resolve more review comments