Cleanup

Tabs and whitespaces

Change-Id: I3463babf244f73690508e8dc9bf195ec7b850345