Code cleanup in Color Picker