Clean up the wording in a few places