Revise some wording here and there