replace data-class with just class and fix code
remove xhtml namespace