reorganization and editing changes