More edits for formatting