addressing code review comments