Formatting and comment changes.