formatting and small edits