restructuring: some print-out deleted