diff --git a/__init__.py b/__init__.py
index c67145e06e038f4a48ceda33f888dc60ab733eea..40a96afc6ff09d58a702b76e3f7dd412fe975e26 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,7 +1 @@
 # -*- coding: utf-8 -*-
-"""
-Created on Tue Jan 14 18:11:33 2020
-
-@author: gamelina
-"""
-
diff --git a/impedance/__init__.py b/impedance/__init__.py
index b58cd9486a178394793cdc845f5b8355a9a664d1..59a243dfaf20826919019e4e329e03bb8b88c494 100644
--- a/impedance/__init__.py
+++ b/impedance/__init__.py
@@ -1,10 +1,4 @@
 # -*- coding: utf-8 -*-
-"""
-Created on Tue Jan 14 12:25:30 2020
-
-@author: gamelina
-"""
-
 from mbtrack2.impedance.resistive_wall import (skin_depth, 
                                                CircularResistiveWall, 
                                                Coating)
diff --git a/impedance/csr.py b/impedance/csr.py
index 5f0876561ef3c495afcdb4bf24fe489d1dfb4b32..e7a2768111c556990c042f7ce74c42e6e1b594aa 100644
--- a/impedance/csr.py
+++ b/impedance/csr.py
@@ -1,9 +1,6 @@
 # -*- coding: utf-8 -*-
 """
 Define coherent synchrotron radiation (CSR) wakefields in various models.
-
-@author: Alexis Gamelin
-@date: 13/04/2021
 """
 import numpy as np
 import mpmath as mp
diff --git a/impedance/impedance_model.py b/impedance/impedance_model.py
index b398e9bf89cdfcde8d039fa54f799ddace3c55f6..f174cae6dc970bff3eae43e3862a07b95eb4ea25 100644
--- a/impedance/impedance_model.py
+++ b/impedance/impedance_model.py
@@ -1,8 +1,6 @@
 # -*- coding: utf-8 -*-
 """
-Created on Mon Sep 28 15:18:23 2020
-
-@author: gamelina
+Module where the ImpedanceModel class is defined.
 """
 import pandas as pd
 import numpy as np
diff --git a/impedance/resistive_wall.py b/impedance/resistive_wall.py
index 126f053e48bd2d2f3636ff20586e8338f13828f0..c7f13a81abbd1eaae178c030902fe829be4bf874 100644
--- a/impedance/resistive_wall.py
+++ b/impedance/resistive_wall.py
@@ -1,9 +1,6 @@
 # -*- coding: utf-8 -*-
 """
 Define resistive wall elements based on the WakeField class.
-
-@author: Alexis Gamelin
-@date: 14/01/2020
 """
 
 import numpy as np
diff --git a/impedance/resonator.py b/impedance/resonator.py
index e41883ed7106bd1b8387dd4e08bcc016f7d23c1c..d514e52730151262542d748bf045bd195d5246cc 100644
--- a/impedance/resonator.py
+++ b/impedance/resonator.py
@@ -2,9 +2,6 @@
 """
 This module defines the impedances and wake functions from the resonator model 
 based on the WakeField class.
-
-@author: Alexis Gamelin, Watanyu Foosang
-@date: 25/09/2020
 """
 
 import numpy as np
diff --git a/impedance/tapers.py b/impedance/tapers.py
index 73d891e3cc5aa00b7c384e14e3e8361ede822f39..838e275dc7c6aa09aa1f30b92668f3c745ef6575 100644
--- a/impedance/tapers.py
+++ b/impedance/tapers.py
@@ -1,8 +1,6 @@
 # -*- coding: utf-8 -*-
 """
-Created on Tue Mar 31 13:15:36 2020
-
-@author: gamelina
+Module where taper elements are defined.
 """
 
 from scipy.constants import mu_0, c, pi
diff --git a/impedance/wakefield.py b/impedance/wakefield.py
index a67067b455d7145f8deae9e4be6a19c6f9228c17..a7b6efd8ce485a99591b0f1a2a004005de8d839e 100644
--- a/impedance/wakefield.py
+++ b/impedance/wakefield.py
@@ -2,9 +2,6 @@
 """
 This module defines general classes to describes wakefields, impedances and 
 wake functions.
-
-@author: David Amorin, Alexis Gamelin, Watanyu Foosang
-@date: 24/09/2020
 """
 
 import warnings
diff --git a/instability/__init__.py b/instability/__init__.py
index a8925c15ade8f5456dc829f9a69f38751cfef735..054a9bd0cb25e6f01071af729ec172c9b7f0c337 100644
--- a/instability/__init__.py
+++ b/instability/__init__.py
@@ -1,10 +1,4 @@
 # -*- coding: utf-8 -*-
-"""
-Created on Wed Mar 30 16:22:48 2022
-
-@author: gamelina
-"""
-
 from mbtrack2.instability.ions import (ion_cross_section,
                                        ion_frequency,
                                        fast_beam_ion,
diff --git a/instability/instabilities.py b/instability/instabilities.py
index 83089cc1c73d902956d27c884646d877c2da5a93..bfecc533b44be301996727954b5f3bf98fe2cf19 100644
--- a/instability/instabilities.py
+++ b/instability/instabilities.py
@@ -1,8 +1,6 @@
 # -*- coding: utf-8 -*-
 """
-General calculations about instabilities
-
-@author: Alexis Gamelin
+General calculations about instability thresholds.
 """
 
 import numpy as np
diff --git a/instability/ions.py b/instability/ions.py
index bac8d8ef3a335a536116c1e72c91d3759136ed13..d6289295d4124b4674af9013c3af397e56f19af7 100644
--- a/instability/ions.py
+++ b/instability/ions.py
@@ -2,8 +2,6 @@
 """
 Various calculations about ion trapping and instabilities in electron storage 
 rings.
-
-@author: Alexis Gamelin
 """
 
 import numpy as np
diff --git a/tracking/__init__.py b/tracking/__init__.py
index 5ecae9b83ec11df7ff1b958120403ca60b95fae5..f0dd800a22bf679b4c3f2d79fe671c95cfc1a9b6 100644
--- a/tracking/__init__.py
+++ b/tracking/__init__.py
@@ -1,17 +1,17 @@
 # -*- coding: utf-8 -*-
-"""
-Created on Tue Jan 14 18:11:33 2020
-
-@author: gamelina
-"""
-
-from mbtrack2.tracking.particles import (Electron, Proton, Bunch, Beam, 
+from mbtrack2.tracking.particles import (Electron, 
+                                         Proton, 
+                                         Bunch, 
+                                         Beam, 
                                          Particle)
 from mbtrack2.tracking.synchrotron import Synchrotron
-from mbtrack2.tracking.rf import RFCavity, CavityResonator
+from mbtrack2.tracking.rf import (RFCavity, 
+                                  CavityResonator)
 from mbtrack2.tracking.parallel import Mpi
-from mbtrack2.tracking.element import (Element, LongitudinalMap, 
-                                       TransverseMap, SynchrotronRadiation,
+from mbtrack2.tracking.element import (Element, 
+                                       LongitudinalMap, 
+                                       TransverseMap, 
+                                       SynchrotronRadiation,
                                        SkewQuadrupole)
 from mbtrack2.tracking.aperture import (CircularAperture, 
                                         ElipticalAperture,
diff --git a/tracking/aperture.py b/tracking/aperture.py
index 4ba285f0730a636cbb7de84d50624e5ae3cf87fe..67b51bf5d8a7d72cc855c7d6b028f423725b93c7 100644
--- a/tracking/aperture.py
+++ b/tracking/aperture.py
@@ -1,9 +1,6 @@
 # -*- coding: utf-8 -*-
 """
 This module defines aperture elements for tracking.
-
-@author: gamelina
-@date: 11/03/2020
 """
 
 import numpy as np
diff --git a/tracking/element.py b/tracking/element.py
index d5eacc2af0556430b7c9f02d3e1b8e54eb066645..a9f2efdd067850154858dbbcb04e565a4a68898e 100644
--- a/tracking/element.py
+++ b/tracking/element.py
@@ -3,9 +3,6 @@
 This module defines the most basic elements for tracking, including Element,
 an abstract base class which is to be used as mother class to every elements
 included in the tracking.
-
-@author: gamelina
-@date: 11/03/2020
 """
 
 import numpy as np
diff --git a/tracking/monitors/__init__.py b/tracking/monitors/__init__.py
index 7f5ba519d883ab4516678a510da8a8848cedb89c..b4688b7378e57fc37f7133981abd6259df1b2eda 100644
--- a/tracking/monitors/__init__.py
+++ b/tracking/monitors/__init__.py
@@ -1,10 +1,4 @@
 # -*- coding: utf-8 -*-
-"""
-Created on Tue Jan 14 18:11:33 2020
-
-@author: gamelina
-"""
-
 from mbtrack2.tracking.monitors.monitors import (Monitor, BunchMonitor, 
                                                  PhaseSpaceMonitor,
                                                  BeamMonitor,
diff --git a/tracking/monitors/monitors.py b/tracking/monitors/monitors.py
index 348371aafad9bcc97de7ba8508b5029429ce8d96..8091b9ff0404173790f84f87b0665c1142279c06 100644
--- a/tracking/monitors/monitors.py
+++ b/tracking/monitors/monitors.py
@@ -2,10 +2,6 @@
 """
 This module defines the different monitor class which are used to save data
 during tracking.
-
-@author: Alexis Gamelin
-@date: 24/03/2020
-
 """
 
 import numpy as np
diff --git a/tracking/monitors/plotting.py b/tracking/monitors/plotting.py
index 8096647a0ee7f0670a055fdc03b50b4dde369200..ab53a90d15d7914dd8e9871c632d83280178a932 100644
--- a/tracking/monitors/plotting.py
+++ b/tracking/monitors/plotting.py
@@ -2,9 +2,6 @@
 """
 Module for plotting the data recorded by the monitor module during the 
 tracking.
-
-@author: Watanyu Foosang, Alexis Gamelin
-@Date: 20/07/2021
 """
 
 import numpy as np
diff --git a/tracking/monitors/tools.py b/tracking/monitors/tools.py
index 50ab42b86a5e0a1ca40fca0e5862e54d6021d11d..771ff16373f6d48b75f699874d5083e44cfb208c 100644
--- a/tracking/monitors/tools.py
+++ b/tracking/monitors/tools.py
@@ -2,8 +2,6 @@
 """
 This module defines utilities functions, helping to deals with tracking output 
 and hdf5 files.
-
-@author: Alexis Gamelin
 """
 
 import numpy as np
diff --git a/tracking/parallel.py b/tracking/parallel.py
index 25cb307d2ed29e4abc45fff057070bc947650e5e..ed1bb22fe7c3c2d79e117d685e12edb6eb9aa6e2 100644
--- a/tracking/parallel.py
+++ b/tracking/parallel.py
@@ -2,9 +2,6 @@
 
 """
 Module to handle parallel computation
-
-@author: Alexis Gamelin
-@date: 06/03/2020
 """
 
 import numpy as np
diff --git a/tracking/particles.py b/tracking/particles.py
index f4351c1a6be418aa07e842891389bcd7479b4ecf..b86b4093c4cbbcc72426af5d65abc6ad32b5b2cd 100644
--- a/tracking/particles.py
+++ b/tracking/particles.py
@@ -1,10 +1,6 @@
 # -*- coding: utf-8 -*-
 """
 Module where particles, bunches and beams are described as objects.
-
-@author: Alexis Gamelin
-@date: 11/03/2020
-
 """
 
 import numpy as np
diff --git a/tracking/rf.py b/tracking/rf.py
index de05d591b9e3e6d57a4752619b3882c204ea354e..c5ccbf8e9613d43a7f5ae9292a341daa1117d51e 100644
--- a/tracking/rf.py
+++ b/tracking/rf.py
@@ -1,9 +1,6 @@
 # -*- coding: utf-8 -*-
 """
 This module handles radio-frequency (RF) cavitiy elements. 
-
-@author: gamelina
-@date: 11/03/2020
 """
 
 import numpy as np
diff --git a/tracking/synchrotron.py b/tracking/synchrotron.py
index 92515510a3a4bebfafc39c9a7aeef1ff2714704d..17460077f3ef755f52c1a0defb7ae54ee1975088 100644
--- a/tracking/synchrotron.py
+++ b/tracking/synchrotron.py
@@ -1,9 +1,6 @@
 # -*- coding: utf-8 -*-
 """
-Module where the synchrotron class is defined.
-
-@author: Alexis Gamelin
-@date: 15/01/2020
+Module where the Synchrotron class is defined.
 """
 
 import numpy as np
diff --git a/tracking/wakepotential.py b/tracking/wakepotential.py
index 655c2666c8af4675c1e6159356ff8ed9f78358be..953b49a3e7cf8e844be741084ee2bd6079bf43b6 100644
--- a/tracking/wakepotential.py
+++ b/tracking/wakepotential.py
@@ -1,10 +1,7 @@
 # -*- coding: utf-8 -*-
 """
-This module defines the WakePotential class which deals with the single bunch 
-effects, both longitudinal and transverse.
-
-@author: Alexis Gamelin, Watanyu Foosang
-@date: 25/09/2020
+This module defines the WakePotential and LongRangeResistiveWall classes which 
+deal with the single bunch and multi-bunch wakes.
 """
 
 import numpy as np
diff --git a/utilities/__init__.py b/utilities/__init__.py
index 0cee3f7ce81b21fe8f9f734531eed5ea3b6caaac..316d00149e099c60e2a7db37bdf5b6ce8b9b90f3 100644
--- a/utilities/__init__.py
+++ b/utilities/__init__.py
@@ -1,10 +1,4 @@
 # -*- coding: utf-8 -*-
-"""
-Created on Tue Jan 14 18:11:33 2020
-
-@author: gamelina
-"""
-
 from mbtrack2.utilities.read_impedance import (read_CST,
                                                read_IW2D,
                                                read_IW2D_folder)
diff --git a/utilities/beamloading.py b/utilities/beamloading.py
index ae2eed4c549ad692565eed0b38005d46c1564424..a788cf4876dd10e429884876de2ae45ae6936106 100644
--- a/utilities/beamloading.py
+++ b/utilities/beamloading.py
@@ -1,9 +1,6 @@
 # -*- coding: utf-8 -*-
 """
-Beam loading equilibrium module
-Created on Fri Aug 23 13:32:03 2019
-
-@author: gamelina
+Module where the BeamLoadingEquilibrium class is defined.
 """
 
 import numpy as np
diff --git a/utilities/misc.py b/utilities/misc.py
index 9dcac0d475d91fd3409ded9916c635605e9e99a2..b2afeaf0568e3f3cfbb2413619d6c337f3adfe87 100644
--- a/utilities/misc.py
+++ b/utilities/misc.py
@@ -1,16 +1,14 @@
 # -*- coding: utf-8 -*-
 """
-This module defines utilities functions, helping to deals with the 
-collective_effects module.
-
-@author: Alexis Gamelin
-@date: 28/09/2020
+This module defines miscellaneous utilities functions.
 """
 
 import pandas as pd
 import numpy as np
 from pathlib import Path
+from scipy.interpolate import interp1d
 from mbtrack2.impedance.wakefield import Impedance
+from mbtrack.utilities import spectral_density
     
 def effective_impedance(ring, imp, m, mu, sigma, M, tuneS, xi=None, 
                         mode="Hermite"):
diff --git a/utilities/optics.py b/utilities/optics.py
index 223a70a8bd256a23af338851fd817e4d271d21b0..fdbd0091ab9166430c2cf329ed90fbe384931055 100644
--- a/utilities/optics.py
+++ b/utilities/optics.py
@@ -2,9 +2,6 @@
 """
 Module where the class to store the optic functions and the lattice physical 
 parameters are defined.
-
-@author: Alexis Gamelin
-@date: 10/04/2020
 """
 
 import numpy as np
diff --git a/utilities/read_impedance.py b/utilities/read_impedance.py
index cbaf3016733d8731522712a181f6ccd760db53ab..5a3f0a501a433e37996ad6d16dc0985f316aa0f0 100644
--- a/utilities/read_impedance.py
+++ b/utilities/read_impedance.py
@@ -1,8 +1,7 @@
 # -*- coding: utf-8 -*-
 """
-Created on Wed Mar 30 16:07:02 2022
-
-@author: gamelina
+Module where function used to import impedance and wakes from other codes are
+defined.
 """
 
 import pandas as pd
diff --git a/utilities/spectrum.py b/utilities/spectrum.py
index 98e4512d1f68307b6b3ace01262f88a98e88f0d6..91fba8d805e4ad9dce16ca12fd6d4770c9cededa 100644
--- a/utilities/spectrum.py
+++ b/utilities/spectrum.py
@@ -1,8 +1,6 @@
 # -*- coding: utf-8 -*-
 """
-Created on Wed Mar 30 16:09:05 2022
-
-@author: gamelina
+Module where bunch and beam spectrums and profile are defined.
 """
 
 import numpy as np