Cleanup and refactoring.

Change-Id: I663981416a2f12c627b562eb998255526445235e
4 files changed