Improve code based on feedback.