Updates for formatting, doc, and style feedback.