Small cleanup of style and junk comments.
Merge pull request #178 from workhorsy/cleanup

Small cleanup of style and junk comments.