Improved tokenizer