SAX parser refactoring