after further refactoring the Zenodo code