HannesWell Refactor XML processing