Improve based on remarks.