code cleanup, going through comments, simplifying some of them
Authored by: mrieser 2012-04-03
Parent: [r19002]
Child: [r19004]