Refactored parsing intp RecursiveDescentParser