make changes per code review