Minor comment deleting/adding and formatting changes