Start moving things back to our format

Change-Id: Id7842592257c2a769401602824e8c95d1199c18b
Cleanup

Tabs,whitespaces

Change-Id: I90488a92c80b764a91acc6eada8d91a2c223c9b8