team selection for all riders and refactoring