Refactored/renamed tokenizers