Combobox Refactor