Implement Keith's review feedback.