Reorganizing comments