Hlint / refactor

I ran HLint and did a tiny amount of manual refactoring.  Most of it is just removing unneeded parens.  I think the results are cleaner but let me know it there is anything you want me to change back.