fix more code review comments