Refactored AnnotationColumnChoser and AnnotationColorChooser to apply the DRY principle