improved Tokenizer.tokenize