Suggestion from pull request review