Changes based on hlint suggestions