Tokenizer class clean up