updates after code review