simplify tokenizer; no longer return dicts