updates from code review