Cleaning up and making Xml more ddex focused