refactoring to Tokenizer - first step