fix according to code review comments