refactored Tokenizer to implementation file