code cleanup for the color options