Address code review comments.