Streamlined + Added Calo to skimTree