Formatting and commentary improvements.