Cleaning up the wording and structure