diff --git a/.coveragerc b/.coveragerc
index 774c4f6..07b738b 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -9,11 +9,11 @@ omit =
     .*rc
     versioneer.py
     setup.py
-    */tests/*
-    */_version.py
-    */__init__.py
-    */**/__init__.py
-    */due.py
-    */.*rc
-    */versioneer.py
-    */setup.py
+    phys2denoise/tests/*
+    phys2denoise/_version.py
+    phys2denoise/__init__.py
+    phys2denoise/**/__init__.py
+    phys2denoise/due.py
+    phys2denoise/.*rc
+    phys2denoise/versioneer.py
+    phys2denoise/setup.py
diff --git a/.zenodo.json b/.zenodo.json
index 2bef93d..7658c5a 100644
--- a/.zenodo.json
+++ b/.zenodo.json
@@ -1,9 +1,8 @@
 {
-  "metadata": {
-    "license": {
-      "id": "Apache-2.0"
-    }, 
+    "license":"Apache-2.0",
     "title": "physiopy/phys2denoise: Creation of physiological regressors for fMRI", 
+    "upload_type":"software",
+    "access_right":"open",
     "creators": [ 
       {
         "affiliation": "BCBL - Basque Center on Cognition, Brain and Language", 
@@ -18,11 +17,5 @@
         "affiliation": "BCBL - Basque Center on Cognition, Brain and Language", 
         "name": "Stefano Moia"
       }
-    ], 
-    "access_right": "open", 
-    "resource_type": {
-      "type": "software", 
-      "title": "Software"
-    },
-  }
-}
\ No newline at end of file
+    ]
+}
diff --git a/requirements.txt b/requirements.txt
index 5f521f9..37ba207 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,2 @@
 numpy>=1.9.3
 matplotlib>=3.1.1 !=3.3.0rc1
-PyYAML >=5.1, !=*rc*
diff --git a/setup.cfg b/setup.cfg
index 8f62c05..5032f99 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -24,6 +24,7 @@ python_requires = >=3.6.1
 install_requires =
     numpy >=1.9.3
     matplotlib >=3.1.1
+    duecredit
 tests_require =
     pytest >=5.3
 test_suite = pytest
@@ -32,13 +33,6 @@ packages = find:
 include_package_data = True
 
 [options.extras_require]
-extra_1 =
-    numpy
-extra_2 =
-    numpy
-all =
-    %(extra_1)s
-    %(extra_2)s
 doc =
     sphinx>=2.0
     sphinx-argparse
@@ -50,7 +44,6 @@ style =
     isort<6.0.0
     pydocstyle
 test =
-    %(all)s
     %(style)s
     pytest >=5.3
     pytest-cov
@@ -61,7 +54,6 @@ dev =
     %(devtools)s
     %(doc)s
     %(test)s
-    %(test)s
 
 [options.entry_points]
 console_scripts =
@@ -71,8 +63,8 @@ console_scripts =
 doctest = True
 exclude=
     _version.py
-    ./<phys2denoise>/cli/__init__.py
-    ./<phys2denoise>/tests/*
+    ./phys2denoise/cli/__init__.py
+    ./phys2denoise/tests/*
     versioneer.py
 ignore = E126, E402, W503, F401, F811
 max-line-length = 88
@@ -92,15 +84,15 @@ extend_skip =
     codecov.yml
     setup.py
     versioneer.py
-    <phys2denoise>/_version.py
+    phys2denoise/_version.py
 skip_glob =
     docs/*
 
 [pydocstyle]
 convention = numpy
 match =
-    <phys2denoise>/*.py
-match_dir = <phys2denoise>/[^tests]*
+    phys2denoise/*.py
+match_dir = phys2denoise/[^tests]*
 
 
 [tool:pytest]
@@ -111,7 +103,7 @@ addopts = -rx
 [coverage:run]
 branch = True
 omit =
-    <phys2denoise>/tests/*
+    phys2denoise/tests/*
     docs/*
     setup.py
     versioneer.py