cleaned up color logic