diff --git a/.github/workflows/isort.yml b/.github/workflows/isort.yml
new file mode 100644
index 00000000..13c96edd
--- /dev/null
+++ b/.github/workflows/isort.yml
@@ -0,0 +1,24 @@
+name: Run isort
+
+on:
+  push:
+  pull_request:
+  merge_group:
+
+jobs:
+  isort:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install poetry
+        run: pipx install poetry
+      - name: Set up Python 3.11
+        uses: actions/setup-python@v4
+        with:
+          python-version: "3.11"
+      - name: Install dependencies
+        run: |
+          poetry install --with dev
+      - name: Check code with isort
+        run: |
+          poetry run isort . -c
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
new file mode 100644
index 00000000..dce57e8e
--- /dev/null
+++ b/.pre-commit-config.yaml
@@ -0,0 +1,20 @@
+repos:
+-   repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v2.3.0
+    hooks:
+    -   id: check-yaml
+    -   id: end-of-file-fixer
+-   repo: local
+    hooks:
+    -   id: black
+        name: black
+        entry: black
+        language: system
+        types: [ python ]
+-   repo: local
+    hooks:
+      - id: isort
+        name: isort (python)
+        entry: isort
+        language: system
+        types: [ python ]
diff --git a/README.md b/README.md
index eee2a8d1..64b06f2d 100644
--- a/README.md
+++ b/README.md
@@ -73,6 +73,12 @@ pip install -e ".[dev]"
 Either way will give you the very latest copy of the code, update the installed version if you git pull or modify scripts 
 yourself, and still enable you to import flarestack.
 
+Finally, install the pre-commit hooks:
+
+```shell
+pre-commit install
+```
+
 If you do want to contribute to _flarestack_, you can check out some guidelines [here](https://github.com/icecube/flarestack/blob/master/CONTRIBUTING.md).
 
 
diff --git a/examples/create_scrambled_dataset.py b/examples/create_scrambled_dataset.py
index a926af42..22b51285 100644
--- a/examples/create_scrambled_dataset.py
+++ b/examples/create_scrambled_dataset.py
@@ -1,7 +1,8 @@
-from flarestack.data.icecube import gfu_v002_p04
-from flarestack.utils import ps_catalogue_name, load_catalogue
 import logging
 
+from flarestack.data.icecube import gfu_v002_p04
+from flarestack.utils import load_catalogue, ps_catalogue_name
+
 logging.getLogger().setLevel("INFO")
 
 # Initialise Injectors/LLHs
diff --git a/flarestack/__init__.py b/flarestack/__init__.py
index 11f3027b..f13ea478 100644
--- a/flarestack/__init__.py
+++ b/flarestack/__init__.py
@@ -1,6 +1,6 @@
-from flarestack.core.minimisation import MinimisationHandler
-from flarestack.core.results import ResultsHandler, OverfluctuationError
 from flarestack.cluster import analyse, wait_cluster
-from flarestack.core.unblinding import create_unblinder
 from flarestack.core.energy_pdf import EnergyPDF
+from flarestack.core.minimisation import MinimisationHandler
+from flarestack.core.results import OverfluctuationError, ResultsHandler
+from flarestack.core.unblinding import create_unblinder
 from flarestack.shared import *
diff --git a/flarestack/analyses/agn_cores/create_catalogue.py b/flarestack/analyses/agn_cores/create_catalogue.py
index 8345e655..8414233c 100644
--- a/flarestack/analyses/agn_cores/create_catalogue.py
+++ b/flarestack/analyses/agn_cores/create_catalogue.py
@@ -7,23 +7,24 @@
 remaining 30% weight distributed across many sources. As integer numbers of
 sources are used, the closest percentage to 70% is used for splitting.
 """
-from __future__ import print_function
-from __future__ import absolute_import
+
+from __future__ import absolute_import, print_function
+
+import os
 from builtins import zip
+
+import astropy.io.fits as pyfits
+import numpy as np
+from astropy.table import Table
+
 from flarestack.analyses.agn_cores.shared_agncores import (
-    raw_cat_dir,
     agn_catalogue_name,
     agn_cores_output_dir,
-)
-from flarestack.analyses.agn_cores.shared_agncores import (
     create_random_src,
     plot_catalogue,
+    raw_cat_dir,
 )
 from flarestack.utils.prepare_catalogue import cat_dtype
-import astropy.io.fits as pyfits
-from astropy.table import Table
-import numpy as np
-import os
 
 
 def select_nrandom_sources(cat, n_random=100):
diff --git a/flarestack/analyses/agn_cores/diffuse_dataset/test_completeness_diffuse_8years_cluster_collectdata.py b/flarestack/analyses/agn_cores/diffuse_dataset/test_completeness_diffuse_8years_cluster_collectdata.py
index e869628c..9a463a86 100644
--- a/flarestack/analyses/agn_cores/diffuse_dataset/test_completeness_diffuse_8years_cluster_collectdata.py
+++ b/flarestack/analyses/agn_cores/diffuse_dataset/test_completeness_diffuse_8years_cluster_collectdata.py
@@ -3,47 +3,45 @@
 Sensitivities are given as the total integrated fluence across all sources,
 and as the corresponding standard-candle-luminosity.
 """
-from __future__ import print_function
-from __future__ import division
+
+from __future__ import division, print_function
+
+import logging
+import math
+import os
+import resource
+import time
+
+import matplotlib.pyplot as plt
 import numpy as np
+import psutil  # to get memory usage info
+from matplotlib.ticker import ScalarFormatter
+
+from flarestack.analyses.agn_cores.shared_agncores import (
+    agn_catalogue_name,
+    agn_subset_catalogue,
+    agn_subset_catalogue_north,
+    complete_cats,
+)
+from flarestack.cluster import analyse, wait_for_cluster
+from flarestack.core.minimisation import MinimisationHandler
 from flarestack.core.results import ResultsHandler
+from flarestack.data.icecube import diffuse_8_year
 
 # # from flarestack.data.icecube.ps_tracks.ps_v002_p01 import ps_7year
 # from flarestack.data.icecube.ps_tracks.ps_v003_p02 import ps_10year
 # from flarestack.data.icecube.northern_tracks.nt_v002_p05 import diffuse_8year
 # from flarestack.data.icecube.gfu.gfu_v002_p01 import txs_sample_v1
 from flarestack.shared import (
-    plot_output_dir,
     flux_to_k,
-    make_analysis_pickle,
     k_to_flux,
+    make_analysis_pickle,
+    plot_output_dir,
 )
-
-from flarestack.data.icecube import diffuse_8_year
 from flarestack.utils.catalogue_loader import load_catalogue
-from flarestack.analyses.agn_cores.shared_agncores import (
-    agn_subset_catalogue,
-    complete_cats,
-    agn_catalogue_name,
-    agn_subset_catalogue_north,
-)
-from flarestack.core.minimisation import MinimisationHandler
-
-from flarestack.cluster import analyse, wait_for_cluster
-import math
-import matplotlib.pyplot as plt
-from matplotlib.ticker import ScalarFormatter
-
-import matplotlib.pyplot as plt
 
 # plt.style.use('~/scratch/phdthesis.mpltstyle')
 
-import time
-
-import logging
-
-import os
-import psutil, resource  # to get memory usage info
 
 analyses = dict()
 
@@ -691,9 +689,8 @@ def generate_name(cat_key, n_sources, gamma):
             frame2.set_ylabel("Stacked\nsources")
             frame2.set_yticks([10, 1000, 10000])
 
-            from matplotlib.ticker import AutoMinorLocator
-            from matplotlib.ticker import StrMethodFormatter
             from matplotlib import ticker
+            from matplotlib.ticker import AutoMinorLocator, StrMethodFormatter
 
             minorLocator = AutoMinorLocator()
             # frame2.xaxis.set_minor_locator(minorLocator)
@@ -819,9 +816,8 @@ def generate_name(cat_key, n_sources, gamma):
         frame2.set_yticks([10, 1000, 10000])
         frame2.set_ylabel("Stacked\nsources")
 
-        from matplotlib.ticker import AutoMinorLocator
-        from matplotlib.ticker import StrMethodFormatter
         from matplotlib import ticker
+        from matplotlib.ticker import AutoMinorLocator, StrMethodFormatter
 
         minorLocator = AutoMinorLocator()
         # frame2.xaxis.set_minor_locator(minorLocator)
diff --git a/flarestack/analyses/agn_cores/loop_over_catalogues.py b/flarestack/analyses/agn_cores/loop_over_catalogues.py
index 830c0301..91cf681b 100644
--- a/flarestack/analyses/agn_cores/loop_over_catalogues.py
+++ b/flarestack/analyses/agn_cores/loop_over_catalogues.py
@@ -3,17 +3,20 @@
 Sensitivities are given as the total integrated fluence across all sources,
 and as the corresponding standard-candle-luminosity.
 """
+
+import math
 from builtins import str
+
+import matplotlib.pyplot as plt
 import numpy as np
+
+from flarestack.analyses.tde.shared_TDE import tde_catalogue_name, tde_catalogues
+from flarestack.cluster import run_desy_cluster as rd
 from flarestack.core.results import ResultsHandler
 from flarestack.data.icecube.gfu.gfu_v002_p01 import txs_sample_v1
-from flarestack.shared import plot_output_dir, flux_to_k, make_analysis_pickle
-from flarestack.utils.reference_sensitivity import reference_sensitivity
-from flarestack.analyses.tde.shared_TDE import tde_catalogues, tde_catalogue_name
-from flarestack.cluster import run_desy_cluster as rd
-import math
-import matplotlib.pyplot as plt
+from flarestack.shared import flux_to_k, make_analysis_pickle, plot_output_dir
 from flarestack.utils.custom_dataset import custom_dataset
+from flarestack.utils.reference_sensitivity import reference_sensitivity
 
 analyses = dict()
 
diff --git a/flarestack/analyses/agn_cores/scripts_for_unblinding/agn_catalogues/create_ir_selected_agn_north_catalogue.py b/flarestack/analyses/agn_cores/scripts_for_unblinding/agn_catalogues/create_ir_selected_agn_north_catalogue.py
index 83a1f233..72dc7576 100644
--- a/flarestack/analyses/agn_cores/scripts_for_unblinding/agn_catalogues/create_ir_selected_agn_north_catalogue.py
+++ b/flarestack/analyses/agn_cores/scripts_for_unblinding/agn_catalogues/create_ir_selected_agn_north_catalogue.py
@@ -5,18 +5,21 @@
 and XMMSL2 and NVSS. From the two subsamples 3LAC blazars have been removed.
 Also double X-Ray sources and double radio sources have been removed.
 """
+
+import os
+
+import astropy.io.fits as pyfits
+import numpy as np
+import pandas as pd
+from astropy.table import Table
+from shared_agncores import create_random_src, plot_catalogue
+
 from flarestack.analyses.agn_cores.shared_agncores import (
-    raw_cat_dir,
     agn_catalogue_name,
     agn_cores_output_dir,
+    raw_cat_dir,
 )
-from shared_agncores import create_random_src, plot_catalogue
 from flarestack.utils.prepare_catalogue import cat_dtype
-import astropy.io.fits as pyfits
-from astropy.table import Table
-import numpy as np
-import pandas as pd
-import os
 
 
 def select_nrandom_sources(cat, n_random=100):
diff --git a/flarestack/analyses/agn_cores/scripts_for_unblinding/agn_catalogues/create_llagn_north_catalogue.py b/flarestack/analyses/agn_cores/scripts_for_unblinding/agn_catalogues/create_llagn_north_catalogue.py
index bb9936a2..51a578ff 100644
--- a/flarestack/analyses/agn_cores/scripts_for_unblinding/agn_catalogues/create_llagn_north_catalogue.py
+++ b/flarestack/analyses/agn_cores/scripts_for_unblinding/agn_catalogues/create_llagn_north_catalogue.py
@@ -5,18 +5,21 @@
 and XMMSL2 and NVSS. From the two subsamples 3LAC blazars have been removed.
 Also double X-Ray sources and double radio sources have been removed.
 """
+
+import os
+
+import astropy.io.fits as pyfits
+import numpy as np
+import pandas as pd
+from astropy.table import Table
+from shared_agncores import create_random_src, plot_catalogue
+
 from flarestack.analyses.agn_cores.shared_agncores import (
-    raw_cat_dir,
     agn_catalogue_name,
     agn_cores_output_dir,
+    raw_cat_dir,
 )
-from shared_agncores import create_random_src, plot_catalogue
 from flarestack.utils.prepare_catalogue import cat_dtype
-import astropy.io.fits as pyfits
-from astropy.table import Table
-import numpy as np
-import pandas as pd
-import os
 
 
 def select_nrandom_sources(cat, n_random=100):
diff --git a/flarestack/analyses/agn_cores/scripts_for_unblinding/agn_catalogues/create_radio_selected_agn_north_catalogue.py b/flarestack/analyses/agn_cores/scripts_for_unblinding/agn_catalogues/create_radio_selected_agn_north_catalogue.py
index 85d1c223..bfb8b9a4 100644
--- a/flarestack/analyses/agn_cores/scripts_for_unblinding/agn_catalogues/create_radio_selected_agn_north_catalogue.py
+++ b/flarestack/analyses/agn_cores/scripts_for_unblinding/agn_catalogues/create_radio_selected_agn_north_catalogue.py
@@ -5,18 +5,21 @@
 and XMMSL2 and NVSS. From the two subsamples 3LAC blazars have been removed.
 Also double X-Ray sources and double radio sources have been removed.
 """
+
+import os
+
+import astropy.io.fits as pyfits
+import numpy as np
+import pandas as pd
+from astropy.table import Table
+from shared_agncores import create_random_src, plot_catalogue
+
 from flarestack.analyses.agn_cores.shared_agncores import (
-    raw_cat_dir,
     agn_catalogue_name,
     agn_cores_output_dir,
+    raw_cat_dir,
 )
-from shared_agncores import create_random_src, plot_catalogue
 from flarestack.utils.prepare_catalogue import cat_dtype
-import astropy.io.fits as pyfits
-from astropy.table import Table
-import numpy as np
-import pandas as pd
-import os
 
 
 def select_nrandom_sources(cat, n_random=100):
diff --git a/flarestack/analyses/agn_cores/scripts_for_unblinding/create_agn_samples/create_ir_selected_agn_north_catalogue.py b/flarestack/analyses/agn_cores/scripts_for_unblinding/create_agn_samples/create_ir_selected_agn_north_catalogue.py
index 3cd2152f..37d4b062 100644
--- a/flarestack/analyses/agn_cores/scripts_for_unblinding/create_agn_samples/create_ir_selected_agn_north_catalogue.py
+++ b/flarestack/analyses/agn_cores/scripts_for_unblinding/create_agn_samples/create_ir_selected_agn_north_catalogue.py
@@ -5,18 +5,21 @@
 and XMMSL2 and NVSS. From the two subsamples 3LAC blazars have been removed.
 Also double X-Ray sources and double radio sources have been removed.
 """
+
+import os
+
+import astropy.io.fits as pyfits
+import numpy as np
+import pandas as pd
+from astropy.table import Table
+from shared_agncores import create_random_src, plot_catalogue
+
 from flarestack.analyses.agn_cores.shared_agncores import (
-    raw_cat_dir,
     agn_catalogue_name,
     agn_cores_output_dir,
+    raw_cat_dir,
 )
-from shared_agncores import create_random_src, plot_catalogue
 from flarestack.utils.prepare_catalogue import cat_dtype
-import astropy.io.fits as pyfits
-from astropy.table import Table
-import numpy as np
-import pandas as pd
-import os
 
 
 def select_nrandom_sources(cat, n_random=100):
diff --git a/flarestack/analyses/agn_cores/scripts_for_unblinding/create_agn_samples/create_llagn_north_catalogue.py b/flarestack/analyses/agn_cores/scripts_for_unblinding/create_agn_samples/create_llagn_north_catalogue.py
index 7d23d8df..2056ae3b 100644
--- a/flarestack/analyses/agn_cores/scripts_for_unblinding/create_agn_samples/create_llagn_north_catalogue.py
+++ b/flarestack/analyses/agn_cores/scripts_for_unblinding/create_agn_samples/create_llagn_north_catalogue.py
@@ -5,18 +5,21 @@
 and removing the 3LAC blazars. A Seyferntess PDF is assigned and only sources with
 Seyfertness larger than 0.5 are selected in the final sample.
 """
+
+import os
+
+import astropy.io.fits as pyfits
+import numpy as np
+import pandas as pd
+from astropy.table import Table
+from shared_agncores import create_random_src, plot_catalogue
+
 from flarestack.analyses.agn_cores.shared_agncores import (
-    raw_cat_dir,
     agn_catalogue_name,
     agn_cores_output_dir,
+    raw_cat_dir,
 )
-from shared_agncores import create_random_src, plot_catalogue
 from flarestack.utils.prepare_catalogue import cat_dtype
-import astropy.io.fits as pyfits
-from astropy.table import Table
-import numpy as np
-import pandas as pd
-import os
 
 
 def select_nrandom_sources(cat, n_random=100):
diff --git a/flarestack/analyses/agn_cores/scripts_for_unblinding/create_agn_samples/create_radio_selected_agn_north_catalogue.py b/flarestack/analyses/agn_cores/scripts_for_unblinding/create_agn_samples/create_radio_selected_agn_north_catalogue.py
index e46ef033..3a41b1a4 100644
--- a/flarestack/analyses/agn_cores/scripts_for_unblinding/create_agn_samples/create_radio_selected_agn_north_catalogue.py
+++ b/flarestack/analyses/agn_cores/scripts_for_unblinding/create_agn_samples/create_radio_selected_agn_north_catalogue.py
@@ -5,18 +5,21 @@
 and XMMSL2 and AllWISE. From the two subsamples 3LAC blazars have been removed.
 Also double X-Ray sources have been removed.
 """
+
+import os
+
+import astropy.io.fits as pyfits
+import numpy as np
+import pandas as pd
+from astropy.table import Table
+from shared_agncores import create_random_src, plot_catalogue
+
 from flarestack.analyses.agn_cores.shared_agncores import (
-    raw_cat_dir,
     agn_catalogue_name,
     agn_cores_output_dir,
+    raw_cat_dir,
 )
-from shared_agncores import create_random_src, plot_catalogue
 from flarestack.utils.prepare_catalogue import cat_dtype
-import astropy.io.fits as pyfits
-from astropy.table import Table
-import numpy as np
-import pandas as pd
-import os
 
 
 def select_nrandom_sources(cat, n_random=100):
diff --git a/flarestack/analyses/agn_cores/scripts_for_unblinding/differential_sensitivity/diff_sens_ir_selected_agn_analysis.py b/flarestack/analyses/agn_cores/scripts_for_unblinding/differential_sensitivity/diff_sens_ir_selected_agn_analysis.py
index f387f61b..8e27d689 100644
--- a/flarestack/analyses/agn_cores/scripts_for_unblinding/differential_sensitivity/diff_sens_ir_selected_agn_analysis.py
+++ b/flarestack/analyses/agn_cores/scripts_for_unblinding/differential_sensitivity/diff_sens_ir_selected_agn_analysis.py
@@ -1,46 +1,45 @@
 """Script to compare the sensitivity and discovery potential for the IR-selected AGN sample (32249 sources)
 as a function of injected spectral index for energy decades between 100 GeV and 10 PeV.
 """
-from __future__ import print_function
-from __future__ import division
+
+from __future__ import division, print_function
+
+import logging
+import math
+import os
+import resource
+import time
+
+import matplotlib.pyplot as plt
 import numpy as np
+import psutil  # to get memory usage info
+from matplotlib.ticker import ScalarFormatter
+
+from flarestack.analyses.agn_cores.shared_agncores import (
+    agn_catalogue_name,
+    agn_subset_catalogue,
+    agn_subset_catalogue_north,
+    complete_cats_north,
+)
+from flarestack.cluster import analyse, wait_for_cluster
+from flarestack.core.minimisation import MinimisationHandler
 from flarestack.core.results import ResultsHandler
+from flarestack.data.icecube import diffuse_8_year
 
 # # from flarestack.data.icecube.ps_tracks.ps_v002_p01 import ps_7year
 # from flarestack.data.icecube.ps_tracks.ps_v003_p02 import ps_10year
 # from flarestack.data.icecube.northern_tracks.nt_v002_p05 import diffuse_8year
 # from flarestack.data.icecube.gfu.gfu_v002_p01 import txs_sample_v1
 from flarestack.shared import (
-    plot_output_dir,
     flux_to_k,
-    make_analysis_pickle,
     k_to_flux,
+    make_analysis_pickle,
+    plot_output_dir,
 )
-
-from flarestack.data.icecube import diffuse_8_year
 from flarestack.utils.catalogue_loader import load_catalogue
-from flarestack.analyses.agn_cores.shared_agncores import (
-    agn_subset_catalogue,
-    complete_cats_north,
-    complete_cats_north,
-    agn_catalogue_name,
-    agn_subset_catalogue_north,
-)
-from flarestack.core.minimisation import MinimisationHandler
-
-from flarestack.cluster import analyse, wait_for_cluster
-import math
-import matplotlib.pyplot as plt
-from matplotlib.ticker import ScalarFormatter
 
 # plt.style.use('~/scratch/phdthesis.mpltstyle')
 
-import time
-
-import logging
-
-import os
-import psutil, resource  # to get memory usage info
 
 analyses = dict()
 
diff --git a/flarestack/analyses/agn_cores/scripts_for_unblinding/differential_sensitivity/diff_sens_llagn_analysis.py b/flarestack/analyses/agn_cores/scripts_for_unblinding/differential_sensitivity/diff_sens_llagn_analysis.py
index 5bca6537..bcedca0d 100644
--- a/flarestack/analyses/agn_cores/scripts_for_unblinding/differential_sensitivity/diff_sens_llagn_analysis.py
+++ b/flarestack/analyses/agn_cores/scripts_for_unblinding/differential_sensitivity/diff_sens_llagn_analysis.py
@@ -1,46 +1,45 @@
 """Script to compare the sensitivity and discovery potential for the LLAGN sample (15887 sources)
 as a function of injected spectral index for energy decades between 100 GeV and 10 PeV.
 """
-from __future__ import print_function
-from __future__ import division
+
+from __future__ import division, print_function
+
+import logging
+import math
+import os
+import resource
+import time
+
+import matplotlib.pyplot as plt
 import numpy as np
+import psutil  # to get memory usage info
+from matplotlib.ticker import ScalarFormatter
+
+from flarestack.analyses.agn_cores.shared_agncores import (
+    agn_catalogue_name,
+    agn_subset_catalogue,
+    agn_subset_catalogue_north,
+    complete_cats_north,
+)
+from flarestack.cluster import analyse, wait_for_cluster
+from flarestack.core.minimisation import MinimisationHandler
 from flarestack.core.results import ResultsHandler
+from flarestack.data.icecube import diffuse_8_year
 
 # # from flarestack.data.icecube.ps_tracks.ps_v002_p01 import ps_7year
 # from flarestack.data.icecube.ps_tracks.ps_v003_p02 import ps_10year
 # from flarestack.data.icecube.northern_tracks.nt_v002_p05 import diffuse_8year
 # from flarestack.data.icecube.gfu.gfu_v002_p01 import txs_sample_v1
 from flarestack.shared import (
-    plot_output_dir,
     flux_to_k,
-    make_analysis_pickle,
     k_to_flux,
+    make_analysis_pickle,
+    plot_output_dir,
 )
-
-from flarestack.data.icecube import diffuse_8_year
 from flarestack.utils.catalogue_loader import load_catalogue
-from flarestack.analyses.agn_cores.shared_agncores import (
-    agn_subset_catalogue,
-    complete_cats_north,
-    complete_cats_north,
-    agn_catalogue_name,
-    agn_subset_catalogue_north,
-)
-from flarestack.core.minimisation import MinimisationHandler
-
-from flarestack.cluster import analyse, wait_for_cluster
-import math
-import matplotlib.pyplot as plt
-from matplotlib.ticker import ScalarFormatter
 
 # plt.style.use('~/scratch/phdthesis.mpltstyle')
 
-import time
-
-import logging
-
-import os
-import psutil, resource  # to get memory usage info
 
 analyses = dict()
 
diff --git a/flarestack/analyses/agn_cores/scripts_for_unblinding/differential_sensitivity/diff_sens_radio_selected_agn_analysis.py b/flarestack/analyses/agn_cores/scripts_for_unblinding/differential_sensitivity/diff_sens_radio_selected_agn_analysis.py
index 578bffbb..3f78682b 100644
--- a/flarestack/analyses/agn_cores/scripts_for_unblinding/differential_sensitivity/diff_sens_radio_selected_agn_analysis.py
+++ b/flarestack/analyses/agn_cores/scripts_for_unblinding/differential_sensitivity/diff_sens_radio_selected_agn_analysis.py
@@ -1,46 +1,45 @@
 """Script to compare the sensitivity and discovery potential for the Radio-selected AGN sample (9749 sources)
 as a function of injected spectral index for energy decades between 100 GeV and 10 PeV.
 """
-from __future__ import print_function
-from __future__ import division
+
+from __future__ import division, print_function
+
+import logging
+import math
+import os
+import resource
+import time
+
+import matplotlib.pyplot as plt
 import numpy as np
+import psutil  # to get memory usage info
+from matplotlib.ticker import ScalarFormatter
+
+from flarestack.analyses.agn_cores.shared_agncores import (
+    agn_catalogue_name,
+    agn_subset_catalogue,
+    agn_subset_catalogue_north,
+    complete_cats_north,
+)
+from flarestack.cluster import analyse, wait_for_cluster
+from flarestack.core.minimisation import MinimisationHandler
 from flarestack.core.results import ResultsHandler
+from flarestack.data.icecube import diffuse_8_year
 
 # # from flarestack.data.icecube.ps_tracks.ps_v002_p01 import ps_7year
 # from flarestack.data.icecube.ps_tracks.ps_v003_p02 import ps_10year
 # from flarestack.data.icecube.northern_tracks.nt_v002_p05 import diffuse_8year
 # from flarestack.data.icecube.gfu.gfu_v002_p01 import txs_sample_v1
 from flarestack.shared import (
-    plot_output_dir,
     flux_to_k,
-    make_analysis_pickle,
     k_to_flux,
+    make_analysis_pickle,
+    plot_output_dir,
 )
-
-from flarestack.data.icecube import diffuse_8_year
 from flarestack.utils.catalogue_loader import load_catalogue
-from flarestack.analyses.agn_cores.shared_agncores import (
-    agn_subset_catalogue,
-    complete_cats_north,
-    complete_cats_north,
-    agn_catalogue_name,
-    agn_subset_catalogue_north,
-)
-from flarestack.core.minimisation import MinimisationHandler
-
-from flarestack.cluster import analyse, wait_for_cluster
-import math
-import matplotlib.pyplot as plt
-from matplotlib.ticker import ScalarFormatter
 
 # plt.style.use('~/scratch/phdthesis.mpltstyle')
 
-import time
-
-import logging
-
-import os
-import psutil, resource  # to get memory usage info
 
 analyses = dict()
 
diff --git a/flarestack/analyses/agn_cores/scripts_for_unblinding/differential_sensitivity/unblind_differential_ir_selected_agn.py b/flarestack/analyses/agn_cores/scripts_for_unblinding/differential_sensitivity/unblind_differential_ir_selected_agn.py
index f446ec5d..158090e1 100644
--- a/flarestack/analyses/agn_cores/scripts_for_unblinding/differential_sensitivity/unblind_differential_ir_selected_agn.py
+++ b/flarestack/analyses/agn_cores/scripts_for_unblinding/differential_sensitivity/unblind_differential_ir_selected_agn.py
@@ -2,27 +2,27 @@
 Draws the background TS values generated by differential_sensitivit/diff_sens_ir_selected_agn_analysis.py,
 in order to quantify the significance of the result. Produces relevant post-unblinding plots.
 """
-from __future__ import print_function
-from __future__ import division
+
+from __future__ import division, print_function
+
+import logging
+import os
+import resource
+
 import numpy as np
-from flarestack.core.results import ResultsHandler
-from flarestack.data.icecube import diffuse_8_year
-from flarestack.utils.catalogue_loader import load_catalogue
+import psutil  # to get memory usage info
+
 from flarestack.analyses.agn_cores.shared_agncores import (
-    agn_subset_catalogue,
-    complete_cats_north,
-    complete_cats_north,
     agn_catalogue_name,
+    agn_subset_catalogue,
     agn_subset_catalogue_north,
+    complete_cats_north,
 )
 from flarestack.core.minimisation import MinimisationHandler
+from flarestack.core.results import ResultsHandler
 from flarestack.core.unblinding import create_unblinder
-
-
-import logging
-import os
-import psutil, resource  # to get memory usage info
-
+from flarestack.data.icecube import diffuse_8_year
+from flarestack.utils.catalogue_loader import load_catalogue
 
 logging.getLogger().setLevel("INFO")
 
diff --git a/flarestack/analyses/agn_cores/scripts_for_unblinding/differential_sensitivity/unblind_differential_llagn.py b/flarestack/analyses/agn_cores/scripts_for_unblinding/differential_sensitivity/unblind_differential_llagn.py
index da2e0684..fae5dc65 100644
--- a/flarestack/analyses/agn_cores/scripts_for_unblinding/differential_sensitivity/unblind_differential_llagn.py
+++ b/flarestack/analyses/agn_cores/scripts_for_unblinding/differential_sensitivity/unblind_differential_llagn.py
@@ -2,27 +2,27 @@
 Draws the background TS values generated by differential_sensitivit/diff_sens_llagn_analysis.py,
 in order to quantify the significance of the result. Produces relevant post-unblinding plots.
 """
-from __future__ import print_function
-from __future__ import division
+
+from __future__ import division, print_function
+
+import logging
+import os
+import resource
+
 import numpy as np
-from flarestack.core.results import ResultsHandler
-from flarestack.data.icecube import diffuse_8_year
-from flarestack.utils.catalogue_loader import load_catalogue
+import psutil  # to get memory usage info
+
 from flarestack.analyses.agn_cores.shared_agncores import (
-    agn_subset_catalogue,
-    complete_cats_north,
-    complete_cats_north,
     agn_catalogue_name,
+    agn_subset_catalogue,
     agn_subset_catalogue_north,
+    complete_cats_north,
 )
 from flarestack.core.minimisation import MinimisationHandler
+from flarestack.core.results import ResultsHandler
 from flarestack.core.unblinding import create_unblinder
-
-
-import logging
-import os
-import psutil, resource  # to get memory usage info
-
+from flarestack.data.icecube import diffuse_8_year
+from flarestack.utils.catalogue_loader import load_catalogue
 
 logging.getLogger().setLevel("INFO")
 
diff --git a/flarestack/analyses/agn_cores/scripts_for_unblinding/differential_sensitivity/unblind_differential_radio_selected_agn.py b/flarestack/analyses/agn_cores/scripts_for_unblinding/differential_sensitivity/unblind_differential_radio_selected_agn.py
index 06425d30..e9ec2bfe 100644
--- a/flarestack/analyses/agn_cores/scripts_for_unblinding/differential_sensitivity/unblind_differential_radio_selected_agn.py
+++ b/flarestack/analyses/agn_cores/scripts_for_unblinding/differential_sensitivity/unblind_differential_radio_selected_agn.py
@@ -2,27 +2,27 @@
 Draws the background TS values generated by differential_sensitivit/diff_sens_radio_selected_agn_analysis.py,
 in order to quantify the significance of the result. Produces relevant post-unblinding plots.
 """
-from __future__ import print_function
-from __future__ import division
+
+from __future__ import division, print_function
+
+import logging
+import os
+import resource
+
 import numpy as np
-from flarestack.core.results import ResultsHandler
-from flarestack.data.icecube import diffuse_8_year
-from flarestack.utils.catalogue_loader import load_catalogue
+import psutil  # to get memory usage info
+
 from flarestack.analyses.agn_cores.shared_agncores import (
-    agn_subset_catalogue,
-    complete_cats_north,
-    complete_cats_north,
     agn_catalogue_name,
+    agn_subset_catalogue,
     agn_subset_catalogue_north,
+    complete_cats_north,
 )
 from flarestack.core.minimisation import MinimisationHandler
+from flarestack.core.results import ResultsHandler
 from flarestack.core.unblinding import create_unblinder
-
-
-import logging
-import os
-import psutil, resource  # to get memory usage info
-
+from flarestack.data.icecube import diffuse_8_year
+from flarestack.utils.catalogue_loader import load_catalogue
 
 logging.getLogger().setLevel("INFO")
 
diff --git a/flarestack/analyses/agn_cores/scripts_for_unblinding/energy_range/calculate_energy_range_lower.py b/flarestack/analyses/agn_cores/scripts_for_unblinding/energy_range/calculate_energy_range_lower.py
index 43f87547..1cc68de0 100644
--- a/flarestack/analyses/agn_cores/scripts_for_unblinding/energy_range/calculate_energy_range_lower.py
+++ b/flarestack/analyses/agn_cores/scripts_for_unblinding/energy_range/calculate_energy_range_lower.py
@@ -1,48 +1,45 @@
 """Script to reproduce the sensitivity curves as a function of the minimum energy of the injected neutrinos,
 using 100 sources of the radio-selected AGN sample.
 """
-from __future__ import print_function
-from __future__ import division
+
+from __future__ import division, print_function
+
+import logging
+import math
+import os
+import resource
+import time
+
+import matplotlib.pyplot as plt
 import numpy as np
+import psutil  # to get memory usage info
+from matplotlib.ticker import ScalarFormatter
+
+from flarestack.analyses.agn_cores.shared_agncores import (
+    agn_catalogue_name,
+    agn_subset_catalogue,
+    agn_subset_catalogue_north,
+    complete_cats_north,
+)
+from flarestack.cluster import analyse, wait_for_cluster
+from flarestack.core.minimisation import MinimisationHandler
 from flarestack.core.results import ResultsHandler
+from flarestack.data.icecube import diffuse_8_year, diffuse_10_year
 
 # # from flarestack.data.icecube.ps_tracks.ps_v002_p01 import ps_7year
 # from flarestack.data.icecube.ps_tracks.ps_v003_p02 import ps_10year
 # from flarestack.data.icecube.northern_tracks.nt_v002_p05 import diffuse_8year
 # from flarestack.data.icecube.gfu.gfu_v002_p01 import txs_sample_v1
 from flarestack.shared import (
-    plot_output_dir,
     flux_to_k,
-    make_analysis_pickle,
     k_to_flux,
+    make_analysis_pickle,
+    plot_output_dir,
 )
-
-from flarestack.data.icecube import diffuse_8_year, diffuse_10_year
 from flarestack.utils.catalogue_loader import load_catalogue
-from flarestack.analyses.agn_cores.shared_agncores import (
-    agn_subset_catalogue,
-    complete_cats_north,
-    complete_cats_north,
-    agn_catalogue_name,
-    agn_subset_catalogue_north,
-)
-from flarestack.core.minimisation import MinimisationHandler
-
-from flarestack.cluster import analyse, wait_for_cluster
-import math
-import matplotlib.pyplot as plt
-from matplotlib.ticker import ScalarFormatter
-
-import matplotlib.pyplot as plt
 
 # plt.style.use('~/scratch/phdthesis.mpltstyle')
 
-import time
-
-import logging
-
-import os
-import psutil, resource  # to get memory usage info
 
 analyses = dict()
 
diff --git a/flarestack/analyses/agn_cores/scripts_for_unblinding/energy_range/calculate_energy_range_upper.py b/flarestack/analyses/agn_cores/scripts_for_unblinding/energy_range/calculate_energy_range_upper.py
index c8faa963..e7b1534f 100644
--- a/flarestack/analyses/agn_cores/scripts_for_unblinding/energy_range/calculate_energy_range_upper.py
+++ b/flarestack/analyses/agn_cores/scripts_for_unblinding/energy_range/calculate_energy_range_upper.py
@@ -1,48 +1,45 @@
 """Script to reproduce the sensitivity curves as a function of the maximum energy of the injected neutrinos,
 using 100 sources of the radio-selected AGN sample.
 """
-from __future__ import print_function
-from __future__ import division
+
+from __future__ import division, print_function
+
+import logging
+import math
+import os
+import resource
+import time
+
+import matplotlib.pyplot as plt
 import numpy as np
+import psutil  # to get memory usage info
+from matplotlib.ticker import ScalarFormatter
+
+from flarestack.analyses.agn_cores.shared_agncores import (
+    agn_catalogue_name,
+    agn_subset_catalogue,
+    agn_subset_catalogue_north,
+    complete_cats_north,
+)
+from flarestack.cluster import analyse, wait_for_cluster
+from flarestack.core.minimisation import MinimisationHandler
 from flarestack.core.results import ResultsHandler
+from flarestack.data.icecube import diffuse_8_year, diffuse_10_year
 
 # # from flarestack.data.icecube.ps_tracks.ps_v002_p01 import ps_7year
 # from flarestack.data.icecube.ps_tracks.ps_v003_p02 import ps_10year
 # from flarestack.data.icecube.northern_tracks.nt_v002_p05 import diffuse_8year
 # from flarestack.data.icecube.gfu.gfu_v002_p01 import txs_sample_v1
 from flarestack.shared import (
-    plot_output_dir,
     flux_to_k,
-    make_analysis_pickle,
     k_to_flux,
+    make_analysis_pickle,
+    plot_output_dir,
 )
-
-from flarestack.data.icecube import diffuse_8_year, diffuse_10_year
 from flarestack.utils.catalogue_loader import load_catalogue
-from flarestack.analyses.agn_cores.shared_agncores import (
-    agn_subset_catalogue,
-    complete_cats_north,
-    complete_cats_north,
-    agn_catalogue_name,
-    agn_subset_catalogue_north,
-)
-from flarestack.core.minimisation import MinimisationHandler
-
-from flarestack.cluster import analyse, wait_for_cluster
-import math
-import matplotlib.pyplot as plt
-from matplotlib.ticker import ScalarFormatter
-
-import matplotlib.pyplot as plt
 
 # plt.style.use('~/scratch/phdthesis.mpltstyle')
 
-import time
-
-import logging
-
-import os
-import psutil, resource  # to get memory usage info
 
 analyses = dict()
 
diff --git a/flarestack/analyses/agn_cores/scripts_for_unblinding/ir_selected_agn_analysis.py b/flarestack/analyses/agn_cores/scripts_for_unblinding/ir_selected_agn_analysis.py
index 521787c0..b0f709b4 100644
--- a/flarestack/analyses/agn_cores/scripts_for_unblinding/ir_selected_agn_analysis.py
+++ b/flarestack/analyses/agn_cores/scripts_for_unblinding/ir_selected_agn_analysis.py
@@ -2,31 +2,32 @@
 as a function of injected spectral index. The analysis is performed for 10 sub-samples of the
 X-ray brightest sources of the total IR-selected AGN sample (total of 32249 sources).
 """
-from __future__ import print_function
-from __future__ import division
+
+from __future__ import division, print_function
+
+import logging
+import os
+import resource
+
 import numpy as np
-from flarestack.data.icecube import diffuse_8_year
-from flarestack.utils.catalogue_loader import load_catalogue
+import psutil  # to get memory usage info
+
 from flarestack.analyses.agn_cores.shared_agncores import (
-    agn_subset_catalogue,
-    complete_cats_north,
-    complete_cats_north,
     agn_catalogue_name,
+    agn_subset_catalogue,
     agn_subset_catalogue_north,
+    complete_cats_north,
 )
+from flarestack.cluster import analyse, wait_for_cluster
 from flarestack.core.minimisation import MinimisationHandler
+from flarestack.data.icecube import diffuse_8_year
 from flarestack.shared import (
-    plot_output_dir,
     flux_to_k,
-    make_analysis_pickle,
     k_to_flux,
+    make_analysis_pickle,
+    plot_output_dir,
 )
-from flarestack.cluster import analyse, wait_for_cluster
-
-import logging
-
-import os
-import psutil, resource  # to get memory usage info
+from flarestack.utils.catalogue_loader import load_catalogue
 
 analyses = dict()
 
@@ -600,9 +601,8 @@ def generate_name(cat_key, n_sources, gamma):
             frame2.set_ylabel("Stacked\nsources")
             frame2.set_yticks([10, 1000, 10000])
 
-            from matplotlib.ticker import AutoMinorLocator
-            from matplotlib.ticker import StrMethodFormatter
             from matplotlib import ticker
+            from matplotlib.ticker import AutoMinorLocator, StrMethodFormatter
 
             minorLocator = AutoMinorLocator()
             # frame2.xaxis.set_minor_locator(minorLocator)
@@ -728,9 +728,8 @@ def generate_name(cat_key, n_sources, gamma):
         frame2.set_yticks([10, 1000, 10000])
         frame2.set_ylabel("Stacked\nsources")
 
-        from matplotlib.ticker import AutoMinorLocator
-        from matplotlib.ticker import StrMethodFormatter
         from matplotlib import ticker
+        from matplotlib.ticker import AutoMinorLocator, StrMethodFormatter
 
         minorLocator = AutoMinorLocator()
         # frame2.xaxis.set_minor_locator(minorLocator)
diff --git a/flarestack/analyses/agn_cores/scripts_for_unblinding/llagn_analysis.py b/flarestack/analyses/agn_cores/scripts_for_unblinding/llagn_analysis.py
index edc2bbfa..494887e3 100644
--- a/flarestack/analyses/agn_cores/scripts_for_unblinding/llagn_analysis.py
+++ b/flarestack/analyses/agn_cores/scripts_for_unblinding/llagn_analysis.py
@@ -3,35 +3,32 @@
 X-ray brightest sources of the total LLAGN sample (total of 15887 sources).
 """
 
-from __future__ import print_function
-from __future__ import division
+from __future__ import division, print_function
+
+import logging
+
+import matplotlib.pyplot as plt
 import numpy as np
-from flarestack.core.results import ResultsHandler
-from flarestack.shared import (
-    plot_output_dir,
-    flux_to_k,
-    make_analysis_pickle,
-    k_to_flux,
-)
+from matplotlib.ticker import ScalarFormatter
 
-from flarestack.data.icecube import diffuse_8_year
-from flarestack.utils.catalogue_loader import load_catalogue
 from flarestack.analyses.agn_cores.shared_agncores import (
-    agn_subset_catalogue,
-    complete_cats,
     agn_catalogue_name,
+    agn_subset_catalogue,
     agn_subset_catalogue_north,
+    complete_cats,
     complete_cats_north,
 )
-from flarestack.core.minimisation import MinimisationHandler
-
 from flarestack.cluster import analyse, wait_for_cluster
-from matplotlib.ticker import ScalarFormatter
-
-import matplotlib.pyplot as plt
-
-import logging
-
+from flarestack.core.minimisation import MinimisationHandler
+from flarestack.core.results import ResultsHandler
+from flarestack.data.icecube import diffuse_8_year
+from flarestack.shared import (
+    flux_to_k,
+    k_to_flux,
+    make_analysis_pickle,
+    plot_output_dir,
+)
+from flarestack.utils.catalogue_loader import load_catalogue
 
 analyses = dict()
 
@@ -605,9 +602,8 @@ def generate_name(cat_key, n_sources, gamma):
             frame2.set_ylabel("Stacked\nsources")
             frame2.set_yticks([10, 1000, 10000])
 
-            from matplotlib.ticker import AutoMinorLocator
-            from matplotlib.ticker import StrMethodFormatter
             from matplotlib import ticker
+            from matplotlib.ticker import AutoMinorLocator, StrMethodFormatter
 
             minorLocator = AutoMinorLocator()
             # frame2.xaxis.set_minor_locator(minorLocator)
@@ -733,9 +729,8 @@ def generate_name(cat_key, n_sources, gamma):
         frame2.set_yticks([10, 1000, 10000])
         frame2.set_ylabel("Stacked\nsources")
 
-        from matplotlib.ticker import AutoMinorLocator
-        from matplotlib.ticker import StrMethodFormatter
         from matplotlib import ticker
+        from matplotlib.ticker import AutoMinorLocator, StrMethodFormatter
 
         minorLocator = AutoMinorLocator()
         # frame2.xaxis.set_minor_locator(minorLocator)
diff --git a/flarestack/analyses/agn_cores/scripts_for_unblinding/radio_selected_agn_analysis.py b/flarestack/analyses/agn_cores/scripts_for_unblinding/radio_selected_agn_analysis.py
index 3dcd7ea7..5cbc30b3 100644
--- a/flarestack/analyses/agn_cores/scripts_for_unblinding/radio_selected_agn_analysis.py
+++ b/flarestack/analyses/agn_cores/scripts_for_unblinding/radio_selected_agn_analysis.py
@@ -3,33 +3,31 @@
 X-ray brightest sources of the total Radio-selected AGN sample (total of 9749 sources).
 """
 
-from __future__ import print_function
-from __future__ import division
+from __future__ import division, print_function
+
+import logging
+
+import matplotlib.pyplot as plt
 import numpy as np
-from flarestack.core.results import ResultsHandler
-from flarestack.data.icecube import diffuse_8_year
-from flarestack.utils.catalogue_loader import load_catalogue
+from matplotlib.ticker import ScalarFormatter
+
 from flarestack.analyses.agn_cores.shared_agncores import (
-    agn_subset_catalogue,
-    complete_cats_north,
-    complete_cats_north,
     agn_catalogue_name,
+    agn_subset_catalogue,
     agn_subset_catalogue_north,
+    complete_cats_north,
 )
-from flarestack.core.minimisation import MinimisationHandler
 from flarestack.cluster import analyse, wait_for_cluster
+from flarestack.core.minimisation import MinimisationHandler
+from flarestack.core.results import ResultsHandler
+from flarestack.data.icecube import diffuse_8_year
 from flarestack.shared import (
-    plot_output_dir,
     flux_to_k,
-    make_analysis_pickle,
     k_to_flux,
+    make_analysis_pickle,
+    plot_output_dir,
 )
-
-
-import logging
-import matplotlib.pyplot as plt
-from matplotlib.ticker import ScalarFormatter
-
+from flarestack.utils.catalogue_loader import load_catalogue
 
 analyses = dict()
 
@@ -603,9 +601,8 @@ def generate_name(cat_key, n_sources, gamma):
             frame2.set_ylabel("Stacked\nsources")
             frame2.set_yticks([10, 1000, 10000])
 
-            from matplotlib.ticker import AutoMinorLocator
-            from matplotlib.ticker import StrMethodFormatter
             from matplotlib import ticker
+            from matplotlib.ticker import AutoMinorLocator, StrMethodFormatter
 
             minorLocator = AutoMinorLocator()
             # frame2.xaxis.set_minor_locator(minorLocator)
@@ -731,9 +728,8 @@ def generate_name(cat_key, n_sources, gamma):
         frame2.set_yticks([10, 1000, 10000])
         frame2.set_ylabel("Stacked\nsources")
 
-        from matplotlib.ticker import AutoMinorLocator
-        from matplotlib.ticker import StrMethodFormatter
         from matplotlib import ticker
+        from matplotlib.ticker import AutoMinorLocator, StrMethodFormatter
 
         minorLocator = AutoMinorLocator()
         # frame2.xaxis.set_minor_locator(minorLocator)
diff --git a/flarestack/analyses/agn_cores/scripts_for_unblinding/unblind_integral_ir_selected_agn.py b/flarestack/analyses/agn_cores/scripts_for_unblinding/unblind_integral_ir_selected_agn.py
index c212aa90..a0773026 100644
--- a/flarestack/analyses/agn_cores/scripts_for_unblinding/unblind_integral_ir_selected_agn.py
+++ b/flarestack/analyses/agn_cores/scripts_for_unblinding/unblind_integral_ir_selected_agn.py
@@ -3,23 +3,21 @@
 Produces relevant post-unblinding plots.
 """
 
-from __future__ import print_function
-from __future__ import division
+from __future__ import division, print_function
+
+import logging
+
 import numpy as np
-from flarestack.data.icecube import diffuse_8_year
-from flarestack.utils.catalogue_loader import load_catalogue
+
 from flarestack.analyses.agn_cores.shared_agncores import (
-    agn_subset_catalogue,
-    complete_cats_north,
-    complete_cats_north,
     agn_catalogue_name,
+    agn_subset_catalogue,
     agn_subset_catalogue_north,
+    complete_cats_north,
 )
 from flarestack.core.unblinding import create_unblinder
-
-
-import logging
-
+from flarestack.data.icecube import diffuse_8_year
+from flarestack.utils.catalogue_loader import load_catalogue
 
 logging.getLogger().setLevel("INFO")
 
diff --git a/flarestack/analyses/agn_cores/scripts_for_unblinding/unblind_integral_llagn.py b/flarestack/analyses/agn_cores/scripts_for_unblinding/unblind_integral_llagn.py
index 9f966f86..90f3fd7a 100644
--- a/flarestack/analyses/agn_cores/scripts_for_unblinding/unblind_integral_llagn.py
+++ b/flarestack/analyses/agn_cores/scripts_for_unblinding/unblind_integral_llagn.py
@@ -3,23 +3,21 @@
 Produces relevant post-unblinding plots.
 """
 
-from __future__ import print_function
-from __future__ import division
+from __future__ import division, print_function
+
+import logging
+
 import numpy as np
-from flarestack.data.icecube import diffuse_8_year
-from flarestack.utils.catalogue_loader import load_catalogue
+
 from flarestack.analyses.agn_cores.shared_agncores import (
-    agn_subset_catalogue,
-    complete_cats_north,
-    complete_cats_north,
     agn_catalogue_name,
+    agn_subset_catalogue,
     agn_subset_catalogue_north,
+    complete_cats_north,
 )
 from flarestack.core.unblinding import create_unblinder
-
-
-import logging
-
+from flarestack.data.icecube import diffuse_8_year
+from flarestack.utils.catalogue_loader import load_catalogue
 
 logging.getLogger().setLevel("INFO")
 
diff --git a/flarestack/analyses/agn_cores/scripts_for_unblinding/unblind_integral_radio_selected_agn.py b/flarestack/analyses/agn_cores/scripts_for_unblinding/unblind_integral_radio_selected_agn.py
index 05b9a5b2..d44fbd55 100644
--- a/flarestack/analyses/agn_cores/scripts_for_unblinding/unblind_integral_radio_selected_agn.py
+++ b/flarestack/analyses/agn_cores/scripts_for_unblinding/unblind_integral_radio_selected_agn.py
@@ -2,23 +2,22 @@
 generated by radio_selected_agn_analysis.py, in order to quantify the significance of the result.
 Produces relevant post-unblinding plots.
 """
-from __future__ import print_function
-from __future__ import division
+
+from __future__ import division, print_function
+
+import logging
+
 import numpy as np
-from flarestack.data.icecube import diffuse_8_year
-from flarestack.utils.catalogue_loader import load_catalogue
+
 from flarestack.analyses.agn_cores.shared_agncores import (
-    agn_subset_catalogue,
-    complete_cats_north,
-    complete_cats_north,
     agn_catalogue_name,
+    agn_subset_catalogue,
     agn_subset_catalogue_north,
+    complete_cats_north,
 )
 from flarestack.core.unblinding import create_unblinder
-
-
-import logging
-
+from flarestack.data.icecube import diffuse_8_year
+from flarestack.utils.catalogue_loader import load_catalogue
 
 logging.getLogger().setLevel("INFO")
 
diff --git a/flarestack/analyses/agn_cores/shared_agncores.py b/flarestack/analyses/agn_cores/shared_agncores.py
index dc2ba152..ff42d58d 100644
--- a/flarestack/analyses/agn_cores/shared_agncores.py
+++ b/flarestack/analyses/agn_cores/shared_agncores.py
@@ -1,8 +1,11 @@
 from __future__ import print_function
-from builtins import zip
+
 import os
+from builtins import zip
+
 import numpy as np
-from flarestack.shared import plot_output_dir, catalogue_dir
+
+from flarestack.shared import catalogue_dir, plot_output_dir
 from flarestack.utils.catalogue_loader import load_catalogue
 
 agncores_dir = os.path.abspath(os.path.dirname(__file__))
@@ -180,8 +183,8 @@ def create_random_src(min_distance=10, nr_sources=100):
 
     import astropy.coordinates as coord
     import astropy.units as u
-    from astropy.coordinates import SkyCoord
     import numpy as np
+    from astropy.coordinates import SkyCoord
 
     min_distance = min_distance * u.deg
     print(
@@ -241,12 +244,12 @@ def plot_catalogue(
     :return: mollewied plot in equatorial coordinates
     """
 
-    import numpy as np
     import astropy.coordinates as coord
     import astropy.units as u
     import matplotlib.pyplot as plt
-    from matplotlib.pyplot import cm
+    import numpy as np
     from matplotlib.colors import LogNorm
+    from matplotlib.pyplot import cm
 
     if radians:
         src_ra = np.rad2deg(src_ra)
diff --git a/flarestack/analyses/agn_cores/test_analysis.py b/flarestack/analyses/agn_cores/test_analysis.py
index ca76b651..5d3e2ab4 100644
--- a/flarestack/analyses/agn_cores/test_analysis.py
+++ b/flarestack/analyses/agn_cores/test_analysis.py
@@ -1,14 +1,17 @@
 from __future__ import print_function
+
 import unittest
+
 import numpy as np
+
+from flarestack.analyses.agn_cores.shared_agncores import agn_catalogue_name
+from flarestack.analyses.tde.shared_TDE import tde_catalogue_name
+from flarestack.core.minimisation import MinimisationHandler
+from flarestack.core.results import ResultsHandler
 from flarestack.data.icecube.ps_tracks.ps_v002_p01 import ps_7year
+from flarestack.shared import flux_to_k, fs_scratch_dir
 from flarestack.utils.prepare_catalogue import ps_catalogue_name
-from flarestack.core.minimisation import MinimisationHandler
-from flarestack.shared import fs_scratch_dir, flux_to_k
 from flarestack.utils.reference_sensitivity import reference_sensitivity
-from flarestack.analyses.tde.shared_TDE import tde_catalogue_name
-from flarestack.core.results import ResultsHandler
-from flarestack.analyses.agn_cores.shared_agncores import agn_catalogue_name
 
 # Initialise Injectors/LLHs
 
diff --git a/flarestack/analyses/agn_cores/test_analysis_random.py b/flarestack/analyses/agn_cores/test_analysis_random.py
index a6194e4d..bf1d4893 100644
--- a/flarestack/analyses/agn_cores/test_analysis_random.py
+++ b/flarestack/analyses/agn_cores/test_analysis_random.py
@@ -1,16 +1,17 @@
 import unittest
+
 import numpy as np
-from flarestack.data.icecube.ps_tracks.ps_v002_p01 import ps_7year
+
+from flarestack.analyses.agn_cores.shared_agncores import agn_catalogue_name
+from flarestack.analyses.tde.shared_TDE import tde_catalogue_name
+from flarestack.cluster import run_desy_cluster as rd
+from flarestack.core.minimisation import MinimisationHandler
+from flarestack.core.results import ResultsHandler
 from flarestack.data.icecube.gfu.gfu_v002_p01 import gfu_v002_p01
+from flarestack.data.icecube.ps_tracks.ps_v002_p01 import ps_7year
+from flarestack.shared import flux_to_k, fs_scratch_dir, make_analysis_pickle
 from flarestack.utils.prepare_catalogue import ps_catalogue_name
-from flarestack.core.minimisation import MinimisationHandler
-from flarestack.shared import fs_scratch_dir, flux_to_k, make_analysis_pickle
 from flarestack.utils.reference_sensitivity import reference_sensitivity
-from flarestack.analyses.tde.shared_TDE import tde_catalogue_name
-from flarestack.core.results import ResultsHandler
-from flarestack.analyses.agn_cores.shared_agncores import agn_catalogue_name
-
-from flarestack.cluster import run_desy_cluster as rd
 
 # Initialise Injectors/LLHs
 
diff --git a/flarestack/analyses/agn_cores/test_completeness.py b/flarestack/analyses/agn_cores/test_completeness.py
index 08093065..aba65ae4 100644
--- a/flarestack/analyses/agn_cores/test_completeness.py
+++ b/flarestack/analyses/agn_cores/test_completeness.py
@@ -3,33 +3,33 @@
 Sensitivities are given as the total integrated fluence across all sources,
 and as the corresponding standard-candle-luminosity.
 """
-from __future__ import print_function
-from __future__ import division
+
+from __future__ import division, print_function
+
+import math
+
+import matplotlib.pyplot as plt
 import numpy as np
+from matplotlib.ticker import ScalarFormatter
+
+from flarestack.analyses.agn_cores.shared_agncores import (
+    agn_catalogue_name,
+    agn_subset_catalogue,
+    complete_cats,
+)
+from flarestack.cluster import analyse
+from flarestack.core.minimisation import MinimisationHandler
 from flarestack.core.results import ResultsHandler
+from flarestack.data.icecube.gfu.gfu_v002_p01 import txs_sample_v1
 from flarestack.data.icecube.ps_tracks.ps_v002_p01 import ps_7year
 from flarestack.data.icecube.ps_tracks.ps_v003_p02 import ps_10year
-from flarestack.data.icecube.gfu.gfu_v002_p01 import txs_sample_v1
 from flarestack.shared import (
-    plot_output_dir,
     flux_to_k,
-    make_analysis_pickle,
     k_to_flux,
+    make_analysis_pickle,
+    plot_output_dir,
 )
 from flarestack.utils.catalogue_loader import load_catalogue
-from flarestack.analyses.agn_cores.shared_agncores import (
-    agn_subset_catalogue,
-    complete_cats,
-    agn_catalogue_name,
-)
-from flarestack.core.minimisation import MinimisationHandler
-
-from flarestack.cluster import analyse
-import math
-import matplotlib.pyplot as plt
-from matplotlib.ticker import ScalarFormatter
-
-import matplotlib.pyplot as plt
 
 plt.style.use("~/scratch/phdthesis.mpltstyle")
 
diff --git a/flarestack/analyses/angular_error_floor/check_bias.py b/flarestack/analyses/angular_error_floor/check_bias.py
index 4310287b..0c5fedca 100644
--- a/flarestack/analyses/angular_error_floor/check_bias.py
+++ b/flarestack/analyses/angular_error_floor/check_bias.py
@@ -1,10 +1,11 @@
 from builtins import str
-from flarestack.data.icecube.ps_tracks.ps_v002_p01 import IC86_1_dict
-from flarestack.core.minimisation import MinimisationHandler
-from flarestack.shared import fs_scratch_dir, flux_to_k
-from flarestack.icecube_utils.reference_sensitivity import reference_sensitivity
+
 from flarestack.analyses.tde.shared_TDE import tde_catalogue_name
+from flarestack.core.minimisation import MinimisationHandler
 from flarestack.core.results import ResultsHandler
+from flarestack.data.icecube.ps_tracks.ps_v002_p01 import IC86_1_dict
+from flarestack.icecube_utils.reference_sensitivity import reference_sensitivity
+from flarestack.shared import flux_to_k, fs_scratch_dir
 
 # Initialise Injectors/LLHs
 
diff --git a/flarestack/analyses/angular_error_floor/compare_dpc.py b/flarestack/analyses/angular_error_floor/compare_dpc.py
index cd34a779..78e767eb 100644
--- a/flarestack/analyses/angular_error_floor/compare_dpc.py
+++ b/flarestack/analyses/angular_error_floor/compare_dpc.py
@@ -1,20 +1,22 @@
-from __future__ import print_function
-from __future__ import division
+from __future__ import division, print_function
+
 from builtins import str
-from flarestack.utils.prepare_catalogue import ps_catalogue_name
-from flarestack.data.icecube.ps_tracks.ps_v002_p01 import IC86_1_dict
+
+import matplotlib.pyplot as plt
+import numpy as np
+
+from flarestack.cluster import run_desy_cluster as rd
 from flarestack.core.minimisation import MinimisationHandler
 from flarestack.core.results import ResultsHandler
-from flarestack.cluster import run_desy_cluster as rd
+from flarestack.data.icecube.ps_tracks.ps_v002_p01 import IC86_1_dict
+from flarestack.icecube_utils.reference_sensitivity import reference_sensitivity
 from flarestack.shared import (
     flux_to_k,
+    make_analysis_pickle,
     plot_output_dir,
     scale_shortener,
-    make_analysis_pickle,
 )
-from flarestack.icecube_utils.reference_sensitivity import reference_sensitivity
-import matplotlib.pyplot as plt
-import numpy as np
+from flarestack.utils.prepare_catalogue import ps_catalogue_name
 
 all_res = dict()
 
diff --git a/flarestack/analyses/angular_error_floor/compare_feature.py b/flarestack/analyses/angular_error_floor/compare_feature.py
index 82583dc0..89fbb699 100644
--- a/flarestack/analyses/angular_error_floor/compare_feature.py
+++ b/flarestack/analyses/angular_error_floor/compare_feature.py
@@ -1,14 +1,16 @@
-from __future__ import print_function
-from __future__ import division
+from __future__ import division, print_function
+
 from builtins import str
-from flarestack.utils.prepare_catalogue import ps_catalogue_name
-from flarestack.data.icecube.ps_tracks.ps_v002_p01 import IC86_1_dict
-from flarestack.core.results import ResultsHandler
-from flarestack.cluster import run_desy_cluster as rd
-from flarestack.shared import plot_output_dir, scale_shortener, make_analysis_pickle
+
 import matplotlib.pyplot as plt
 import numpy as np
 
+from flarestack.cluster import run_desy_cluster as rd
+from flarestack.core.results import ResultsHandler
+from flarestack.data.icecube.ps_tracks.ps_v002_p01 import IC86_1_dict
+from flarestack.shared import make_analysis_pickle, plot_output_dir, scale_shortener
+from flarestack.utils.prepare_catalogue import ps_catalogue_name
+
 all_res = dict()
 
 basename = "analyses/angular_error_floor/compare_feature/"
diff --git a/flarestack/analyses/angular_error_floor/compare_seasons.py b/flarestack/analyses/angular_error_floor/compare_seasons.py
index 4de37d4b..0321d694 100644
--- a/flarestack/analyses/angular_error_floor/compare_seasons.py
+++ b/flarestack/analyses/angular_error_floor/compare_seasons.py
@@ -1,14 +1,16 @@
-from __future__ import print_function
-from __future__ import division
+from __future__ import division, print_function
+
 from builtins import str
-from flarestack.utils.prepare_catalogue import ps_catalogue_name
-from flarestack.data.icecube.ps_tracks.ps_v002_p01 import IC86_1_dict, IC86_234_dict
-from flarestack.core.results import ResultsHandler
-from flarestack.cluster import run_desy_cluster as rd
-from flarestack.shared import plot_output_dir, scale_shortener, make_analysis_pickle
+
 import matplotlib.pyplot as plt
 import numpy as np
 
+from flarestack.cluster import run_desy_cluster as rd
+from flarestack.core.results import ResultsHandler
+from flarestack.data.icecube.ps_tracks.ps_v002_p01 import IC86_1_dict, IC86_234_dict
+from flarestack.shared import make_analysis_pickle, plot_output_dir, scale_shortener
+from flarestack.utils.prepare_catalogue import ps_catalogue_name
+
 seasons = [IC86_1_dict, IC86_234_dict]
 
 all_res = dict()
diff --git a/flarestack/analyses/angular_error_floor/plot_bias.py b/flarestack/analyses/angular_error_floor/plot_bias.py
index be160e7c..fc8352f0 100644
--- a/flarestack/analyses/angular_error_floor/plot_bias.py
+++ b/flarestack/analyses/angular_error_floor/plot_bias.py
@@ -1,15 +1,15 @@
-from __future__ import print_function
-from __future__ import division
-from builtins import input
-from builtins import str
-from builtins import range
+from __future__ import division, print_function
+
 import os
-import numpy as np
+from builtins import input, range, str
+
 import matplotlib.pyplot as plt
+import numpy as np
+
+from flarestack.core.astro import angular_distance
 from flarestack.data.icecube.gfu.gfu_v002_p01 import txs_sample_v1
-from flarestack.shared import plot_output_dir
 from flarestack.icecube_utils.dataset_loader import data_loader
-from flarestack.core.astro import angular_distance
+from flarestack.shared import plot_output_dir
 
 basedir = plot_output_dir("analyses/angular_error_floor/plots/")
 
diff --git a/flarestack/analyses/angular_error_floor/test_dynamic_pull_correction.py b/flarestack/analyses/angular_error_floor/test_dynamic_pull_correction.py
index 73522f60..e289b251 100644
--- a/flarestack/analyses/angular_error_floor/test_dynamic_pull_correction.py
+++ b/flarestack/analyses/angular_error_floor/test_dynamic_pull_correction.py
@@ -1,15 +1,17 @@
 from __future__ import division
-from builtins import str
-from builtins import range
+
 import os
-import numpy as np
+from builtins import range, str
+
 import matplotlib.pyplot as plt
+import numpy as np
+from numpy.lib.recfunctions import append_fields
+
+from flarestack.core.astro import angular_distance
 from flarestack.data.icecube.ps_tracks.ps_v002_p01 import IC86_1_dict
 from flarestack.data.icecube.ps_tracks.ps_v003_p01 import IC86_234567_dict
-from flarestack.shared import plot_output_dir
 from flarestack.icecube_utils.dataset_loader import data_loader
-from flarestack.core.astro import angular_distance
-from numpy.lib.recfunctions import append_fields
+from flarestack.shared import plot_output_dir
 
 basedir = plot_output_dir("analyses/angular_error_floor/dynamic_pull_corrections/")
 
diff --git a/flarestack/analyses/benchmarks/benchmark_blazar_flare_search.py b/flarestack/analyses/benchmarks/benchmark_blazar_flare_search.py
index 2a289ecb..d16873b4 100644
--- a/flarestack/analyses/benchmarks/benchmark_blazar_flare_search.py
+++ b/flarestack/analyses/benchmarks/benchmark_blazar_flare_search.py
@@ -5,23 +5,26 @@
 The script can be used to verify that the flare search method, as implemented
 here, is capable of matching previous flare search methods.
 """
-from __future__ import print_function
-from __future__ import division
+
+from __future__ import division, print_function
+
 from builtins import str
+
+import matplotlib.pyplot as plt
 import numpy as np
+from astropy.coordinates import Distance
+
+from flarestack.cluster import run_desy_cluster as rd
 from flarestack.core.results import ResultsHandler
 from flarestack.data.icecube import gfu_v002_p01
+from flarestack.icecube_utils.reference_sensitivity import reference_sensitivity
 from flarestack.shared import (
-    plot_output_dir,
     flux_to_k,
-    transients_dir,
     make_analysis_pickle,
+    plot_output_dir,
+    transients_dir,
 )
 from flarestack.utils.prepare_catalogue import custom_sources
-from flarestack.icecube_utils.reference_sensitivity import reference_sensitivity
-from flarestack.cluster import run_desy_cluster as rd
-import matplotlib.pyplot as plt
-from astropy.coordinates import Distance
 
 name = "analyses/benchmarks/1ES_blazar_benchmark/"
 
diff --git a/flarestack/analyses/benchmarks/benchmark_point_source_sensitivity_10yr.py b/flarestack/analyses/benchmarks/benchmark_point_source_sensitivity_10yr.py
index fb6543e8..3d398325 100644
--- a/flarestack/analyses/benchmarks/benchmark_point_source_sensitivity_10yr.py
+++ b/flarestack/analyses/benchmarks/benchmark_point_source_sensitivity_10yr.py
@@ -1,15 +1,16 @@
+import logging
+
+import matplotlib.pyplot as plt
 import numpy as np
-from flarestack import ResultsHandler, MinimisationHandler
+
+from flarestack import MinimisationHandler, ResultsHandler, analyse, wait_cluster
 from flarestack.data.icecube import ps_v003_p02
-from flarestack.shared import plot_output_dir, flux_to_k
-from flarestack.utils.prepare_catalogue import ps_catalogue_name
 from flarestack.icecube_utils.reference_sensitivity import (
-    reference_sensitivity,
     reference_discovery_potential,
+    reference_sensitivity,
 )
-import matplotlib.pyplot as plt
-from flarestack import analyse, wait_cluster
-import logging
+from flarestack.shared import flux_to_k, plot_output_dir
+from flarestack.utils.prepare_catalogue import ps_catalogue_name
 
 logging.basicConfig(level=logging.INFO)
 
diff --git a/flarestack/analyses/benchmarks/benchmark_point_source_sensitivity_11yr_NT_KDE+gamma.py b/flarestack/analyses/benchmarks/benchmark_point_source_sensitivity_11yr_NT_KDE+gamma.py
index 068011ab..627a56fe 100644
--- a/flarestack/analyses/benchmarks/benchmark_point_source_sensitivity_11yr_NT_KDE+gamma.py
+++ b/flarestack/analyses/benchmarks/benchmark_point_source_sensitivity_11yr_NT_KDE+gamma.py
@@ -1,16 +1,18 @@
+import logging
+import pickle
+import sys
+
+import matplotlib.pyplot as plt
 import numpy as np
-from flarestack import ResultsHandler, MinimisationHandler
+
+from flarestack import MinimisationHandler, ResultsHandler, analyse, wait_cluster
 from flarestack.data.icecube import nt_v005_p01
-from flarestack.shared import plot_output_dir, flux_to_k
-from flarestack.utils.prepare_catalogue import ps_catalogue_name
 from flarestack.icecube_utils.reference_sensitivity import (
-    reference_sensitivity,
     reference_discovery_potential,
+    reference_sensitivity,
 )
-import matplotlib.pyplot as plt
-from flarestack import analyse, wait_cluster
-import logging
-import sys, pickle
+from flarestack.shared import flux_to_k, plot_output_dir
+from flarestack.utils.prepare_catalogue import ps_catalogue_name
 
 logging.basicConfig(level=logging.INFO)
 
diff --git a/flarestack/analyses/benchmarks/benchmark_point_source_sensitivity_7yr.py b/flarestack/analyses/benchmarks/benchmark_point_source_sensitivity_7yr.py
index 78164589..90c18f04 100644
--- a/flarestack/analyses/benchmarks/benchmark_point_source_sensitivity_7yr.py
+++ b/flarestack/analyses/benchmarks/benchmark_point_source_sensitivity_7yr.py
@@ -1,15 +1,17 @@
+import logging
+
+import matplotlib.pyplot as plt
 import numpy as np
+
+from flarestack import analyse, wait_cluster
 from flarestack.core.results import ResultsHandler
 from flarestack.data.icecube import ps_v002_p01
-from flarestack.shared import plot_output_dir, flux_to_k
-from flarestack.utils.prepare_catalogue import ps_catalogue_name
 from flarestack.icecube_utils.reference_sensitivity import (
-    reference_sensitivity,
     reference_7year_discovery_potential,
+    reference_sensitivity,
 )
-import matplotlib.pyplot as plt
-from flarestack import analyse, wait_cluster
-import logging
+from flarestack.shared import flux_to_k, plot_output_dir
+from flarestack.utils.prepare_catalogue import ps_catalogue_name
 
 logging.getLogger().setLevel("INFO")
 
diff --git a/flarestack/analyses/benchmarks/benchmark_point_source_sensitivity_9yr_NT_KDE.py b/flarestack/analyses/benchmarks/benchmark_point_source_sensitivity_9yr_NT_KDE.py
index b917733d..55d8adf8 100644
--- a/flarestack/analyses/benchmarks/benchmark_point_source_sensitivity_9yr_NT_KDE.py
+++ b/flarestack/analyses/benchmarks/benchmark_point_source_sensitivity_9yr_NT_KDE.py
@@ -1,16 +1,18 @@
+import logging
+import pickle
+import sys
+
+import matplotlib.pyplot as plt
 import numpy as np
-from flarestack import ResultsHandler, MinimisationHandler
+
+from flarestack import MinimisationHandler, ResultsHandler, analyse, wait_cluster
 from flarestack.data.icecube import nt_v005_p00
-from flarestack.shared import plot_output_dir, flux_to_k
-from flarestack.utils.prepare_catalogue import ps_catalogue_name
 from flarestack.icecube_utils.reference_sensitivity import (
-    reference_sensitivity,
     reference_discovery_potential,
+    reference_sensitivity,
 )
-import matplotlib.pyplot as plt
-from flarestack import analyse, wait_cluster
-import logging
-import sys, pickle
+from flarestack.shared import flux_to_k, plot_output_dir
+from flarestack.utils.prepare_catalogue import ps_catalogue_name
 
 logging.basicConfig(level=logging.INFO)
 
diff --git a/flarestack/analyses/benchmarks/benchmark_point_source_sensitivity_IC86_2012_17.py b/flarestack/analyses/benchmarks/benchmark_point_source_sensitivity_IC86_2012_17.py
index 60256b93..5e848daa 100644
--- a/flarestack/analyses/benchmarks/benchmark_point_source_sensitivity_IC86_2012_17.py
+++ b/flarestack/analyses/benchmarks/benchmark_point_source_sensitivity_IC86_2012_17.py
@@ -1,15 +1,17 @@
+import logging
+
+import matplotlib.pyplot as plt
 import numpy as np
+
+from flarestack import analyse, wait_cluster
 from flarestack.core.results import ResultsHandler
 from flarestack.data.icecube import ps_v003_p02
-from flarestack.shared import plot_output_dir, flux_to_k
-from flarestack.utils.prepare_catalogue import ps_catalogue_name
 from flarestack.icecube_utils.reference_sensitivity import (
-    reference_sensitivity,
     reference_7year_discovery_potential,
+    reference_sensitivity,
 )
-import matplotlib.pyplot as plt
-from flarestack import analyse, wait_cluster
-import logging
+from flarestack.shared import flux_to_k, plot_output_dir
+from flarestack.utils.prepare_catalogue import ps_catalogue_name
 
 logging.getLogger().setLevel("INFO")
 
diff --git a/flarestack/analyses/benchmarks/benchmark_unblind_txs_neutrino_flare.py b/flarestack/analyses/benchmarks/benchmark_unblind_txs_neutrino_flare.py
index aafb52d5..c0dc3c79 100644
--- a/flarestack/analyses/benchmarks/benchmark_unblind_txs_neutrino_flare.py
+++ b/flarestack/analyses/benchmarks/benchmark_unblind_txs_neutrino_flare.py
@@ -1,14 +1,15 @@
 """Script to replicate unblinding of the neutrino flare found for the source
 TXS 0506+056, as described in https://arxiv.org/abs/1807.08794.
 """
-from flarestack.core.unblinding import create_unblinder
-from flarestack.data.icecube import txs_sample_v1, ps_v003_p02, nt_v002_p05
+
+from flarestack.analyses.txs_0506_056.load_gao_spectral_models import spline_name
 from flarestack.analyses.txs_0506_056.make_txs_catalogue import (
     txs_cat_path,
     txs_catalogue,
 )
+from flarestack.core.unblinding import create_unblinder
+from flarestack.data.icecube import nt_v002_p05, ps_v003_p02, txs_sample_v1
 from flarestack.utils.custom_dataset import custom_dataset
-from flarestack.analyses.txs_0506_056.load_gao_spectral_models import spline_name
 
 # Initialise Injectors/LLHs
 
diff --git a/flarestack/analyses/ccsn/__init__.py b/flarestack/analyses/ccsn/__init__.py
index 62574636..28370dd2 100644
--- a/flarestack/analyses/ccsn/__init__.py
+++ b/flarestack/analyses/ccsn/__init__.py
@@ -1,4 +1,5 @@
 import logging
+
 import matplotlib.pyplot as plt
 import numpy as np
 
diff --git a/flarestack/analyses/ccsn/necker_2019/box_sensitivity.py b/flarestack/analyses/ccsn/necker_2019/box_sensitivity.py
index d6fd32ce..f6cbbfb4 100644
--- a/flarestack/analyses/ccsn/necker_2019/box_sensitivity.py
+++ b/flarestack/analyses/ccsn/necker_2019/box_sensitivity.py
@@ -1,36 +1,38 @@
-"""Script to calculate the sensitivity and discovery potential for CCSNe.
-"""
+"""Script to calculate the sensitivity and discovery potential for CCSNe."""
+
+import logging
+import math
+import os
+import pickle
+import time
+
+import matplotlib
+
+# matplotlib.use('Agg')
+import matplotlib.pyplot as plt
 import numpy as np
-from flarestack.core.results import ResultsHandler
-from flarestack.data.icecube import ps_v002_p01, ps_v002_p03
-from flarestack.shared import plot_output_dir, flux_to_k
-from flarestack.icecube_utils.reference_sensitivity import reference_sensitivity
-from flarestack.analyses.ccsn.stasik_2017.ccsn_limits import (
-    limits,
-    get_figure_limits,
-    p_vals,
-)
+
+from flarestack.analyses.ccsn import get_sn_color
 from flarestack.analyses.ccsn.necker_2019.ccsn_helpers import (
+    limit_sens,
+    pdf_names,
+    raw_output_dir,
     sn_cats,
-    updated_sn_catalogue_name,
     sn_time_pdfs,
-    raw_output_dir,
-    pdf_names,
-    limit_sens,
+    updated_sn_catalogue_name,
+)
+from flarestack.analyses.ccsn.stasik_2017.ccsn_limits import (
+    get_figure_limits,
+    limits,
+    p_vals,
 )
-from flarestack.analyses.ccsn import get_sn_color
 from flarestack.cluster import analyse
 from flarestack.cluster.run_desy_cluster import wait_for_cluster
-import math
-import pickle
-import matplotlib
-
-# matplotlib.use('Agg')
-import matplotlib.pyplot as plt
+from flarestack.core.results import ResultsHandler
+from flarestack.data.icecube import ps_v002_p01, ps_v002_p03
+from flarestack.icecube_utils.reference_sensitivity import reference_sensitivity
+from flarestack.shared import flux_to_k, plot_output_dir
 from flarestack.utils.custom_dataset import custom_dataset
-import os
-import logging
-import time
 
 # Set Logger Level
 
diff --git a/flarestack/analyses/ccsn/necker_2019/build_catalogues_from_raw.py b/flarestack/analyses/ccsn/necker_2019/build_catalogues_from_raw.py
index e6830640..1cd38281 100644
--- a/flarestack/analyses/ccsn/necker_2019/build_catalogues_from_raw.py
+++ b/flarestack/analyses/ccsn/necker_2019/build_catalogues_from_raw.py
@@ -1,16 +1,17 @@
-import pandas as pd
-import numpy as np
 import logging
+import math
+
+import numpy as np
+import pandas as pd
+
 from flarestack.analyses.ccsn.necker_2019.ccsn_helpers import (
+    conservative_redshift_addition,
+    pdf_names,
     raw_sn_catalogue_name,
-    updated_sn_catalogue_name,
     sn_times,
-    pdf_names,
-    conservative_redshift_addition,
+    updated_sn_catalogue_name,
 )
 from flarestack.analyses.ccsn.stasik_2017.shared_ccsn import sn_catalogue_name
-import math
-
 
 logging.getLogger().setLevel("INFO")
 
@@ -198,9 +199,11 @@ def load_catalogue(sn_type, pdf_name, include_flagged=False, z_add=0):
 
 def keymap(keys, raw_catalogue):
     indices = [
-        np.where(np.array(raw_catalogue.columns) == key)[0][0]
-        if len(np.where(np.array(raw_catalogue.columns) == key)) <= 1
-        else np.where(np.array(raw_catalogue.columns) == key)
+        (
+            np.where(np.array(raw_catalogue.columns) == key)[0][0]
+            if len(np.where(np.array(raw_catalogue.columns) == key)) <= 1
+            else np.where(np.array(raw_catalogue.columns) == key)
+        )
         for key in keys
     ]
 
diff --git a/flarestack/analyses/ccsn/necker_2019/catalogues/plot_difference_between_catalogues.py b/flarestack/analyses/ccsn/necker_2019/catalogues/plot_difference_between_catalogues.py
index 36be50e6..6b1aa3b7 100644
--- a/flarestack/analyses/ccsn/necker_2019/catalogues/plot_difference_between_catalogues.py
+++ b/flarestack/analyses/ccsn/necker_2019/catalogues/plot_difference_between_catalogues.py
@@ -1,19 +1,22 @@
-import matplotlib, os
+import os
+
+import matplotlib
 
 matplotlib.use("Agg")
+import logging
+
 import matplotlib.pyplot as plt
 import numpy as np
+
 from flarestack.analyses.ccsn.necker_2019.ccsn_helpers import (
-    updated_sn_catalogue_name,
-    sn_cats,
-    sn_times,
     pdf_names,
     raw_output_dir,
+    sn_cats,
+    sn_times,
+    updated_sn_catalogue_name,
 )
-import logging
 from flarestack.shared import plot_output_dir
 
-
 plot_dir = plot_output_dir(
     raw_output_dir + "/catalogue_visualization/difference_stasik/"
 )
diff --git a/flarestack/analyses/ccsn/necker_2019/ccsn_helpers.py b/flarestack/analyses/ccsn/necker_2019/ccsn_helpers.py
index c3335581..5bd17056 100644
--- a/flarestack/analyses/ccsn/necker_2019/ccsn_helpers.py
+++ b/flarestack/analyses/ccsn/necker_2019/ccsn_helpers.py
@@ -1,10 +1,11 @@
-import os
 import logging
+import os
+
 from astropy import units as u
-from flarestack.shared import limits_dir, limit_output_path
-from flarestack.cosmo.neutrino_cosmology import define_cosmology_functions
-from flarestack.core.energy_pdf import EnergyPDF
 
+from flarestack.core.energy_pdf import EnergyPDF
+from flarestack.cosmo.neutrino_cosmology import define_cosmology_functions
+from flarestack.shared import limit_output_path, limits_dir
 
 raw_output_dir = "analyses/ccsn/necker_2019"
 
diff --git a/flarestack/analyses/ccsn/necker_2019/decay_sensitivity.py b/flarestack/analyses/ccsn/necker_2019/decay_sensitivity.py
index 363cca15..952a2da9 100644
--- a/flarestack/analyses/ccsn/necker_2019/decay_sensitivity.py
+++ b/flarestack/analyses/ccsn/necker_2019/decay_sensitivity.py
@@ -1,38 +1,40 @@
-"""Script to calculate the sensitivity and discovery potential for CCSNe.
-"""
+"""Script to calculate the sensitivity and discovery potential for CCSNe."""
+
+import logging
+import math
+import os
+import pickle
+import time
+
+import matplotlib
+
+# matplotlib.use('Agg')
+import matplotlib.pyplot as plt
 import numpy as np
-from flarestack.core.results import ResultsHandler
-from flarestack.core.experimental_results import ExperimentalResultHandler
-from flarestack.data.icecube import ps_v002_p01, ps_v002_p03
-from flarestack.shared import plot_output_dir, flux_to_k
-from flarestack.icecube_utils.reference_sensitivity import reference_sensitivity
-from flarestack.analyses.ccsn.stasik_2017.ccsn_limits import (
-    limits,
-    get_figure_limits,
-    p_vals,
-)
+
+from flarestack.analyses.ccsn import get_sn_color
 from flarestack.analyses.ccsn.necker_2019.ccsn_helpers import (
+    limit_sens,
+    pdf_names,
+    raw_output_dir,
     sn_cats,
-    updated_sn_catalogue_name,
     sn_time_pdfs,
-    raw_output_dir,
-    pdf_names,
-    limit_sens,
+    updated_sn_catalogue_name,
+)
+from flarestack.analyses.ccsn.stasik_2017.ccsn_limits import (
+    get_figure_limits,
+    limits,
+    p_vals,
 )
-from flarestack.core.time_pdf import TimePDF
-from flarestack.analyses.ccsn import get_sn_color
 from flarestack.cluster import analyse
 from flarestack.cluster.run_desy_cluster import wait_for_cluster
-import math
-import pickle
-import matplotlib
-
-# matplotlib.use('Agg')
-import matplotlib.pyplot as plt
+from flarestack.core.experimental_results import ExperimentalResultHandler
+from flarestack.core.results import ResultsHandler
+from flarestack.core.time_pdf import TimePDF
+from flarestack.data.icecube import ps_v002_p01, ps_v002_p03
+from flarestack.icecube_utils.reference_sensitivity import reference_sensitivity
+from flarestack.shared import flux_to_k, plot_output_dir
 from flarestack.utils.custom_dataset import custom_dataset
-import os
-import logging
-import time
 
 # Set Logger Level
 
diff --git a/flarestack/analyses/ccsn/necker_2019/make_ratio_plots.py b/flarestack/analyses/ccsn/necker_2019/make_ratio_plots.py
index ce86e112..c0da8536 100644
--- a/flarestack/analyses/ccsn/necker_2019/make_ratio_plots.py
+++ b/flarestack/analyses/ccsn/necker_2019/make_ratio_plots.py
@@ -1,23 +1,22 @@
-from flarestack.analyses.ccsn.stasik_2017.shared_ccsn import (
-    limit_sens as stasik_sens_flarestack,
-)
+import logging
+import os
+import pickle
+
+import matplotlib.pyplot as plt
+import numpy as np
+
+from flarestack.analyses.ccsn import get_sn_color
+from flarestack.analyses.ccsn.necker_2019.ccsn_helpers import limit_sens as necker_sens
+from flarestack.analyses.ccsn.necker_2019.ccsn_helpers import raw_output_dir
 from flarestack.analyses.ccsn.stasik_2017.ccsn_limits import (
-    limits,
     get_figure_limits,
+    limits,
     p_vals,
 )
-from flarestack.analyses.ccsn.necker_2019.ccsn_helpers import (
-    limit_sens as necker_sens,
-    raw_output_dir,
+from flarestack.analyses.ccsn.stasik_2017.shared_ccsn import (
+    limit_sens as stasik_sens_flarestack,
 )
-from flarestack.analyses.ccsn import get_sn_color
 from flarestack.shared import plot_output_dir
-import pickle
-import matplotlib.pyplot as plt
-import numpy as np
-import logging
-import os
-
 
 # define output directory
 ratios_plot_dir = plot_output_dir(f"{raw_output_dir}/ratios")
diff --git a/flarestack/analyses/ccsn/necker_2019/plot_sensitivity_fluxes.py b/flarestack/analyses/ccsn/necker_2019/plot_sensitivity_fluxes.py
index b1fb2bd1..2d80ad65 100644
--- a/flarestack/analyses/ccsn/necker_2019/plot_sensitivity_fluxes.py
+++ b/flarestack/analyses/ccsn/necker_2019/plot_sensitivity_fluxes.py
@@ -1,27 +1,29 @@
 """Script to calculate and plot the sensitivity flux from the population of the different SNe types"""
+
+import logging
+import os
+
+# from flarestack.misc.convert_diffuse_flux_contour import contour_95, lower_contour, upper_contour, e_range
+import pickle
+
+import matplotlib.pyplot as plt
 import numpy as np
 from astropy import units as u
 from scipy.integrate import quad
-from flarestack.shared import plot_output_dir
+
+from flarestack.analyses.ccsn import get_sn_color
 from flarestack.analyses.ccsn.necker_2019.ccsn_helpers import (
-    raw_output_dir,
-    limit_sens,
-    sn_times,
     get_population_flux,
+    limit_sens,
     pdf_names,
+    raw_output_dir,
+    sn_times,
 )
 from flarestack.analyses.ccsn.necker_2019.ccsn_rate import get_ccsn_rate_type_function
-from flarestack.analyses.ccsn import get_sn_color
-from flarestack.cosmo.neutrino_cosmology import get_diffuse_flux_at_1GeV
 from flarestack.cosmo import get_diffuse_flux_contour
 from flarestack.cosmo.icecube_diffuse_flux.joint_15 import contour_95, e_range, units
-
-# from flarestack.misc.convert_diffuse_flux_contour import contour_95, lower_contour, upper_contour, e_range
-import pickle
-import matplotlib.pyplot as plt
-import os
-import logging
-
+from flarestack.cosmo.neutrino_cosmology import get_diffuse_flux_at_1GeV
+from flarestack.shared import plot_output_dir
 
 mh_name = "fit_weights"
 energy_range_gev = np.linspace(10**3, 10**7, 10)
diff --git a/flarestack/analyses/ccsn/necker_2019/skylab_crosscheck.py b/flarestack/analyses/ccsn/necker_2019/skylab_crosscheck.py
index 823a447e..50e2de0c 100644
--- a/flarestack/analyses/ccsn/necker_2019/skylab_crosscheck.py
+++ b/flarestack/analyses/ccsn/necker_2019/skylab_crosscheck.py
@@ -1,38 +1,39 @@
+import argparse
+import logging
+import math
+import os
+import pickle
+import time
+
+import matplotlib
+
+# matplotlib.use('Agg')
+import matplotlib.pyplot as plt
 import numpy as np
 from astropy.table import Table
-import argparse
-from flarestack.core.results import ResultsHandler
-from flarestack.data.icecube import ps_v002_p01
-from flarestack.shared import plot_output_dir, flux_to_k
-from flarestack.icecube_utils.reference_sensitivity import reference_sensitivity
-from flarestack.analyses.ccsn.stasik_2017.ccsn_limits import (
-    limits,
-    get_figure_limits,
-    p_vals,
-)
+
+from flarestack.analyses.ccsn import get_sn_color
 from flarestack.analyses.ccsn.necker_2019.ccsn_helpers import (
+    limit_sens,
+    pdf_names,
+    raw_output_dir,
     sn_cats,
-    updated_sn_catalogue_name,
     sn_time_pdfs,
-    raw_output_dir,
-    pdf_names,
-    limit_sens,
+    updated_sn_catalogue_name,
 )
 from flarestack.analyses.ccsn.necker_2019.skylab_crosscheck_data import skylab_data
-from flarestack.analyses.ccsn import get_sn_color
+from flarestack.analyses.ccsn.stasik_2017.ccsn_limits import (
+    get_figure_limits,
+    limits,
+    p_vals,
+)
 from flarestack.cluster import analyse
 from flarestack.cluster.run_desy_cluster import wait_for_cluster
-import math
-import pickle
-import matplotlib
-
-# matplotlib.use('Agg')
-import matplotlib.pyplot as plt
+from flarestack.core.results import ResultsHandler
+from flarestack.data.icecube import ps_v002_p01
+from flarestack.icecube_utils.reference_sensitivity import reference_sensitivity
+from flarestack.shared import flux_to_k, plot_output_dir
 from flarestack.utils.custom_dataset import custom_dataset
-import os
-import logging
-import time
-
 
 parser = argparse.ArgumentParser()
 parser.add_argument("-a", "--analyse", type=bool, default=False)
diff --git a/flarestack/analyses/ccsn/necker_2019/skylab_crosscheck_data/__init__.py b/flarestack/analyses/ccsn/necker_2019/skylab_crosscheck_data/__init__.py
index d899cbac..b2f989c8 100644
--- a/flarestack/analyses/ccsn/necker_2019/skylab_crosscheck_data/__init__.py
+++ b/flarestack/analyses/ccsn/necker_2019/skylab_crosscheck_data/__init__.py
@@ -1,10 +1,10 @@
-import os
-import numpy as np
 import logging
+import os
 from pathlib import Path
 
-from flarestack.shared import host_server
+import numpy as np
 
+from flarestack.shared import host_server
 
 logger = logging.getLogger(__name__)
 # dir_path = os.path.dirname(os.path.realpath(__file__))
diff --git a/flarestack/analyses/ccsn/necker_2019/unblinding_scripts/energy_range/energy_range.py b/flarestack/analyses/ccsn/necker_2019/unblinding_scripts/energy_range/energy_range.py
index efb20f6c..671a010e 100644
--- a/flarestack/analyses/ccsn/necker_2019/unblinding_scripts/energy_range/energy_range.py
+++ b/flarestack/analyses/ccsn/necker_2019/unblinding_scripts/energy_range/energy_range.py
@@ -1,27 +1,34 @@
-"""Script to calculate the sensitivity and discovery potential for CCSNe.
-"""
+"""Script to calculate the sensitivity and discovery potential for CCSNe."""
+
+import logging
+import math
+import os
+import pickle
+import shutil
+import time
+
 import numpy as np
-import math, pickle, os, logging, time, shutil
-from flarestack.core.results import ResultsHandler, OverfluctuationError
+
+from flarestack.analyses.ccsn.necker_2019.ccsn_helpers import (
+    pdf_names,
+    raw_output_dir,
+    sn_cats,
+    sn_time_pdfs,
+    updated_sn_catalogue_name,
+)
+from flarestack.cluster import analyse
+from flarestack.cluster.run_desy_cluster import wait_for_cluster
 from flarestack.core.experimental_results import ExperimentalResultHandler
+from flarestack.core.results import OverfluctuationError, ResultsHandler
 from flarestack.data.icecube import ps_v002_p03
+from flarestack.icecube_utils.reference_sensitivity import reference_sensitivity
 from flarestack.shared import (
     flux_to_k,
+    inj_param_dir,
+    pickle_dir,
     scale_shortener,
     storage_dir,
-    pickle_dir,
-    inj_param_dir,
 )
-from flarestack.icecube_utils.reference_sensitivity import reference_sensitivity
-from flarestack.analyses.ccsn.necker_2019.ccsn_helpers import (
-    sn_cats,
-    updated_sn_catalogue_name,
-    sn_time_pdfs,
-    raw_output_dir,
-    pdf_names,
-)
-from flarestack.cluster import analyse
-from flarestack.cluster.run_desy_cluster import wait_for_cluster
 from flarestack.utils.custom_dataset import custom_dataset
 
 # Set Logger Level
diff --git a/flarestack/analyses/ccsn/necker_2019/unblinding_scripts/p_value_distribution/generate_background_pvalue_distribution_single.py b/flarestack/analyses/ccsn/necker_2019/unblinding_scripts/p_value_distribution/generate_background_pvalue_distribution_single.py
index f9a7a842..4641da35 100644
--- a/flarestack/analyses/ccsn/necker_2019/unblinding_scripts/p_value_distribution/generate_background_pvalue_distribution_single.py
+++ b/flarestack/analyses/ccsn/necker_2019/unblinding_scripts/p_value_distribution/generate_background_pvalue_distribution_single.py
@@ -1,13 +1,17 @@
-import logging, os, pickle, argparse
+import argparse
+import logging
+import os
+import pickle
+
 import numpy as np
 
-from flarestack.shared import analysis_pickle_path, storage_dir
-from flarestack.core.unblinding import create_unblinder
 from flarestack.analyses.ccsn.necker_2019.ccsn_helpers import (
+    raw_output_dir,
     sn_cats,
     sn_time_pdfs,
-    raw_output_dir,
 )
+from flarestack.core.unblinding import create_unblinder
+from flarestack.shared import analysis_pickle_path, storage_dir
 
 # from flarestack.analyses.ccsn.necker_2019.unblinding_scripts.p_value_distribution.generate_background_pvalue_distributions import \
 #     base_raw, gammas, p_value_filename_single
diff --git a/flarestack/analyses/ccsn/necker_2019/unblinding_scripts/p_value_distribution/generate_background_pvalue_distributions.py b/flarestack/analyses/ccsn/necker_2019/unblinding_scripts/p_value_distribution/generate_background_pvalue_distributions.py
index 4d0d5742..4fe7841f 100644
--- a/flarestack/analyses/ccsn/necker_2019/unblinding_scripts/p_value_distribution/generate_background_pvalue_distributions.py
+++ b/flarestack/analyses/ccsn/necker_2019/unblinding_scripts/p_value_distribution/generate_background_pvalue_distributions.py
@@ -1,16 +1,20 @@
-import logging, os, pickle, subprocess, time
+import logging
+import os
+import pickle
+import subprocess
+import time
 from multiprocessing import Pool
+
 from tqdm import tqdm
 
-from flarestack.cluster.submitter import DESYSubmitter
-from flarestack.shared import cluster_dir, log_dir, fs_scratch_dir
 from flarestack.analyses.ccsn.necker_2019.unblinding_scripts.p_value_distribution.generate_background_pvalue_distribution_single import (
-    single_filename,
-    run_background_pvalue_trials,
-    p_value_filename,
     p_value_directory,
+    p_value_filename,
+    run_background_pvalue_trials,
+    single_filename,
 )
-
+from flarestack.cluster.submitter import DESYSubmitter
+from flarestack.shared import cluster_dir, fs_scratch_dir, log_dir
 
 logging.getLogger().setLevel("DEBUG")
 logging.debug("logging level is DEBUG")
@@ -24,7 +28,6 @@
 
 
 class MyPValueSubmitter(DESYSubmitter):
-
     """
     This is a bit hacky. We will subclass the Submitter class and put a different submission script in,
     that no longer runs the MultiProcessor on the cluster but our run_background_pvalue_trials() function.
diff --git a/flarestack/analyses/ccsn/necker_2019/unblinding_scripts/unblind_updated_ccsn.py b/flarestack/analyses/ccsn/necker_2019/unblinding_scripts/unblind_updated_ccsn.py
index d6f9d05c..8fe59f9e 100644
--- a/flarestack/analyses/ccsn/necker_2019/unblinding_scripts/unblind_updated_ccsn.py
+++ b/flarestack/analyses/ccsn/necker_2019/unblinding_scripts/unblind_updated_ccsn.py
@@ -1,15 +1,15 @@
 import numpy as np
-from flarestack.data.icecube.ps_tracks.ps_v002_p01 import ps_v002_p01
+
 from flarestack.analyses.ccsn.necker_2019.ccsn_helpers import (
     sn_cats,
+    sn_time_pdfs,
     sn_times,
     updated_sn_catalogue_name,
-    sn_time_pdfs,
 )
 from flarestack.core.unblinding import create_unblinder
+from flarestack.data.icecube.ps_tracks.ps_v002_p01 import ps_v002_p01
 from flarestack.utils.custom_dataset import custom_dataset
 
-
 name_root = "analyses/ccsn/necker_2019/unblind_ccsn"
 bkg_ts_root = "analyses/ccsn/necker_2019/calculate_sensitivity/fit_weights"
 
diff --git a/flarestack/analyses/ccsn/stasik_2017/calculate_sensitivity_reproduce_stasik.py b/flarestack/analyses/ccsn/stasik_2017/calculate_sensitivity_reproduce_stasik.py
index da02cc55..46a55b30 100644
--- a/flarestack/analyses/ccsn/stasik_2017/calculate_sensitivity_reproduce_stasik.py
+++ b/flarestack/analyses/ccsn/stasik_2017/calculate_sensitivity_reproduce_stasik.py
@@ -1,36 +1,38 @@
-"""Script to calculate the sensitivity and discovery potential for CCSNe.
-"""
+"""Script to calculate the sensitivity and discovery potential for CCSNe."""
+
+import logging
+import math
+import os
+import pickle
+import time
+
+import matplotlib
+
+# matplotlib.use('Agg')
+import matplotlib.pyplot as plt
 import numpy as np
-from flarestack.core.results import ResultsHandler
-from flarestack.data.icecube import ps_v002_p01
-from flarestack.shared import plot_output_dir, flux_to_k
-from flarestack.icecube_utils.reference_sensitivity import reference_sensitivity
+
+from flarestack.analyses.ccsn import get_sn_color
+from flarestack.analyses.ccsn.necker_2019.ccsn_helpers import sn_time_pdfs
+from flarestack.analyses.ccsn.stasik_2017.ccsn_limits import (
+    get_figure_limits,
+    limits,
+    p_vals,
+)
 from flarestack.analyses.ccsn.stasik_2017.shared_ccsn import (
+    limit_sens,
+    pdf_names,
     sn_catalogue_name,
     sn_cats,
     sn_time_pdfs,
-    pdf_names,
-    limit_sens,
 )
-from flarestack.analyses.ccsn.stasik_2017.ccsn_limits import (
-    limits,
-    get_figure_limits,
-    p_vals,
-)
-from flarestack.analyses.ccsn.necker_2019.ccsn_helpers import sn_time_pdfs
-from flarestack.analyses.ccsn import get_sn_color
 from flarestack.cluster import analyse
 from flarestack.cluster.run_desy_cluster import wait_for_cluster
-import math
-import pickle
-import matplotlib
-
-# matplotlib.use('Agg')
-import matplotlib.pyplot as plt
+from flarestack.core.results import ResultsHandler
+from flarestack.data.icecube import ps_v002_p01
+from flarestack.icecube_utils.reference_sensitivity import reference_sensitivity
+from flarestack.shared import flux_to_k, plot_output_dir
 from flarestack.utils.custom_dataset import custom_dataset
-import os
-import logging
-import time
 
 # Set Logger Level
 
diff --git a/flarestack/analyses/ccsn/stasik_2017/calculate_sensitivity_reproduce_stasik_decay.py b/flarestack/analyses/ccsn/stasik_2017/calculate_sensitivity_reproduce_stasik_decay.py
index c8a54ec3..75119145 100644
--- a/flarestack/analyses/ccsn/stasik_2017/calculate_sensitivity_reproduce_stasik_decay.py
+++ b/flarestack/analyses/ccsn/stasik_2017/calculate_sensitivity_reproduce_stasik_decay.py
@@ -1,36 +1,38 @@
-"""Script to calculate the sensitivity and discovery potential for CCSNe.
-"""
+"""Script to calculate the sensitivity and discovery potential for CCSNe."""
+
+import logging
+import math
+import os
+import pickle
+import time
+
+import matplotlib
+
+# matplotlib.use('Agg')
+import matplotlib.pyplot as plt
 import numpy as np
-from flarestack.core.results import ResultsHandler
-from flarestack.data.icecube import ps_v002_p01
-from flarestack.shared import plot_output_dir, flux_to_k
-from flarestack.icecube_utils.reference_sensitivity import reference_sensitivity
+
+from flarestack.analyses.ccsn import get_sn_color
+from flarestack.analyses.ccsn.necker_2019.ccsn_helpers import sn_time_pdfs
+from flarestack.analyses.ccsn.stasik_2017.ccsn_limits import (
+    get_figure_limits,
+    limits,
+    p_vals,
+)
 from flarestack.analyses.ccsn.stasik_2017.shared_ccsn import (
+    limit_sens,
+    pdf_names,
     sn_catalogue_name,
     sn_cats,
     sn_time_pdfs,
-    pdf_names,
-    limit_sens,
 )
-from flarestack.analyses.ccsn.stasik_2017.ccsn_limits import (
-    limits,
-    get_figure_limits,
-    p_vals,
-)
-from flarestack.analyses.ccsn.necker_2019.ccsn_helpers import sn_time_pdfs
-from flarestack.analyses.ccsn import get_sn_color
 from flarestack.cluster import analyse
 from flarestack.cluster.run_desy_cluster import wait_for_cluster
-import math
-import pickle
-import matplotlib
-
-# matplotlib.use('Agg')
-import matplotlib.pyplot as plt
+from flarestack.core.results import ResultsHandler
+from flarestack.data.icecube import ps_v002_p01
+from flarestack.icecube_utils.reference_sensitivity import reference_sensitivity
+from flarestack.shared import flux_to_k, plot_output_dir
 from flarestack.utils.custom_dataset import custom_dataset
-import os
-import logging
-import time
 
 # Set Logger Level
 
diff --git a/flarestack/analyses/ccsn/stasik_2017/catalogues/raw/convert_stasik_to_fs_readable.py b/flarestack/analyses/ccsn/stasik_2017/catalogues/raw/convert_stasik_to_fs_readable.py
index 0bebae2d..858cb260 100644
--- a/flarestack/analyses/ccsn/stasik_2017/catalogues/raw/convert_stasik_to_fs_readable.py
+++ b/flarestack/analyses/ccsn/stasik_2017/catalogues/raw/convert_stasik_to_fs_readable.py
@@ -1,4 +1,5 @@
 import numpy as np
+
 from flarestack.analyses.ccsn.necker_2019.ccsn_helpers import (
     raw_sn_catalogue_name,
     sn_cats,
diff --git a/flarestack/analyses/ccsn/stasik_2017/ccsn_limits.py b/flarestack/analyses/ccsn/stasik_2017/ccsn_limits.py
index 3c27abc3..7a36a4bc 100644
--- a/flarestack/analyses/ccsn/stasik_2017/ccsn_limits.py
+++ b/flarestack/analyses/ccsn/stasik_2017/ccsn_limits.py
@@ -3,11 +3,13 @@
 Two methods were used, both a traditional fixed-weight analysis and a
 fixed-weight analysis.
 """
+
+import numpy as np
 from astropy import units as u
 from astropy.table import Table
-from flarestack.utils.neutrino_astronomy import calculate_astronomy
+
 from flarestack.core.energy_pdf import EnergyPDF
-import numpy as np
+from flarestack.utils.neutrino_astronomy import calculate_astronomy
 
 # Results
 
diff --git a/flarestack/analyses/ccsn/stasik_2017/convert_old_sn_catalogue.py b/flarestack/analyses/ccsn/stasik_2017/convert_old_sn_catalogue.py
index abee13c8..d05b3233 100644
--- a/flarestack/analyses/ccsn/stasik_2017/convert_old_sn_catalogue.py
+++ b/flarestack/analyses/ccsn/stasik_2017/convert_old_sn_catalogue.py
@@ -7,14 +7,17 @@
 remaining 30% weight distributed across many sources. As integer numbers of
 sources are used, the closest percentage to 70% is used for splitting.
 """
+
+import logging
+import os
+
+import numpy as np
+
 from flarestack.analyses.ccsn.stasik_2017.shared_ccsn import (
     raw_cat_dir,
     sn_catalogue_name,
 )
 from flarestack.utils.prepare_catalogue import cat_dtype
-import numpy as np
-import os
-import logging
 
 mask = ["ra", "dec", "distance", "discoverydate_mjd", "name", "weight"]
 new_names = ["ra", "dec", "distance_mpc", "ref_time_mjd", "source_name", "weight"]
diff --git a/flarestack/analyses/ccsn/stasik_2017/estimate_improvement.py b/flarestack/analyses/ccsn/stasik_2017/estimate_improvement.py
index 2880a349..7bcd233c 100644
--- a/flarestack/analyses/ccsn/stasik_2017/estimate_improvement.py
+++ b/flarestack/analyses/ccsn/stasik_2017/estimate_improvement.py
@@ -1,26 +1,27 @@
-"""Script to calculate the sensitivity and discovery potential for CCSNe.
-"""
-import numpy as np
-from flarestack.core.results import ResultsHandler
-from flarestack.data.icecube import ps_v002_p01
-from flarestack.shared import plot_output_dir, flux_to_k
-from flarestack.icecube_utils.reference_sensitivity import reference_sensitivity
-from flarestack.analyses.ccsn.stasik_2017.shared_ccsn import sn_catalogue_name
-from flarestack.analyses.ccsn.stasik_2017.ccsn_limits import limits, get_figure_limits
+"""Script to calculate the sensitivity and discovery potential for CCSNe."""
 
-# from flarestack.analyses.ccsn.stasik_2017.calculate_sensitivity_reproduce_stasik import raw as original_raw
-from flarestack.analyses.ccsn import get_sn_color
-from flarestack.cluster import analyse
-from flarestack.cluster.run_desy_cluster import wait_for_cluster
+import logging
 import math
+import os
+import time
+
 import matplotlib
 
 # matplotlib.use('Agg')
 import matplotlib.pyplot as plt
+import numpy as np
+
+# from flarestack.analyses.ccsn.stasik_2017.calculate_sensitivity_reproduce_stasik import raw as original_raw
+from flarestack.analyses.ccsn import get_sn_color
+from flarestack.analyses.ccsn.stasik_2017.ccsn_limits import get_figure_limits, limits
+from flarestack.analyses.ccsn.stasik_2017.shared_ccsn import sn_catalogue_name
+from flarestack.cluster import analyse
+from flarestack.cluster.run_desy_cluster import wait_for_cluster
+from flarestack.core.results import ResultsHandler
+from flarestack.data.icecube import ps_v002_p01
+from flarestack.icecube_utils.reference_sensitivity import reference_sensitivity
+from flarestack.shared import flux_to_k, plot_output_dir
 from flarestack.utils.custom_dataset import custom_dataset
-import os
-import logging
-import time
 
 # Set Logger Level
 
diff --git a/flarestack/analyses/ccsn/stasik_2017/shared_ccsn.py b/flarestack/analyses/ccsn/stasik_2017/shared_ccsn.py
index 51fcb09d..77370db8 100644
--- a/flarestack/analyses/ccsn/stasik_2017/shared_ccsn.py
+++ b/flarestack/analyses/ccsn/stasik_2017/shared_ccsn.py
@@ -1,12 +1,15 @@
 from __future__ import print_function
-import os
+
 import logging
-import numpy as np
+import os
 import pickle as Pickle
-from scipy.interpolate import interp1d
-from flarestack.shared import limit_output_path, limits_dir
+
+import numpy as np
 from astropy import units as u
 from astropy.table import Table
+from scipy.interpolate import interp1d
+
+from flarestack.shared import limit_output_path, limits_dir
 
 ccsn_dir = os.path.abspath(os.path.dirname(__file__))
 ccsn_cat_dir = ccsn_dir + "/catalogues/"
diff --git a/flarestack/analyses/ccsn/stasik_2017/sn_cosmology.py b/flarestack/analyses/ccsn/stasik_2017/sn_cosmology.py
index 3dc97efc..6e9b20ec 100644
--- a/flarestack/analyses/ccsn/stasik_2017/sn_cosmology.py
+++ b/flarestack/analyses/ccsn/stasik_2017/sn_cosmology.py
@@ -1,26 +1,29 @@
 from __future__ import division
+
+import os
 from builtins import str
-from flarestack.utils.neutrino_cosmology import (
-    calculate_transient_cosmology,
-    sfr_madau,
-    sfr_clash_candels,
-    get_diffuse_flux_at_1GeV,
-)
+
+import matplotlib.pyplot as plt
+import numpy as np
+from astropy.cosmology import Planck15 as cosmo
+
 from flarestack.analyses.ccsn.stasik_2017.ccsn_limits import limits
 from flarestack.core.energy_pdf import EnergyPDF
-from astropy.cosmology import Planck15 as cosmo
-import numpy as np
-from flarestack.cosmo.icecube_diffuse_flux.joint_15 import contour_95, e_range
 from flarestack.cosmo import lower_contour, upper_contour
-import matplotlib.pyplot as plt
-from flarestack.shared import plot_output_dir
-import os
+from flarestack.cosmo.icecube_diffuse_flux.joint_15 import contour_95, e_range
 from flarestack.cosmo.rates import (
     ccsn_clash_candels,
     ccsn_madau,
     get_sn_fraction,
     get_sn_type_rate,
 )
+from flarestack.shared import plot_output_dir
+from flarestack.utils.neutrino_cosmology import (
+    calculate_transient_cosmology,
+    get_diffuse_flux_at_1GeV,
+    sfr_clash_candels,
+    sfr_madau,
+)
 
 global_fit_e_range = e_range
 
diff --git a/flarestack/analyses/ccsn/stasik_2017/unblind_ccsn.py b/flarestack/analyses/ccsn/stasik_2017/unblind_ccsn.py
index 9b22b602..6fbcfdda 100644
--- a/flarestack/analyses/ccsn/stasik_2017/unblind_ccsn.py
+++ b/flarestack/analyses/ccsn/stasik_2017/unblind_ccsn.py
@@ -1,14 +1,14 @@
 import numpy as np
-from flarestack.data.icecube.ps_tracks.ps_v002_p01 import ps_v002_p01
+
 from flarestack.analyses.ccsn.stasik_2017.shared_ccsn import (
-    sn_cats,
     sn_catalogue_name,
+    sn_cats,
     sn_time_pdfs,
 )
 from flarestack.core.unblinding import create_unblinder
+from flarestack.data.icecube.ps_tracks.ps_v002_p01 import ps_v002_p01
 from flarestack.utils.custom_dataset import custom_dataset
 
-
 name_root = "analyses/ccsn/stasik_2017/unblind_ccsn/"
 bkg_ts_root = "analyses/ccsn/stasik_2017/calculate_sensitivity/"
 
diff --git a/flarestack/analyses/fermi/gb6_fermi_blazar_flare_search.py b/flarestack/analyses/fermi/gb6_fermi_blazar_flare_search.py
index 5599155b..e9d5a622 100644
--- a/flarestack/analyses/fermi/gb6_fermi_blazar_flare_search.py
+++ b/flarestack/analyses/fermi/gb6_fermi_blazar_flare_search.py
@@ -5,20 +5,23 @@
 The script can be used to verify that the flare search method, as implemented
 here, is capable of matching previous flare search methods.
 """
-from __future__ import print_function
-from __future__ import division
+
+from __future__ import division, print_function
+
 from builtins import str
+
+import matplotlib
+import matplotlib.pyplot as plt
 import numpy as np
+from astropy.coordinates import Distance
+
+from flarestack.cluster import analyse, wait_for_cluster
 from flarestack.core.results import ResultsHandler
 from flarestack.data.icecube import txs_sample_v1
+from flarestack.icecube_utils.reference_sensitivity import reference_sensitivity
+from flarestack.shared import flux_to_k, plot_output_dir, transients_dir
 from flarestack.utils.custom_dataset import custom_dataset
-from flarestack.shared import plot_output_dir, flux_to_k, transients_dir
 from flarestack.utils.prepare_catalogue import custom_sources
-from flarestack.icecube_utils.reference_sensitivity import reference_sensitivity
-from flarestack.cluster import analyse, wait_for_cluster
-import matplotlib
-import matplotlib.pyplot as plt
-from astropy.coordinates import Distance
 
 name = "analyses/fermi/GB6_blazar_flare_search/"
 
diff --git a/flarestack/analyses/gen2_white_paper/produce_catalogues.py b/flarestack/analyses/gen2_white_paper/produce_catalogues.py
index 0f7af099..f3e9ebcc 100644
--- a/flarestack/analyses/gen2_white_paper/produce_catalogues.py
+++ b/flarestack/analyses/gen2_white_paper/produce_catalogues.py
@@ -1,10 +1,13 @@
 from __future__ import print_function
-import matplotlib.pyplot as plt
+
 import os
+
+import matplotlib.pyplot as plt
 import numpy as np
-from flarestack.utils.simulate_catalogue import simulate_transients
+
 from flarestack.analyses.ccsn import get_sn_type_rate
 from flarestack.shared import plot_output_dir
+from flarestack.utils.simulate_catalogue import simulate_transients
 
 sn_types = ["IIn"]
 
diff --git a/flarestack/analyses/general/check_stack_bias.py b/flarestack/analyses/general/check_stack_bias.py
index 45951ce5..2e951708 100644
--- a/flarestack/analyses/general/check_stack_bias.py
+++ b/flarestack/analyses/general/check_stack_bias.py
@@ -1,31 +1,33 @@
+import argparse
+import logging
+import math
+import os
+import pickle
+import time
+
 import numpy as np
 from astropy.table import Table
-import argparse
-from flarestack.core.results import ResultsHandler
-from flarestack.data.icecube import ps_v002_p01, diffuse_8_year
-from flarestack.shared import plot_output_dir, flux_to_k
-from flarestack.analyses.ccsn.stasik_2017.ccsn_limits import (
-    limits,
-    get_figure_limits,
-    p_vals,
-)
+
+from flarestack.analyses.ccsn import get_sn_color
 from flarestack.analyses.ccsn.necker_2019.ccsn_helpers import (
+    limit_sens,
+    pdf_names,
+    raw_output_dir,
     sn_cats,
-    updated_sn_catalogue_name,
     sn_time_pdfs,
-    raw_output_dir,
-    pdf_names,
-    limit_sens,
+    updated_sn_catalogue_name,
+)
+from flarestack.analyses.ccsn.stasik_2017.ccsn_limits import (
+    get_figure_limits,
+    limits,
+    p_vals,
 )
-from flarestack.analyses.ccsn import get_sn_color
 from flarestack.cluster import analyse
 from flarestack.cluster.run_desy_cluster import wait_for_cluster
-import math
-import pickle
+from flarestack.core.results import ResultsHandler
+from flarestack.data.icecube import diffuse_8_year, ps_v002_p01
+from flarestack.shared import flux_to_k, plot_output_dir
 from flarestack.utils.custom_dataset import custom_dataset
-import os
-import logging
-import time
 
 logging.getLogger().setLevel("INFO")
 injection_energy = {"energy_pdf_name": "power_law", "gamma": 2.0}
diff --git a/flarestack/analyses/general/check_stack_bias_equal_dist.py b/flarestack/analyses/general/check_stack_bias_equal_dist.py
index 347cdd87..5f0625b0 100644
--- a/flarestack/analyses/general/check_stack_bias_equal_dist.py
+++ b/flarestack/analyses/general/check_stack_bias_equal_dist.py
@@ -1,32 +1,33 @@
-import numpy as np
+import argparse
+import logging
+import math
 import os
+import pickle
+import time
+
+import numpy as np
 from astropy.table import Table
-import argparse
-from flarestack.core.results import ResultsHandler
-from flarestack.data.icecube import ps_v002_p01
-from flarestack.shared import plot_output_dir, flux_to_k
-from flarestack.analyses.ccsn.stasik_2017.ccsn_limits import (
-    limits,
-    get_figure_limits,
-    p_vals,
-)
+
+from flarestack.analyses.ccsn import get_sn_color
 from flarestack.analyses.ccsn.necker_2019.ccsn_helpers import (
+    limit_sens,
+    pdf_names,
+    raw_output_dir,
     sn_cats,
-    updated_sn_catalogue_name,
     sn_time_pdfs,
-    raw_output_dir,
-    pdf_names,
-    limit_sens,
+    updated_sn_catalogue_name,
+)
+from flarestack.analyses.ccsn.stasik_2017.ccsn_limits import (
+    get_figure_limits,
+    limits,
+    p_vals,
 )
-from flarestack.analyses.ccsn import get_sn_color
 from flarestack.cluster import analyse
 from flarestack.cluster.run_desy_cluster import wait_for_cluster
-import math
-import pickle
+from flarestack.core.results import ResultsHandler
+from flarestack.data.icecube import ps_v002_p01
+from flarestack.shared import flux_to_k, plot_output_dir
 from flarestack.utils.custom_dataset import custom_dataset
-import os
-import logging
-import time
 
 logging.getLogger().setLevel("INFO")
 injection_energy = {"energy_pdf_name": "power_law", "gamma": 2.0}
diff --git a/flarestack/analyses/general/check_stack_bias_equal_dist_iip.py b/flarestack/analyses/general/check_stack_bias_equal_dist_iip.py
index 969cf07b..e5e2bddc 100644
--- a/flarestack/analyses/general/check_stack_bias_equal_dist_iip.py
+++ b/flarestack/analyses/general/check_stack_bias_equal_dist_iip.py
@@ -1,32 +1,33 @@
-import numpy as np
+import argparse
+import logging
+import math
 import os
+import pickle
+import time
+
+import numpy as np
 from astropy.table import Table
-import argparse
-from flarestack.core.results import ResultsHandler
-from flarestack.data.icecube import ps_v002_p01
-from flarestack.shared import plot_output_dir, flux_to_k
-from flarestack.analyses.ccsn.stasik_2017.ccsn_limits import (
-    limits,
-    get_figure_limits,
-    p_vals,
-)
+
+from flarestack.analyses.ccsn import get_sn_color
 from flarestack.analyses.ccsn.necker_2019.ccsn_helpers import (
+    limit_sens,
+    pdf_names,
+    raw_output_dir,
     sn_cats,
-    updated_sn_catalogue_name,
     sn_time_pdfs,
-    raw_output_dir,
-    pdf_names,
-    limit_sens,
+    updated_sn_catalogue_name,
+)
+from flarestack.analyses.ccsn.stasik_2017.ccsn_limits import (
+    get_figure_limits,
+    limits,
+    p_vals,
 )
-from flarestack.analyses.ccsn import get_sn_color
 from flarestack.cluster import analyse
 from flarestack.cluster.run_desy_cluster import wait_for_cluster
-import math
-import pickle
+from flarestack.core.results import ResultsHandler
+from flarestack.data.icecube import ps_v002_p01
+from flarestack.shared import flux_to_k, plot_output_dir
 from flarestack.utils.custom_dataset import custom_dataset
-import os
-import logging
-import time
 
 logging.getLogger().setLevel("INFO")
 injection_energy = {"energy_pdf_name": "power_law", "gamma": 2.0}
diff --git a/flarestack/analyses/general/compare_brute_seed.py b/flarestack/analyses/general/compare_brute_seed.py
index 4e936dc7..e5a177fc 100644
--- a/flarestack/analyses/general/compare_brute_seed.py
+++ b/flarestack/analyses/general/compare_brute_seed.py
@@ -1,15 +1,18 @@
 from __future__ import division
-from builtins import str
-import numpy as np
+
 import os
 import pickle as Pickle
+from builtins import str
+
+import matplotlib.pyplot as plt
+import numpy as np
+
+from flarestack.cluster import run_desy_cluster as rd
 from flarestack.core.results import ResultsHandler
 from flarestack.data.icecube import ps_v002_p01
-from flarestack.shared import plot_output_dir, flux_to_k, analysis_dir
-from flarestack.utils.prepare_catalogue import ps_catalogue_name
 from flarestack.icecube_utils.reference_sensitivity import reference_sensitivity
-from flarestack.cluster import run_desy_cluster as rd
-import matplotlib.pyplot as plt
+from flarestack.shared import analysis_dir, flux_to_k, plot_output_dir
+from flarestack.utils.prepare_catalogue import ps_catalogue_name
 
 # Initialise Injectors/LLHs
 
diff --git a/flarestack/analyses/general/compare_negative_n_s_dec.py b/flarestack/analyses/general/compare_negative_n_s_dec.py
index 9313bb51..740aa609 100644
--- a/flarestack/analyses/general/compare_negative_n_s_dec.py
+++ b/flarestack/analyses/general/compare_negative_n_s_dec.py
@@ -1,15 +1,18 @@
 from __future__ import division
-from builtins import str
-import numpy as np
+
 import os
 import pickle as Pickle
+from builtins import str
+
+import matplotlib.pyplot as plt
+import numpy as np
+
+from flarestack.cluster import run_desy_cluster as rd
 from flarestack.core.results import ResultsHandler
 from flarestack.data.icecube.ps_tracks.ps_v002_p01 import ps_v002_p01
-from flarestack.shared import plot_output_dir, flux_to_k, analysis_dir
-from flarestack.utils.prepare_catalogue import ps_catalogue_name
 from flarestack.icecube_utils.reference_sensitivity import reference_sensitivity
-from flarestack.cluster import run_desy_cluster as rd
-import matplotlib.pyplot as plt
+from flarestack.shared import analysis_dir, flux_to_k, plot_output_dir
+from flarestack.utils.prepare_catalogue import ps_catalogue_name
 
 # Initialise Injectors/LLHs
 
diff --git a/flarestack/analyses/general/compare_negative_n_s_time.py b/flarestack/analyses/general/compare_negative_n_s_time.py
index 81e8fa93..6377b5b5 100644
--- a/flarestack/analyses/general/compare_negative_n_s_time.py
+++ b/flarestack/analyses/general/compare_negative_n_s_time.py
@@ -1,17 +1,20 @@
 from __future__ import division
-from builtins import str
-import numpy as np
+
 import os
 import pickle as Pickle
+from builtins import str
+
+import matplotlib.pyplot as plt
+import numpy as np
+
+from flarestack.cluster import run_desy_cluster as rd
 from flarestack.core.results import ResultsHandler
+from flarestack.core.time_pdf import TimePDF
 from flarestack.data.icecube.ps_tracks.ps_v002_p01 import ps_v002_p01
-from flarestack.shared import plot_output_dir, flux_to_k, analysis_dir
-from flarestack.utils.prepare_catalogue import ps_catalogue_name
 from flarestack.icecube_utils.reference_sensitivity import reference_sensitivity
-from flarestack.cluster import run_desy_cluster as rd
-import matplotlib.pyplot as plt
+from flarestack.shared import analysis_dir, flux_to_k, plot_output_dir
 from flarestack.utils.custom_dataset import custom_dataset
-from flarestack.core.time_pdf import TimePDF
+from flarestack.utils.prepare_catalogue import ps_catalogue_name
 
 # Initialise Injectors/LLHs
 
diff --git a/flarestack/analyses/general/compare_public_data_sensitivity.py b/flarestack/analyses/general/compare_public_data_sensitivity.py
index b021f248..42eddbe3 100644
--- a/flarestack/analyses/general/compare_public_data_sensitivity.py
+++ b/flarestack/analyses/general/compare_public_data_sensitivity.py
@@ -1,17 +1,19 @@
 """Script to replicate unblinding of the neutrino flare found for the source
 TXS 0506+056, as described in https://arxiv.org/abs/1807.08794.
 """
+
 import os
+
 import matplotlib.pyplot as plt
-from flarestack.core.results import ResultsHandler
 import numpy as np
-from flarestack.data.icecube.public.all_sky_point_source.all_sky_3_year import ps_3_year
-from flarestack.data.icecube.ps_tracks.ps_v002_p01 import ps_3_systematic_set
+
 from flarestack.cluster import analyse, wait_cluster
-from flarestack.utils.prepare_catalogue import ps_catalogue_name
+from flarestack.core.results import ResultsHandler
+from flarestack.data.icecube.ps_tracks.ps_v002_p01 import ps_3_systematic_set
+from flarestack.data.icecube.public.all_sky_point_source.all_sky_3_year import ps_3_year
+from flarestack.shared import flux_to_k, plot_output_dir
 from flarestack.utils.asimov_estimator import AsimovEstimator
-from flarestack.shared import plot_output_dir, flux_to_k
-
+from flarestack.utils.prepare_catalogue import ps_catalogue_name
 
 # Initialise Injectors/LLHs
 
diff --git a/flarestack/analyses/general/energy_decade_sensitivity.py b/flarestack/analyses/general/energy_decade_sensitivity.py
index 9a433820..5400599e 100644
--- a/flarestack/analyses/general/energy_decade_sensitivity.py
+++ b/flarestack/analyses/general/energy_decade_sensitivity.py
@@ -1,16 +1,16 @@
-from builtins import zip
-from builtins import str
-from builtins import range
-import numpy as np
 import os
 import pickle as Pickle
+from builtins import range, str, zip
+
+import matplotlib.pyplot as plt
+import numpy as np
+
+from flarestack.cluster import run_desy_cluster as rd
 from flarestack.core.results import ResultsHandler
 from flarestack.data.icecube.ps_tracks.ps_v002_p01 import ps_v002_p01
-from flarestack.shared import plot_output_dir, flux_to_k, analysis_dir
-from flarestack.utils.prepare_catalogue import ps_catalogue_name
 from flarestack.icecube_utils.reference_sensitivity import reference_sensitivity
-from flarestack.cluster import run_desy_cluster as rd
-import matplotlib.pyplot as plt
+from flarestack.shared import analysis_dir, flux_to_k, plot_output_dir
+from flarestack.utils.prepare_catalogue import ps_catalogue_name
 
 # Initialise Injectors/LLHs
 
diff --git a/flarestack/analyses/general/improved_point_source_sensitivity.py b/flarestack/analyses/general/improved_point_source_sensitivity.py
index 055c4c11..d42dd4ce 100644
--- a/flarestack/analyses/general/improved_point_source_sensitivity.py
+++ b/flarestack/analyses/general/improved_point_source_sensitivity.py
@@ -1,17 +1,20 @@
 from __future__ import division
-import numpy as np
+
 import os
 import pickle as Pickle
+
+import matplotlib.pyplot as plt
+import numpy as np
+
+from flarestack.cluster import run_desy_cluster as rd
 from flarestack.core.results import ResultsHandler
 from flarestack.data.icecube.ps_tracks.ps_v002_p01 import ps_v002_p01
-from flarestack.shared import plot_output_dir, flux_to_k, analysis_dir
-from flarestack.utils.prepare_catalogue import ps_catalogue_name
 from flarestack.icecube_utils.reference_sensitivity import (
-    reference_sensitivity,
     reference_7year_discovery_potential,
+    reference_sensitivity,
 )
-from flarestack.cluster import run_desy_cluster as rd
-import matplotlib.pyplot as plt
+from flarestack.shared import analysis_dir, flux_to_k, plot_output_dir
+from flarestack.utils.prepare_catalogue import ps_catalogue_name
 
 # Initialise Injectors/LLHs
 
diff --git a/flarestack/analyses/general/study_timePDF_misalignment.py b/flarestack/analyses/general/study_timePDF_misalignment.py
index 684f788a..08bd53ed 100644
--- a/flarestack/analyses/general/study_timePDF_misalignment.py
+++ b/flarestack/analyses/general/study_timePDF_misalignment.py
@@ -1,15 +1,18 @@
 from __future__ import division
-from builtins import str
-import numpy as np
+
 import os
 import pickle as Pickle
+from builtins import str
+
+import matplotlib.pyplot as plt
+import numpy as np
+
 from flarestack.core.results import ResultsHandler
 from flarestack.data.icecube.ps_tracks.ps_v002_p01 import ps_v002_p01
-from flarestack.shared import plot_output_dir, flux_to_k, analysis_dir
-from flarestack.utils.prepare_catalogue import ps_catalogue_name
 from flarestack.icecube_utils.reference_sensitivity import reference_sensitivity
-import matplotlib.pyplot as plt
+from flarestack.shared import analysis_dir, flux_to_k, plot_output_dir
 from flarestack.utils.custom_dataset import custom_dataset
+from flarestack.utils.prepare_catalogue import ps_catalogue_name
 
 name_root = "benchmarks/timePDFs/misalignment/"
 
diff --git a/flarestack/analyses/general/study_timePDF_scaling.py b/flarestack/analyses/general/study_timePDF_scaling.py
index 7f8aa4ce..9b210bdf 100644
--- a/flarestack/analyses/general/study_timePDF_scaling.py
+++ b/flarestack/analyses/general/study_timePDF_scaling.py
@@ -1,18 +1,19 @@
-from __future__ import print_function
-from __future__ import division
-from builtins import input
-from builtins import str
-import numpy as np
+from __future__ import division, print_function
+
 import os
 import pickle as Pickle
+from builtins import input, str
+
+import matplotlib.pyplot as plt
+import numpy as np
+
+from flarestack.cluster import run_desy_cluster as rd
 from flarestack.core.results import ResultsHandler
 from flarestack.data.icecube.ps_tracks.ps_v002_p01 import ps_v002_p01
-from flarestack.shared import plot_output_dir, flux_to_k, analysis_dir
-from flarestack.utils.prepare_catalogue import ps_catalogue_name
 from flarestack.icecube_utils.reference_sensitivity import reference_sensitivity
-from flarestack.cluster import run_desy_cluster as rd
-import matplotlib.pyplot as plt
+from flarestack.shared import analysis_dir, flux_to_k, plot_output_dir
 from flarestack.utils.custom_dataset import custom_dataset
+from flarestack.utils.prepare_catalogue import ps_catalogue_name
 
 name_root = "benchmarks/timePDFs/scaling/"
 
diff --git a/flarestack/analyses/simcube/verify_simcube_sensitivity.py b/flarestack/analyses/simcube/verify_simcube_sensitivity.py
index 9c8ff9d4..16fc546b 100644
--- a/flarestack/analyses/simcube/verify_simcube_sensitivity.py
+++ b/flarestack/analyses/simcube/verify_simcube_sensitivity.py
@@ -1,13 +1,16 @@
 from __future__ import division
-import numpy as np
+
 import os
-from flarestack.shared import plot_output_dir
-from flarestack.utils.prepare_catalogue import ps_catalogue_name
+
 import matplotlib.pyplot as plt
-from flarestack.utils.asimov_estimator import AsimovEstimator
-from flarestack import analyse, MinimisationHandler
-from flarestack.data.simulate.simcube import simcube_dataset
+import numpy as np
+
+from flarestack import MinimisationHandler, analyse
 from flarestack.data.public import icecube_ps_3_year
+from flarestack.data.simulate.simcube import simcube_dataset
+from flarestack.shared import plot_output_dir
+from flarestack.utils.asimov_estimator import AsimovEstimator
+from flarestack.utils.prepare_catalogue import ps_catalogue_name
 
 name = "analyses/simcube/verify_sensitivity"
 
diff --git a/flarestack/analyses/skylab_crosscheck/calculate_skylab_sensitivity.py b/flarestack/analyses/skylab_crosscheck/calculate_skylab_sensitivity.py
index be17e8e2..1e45e5a0 100644
--- a/flarestack/analyses/skylab_crosscheck/calculate_skylab_sensitivity.py
+++ b/flarestack/analyses/skylab_crosscheck/calculate_skylab_sensitivity.py
@@ -1,20 +1,21 @@
-"""Script to calculate the sensitivity and discovery potential for some sources to check consistency with skylab.
-"""
-import numpy as np
+"""Script to calculate the sensitivity and discovery potential for some sources to check consistency with skylab."""
+
 import argparse
+import logging
+import math
+import os
+
+import matplotlib.pyplot as plt
+import numpy as np
+
 from flarestack.analyses.skylab_crosscheck.make_sources import fs_sources, nsources
 from flarestack.analyses.skylab_crosscheck.skylab_results import sl_data_dir
+from flarestack.cluster import analyse, wait_for_cluster
 from flarestack.core.results import ResultsHandler
 from flarestack.data.icecube import ps_v002_p01
-from flarestack.shared import plot_output_dir, flux_to_k
 from flarestack.icecube_utils.reference_sensitivity import reference_sensitivity
-from flarestack.cluster import analyse, wait_for_cluster
-import math
-import matplotlib.pyplot as plt
+from flarestack.shared import flux_to_k, plot_output_dir
 from flarestack.utils.custom_dataset import custom_dataset
-import os
-import logging
-
 
 parser = argparse.ArgumentParser()
 parser.add_argument("-a", "--analyse", type=bool, default=False, const=True, nargs="?")
diff --git a/flarestack/analyses/skylab_crosscheck/data/__init__.py b/flarestack/analyses/skylab_crosscheck/data/__init__.py
index 079aad59..2ba9a098 100644
--- a/flarestack/analyses/skylab_crosscheck/data/__init__.py
+++ b/flarestack/analyses/skylab_crosscheck/data/__init__.py
@@ -1,10 +1,11 @@
-import numpy as np
-import os
 import logging
+import os
 import pickle
-from flarestack.utils.prepare_catalogue import single_source
-from flarestack.shared import fs_scratch_dir
 
+import numpy as np
+
+from flarestack.shared import fs_scratch_dir
+from flarestack.utils.prepare_catalogue import single_source
 
 logger = logging.getLogger(__name__)
 
diff --git a/flarestack/analyses/skylab_crosscheck/make_sources.py b/flarestack/analyses/skylab_crosscheck/make_sources.py
index e747ce0d..c7a1b4cd 100644
--- a/flarestack/analyses/skylab_crosscheck/make_sources.py
+++ b/flarestack/analyses/skylab_crosscheck/make_sources.py
@@ -1,8 +1,9 @@
+import logging
 import os
+
 import numpy as np
-import logging
-from flarestack.utils.prepare_catalogue import single_source
 
+from flarestack.utils.prepare_catalogue import single_source
 
 logging.getLogger().setLevel(logging.INFO)
 
diff --git a/flarestack/analyses/skylab_crosscheck/skylab_crosscheck_with_same_scramble.py b/flarestack/analyses/skylab_crosscheck/skylab_crosscheck_with_same_scramble.py
index 7945283a..d6076b84 100644
--- a/flarestack/analyses/skylab_crosscheck/skylab_crosscheck_with_same_scramble.py
+++ b/flarestack/analyses/skylab_crosscheck/skylab_crosscheck_with_same_scramble.py
@@ -1,34 +1,35 @@
-import numpy as np
+import argparse
+import copy
+import json
 import logging
 import os
-import sys
-import pandas as pd
-import json
-import copy
-from tqdm import tqdm
 import pickle
+import shutil
+import sys
 from zipfile import ZipFile
+
 import matplotlib.pyplot as plt
-import argparse
-import shutil
+import numpy as np
+import pandas as pd
 import pylatex
-from flarestack.data.icecube import ps_v002_p01
-from flarestack.shared import (
-    sim_dataset_dir,
-    catalogue_dir,
-    plot_output_dir,
-    storage_dir,
-    fs_scratch_dir,
-)
-from flarestack.utils.prepare_catalogue import custom_sources, cat_dtype
-from flarestack.core.unblinding import create_unblinder
+from tqdm import tqdm
+
 from flarestack.analyses.skylab_crosscheck.skylab_results import (
     crosscheck_with_same_scrambles,
 )
 from flarestack.core.angular_error_modifier import BaseAngularErrorModifier
 from flarestack.core.llh import LLH
 from flarestack.core.minimisation import MinimisationHandler
-
+from flarestack.core.unblinding import create_unblinder
+from flarestack.data.icecube import ps_v002_p01
+from flarestack.shared import (
+    catalogue_dir,
+    fs_scratch_dir,
+    plot_output_dir,
+    sim_dataset_dir,
+    storage_dir,
+)
+from flarestack.utils.prepare_catalogue import cat_dtype, custom_sources
 
 logger = logging.getLogger(__name__)
 
@@ -544,9 +545,9 @@ def get_minimizer_dict(
 
     minimizer_dictionary = {
         "name": name,
-        "mh_name": "fixed_weights"
-        if "spatial" in name
-        else minimizer_name,  # TODO: find a way to not do this!
+        "mh_name": (
+            "fixed_weights" if "spatial" in name else minimizer_name
+        ),  # TODO: find a way to not do this!
         "dataset": data,
         "catalogue": catalogue_path,
         "llh_dict": llh_dict,
@@ -1023,9 +1024,7 @@ def make_individual_scatter_plots(
         injected_value = (
             injected_ns
             if "ns" in param_name
-            else injected_gamma
-            if param_name == "gamma"
-            else np.nan
+            else injected_gamma if param_name == "gamma" else np.nan
         )
         qs = [0.5, 0.05, 0.95]
 
@@ -1075,9 +1074,7 @@ def make_individual_scatter_plots(
         lower_lim = (
             0
             if param_name == "ns"
-            else 1
-            if param_name == "gamma"
-            else min((min(xlim), min(ylim)))
+            else 1 if param_name == "gamma" else min((min(xlim), min(ylim)))
         )
         upper_lim = 4 if param_name == "gamma" else max(max(xlim), max(ylim))
         lim = (lower_lim, upper_lim)
@@ -1178,9 +1175,7 @@ def make_plots_comparing_smoothings(
         injected_value = (
             injected_ns
             if param_name == "ns"
-            else injected_gamma
-            if param_name == "gamma"
-            else np.nan
+            else injected_gamma if param_name == "gamma" else np.nan
         )
         injected_value = float(injected_value)
 
@@ -1434,13 +1429,19 @@ def make_summary_pdf(title, filename, diagnostic_plots_directory, llh_scans_dire
             smoothing_str = (
                 ""
                 if (smoothing == "default") or (smoothing == "flarestack")
-                else "SkyLab_pdf_smoothing"
-                if smoothing == "skylab"
-                else "SkyLab_splines_kernel1"
-                if ("splines" in smoothing) and ("kernel1" in smoothing)
-                else "SkyLab_splines_kernel0"
-                if ("splines" in smoothing) and ("kernel0" in smoothing)
-                else None
+                else (
+                    "SkyLab_pdf_smoothing"
+                    if smoothing == "skylab"
+                    else (
+                        "SkyLab_splines_kernel1"
+                        if ("splines" in smoothing) and ("kernel1" in smoothing)
+                        else (
+                            "SkyLab_splines_kernel0"
+                            if ("splines" in smoothing) and ("kernel0" in smoothing)
+                            else None
+                        )
+                    )
+                )
             )
 
             if isinstance(smoothing_str, type(None)):
@@ -1513,9 +1514,9 @@ def make_summary_pdf(title, filename, diagnostic_plots_directory, llh_scans_dire
                                 hsphere,
                                 nsources,
                                 gamma,
-                                use_skylab_energy_splines=True
-                                if "skylab_splines" in smoothing
-                                else False,
+                                use_skylab_energy_splines=(
+                                    True if "skylab_splines" in smoothing else False
+                                ),
                                 skylab_kernel=skylab_kernel,
                             )
 
@@ -1857,9 +1858,9 @@ def make_summary_pdf(title, filename, diagnostic_plots_directory, llh_scans_dire
                                 nsources,
                                 use_dataset,
                                 outlier_indices,
-                                use_skylab_splines=True
-                                if "splines" in smoothing_str
-                                else False,
+                                use_skylab_splines=(
+                                    True if "splines" in smoothing_str else False
+                                ),
                                 skylab_kernel=skylab_kernel,
                             )
 
@@ -1952,9 +1953,9 @@ def make_summary_pdf(title, filename, diagnostic_plots_directory, llh_scans_dire
                             nsources,
                             use_dataset,
                             outlier_indices,
-                            use_skylab_splines=True
-                            if "splines" in smoothing_str
-                            else False,
+                            use_skylab_splines=(
+                                True if "splines" in smoothing_str else False
+                            ),
                             skylab_kernel=skylab_kernel,
                         )
 
diff --git a/flarestack/analyses/skylab_crosscheck/skylab_results/__init__.py b/flarestack/analyses/skylab_crosscheck/skylab_results/__init__.py
index 016c3561..a20a0a69 100644
--- a/flarestack/analyses/skylab_crosscheck/skylab_results/__init__.py
+++ b/flarestack/analyses/skylab_crosscheck/skylab_results/__init__.py
@@ -1,6 +1,5 @@
 import os
 
-
 sl_data_dir_raw = os.path.dirname(os.path.realpath(__file__))
 
 
diff --git a/flarestack/analyses/skylab_crosscheck/test_skylab_like_scale_guessing.py b/flarestack/analyses/skylab_crosscheck/test_skylab_like_scale_guessing.py
index 6affe47e..dd3413d0 100644
--- a/flarestack/analyses/skylab_crosscheck/test_skylab_like_scale_guessing.py
+++ b/flarestack/analyses/skylab_crosscheck/test_skylab_like_scale_guessing.py
@@ -1,24 +1,25 @@
-import numpy as np
 import argparse
-from flarestack.core.results import ResultsHandler
-from flarestack.data.icecube import ps_v002_p01, diffuse_8_year
-from flarestack.shared import plot_output_dir, flux_to_k, catalogue_dir
-from flarestack.icecube_utils.reference_sensitivity import reference_sensitivity
-from flarestack.cluster import analyse
-from flarestack.cluster.run_desy_cluster import wait_for_cluster
-from flarestack.analyses.skylab_crosscheck.skylab_crosscheck_with_same_scramble import (
-    make_sources,
-)
+import logging
+import math
+import os
+
+import matplotlib.pyplot as plt
+import numpy as np
+
 from flarestack.analyses.skylab_crosscheck.data import (
     get_skylab_crosscheck_stacking_same_sources_res,
 )
-import math
-import matplotlib.pyplot as plt
+from flarestack.analyses.skylab_crosscheck.skylab_crosscheck_with_same_scramble import (
+    make_sources,
+)
+from flarestack.cluster import analyse
+from flarestack.cluster.run_desy_cluster import wait_for_cluster
+from flarestack.core.results import ResultsHandler
+from flarestack.data.icecube import diffuse_8_year, ps_v002_p01
+from flarestack.icecube_utils.reference_sensitivity import reference_sensitivity
+from flarestack.shared import catalogue_dir, flux_to_k, plot_output_dir
 from flarestack.utils.custom_dataset import custom_dataset
 from flarestack.utils.prepare_catalogue import custom_sources
-import os
-import logging
-
 
 parser = argparse.ArgumentParser()
 parser.add_argument("-a", "--analyse", type=bool, default=False, nargs="?", const=True)
@@ -114,9 +115,11 @@
             }
 
             llh_dict = {
-                "llh_name": "standard"
-                if not mh_name == "large_catalogue"
-                else "standard_matrix",
+                "llh_name": (
+                    "standard"
+                    if not mh_name == "large_catalogue"
+                    else "standard_matrix"
+                ),
                 "llh_energy_pdf": llh_energy,
                 "llh_sig_time_pdf": llh_time,
                 "llh_bkg_time_pdf": {"time_pdf_name": "steady"},
diff --git a/flarestack/analyses/tde/bran_stark.py b/flarestack/analyses/tde/bran_stark.py
index 2e78bd81..17d5e22d 100644
--- a/flarestack/analyses/tde/bran_stark.py
+++ b/flarestack/analyses/tde/bran_stark.py
@@ -1,7 +1,8 @@
 from astropy import units as u
+
 from flarestack.utils.neutrino_cosmology import (
-    integrate_over_z,
     define_cosmology_functions,
+    integrate_over_z,
 )
 
 
diff --git a/flarestack/analyses/tde/calculate_DaiFang_neutrino_numbers.py b/flarestack/analyses/tde/calculate_DaiFang_neutrino_numbers.py
index ebe1b905..840537bc 100644
--- a/flarestack/analyses/tde/calculate_DaiFang_neutrino_numbers.py
+++ b/flarestack/analyses/tde/calculate_DaiFang_neutrino_numbers.py
@@ -1,11 +1,12 @@
-from __future__ import print_function
-from __future__ import division
+from __future__ import division, print_function
+
 import numpy as np
+from astropy import units as u
+
+from flarestack.data.icecube.gfu.gfu_v002_p01 import ps_v002_p01, txs_sample_v1
 from flarestack.shared import catalogue_dir
-from flarestack.data.icecube.gfu.gfu_v002_p01 import txs_sample_v1, ps_v002_p01
 from flarestack.utils.custom_dataset import custom_dataset
 from flarestack.utils.neutrino_astronomy import calculate_neutrinos
-from astropy import units as u
 
 # Calculate expected neutrino numbers for entries in the catalogue by Dai &
 # Fang, in which nearby TDEs were selected and event rates estimated. The
diff --git a/flarestack/analyses/tde/calculate_jetted_model_limit.py b/flarestack/analyses/tde/calculate_jetted_model_limit.py
index 2e6eb166..7cd6c4d3 100644
--- a/flarestack/analyses/tde/calculate_jetted_model_limit.py
+++ b/flarestack/analyses/tde/calculate_jetted_model_limit.py
@@ -6,34 +6,37 @@
 
 These splines are injected, but a standard power law is fit.
 """
+
+import math
+
+import matplotlib.pyplot as plt
 import numpy as np
-from flarestack.core.results import ResultsHandler
-from flarestack.core.energy_PDFs import EnergyPDF
+from astropy import units as u
 from astropy.cosmology import WMAP9 as cosmo
-from flarestack.data.icecube.gfu.gfu_v002_p01 import txs_sample_v1
-from flarestack.shared import (
-    plot_output_dir,
-    flux_to_k,
-    make_analysis_pickle,
-    k_to_flux,
-)
-from flarestack.utils.reference_sensitivity import reference_sensitivity
+
 from flarestack.analyses.tde.shared_TDE import (
-    tde_catalogues,
-    tde_catalogue_name,
     individual_tde_cat,
+    tde_catalogue_name,
+    tde_catalogues,
 )
-from flarestack.cluster import run_desy_cluster as rd
-import math
-import matplotlib.pyplot as plt
-from flarestack.utils.custom_seasons import custom_dataset
+from flarestack.analyses.tde.tde_cosmology import biehl_local_rate, measured_local_rate
 from flarestack.analyses.tde.tde_model_spline.convert_spline import (
-    tde_spline_output_path,
     min_nu_e_gev,
+    tde_spline_output_path,
 )
+from flarestack.cluster import run_desy_cluster as rd
+from flarestack.core.energy_PDFs import EnergyPDF
 from flarestack.core.minimisation import MinimisationHandler
-from astropy import units as u
-from flarestack.analyses.tde.tde_cosmology import biehl_local_rate, measured_local_rate
+from flarestack.core.results import ResultsHandler
+from flarestack.data.icecube.gfu.gfu_v002_p01 import txs_sample_v1
+from flarestack.shared import (
+    flux_to_k,
+    k_to_flux,
+    make_analysis_pickle,
+    plot_output_dir,
+)
+from flarestack.utils.custom_seasons import custom_dataset
+from flarestack.utils.reference_sensitivity import reference_sensitivity
 
 analyses = dict()
 
diff --git a/flarestack/analyses/tde/compare_cluster_search_to_time_integration.py b/flarestack/analyses/tde/compare_cluster_search_to_time_integration.py
index 5c74fe18..fd67ce86 100644
--- a/flarestack/analyses/tde/compare_cluster_search_to_time_integration.py
+++ b/flarestack/analyses/tde/compare_cluster_search_to_time_integration.py
@@ -2,17 +2,20 @@
 with negative n_s, and also to the flare search method, which looks for
 temporal clustering. The script runs for all individual TDEs to be analysed.
 """
+
+import logging
+
+import matplotlib.pyplot as plt
 import numpy as np
+
+from flarestack.analyses.tde.shared_TDE import individual_tde_cat, individual_tdes
+from flarestack.cluster import analyse, wait_cluster
 from flarestack.core.results import ResultsHandler
 from flarestack.data.icecube.gfu.gfu_v002_p02 import txs_sample_v2
 from flarestack.data.icecube.gfu.gfu_v002_p04 import gfu_v002_p04
-from flarestack.shared import plot_output_dir, flux_to_k
 from flarestack.icecube_utils.reference_sensitivity import reference_sensitivity
-from flarestack.utils import load_catalogue, custom_dataset
-from flarestack.cluster import analyse, wait_cluster
-import matplotlib.pyplot as plt
-from flarestack.analyses.tde.shared_TDE import individual_tdes, individual_tde_cat
-import logging
+from flarestack.shared import flux_to_k, plot_output_dir
+from flarestack.utils import custom_dataset, load_catalogue
 
 logging.basicConfig(level=logging.INFO)
 
diff --git a/flarestack/analyses/tde/compare_fitting_weights.py b/flarestack/analyses/tde/compare_fitting_weights.py
index 829d5581..5ad56ef6 100644
--- a/flarestack/analyses/tde/compare_fitting_weights.py
+++ b/flarestack/analyses/tde/compare_fitting_weights.py
@@ -4,17 +4,21 @@
 joint n_s split across sources assuming standard candles), and lastly an
 independent flare search for each source with TS values summed at the end.
 """
+
 from __future__ import division
+
+import math
 from builtins import str
+
+import matplotlib.pyplot as plt
 import numpy as np
+
+from flarestack.analyses.tde.shared_TDE import tde_catalogue_name, tde_catalogues
 from flarestack.core.results import ResultsHandler
 from flarestack.data.icecube.gfu.gfu_v002_p02 import txs_sample_v2
-from flarestack.shared import plot_output_dir, flux_to_k, make_analysis_pickle
 from flarestack.icecube_utils.reference_sensitivity import reference_sensitivity
-import matplotlib.pyplot as plt
+from flarestack.shared import flux_to_k, make_analysis_pickle, plot_output_dir
 from flarestack.utils.custom_dataset import custom_dataset
-import math
-from flarestack.analyses.tde.shared_TDE import tde_catalogue_name, tde_catalogues
 
 analyses = dict()
 
diff --git a/flarestack/analyses/tde/compare_spectral_indices.py b/flarestack/analyses/tde/compare_spectral_indices.py
index 55487fec..74658d25 100644
--- a/flarestack/analyses/tde/compare_spectral_indices.py
+++ b/flarestack/analyses/tde/compare_spectral_indices.py
@@ -3,17 +3,20 @@
 Sensitivities are given as the total integrated fluence across all sources,
 and as the corresponding standard-candle-luminosity.
 """
+
+import math
 from builtins import str
+
+import matplotlib.pyplot as plt
 import numpy as np
+
+from flarestack.analyses.tde.shared_TDE import tde_catalogue_name, tde_catalogues
 from flarestack.core.results import ResultsHandler
 from flarestack.data.icecube.gfu.gfu_v002_p01 import txs_sample_v1
-from flarestack.shared import plot_output_dir, flux_to_k, make_analysis_pickle
 from flarestack.icecube_utils.reference_sensitivity import reference_sensitivity
-from flarestack.analyses.tde.shared_TDE import tde_catalogues, tde_catalogue_name
-import math
-import matplotlib.pyplot as plt
-from flarestack.utils.custom_dataset import custom_dataset
+from flarestack.shared import flux_to_k, make_analysis_pickle, plot_output_dir
 from flarestack.utils.catalogue_loader import load_catalogue
+from flarestack.utils.custom_dataset import custom_dataset
 
 analyses = dict()
 
diff --git a/flarestack/analyses/tde/compare_spectral_indices_individual.py b/flarestack/analyses/tde/compare_spectral_indices_individual.py
index 23286ee8..a7c77996 100644
--- a/flarestack/analyses/tde/compare_spectral_indices_individual.py
+++ b/flarestack/analyses/tde/compare_spectral_indices_individual.py
@@ -1,14 +1,17 @@
 from __future__ import print_function
-from builtins import str
-import numpy as np
+
 import os
 import pickle as Pickle
+from builtins import str
+
+import matplotlib.pyplot as plt
+import numpy as np
+
+from flarestack.cluster import run_desy_cluster as rd
 from flarestack.core.results import ResultsHandler
 from flarestack.data.icecube.gfu.gfu_v002_p01 import txs_sample_v1
-from flarestack.shared import plot_output_dir, flux_to_k, analysis_dir, catalogue_dir
 from flarestack.icecube_utils.reference_sensitivity import reference_sensitivity
-from flarestack.cluster import run_desy_cluster as rd
-import matplotlib.pyplot as plt
+from flarestack.shared import analysis_dir, catalogue_dir, flux_to_k, plot_output_dir
 from flarestack.utils.custom_dataset import custom_dataset
 
 analyses = dict()
diff --git a/flarestack/analyses/tde/make_AT2018cow_catalogue.py b/flarestack/analyses/tde/make_AT2018cow_catalogue.py
index 54463e60..82e395a3 100644
--- a/flarestack/analyses/tde/make_AT2018cow_catalogue.py
+++ b/flarestack/analyses/tde/make_AT2018cow_catalogue.py
@@ -1,9 +1,11 @@
-from flarestack.utils.prepare_catalogue import custom_sources
+import os
+
+import numpy as np
 from astropy.coordinates import Distance
-from flarestack.shared import catalogue_dir
+
 from flarestack.analyses.tde.shared_TDE import individual_tde_cat
-import numpy as np
-import os
+from flarestack.shared import catalogue_dir
+from flarestack.utils.prepare_catalogue import custom_sources
 
 # Max time taken from https://arxiv.org/pdf/1807.05965
 # Corresponding time window set by method laid out in TDE analysis page:
diff --git a/flarestack/analyses/tde/shared_TDE.py b/flarestack/analyses/tde/shared_TDE.py
index 40ff2647..a1ef810d 100644
--- a/flarestack/analyses/tde/shared_TDE.py
+++ b/flarestack/analyses/tde/shared_TDE.py
@@ -1,9 +1,11 @@
-from flarestack.shared import catalogue_dir, limits_dir
 import os
 import pickle as Pickle
-from scipy.interpolate import interp1d
+
 import matplotlib.pyplot as plt
 import numpy as np
+from scipy.interpolate import interp1d
+
+from flarestack.shared import catalogue_dir, limits_dir
 
 tde_dir = os.path.abspath(os.path.dirname(__file__))
 tde_cat_dir = tde_dir + "/tde_catalogues/"
diff --git a/flarestack/analyses/tde/tde_cosmology.py b/flarestack/analyses/tde/tde_cosmology.py
index f47d8417..562a7532 100644
--- a/flarestack/analyses/tde/tde_cosmology.py
+++ b/flarestack/analyses/tde/tde_cosmology.py
@@ -1,18 +1,23 @@
 from __future__ import division
-from flarestack.utils.neutrino_cosmology import calculate_transient_cosmology
-from astropy import units as u
+
+import os
+
 import matplotlib.pyplot as plt
-from flarestack.shared import plot_output_dir
 import numpy as np
-import os
+from astropy import units as u
+
+from flarestack.analyses.tde.shared_TDE import tde_cat_limit
 from flarestack.misc.convert_diffuse_flux_contour import (
     contour_95,
-    upper_contour,
-    lower_contour,
     global_fit_e_range,
+    lower_contour,
+    upper_contour,
+)
+from flarestack.shared import plot_output_dir
+from flarestack.utils.neutrino_cosmology import (
+    calculate_transient_cosmology,
+    get_diffuse_flux_at_1GeV,
 )
-from flarestack.utils.neutrino_cosmology import get_diffuse_flux_at_1GeV
-from flarestack.analyses.tde.shared_TDE import tde_cat_limit
 
 e_pdf_dict_template = {
     "Name": "Power Law",
diff --git a/flarestack/analyses/tde/tde_histograms.py b/flarestack/analyses/tde/tde_histograms.py
index d2a63ad3..c2f932f4 100644
--- a/flarestack/analyses/tde/tde_histograms.py
+++ b/flarestack/analyses/tde/tde_histograms.py
@@ -1,7 +1,9 @@
 from __future__ import print_function
+
+import matplotlib.pyplot as plt
 import numpy as np
+
 from flarestack.shared import catalogue_dir, plot_output_dir
-import matplotlib.pyplot as plt
 
 cats = ["jetted", "gold", "obscured", "silver"]
 
diff --git a/flarestack/analyses/tde/tde_model_spline/convert_spline.py b/flarestack/analyses/tde/tde_model_spline/convert_spline.py
index 9c92e08d..aced668f 100644
--- a/flarestack/analyses/tde/tde_model_spline/convert_spline.py
+++ b/flarestack/analyses/tde/tde_model_spline/convert_spline.py
@@ -2,9 +2,11 @@
 with tabulated values kindly provided by Leonel Morejon.
 These values are converted to a spline, and saved.
 """
-import numpy as np
-import pickle
+
 import os
+import pickle
+
+import numpy as np
 from scipy.interpolate import InterpolatedUnivariateSpline
 
 dir_path = os.path.dirname(os.path.realpath(__file__))
diff --git a/flarestack/analyses/tde/unblind_individual_tdes.py b/flarestack/analyses/tde/unblind_individual_tdes.py
index 338048f5..90ed49de 100644
--- a/flarestack/analyses/tde/unblind_individual_tdes.py
+++ b/flarestack/analyses/tde/unblind_individual_tdes.py
@@ -3,13 +3,16 @@
 quantify the significance of the result. Produces relevant post-unblinding
 plots.
 """
+
+import logging
+
 import numpy as np
+
+from flarestack.analyses.tde.shared_TDE import individual_tde_cat, individual_tdes
 from flarestack.core.unblinding import create_unblinder
-from flarestack.data.icecube import txs_sample_v1, gfu_v002_p04
-from flarestack.utils.custom_dataset import custom_dataset
-from flarestack.analyses.tde.shared_TDE import individual_tdes, individual_tde_cat
-import logging
+from flarestack.data.icecube import gfu_v002_p04, txs_sample_v1
 from flarestack.utils.catalogue_loader import load_catalogue
+from flarestack.utils.custom_dataset import custom_dataset
 
 logging.getLogger().setLevel("INFO")
 
diff --git a/flarestack/analyses/tde/unblind_tde_catalogues.py b/flarestack/analyses/tde/unblind_tde_catalogues.py
index f5897441..efc64de3 100644
--- a/flarestack/analyses/tde/unblind_tde_catalogues.py
+++ b/flarestack/analyses/tde/unblind_tde_catalogues.py
@@ -3,13 +3,16 @@
 quantify the significance of the result. Produces relevant post-unblinding
 plots.
 """
+
+import logging
+
 import numpy as np
+
+from flarestack.analyses.tde.shared_TDE import tde_catalogue_name, tde_catalogues
 from flarestack.core.unblinding import create_unblinder
 from flarestack.data.icecube.gfu.gfu_v002_p01 import txs_sample_v1
-from flarestack.utils.custom_dataset import custom_dataset
-from flarestack.analyses.tde.shared_TDE import tde_catalogue_name, tde_catalogues
-import logging
 from flarestack.utils.catalogue_loader import load_catalogue
+from flarestack.utils.custom_dataset import custom_dataset
 
 logging.getLogger().setLevel("INFO")
 
diff --git a/flarestack/analyses/txs_0506_056/INTRO1.py b/flarestack/analyses/txs_0506_056/INTRO1.py
index b9dccb33..873404cf 100644
--- a/flarestack/analyses/txs_0506_056/INTRO1.py
+++ b/flarestack/analyses/txs_0506_056/INTRO1.py
@@ -1,14 +1,15 @@
 from __future__ import print_function
+
+from flarestack.analyses.txs_0506_056.make_txs_catalogue import (
+    txs_cat_path,
+    txs_catalogue,
+)
+from flarestack.cluster import analyse, wait_cluster
+from flarestack.core.minimisation import MinimisationHandler
 from flarestack.core.results import ResultsHandler
 from flarestack.data.icecube.ps_tracks.ps_v002_p01 import ps_v002_p01
 from flarestack.data.icecube.ps_tracks.ps_v003_p02 import ps_v003_p02
 from flarestack.shared import make_analysis_pickle
-from flarestack.core.minimisation import MinimisationHandler
-from flarestack.cluster import analyse, wait_cluster
-from flarestack.analyses.txs_0506_056.make_txs_catalogue import (
-    txs_catalogue,
-    txs_cat_path,
-)
 
 # Initialise Injectors/LLHs
 
diff --git a/flarestack/analyses/txs_0506_056/compare_txs_spectral_indices.py b/flarestack/analyses/txs_0506_056/compare_txs_spectral_indices.py
index 8821c14c..db99de22 100644
--- a/flarestack/analyses/txs_0506_056/compare_txs_spectral_indices.py
+++ b/flarestack/analyses/txs_0506_056/compare_txs_spectral_indices.py
@@ -1,14 +1,16 @@
-from builtins import str
-import numpy as np
 import os
 import pickle as Pickle
+from builtins import str
+
+import matplotlib.pyplot as plt
+import numpy as np
+
+from flarestack.analyses.txs_0506_056.make_txs_catalogue import txs_cat_path
 from flarestack.core.results import ResultsHandler
 from flarestack.data.icecube.gfu.gfu_v002_p01 import txs_sample_v1
-from flarestack.shared import plot_output_dir, flux_to_k, analysis_dir
 from flarestack.icecube_utils.reference_sensitivity import reference_sensitivity
-import matplotlib.pyplot as plt
+from flarestack.shared import analysis_dir, flux_to_k, plot_output_dir
 from flarestack.utils.custom_dataset import custom_dataset
-from flarestack.analyses.txs_0506_056.make_txs_catalogue import txs_cat_path
 
 catalogue = np.load(txs_cat_path)
 
diff --git a/flarestack/analyses/txs_0506_056/load_gao_spectral_models.py b/flarestack/analyses/txs_0506_056/load_gao_spectral_models.py
index 652beb3a..a57912d2 100644
--- a/flarestack/analyses/txs_0506_056/load_gao_spectral_models.py
+++ b/flarestack/analyses/txs_0506_056/load_gao_spectral_models.py
@@ -1,16 +1,17 @@
-from __future__ import print_function
-from __future__ import division
-from builtins import str
-from builtins import range
+from __future__ import division, print_function
+
 import os
-import numpy as np
 import pickle as Pickle
-from astropy import units as u
-from astropy import constants as const
-from flarestack.shared import plot_output_dir, fs_scratch_dir
+from builtins import range, str
+
 import matplotlib.pyplot as plt
+import numpy as np
+from astropy import constants as const
+from astropy import units as u
 from scipy.interpolate import InterpolatedUnivariateSpline
 
+from flarestack.shared import fs_scratch_dir, plot_output_dir
+
 base_dir = "/afs/ifh.de/user/s/steinrob/scratch/gao_txs/"
 
 output_name = "analyses/txs_0506_056/"
diff --git a/flarestack/analyses/txs_0506_056/loop_over_models.py b/flarestack/analyses/txs_0506_056/loop_over_models.py
index 20305173..d30eb1ce 100644
--- a/flarestack/analyses/txs_0506_056/loop_over_models.py
+++ b/flarestack/analyses/txs_0506_056/loop_over_models.py
@@ -1,20 +1,22 @@
 from __future__ import print_function
-from builtins import str
-from builtins import range
-import numpy as np
+
 import os
 import pickle as Pickle
-from flarestack.core.results import ResultsHandler
-from flarestack.data.icecube.ps_tracks.ps_v002_p01 import IC86_1_dict, IC86_234_dict
-from flarestack.shared import flux_to_k, make_analysis_pickle, plot_output_dir
-from flarestack.core.minimisation import MinimisationHandler
-from flarestack.cluster import run_desy_cluster as rd
+from builtins import range, str
+
 import matplotlib.pyplot as plt
+import numpy as np
+
+from flarestack.analyses.txs_0506_056.load_gao_spectral_models import spline_name
 from flarestack.analyses.txs_0506_056.make_txs_catalogue import (
-    txs_catalogue,
     txs_cat_path,
+    txs_catalogue,
 )
-from flarestack.analyses.txs_0506_056.load_gao_spectral_models import spline_name
+from flarestack.cluster import run_desy_cluster as rd
+from flarestack.core.minimisation import MinimisationHandler
+from flarestack.core.results import ResultsHandler
+from flarestack.data.icecube.ps_tracks.ps_v002_p01 import IC86_1_dict, IC86_234_dict
+from flarestack.shared import flux_to_k, make_analysis_pickle, plot_output_dir
 from flarestack.utils.custom_dataset import custom_dataset
 
 base_dir = "analyses/txs_0506_056/loop_gao_models/"
diff --git a/flarestack/analyses/txs_0506_056/make_txs_catalogue.py b/flarestack/analyses/txs_0506_056/make_txs_catalogue.py
index ac3fa577..ff90224c 100644
--- a/flarestack/analyses/txs_0506_056/make_txs_catalogue.py
+++ b/flarestack/analyses/txs_0506_056/make_txs_catalogue.py
@@ -1,8 +1,10 @@
-from flarestack.utils.prepare_catalogue import custom_sources
-from astropy.coordinates import Distance
-import numpy as np
 import os
+
+import numpy as np
+from astropy.coordinates import Distance
+
 from flarestack.shared import transients_dir
+from flarestack.utils.prepare_catalogue import custom_sources
 
 # Start and end time of neutrino flare, taken from box fit in
 # https://arxiv.org/abs/1807.08794.
diff --git a/flarestack/analyses/txs_0506_056/model_hypothesis_test.py b/flarestack/analyses/txs_0506_056/model_hypothesis_test.py
index f81dd0a1..aa8c373c 100644
--- a/flarestack/analyses/txs_0506_056/model_hypothesis_test.py
+++ b/flarestack/analyses/txs_0506_056/model_hypothesis_test.py
@@ -1,22 +1,25 @@
 from __future__ import print_function
-from builtins import range
-import numpy as np
+
 import os
 import pickle as Pickle
-from flarestack.core.results import ResultsHandler
 import random
-from flarestack.data.icecube.ps_tracks.ps_v002_p01 import IC86_1_dict, IC86_234_dict
-from flarestack.shared import flux_to_k, make_analysis_pickle, plot_output_dir
-from flarestack.core.minimisation import MinimisationHandler
-from flarestack.cluster import run_desy_cluster as rd
+from builtins import range
+
 import matplotlib.pyplot as plt
+import numpy as np
+from scipy.stats import norm
+
+from flarestack.analyses.txs_0506_056.load_gao_spectral_models import spline_name
 from flarestack.analyses.txs_0506_056.make_txs_catalogue import (
-    txs_catalogue,
     txs_cat_path,
+    txs_catalogue,
 )
-from flarestack.analyses.txs_0506_056.load_gao_spectral_models import spline_name
+from flarestack.cluster import run_desy_cluster as rd
+from flarestack.core.minimisation import MinimisationHandler
+from flarestack.core.results import ResultsHandler
+from flarestack.data.icecube.ps_tracks.ps_v002_p01 import IC86_1_dict, IC86_234_dict
+from flarestack.shared import flux_to_k, make_analysis_pickle, plot_output_dir
 from flarestack.utils.custom_dataset import custom_dataset
-from scipy.stats import norm
 
 base_dir = "analyses/txs_0506_056/model_hypothesis_test/"
 
diff --git a/flarestack/analyses/ztf/plot_sensitvity_depth.py b/flarestack/analyses/ztf/plot_sensitvity_depth.py
index 06562372..e009aeac 100644
--- a/flarestack/analyses/ztf/plot_sensitvity_depth.py
+++ b/flarestack/analyses/ztf/plot_sensitvity_depth.py
@@ -1,9 +1,11 @@
 from __future__ import print_function
-import numpy as np
+
 import matplotlib.pyplot as plt
-from astropy import units as u
+import numpy as np
 from astropy import cosmology
+from astropy import units as u
 from astropy.coordinates import Distance
+
 from flarestack.shared import plot_output_dir
 
 dist_mpc = np.array(
diff --git a/flarestack/analyses/ztf/test_code_scalability.py b/flarestack/analyses/ztf/test_code_scalability.py
index df53e2b6..ecca8dc3 100644
--- a/flarestack/analyses/ztf/test_code_scalability.py
+++ b/flarestack/analyses/ztf/test_code_scalability.py
@@ -1,17 +1,18 @@
-from __future__ import print_function
-from __future__ import division
-from builtins import str
-from builtins import range
-import numpy as np
+from __future__ import division, print_function
+
 import datetime
+import math
 import os
 import pickle as Pickle
+from builtins import range, str
+
+import matplotlib.pyplot as plt
+import numpy as np
+
+from flarestack.core.minimisation import MinimisationHandler
 from flarestack.data.icecube.ps_tracks.ps_v002_p01 import ps_v002_p01
-from flarestack.shared import plot_output_dir, flux_to_k, analysis_dir, catalogue_dir
 from flarestack.icecube_utils.reference_sensitivity import reference_sensitivity
-from flarestack.core.minimisation import MinimisationHandler
-import matplotlib.pyplot as plt
-import math
+from flarestack.shared import analysis_dir, catalogue_dir, flux_to_k, plot_output_dir
 from flarestack.utils.prepare_catalogue import cat_dtype
 
 name_root = "analyses/ztf/scalability/"
diff --git a/flarestack/analyses/ztf/test_sens_dep.py b/flarestack/analyses/ztf/test_sens_dep.py
index 34d43d7b..102c28f6 100644
--- a/flarestack/analyses/ztf/test_sens_dep.py
+++ b/flarestack/analyses/ztf/test_sens_dep.py
@@ -1,17 +1,19 @@
-import numpy as np
-import os
 import logging
-from flarestack.data.icecube import gfu_8_year, ps_7_year
-from flarestack.shared import plot_output_dir, k_to_flux
-from flarestack.cluster import analyse, wait_for_cluster
+import os
+
 import matplotlib.pyplot as plt
-from flarestack.utils.simulate_catalogue import simulate_transient_catalogue
+import numpy as np
+
 from flarestack.analyses.ccsn.sn_cosmology import get_sn_type_rate
-from flarestack.utils.catalogue_loader import load_catalogue
-from flarestack.utils.neutrino_astronomy import calculate_astronomy
-from flarestack.utils.asimov_estimator import AsimovEstimator
+from flarestack.cluster import analyse, wait_for_cluster
 from flarestack.core.minimisation import MinimisationHandler
 from flarestack.core.results import ResultsHandler
+from flarestack.data.icecube import gfu_8_year, ps_7_year
+from flarestack.shared import k_to_flux, plot_output_dir
+from flarestack.utils.asimov_estimator import AsimovEstimator
+from flarestack.utils.catalogue_loader import load_catalogue
+from flarestack.utils.neutrino_astronomy import calculate_astronomy
+from flarestack.utils.simulate_catalogue import simulate_transient_catalogue
 
 logging.getLogger().setLevel("INFO")
 
diff --git a/flarestack/analyses/ztf/test_sensitivity_depth.py b/flarestack/analyses/ztf/test_sensitivity_depth.py
index b83949f4..10391f9b 100644
--- a/flarestack/analyses/ztf/test_sensitivity_depth.py
+++ b/flarestack/analyses/ztf/test_sensitivity_depth.py
@@ -1,17 +1,19 @@
-import numpy as np
-import os
 import logging
-from flarestack.data.icecube import ps_7_year
-from flarestack.shared import plot_output_dir, k_to_flux
-from flarestack.cluster import analyse, wait_for_cluster
+import os
+
 import matplotlib.pyplot as plt
-from flarestack.utils.simulate_catalogue import simulate_transient_catalogue
+import numpy as np
+
 from flarestack.analyses.ccsn.sn_cosmology import get_sn_type_rate
-from flarestack.utils.catalogue_loader import load_catalogue
-from flarestack.utils.neutrino_astronomy import calculate_astronomy
-from flarestack.utils.asimov_estimator import AsimovEstimator
+from flarestack.cluster import analyse, wait_for_cluster
 from flarestack.core.minimisation import MinimisationHandler
 from flarestack.core.results import ResultsHandler
+from flarestack.data.icecube import ps_7_year
+from flarestack.shared import k_to_flux, plot_output_dir
+from flarestack.utils.asimov_estimator import AsimovEstimator
+from flarestack.utils.catalogue_loader import load_catalogue
+from flarestack.utils.neutrino_astronomy import calculate_astronomy
+from flarestack.utils.simulate_catalogue import simulate_transient_catalogue
 
 logging.getLogger().setLevel("INFO")
 
diff --git a/flarestack/analyses/ztf/test_sensitivity_depth_time.py b/flarestack/analyses/ztf/test_sensitivity_depth_time.py
index a35e1b83..5b72329f 100644
--- a/flarestack/analyses/ztf/test_sensitivity_depth_time.py
+++ b/flarestack/analyses/ztf/test_sensitivity_depth_time.py
@@ -1,18 +1,20 @@
-import numpy as np
-import os
 import logging
-from flarestack.data.icecube import gfu_8_year
-from flarestack.shared import plot_output_dir, k_to_flux
-from flarestack.cluster import analyse, wait_for_cluster
+import os
+
 import matplotlib.pyplot as plt
-from flarestack.utils.simulate_catalogue import simulate_transient_catalogue
+import numpy as np
+from astropy.cosmology import WMAP9 as cosmo
+
 from flarestack.analyses.ccsn.sn_cosmology import get_sn_type_rate
-from flarestack.utils.catalogue_loader import load_catalogue
-from flarestack.utils.neutrino_astronomy import calculate_astronomy
-from flarestack.utils.asimov_estimator import AsimovEstimator
+from flarestack.cluster import analyse, wait_for_cluster
 from flarestack.core.minimisation import MinimisationHandler
 from flarestack.core.results import ResultsHandler
-from astropy.cosmology import WMAP9 as cosmo
+from flarestack.data.icecube import gfu_8_year
+from flarestack.shared import k_to_flux, plot_output_dir
+from flarestack.utils.asimov_estimator import AsimovEstimator
+from flarestack.utils.catalogue_loader import load_catalogue
+from flarestack.utils.neutrino_astronomy import calculate_astronomy
+from flarestack.utils.simulate_catalogue import simulate_transient_catalogue
 
 logging.getLogger().setLevel("INFO")
 
diff --git a/flarestack/cluster/__init__.py b/flarestack/cluster/__init__.py
index 5c68f170..320f1267 100644
--- a/flarestack/cluster/__init__.py
+++ b/flarestack/cluster/__init__.py
@@ -1,4 +1,5 @@
 import logging
+
 from flarestack.cluster.submitter import Submitter
 
 logger = logging.getLogger(__name__)
diff --git a/flarestack/cluster/submitter.py b/flarestack/cluster/submitter.py
index ad991537..7675578c 100644
--- a/flarestack/cluster/submitter.py
+++ b/flarestack/cluster/submitter.py
@@ -1,31 +1,31 @@
 import copy
 import json
 import logging
-import numpy as np
 import os
-from pathlib import Path
 import shutil
 import subprocess
 import sys
 import time
+from pathlib import Path
 from typing import Optional
 
+import numpy as np
+
+from flarestack.core.minimisation import MinimisationHandler
+from flarestack.core.multiprocess_wrapper import run_multiprocess
+from flarestack.core.results import ResultsHandler
 from flarestack.shared import (
+    cluster_dir,
     fs_dir,
-    log_dir,
     fs_scratch_dir,
-    make_analysis_pickle,
     host_server,
     inj_dir_name,
+    log_dir,
+    make_analysis_pickle,
     name_pickle_output_dir,
-    cluster_dir,
 )
-from flarestack.core.multiprocess_wrapper import run_multiprocess
-from flarestack.core.minimisation import MinimisationHandler
-from flarestack.core.results import ResultsHandler
 from flarestack.utils.make_band_masks_wrapper import make_band_mask
 
-
 logger = logging.getLogger(__name__)
 
 
diff --git a/flarestack/core/angular_error_modifier.py b/flarestack/core/angular_error_modifier.py
index 689f35a5..1d2ab2d3 100644
--- a/flarestack/core/angular_error_modifier.py
+++ b/flarestack/core/angular_error_modifier.py
@@ -1,34 +1,36 @@
+import inspect
 import logging
-import numpy as np
 import os
+import pickle as Pickle
+
+import numexpr
+import numpy as np
+from scipy.interpolate import RectBivariateSpline, interp1d
+
 from flarestack.core.energy_pdf import EnergyPDF
 from flarestack.shared import (
-    min_angular_err,
     base_floor_quantile,
     floor_pickle,
+    min_angular_err,
     pull_pickle,
     weighted_quantile,
 )
 from flarestack.utils.dynamic_pull_correction import (
-    create_quantile_floor_0d,
-    create_quantile_floor_0d_e,
-    create_quantile_floor_1d,
-    create_quantile_floor_1d_e,
     create_pull_0d_e,
     create_pull_1d,
     create_pull_1d_e,
     create_pull_2d,
     create_pull_2d_e,
+    create_quantile_floor_0d,
+    create_quantile_floor_0d_e,
+    create_quantile_floor_1d,
+    create_quantile_floor_1d_e,
 )
-import pickle as Pickle
-from scipy.interpolate import interp1d, RectBivariateSpline
 from flarestack.utils.make_SoB_splines import (
-    get_gamma_support_points,
-    get_gamma_precision,
     _around,
+    get_gamma_precision,
+    get_gamma_support_points,
 )
-import numexpr
-import inspect
 
 logger = logging.getLogger(__name__)
 
diff --git a/flarestack/core/astro.py b/flarestack/core/astro.py
index f70b18a4..0e168fe1 100644
--- a/flarestack/core/astro.py
+++ b/flarestack/core/astro.py
@@ -1,6 +1,7 @@
 """
 Function taken from IceCube astro package.
 """
+
 import numpy as np
 
 
diff --git a/flarestack/core/energy_pdf.py b/flarestack/core/energy_pdf.py
index 777069ff..209f5608 100644
--- a/flarestack/core/energy_pdf.py
+++ b/flarestack/core/energy_pdf.py
@@ -2,10 +2,12 @@
 events based on a given energy PDF.
 
 """
+
+import logging
+import pickle as Pickle
+
 import numexpr
 import numpy as np
-import pickle as Pickle
-import logging
 
 logger = logging.getLogger(__name__)
 
@@ -286,9 +288,7 @@ def flux_integral(self, e_min=None, e_max=None):
         else:
             phi_power = 1 - self.gamma
 
-            phi_integral = (1.0 / phi_power) * (
-                (e_max**phi_power) - (e_min**phi_power)
-            )
+            phi_integral = (1.0 / phi_power) * ((e_max**phi_power) - (e_min**phi_power))
 
         return phi_integral
 
diff --git a/flarestack/core/injector.py b/flarestack/core/injector.py
index 6978a9ef..7db6881b 100644
--- a/flarestack/core/injector.py
+++ b/flarestack/core/injector.py
@@ -1,17 +1,18 @@
 import logging
 import os
-import numpy as np
 import random
 import zipfile
 import zlib
+
+import numpy as np
 from astropy.table import Table
-from flarestack.shared import band_mask_cache_name
+from scipy import interpolate, sparse
+
 from flarestack.core.energy_pdf import EnergyPDF, read_e_pdf_dict
-from flarestack.core.time_pdf import TimePDF, read_t_pdf_dict
 from flarestack.core.spatial_pdf import SpatialPDF
+from flarestack.core.time_pdf import TimePDF, read_t_pdf_dict
+from flarestack.shared import band_mask_cache_name, k_to_flux
 from flarestack.utils.catalogue_loader import calculate_source_weight
-from scipy import sparse, interpolate
-from flarestack.shared import k_to_flux
 
 logger = logging.getLogger(__name__)
 
diff --git a/flarestack/core/llh.py b/flarestack/core/llh.py
index b9989bbc..630583f2 100644
--- a/flarestack/core/llh.py
+++ b/flarestack/core/llh.py
@@ -1,29 +1,31 @@
 import logging
-import numexpr
 import os
+import pickle
+from typing import Optional
+
+import numexpr
 import numpy as np
 import scipy.interpolate
-from scipy import sparse
 from astropy.table import Table
-from typing import Optional
-import pickle
+from scipy import sparse
+
+from flarestack.core.energy_pdf import EnergyPDF, read_e_pdf_dict
+from flarestack.core.spatial_pdf import SpatialPDF
+from flarestack.core.time_pdf import TimePDF, read_t_pdf_dict
 from flarestack.shared import (
-    acceptance_path,
-    llh_energy_hash_pickles,
     SoB_spline_path,
+    acceptance_path,
     default_gamma_precision,
     default_smoothing_order,
+    llh_energy_hash_pickles,
 )
-from flarestack.core.time_pdf import TimePDF, read_t_pdf_dict
-from flarestack.utils.make_SoB_splines import load_spline
-from flarestack.core.energy_pdf import EnergyPDF, read_e_pdf_dict
-from flarestack.core.spatial_pdf import SpatialPDF
 from flarestack.utils.create_acceptance_functions import (
     dec_range,
     make_acceptance_season,
 )
 from flarestack.utils.make_SoB_splines import (
     create_2d_ratio_hist,
+    load_spline,
     make_2d_spline_from_hist,
     make_individual_spline_set,
 )
diff --git a/flarestack/core/minimisation.py b/flarestack/core/minimisation.py
index bfa6038d..f4d09557 100644
--- a/flarestack/core/minimisation.py
+++ b/flarestack/core/minimisation.py
@@ -1,29 +1,31 @@
+import argparse
 import logging
-import numpy as np
-import resource
-import random
-from sys import stdout
 import os
-import argparse
 import pickle as Pickle
+import random
+import resource
+from sys import stdout
+
+import matplotlib as mpl
+import matplotlib.cm as cm
+import matplotlib.pyplot as plt
+import numpy as np
 import scipy.optimize
+from matplotlib.colors import ListedColormap, Normalize
+
+from flarestack.core.angular_error_modifier import BaseAngularErrorModifier
 from flarestack.core.injector import read_injector_dict
 from flarestack.core.llh import LLH, generate_dynamic_flare_class, read_llh_dict
+from flarestack.core.time_pdf import Box, Steady, TimePDF
 from flarestack.shared import (
-    name_pickle_output_dir,
+    flux_to_k,
     inj_dir_name,
+    name_pickle_output_dir,
     plot_output_dir,
     scale_shortener,
-    flux_to_k,
 )
-import matplotlib.pyplot as plt
-import matplotlib.cm as cm
-from matplotlib.colors import Normalize, ListedColormap
-import matplotlib as mpl
-from flarestack.core.time_pdf import TimePDF, Box, Steady
-from flarestack.core.angular_error_modifier import BaseAngularErrorModifier
-from flarestack.utils.catalogue_loader import load_catalogue, calculate_source_weight
 from flarestack.utils.asimov_estimator import estimate_discovery_potential
+from flarestack.utils.catalogue_loader import calculate_source_weight, load_catalogue
 
 logger = logging.getLogger(__name__)
 
diff --git a/flarestack/core/multiprocess_wrapper.py b/flarestack/core/multiprocess_wrapper.py
index 655fc6dc..abfc6ee3 100644
--- a/flarestack/core/multiprocess_wrapper.py
+++ b/flarestack/core/multiprocess_wrapper.py
@@ -1,12 +1,12 @@
-import pickle
+import argparse
 import logging
+import pickle
+import random
 import time
 from logging.handlers import QueueHandler, QueueListener
-import argparse
+from multiprocessing import JoinableQueue, Process, Queue, Value, set_start_method
+
 from flarestack.core.minimisation import MinimisationHandler, read_mh_dict
-from multiprocessing import JoinableQueue, Process, Queue, Value
-import random
-from multiprocessing import set_start_method
 
 logger = logging.getLogger(__name__)
 
diff --git a/flarestack/core/results.py b/flarestack/core/results.py
index 90e46fc8..b7bef68e 100644
--- a/flarestack/core/results.py
+++ b/flarestack/core/results.py
@@ -1,31 +1,33 @@
+import logging
 import os
 import pickle as Pickle
-import numpy as np
-import scipy
-import scipy.stats
+import sys
+
+import matplotlib.animation as animation
 import matplotlib.cm as cm
 import matplotlib.colors as colors
-import matplotlib.animation as animation
 import matplotlib.pyplot as plt
+import numpy as np
+import scipy
+import scipy.stats
+
+from flarestack.core.minimisation import MinimisationHandler
+from flarestack.core.time_pdf import TimePDF
+from flarestack.core.ts_distributions import (
+    get_ts_fit_type,
+    plot_background_ts_distribution,
+    plot_fit_results,
+)
 from flarestack.shared import (
+    flux_to_k,
+    inj_dir_name,
+    k_to_flux,
     name_pickle_output_dir,
     plot_output_dir,
-    k_to_flux,
-    inj_dir_name,
     scale_shortener,
-    flux_to_k,
-)
-from flarestack.core.ts_distributions import (
-    plot_background_ts_distribution,
-    plot_fit_results,
-    get_ts_fit_type,
 )
-from flarestack.utils.neutrino_astronomy import calculate_astronomy
-from flarestack.core.minimisation import MinimisationHandler
-from flarestack.core.time_pdf import TimePDF
 from flarestack.utils.catalogue_loader import load_catalogue
-import sys
-import logging
+from flarestack.utils.neutrino_astronomy import calculate_astronomy
 
 logger = logging.getLogger(__name__)
 
diff --git a/flarestack/core/time_pdf.py b/flarestack/core/time_pdf.py
index 30605169..90de41ae 100644
--- a/flarestack/core/time_pdf.py
+++ b/flarestack/core/time_pdf.py
@@ -1,8 +1,8 @@
 import logging
+
 import numpy as np
 from scipy.interpolate import interp1d
 
-
 logger = logging.getLogger(__name__)
 
 
diff --git a/flarestack/core/ts_distributions.py b/flarestack/core/ts_distributions.py
index 8689a092..090fe0e4 100644
--- a/flarestack/core/ts_distributions.py
+++ b/flarestack/core/ts_distributions.py
@@ -1,9 +1,11 @@
-import numpy as np
+import logging
 import os
+
 import matplotlib.pyplot as plt
-import scipy.optimize, scipy.stats
+import numpy as np
+import scipy.optimize
+import scipy.stats
 from scipy.stats import norm
-import logging
 
 logger = logging.getLogger(__name__)
 
diff --git a/flarestack/core/unblinding.py b/flarestack/core/unblinding.py
index b0f648b2..fd529541 100644
--- a/flarestack/core/unblinding.py
+++ b/flarestack/core/unblinding.py
@@ -1,28 +1,30 @@
 import logging
-import sys
 import os
+import pickle
+import sys
+
+import matplotlib.pyplot as plt
 import numpy as np
+
+from flarestack.core.injector import MockUnblindedInjector, TrueUnblindedInjector
 from flarestack.core.minimisation import (
+    FlareMinimisationHandler,
     MinimisationHandler,
     read_mh_dict,
-    FlareMinimisationHandler,
 )
-from flarestack.core.injector import MockUnblindedInjector, TrueUnblindedInjector
-from flarestack.core.results import ResultsHandler, OverfluctuationError
+from flarestack.core.results import OverfluctuationError, ResultsHandler
 from flarestack.core.time_pdf import TimePDF
+from flarestack.core.ts_distributions import (
+    get_ts_fit_type,
+    plot_background_ts_distribution,
+)
 from flarestack.shared import (
-    name_pickle_output_dir,
-    plot_output_dir,
     analysis_pickle_path,
     limit_output_path,
+    name_pickle_output_dir,
+    plot_output_dir,
     unblinding_output_path,
 )
-import pickle
-from flarestack.core.ts_distributions import (
-    plot_background_ts_distribution,
-    get_ts_fit_type,
-)
-import matplotlib.pyplot as plt
 from flarestack.utils.catalogue_loader import load_catalogue
 
 logger = logging.getLogger(__name__)
diff --git a/flarestack/cosmo/__init__.py b/flarestack/cosmo/__init__.py
index b4171af1..9f4469a7 100644
--- a/flarestack/cosmo/__init__.py
+++ b/flarestack/cosmo/__init__.py
@@ -1,15 +1,15 @@
 from flarestack.cosmo.icecube_diffuse_flux import (
-    get_diffuse_flux_at_100TeV,
+    contours,
+    get_diffuse_flux,
     get_diffuse_flux_at_1GeV,
+    get_diffuse_flux_at_100TeV,
     get_diffuse_flux_contour,
     plot_diffuse_flux,
-    contours,
-    get_diffuse_flux,
 )
-from flarestack.cosmo.rates import get_rate
 from flarestack.cosmo.neutrino_cosmology import (
     calculate_transient_cosmology,
-    define_cosmology_functions,
     cumulative_z,
+    define_cosmology_functions,
 )
+from flarestack.cosmo.rates import get_rate
 from flarestack.cosmo.simulate_catalogue import simulate_transient_catalogue
diff --git a/flarestack/cosmo/icecube_diffuse_flux/__init__.py b/flarestack/cosmo/icecube_diffuse_flux/__init__.py
index 35fa4a66..e86ea5cb 100644
--- a/flarestack/cosmo/icecube_diffuse_flux/__init__.py
+++ b/flarestack/cosmo/icecube_diffuse_flux/__init__.py
@@ -1,10 +1,12 @@
 import logging
+
 import matplotlib.pyplot as plt
-from flarestack.shared import illustration_dir
+
 from flarestack.cosmo.icecube_diffuse_flux.joint_15 import joint_15
 from flarestack.cosmo.icecube_diffuse_flux.nt_16 import nt_16
 from flarestack.cosmo.icecube_diffuse_flux.nt_17 import nt_17
 from flarestack.cosmo.icecube_diffuse_flux.nt_19 import nt_19
+from flarestack.shared import illustration_dir
 
 logger = logging.getLogger(__name__)
 
diff --git a/flarestack/cosmo/icecube_diffuse_flux/joint_15.py b/flarestack/cosmo/icecube_diffuse_flux/joint_15.py
index 6beb8fca..afa4bc46 100644
--- a/flarestack/cosmo/icecube_diffuse_flux/joint_15.py
+++ b/flarestack/cosmo/icecube_diffuse_flux/joint_15.py
@@ -6,6 +6,7 @@
 
 C
 """
+
 import numpy as np
 from astropy import units as u
 
diff --git a/flarestack/cosmo/icecube_diffuse_flux/nt_16.py b/flarestack/cosmo/icecube_diffuse_flux/nt_16.py
index 74bc0a8c..2aa78215 100644
--- a/flarestack/cosmo/icecube_diffuse_flux/nt_16.py
+++ b/flarestack/cosmo/icecube_diffuse_flux/nt_16.py
@@ -6,6 +6,7 @@
 
 
 """
+
 import numpy as np
 from astropy import units as u
 
diff --git a/flarestack/cosmo/icecube_diffuse_flux/nt_17.py b/flarestack/cosmo/icecube_diffuse_flux/nt_17.py
index 824e34a1..f3c8adef 100644
--- a/flarestack/cosmo/icecube_diffuse_flux/nt_17.py
+++ b/flarestack/cosmo/icecube_diffuse_flux/nt_17.py
@@ -6,6 +6,7 @@
 
 
 """
+
 import numpy as np
 from astropy import units as u
 
diff --git a/flarestack/cosmo/icecube_diffuse_flux/nt_19.py b/flarestack/cosmo/icecube_diffuse_flux/nt_19.py
index a6a0ab57..f4fb3015 100644
--- a/flarestack/cosmo/icecube_diffuse_flux/nt_19.py
+++ b/flarestack/cosmo/icecube_diffuse_flux/nt_19.py
@@ -6,6 +6,7 @@
 
 
 """
+
 import numpy as np
 from astropy import units as u
 
diff --git a/flarestack/cosmo/neutrino_cosmology.py b/flarestack/cosmo/neutrino_cosmology.py
index df1be37a..2e6bfcbe 100644
--- a/flarestack/cosmo/neutrino_cosmology.py
+++ b/flarestack/cosmo/neutrino_cosmology.py
@@ -1,14 +1,16 @@
 import logging
-from astropy import units as u
+import os
+
 import astropy
-from astropy.cosmology import Planck15 as cosmo
-from astropy.coordinates import Distance
 import matplotlib.pyplot as plt
 import numpy as np
-import os
-from flarestack.shared import plots_dir
+from astropy import units as u
+from astropy.coordinates import Distance
+from astropy.cosmology import Planck15 as cosmo
+
 from flarestack.core.energy_pdf import EnergyPDF, read_e_pdf_dict
 from flarestack.cosmo.icecube_diffuse_flux import get_diffuse_flux_at_1GeV
+from flarestack.shared import plots_dir
 
 logger = logging.getLogger(__name__)
 
diff --git a/flarestack/cosmo/rates/__init__.py b/flarestack/cosmo/rates/__init__.py
index 2ec47cd2..d877e4d7 100644
--- a/flarestack/cosmo/rates/__init__.py
+++ b/flarestack/cosmo/rates/__init__.py
@@ -1,10 +1,11 @@
 import logging
-from flarestack.cosmo.rates.sfr_rates import get_sfr_rate
+
 from flarestack.cosmo.rates.ccsn_rates import get_ccsn_rate
-from flarestack.cosmo.rates.tde_rates import get_tde_rate
-from flarestack.cosmo.rates.grb_rates import get_grb_rate
 from flarestack.cosmo.rates.fbot_rates import get_fbot_rate
 from flarestack.cosmo.rates.frb_rates import get_frb_rate
+from flarestack.cosmo.rates.grb_rates import get_grb_rate
+from flarestack.cosmo.rates.sfr_rates import get_sfr_rate
+from flarestack.cosmo.rates.tde_rates import get_tde_rate
 
 logger = logging.getLogger(__name__)
 
diff --git a/flarestack/cosmo/rates/ccsn_rates.py b/flarestack/cosmo/rates/ccsn_rates.py
index 010fcd22..21c81d58 100644
--- a/flarestack/cosmo/rates/ccsn_rates.py
+++ b/flarestack/cosmo/rates/ccsn_rates.py
@@ -1,12 +1,14 @@
 import logging
-from astropy.cosmology import Planck15 as cosmo
-from astropy import units as u
+
 import numpy as np
+from astropy import units as u
+from astropy.cosmology import Planck15 as cosmo
+
 from flarestack.cosmo.rates.sfr_rates import (
     get_local_sfr_rate,
     get_sfr_evolution,
-    sfr_evolutions,
     local_sfr_rates,
+    sfr_evolutions,
 )
 
 # Taken from https://arxiv.org/pdf/1509.06574.pdf
diff --git a/flarestack/cosmo/rates/fbot_rates.py b/flarestack/cosmo/rates/fbot_rates.py
index 85367daf..031d18a6 100644
--- a/flarestack/cosmo/rates/fbot_rates.py
+++ b/flarestack/cosmo/rates/fbot_rates.py
@@ -1,5 +1,7 @@
 import logging
+
 from astropy import units as u
+
 from flarestack.cosmo.rates.sfr_rates import get_sfr_evolution
 
 local_fbot_rates = {
diff --git a/flarestack/cosmo/rates/frb_rates.py b/flarestack/cosmo/rates/frb_rates.py
index 2d28e7f0..59147cba 100644
--- a/flarestack/cosmo/rates/frb_rates.py
+++ b/flarestack/cosmo/rates/frb_rates.py
@@ -1,5 +1,7 @@
 import logging
+
 from astropy import units as u
+
 from flarestack.cosmo.rates.sfr_rates import get_sfr_evolution
 
 local_frb_rates = {
diff --git a/flarestack/cosmo/rates/grb_rates.py b/flarestack/cosmo/rates/grb_rates.py
index fa483565..13f2255b 100644
--- a/flarestack/cosmo/rates/grb_rates.py
+++ b/flarestack/cosmo/rates/grb_rates.py
@@ -1,4 +1,5 @@
 import logging
+
 import numpy as np
 from astropy import units as u
 
diff --git a/flarestack/cosmo/rates/sfr_rates.py b/flarestack/cosmo/rates/sfr_rates.py
index 723ccc75..c54fd572 100644
--- a/flarestack/cosmo/rates/sfr_rates.py
+++ b/flarestack/cosmo/rates/sfr_rates.py
@@ -1,4 +1,5 @@
 import logging
+
 from astropy import units as u
 
 
diff --git a/flarestack/cosmo/rates/tde_rates.py b/flarestack/cosmo/rates/tde_rates.py
index 5c1305f8..fe8efc0e 100644
--- a/flarestack/cosmo/rates/tde_rates.py
+++ b/flarestack/cosmo/rates/tde_rates.py
@@ -1,4 +1,5 @@
 import logging
+
 from astropy import units as u
 
 # Assumed source evolution is highly negative
diff --git a/flarestack/cosmo/simulate_catalogue.py b/flarestack/cosmo/simulate_catalogue.py
index 37412590..e7a1c1f1 100644
--- a/flarestack/cosmo/simulate_catalogue.py
+++ b/flarestack/cosmo/simulate_catalogue.py
@@ -1,16 +1,18 @@
+import logging
+import os
+
 import numpy as np
 from astropy import units as u
 from astropy.coordinates import Distance
-import os
-import logging
-from flarestack.shared import catalogue_dir
+from scipy.interpolate import interp1d
+
 from flarestack.core.data_types import catalogue_dtype
 from flarestack.cosmo.neutrino_cosmology import (
+    cumulative_z,
     define_cosmology_functions,
     integrate_over_z,
-    cumulative_z,
 )
-from scipy.interpolate import interp1d
+from flarestack.shared import catalogue_dir
 
 logger = logging.getLogger(__name__)
 
diff --git a/flarestack/data/__init__.py b/flarestack/data/__init__.py
index 95d10e11..f7cd60d3 100644
--- a/flarestack/data/__init__.py
+++ b/flarestack/data/__init__.py
@@ -1,21 +1,22 @@
-"""Generic classes for a Dataset, and for a Season.
-"""
-import os
-import numpy as np
+"""Generic classes for a Dataset, and for a Season."""
+
 import copy
 import logging
+import os
+
+import numpy as np
 from numpy.lib.recfunctions import append_fields, drop_fields
-from flarestack.core.injector import MCInjector, EffectiveAreaInjector
-from flarestack.utils.make_SoB_splines import make_background_spline
-from flarestack.utils.create_acceptance_functions import make_acceptance_season
+
+import flarestack
+from flarestack.core.injector import EffectiveAreaInjector, MCInjector
 from flarestack.core.time_pdf import (
-    TimePDF,
     DetectorOnOffList,
     FixedEndBox,
     FixedRefBox,
+    TimePDF,
 )
-import flarestack
-
+from flarestack.utils.create_acceptance_functions import make_acceptance_season
+from flarestack.utils.make_SoB_splines import make_background_spline
 
 logger = logging.getLogger(__name__)
 
diff --git a/flarestack/data/dataset_index.py b/flarestack/data/dataset_index.py
index ef8403c8..95886553 100644
--- a/flarestack/data/dataset_index.py
+++ b/flarestack/data/dataset_index.py
@@ -1,11 +1,10 @@
-""" This module provides the functionality to create a dataset index by instantiating a DatasetIndex object and importing all the available datasets. Each dataset, in turns, is expect to import `dataset_index` from this module, and adding its own information.
-"""
+"""This module provides the functionality to create a dataset index by instantiating a DatasetIndex object and importing all the available datasets. Each dataset, in turns, is expect to import `dataset_index` from this module, and adding its own information."""
 
 import logging
 from typing import List
-from flarestack.data import Dataset
 
-from flarestack.data.icecube import ps_v004_p02, nt_v005_p01, gfu_v002_p04
+from flarestack.data import Dataset
+from flarestack.data.icecube import gfu_v002_p04, nt_v005_p01, ps_v004_p02
 
 logger = logging.getLogger(__name__)
 
diff --git a/flarestack/data/icecube/__init__.py b/flarestack/data/icecube/__init__.py
index f133d535..9f50587e 100644
--- a/flarestack/data/icecube/__init__.py
+++ b/flarestack/data/icecube/__init__.py
@@ -1,15 +1,15 @@
+from flarestack.data.icecube.gfu.gfu_v002_p01 import gfu_v002_p01, txs_sample_v1
+from flarestack.data.icecube.gfu.gfu_v002_p02 import gfu_v002_p02, txs_sample_v2
+from flarestack.data.icecube.gfu.gfu_v002_p04 import gfu_v002_p04
+from flarestack.data.icecube.ic_season import icecube_dataset_dir
+from flarestack.data.icecube.northern_tracks.nt_v002_p05 import nt_v002_p05
+from flarestack.data.icecube.northern_tracks.nt_v005_p00 import nt_v005_p00
+from flarestack.data.icecube.northern_tracks.nt_v005_p01 import nt_v005_p01
 from flarestack.data.icecube.ps_tracks.ps_v002_p01 import ps_v002_p01
 from flarestack.data.icecube.ps_tracks.ps_v002_p03 import ps_v002_p03
 from flarestack.data.icecube.ps_tracks.ps_v003_p01 import ps_v003_p01
 from flarestack.data.icecube.ps_tracks.ps_v003_p02 import ps_v003_p02
 from flarestack.data.icecube.ps_tracks.ps_v004_p02 import ps_v004_p02
-from flarestack.data.icecube.northern_tracks.nt_v002_p05 import nt_v002_p05
-from flarestack.data.icecube.northern_tracks.nt_v005_p00 import nt_v005_p00
-from flarestack.data.icecube.northern_tracks.nt_v005_p01 import nt_v005_p01
-from flarestack.data.icecube.gfu.gfu_v002_p01 import gfu_v002_p01, txs_sample_v1
-from flarestack.data.icecube.gfu.gfu_v002_p02 import gfu_v002_p02, txs_sample_v2
-from flarestack.data.icecube.gfu.gfu_v002_p04 import gfu_v002_p04
-from flarestack.data.icecube.ic_season import icecube_dataset_dir
 
 ps_7_year = ps_v002_p01
 ps_10_year = ps_v003_p02
diff --git a/flarestack/data/icecube/gfu/gfu_v002_p01.py b/flarestack/data/icecube/gfu/gfu_v002_p01.py
index 1122fa13..6ae0c8b1 100644
--- a/flarestack/data/icecube/gfu/gfu_v002_p01.py
+++ b/flarestack/data/icecube/gfu/gfu_v002_p01.py
@@ -8,15 +8,16 @@
 This is the sample that was used for the original TXS analysis in 2017
 (NOT THE ONE THAT INCLUDED ADDITIONAL DATA UP TO SPRING 2018!)
 """
-from flarestack.data.icecube.ps_tracks.ps_v002_p01 import ps_v002_p01
+
+import numpy as np
+
+from flarestack.data.icecube.gfu import gfu_binning
 from flarestack.data.icecube.ic_season import (
     IceCubeDataset,
     IceCubeSeason,
     get_dataset_dir,
 )
-
-from flarestack.data.icecube.gfu import gfu_binning
-import numpy as np
+from flarestack.data.icecube.ps_tracks.ps_v002_p01 import ps_v002_p01
 
 icecube_dataset_dir = get_dataset_dir()
 
diff --git a/flarestack/data/icecube/gfu/gfu_v002_p02.py b/flarestack/data/icecube/gfu/gfu_v002_p02.py
index 59fa8b49..92eb7665 100644
--- a/flarestack/data/icecube/gfu/gfu_v002_p02.py
+++ b/flarestack/data/icecube/gfu/gfu_v002_p02.py
@@ -3,14 +3,15 @@
 This is the sample that was used for the second TXS analysis up to March 2018
 """
 
-from flarestack.data.icecube.ps_tracks.ps_v002_p01 import ps_v002_p01
+import numpy as np
+
+from flarestack.data.icecube.gfu import gfu_binning
 from flarestack.data.icecube.ic_season import (
     IceCubeDataset,
     IceCubeSeason,
     get_dataset_dir,
 )
-from flarestack.data.icecube.gfu import gfu_binning
-import numpy as np
+from flarestack.data.icecube.ps_tracks.ps_v002_p01 import ps_v002_p01
 
 icecube_dataset_dir = get_dataset_dir()
 
diff --git a/flarestack/data/icecube/gfu/gfu_v002_p04.py b/flarestack/data/icecube/gfu/gfu_v002_p04.py
index e9a22d27..2b2ae9d9 100644
--- a/flarestack/data/icecube/gfu/gfu_v002_p04.py
+++ b/flarestack/data/icecube/gfu/gfu_v002_p04.py
@@ -4,14 +4,16 @@
 in Thomas Kintscher's final unblinding of GFU for the application of the
 'Online Flare Search' method on archival data.
 """
-from flarestack.data.icecube.ps_tracks.ps_v002_p01 import ps_v002_p01
+
+import numpy as np
+
+from flarestack.data.icecube.gfu import gfu_binning
 from flarestack.data.icecube.ic_season import (
     IceCubeDataset,
     IceCubeSeason,
     get_dataset_dir,
 )
-from flarestack.data.icecube.gfu import gfu_binning
-import numpy as np
+from flarestack.data.icecube.ps_tracks.ps_v002_p01 import ps_v002_p01
 
 icecube_dataset_dir = get_dataset_dir()
 
diff --git a/flarestack/data/icecube/ic_season.py b/flarestack/data/icecube/ic_season.py
index 22819c8a..a36559ce 100644
--- a/flarestack/data/icecube/ic_season.py
+++ b/flarestack/data/icecube/ic_season.py
@@ -1,5 +1,12 @@
-import numpy as np
+import logging
 import os
+from pathlib import Path
+from typing import Optional
+
+import numpy as np
+from scipy.interpolate import interp1d
+
+from flarestack.core.time_pdf import DetectorOnOffList, TimePDF
 from flarestack.data import Dataset, SeasonWithMC
 from flarestack.icecube_utils.dataset_loader import (
     data_loader,
@@ -7,12 +14,6 @@
     verify_grl_with_data,
 )
 from flarestack.shared import host_server
-from flarestack.core.time_pdf import TimePDF, DetectorOnOffList
-from scipy.interpolate import interp1d
-import logging
-from pathlib import Path
-from typing import Optional
-
 
 logger = logging.getLogger(__name__)
 
diff --git a/flarestack/data/icecube/northern_tracks/__init__.py b/flarestack/data/icecube/northern_tracks/__init__.py
index 956e44a0..650e7bf2 100644
--- a/flarestack/data/icecube/northern_tracks/__init__.py
+++ b/flarestack/data/icecube/northern_tracks/__init__.py
@@ -1,7 +1,7 @@
 import numpy as np
-from flarestack.data.icecube.ic_season import IceCubeSeason
 from numpy.lib.recfunctions import rename_fields
 
+from flarestack.data.icecube.ic_season import IceCubeSeason
 
 diffuse_binning = {
     "IC59": (
diff --git a/flarestack/data/icecube/northern_tracks/nt_v002_p05.py b/flarestack/data/icecube/northern_tracks/nt_v002_p05.py
index 3559f2be..292f07e5 100644
--- a/flarestack/data/icecube/northern_tracks/nt_v002_p05.py
+++ b/flarestack/data/icecube/northern_tracks/nt_v002_p05.py
@@ -67,6 +67,7 @@
 
 
 """
+
 from flarestack.data.icecube.ic_season import IceCubeDataset, get_dataset_dir
 from flarestack.data.icecube.northern_tracks import NTSeason, get_diffuse_binning
 
diff --git a/flarestack/data/icecube/ps_tracks/__init__.py b/flarestack/data/icecube/ps_tracks/__init__.py
index 963eeb6a..1ea33269 100644
--- a/flarestack/data/icecube/ps_tracks/__init__.py
+++ b/flarestack/data/icecube/ps_tracks/__init__.py
@@ -1,4 +1,5 @@
 import numpy as np
+
 from flarestack.data.icecube.ic_season import IceCubeDataset, IceCubeSeason
 
 # Sets transition between North/South
diff --git a/flarestack/data/icecube/ps_tracks/ps_v002_p01.py b/flarestack/data/icecube/ps_tracks/ps_v002_p01.py
index a5e64452..eaed959b 100644
--- a/flarestack/data/icecube/ps_tracks/ps_v002_p01.py
+++ b/flarestack/data/icecube/ps_tracks/ps_v002_p01.py
@@ -57,14 +57,17 @@
       MC File    IC86-2014_corrected_MC_v2.npy
 
 """
+
+import copy
+
+import numpy as np
+
 from flarestack.data.icecube.ic_season import (
     IceCubeDataset,
     IceCubeSeason,
     get_dataset_dir,
 )
 from flarestack.data.icecube.ps_tracks import get_ps_binning
-import numpy as np
-import copy
 
 icecube_dataset_dir = get_dataset_dir()
 
diff --git a/flarestack/data/icecube/ps_tracks/ps_v002_p03.py b/flarestack/data/icecube/ps_tracks/ps_v002_p03.py
index 7fe36d5b..811696d0 100644
--- a/flarestack/data/icecube/ps_tracks/ps_v002_p03.py
+++ b/flarestack/data/icecube/ps_tracks/ps_v002_p03.py
@@ -78,15 +78,17 @@
     /data/ana/PointSource/IC86_2012_PS/Merged_11*.hd5
 
 """
+
+import logging
+
+import numpy as np
+
 from flarestack.data.icecube.ic_season import (
     IceCubeDataset,
     IceCubeSeason,
     get_dataset_dir,
 )
 from flarestack.data.icecube.ps_tracks import get_ps_binning
-import numpy as np
-import logging
-
 
 logger = logging.getLogger(__name__)
 
diff --git a/flarestack/data/icecube/ps_tracks/ps_v003_p01.py b/flarestack/data/icecube/ps_tracks/ps_v003_p01.py
index 1844d0dc..0b34e975 100644
--- a/flarestack/data/icecube/ps_tracks/ps_v003_p01.py
+++ b/flarestack/data/icecube/ps_tracks/ps_v003_p01.py
@@ -1,12 +1,13 @@
-"""PS Tracks v003_p01, as used by Tessa in the 10 year PS analysis.
-"""
+"""PS Tracks v003_p01, as used by Tessa in the 10 year PS analysis."""
+
+import numpy as np
+
 from flarestack.data.icecube.ic_season import (
-    IceCubeSeason,
     IceCubeDataset,
+    IceCubeSeason,
     get_dataset_dir,
 )
 from flarestack.data.icecube.ps_tracks import get_ps_binning
-import numpy as np
 
 icecube_dataset_dir = get_dataset_dir()
 
diff --git a/flarestack/data/icecube/ps_tracks/ps_v003_p02.py b/flarestack/data/icecube/ps_tracks/ps_v003_p02.py
index c9f9e863..fa67384c 100644
--- a/flarestack/data/icecube/ps_tracks/ps_v003_p02.py
+++ b/flarestack/data/icecube/ps_tracks/ps_v003_p02.py
@@ -1,13 +1,15 @@
 """PS Tracks v003_p02, as used by Alex Pizzuto in the Anita analysis.
 It includes runs 125865-125867 with 2 dropped strings.
 """
+
+import numpy as np
+
 from flarestack.data.icecube.ic_season import (
-    IceCubeSeason,
     IceCubeDataset,
+    IceCubeSeason,
     get_dataset_dir,
 )
 from flarestack.data.icecube.ps_tracks import get_ps_binning
-import numpy as np
 
 icecube_dataset_dir = get_dataset_dir()
 
diff --git a/flarestack/data/icecube/ps_tracks/ps_v004_p02.py b/flarestack/data/icecube/ps_tracks/ps_v004_p02.py
index 092a40c5..8c48cd26 100644
--- a/flarestack/data/icecube/ps_tracks/ps_v004_p02.py
+++ b/flarestack/data/icecube/ps_tracks/ps_v004_p02.py
@@ -1,6 +1,6 @@
 """
-    This is the interface to the IceCube PS Tracks v4.2 dataset
-    For further information, see the readme file contained in the dataset folder.
+This is the interface to the IceCube PS Tracks v4.2 dataset
+For further information, see the readme file contained in the dataset folder.
 """
 
 import numpy as np
@@ -10,7 +10,6 @@
     IceCubeSeason,
     icecube_dataset_dir,
 )
-
 from flarestack.data.icecube.ps_tracks import get_ps_binning
 
 sample_name = "ps_tracks_v004_p02"
diff --git a/flarestack/data/icecube/public/IC86_1/parse_public_IC86_1.py b/flarestack/data/icecube/public/IC86_1/parse_public_IC86_1.py
index c1bf6506..11891505 100644
--- a/flarestack/data/icecube/public/IC86_1/parse_public_IC86_1.py
+++ b/flarestack/data/icecube/public/IC86_1/parse_public_IC86_1.py
@@ -13,11 +13,12 @@
 
 """
 
-import os
-import numpy as np
 import csv
+import os
 import pickle
 
+import numpy as np
+
 from flarestack.data.icecube.ps_tracks.ps_v002_p01 import IC86_1_dict
 from flarestack.icecube_utils.dataset_loader import data_loader
 from flarestack.shared import input_dir
diff --git a/flarestack/data/icecube/public/txs_0506_056/txs_data.py b/flarestack/data/icecube/public/txs_0506_056/txs_data.py
index 8f2237c6..4826428f 100644
--- a/flarestack/data/icecube/public/txs_0506_056/txs_data.py
+++ b/flarestack/data/icecube/public/txs_0506_056/txs_data.py
@@ -1,9 +1,11 @@
-import os
-import numpy as np
 import csv
+import os
 import pickle
-from flarestack.shared import public_dataset_dir
+
+import numpy as np
+
 from flarestack.analyses.txs_0506_056.make_txs_catalogue import txs_catalogue
+from flarestack.shared import public_dataset_dir
 
 src_dir = os.path.dirname(os.path.realpath(__file__)) + "/"
 
diff --git a/flarestack/data/public/icecube/__init__.py b/flarestack/data/public/icecube/__init__.py
index b66bfcb9..f70abba8 100644
--- a/flarestack/data/public/icecube/__init__.py
+++ b/flarestack/data/public/icecube/__init__.py
@@ -1,19 +1,21 @@
-import os
-import numpy as np
-import pickle
 import csv
-import scipy.interpolate
 import logging
-from flarestack.data import SeasonWithoutMC, Season
-from flarestack.icecube_utils.dataset_loader import data_loader
+import os
+import pickle
+
 import matplotlib.pyplot as plt
-from matplotlib.colors import LogNorm
 import matplotlib.ticker as ticker
+import numpy as np
+import scipy.interpolate
+from matplotlib.colors import LogNorm
+
+from flarestack.data import Season, SeasonWithoutMC
+from flarestack.icecube_utils.dataset_loader import data_loader
 from flarestack.shared import (
     eff_a_plot_dir,
     energy_proxy_path,
-    med_ang_res_path,
     energy_proxy_plot_path,
+    med_ang_res_path,
 )
 
 logger = logging.getLogger(__name__)
diff --git a/flarestack/data/public/icecube/all_sky_point_source/all_sky_3_year.py b/flarestack/data/public/icecube/all_sky_point_source/all_sky_3_year.py
index cba82fdf..3329dbc1 100644
--- a/flarestack/data/public/icecube/all_sky_point_source/all_sky_3_year.py
+++ b/flarestack/data/public/icecube/all_sky_point_source/all_sky_3_year.py
@@ -1,15 +1,21 @@
-import os
-import logging
-import numpy as np
 import csv
+import logging
+import os
 import pickle
-from flarestack.shared import public_dataset_dir, med_ang_res_path, ang_res_plot_path
-from flarestack.utils.make_SoB_splines import make_individual_spline_set
-from flarestack.shared import SoB_spline_path
+import zipfile
+
+import matplotlib.pyplot as plt
+import numpy as np
+
 from flarestack.data import Dataset
 from flarestack.data.public.icecube import PublicICSeason
-import matplotlib.pyplot as plt
-import zipfile
+from flarestack.shared import (
+    SoB_spline_path,
+    ang_res_plot_path,
+    med_ang_res_path,
+    public_dataset_dir,
+)
+from flarestack.utils.make_SoB_splines import make_individual_spline_set
 
 logger = logging.getLogger(__name__)
 
diff --git a/flarestack/data/simulate/__init__.py b/flarestack/data/simulate/__init__.py
index 10355e1e..8abb9f73 100644
--- a/flarestack/data/simulate/__init__.py
+++ b/flarestack/data/simulate/__init__.py
@@ -1,11 +1,13 @@
-from flarestack.data import SeasonWithoutMC, Dataset
-import os
-import numpy as np
 import copy
 import logging
+import os
+
+import numpy as np
+
 from flarestack.core.energy_pdf import EnergyPDF
-from flarestack.shared import sim_dataset_dir_path, k_to_flux
+from flarestack.data import Dataset, SeasonWithoutMC
 from flarestack.data.public.icecube import PublicICSeason
+from flarestack.shared import k_to_flux, sim_dataset_dir_path
 
 sim_dir = os.path.abspath(os.path.dirname(__file__))
 raw_sim_data_dir = sim_dir + "/raw_data/"
diff --git a/flarestack/data/simulate/potemkin.py b/flarestack/data/simulate/potemkin.py
index cca17fbe..172c480b 100644
--- a/flarestack/data/simulate/potemkin.py
+++ b/flarestack/data/simulate/potemkin.py
@@ -1,12 +1,14 @@
-import numpy as np
+import logging
 import random
+
+import numpy as np
 from scipy.interpolate import interp1d
-import logging
-from flarestack.data.public import icecube_ps_3_year
+
 from flarestack.core.energy_pdf import EnergyPDF
-from flarestack.data.simulate import SimSeason, SimDataset
-from flarestack.shared import flux_to_k
+from flarestack.data.public import icecube_ps_3_year
 from flarestack.data.public.icecube import PublicICSeason
+from flarestack.data.simulate import SimDataset, SimSeason
+from flarestack.shared import flux_to_k
 
 logger = logging.getLogger(__name__)
 
diff --git a/flarestack/data/simulate/simcube.py b/flarestack/data/simulate/simcube.py
index b78e120b..cf596d0e 100644
--- a/flarestack/data/simulate/simcube.py
+++ b/flarestack/data/simulate/simcube.py
@@ -1,10 +1,12 @@
-import numpy as np
+import logging
 import random
+
+import numpy as np
 from scipy.interpolate import interp1d
-import logging
-from flarestack.data.public import icecube_ps_3_year
+
 from flarestack.core.energy_pdf import EnergyPDF
-from flarestack.data.simulate import SimSeason, SimDataset
+from flarestack.data.public import icecube_ps_3_year
+from flarestack.data.simulate import SimDataset, SimSeason
 
 logger = logging.getLogger(__name__)
 
diff --git a/flarestack/data/simulate/simcube_gen2.py b/flarestack/data/simulate/simcube_gen2.py
index 8b0d1124..933d1164 100644
--- a/flarestack/data/simulate/simcube_gen2.py
+++ b/flarestack/data/simulate/simcube_gen2.py
@@ -1,11 +1,12 @@
-from flarestack.data.public import icecube_ps_3_year
-from flarestack.core.energy_pdf import EnergyPDF
-from flarestack.data.simulate import SimSeason, SimDataset
-import numpy as np
-import random
 import os
+import random
+
+import numpy as np
 from scipy.interpolate import interp1d
-from flarestack.data.simulate import raw_sim_data_dir
+
+from flarestack.core.energy_pdf import EnergyPDF
+from flarestack.data.public import icecube_ps_3_year
+from flarestack.data.simulate import SimDataset, SimSeason, raw_sim_data_dir
 
 gen2_eff_a_path = raw_sim_data_dir + "gen2_inice_effective_area.npz"
 
diff --git a/flarestack/icecube_utils/dataset_loader.py b/flarestack/icecube_utils/dataset_loader.py
index 6553bef8..a2db8fca 100644
--- a/flarestack/icecube_utils/dataset_loader.py
+++ b/flarestack/icecube_utils/dataset_loader.py
@@ -1,6 +1,8 @@
-import numpy as np
 import logging
+
+import numpy as np
 from numpy.lib.recfunctions import append_fields, rename_fields
+
 from flarestack.shared import min_angular_err
 
 logger = logging.getLogger(__name__)
diff --git a/flarestack/icecube_utils/reference_sensitivity.py b/flarestack/icecube_utils/reference_sensitivity.py
index 095ff47e..fc14d251 100644
--- a/flarestack/icecube_utils/reference_sensitivity.py
+++ b/flarestack/icecube_utils/reference_sensitivity.py
@@ -1,9 +1,10 @@
+import logging
 import os
+
 import numpy as np
-import logging
 from scipy.interpolate import interp1d, interp2d
-from flarestack.data.icecube.ic_season import get_published_sens_ref_dir
 
+from flarestack.data.icecube.ic_season import get_published_sens_ref_dir
 
 logger = logging.getLogger(__name__)
 
diff --git a/flarestack/misc/check_min_angular_error.py b/flarestack/misc/check_min_angular_error.py
index dab91035..6ce628ae 100644
--- a/flarestack/misc/check_min_angular_error.py
+++ b/flarestack/misc/check_min_angular_error.py
@@ -1,9 +1,11 @@
-import numpy as np
 import os
+
 import matplotlib.pyplot as plt
+import numpy as np
+
 from flarestack.data.icecube.gfu.gfu_v002_p01 import txs_sample_v1
 from flarestack.icecube_utils.dataset_loader import data_loader
-from flarestack.shared import plots_dir, min_angular_err
+from flarestack.shared import min_angular_err, plots_dir
 
 ang_err_dir = plots_dir + "angular_error/"
 
diff --git a/flarestack/misc/flare_llh_plots.py b/flarestack/misc/flare_llh_plots.py
index c90cb5a6..a48805a4 100644
--- a/flarestack/misc/flare_llh_plots.py
+++ b/flarestack/misc/flare_llh_plots.py
@@ -1,6 +1,7 @@
-import numpy as np
-import matplotlib.pyplot as plt
 import matplotlib.cm as cm
+import matplotlib.pyplot as plt
+import numpy as np
+
 from flarestack.shared import illustration_dir
 
 plt.xkcd()
diff --git a/flarestack/misc/negative_ns_plots.py b/flarestack/misc/negative_ns_plots.py
index b9074dba..f0bf1f83 100644
--- a/flarestack/misc/negative_ns_plots.py
+++ b/flarestack/misc/negative_ns_plots.py
@@ -1,9 +1,10 @@
-import numpy as np
-import matplotlib.pyplot as plt
 import matplotlib.cm as cm
-from flarestack.shared import illustration_dir
+import matplotlib.pyplot as plt
+import numpy as np
 import scipy.stats
 
+from flarestack.shared import illustration_dir
+
 plt.xkcd()
 
 n_zero = 10000
diff --git a/flarestack/misc/plot_data_rate.py b/flarestack/misc/plot_data_rate.py
index 8bb3e423..9782abc4 100644
--- a/flarestack/misc/plot_data_rate.py
+++ b/flarestack/misc/plot_data_rate.py
@@ -5,10 +5,12 @@
 # if in the future this script is updated to use a new data set, remove the `type: ignore` comment
 
 import os
+
 import matplotlib.pyplot as plt
+
 from flarestack.data.icecube.northern_tracks.nt_v002_p01 import diffuse_8year
-from flarestack.shared import plots_dir
 from flarestack.icecube_utils.dataset_loader import data_loader, grl_loader
+from flarestack.shared import plots_dir
 
 data_rate_dir = plots_dir + "data_rate/"
 
diff --git a/flarestack/misc/plots_azimuth_asymmetry.py b/flarestack/misc/plots_azimuth_asymmetry.py
index 9f9b763b..ed8227d6 100644
--- a/flarestack/misc/plots_azimuth_asymmetry.py
+++ b/flarestack/misc/plots_azimuth_asymmetry.py
@@ -1,14 +1,16 @@
-import numpy as np
-import scipy.interpolate
 import os
-import numexpr
 import resource
+
+import matplotlib.cm as cm
 import matplotlib.pyplot as plt
+import numexpr
+import numpy as np
+import scipy.interpolate
+
+from flarestack.core.energy_pdf import PowerLaw
 from flarestack.data.icecube.gfu.gfu_v002_p01 import gfu_v002_p01
 from flarestack.icecube_utils.dataset_loader import data_loader
-from flarestack.core.energy_pdf import PowerLaw
 from flarestack.shared import plots_dir
-import matplotlib.cm as cm
 
 # season_dict = gfu_v002_p01[0]
 
diff --git a/flarestack/misc/verify_discovery_potential_estimation.py b/flarestack/misc/verify_discovery_potential_estimation.py
index e887a594..bba2e80e 100644
--- a/flarestack/misc/verify_discovery_potential_estimation.py
+++ b/flarestack/misc/verify_discovery_potential_estimation.py
@@ -4,16 +4,18 @@
 # this also implies that this file is currently untested, otherwise such a test would fail
 # if in the future its functionality is restored, remove the `type: ignore` comment
 
-import numpy as np
 import os
+
+import matplotlib.pyplot as plt
+import numpy as np
+
 from flarestack.data.icecube.ps_tracks.ps_v002_p01 import ps_v002_p01
-from flarestack.shared import plot_output_dir
-from flarestack.utils.prepare_catalogue import ps_catalogue_name
 from flarestack.icecube_utils.reference_sensitivity import (
     reference_7year_discovery_potential,
 )
-import matplotlib.pyplot as plt
+from flarestack.shared import plot_output_dir
 from flarestack.utils.asimov_estimator import AsimovEstimator
+from flarestack.utils.prepare_catalogue import ps_catalogue_name
 
 name = "verify_disc_potential"
 
diff --git a/flarestack/shared.py b/flarestack/shared.py
index bfc06bda..15ecf13d 100644
--- a/flarestack/shared.py
+++ b/flarestack/shared.py
@@ -1,13 +1,14 @@
+import json
+import logging
 import os
-import numpy as np
-import socket
 import pickle
-import json
+import socket
 import zlib
-import logging
 from pathlib import Path
 from typing import Optional
 
+import numpy as np
+
 logger = logging.getLogger(__name__)
 
 # ==============================================================================
diff --git a/flarestack/utils/__init__.py b/flarestack/utils/__init__.py
index 886bd0c2..04b03a40 100644
--- a/flarestack/utils/__init__.py
+++ b/flarestack/utils/__init__.py
@@ -1,4 +1,4 @@
-from flarestack.utils.custom_dataset import custom_dataset
 from flarestack.utils.catalogue_loader import load_catalogue
-from flarestack.utils.prepare_catalogue import ps_catalogue_name
+from flarestack.utils.custom_dataset import custom_dataset
 from flarestack.utils.neutrino_astronomy import calculate_astronomy
+from flarestack.utils.prepare_catalogue import ps_catalogue_name
diff --git a/flarestack/utils/asimov_estimator.py b/flarestack/utils/asimov_estimator.py
index 2228450b..21ee5041 100644
--- a/flarestack/utils/asimov_estimator.py
+++ b/flarestack/utils/asimov_estimator.py
@@ -4,13 +4,16 @@
 quickly guess appropriate flux scales, or understand trends, without full
 calculations.
 """
+
+import logging
+
 import numpy as np
-from flarestack.core.llh import LLH
+from scipy.stats import norm
+
 from flarestack.core.astro import angular_distance
+from flarestack.core.llh import LLH
 from flarestack.shared import k_to_flux
-from flarestack.utils.catalogue_loader import load_catalogue, calculate_source_weight
-from scipy.stats import norm
-import logging
+from flarestack.utils.catalogue_loader import calculate_source_weight, load_catalogue
 
 
 def estimate_discovery_potential(seasons, inj_dict, sources, llh_dict, raw_scale=1.0):
diff --git a/flarestack/utils/create_acceptance_functions.py b/flarestack/utils/create_acceptance_functions.py
index c23bb0de..d2b06632 100644
--- a/flarestack/utils/create_acceptance_functions.py
+++ b/flarestack/utils/create_acceptance_functions.py
@@ -1,9 +1,11 @@
-import numpy as np
+import logging
 import os
 import pickle
-import logging
-from flarestack.shared import acceptance_path, get_base_sob_plot_dir
+
+import numpy as np
+
 from flarestack.core.energy_pdf import PowerLaw
+from flarestack.shared import acceptance_path, get_base_sob_plot_dir
 from flarestack.utils.make_SoB_splines import make_plot
 
 logger = logging.getLogger(__name__)
diff --git a/flarestack/utils/custom_dataset.py b/flarestack/utils/custom_dataset.py
index 47a5222a..8685da49 100644
--- a/flarestack/utils/custom_dataset.py
+++ b/flarestack/utils/custom_dataset.py
@@ -1,4 +1,5 @@
 import numpy as np
+
 from flarestack.core.time_pdf import TimePDF
 
 
diff --git a/flarestack/utils/dynamic_pull_correction.py b/flarestack/utils/dynamic_pull_correction.py
index fbc1351e..8ca7e371 100644
--- a/flarestack/utils/dynamic_pull_correction.py
+++ b/flarestack/utils/dynamic_pull_correction.py
@@ -1,11 +1,13 @@
-import numpy as np
 import os
 import pickle as Pickle
-from flarestack.icecube_utils.dataset_loader import data_loader
-from flarestack.core.energy_pdf import EnergyPDF
+
 import matplotlib.pyplot as plt
-from flarestack.shared import weighted_quantile, floor_pickle, pull_pickle
+import numpy as np
+
 from flarestack.core.astro import angular_distance
+from flarestack.core.energy_pdf import EnergyPDF
+from flarestack.icecube_utils.dataset_loader import data_loader
+from flarestack.shared import floor_pickle, pull_pickle, weighted_quantile
 from flarestack.utils.make_SoB_splines import get_gamma_support_points
 
 
diff --git a/flarestack/utils/make_SoB_splines.py b/flarestack/utils/make_SoB_splines.py
index a5342820..82e70bee 100644
--- a/flarestack/utils/make_SoB_splines.py
+++ b/flarestack/utils/make_SoB_splines.py
@@ -1,19 +1,21 @@
 import logging
-import numpy as np
 import os
+import pickle as Pickle
 import shutil
+
+import matplotlib.pyplot as plt
+import numpy as np
 import scipy.interpolate
-import pickle as Pickle
+
+from flarestack.core.energy_pdf import PowerLaw
 from flarestack.shared import (
-    default_gamma_precision,
     SoB_spline_path,
-    default_smoothing_order,
     bkg_spline_path,
-    get_base_sob_plot_dir,
+    default_gamma_precision,
+    default_smoothing_order,
     flarestack_gamma_precision,
+    get_base_sob_plot_dir,
 )
-from flarestack.core.energy_pdf import PowerLaw
-import matplotlib.pyplot as plt
 
 environment_smoothing_key = "FLARESATCK_SMOOTHING_ORDER"
 environment_precision_key = "FLARESTACK_PRECISION"
diff --git a/flarestack/utils/make_band_masks_wrapper.py b/flarestack/utils/make_band_masks_wrapper.py
index 08df336b..217d9d5b 100644
--- a/flarestack/utils/make_band_masks_wrapper.py
+++ b/flarestack/utils/make_band_masks_wrapper.py
@@ -1,19 +1,19 @@
-""" Script for making band masks for each season when 'large_catalogue' minimizer is chosen.
-    In case jobs are submitted in the cluster, this script is ran locally first,
-    performing 1 trial in order to write the band masks per catalogue,
-    which are then loaded when running trials on the cluster.
-    This tackles issue #7 in flarestack repo
+"""Script for making band masks for each season when 'large_catalogue' minimizer is chosen.
+In case jobs are submitted in the cluster, this script is ran locally first,
+performing 1 trial in order to write the band masks per catalogue,
+which are then loaded when running trials on the cluster.
+This tackles issue #7 in flarestack repo
 """
 
+import logging
 import os
+
 import numpy as np
+
 from flarestack.core.minimisation import MinimisationHandler
 from flarestack.shared import band_mask_cache_name
 from flarestack.utils.catalogue_loader import load_catalogue
 
-
-import logging
-
 logger = logging.getLogger(__name__)
 
 
diff --git a/flarestack/utils/neutrino_astronomy.py b/flarestack/utils/neutrino_astronomy.py
index f85eec49..f1a961e2 100644
--- a/flarestack/utils/neutrino_astronomy.py
+++ b/flarestack/utils/neutrino_astronomy.py
@@ -1,9 +1,11 @@
 import logging
+import math
+
 import astropy
-from astropy import units as u
 import numpy as np
-import math
+from astropy import units as u
 from astropy.coordinates import Distance
+
 from flarestack.core.energy_pdf import EnergyPDF
 
 logger = logging.getLogger(__name__)
diff --git a/flarestack/utils/percentile_SoB.py b/flarestack/utils/percentile_SoB.py
index c95bfefa..34f3ecc6 100644
--- a/flarestack/utils/percentile_SoB.py
+++ b/flarestack/utils/percentile_SoB.py
@@ -6,14 +6,16 @@
 
 
 import os
+
+import matplotlib.pyplot as plt
 import numpy as np
 import scipy
+from numpy.lib.recfunctions import append_fields
 from scipy.interpolate import interp1d
-import matplotlib.pyplot as plt
+
 from flarestack.data.icecube.ps_tracks.ps_v002_p01 import IC86_1_dict
-from flarestack.shared import dataset_plot_dir
 from flarestack.icecube_utils.dataset_loader import data_loader
-from numpy.lib.recfunctions import append_fields
+from flarestack.shared import dataset_plot_dir
 
 season = IC86_1_dict
 
diff --git a/flarestack/utils/prepare_catalogue.py b/flarestack/utils/prepare_catalogue.py
index 9ed5405d..dabeb538 100644
--- a/flarestack/utils/prepare_catalogue.py
+++ b/flarestack/utils/prepare_catalogue.py
@@ -5,11 +5,14 @@
 arbitrary number of sources.
 
 """
-import numpy as np
-import os
+
 import logging
+import os
 import random
 import zlib
+
+import numpy as np
+
 from flarestack.shared import catalogue_dir
 
 """ 
diff --git a/poetry.lock b/poetry.lock
index 0b94d729..9e784271 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -286,34 +286,34 @@ lxml = ["lxml"]
 
 [[package]]
 name = "black"
-version = "23.12.1"
+version = "25.1.0"
 description = "The uncompromising code formatter."
 optional = false
-python-versions = ">=3.8"
+python-versions = ">=3.9"
 groups = ["dev"]
 files = [
-    {file = "black-23.12.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:e0aaf6041986767a5e0ce663c7a2f0e9eaf21e6ff87a5f95cbf3675bfd4c41d2"},
-    {file = "black-23.12.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:c88b3711d12905b74206227109272673edce0cb29f27e1385f33b0163c414bba"},
-    {file = "black-23.12.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a920b569dc6b3472513ba6ddea21f440d4b4c699494d2e972a1753cdc25df7b0"},
-    {file = "black-23.12.1-cp310-cp310-win_amd64.whl", hash = "sha256:3fa4be75ef2a6b96ea8d92b1587dd8cb3a35c7e3d51f0738ced0781c3aa3a5a3"},
-    {file = "black-23.12.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:8d4df77958a622f9b5a4c96edb4b8c0034f8434032ab11077ec6c56ae9f384ba"},
-    {file = "black-23.12.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:602cfb1196dc692424c70b6507593a2b29aac0547c1be9a1d1365f0d964c353b"},
-    {file = "black-23.12.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9c4352800f14be5b4864016882cdba10755bd50805c95f728011bcb47a4afd59"},
-    {file = "black-23.12.1-cp311-cp311-win_amd64.whl", hash = "sha256:0808494f2b2df923ffc5723ed3c7b096bd76341f6213989759287611e9837d50"},
-    {file = "black-23.12.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:25e57fd232a6d6ff3f4478a6fd0580838e47c93c83eaf1ccc92d4faf27112c4e"},
-    {file = "black-23.12.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:2d9e13db441c509a3763a7a3d9a49ccc1b4e974a47be4e08ade2a228876500ec"},
-    {file = "black-23.12.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6d1bd9c210f8b109b1762ec9fd36592fdd528485aadb3f5849b2740ef17e674e"},
-    {file = "black-23.12.1-cp312-cp312-win_amd64.whl", hash = "sha256:ae76c22bde5cbb6bfd211ec343ded2163bba7883c7bc77f6b756a1049436fbb9"},
-    {file = "black-23.12.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:1fa88a0f74e50e4487477bc0bb900c6781dbddfdfa32691e780bf854c3b4a47f"},
-    {file = "black-23.12.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:a4d6a9668e45ad99d2f8ec70d5c8c04ef4f32f648ef39048d010b0689832ec6d"},
-    {file = "black-23.12.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b18fb2ae6c4bb63eebe5be6bd869ba2f14fd0259bda7d18a46b764d8fb86298a"},
-    {file = "black-23.12.1-cp38-cp38-win_amd64.whl", hash = "sha256:c04b6d9d20e9c13f43eee8ea87d44156b8505ca8a3c878773f68b4e4812a421e"},
-    {file = "black-23.12.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:3e1b38b3135fd4c025c28c55ddfc236b05af657828a8a6abe5deec419a0b7055"},
-    {file = "black-23.12.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:4f0031eaa7b921db76decd73636ef3a12c942ed367d8c3841a0739412b260a54"},
-    {file = "black-23.12.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:97e56155c6b737854e60a9ab1c598ff2533d57e7506d97af5481141671abf3ea"},
-    {file = "black-23.12.1-cp39-cp39-win_amd64.whl", hash = "sha256:dd15245c8b68fe2b6bd0f32c1556509d11bb33aec9b5d0866dd8e2ed3dba09c2"},
-    {file = "black-23.12.1-py3-none-any.whl", hash = "sha256:78baad24af0f033958cad29731e27363183e140962595def56423e626f4bee3e"},
-    {file = "black-23.12.1.tar.gz", hash = "sha256:4ce3ef14ebe8d9509188014d96af1c456a910d5b5cbf434a09fef7e024b3d0d5"},
+    {file = "black-25.1.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:759e7ec1e050a15f89b770cefbf91ebee8917aac5c20483bc2d80a6c3a04df32"},
+    {file = "black-25.1.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:0e519ecf93120f34243e6b0054db49c00a35f84f195d5bce7e9f5cfc578fc2da"},
+    {file = "black-25.1.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:055e59b198df7ac0b7efca5ad7ff2516bca343276c466be72eb04a3bcc1f82d7"},
+    {file = "black-25.1.0-cp310-cp310-win_amd64.whl", hash = "sha256:db8ea9917d6f8fc62abd90d944920d95e73c83a5ee3383493e35d271aca872e9"},
+    {file = "black-25.1.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:a39337598244de4bae26475f77dda852ea00a93bd4c728e09eacd827ec929df0"},
+    {file = "black-25.1.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:96c1c7cd856bba8e20094e36e0f948718dc688dba4a9d78c3adde52b9e6c2299"},
+    {file = "black-25.1.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:bce2e264d59c91e52d8000d507eb20a9aca4a778731a08cfff7e5ac4a4bb7096"},
+    {file = "black-25.1.0-cp311-cp311-win_amd64.whl", hash = "sha256:172b1dbff09f86ce6f4eb8edf9dede08b1fce58ba194c87d7a4f1a5aa2f5b3c2"},
+    {file = "black-25.1.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:4b60580e829091e6f9238c848ea6750efed72140b91b048770b64e74fe04908b"},
+    {file = "black-25.1.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:1e2978f6df243b155ef5fa7e558a43037c3079093ed5d10fd84c43900f2d8ecc"},
+    {file = "black-25.1.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:3b48735872ec535027d979e8dcb20bf4f70b5ac75a8ea99f127c106a7d7aba9f"},
+    {file = "black-25.1.0-cp312-cp312-win_amd64.whl", hash = "sha256:ea0213189960bda9cf99be5b8c8ce66bb054af5e9e861249cd23471bd7b0b3ba"},
+    {file = "black-25.1.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:8f0b18a02996a836cc9c9c78e5babec10930862827b1b724ddfe98ccf2f2fe4f"},
+    {file = "black-25.1.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:afebb7098bfbc70037a053b91ae8437c3857482d3a690fefc03e9ff7aa9a5fd3"},
+    {file = "black-25.1.0-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:030b9759066a4ee5e5aca28c3c77f9c64789cdd4de8ac1df642c40b708be6171"},
+    {file = "black-25.1.0-cp313-cp313-win_amd64.whl", hash = "sha256:a22f402b410566e2d1c950708c77ebf5ebd5d0d88a6a2e87c86d9fb48afa0d18"},
+    {file = "black-25.1.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:a1ee0a0c330f7b5130ce0caed9936a904793576ef4d2b98c40835d6a65afa6a0"},
+    {file = "black-25.1.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:f3df5f1bf91d36002b0a75389ca8663510cf0531cca8aa5c1ef695b46d98655f"},
+    {file = "black-25.1.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:d9e6827d563a2c820772b32ce8a42828dc6790f095f441beef18f96aa6f8294e"},
+    {file = "black-25.1.0-cp39-cp39-win_amd64.whl", hash = "sha256:bacabb307dca5ebaf9c118d2d2f6903da0d62c9faa82bd21a33eecc319559355"},
+    {file = "black-25.1.0-py3-none-any.whl", hash = "sha256:95e8176dae143ba9097f351d174fdaf0ccd29efb414b362ae3fd72bf0f710717"},
+    {file = "black-25.1.0.tar.gz", hash = "sha256:33496d5cd1222ad73391352b4ae8da15253c5de89b93a80b3e2c8d9a19ec2666"},
 ]
 
 [package.dependencies]
@@ -327,7 +327,7 @@ typing-extensions = {version = ">=4.0.1", markers = "python_version < \"3.11\""}
 
 [package.extras]
 colorama = ["colorama (>=0.4.3)"]
-d = ["aiohttp (>=3.7.4)", "aiohttp (>=3.7.4,!=3.9.0)"]
+d = ["aiohttp (>=3.10)"]
 jupyter = ["ipython (>=7.8.0)", "tokenize-rt (>=3.2.0)"]
 uvloop = ["uvloop (>=0.15.2)"]
 
@@ -443,6 +443,18 @@ markers = {dev = "implementation_name == \"pypy\""}
 [package.dependencies]
 pycparser = "*"
 
+[[package]]
+name = "cfgv"
+version = "3.4.0"
+description = "Validate configuration and produce human readable error messages."
+optional = false
+python-versions = ">=3.8"
+groups = ["dev"]
+files = [
+    {file = "cfgv-3.4.0-py2.py3-none-any.whl", hash = "sha256:b7265b1f29fd3316bfcd2b330d63d024f2bfd8bcb8b0272f8e19a504856c48f9"},
+    {file = "cfgv-3.4.0.tar.gz", hash = "sha256:e52591d4c5f5dead8e0f673fb16db7949d2cfb3f7da4582893288f0ded8fe560"},
+]
+
 [[package]]
 name = "charset-normalizer"
 version = "3.4.1"
@@ -835,6 +847,18 @@ files = [
     {file = "defusedxml-0.7.1.tar.gz", hash = "sha256:1bb3032db185915b62d7c6209c5a8792be6a32ab2fedacc84e01b52c51aa3e69"},
 ]
 
+[[package]]
+name = "distlib"
+version = "0.3.9"
+description = "Distribution utilities"
+optional = false
+python-versions = "*"
+groups = ["dev"]
+files = [
+    {file = "distlib-0.3.9-py2.py3-none-any.whl", hash = "sha256:47f8c22fd27c27e25a65601af709b38e4f0a45ea4fc2e710f65755fa8caaaf87"},
+    {file = "distlib-0.3.9.tar.gz", hash = "sha256:a60f20dea646b8a33f3e7772f74dc0b2d0772d2837ee1342a00645c81edf9403"},
+]
+
 [[package]]
 name = "docopt"
 version = "0.6.2"
@@ -904,6 +928,23 @@ files = [
 [package.extras]
 devel = ["colorama", "json-spec", "jsonschema", "pylint", "pytest", "pytest-benchmark", "pytest-cache", "validictory"]
 
+[[package]]
+name = "filelock"
+version = "3.17.0"
+description = "A platform independent file lock."
+optional = false
+python-versions = ">=3.9"
+groups = ["dev"]
+files = [
+    {file = "filelock-3.17.0-py3-none-any.whl", hash = "sha256:533dc2f7ba78dc2f0f531fc6c4940addf7b70a481e269a5a3b93be94ffbe8338"},
+    {file = "filelock-3.17.0.tar.gz", hash = "sha256:ee4e77401ef576ebb38cd7f13b9b28893194acc20a8e68e18730ba9c0e54660e"},
+]
+
+[package.extras]
+docs = ["furo (>=2024.8.6)", "sphinx (>=8.1.3)", "sphinx-autodoc-typehints (>=3)"]
+testing = ["covdefaults (>=2.3)", "coverage (>=7.6.10)", "diff-cover (>=9.2.1)", "pytest (>=8.3.4)", "pytest-asyncio (>=0.25.2)", "pytest-cov (>=6)", "pytest-mock (>=3.14)", "pytest-timeout (>=2.3.1)", "virtualenv (>=20.28.1)"]
+typing = ["typing-extensions (>=4.12.2)"]
+
 [[package]]
 name = "fonttools"
 version = "4.55.5"
@@ -1172,6 +1213,21 @@ http2 = ["h2 (>=3,<5)"]
 socks = ["socksio (==1.*)"]
 zstd = ["zstandard (>=0.18.0)"]
 
+[[package]]
+name = "identify"
+version = "2.6.6"
+description = "File identification library for Python"
+optional = false
+python-versions = ">=3.9"
+groups = ["dev"]
+files = [
+    {file = "identify-2.6.6-py2.py3-none-any.whl", hash = "sha256:cbd1810bce79f8b671ecb20f53ee0ae8e86ae84b557de31d89709dc2a48ba881"},
+    {file = "identify-2.6.6.tar.gz", hash = "sha256:7bec12768ed44ea4761efb47806f0a41f86e7c0a5fdf5950d4648c90eca7e251"},
+]
+
+[package.extras]
+license = ["ukkonen"]
+
 [[package]]
 name = "idna"
 version = "3.10"
@@ -1357,6 +1413,22 @@ files = [
 [package.dependencies]
 arrow = ">=0.15.0"
 
+[[package]]
+name = "isort"
+version = "6.0.0"
+description = "A Python utility / library to sort Python imports."
+optional = false
+python-versions = ">=3.9.0"
+groups = ["dev"]
+files = [
+    {file = "isort-6.0.0-py3-none-any.whl", hash = "sha256:567954102bb47bb12e0fae62606570faacddd441e45683968c8d1734fb1af892"},
+    {file = "isort-6.0.0.tar.gz", hash = "sha256:75d9d8a1438a9432a7d7b54f2d3b45cad9a4a0fdba43617d9873379704a8bdf1"},
+]
+
+[package.extras]
+colors = ["colorama"]
+plugins = ["setuptools"]
+
 [[package]]
 name = "jedi"
 version = "0.19.2"
@@ -2362,6 +2434,18 @@ files = [
     {file = "nest_asyncio-1.6.0.tar.gz", hash = "sha256:6f172d5449aca15afd6c646851f4e31e02c598d553a667e38cafa997cfec55fe"},
 ]
 
+[[package]]
+name = "nodeenv"
+version = "1.9.1"
+description = "Node.js virtual environment builder"
+optional = false
+python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*,>=2.7"
+groups = ["dev"]
+files = [
+    {file = "nodeenv-1.9.1-py2.py3-none-any.whl", hash = "sha256:ba11c9782d29c27c70ffbdda2d7415098754709be8a7056d79a737cd901155c9"},
+    {file = "nodeenv-1.9.1.tar.gz", hash = "sha256:6ec12890a2dab7946721edbfbcd91f3319c6ccc9aec47be7c7e6b7011ee6645f"},
+]
+
 [[package]]
 name = "notebook"
 version = "7.3.2"
@@ -2685,6 +2769,25 @@ docs = ["furo (>=2024.8.6)", "proselint (>=0.14)", "sphinx (>=8.0.2)", "sphinx-a
 test = ["appdirs (==1.4.4)", "covdefaults (>=2.3)", "pytest (>=8.3.2)", "pytest-cov (>=5)", "pytest-mock (>=3.14)"]
 type = ["mypy (>=1.11.2)"]
 
+[[package]]
+name = "pre-commit"
+version = "4.1.0"
+description = "A framework for managing and maintaining multi-language pre-commit hooks."
+optional = false
+python-versions = ">=3.9"
+groups = ["dev"]
+files = [
+    {file = "pre_commit-4.1.0-py2.py3-none-any.whl", hash = "sha256:d29e7cb346295bcc1cc75fc3e92e343495e3ea0196c9ec6ba53f49f10ab6ae7b"},
+    {file = "pre_commit-4.1.0.tar.gz", hash = "sha256:ae3f018575a588e30dfddfab9a05448bfbd6b73d78709617b5a2b853549716d4"},
+]
+
+[package.dependencies]
+cfgv = ">=2.0.0"
+identify = ">=1.0.0"
+nodeenv = ">=0.11.1"
+pyyaml = ">=5.1"
+virtualenv = ">=20.10.0"
+
 [[package]]
 name = "prometheus-client"
 version = "0.21.1"
@@ -3898,6 +4001,27 @@ h2 = ["h2 (>=4,<5)"]
 socks = ["pysocks (>=1.5.6,!=1.5.7,<2.0)"]
 zstd = ["zstandard (>=0.18.0)"]
 
+[[package]]
+name = "virtualenv"
+version = "20.29.1"
+description = "Virtual Python Environment builder"
+optional = false
+python-versions = ">=3.8"
+groups = ["dev"]
+files = [
+    {file = "virtualenv-20.29.1-py3-none-any.whl", hash = "sha256:4e4cb403c0b0da39e13b46b1b2476e505cb0046b25f242bee80f62bf990b2779"},
+    {file = "virtualenv-20.29.1.tar.gz", hash = "sha256:b8b8970138d32fb606192cb97f6cd4bb644fa486be9308fb9b63f81091b5dc35"},
+]
+
+[package.dependencies]
+distlib = ">=0.3.7,<1"
+filelock = ">=3.12.2,<4"
+platformdirs = ">=3.9.1,<5"
+
+[package.extras]
+docs = ["furo (>=2023.7.26)", "proselint (>=0.13)", "sphinx (>=7.1.2,!=7.3)", "sphinx-argparse (>=0.4)", "sphinxcontrib-towncrier (>=0.2.1a0)", "towncrier (>=23.6)"]
+test = ["covdefaults (>=2.3)", "coverage (>=7.2.7)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7)", "packaging (>=23.1)", "pytest (>=7.4)", "pytest-env (>=0.8.2)", "pytest-freezer (>=0.4.8)", "pytest-mock (>=3.11.1)", "pytest-randomly (>=3.12)", "pytest-timeout (>=2.1)", "setuptools (>=68)", "time-machine (>=2.10)"]
+
 [[package]]
 name = "wcwidth"
 version = "0.2.13"
@@ -3987,4 +4111,4 @@ type = ["pytest-mypy"]
 [metadata]
 lock-version = "2.1"
 python-versions = ">=3.9, <4.0"
-content-hash = "632e63e0fc4ae377518e06ba6afeda63d1be6e91158f49b489c42334f3af622d"
+content-hash = "6bf209f3890c7c8a39c487409db852f5a5c66bbea756a613d9d8c527358a93ee"
diff --git a/pyproject.toml b/pyproject.toml
index ed6ad978..dec522c0 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -40,13 +40,18 @@ urllib3 = "2.3.0"
 optional = true
 
 [tool.poetry.group.dev.dependencies]
-black = "^23.12"
+black = "^25.1.0"
 mypy = "^1.5.1"
 Sphinx = "^5.1.1"
 sphinx-rtd-theme = ">=1,<3"
 myst-parser = "^0.18.0"
 nbsphinx = ">=0.8.9,<0.10.0"
 myst-nb = ">=0.16,<0.18"
+isort = "^6.0.0"
+pre-commit = "^4.1.0"
+
+[tool.isort]
+profile = "black"
 
 [build-system]
 requires = ["poetry-core>=1.2.0"]
diff --git a/tests/test_asimov_estimator.py b/tests/test_asimov_estimator.py
index 5bf3ae14..c19d0251 100644
--- a/tests/test_asimov_estimator.py
+++ b/tests/test_asimov_estimator.py
@@ -1,11 +1,14 @@
 """A standard time-integrated analysis is performed, using one year of
 IceCube data (IC86_1).
 """
+
 import unittest
+
 import numpy as np
+
 from flarestack.data.public import icecube_ps_3_year
-from flarestack.utils.prepare_catalogue import ps_catalogue_name
 from flarestack.utils.asimov_estimator import AsimovEstimator
+from flarestack.utils.prepare_catalogue import ps_catalogue_name
 
 # Initialise Injectors/LLHs
 
diff --git a/tests/test_cosmo.py b/tests/test_cosmo.py
index 330e4dc4..54698eb6 100644
--- a/tests/test_cosmo.py
+++ b/tests/test_cosmo.py
@@ -1,17 +1,20 @@
 """A standard time-integrated analysis is performed, using one year of
 IceCube data (IC86_1).
 """
+
 import logging
 import unittest
+
+from astropy import units as u
+
 from flarestack.cosmo import (
+    calculate_transient_cosmology,
+    get_diffuse_flux,
     get_diffuse_flux_at_1GeV,
     get_diffuse_flux_at_100TeV,
-    get_diffuse_flux,
-    calculate_transient_cosmology,
     get_rate,
 )
 from flarestack.cosmo.icecube_diffuse_flux import contours, plot_diffuse_flux
-from astropy import units as u
 
 default_flux_100TeV = [
     (2.2333333333333334e-18 / (u.cm**2 * u.GeV * u.s * u.sr), 2.5),
diff --git a/tests/test_cosmo_rates.py b/tests/test_cosmo_rates.py
index c3ec2390..e42eb860 100644
--- a/tests/test_cosmo_rates.py
+++ b/tests/test_cosmo_rates.py
@@ -1,15 +1,17 @@
 import logging
 import unittest
+
 import numpy as np
 from astropy import units as u
+
 from flarestack.cosmo import get_rate
 from flarestack.cosmo.rates import source_maps
-from flarestack.cosmo.rates.tde_rates import tde_evolutions, local_tde_rates
-from flarestack.cosmo.rates.sfr_rates import sfr_evolutions, local_sfr_rates
 from flarestack.cosmo.rates.ccsn_rates import kcc_rates, sn_subclass_rates
-from flarestack.cosmo.rates.grb_rates import grb_evolutions, local_grb_rates
 from flarestack.cosmo.rates.fbot_rates import local_fbot_rates
 from flarestack.cosmo.rates.frb_rates import local_frb_rates
+from flarestack.cosmo.rates.grb_rates import grb_evolutions, local_grb_rates
+from flarestack.cosmo.rates.sfr_rates import local_sfr_rates, sfr_evolutions
+from flarestack.cosmo.rates.tde_rates import local_tde_rates, tde_evolutions
 
 zrange = np.linspace(0.0, 8.0, 5)
 
diff --git a/tests/test_energy_pdfs.py b/tests/test_energy_pdfs.py
index 56bb5f0f..d0cc7025 100644
--- a/tests/test_energy_pdfs.py
+++ b/tests/test_energy_pdfs.py
@@ -1,16 +1,19 @@
 """A standard time-integrated analysis is performed, using one year of
 IceCube data (IC86_1).
 """
+
 import logging
-import unittest
 import pickle
+import unittest
+
 import numpy as np
 from scipy.interpolate import InterpolatedUnivariateSpline
-from flarestack.data.public import icecube_ps_3_year
-from flarestack.core.unblinding import create_unblinder
+
 from flarestack.core.energy_pdf import EnergyPDF
-from flarestack.utils.prepare_catalogue import ps_catalogue_name
+from flarestack.core.unblinding import create_unblinder
+from flarestack.data.public import icecube_ps_3_year
 from flarestack.shared import energy_spline_dir
+from flarestack.utils.prepare_catalogue import ps_catalogue_name
 
 logger = logging.getLogger()
 logger.setLevel("ERROR")
diff --git a/tests/test_full_analysis_chain.py b/tests/test_full_analysis_chain.py
index a0488f77..5dcf4fc5 100644
--- a/tests/test_full_analysis_chain.py
+++ b/tests/test_full_analysis_chain.py
@@ -1,12 +1,19 @@
 """A standard time-integrated analysis is performed, using one year of
 IceCube data (IC86_1).
 """
+
 import logging
 import unittest
-from flarestack.data.public import icecube_ps_3_year
-from flarestack import create_unblinder, MinimisationHandler
+
+from flarestack import (
+    MinimisationHandler,
+    OverfluctuationError,
+    ResultsHandler,
+    analyse,
+    create_unblinder,
+)
 from flarestack.analyses.tde.shared_TDE import tde_catalogue_name
-from flarestack import analyse, ResultsHandler, OverfluctuationError
+from flarestack.data.public import icecube_ps_3_year
 
 logging.getLogger().setLevel("INFO")
 
diff --git a/tests/test_likelihood_fixed_energy.py b/tests/test_likelihood_fixed_energy.py
index bfdcfef2..8b1a422b 100644
--- a/tests/test_likelihood_fixed_energy.py
+++ b/tests/test_likelihood_fixed_energy.py
@@ -1,12 +1,15 @@
 """A standard time-integrated analysis is performed, using one year of
 IceCube data (IC86_1).
 """
+
 import logging
 import unittest
+
 import numpy as np
+
+from flarestack.core.unblinding import create_unblinder
 from flarestack.data.public import icecube_ps_3_year
 from flarestack.utils.prepare_catalogue import ps_catalogue_name
-from flarestack.core.unblinding import create_unblinder
 
 # Initialise Injectors/LLHs
 
diff --git a/tests/test_likelihood_spatial.py b/tests/test_likelihood_spatial.py
index 842e880d..daebf394 100644
--- a/tests/test_likelihood_spatial.py
+++ b/tests/test_likelihood_spatial.py
@@ -1,8 +1,9 @@
 import logging
+import unittest
+
+from flarestack.core.unblinding import create_unblinder
 from flarestack.data.public import icecube_ps_3_year
 from flarestack.utils.prepare_catalogue import ps_catalogue_name
-from flarestack.core.unblinding import create_unblinder
-import unittest
 
 llh_dict = {
     "llh_name": "spatial",
diff --git a/tests/test_likelihood_standard.py b/tests/test_likelihood_standard.py
index ed579db8..4cbdc7ee 100644
--- a/tests/test_likelihood_standard.py
+++ b/tests/test_likelihood_standard.py
@@ -1,12 +1,15 @@
 """A standard time-integrated analysis is performed, using one year of
 IceCube data (IC86_1).
 """
+
 import logging
 import unittest
+
 import numpy as np
+
+from flarestack.core.unblinding import create_unblinder
 from flarestack.data.public import icecube_ps_3_year
 from flarestack.utils.prepare_catalogue import ps_catalogue_name
-from flarestack.core.unblinding import create_unblinder
 
 # Initialise Injectors/LLHs
 
diff --git a/tests/test_likelihood_standard_matrix.py b/tests/test_likelihood_standard_matrix.py
index ce98bd4d..8672637f 100644
--- a/tests/test_likelihood_standard_matrix.py
+++ b/tests/test_likelihood_standard_matrix.py
@@ -1,11 +1,13 @@
 """A standard time-integrated analysis is performed, using one year of
 IceCube data (IC86_1).
 """
+
 import logging
 import unittest
-from flarestack.data.public import icecube_ps_3_year
-from flarestack.core.unblinding import create_unblinder
+
 from flarestack.analyses.tde.shared_TDE import tde_catalogue_name
+from flarestack.core.unblinding import create_unblinder
+from flarestack.data.public import icecube_ps_3_year
 
 # Initialise Injectors/LLHs
 
diff --git a/tests/test_likelihood_standard_overlapping.py b/tests/test_likelihood_standard_overlapping.py
index 0f2c0cfa..eceaf04d 100644
--- a/tests/test_likelihood_standard_overlapping.py
+++ b/tests/test_likelihood_standard_overlapping.py
@@ -1,11 +1,13 @@
 """A standard time-integrated analysis is performed, using one year of
 IceCube data (IC86_1).
 """
+
 import logging
 import unittest
-from flarestack.data.public import icecube_ps_3_year
-from flarestack.core.unblinding import create_unblinder
+
 from flarestack.analyses.tde.shared_TDE import tde_catalogue_name
+from flarestack.core.unblinding import create_unblinder
+from flarestack.data.public import icecube_ps_3_year
 
 # Initialise Injectors/LLHs
 
diff --git a/tests/test_mh_fit_weights.py b/tests/test_mh_fit_weights.py
index e9e2191d..abbcf85a 100644
--- a/tests/test_mh_fit_weights.py
+++ b/tests/test_mh_fit_weights.py
@@ -1,12 +1,14 @@
 """A standard time-integrated analysis is performed, using one year of
 IceCube data (IC86_1).
 """
+
 import logging
 import unittest
-from flarestack.data.public import icecube_ps_3_year
-from flarestack.core.unblinding import create_unblinder
-from flarestack.analyses.tde.shared_TDE import tde_catalogue_name
+
 from flarestack import MinimisationHandler, analyse
+from flarestack.analyses.tde.shared_TDE import tde_catalogue_name
+from flarestack.core.unblinding import create_unblinder
+from flarestack.data.public import icecube_ps_3_year
 
 # Initialise Injectors/LLHs
 
diff --git a/tests/test_mh_fixed_weights.py b/tests/test_mh_fixed_weights.py
index 86aac2a5..e24d2a47 100644
--- a/tests/test_mh_fixed_weights.py
+++ b/tests/test_mh_fixed_weights.py
@@ -1,11 +1,13 @@
 """A standard time-integrated analysis is performed, using one year of
 IceCube data (IC86_1).
 """
+
 import logging
 import unittest
-from flarestack.data.public import icecube_ps_3_year
+
+from flarestack import MinimisationHandler, create_unblinder
 from flarestack.analyses.tde.shared_TDE import tde_catalogue_name
-from flarestack import create_unblinder, MinimisationHandler
+from flarestack.data.public import icecube_ps_3_year
 
 # Initialise Injectors/LLHs
 
diff --git a/tests/test_mh_flare.py b/tests/test_mh_flare.py
index e977c2eb..0d8f7c0d 100644
--- a/tests/test_mh_flare.py
+++ b/tests/test_mh_flare.py
@@ -1,12 +1,14 @@
 """Test the flare search method using one fixed-seed background trial. The
 process is deterministic, so the same flare should be found each time.
 """
+
 import logging
 import unittest
+
 from flarestack import MinimisationHandler, analyse
+from flarestack.core.unblinding import create_unblinder
 from flarestack.data.public import icecube_ps_3_year
 from flarestack.utils.prepare_catalogue import ps_catalogue_name
-from flarestack.core.unblinding import create_unblinder
 
 # Initialise Injectors/LLHs
 
diff --git a/tests/test_mh_large_catalogue.py b/tests/test_mh_large_catalogue.py
index f6a56c40..6b944cd6 100644
--- a/tests/test_mh_large_catalogue.py
+++ b/tests/test_mh_large_catalogue.py
@@ -1,12 +1,14 @@
 """A standard time-integrated analysis is performed, using one year of
 IceCube data (IC86_1).
 """
+
 import logging
 import unittest
-from flarestack.data.public import icecube_ps_3_year
-from flarestack.core.unblinding import create_unblinder
-from flarestack.core.minimisation import MinimisationHandler
+
 from flarestack.analyses.agn_cores.shared_agncores import agn_subset_catalogue
+from flarestack.core.minimisation import MinimisationHandler
+from flarestack.core.unblinding import create_unblinder
+from flarestack.data.public import icecube_ps_3_year
 
 # Initialise Injectors/LLHs
 
diff --git a/tests/test_negative_ns.py b/tests/test_negative_ns.py
index 889c28bf..523cc492 100644
--- a/tests/test_negative_ns.py
+++ b/tests/test_negative_ns.py
@@ -1,12 +1,15 @@
 """A standard time-integrated analysis is performed, using one year of
 IceCube data (IC86_1).
 """
+
 import logging
 import unittest
+
 import numpy as np
+
+from flarestack.core.unblinding import create_unblinder
 from flarestack.data.public import icecube_ps_3_year
 from flarestack.utils.prepare_catalogue import ps_catalogue_name
-from flarestack.core.unblinding import create_unblinder
 
 # Initialise Injectors/LLHs
 
diff --git a/tests/test_simcube.py b/tests/test_simcube.py
index bf367b7f..732f941e 100644
--- a/tests/test_simcube.py
+++ b/tests/test_simcube.py
@@ -1,10 +1,13 @@
 """A standard time-integrated analysis is performed, using one year of
 IceCube data (IC86_1).
 """
+
 import unittest
+
 import numpy as np
-from flarestack.utils.prepare_catalogue import ps_catalogue_name
+
 from flarestack import create_unblinder
+from flarestack.utils.prepare_catalogue import ps_catalogue_name
 
 sindecs = np.linspace(0.9, 0.0, 4)
 
diff --git a/tests/test_simulate_catalogue.py b/tests/test_simulate_catalogue.py
index 99eac0e9..76b0b744 100644
--- a/tests/test_simulate_catalogue.py
+++ b/tests/test_simulate_catalogue.py
@@ -1,13 +1,16 @@
 """A standard time-integrated analysis is performed, using one year of
 IceCube data (IC86_1).
 """
+
 import logging
 import unittest
-from flarestack.utils import load_catalogue
-from flarestack.data.public import icecube_ps_3_year
-from flarestack.cosmo import simulate_transient_catalogue, get_rate
+
 from astropy import units as u
 
+from flarestack.cosmo import get_rate, simulate_transient_catalogue
+from flarestack.data.public import icecube_ps_3_year
+from flarestack.utils import load_catalogue
+
 default_cat = [
     (0.60035332, 0.01447306, 1.0, 1.0, 56327.97886837, 0.0, 0.0, 5.74325505, b"src0"),
     (2.15873548, 0.61203329, 1.0, 1.0, 55571.83350285, 0.0, 0.0, 8.16688538, b"src2"),
diff --git a/tests/test_submitter.py b/tests/test_submitter.py
index 20d62d86..cac6e02e 100644
--- a/tests/test_submitter.py
+++ b/tests/test_submitter.py
@@ -2,12 +2,12 @@
 
 import logging
 import unittest
-from flarestack.shared import flux_to_k
+
+from flarestack.cluster.submitter import LocalSubmitter, Submitter
+from flarestack.core.results import ResultsHandler
 from flarestack.data.public import icecube_ps_3_year
+from flarestack.shared import flux_to_k
 from flarestack.utils.prepare_catalogue import ps_catalogue_name
-from flarestack.cluster.submitter import Submitter, LocalSubmitter
-from flarestack.core.results import ResultsHandler
-
 
 logger = logging.getLogger(__name__)
 
diff --git a/tests/test_time_pdfs.py b/tests/test_time_pdfs.py
index ed3743cb..04650193 100644
--- a/tests/test_time_pdfs.py
+++ b/tests/test_time_pdfs.py
@@ -1,12 +1,13 @@
 """A standard time-integrated analysis is performed, using one year of
 IceCube data (IC86_1).
 """
+
 import logging
 import unittest
-from flarestack.data.public import icecube_ps_3_year
-from flarestack import create_unblinder
+
+from flarestack import MinimisationHandler, create_unblinder
 from flarestack.analyses.tde.shared_TDE import tde_catalogue_name
-from flarestack import MinimisationHandler
+from flarestack.data.public import icecube_ps_3_year
 
 # Initialise Injectors/LLHs
 
diff --git a/tests/test_util_astronomy.py b/tests/test_util_astronomy.py
index 13eadc7d..54ab025a 100644
--- a/tests/test_util_astronomy.py
+++ b/tests/test_util_astronomy.py
@@ -1,12 +1,15 @@
 """A standard time-integrated analysis is performed, using one year of
 IceCube data (IC86_1).
 """
+
 import logging
 import unittest
-from flarestack.analyses.tde.shared_TDE import tde_catalogue_name
-from flarestack.utils import load_catalogue, calculate_astronomy
-from astropy import units as u
+
 import numpy as np
+from astropy import units as u
+
+from flarestack.analyses.tde.shared_TDE import tde_catalogue_name
+from flarestack.utils import calculate_astronomy, load_catalogue
 
 true_res_astro = {
     "Energy Flux (GeV cm^{-2} s^{-1})": 1.151292546497023e-08,
diff --git a/tests/test_util_custom_dataset.py b/tests/test_util_custom_dataset.py
index 8bf1e14d..28cfe6a0 100644
--- a/tests/test_util_custom_dataset.py
+++ b/tests/test_util_custom_dataset.py
@@ -1,11 +1,13 @@
 """A standard time-integrated analysis is performed, using one year of
 IceCube data (IC86_1).
 """
+
 import logging
 import unittest
-from flarestack.data.public import icecube_ps_3_year
-from flarestack.core.unblinding import create_unblinder
+
 from flarestack.analyses.tde.shared_TDE import tde_catalogue_name
+from flarestack.core.unblinding import create_unblinder
+from flarestack.data.public import icecube_ps_3_year
 from flarestack.utils import custom_dataset, load_catalogue
 
 true_parameters = [0.0, 2.07606811]