Refactor Parser.