Clean up color methods