incorporating minor fixes from the pull request review