Wording cleanup