Fixed tabs to spaces.
Tabs to spaces and a few lint issues fixed.