refactored color