Cleaned up color implementation