cleaned up the tokenizer