Commenting out improved