-consitent cleanups in the class comments