Some comment changes before submitting