Minor Commenting and formatting changes