Clean up tokenizer a lot