Tabs and whitespace cleanup

Beginnings of some white-space and tab cleanups
The indentation after the `*` still consists of tabs.