Debug, XML, Tools

Refactoring