Refactoring
Added tokenizer