just some minor tweaks based on comments from the pull request