color code cleanup