Work on refactoring the Parser