Commenting and cleanup.