Addressed PR comments.