Commenting and restructuring