Minor cleanup following feedback from pull request