Refactor the ComboBox