addresses pull request feedback

/cc @densh