Improving the tokenizer