Clarify, comment, and format