hlint fixes
hlint fixes
Merge pull request #1 from bobgru/hlint-cleanup

Hlint cleanup