Addresses review feedback.