diff --git a/examples/OHagan-function/example_OHagan.py b/examples/OHagan-function/example_OHagan.py
index 170014ab584018c3856d058a717e242e451fe088..8c7690767346db5c09e1a7b33595567c26c36a77 100644
--- a/examples/OHagan-function/example_OHagan.py
+++ b/examples/OHagan-function/example_OHagan.py
@@ -16,8 +16,6 @@ of Stuttgart, www.iws.uni-stuttgart.de/lh2/
 Pfaffenwaldring 61
 70569 Stuttgart
 
-Created on Wed Jul 10 2019
-
 """
 
 import numpy as np
diff --git a/examples/beam/example_beam.py b/examples/beam/example_beam.py
index 04d19518feaf8312d48e5d1fcfdae490c353593f..84b88255f53ef81ae5eb2861b4550fe0c68052ab 100644
--- a/examples/beam/example_beam.py
+++ b/examples/beam/example_beam.py
@@ -13,8 +13,6 @@ of Stuttgart www.iws.uni-stuttgart.de/lh2/
 Pfaffenwaldring 61
 70569 Stuttgart
 
-Created on Wed Jul 10 2019
-
 """
 # Add BayesValidRox path
 import sys
diff --git a/examples/ishigami/example_ishigami.py b/examples/ishigami/example_ishigami.py
index 1f3c7f80a122685d0a44e0198804d88c7a1b9e01..72c9dc2d31e93601cbbd60bc40b88a31a73bd5b9 100644
--- a/examples/ishigami/example_ishigami.py
+++ b/examples/ishigami/example_ishigami.py
@@ -15,8 +15,6 @@ of Stuttgart, www.iws.uni-stuttgart.de/lh2/
 Pfaffenwaldring 61
 70569 Stuttgart
 
-Created on Wed Jul 10 2019
-
 """
 
 import numpy as np
diff --git a/examples/model-comparison/example_model_comparison.py b/examples/model-comparison/example_model_comparison.py
index 884b0d52a6fd46375159a78b4630cd589b74082b..ebd80fea82a3caf3ff204b89da96c59737ba502b 100644
--- a/examples/model-comparison/example_model_comparison.py
+++ b/examples/model-comparison/example_model_comparison.py
@@ -14,8 +14,6 @@ University of Stuttgart, www.iws.uni-stuttgart.de/lh2/
 Pfaffenwaldring 61
 70569 Stuttgart
 
-Created on Wed Oct 10 2021
-
 """
 
 from copy import deepcopy
diff --git a/examples/pollution/example_valid_pollution.py b/examples/pollution/example_valid_pollution.py
index 334e80e8c3ad40f15742241b989e85fd805fbd63..74b87787b741a0c990c6d1ccbf06596b43256a57 100644
--- a/examples/pollution/example_valid_pollution.py
+++ b/examples/pollution/example_valid_pollution.py
@@ -13,8 +13,6 @@ of Stuttgart, www.iws.uni-stuttgart.de/lh2/
 Pfaffenwaldring 61
 70569 Stuttgart
 
-Created on Fri Aug 9 2019
-
 """
 
 import numpy as np
diff --git a/src/bayesvalidrox/bayes_inference/bayes_model_comparison.py b/src/bayesvalidrox/bayes_inference/bayes_model_comparison.py
index b946281c527558cbe870e59ac6f848877ce91eb6..828613556e90ec0c529b91f2592eec148c98136b 100644
--- a/src/bayesvalidrox/bayes_inference/bayes_model_comparison.py
+++ b/src/bayesvalidrox/bayes_inference/bayes_model_comparison.py
@@ -1,10 +1,6 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-"""
-Created on Sat Aug 24 16:04:06 2019
 
-@author: farid
-"""
 import numpy as np
 import os
 from scipy import stats
diff --git a/src/bayesvalidrox/pylink/pylink.py b/src/bayesvalidrox/pylink/pylink.py
index 8b826c5ceb12a27c0958dbf09b72847acc7cb2f3..5084f1cf1450ea08d91d97b8a64cf1d4a12e494e 100644
--- a/src/bayesvalidrox/pylink/pylink.py
+++ b/src/bayesvalidrox/pylink/pylink.py
@@ -1,5 +1,9 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
+"""
+Calls to the model and evaluations
+"""
+
 from dataclasses import dataclass
 
 import os
diff --git a/src/bayesvalidrox/surrogate_models/engine.py b/src/bayesvalidrox/surrogate_models/engine.py
index 85865c2197d70090bc5bb31ec3a7b40f877fd2b9..57d92aca04b7bbf994ed6d700291e8fa88455046 100644
--- a/src/bayesvalidrox/surrogate_models/engine.py
+++ b/src/bayesvalidrox/surrogate_models/engine.py
@@ -1,9 +1,7 @@
 # -*- coding: utf-8 -*-
 """
-Created on Sat Dec 16 10:16:50 2023
-Engine to train the surrogate with
+Engine to train the surrogate
 
-@author: Rebecca Kohlhaas
 """
 import copy
 from copy import deepcopy, copy
diff --git a/src/bayesvalidrox/surrogate_models/exp_designs.py b/src/bayesvalidrox/surrogate_models/exp_designs.py
index 665ee4fc38976539a1b6cfe33ff84e6ff32b61b4..4d719654b1b9ec03f45cf563d55f0d587907eb19 100644
--- a/src/bayesvalidrox/surrogate_models/exp_designs.py
+++ b/src/bayesvalidrox/surrogate_models/exp_designs.py
@@ -1,5 +1,8 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
+"""
+Experimental design with associated sampling methods
+"""
 
 import numpy as np
 import math
diff --git a/src/bayesvalidrox/surrogate_models/exploration.py b/src/bayesvalidrox/surrogate_models/exploration.py
index e1853720771393bc36d3d07488acfda763bb073b..6abb652f145fadb410ecf8f987142e8ceb544a41 100644
--- a/src/bayesvalidrox/surrogate_models/exploration.py
+++ b/src/bayesvalidrox/surrogate_models/exploration.py
@@ -1,5 +1,8 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
+"""
+Exploration for sequential training of metamodels
+"""
 
 import numpy as np
 from scipy.spatial import distance
diff --git a/src/bayesvalidrox/surrogate_models/input_space.py b/src/bayesvalidrox/surrogate_models/input_space.py
index 3160ba2d0013de069f08e127639ad2fd7a8637d7..4e010d66f2933ec243bad756d8f2c5454808d802 100644
--- a/src/bayesvalidrox/surrogate_models/input_space.py
+++ b/src/bayesvalidrox/surrogate_models/input_space.py
@@ -1,5 +1,8 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
+"""
+Input space built from set prior distributions
+"""
 
 import numpy as np
 import chaospy
diff --git a/src/bayesvalidrox/surrogate_models/inputs.py b/src/bayesvalidrox/surrogate_models/inputs.py
index 783e82b053cc458be712b588b7fde3a0f3c8decb..094e1066fe008e37288e44750524c5a1370bd7a2 100644
--- a/src/bayesvalidrox/surrogate_models/inputs.py
+++ b/src/bayesvalidrox/surrogate_models/inputs.py
@@ -1,5 +1,8 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
+"""
+Inputs and related marginal distributions
+"""
 
 class Input:
     """
diff --git a/src/bayesvalidrox/surrogate_models/surrogate_models.py b/src/bayesvalidrox/surrogate_models/surrogate_models.py
index af20e9814c6be3f75f34699c0178005f2d29d190..a64a4dc315863b7729c5a025649973a97865dabf 100644
--- a/src/bayesvalidrox/surrogate_models/surrogate_models.py
+++ b/src/bayesvalidrox/surrogate_models/surrogate_models.py
@@ -1,5 +1,8 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
+"""
+Implementation of metamodel as either PC, aPC or GPE
+"""
 
 import warnings
 import numpy as np
diff --git a/tests/test_Discrepancy.py b/tests/test_Discrepancy.py
index 89ff73f10ea1156191466693c28c0222ae6f1811..c46e0a13751756e0583f3176489e7215da77f4ba 100644
--- a/tests/test_Discrepancy.py
+++ b/tests/test_Discrepancy.py
@@ -5,7 +5,6 @@ Tests are available for the following functions
 Class Discrepancy: 
     get_sample
 
-@author: Rebecca Kohlhaas
 """
 import sys
 sys.path.append("src/")
diff --git a/tests/test_ExpDesign.py b/tests/test_ExpDesign.py
index d2e9aebe16e582bc06dcbc8c612ccccb340d6312..42f87663c2d843c4fa3a23e047270673501dbd4c 100644
--- a/tests/test_ExpDesign.py
+++ b/tests/test_ExpDesign.py
@@ -13,7 +13,6 @@ Class ExpDesigns:
     pcm_sampler
 Other function tests to be found in parent class 'InputSpace'
 
-@author: Rebecca Kohlhaas
 """
 import sys
 sys.path.append("src/")
diff --git a/tests/test_InputSpace.py b/tests/test_InputSpace.py
index f02ce389760bedba23c1caec950bf694f65a1ce9..1b5a28fa3eb4b1ad11c8a666a9e98e2b0dbaa8b9 100644
--- a/tests/test_InputSpace.py
+++ b/tests/test_InputSpace.py
@@ -8,7 +8,6 @@ Class InputSpace:
     build_polytypes     - x
     transform           - x
 
-@author: Rebecca Kohlhaas
 """
 import sys
 sys.path.append("src/")
diff --git a/tests/test_MetaModel.py b/tests/test_MetaModel.py
index a2fb876e2d2f5eab62cc4963e73cf94e862193d0..b5095fa3494619b32af5d3ff81991e123adceab9 100644
--- a/tests/test_MetaModel.py
+++ b/tests/test_MetaModel.py
@@ -24,8 +24,6 @@ Class MetaModel:
     generate_polynomials
     _compute_pce_moments
     
-
-@author: Rebecca Kohlhaas
 """
 import numpy as np
 import sys
diff --git a/tests/test_engine.py b/tests/test_engine.py
index 36e582cf2ff0609e264286578569e33cb3195439..72dabd466174fbfd2b60ed23fc500e53ad51f240 100644
--- a/tests/test_engine.py
+++ b/tests/test_engine.py
@@ -27,7 +27,6 @@ Engine:
     _validError         - x
     _error_Mean_Std     - x 
 
-@author: Rebecca Kohlhaas
 """
 import math
 import numpy as np
diff --git a/tests/test_polyconst.py b/tests/test_polyconst.py
index 7b05429f9e2e619672214c7ba783a8357e7987c4..f831cd5a1b922e2865ca744f89d6cd068fe26b91 100644
--- a/tests/test_polyconst.py
+++ b/tests/test_polyconst.py
@@ -6,7 +6,6 @@ Tests are available for the following functions:
     glexindex             
     cross_truncate
 
-@author: Rebecca Kohlhaas
 """
 import sys
 sys.path.append("src/")
diff --git a/tests/test_pylink.py b/tests/test_pylink.py
index 870e3400b6897ec75eec48ee0baba85f0748325a..47cc27081339a71d53963bb77cc44ad2da4b934a 100644
--- a/tests/test_pylink.py
+++ b/tests/test_pylink.py
@@ -16,7 +16,6 @@ PyLinkForwardModel:
 OutputData:
     constructor only
 
-@author: Rebecca Kohlhaas
 """
 import sys
 sys.path.append("src/")