Tweak wording and formatting