Applied hlint suggestions.