Commenting and cleanup