fix code review comments