Improved loading of XML data
Improved code-quality