Some cleanup in ColorTable