Fixup minor whitespace issues

Change-Id: I54b6ed0cb8b7f413bb7f53b3247de257ce42e84f