Applied hlint suggestions