Changes made based on the pull request comments.