Refactoring on Parser.