Commenting cleanup