Cleanup for style guide compliance

Change-Id: Icf429f7de6117c642aaeb06700984a47cbd81e67