changes as requested per code review