Reformat mcclintock to use less storage during run