Addressing code review comment