--minor class comments cleanup