committing refactored parser