comment reorganization