formatting and edits