cleanup, reorganization, and addition of pileupJetID