Addresses reviewer comments.