Code cleanup in XMLHelper
Code cleanup ALL THE THINGS!