Refactored ColorPicker and SimpleAdder.