moved class comments to proper position