begin cleaning up jiffy and reorganizing