Refactored parser, no errors