Improvements to clarity, structure and markup