comments reorganization