minor changes in commenting