Tweak some language and formatting