Adresses PR comments.