Reorganized some wording