formatting + edits