minor refactor of team picker