Reworking comment system