updates based on Manne's comments in the pull request