retooling, cleanup