Minor changes according to feedback.