Improve tokenizer