Whitespace cleanup

Change-Id: If75b60b5bace54c0715d05cfa08c632b7fcc43ab