diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fc19790f6e9f62fd149105cb44261849e5035ecd..56d4b2571515f53573bf33bac5f0e4fa8aeccf67 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -35,6 +35,10 @@ coverage: # special pipeline for master with coverage report
     - corsika
   script:
     - mkdir build
+    - cmake ..
+    - cmake --build . -- -j 4 
+    - ctest -V >& test.log
+  after_script:
     - cd build
     - cmake .. -DCMAKE_BUILD_TYPE=Coverage
     - cmake --build . -- -j4
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6ad6efda04f97ec6766698d45719e7339bcc96ae..ade8b59113b141e54e31fc9cfcfc206070a075d4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -108,6 +108,12 @@ if (CMAKE_BUILD_TYPE STREQUAL Coverage)
   add_custom_target(coverage DEPENDS coverage-report)
 endif ()
 
+# add call to ./do-copyright.py to run as unit-test-case
+add_test (NAME copyright_notices COMMAND ./do-copyright.py WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+
+# add call to do-clang-format.sh checking to run as unit-test-case
+add_test (NAME clang_format COMMAND ./do-clang-format.sh check WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+
 find_package (Pythia8) # optional
 find_package (Eigen3 REQUIRED)
 
diff --git a/COAST/CMakeLists.txt b/COAST/CMakeLists.txt
index 7a8c67e39c09317ad1d6245e0f536d6503c0f924..dc09ce62da9be3f057c59b66da61c68477eace6c 100644
--- a/COAST/CMakeLists.txt
+++ b/COAST/CMakeLists.txt
@@ -1,4 +1,3 @@
-
 set (
   COAST_HEADERS
   COASTProcess.h
diff --git a/COAST/COASTProcess.cc b/COAST/COASTProcess.cc
index bfbf8839dcf40551bddb1ddd3dff77c1e49ea38f..815fde3bf8ee0c4c094fded33149d31c415391c9 100644
--- a/COAST/COASTProcess.cc
+++ b/COAST/COASTProcess.cc
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/COAST/COASTProcess.h b/COAST/COASTProcess.h
index a5d7606c5f912b862cdee99dfe264cd89073f76b..0d1895e6e96804a090bd2dad80308a9b8cac278d 100644
--- a/COAST/COASTProcess.h
+++ b/COAST/COASTProcess.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/COAST/COASTStack.h b/COAST/COASTStack.h
index 9db80c271a728d8bd0e1f4dc199a1686235e17ef..d1000a93706323e0655ff46dae0631e608be73e1 100644
--- a/COAST/COASTStack.h
+++ b/COAST/COASTStack.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/COAST/COASTUserLib.cc b/COAST/COASTUserLib.cc
index 230d10a5c899ee15e8382f608d3f5d098dd5cccb..51cac0280f2fa5c478f4c77d0767e662b9a02bd2 100644
--- a/COAST/COASTUserLib.cc
+++ b/COAST/COASTUserLib.cc
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/COAST/ParticleConversion.cc b/COAST/ParticleConversion.cc
index c0bc3dab50b8d805cd9cee8212c9a1bd06c67460..2cbd738a87123d3f9ca585bac3747e274beae84b 100644
--- a/COAST/ParticleConversion.cc
+++ b/COAST/ParticleConversion.cc
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/COAST/ParticleConversion.h b/COAST/ParticleConversion.h
index 82a9a9d7dbba18ec612d695b5d869dd6f1b086ac..c3f807c28c22f9ba3f078714fe76d9aed913c04c 100644
--- a/COAST/ParticleConversion.h
+++ b/COAST/ParticleConversion.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Documentation/CMakeLists.txt b/Documentation/CMakeLists.txt
index 194c7be44d8640fd17a3d76b67c00801ddf41e90..ffab73c843a22a06928395980a8b1e097a194234 100644
--- a/Documentation/CMakeLists.txt
+++ b/Documentation/CMakeLists.txt
@@ -1,4 +1,3 @@
-
 add_subdirectory (Doxygen)
 add_subdirectory (Examples)
 
diff --git a/Documentation/Doxygen/CMakeLists.txt b/Documentation/Doxygen/CMakeLists.txt
index 9fdd84f380bcc183ee79a31f2f4b6aa146a0909f..b3511f84ddbc9ccdce365479323f4d5f7d798596 100644
--- a/Documentation/Doxygen/CMakeLists.txt
+++ b/Documentation/Doxygen/CMakeLists.txt
@@ -1,4 +1,3 @@
-
 find_package (Doxygen OPTIONAL_COMPONENTS dot mscgen dia)
 
 if (DOXYGEN_FOUND)
diff --git a/Documentation/Examples/boundary_example.cc b/Documentation/Examples/boundary_example.cc
index 169cb1c6a30a46a16494ac7e37b5bae2e875c256..d97c504a41f48af0d3a178aa212c257890a14acd 100644
--- a/Documentation/Examples/boundary_example.cc
+++ b/Documentation/Examples/boundary_example.cc
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Documentation/Examples/cascade_example.cc b/Documentation/Examples/cascade_example.cc
index 7690d664811f4192d224044ab39ebea7b92d6136..936ed40001c63b4c948883cf62360dc15f4f4c10 100644
--- a/Documentation/Examples/cascade_example.cc
+++ b/Documentation/Examples/cascade_example.cc
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Documentation/Examples/cascade_proton_example.cc b/Documentation/Examples/cascade_proton_example.cc
index 4e47bf5cecc4c12e04d052655cda951086dea8c3..beb3693212fab2abedd8425ec8e1f0b8960e248c 100644
--- a/Documentation/Examples/cascade_proton_example.cc
+++ b/Documentation/Examples/cascade_proton_example.cc
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Documentation/Examples/geometry_example.cc b/Documentation/Examples/geometry_example.cc
index 8ed0d6f65de7327b0cf07a6726cd00ab2c772669..58fc3c20ec4a084497723305cf02ce458db80c3e 100644
--- a/Documentation/Examples/geometry_example.cc
+++ b/Documentation/Examples/geometry_example.cc
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Documentation/Examples/helix_example.cc b/Documentation/Examples/helix_example.cc
index ec73fc36c536fde7209d77842db8ff5278cf0b11..32a14c221fd896bda468e57c065a0bfcdb275b7e 100644
--- a/Documentation/Examples/helix_example.cc
+++ b/Documentation/Examples/helix_example.cc
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Documentation/Examples/logger_example.cc b/Documentation/Examples/logger_example.cc
index 956f49127f44843042bc96fadbb7c2e1fbd8c1b9..ce53b3a67aac4a85d8bc2d21ae63a5aba8f2f0d8 100644
--- a/Documentation/Examples/logger_example.cc
+++ b/Documentation/Examples/logger_example.cc
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Documentation/Examples/stack_example.cc b/Documentation/Examples/stack_example.cc
index 85c68edb6da8cab3a78b6a79d163c601fce2ff9e..6d8bd967fc9c1155fa3683997f4ad7ad031f3ab1 100644
--- a/Documentation/Examples/stack_example.cc
+++ b/Documentation/Examples/stack_example.cc
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Documentation/Examples/staticsequence_example.cc b/Documentation/Examples/staticsequence_example.cc
index 0cd2901c3520d203371a7103f3dff96243328f9f..11bb288d432dcb6df1132a08c083c2018b7b1f8c 100644
--- a/Documentation/Examples/staticsequence_example.cc
+++ b/Documentation/Examples/staticsequence_example.cc
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Documentation/Examples/vertical_EAS.cc b/Documentation/Examples/vertical_EAS.cc
index 872ea2d943bb808edeb295b767cc931dc3e49032..a133be5df380e8171fd5599e68347c76984d5ac7 100644
--- a/Documentation/Examples/vertical_EAS.cc
+++ b/Documentation/Examples/vertical_EAS.cc
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Environment/DensityFunction.h b/Environment/DensityFunction.h
index 92ba841be89e63d7edc49f6eec5cf5bafaa6fae0..992f1b8549c6b010a792fa1879a7cc310036e680 100644
--- a/Environment/DensityFunction.h
+++ b/Environment/DensityFunction.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Environment/Environment.h b/Environment/Environment.h
index d7ac8d14a98e19d852c7151c0069dc928d018e39..4c731ed48fa881e253ddc979677e4639292cb91e 100644
--- a/Environment/Environment.h
+++ b/Environment/Environment.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Environment/FlatExponential.h b/Environment/FlatExponential.h
index 8428508594f6c4286655103da523d77426a46cdb..84a613a572bb0e8f04a96ace5f4c306bbab0a311 100644
--- a/Environment/FlatExponential.h
+++ b/Environment/FlatExponential.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Environment/HomogeneousMedium.h b/Environment/HomogeneousMedium.h
index 1f54dbe7962ce8910fc8f882f36fbf02759a5a61..264482878157a588045574823ae311954fe58d0e 100644
--- a/Environment/HomogeneousMedium.h
+++ b/Environment/HomogeneousMedium.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Environment/IMediumModel.h b/Environment/IMediumModel.h
index 03136a03633546eca0294fac5a1bffdadf40f2b9..25cc2ffaac9c92553a8503b76e4d642856bec45c 100644
--- a/Environment/IMediumModel.h
+++ b/Environment/IMediumModel.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Environment/InhomogeneousMedium.h b/Environment/InhomogeneousMedium.h
index 0b1a0c1b9866ce1a3c64547c06004e6797cb41c7..6c61c7849b47afb8f86c8af18cbf8401d9d3de3c 100644
--- a/Environment/InhomogeneousMedium.h
+++ b/Environment/InhomogeneousMedium.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Environment/LinearApproximationIntegrator.h b/Environment/LinearApproximationIntegrator.h
index 90e14d99a472b9933d094087baefef802ab9d7a9..ba84ac28720b03acf94362f5ca1e6195b81c0f60 100644
--- a/Environment/LinearApproximationIntegrator.h
+++ b/Environment/LinearApproximationIntegrator.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Environment/NuclearComposition.h b/Environment/NuclearComposition.h
index e7f0d6d8a3827985238117dc24db28345d25463e..491f25a251ed7f6c9d5c1ccbde06ea225e88f47e 100644
--- a/Environment/NuclearComposition.h
+++ b/Environment/NuclearComposition.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Environment/testEnvironment.cc b/Environment/testEnvironment.cc
index 0821a24271c951456a4a7364e6aad241d6fdc6d3..1fdaceee3c170564b9d7f6d55340ac6ddf676ee0 100644
--- a/Environment/testEnvironment.cc
+++ b/Environment/testEnvironment.cc
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Framework/CMakeLists.txt b/Framework/CMakeLists.txt
index 2f7cd2b3e6f04e403e40c72946aa0a241b8f91bb..cfcb772a456a4f2583bdec7e0905ab0c2e5be7a5 100644
--- a/Framework/CMakeLists.txt
+++ b/Framework/CMakeLists.txt
@@ -1,4 +1,3 @@
-
 add_subdirectory (Utilities)
 add_subdirectory (Units)
 add_subdirectory (Geometry)
diff --git a/Framework/Cascade/CMakeLists.txt b/Framework/Cascade/CMakeLists.txt
index e4890d87a6df375206cc2ebfad42b5abc42f4721..24339ca6e1620f8b89efbd04ff7da617475a966a 100644
--- a/Framework/Cascade/CMakeLists.txt
+++ b/Framework/Cascade/CMakeLists.txt
@@ -1,4 +1,3 @@
-
 # namespace of library -> location of header files
 set (
   CORSIKAcascade_NAMESPACE
diff --git a/Framework/Cascade/Cascade.h b/Framework/Cascade/Cascade.h
index f9ec0beb0e40df08a16595bee6be8dc0048cff94..73d7c8de27bff2f6b0c6313307b0328a190edddc 100644
--- a/Framework/Cascade/Cascade.h
+++ b/Framework/Cascade/Cascade.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Framework/Cascade/testCascade.cc b/Framework/Cascade/testCascade.cc
index f29d1af9fba4c01c6452fc2dc026df7ff99f2c42..9c06c332e61eb25e934ef90713ec5fd179fa622c 100644
--- a/Framework/Cascade/testCascade.cc
+++ b/Framework/Cascade/testCascade.cc
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Framework/Cascade/testCascade.h b/Framework/Cascade/testCascade.h
index 386a7281f429ad1b9a8ce83de4ed1e5e830ef040..ac7a290f179c7a8578bd5d4455f26e8c0adf2db4 100644
--- a/Framework/Cascade/testCascade.h
+++ b/Framework/Cascade/testCascade.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Framework/Geometry/BaseTrajectory.h b/Framework/Geometry/BaseTrajectory.h
index 8d13f97a3a96c46549f8a4b8a5baad8951e33353..3654db64d05f654a1808f5214081222359526ac1 100644
--- a/Framework/Geometry/BaseTrajectory.h
+++ b/Framework/Geometry/BaseTrajectory.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Framework/Geometry/BaseVector.h b/Framework/Geometry/BaseVector.h
index c41d8edf205f84b2066f83a61a253130225ab207..e8c9857eb40e1a2e70347517cdcb1456fae595c8 100644
--- a/Framework/Geometry/BaseVector.h
+++ b/Framework/Geometry/BaseVector.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Framework/Geometry/CMakeLists.txt b/Framework/Geometry/CMakeLists.txt
index 6cda1a6fff3b6cfd069ec521f92dc7e2f77f66cc..c1c7122ec1081155997606c313fd1ba16df12949 100644
--- a/Framework/Geometry/CMakeLists.txt
+++ b/Framework/Geometry/CMakeLists.txt
@@ -1,4 +1,3 @@
-
 set (
   GEOMETRY_SOURCES
   CoordinateSystem.cc
diff --git a/Framework/Geometry/CoordinateSystem.cc b/Framework/Geometry/CoordinateSystem.cc
index 35e2941678d970b1868626a252785055d4413be4..49a35724e8e4767e5859a953569e8450b4b23182 100644
--- a/Framework/Geometry/CoordinateSystem.cc
+++ b/Framework/Geometry/CoordinateSystem.cc
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Framework/Geometry/CoordinateSystem.h b/Framework/Geometry/CoordinateSystem.h
index 195e89bb8bf74b952a108bf95ade7b4a9507c6d1..26da1a701139a5ed1b887d516582888807ae9d21 100644
--- a/Framework/Geometry/CoordinateSystem.h
+++ b/Framework/Geometry/CoordinateSystem.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Framework/Geometry/FourVector.h b/Framework/Geometry/FourVector.h
index 0a917a153d23a623f8d34881300a2ebccdc3ed6d..cae2d6f8593bce130df4a78ca6c1088db02dd5bb 100644
--- a/Framework/Geometry/FourVector.h
+++ b/Framework/Geometry/FourVector.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Framework/Geometry/Helix.h b/Framework/Geometry/Helix.h
index caf2c34d0009bb2e33ba0bcbf0babcdf7136ba41..120522db20789f6f377a1f911ac9fd33e4a393f4 100644
--- a/Framework/Geometry/Helix.h
+++ b/Framework/Geometry/Helix.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Framework/Geometry/Line.h b/Framework/Geometry/Line.h
index ce795d8d9ffc918c9b6559278ee6a8cf58bdd282..b1d00fe81b76a29a596e0d99aedcb9cc76d19516 100644
--- a/Framework/Geometry/Line.h
+++ b/Framework/Geometry/Line.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Framework/Geometry/Plane.h b/Framework/Geometry/Plane.h
index 2c3f103f52bb9278ffcca63766512ceda13d32c2..f6c201177989866ff7fbfec15253f911e592ec79 100644
--- a/Framework/Geometry/Plane.h
+++ b/Framework/Geometry/Plane.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Framework/Geometry/Point.h b/Framework/Geometry/Point.h
index 55dfa2950a1d5452bb9065ca4a814d4ee7562dee..4b7e121e7994e5b5313944dd66df7b68a8a36a99 100644
--- a/Framework/Geometry/Point.h
+++ b/Framework/Geometry/Point.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Framework/Geometry/QuantityVector.h b/Framework/Geometry/QuantityVector.h
index c606a2934d6415aecefc541c71d2e0335be02948..2c09260c0a65bd0ee24ce806eeb22d8addb2d15f 100644
--- a/Framework/Geometry/QuantityVector.h
+++ b/Framework/Geometry/QuantityVector.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Framework/Geometry/RootCoordinateSystem.h b/Framework/Geometry/RootCoordinateSystem.h
index 0e641b3a349e22173fd894e7bd005a8f71530a2b..ac47ba9c4773ece9fec9873e4d0f6d14df03018d 100644
--- a/Framework/Geometry/RootCoordinateSystem.h
+++ b/Framework/Geometry/RootCoordinateSystem.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Framework/Geometry/Sphere.h b/Framework/Geometry/Sphere.h
index 5a38820a3fecc600d6c2b55177ababc777b7c13c..894309f22a78d718fb34ce54f124d626e484d0d1 100644
--- a/Framework/Geometry/Sphere.h
+++ b/Framework/Geometry/Sphere.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Framework/Geometry/Vector.h b/Framework/Geometry/Vector.h
index ca97abb50feec457527751d79cd9e76b760cb4f2..64a5e8df2ed8178788893ff36344f0006ff308df 100644
--- a/Framework/Geometry/Vector.h
+++ b/Framework/Geometry/Vector.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Framework/Geometry/Volume.h b/Framework/Geometry/Volume.h
index c6c953d9511132e8663a25a3f05cbbd82b98916a..7f82fa1621b1219d70413c3576c88db8f62702c9 100644
--- a/Framework/Geometry/Volume.h
+++ b/Framework/Geometry/Volume.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Framework/Geometry/testFourVector.cc b/Framework/Geometry/testFourVector.cc
index a4063f0ef9a9b7d3528142c2d06094e9e70c7755..4046df094fb7e5dc8a7cfef9be35dac4ac79c2ff 100644
--- a/Framework/Geometry/testFourVector.cc
+++ b/Framework/Geometry/testFourVector.cc
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Framework/Geometry/testGeometry.cc b/Framework/Geometry/testGeometry.cc
index dae272be1bc052b3174ad42ae0b2a3f50777322b..56896960bdd4735423ec9581d5068c3f28a49649 100644
--- a/Framework/Geometry/testGeometry.cc
+++ b/Framework/Geometry/testGeometry.cc
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Framework/Logging/BufferedSink.h b/Framework/Logging/BufferedSink.h
index 16844e013b0d2fb56247ce67292ca56a5ed13fa2..5b2b3a62ae40ce505c682cc704e9428a7f5821fe 100644
--- a/Framework/Logging/BufferedSink.h
+++ b/Framework/Logging/BufferedSink.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Framework/Logging/CMakeLists.txt b/Framework/Logging/CMakeLists.txt
index 0926ad6576a74bb2585daba367461613e42f07c6..dbf8d6afe93735067cfae43e20da15d4f5a1e97e 100644
--- a/Framework/Logging/CMakeLists.txt
+++ b/Framework/Logging/CMakeLists.txt
@@ -1,4 +1,3 @@
-
 add_library (CORSIKAlogging INTERFACE)
 
 # namespace of library -> location of header files
diff --git a/Framework/Logging/Logger.h b/Framework/Logging/Logger.h
index 90bddd82d91cb0ef5e9914e3945830490739649c..15ebe3c54f521f0112d0a61bf80d14521903808c 100644
--- a/Framework/Logging/Logger.h
+++ b/Framework/Logging/Logger.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Framework/Logging/MessageOff.h b/Framework/Logging/MessageOff.h
index 91bd965cd5e9780ccea07d53a5e1c6ccee144283..691824be0100c9a9123ae4c538241830553073ae 100644
--- a/Framework/Logging/MessageOff.h
+++ b/Framework/Logging/MessageOff.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Framework/Logging/MessageOn.h b/Framework/Logging/MessageOn.h
index 159eae68b8e5d3c088f341bf77decacb640ce555..0b013a6350b95afdd1bb6ef5a43ab34ef47b7a92 100644
--- a/Framework/Logging/MessageOn.h
+++ b/Framework/Logging/MessageOn.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Framework/Logging/NoSink.h b/Framework/Logging/NoSink.h
index 93a16d1a1e70a3e30c24ee1f22fcbe212983b8c8..866d35601d8805da00884df2fac551acb4cf7bdd 100644
--- a/Framework/Logging/NoSink.h
+++ b/Framework/Logging/NoSink.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Framework/Logging/Sink.h b/Framework/Logging/Sink.h
index f88e3812f2437c2c47d1dde1204fcca0a32a079b..28c768d6f425a25515dfeeff0065df9b9e628643 100644
--- a/Framework/Logging/Sink.h
+++ b/Framework/Logging/Sink.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Framework/Logging/testLogging.cc b/Framework/Logging/testLogging.cc
index 56b44779c2cd7473f9740f30b0871572f40378e9..92f883d0b92146a8beeb763ed3fafb0b2227b08c 100644
--- a/Framework/Logging/testLogging.cc
+++ b/Framework/Logging/testLogging.cc
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Framework/Particles/ParticleProperties.cc b/Framework/Particles/ParticleProperties.cc
index 396a10afd9363b3e6502b4ce59e9e66fd61727c2..0f572ca24176392129e6ebd2956d2aadb83f0bc1 100644
--- a/Framework/Particles/ParticleProperties.cc
+++ b/Framework/Particles/ParticleProperties.cc
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Framework/Particles/ParticleProperties.h b/Framework/Particles/ParticleProperties.h
index 472baf40dfff9707fb52302043adcd10a4449c3b..69f0700652ec690f0355cdd65206554e330e7544 100644
--- a/Framework/Particles/ParticleProperties.h
+++ b/Framework/Particles/ParticleProperties.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Framework/Particles/testParticles.cc b/Framework/Particles/testParticles.cc
index 3fd99ea2c0e24f52ebd61cd978db97ce54fe3ac7..0b0dd86d5c3306904002038070a039757be24bf2 100644
--- a/Framework/Particles/testParticles.cc
+++ b/Framework/Particles/testParticles.cc
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Framework/ProcessSequence/BaseProcess.h b/Framework/ProcessSequence/BaseProcess.h
index 6733fcf9a9f66a53c3a4d55326cdc37eabbcc314..31b7f5384a57f2f8d56ccd34913e12b371f29017 100644
--- a/Framework/ProcessSequence/BaseProcess.h
+++ b/Framework/ProcessSequence/BaseProcess.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Framework/ProcessSequence/CMakeLists.txt b/Framework/ProcessSequence/CMakeLists.txt
index c1a4c77830c559edd56dd0d7307eca12daa96ab8..78364a26402e0285a439c25721283cb00b9e382f 100644
--- a/Framework/ProcessSequence/CMakeLists.txt
+++ b/Framework/ProcessSequence/CMakeLists.txt
@@ -1,4 +1,3 @@
-
 add_library (CORSIKAprocesssequence INTERFACE)
 
 #namespace of library->location of header files
diff --git a/Framework/ProcessSequence/ContinuousProcess.h b/Framework/ProcessSequence/ContinuousProcess.h
index 27f6c8fae4cb52e037f7ac128dd5fde161dd5566..13ee20752c74d03035dde2124f4d048c628b133b 100644
--- a/Framework/ProcessSequence/ContinuousProcess.h
+++ b/Framework/ProcessSequence/ContinuousProcess.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Framework/ProcessSequence/DecayProcess.h b/Framework/ProcessSequence/DecayProcess.h
index 16d63ae667775848db49076d242fa451f38060e6..2f1131dca957a1240bf121754000673387f0150a 100644
--- a/Framework/ProcessSequence/DecayProcess.h
+++ b/Framework/ProcessSequence/DecayProcess.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Framework/ProcessSequence/InteractionProcess.h b/Framework/ProcessSequence/InteractionProcess.h
index a9b4b9fca306e865a85ac94ae6a9878ce7f0057d..a932be90eec9e1566255fcc36c02e7dd42b988fa 100644
--- a/Framework/ProcessSequence/InteractionProcess.h
+++ b/Framework/ProcessSequence/InteractionProcess.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Framework/ProcessSequence/ProcessReturn.h b/Framework/ProcessSequence/ProcessReturn.h
index 94a69406ac42c9ec7caccb53e0e42493ec15fe32..2684dade53d638a0588a0e6ec9fefa0ad70a004b 100644
--- a/Framework/ProcessSequence/ProcessReturn.h
+++ b/Framework/ProcessSequence/ProcessReturn.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Framework/ProcessSequence/ProcessSequence.h b/Framework/ProcessSequence/ProcessSequence.h
index e4108b95fd5067ddec1d2a1d8e0c1523e22e7305..bb8bb061f56b361efe2036a192a9c5d8ee110b3a 100644
--- a/Framework/ProcessSequence/ProcessSequence.h
+++ b/Framework/ProcessSequence/ProcessSequence.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Framework/ProcessSequence/ProcessSignature.h b/Framework/ProcessSequence/ProcessSignature.h
index 38503b87b49fcd900cc8d2b28f4872e9aeabc419..0fb3abd9ceec074c78c22431822bb475b8899872 100644
--- a/Framework/ProcessSequence/ProcessSignature.h
+++ b/Framework/ProcessSequence/ProcessSignature.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Framework/ProcessSequence/SecondariesProcess.h b/Framework/ProcessSequence/SecondariesProcess.h
index 7e4f11e442e39ecfdde376332ceb276095fc8484..8422012cb90958484fae6e2b0b8134f798eae0c8 100644
--- a/Framework/ProcessSequence/SecondariesProcess.h
+++ b/Framework/ProcessSequence/SecondariesProcess.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Framework/ProcessSequence/StackProcess.h b/Framework/ProcessSequence/StackProcess.h
index 1458fa75ca5938cdd42d50d0b4d22af46f641302..56cf4991c56add045b0a419262b0ec0a021a0da6 100644
--- a/Framework/ProcessSequence/StackProcess.h
+++ b/Framework/ProcessSequence/StackProcess.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Framework/ProcessSequence/testProcessSequence.cc b/Framework/ProcessSequence/testProcessSequence.cc
index e8bfe7c1c835762e64ccb3afed48962775dc24ae..237f90436262fdee35c4638f264c2b0faac1cf35 100644
--- a/Framework/ProcessSequence/testProcessSequence.cc
+++ b/Framework/ProcessSequence/testProcessSequence.cc
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Framework/Random/CMakeLists.txt b/Framework/Random/CMakeLists.txt
index b553d8c44e01cdc678a27d311d96645744a374dc..2878264e86bf546c5db084bb61da433780eadb55 100644
--- a/Framework/Random/CMakeLists.txt
+++ b/Framework/Random/CMakeLists.txt
@@ -1,4 +1,3 @@
-
 set (
   CORSIKArandom_SOURCES
   RNGManager.cc
diff --git a/Framework/Random/ExponentialDistribution.h b/Framework/Random/ExponentialDistribution.h
index dc17b20997e9932aaedfc8f26eeec3c2d63a1392..46b12a6391e21e27877827ccec59b1532734f2f6 100644
--- a/Framework/Random/ExponentialDistribution.h
+++ b/Framework/Random/ExponentialDistribution.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Framework/Random/RNGManager.cc b/Framework/Random/RNGManager.cc
index c02f7a4329b52cd397ba78c404381430c6d030b1..ddcccae37171c36c93158af286f85de91a75b6d4 100644
--- a/Framework/Random/RNGManager.cc
+++ b/Framework/Random/RNGManager.cc
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Framework/Random/RNGManager.h b/Framework/Random/RNGManager.h
index 9637b4b8279a48169a523df687eab0146afada38..da630c2531a2cb0dc5702dee9b837ba3aa13b99d 100644
--- a/Framework/Random/RNGManager.h
+++ b/Framework/Random/RNGManager.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Framework/Random/UniformRealDistribution.h b/Framework/Random/UniformRealDistribution.h
index 1328377dc2d88114c447cd5a4558dfec21cdf112..7f96bea92acc97a62e4730e53f9a70e55c5bc49b 100644
--- a/Framework/Random/UniformRealDistribution.h
+++ b/Framework/Random/UniformRealDistribution.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Framework/Random/testRandom.cc b/Framework/Random/testRandom.cc
index c362d393fea3bc8bf4c4ad72949dd0c6a8d0bf86..95eda4d36b9abc39f30752bbec1b107b86b8f728 100644
--- a/Framework/Random/testRandom.cc
+++ b/Framework/Random/testRandom.cc
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Framework/StackInterface/CombinedStack.h b/Framework/StackInterface/CombinedStack.h
index 8b987d5100732a7a339a23d6fadd3530870bb2ef..42f2f78d82c1fcb94b578e168d9ed7463ba77ceb 100644
--- a/Framework/StackInterface/CombinedStack.h
+++ b/Framework/StackInterface/CombinedStack.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Framework/StackInterface/ParticleBase.h b/Framework/StackInterface/ParticleBase.h
index 04c9184ba5187111e44ffae0902a7352950498da..78a4c867c7a91752765ca29cb84a9dad2d6b9617 100644
--- a/Framework/StackInterface/ParticleBase.h
+++ b/Framework/StackInterface/ParticleBase.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Framework/StackInterface/SecondaryView.h b/Framework/StackInterface/SecondaryView.h
index fae9d463f9c6808b69d346092fe6277a7c5fec7a..a1dd4240924f6851efb2b64be431a0ed8ae632e9 100644
--- a/Framework/StackInterface/SecondaryView.h
+++ b/Framework/StackInterface/SecondaryView.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Framework/StackInterface/Stack.h b/Framework/StackInterface/Stack.h
index 86bd98180fc68fc70d32f2d9a9714eb51cb6f87f..c5c78ad8bb901f6f39e9577b91009fcb2b35a9ec 100644
--- a/Framework/StackInterface/Stack.h
+++ b/Framework/StackInterface/Stack.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Framework/StackInterface/StackIteratorInterface.h b/Framework/StackInterface/StackIteratorInterface.h
index 03c59cb44c1d9b7cc74f18fce20cd0ceaaac687f..16c08f03e9419a8bdf01ee2e1038a930abe64448 100644
--- a/Framework/StackInterface/StackIteratorInterface.h
+++ b/Framework/StackInterface/StackIteratorInterface.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Framework/StackInterface/testCombinedStack.cc b/Framework/StackInterface/testCombinedStack.cc
index aceccd1b472a99c57168eef4d78851b3641c092c..70f5538ccd43558a9b891d781b9e74ea1af254d7 100644
--- a/Framework/StackInterface/testCombinedStack.cc
+++ b/Framework/StackInterface/testCombinedStack.cc
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Framework/StackInterface/testSecondaryView.cc b/Framework/StackInterface/testSecondaryView.cc
index 95c196d5ecef139339b21bb41623f8a52e846d76..2a0dca6c886ce560fcd65b667ac28e26dc7ac467 100644
--- a/Framework/StackInterface/testSecondaryView.cc
+++ b/Framework/StackInterface/testSecondaryView.cc
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Framework/StackInterface/testStackInterface.cc b/Framework/StackInterface/testStackInterface.cc
index 1fa07872f3b695dda729335f2b6d52bfc69acecb..95235f0ebed1dbf0d77ecbf878c5cf9d891fb322 100644
--- a/Framework/StackInterface/testStackInterface.cc
+++ b/Framework/StackInterface/testStackInterface.cc
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Framework/StackInterface/testTestStack.h b/Framework/StackInterface/testTestStack.h
index b086994cc530544c01af66d34b46ac61046ee097..d7a9e7b437db49a7401d165706aa2ca4945b9137 100644
--- a/Framework/StackInterface/testTestStack.h
+++ b/Framework/StackInterface/testTestStack.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Framework/Units/CMakeLists.txt b/Framework/Units/CMakeLists.txt
index 226396ea49132616c57a64a92cb13ddf18783686..e85d7bde024a84e569c0cf1869e4f5044158cd80 100644
--- a/Framework/Units/CMakeLists.txt
+++ b/Framework/Units/CMakeLists.txt
@@ -1,4 +1,3 @@
-
 add_library (CORSIKAunits INTERFACE)
 
 set (CORSIKAunits_NAMESPACE corsika/units)
diff --git a/Framework/Units/PhysicalConstants.h b/Framework/Units/PhysicalConstants.h
index 23494f036ed2f692de71984c8fc1b81a6d919112..eacccfe165b779f810156cdf3c4d30df35d99dba 100644
--- a/Framework/Units/PhysicalConstants.h
+++ b/Framework/Units/PhysicalConstants.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Framework/Units/PhysicalUnits.h b/Framework/Units/PhysicalUnits.h
index b1f1eb7420f3e5e19b9a5694c66e604323786a78..e701928f8cc38b3fca6e91a2de3bbee12e02861a 100644
--- a/Framework/Units/PhysicalUnits.h
+++ b/Framework/Units/PhysicalUnits.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Framework/Units/testUnits.cc b/Framework/Units/testUnits.cc
index fb07c714e858bda0584018de8f8b7d07ba8d0176..bce1218e3617a9a7c9cd4480fd7cb39e9bf9281b 100644
--- a/Framework/Units/testUnits.cc
+++ b/Framework/Units/testUnits.cc
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Framework/Utilities/Bit.h b/Framework/Utilities/Bit.h
index 7306e76d8d7f979fe18974452cd67a25b75b99c7..c3e549028b725e0b13cb26185e9cd177beee38a7 100644
--- a/Framework/Utilities/Bit.h
+++ b/Framework/Utilities/Bit.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Framework/Utilities/COMBoost.cc b/Framework/Utilities/COMBoost.cc
index a94645215f95f047d934e316a0dfff3857636419..1d65d6439a2731a70988d440b76ed4e68a77262f 100644
--- a/Framework/Utilities/COMBoost.cc
+++ b/Framework/Utilities/COMBoost.cc
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Framework/Utilities/COMBoost.h b/Framework/Utilities/COMBoost.h
index 57867769dc420c77630ebe3d446f0834999dd988..48532531e5caa981f1d01daf258af5d737fa1216 100644
--- a/Framework/Utilities/COMBoost.h
+++ b/Framework/Utilities/COMBoost.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Framework/Utilities/CorsikaFenv.h b/Framework/Utilities/CorsikaFenv.h
index e7df5953461aa4d98dab8fa917b8b20847a22ddd..459be7ff681c5681b9bfb123d192368524728ce1 100644
--- a/Framework/Utilities/CorsikaFenv.h
+++ b/Framework/Utilities/CorsikaFenv.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Framework/Utilities/CorsikaFenvDefault.cc b/Framework/Utilities/CorsikaFenvDefault.cc
index f1bb7732bfe111ca3c71018282ac346bacadeee2..228bf54f5184710d2344d80b52730c8f22ba0db4 100644
--- a/Framework/Utilities/CorsikaFenvDefault.cc
+++ b/Framework/Utilities/CorsikaFenvDefault.cc
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Framework/Utilities/CorsikaFenvFallback.cc b/Framework/Utilities/CorsikaFenvFallback.cc
index ed71c5b6c07096fe3d846fd82d5afa5c284e6599..8aa130b73481c79782b368ed98035dbfd8eecd2c 100644
--- a/Framework/Utilities/CorsikaFenvFallback.cc
+++ b/Framework/Utilities/CorsikaFenvFallback.cc
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Framework/Utilities/CorsikaFenvOSX.cc b/Framework/Utilities/CorsikaFenvOSX.cc
index 4495ebd1e823ad5a9a1b894d07c09ae8f842d068..1028c4b7e0988bb7ced605f71990c9c9f344fbbc 100644
--- a/Framework/Utilities/CorsikaFenvOSX.cc
+++ b/Framework/Utilities/CorsikaFenvOSX.cc
@@ -1,14 +1,3 @@
-
-/*
- * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
- *
- * See file AUTHORS for a list of contributors.
- *
- * This software is distributed under the terms of the GNU General Public
- * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
- * the license.
- */
-
 /**
  * Import public domain code
  *
diff --git a/Framework/Utilities/MetaProgramming.h b/Framework/Utilities/MetaProgramming.h
index 73aa19f82a7b481d54e03e9126fe5d8327b4247c..1d88cb218482313232e8749c00a637529e639ce1 100644
--- a/Framework/Utilities/MetaProgramming.h
+++ b/Framework/Utilities/MetaProgramming.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Framework/Utilities/Singleton.h b/Framework/Utilities/Singleton.h
index 80c272d58bff6cea52fbd2083fdfb7e4238b9b60..944fbe6f97c68f0574db5ecbf689fc977caf4d5b 100644
--- a/Framework/Utilities/Singleton.h
+++ b/Framework/Utilities/Singleton.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Framework/Utilities/testCOMBoost.cc b/Framework/Utilities/testCOMBoost.cc
index da7cffefe07da7cccbc6b350f80cf62d173c555a..9589bdd1183cfececea52224736d7f4ad64502e6 100644
--- a/Framework/Utilities/testCOMBoost.cc
+++ b/Framework/Utilities/testCOMBoost.cc
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Framework/Utilities/testCorsikaFenv.cc b/Framework/Utilities/testCorsikaFenv.cc
index eb4885b9a233135356e8a047b1dc4c86861e25b4..1049e5164d757197c45848fef67098d4246321cf 100644
--- a/Framework/Utilities/testCorsikaFenv.cc
+++ b/Framework/Utilities/testCorsikaFenv.cc
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Framework/Utilities/try_feenableexcept.cc b/Framework/Utilities/try_feenableexcept.cc
index 9ca52262c2903878a70e4090f031f8915b619265..0e12cf8d461acebe521cf72b3c851a565fc5f553 100644
--- a/Framework/Utilities/try_feenableexcept.cc
+++ b/Framework/Utilities/try_feenableexcept.cc
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Main/CMakeLists.txt b/Main/CMakeLists.txt
index 139597f9cb07c5d48bed18984ec4747f4b4f3438..8b137891791fe96927ad78e64b0aad7bded08bdc 100644
--- a/Main/CMakeLists.txt
+++ b/Main/CMakeLists.txt
@@ -1,2 +1 @@
 
-
diff --git a/Main/Environment.h b/Main/Environment.h
deleted file mode 100644
index 6839def48c2f6fddfafd0beb5fd4ca46058ebd09..0000000000000000000000000000000000000000
--- a/Main/Environment.h
+++ /dev/null
@@ -1,10 +0,0 @@
-
-/*
- * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
- *
- * See file AUTHORS for a list of contributors.
- *
- * This software is distributed under the terms of the GNU General Public
- * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
- * the license.
- */
diff --git a/Main/Stack.h b/Main/Stack.h
deleted file mode 100644
index 6839def48c2f6fddfafd0beb5fd4ca46058ebd09..0000000000000000000000000000000000000000
--- a/Main/Stack.h
+++ /dev/null
@@ -1,10 +0,0 @@
-
-/*
- * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
- *
- * See file AUTHORS for a list of contributors.
- *
- * This software is distributed under the terms of the GNU General Public
- * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
- * the license.
- */
diff --git a/Main/shower.cc b/Main/shower.cc
index 5ca8d4ab2532081c4654cd51e98b9bcdda9cc2f6..05a5e9bd9ee1c69400167849d114d42177a1ff06 100644
--- a/Main/shower.cc
+++ b/Main/shower.cc
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Processes/CMakeLists.txt b/Processes/CMakeLists.txt
index b54f76d8fd3d16d37de019ffb202015ab15bd663..a9e52d9e8172f42b7265a17ec23924b018e7dd5d 100644
--- a/Processes/CMakeLists.txt
+++ b/Processes/CMakeLists.txt
@@ -1,4 +1,3 @@
-
 add_subdirectory (NullModel)
 add_subdirectory (Sibyll)
 if (PYTHIA8_FOUND)
diff --git a/Processes/EnergyLoss/CMakeLists.txt b/Processes/EnergyLoss/CMakeLists.txt
index 5333eaf4cc8ba39d59ecd67ea83ffcefd55687bd..62fca1ca017b3dbea3a4a331381596b87931ac01 100644
--- a/Processes/EnergyLoss/CMakeLists.txt
+++ b/Processes/EnergyLoss/CMakeLists.txt
@@ -1,4 +1,3 @@
-
 set (
   MODEL_SOURCES
   EnergyLoss.cc
diff --git a/Processes/EnergyLoss/EnergyLoss.cc b/Processes/EnergyLoss/EnergyLoss.cc
index aaa6dfd6146deb0f34cfbdd79f7e78d76aafa4be..b49030a5749dd0e5bb26dee0a8f081f7f5720b7d 100644
--- a/Processes/EnergyLoss/EnergyLoss.cc
+++ b/Processes/EnergyLoss/EnergyLoss.cc
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Processes/EnergyLoss/EnergyLoss.h b/Processes/EnergyLoss/EnergyLoss.h
index d0726d9d44220f27c356f5128a43a0092cecc558..36919fade1f8c6c4cefec25db0b12c2724216345 100644
--- a/Processes/EnergyLoss/EnergyLoss.h
+++ b/Processes/EnergyLoss/EnergyLoss.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Processes/HadronicElasticModel/CMakeLists.txt b/Processes/HadronicElasticModel/CMakeLists.txt
index 993aeba732e0dc20a224109299bf1259eb66f09f..55d774ec43981d88c3ab1d28e74cb8374888b1e7 100644
--- a/Processes/HadronicElasticModel/CMakeLists.txt
+++ b/Processes/HadronicElasticModel/CMakeLists.txt
@@ -1,4 +1,3 @@
-
 set (
   MODEL_SOURCES
   HadronicElasticModel.cc
diff --git a/Processes/HadronicElasticModel/HadronicElasticModel.cc b/Processes/HadronicElasticModel/HadronicElasticModel.cc
index 9e05c521320787b1f8a42ca3c154cfa708285769..9267fcaf989cbd8dd94f278d7c6b4c4d3cd26193 100644
--- a/Processes/HadronicElasticModel/HadronicElasticModel.cc
+++ b/Processes/HadronicElasticModel/HadronicElasticModel.cc
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Processes/HadronicElasticModel/HadronicElasticModel.h b/Processes/HadronicElasticModel/HadronicElasticModel.h
index b3fd15fd2cdc6feac967182cff342b60f30e954d..e9533139b52ed83e3c729ca8025cd435b5a1b92a 100644
--- a/Processes/HadronicElasticModel/HadronicElasticModel.h
+++ b/Processes/HadronicElasticModel/HadronicElasticModel.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Processes/NullModel/CMakeLists.txt b/Processes/NullModel/CMakeLists.txt
index e84d6d9246833cd4e2e763cebd5ef238119a9bfa..d4392ffeaf9ee2d664b746fe61f7d8d56cf4c437 100644
--- a/Processes/NullModel/CMakeLists.txt
+++ b/Processes/NullModel/CMakeLists.txt
@@ -1,4 +1,3 @@
-
 set (
   MODEL_SOURCES
   NullModel.cc
diff --git a/Processes/NullModel/NullModel.cc b/Processes/NullModel/NullModel.cc
index 802ee5b4a669f824ac94c717e0bd61b3a0cfd3a3..2e2861dc9375d3340dd4da1c56459b654fc463dd 100644
--- a/Processes/NullModel/NullModel.cc
+++ b/Processes/NullModel/NullModel.cc
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Processes/NullModel/NullModel.h b/Processes/NullModel/NullModel.h
index d3a820da41ede79dfd40669e7da6d15faaa8cf79..f02978af7a6a98d3be2b26f3cfb848dafed8b989 100644
--- a/Processes/NullModel/NullModel.h
+++ b/Processes/NullModel/NullModel.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Processes/NullModel/testNullModel.cc b/Processes/NullModel/testNullModel.cc
index 930d5979fec7bbcc728212b74e944f7dd11599cf..f8ec122c677c175a35a4fdc3a3288dbde7c59f4c 100644
--- a/Processes/NullModel/testNullModel.cc
+++ b/Processes/NullModel/testNullModel.cc
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Processes/Pythia/Decay.h b/Processes/Pythia/Decay.h
index 6506625b07a04ec076919bafcbf0e8c92395aaf4..cc971c6b0f169dbfc3141905d2685e97f539acbb 100644
--- a/Processes/Pythia/Decay.h
+++ b/Processes/Pythia/Decay.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Processes/Pythia/Interaction.cc b/Processes/Pythia/Interaction.cc
index 2a0cce386edc6dfc5a14f0f6fb84fd94aa5a85a7..043b1d40524876c3ecdf3ad2003edcada07e0934 100644
--- a/Processes/Pythia/Interaction.cc
+++ b/Processes/Pythia/Interaction.cc
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Processes/Pythia/Random.h b/Processes/Pythia/Random.h
index cd35fc4eeafcbdf4ec507cf54ab966271a8183f0..9a6fb6fc706f3504ce32605ad527e1c7f1e7a3b4 100644
--- a/Processes/Pythia/Random.h
+++ b/Processes/Pythia/Random.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Processes/Pythia/testPythia.cc b/Processes/Pythia/testPythia.cc
index f6f09b84c17f80f8b579d1a11eba843e6ddbc964..caeb193281e3410caded70e667754622c53c8e65 100644
--- a/Processes/Pythia/testPythia.cc
+++ b/Processes/Pythia/testPythia.cc
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Processes/Sibyll/Decay.cc b/Processes/Sibyll/Decay.cc
index 9cb42f0c5c2f20db356218450684b41d5d6f1bd5..b2ac4a9efebeea382157dc3af3329d8ad878b4c4 100644
--- a/Processes/Sibyll/Decay.cc
+++ b/Processes/Sibyll/Decay.cc
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Processes/Sibyll/Decay.h b/Processes/Sibyll/Decay.h
index 03efcb97138f2525b676ea66e0bbe121fc4045dc..0416bf6e24c191ef68f6714c29844d8f13b9cab7 100644
--- a/Processes/Sibyll/Decay.h
+++ b/Processes/Sibyll/Decay.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Processes/Sibyll/Interaction.cc b/Processes/Sibyll/Interaction.cc
index c089ec083c9c7d9ec1d91136cb0c7796dc958c57..d55506688b9e6c8d607ee431171088f3c8237de7 100644
--- a/Processes/Sibyll/Interaction.cc
+++ b/Processes/Sibyll/Interaction.cc
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Processes/Sibyll/Interaction.h b/Processes/Sibyll/Interaction.h
index 643bd0d51bd4f387aafa3870f2dddfb0ed1fe9d5..0eb65029c8efeb5a909f517ea0dc385e206ae44a 100644
--- a/Processes/Sibyll/Interaction.h
+++ b/Processes/Sibyll/Interaction.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Processes/Sibyll/NuclearInteraction.cc b/Processes/Sibyll/NuclearInteraction.cc
index 907e95b271bb44cfb4d2982f0f1f40f88cbb0eca..be970455fd33701667bc375d3ffe7581c7997786 100644
--- a/Processes/Sibyll/NuclearInteraction.cc
+++ b/Processes/Sibyll/NuclearInteraction.cc
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Processes/Sibyll/NuclearInteraction.h b/Processes/Sibyll/NuclearInteraction.h
index 261f931321ed98119ab02f4e3cace952308fdbb7..4d12647f21b00415f8992fa796513fe9ee1eed5f 100644
--- a/Processes/Sibyll/NuclearInteraction.h
+++ b/Processes/Sibyll/NuclearInteraction.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Processes/Sibyll/ParticleConversion.cc b/Processes/Sibyll/ParticleConversion.cc
index 1410775bf384239ccfa5133bba674d2751e6596e..4a19f2fb92fc91880f93812f8215119c5772ea09 100644
--- a/Processes/Sibyll/ParticleConversion.cc
+++ b/Processes/Sibyll/ParticleConversion.cc
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Processes/Sibyll/ParticleConversion.h b/Processes/Sibyll/ParticleConversion.h
index 0d67fc830eb3975ed6cc47aaff3972ca846124d4..a6b31fc8fa980bca74e8af5a62cf2443ca9bc883 100644
--- a/Processes/Sibyll/ParticleConversion.h
+++ b/Processes/Sibyll/ParticleConversion.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Processes/Sibyll/SibStack.h b/Processes/Sibyll/SibStack.h
index fd847124abbcd34b42f2acd5ddb1bc3e5cef2e79..f0d979547c80f3bf45ae176f88b73a0dee75f590 100644
--- a/Processes/Sibyll/SibStack.h
+++ b/Processes/Sibyll/SibStack.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Processes/Sibyll/nuclib.h b/Processes/Sibyll/nuclib.h
index 44e86f50ef825bc8bfd7d98763d86be1ab903fa4..b3fc2c059d26a1f2fc74b0b6ccd62e4512d6aea6 100644
--- a/Processes/Sibyll/nuclib.h
+++ b/Processes/Sibyll/nuclib.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Processes/Sibyll/sibyll2.3c.cc b/Processes/Sibyll/sibyll2.3c.cc
index 61766ff1128564977ddf296387389fc7e24a20f0..7cb2c027dc45948c5db2eeae473bc883305b604b 100644
--- a/Processes/Sibyll/sibyll2.3c.cc
+++ b/Processes/Sibyll/sibyll2.3c.cc
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Processes/Sibyll/sibyll2.3c.h b/Processes/Sibyll/sibyll2.3c.h
index 756a94bd2f05d6b14eaada201b4d75e4476c0f9b..b7030ad32578a14cd5d9ed5be1f82b4b082b7d58 100644
--- a/Processes/Sibyll/sibyll2.3c.h
+++ b/Processes/Sibyll/sibyll2.3c.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Processes/Sibyll/testSibyll.cc b/Processes/Sibyll/testSibyll.cc
index 0c42c90abb86a758c45f5ad4a79ebe87d3f1d3fa..e9393b698af6fbcd893144ee38a6a04a54ec70bb 100644
--- a/Processes/Sibyll/testSibyll.cc
+++ b/Processes/Sibyll/testSibyll.cc
@@ -1,6 +1,5 @@
-
 /*
- * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
+ * (c) Copyright 2019 CORSIKA Project, corsika-project@lists.kit.edu
  *
  * See file AUTHORS for a list of contributors.
  *
diff --git a/Processes/StackInspector/CMakeLists.txt b/Processes/StackInspector/CMakeLists.txt
index cbf216ca9094463912ff36eade3293660aba967b..34a8f54858fe12e5bc849d1e8f9fa93834a7ec0c 100644
--- a/Processes/StackInspector/CMakeLists.txt
+++ b/Processes/StackInspector/CMakeLists.txt
@@ -1,4 +1,3 @@
-
 set (
   MODEL_SOURCES
   StackInspector.cc
diff --git a/Processes/StackInspector/StackInspector.cc b/Processes/StackInspector/StackInspector.cc
index e56503378ed5abfc15578c474ed0afd4d54d6412..f9ad04daa9ce083c84c69c971b676a1c57298923 100644
--- a/Processes/StackInspector/StackInspector.cc
+++ b/Processes/StackInspector/StackInspector.cc
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Processes/StackInspector/StackInspector.h b/Processes/StackInspector/StackInspector.h
index 62f36eeebae774f74d26953697707e698c75da6e..24dbf3b9bc5127dc3497499acb7d4f4562e02476 100644
--- a/Processes/StackInspector/StackInspector.h
+++ b/Processes/StackInspector/StackInspector.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Processes/StackInspector/testStackInspector.cc b/Processes/StackInspector/testStackInspector.cc
index 832bea00a8074214ef9f3a235a6a574f7286cf02..ba738ef8e39ce52e3150453526e5754ec95dda5f 100644
--- a/Processes/StackInspector/testStackInspector.cc
+++ b/Processes/StackInspector/testStackInspector.cc
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Processes/TrackWriter/CMakeLists.txt b/Processes/TrackWriter/CMakeLists.txt
index b1cad804b85baacad0958a9172f965247a0806dc..4c7a19556f8913aa1f385b72b802d525532e1c08 100644
--- a/Processes/TrackWriter/CMakeLists.txt
+++ b/Processes/TrackWriter/CMakeLists.txt
@@ -1,4 +1,3 @@
-
 set (
   MODEL_SOURCES
   TrackWriter.cc
diff --git a/Processes/TrackWriter/TrackWriter.cc b/Processes/TrackWriter/TrackWriter.cc
index d3247e87c8ad0e66620afcad2b2dc18d3e1c6049..1bfe40add4f6b6f21170ec9625c744fd1d7feea3 100644
--- a/Processes/TrackWriter/TrackWriter.cc
+++ b/Processes/TrackWriter/TrackWriter.cc
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Processes/TrackWriter/TrackWriter.h b/Processes/TrackWriter/TrackWriter.h
index de9bf31b7373801597c897cbca01ed586f4aa4b1..81f14c5e7f534af62e40cca4200ee584fc78b033 100644
--- a/Processes/TrackWriter/TrackWriter.h
+++ b/Processes/TrackWriter/TrackWriter.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Processes/TrackingLine/CMakeLists.txt b/Processes/TrackingLine/CMakeLists.txt
index 24dcabc8b0c7d581baddbde0e817fa96ffe0a7c3..d61e9c7a8a7d9c1d45a23fdfb57aca98822514e3 100644
--- a/Processes/TrackingLine/CMakeLists.txt
+++ b/Processes/TrackingLine/CMakeLists.txt
@@ -1,4 +1,3 @@
-
 set (
   MODEL_HEADERS
   TrackingLine.h
diff --git a/Processes/TrackingLine/TrackingLine.cc b/Processes/TrackingLine/TrackingLine.cc
index 149556bf245b9fb418fb3db03f267e64b688fb5f..09c05e2e863fd3f4b4e48331560f19a43dfbdeb8 100644
--- a/Processes/TrackingLine/TrackingLine.cc
+++ b/Processes/TrackingLine/TrackingLine.cc
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Processes/TrackingLine/TrackingLine.h b/Processes/TrackingLine/TrackingLine.h
index df02264fe6f4c5640fe40c799255e87ce26a958e..a50c2dd96137818b41f0f511f52b196f958597cd 100644
--- a/Processes/TrackingLine/TrackingLine.h
+++ b/Processes/TrackingLine/TrackingLine.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Processes/UrQMD/Copyright b/Processes/UrQMD/Copyright
index 0667505f66addd37ae1094f423366bdf97ab69a4..94bb565778ca0f60a370592e72a088829c0d5408 100644
--- a/Processes/UrQMD/Copyright
+++ b/Processes/UrQMD/Copyright
@@ -1,4 +1,3 @@
-
 Copyright
 
 
diff --git a/Processes/UrQMD/UrQMD.cc b/Processes/UrQMD/UrQMD.cc
index 98f7a7385727d30836e7590bfb6bd54f8de4f542..b60edba1b5fdc636723c70cbfcee76e92281af4f 100644
--- a/Processes/UrQMD/UrQMD.cc
+++ b/Processes/UrQMD/UrQMD.cc
@@ -1,3 +1,13 @@
+/*
+ * (c) Copyright 2019 CORSIKA Project, corsika-project@lists.kit.edu
+ *
+ * See file AUTHORS for a list of contributors.
+ *
+ * This software is distributed under the terms of the GNU General Public
+ * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
+ * the license.
+ */
+
 #include <corsika/geometry/QuantityVector.h>
 #include <corsika/geometry/Vector.h>
 #include <corsika/particles/ParticleProperties.h>
diff --git a/Processes/UrQMD/UrQMD.h b/Processes/UrQMD/UrQMD.h
index a77e6e843b38055bc96c470c79f2902fcfa58ce5..3be0168ac3aaf327a79a952869b0d60fec12e0a0 100644
--- a/Processes/UrQMD/UrQMD.h
+++ b/Processes/UrQMD/UrQMD.h
@@ -1,3 +1,13 @@
+/*
+ * (c) Copyright 2019 CORSIKA Project, corsika-project@lists.kit.edu
+ *
+ * See file AUTHORS for a list of contributors.
+ *
+ * This software is distributed under the terms of the GNU General Public
+ * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
+ * the license.
+ */
+
 #ifndef _Processes_UrQMD_UrQMD_h
 #define _Processes_UrQMD_UrQMD_h
 
diff --git a/Setup/CMakeLists.txt b/Setup/CMakeLists.txt
index 5b73fa434c99f42a5372c2f7488463a6d9c956de..f37e2dfd4c5c1e09d062d26ecbe1394c918f574a 100644
--- a/Setup/CMakeLists.txt
+++ b/Setup/CMakeLists.txt
@@ -1,4 +1,3 @@
-
 set (
   SETUP_HEADERS
   SetupStack.h
diff --git a/Setup/SetupEnvironment.h b/Setup/SetupEnvironment.h
index 83397da951f2d7594fea3e2c5a3dfa1d2b88da19..fc049b189d6c9315ac5745f24df9f424e2085f78 100644
--- a/Setup/SetupEnvironment.h
+++ b/Setup/SetupEnvironment.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Setup/SetupLogger.h b/Setup/SetupLogger.h
index 76148050fc5a7f5f5fa8a03a0d96d1b12e465777..d3a723d627d9927e88ed07b90dc64024c2683987 100644
--- a/Setup/SetupLogger.h
+++ b/Setup/SetupLogger.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Setup/SetupStack.h b/Setup/SetupStack.h
index a59ca2aa3815b5a956e17a07faabf61e2834d972..18d81195cd9d2c5dc93e5e9451cbe00733f5415b 100644
--- a/Setup/SetupStack.h
+++ b/Setup/SetupStack.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Setup/SetupTrajectory.h b/Setup/SetupTrajectory.h
index 0e93b3e4466eb98caa7ee3ccefd1edcf3946d104..2b8dd1a3b824aed272db7ce3d6b7e69e9f4838b2 100644
--- a/Setup/SetupTrajectory.h
+++ b/Setup/SetupTrajectory.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Stack/CMakeLists.txt b/Stack/CMakeLists.txt
index a9645130bd9f81cd4415fbfeccc88e5a736b7160..01130bb116008bb9c642baa76891630d4dca96e5 100644
--- a/Stack/CMakeLists.txt
+++ b/Stack/CMakeLists.txt
@@ -1,4 +1,3 @@
-
 add_subdirectory (DummyStack)
 add_subdirectory (SuperStupidStack)
 add_subdirectory (NuclearStackExtension)
diff --git a/Stack/DummyStack/CMakeLists.txt b/Stack/DummyStack/CMakeLists.txt
index 7e29fe3fb55c3a6e07505f5195ef674568d08afc..1ac3bf52e24feeb0dfd8a946bb671100cc3713fa 100644
--- a/Stack/DummyStack/CMakeLists.txt
+++ b/Stack/DummyStack/CMakeLists.txt
@@ -1,4 +1,3 @@
-
 set (DummyStack_HEADERS DummyStack.h)
 set (DummyStack_NAMESPACE corsika/stack/dummy)
 
diff --git a/Stack/DummyStack/DummyStack.h b/Stack/DummyStack/DummyStack.h
index adcf494a57b1d46f13d09d9f39e153866b70ea04..a7be951ab1c19c8f32f7fd878adbaa34b8d38eed 100644
--- a/Stack/DummyStack/DummyStack.h
+++ b/Stack/DummyStack/DummyStack.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Stack/NuclearStackExtension/CMakeLists.txt b/Stack/NuclearStackExtension/CMakeLists.txt
index 6a035375e3dc100af848c84aad484aff3f55fc6c..ad294ad5a939c528994bd13f7d153b874244acab 100644
--- a/Stack/NuclearStackExtension/CMakeLists.txt
+++ b/Stack/NuclearStackExtension/CMakeLists.txt
@@ -1,4 +1,3 @@
-
 set (NuclearStackExtension_HEADERS NuclearStackExtension.h)
 set (NuclearStackExtension_NAMESPACE corsika/stack/nuclear_extension)
 
diff --git a/Stack/NuclearStackExtension/NuclearStackExtension.h b/Stack/NuclearStackExtension/NuclearStackExtension.h
index 40eb5e0e672883e58cc207324e99d11afdd6be18..2c1d38f54644dd7a8ffdaa9bc0e48bd5bfb2b356 100644
--- a/Stack/NuclearStackExtension/NuclearStackExtension.h
+++ b/Stack/NuclearStackExtension/NuclearStackExtension.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Stack/NuclearStackExtension/testNuclearStackExtension.cc b/Stack/NuclearStackExtension/testNuclearStackExtension.cc
index c92e5471fdf53e74aa6fdf3e0312e8f0492ae07e..4774ba895627f44a1a59e57fecaf306a84fc1e46 100644
--- a/Stack/NuclearStackExtension/testNuclearStackExtension.cc
+++ b/Stack/NuclearStackExtension/testNuclearStackExtension.cc
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Stack/SuperStupidStack/CMakeLists.txt b/Stack/SuperStupidStack/CMakeLists.txt
index 777e65a3d1352f1085b7b057003d01e32e9ba4c5..23d4e5cc916148c01b478562b12fe2d8ef234b8c 100644
--- a/Stack/SuperStupidStack/CMakeLists.txt
+++ b/Stack/SuperStupidStack/CMakeLists.txt
@@ -1,4 +1,3 @@
-
 set (SuperStupidStack_HEADERS SuperStupidStack.h)
 set (SuperStupidStack_NAMESPACE corsika/stack/super_stupid)
 
diff --git a/Stack/SuperStupidStack/SuperStupidStack.h b/Stack/SuperStupidStack/SuperStupidStack.h
index 0b67b95f184bba24358e10980ededdf1dc86c551..31e39dd4541e001aff1cca8cabd988443409efb7 100644
--- a/Stack/SuperStupidStack/SuperStupidStack.h
+++ b/Stack/SuperStupidStack/SuperStupidStack.h
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/Stack/SuperStupidStack/testSuperStupidStack.cc b/Stack/SuperStupidStack/testSuperStupidStack.cc
index 3e9aa8466169df72d157e3ab0f08c4361741f6ff..22e1a158d9459368de736bae47acf25c57009f48 100644
--- a/Stack/SuperStupidStack/testSuperStupidStack.cc
+++ b/Stack/SuperStupidStack/testSuperStupidStack.cc
@@ -1,4 +1,3 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
diff --git a/do-clang-format.sh b/do-clang-format.sh
index e84335c520be53e1f011cf0466d8006b91085f83..ebfcb2322063638db155308dfb1c5d45272324f9 100755
--- a/do-clang-format.sh
+++ b/do-clang-format.sh
@@ -1,3 +1,10 @@
-clang-format -i -style=file `find . -iregex '^.*\.\(cc\|h\)$' -not -path './ThirdParty/*'`
+#!/bin/bash
 
+command="clang-format -style=file `find . -iregex '^.*\.\(cc\|h\)$' -not -path './ThirdParty/*'`"
 
+if [ "$1" == "check" ];
+then
+    ! ${command}  -output-replacements-xml | grep -c "<replacement " 
+else
+    ${command} -i
+fi
diff --git a/do-copyright.py b/do-copyright.py
index b88829bcf154e6fcbb0932cc02edfdd2b489cd5a..b7f2a3d06e6b5869e805a1bd0d05f1c5027ca724 100755
--- a/do-copyright.py
+++ b/do-copyright.py
@@ -1,10 +1,14 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
 
-import os.path
+import os
+import sys, getopt
+import re
 
-text = """
-/*
- * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
+"""
+ Note: this is technically used as a mutliline regexp
+"""
+text = """/*
+ * (c) Copyright YEAR CORSIKA Project, corsika-project@lists.kit.edu
  *
  * See file AUTHORS for a list of contributors.
  *
@@ -14,30 +18,66 @@ text = """
  */\n
 """
 
-Debug = 0 # 0: nothing, 1: checking, 2: filesystem
+"""
+Debug settings are 0: nothing, 1: checking, 2: filesystem
+"""
+Debug = 0 
 
 excludeDirs = ["ThirdParty", "git"]
-excludeFiles = ['PhysicalConstants.h','CorsikaFenvOSX.cc']
+excludeFiles = ['PhysicalConstants.h','CorsikaFenvOSX.cc', 'sgn.h']
 
 extensions = [".cc", ".h", ".test"]
 
-def checkNote(filename):
+"""
+justCheck: T: only checking, F: also changing files 
+"""
+justCheck = True
+"""
+foundMissing: global variable set to True in case of any needed action 
+"""
+foundMissing = False
+
+"""
+forYear: replace this with year for copyright notice via command line
+"""
+forYear="YEAR" 
+
 
+###############################################
+#
+def checkNote(filename, justCheck, forYear):
+    """
+    function to check, if the file 'filename' contains an exact copy
+    of the copyright notice defined above. 
+    The function also checks for eventual multiple (maybe conflicting) 
+    copyright notices in the same file. 
+    
+    If 'justCheck' is True, the file will never be changed, otherwise
+    the function will attempt to put the correct notice exactly once 
+    at the top of the file. The copyright YEAR will be replace with 
+    'forYear', e.g. forYear="2019" or forYear="2018-2020", etc.
+    
+    The global variable 'foundMissing' is set to True in the event 
+    where any changes are identified, BUT not implemented. 
+    """
+    global foundMissing
+    
     if Debug>0:
         print ("***********************************************")
         print ("file: " + filename )
     
     startNote = []
     endNote = []
-
-    # read input file into lines
+    
+    """ read input file into lines """
     lines = []
-    with open(filename, "r") as file:
+    with open(filename, "r", encoding="utf-8") as file:
         for line in file.readlines():
             lines.append(line)            
         file.close()
-
-    searchStatus = 0 # 0:before comment block, #1 in comment block, #2 found copyright
+    
+    """ 0:before comment block, #1 in comment block, #2 found copyright """
+    searchStatus = 0 
     blockStart = 0
     for iLine in range(len(lines)):
         line = lines[iLine]
@@ -52,55 +92,67 @@ def checkNote(filename):
                 endNote.append(iLine)
             searchStatus = 0
         iLine += 1
-
+    
     if Debug>0:
         txt = "states: n=" + str(len(startNote))
-        for i in xrange(len(startNote)):
+        for i in range(len(startNote)):
             txt += ",  [" + str(startNote[i]) + "-" + str(endNote[i]) + "]"         
-        print ("stats: ") + txt
-
-    # now check if first copyright notices is already identical...
+        print ("stats: " + txt)
+    
+    """ now check if first copyright notices is already identical... """
     isSame = False
     if len(startNote)>0: 
         isSame = True
-        noteLines = text.split('\n')        
+        noteLines = text.split('\n')
         for iLine in range(len(noteLines)-2):
             if startNote[0]+iLine >= len(lines):
                 isSame = False
                 break
-            if noteLines[iLine+1].strip(" \n") != lines[startNote[0]+iLine].strip(" \n"):
+            regex = re.compile(re.escape(noteLines[iLine].strip(" \n")).replace('YEAR','....'))
+            if not re.match(regex, lines[startNote[0]+iLine].strip(" \n")):
                 isSame = False
-                print "need update: " + filename + " new=\'" + noteLines[iLine+1] + "\' vs old=\'" + lines[startNote[0]+iLine].rstrip('\n') + "\'"
+                foundMissing = True
+                print ("needs update: " + filename + " new=\'" + noteLines[iLine] + "\' vs old=\'" + lines[startNote[0]+iLine].rstrip('\n') + "\'")
                 break
     if Debug>0:
-        print ("isSame=" + str(isSame))
+        print ("isSame=" + str(isSame) + " " + str(len(startNote)))
     
-    # check if notice is the same, or we need to remove multiple notices...
+    """ check if notice is the same, or we need to remove multiple notices... """
     if isSame and len(startNote)<=1:
         return                
     
-    # add (new) copyright notice here:
+    if (len(startNote)==0):
+        print ("No copyright note in file: " + filename)
+    
+    """ either we found a file with no copyright, or with wrong copyright notice here """
+    if justCheck:
+        foundMissing = True
+        return
+    
+    """ add (new) copyright notice here: """
     print ("File: " + filename + ", make copy to " + filename+".bak")
     os.rename(filename, filename+".bak")
-
+    
     with open(filename, "w") as file:
-
-        file.write(text)
-
+        
+        textReplace = re.sub(r"Copyright YEAR ", "Copyright " + forYear + " ", text)
+        file.write(textReplace)
+        
         skip = False
         for iLine in range(len(lines)):
-
+            
             inBlock = False
             for iBlock in range(len(startNote)):
                 if iLine>=startNote[iBlock] and iLine<=endNote[iBlock]:
-                    print "   [remove " + str(iBlock) + "] " + (lines[iLine]).strip()
+                    print ("   [remove " + str(iBlock) + "] " + (lines[iLine]).strip())
                     inBlock = True
                     skip = True
 
             if inBlock:
                 continue
-            
-            if lines[iLine].strip() != "": # if line after comment is empty, also remove it
+
+            """ if line after comment is empty, also remove it """
+            if lines[iLine].strip() != "":
                 skip = False
                     
             if not skip:
@@ -109,7 +161,13 @@ def checkNote(filename):
         file.close()
 
 
-def next_file(x, dir_name, files):
+###############################################
+#
+def next_file(dir_name, files, justCheck, forYear):
+    """
+    check files: loops over list of files,
+    excludes if wished, process otherwise
+    """
     for check in excludeDirs :
         if check in dir_name:
             if Debug>1:
@@ -121,16 +179,65 @@ def next_file(x, dir_name, files):
         filename, file_extension = os.path.splitext(check)
         if '#' in check or '~' in check:
             continue
+        excludeThisFile=False
         for check2 in excludeFiles :
             if check2 in check:
                 if Debug>1:
                     print ("exclude: " + check2)
-                continue
+                excludeThisFile=True
+        if excludeThisFile:
+            continue
         if file_extension in extensions:
-            checkNote(dir_name + "/" + check)
+            checkNote(os.path.join(dir_name, check), justCheck, forYear)
         else:
             if Debug>1:
-                print ("exclude-extension: " + dir_name + "/" + check)
+                print ("exclude-extension: " + os.path.join(dir_name, check))
+
+                
+###############################################
+# 
+def main(argv):
+   """
+    the main program
+   """
+   global justCheck, foundMissing, Debug, forYear
+   justCheck = True
+   Debug = 0
+   try:
+      opts, args = getopt.getopt(argv, "cAhd:", ["check", "add=", "debug="])
+   except getopt.GetoptError:
+      print ('do-copyright.py [--check] [--add=YEAR] [--debug=0]')
+      sys.exit(2)
+   for opt, arg in opts:
+      if opt == '-h':
+         print ('do-copyright.py [--check] [--add=YEAR] [--debug=0]')
+         sys.exit()
+      elif opt in ("-c", "--check"):
+         justCheck = True
+      elif opt in ("-A", "--add"):
+         justCheck = False
+         forYear = str(arg)
+         print ('Adding \'Copyright ' + forYear + '\' notice, where needed. ')
+      elif opt in ("-d", "--debug"):
+         Debug = int(arg)
+
+   if justCheck:
+       print ('Only checking. No changes. See \'do-copyright.py -h\' for options.')
+         
+   for root, dirs, files in os.walk('./'):
+       next_file(root, files, justCheck, forYear)
 
-
-os.path.walk("./", next_file, 0)
+    
+###############################################
+#
+if __name__ == "__main__":
+   """
+   main python entry point 
+   """
+   main(sys.argv[1:])
+
+   if justCheck and foundMissing:
+       """ found any need for action """
+       sys.exit(-1)
+   print ("Finished")
+   sys.exit(0)