Minor improvements
Huge simplifications regarding the pretty printing of the xml