refactored select tokens