Refactored tokenizers