color correct refactorings