Refactoring in various places using HLint
Merge pull request #3 from mecampbellsoup/hlinting

Refactoring/style changes according to HLint.