More changes to separate ntuple framework from actual analysis