refactor parse and add tokenizer