Added additonal class comments