Tidied up XHTML.