Class refactoring, XML parsing