Hand refactoring. ExtractAddCombo method added