Whitespace cleanup

Change-Id: I05aaa2319c36dd8cb291bc364b939e3eed2127a7