Cleaned up our tokenizer