Implement some minor review feedback.