formatting and minor edits