Improved Tokenizer