Improve wording and formatting