refactor player/combos