Refactorize combo setup helpers