Clean up Commenting