Address reviewer's comments.