Cleaned Up Commenting