Refactored color