Simplify Builder
Simplify Tokenizer