Edits, mostly for formatting