Tokenizer redesign
Refactor internal algorithm