addressing PR comments.