Addresses review comments.