Commenting clean up