Implemented hlint suggestions.