refactor Parser