removed Debug output
clean up of code
XML output restructuring