Clean up indenting and XML output