Further style changes
Tabs changed to spaces