Addressing comments for PR.