XHTML 1.1 to HTML5 plus Refactoring