Cleanups based on feedback from pull request.