Final formatting edits