Improves markup structure.
Improves wording.