addressing code review comments
addressing code review comments