applied hlint suggestions
applied hlint suggestions