Simplify
Wording
XHTML conformance