XML syntax clean up