clean up & change cyto format