clean up & add define for COLOR