Change to XHTML syntax