cleanup and wording