Cleanup formatting of xml