Refactored Tokenization.