cleanup, add index to tokenizer results