more changes from code review