Remove unnecessary include statement
Simplify the implementation of tokenizer