Clean up color generation code