made some changes per code review