Addressing code review comments.