attempt to restructure to a more standard format