Improved naming, removed some uneeded features from XMLParser