Improve ComboBox code