Refactoring in the XML