minor tokenizer cleanup