minor change according to code review