Formatting and comment tweaks