addressing code review comments.