rework comments