more comment reorganize