Merge "Minor comment and formatting cleanup"