Addressing comments/requests from the code review.