Edits and formatting changes