CR feedback from pull request, #68