Formatting, syntax, and comment fixes from PR review.