comments from 2nd code review addressed