Refactoring parser
Parser test is green