Improve structure and wording