[2307] Minor change as a result of second review.
[2307] Feformatted so that most lines are no longer than 80 characters wide