Apply hlint suggestions
Merge pull request #1 from bennofs/apply-hlint

Apply hlint suggestions