improve tokenizer