13 TeV data now, refactoring