Formatting and commenting adjustments.