clean up and reordering of EmcalJetCDF