Untabify

Minor cleanups.
More of the same
Make things more readable

Remove some comments
Merge pull request #3 from samebchase/tabify

Untabify