Incorporated hlint suggestions.