Cleanup

Minor whitespace, coding convention cleanup

Change-Id: Ibb10ce64ad4c35bfd6f924665243961c80b81714