formatting and minor edits
format