Whitespace cleanup

Change-Id: I9d7ee6332a4284a894240eac3df6ceb6153aa86d