Cleaned up color code