Housekeeping

Comment cleanup.