Rework tokenizer