some more cleanup and improved XMLUtilities