after code review improvements
after code review improvements