Tabs and whitespace cleanup

Beginnings of some white-space and tab cleanups
There are still trailing tabs left at the end of this line.