reorganization and edits