Cleaning up tokenizer