marcocg: Update to reflect pull request comments.