Some hlint suggestions added