updates for code review