Improve xml formatting