Moved class/func printing to own methods