Whitespace fixes

Change-Id: Ib42d0f42e988e1717f2b54c3bf1222494f2d8442