after code review improvements