Cleaning up how listbox works