changes from code review