Rework comment