some changes per code review