Whitespace, code formatting cleanup

Change-Id: Id785b16bd0734fe5a136abb586fb057de18d0d21