Refactor - combined html/xml methods
Refactor - combined html/xml methods
Changed xpath attrib