Some clean-up of language