Further simplification to expt script.
Minor cleanup