Tweaks to formatting and comments