Whitespace cleanup

Change-Id: I8285f1b4ae9a99d5bc658ba38d04e9a1d367635e