Tabs to spaces

Change-Id: I3284110d51cbba81fa7a9b31c5b84c0c6f16dcd6
Cleanup

Change-Id: I425cd9ef45f7f680c15dc4a308c100467c2969c5