hlint suggestions, plus comments
hlint fixes
Remove unnecessary imports
Merge pull request #1 from bobgru/hlint-cleanup

Hlint cleanup