Color coding cleanup