comment changes from Donn Terry, and indentation changes