Implement @agorrod's review feedback.