code review changes from chris