Commenting and reorganizing