incorporate code review changes