Addresses Russ's comments from pull request.