color refactoring