Whitespace cleanup

Change-Id: Ic3eaf12659a502c68c0756519891c99f85a7b4fd