Commenting clean-up