Refactoring of parser.