Remove some comments, minor style fixes
Merge pull request #1 from samebchase/master

Remove some comments, minor style fixes