Update based on reviewer comments.