Some hlint suggestions