Added hlint suggestions