Updated xml formatting