Refactoring DatfXML
Small fixes