fix code review remarks