reorders Combo methods for clarity
refactors two statements in #next_set_of_teams to one-liners, for esthetics