Commenting and reorganization