Tabs and whitespace cleanup

Beginnings of some white-space and tab cleanups
Trailing tab