cleaned up tokenizer a bit