Applied changes from feedback.