Code request cleanups for tokenizer

@dangoor