Style cleanups
Die TAB, die.
Add spaces before []
Add a few comments