diff --git a/Environment/FlatAtmosphere/FlatAtmosphere.h b/Environment/FlatAtmosphere/FlatAtmosphere.h
index 1495baac4cd04881d6d2792d5ab9ee8c35b5ba38..90582b3dfb00d2d85850b81455a2a4c0c061413b 100644
--- a/Environment/FlatAtmosphere/FlatAtmosphere.h
+++ b/Environment/FlatAtmosphere/FlatAtmosphere.h
@@ -1,11 +1,10 @@
 
 /**
-  * (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.
-*/
-
+ * (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/Framework/Particles/ParticleProperties.cc b/Framework/Particles/ParticleProperties.cc
index 79390bd93e5156877d221074ba799f3f0e02b0be..6c8230561f6d76b0bf44a8b68bbdc62e1dab4f0d 100644
--- a/Framework/Particles/ParticleProperties.cc
+++ b/Framework/Particles/ParticleProperties.cc
@@ -1,13 +1,13 @@
 
 /**
-  * (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.
-*/
+ * (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.
+ */
 
 #include <corsika/particles/ParticleProperties.h>
 
diff --git a/Framework/ProcessSequence/BaseProcess.h b/Framework/ProcessSequence/BaseProcess.h
index 2e4b2234896ebc4defe42e5949a156923e90fd29..897497d83c82caee4dbc6c19f90996a5ee7f97fa 100644
--- a/Framework/ProcessSequence/BaseProcess.h
+++ b/Framework/ProcessSequence/BaseProcess.h
@@ -1,13 +1,13 @@
 
 /**
-  * (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.
-*/
+ * (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.
+ */
 
 #ifndef _include_corsika_baseprocess_h_
 #define _include_corsika_baseprocess_h_
diff --git a/Framework/ProcessSequence/ContinuousProcess.h b/Framework/ProcessSequence/ContinuousProcess.h
index 34acce941976ecdca4cce7b5ddce635d9e87780e..c53365f1afcdfb64ac808580077dd0e284dcdbd2 100644
--- a/Framework/ProcessSequence/ContinuousProcess.h
+++ b/Framework/ProcessSequence/ContinuousProcess.h
@@ -1,13 +1,13 @@
 
 /**
-  * (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.
-*/
+ * (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.
+ */
 
 #ifndef _include_corsika_continuousprocess_h_
 #define _include_corsika_continuousprocess_h_
diff --git a/Framework/ProcessSequence/DiscreteProcess.h b/Framework/ProcessSequence/DiscreteProcess.h
index 0fd1dba2275a1e3412b890be229a7f80febd1e1f..83064f5d8767c93619f6742d50c56aeae0863700 100644
--- a/Framework/ProcessSequence/DiscreteProcess.h
+++ b/Framework/ProcessSequence/DiscreteProcess.h
@@ -1,13 +1,13 @@
 
 /**
-  * (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.
-*/
+ * (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.
+ */
 
 #ifndef _include_corsika_discreteprocess_h_
 #define _include_corsika_discreteprocess_h_
diff --git a/Framework/ProcessSequence/ProcessSignature.h b/Framework/ProcessSequence/ProcessSignature.h
index 380c551e50e209755a0dc851b5fa4fe27f6eeb50..cb0081df416b19057f995065545f92d4f083f8a0 100644
--- a/Framework/ProcessSequence/ProcessSignature.h
+++ b/Framework/ProcessSequence/ProcessSignature.h
@@ -1,13 +1,13 @@
 
 /**
-  * (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.
-*/
+ * (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.
+ */
 
 #ifndef _include_process_processsignature_h_
 #define _include_process_processsignature_h_
diff --git a/Main/Environment.h b/Main/Environment.h
index 1495baac4cd04881d6d2792d5ab9ee8c35b5ba38..90582b3dfb00d2d85850b81455a2a4c0c061413b 100644
--- a/Main/Environment.h
+++ b/Main/Environment.h
@@ -1,11 +1,10 @@
 
 /**
-  * (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.
-*/
-
+ * (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
index 1495baac4cd04881d6d2792d5ab9ee8c35b5ba38..90582b3dfb00d2d85850b81455a2a4c0c061413b 100644
--- a/Main/Stack.h
+++ b/Main/Stack.h
@@ -1,11 +1,10 @@
 
 /**
-  * (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.
-*/
-
+ * (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/Processes/StackInspector/StackInspector.cc b/Processes/StackInspector/StackInspector.cc
index 54bdbafce38dc0b3c873863867f3c22354f3f377..5717953f93296478c8692e3903e0c0b91b5f53e5 100644
--- a/Processes/StackInspector/StackInspector.cc
+++ b/Processes/StackInspector/StackInspector.cc
@@ -1,13 +1,13 @@
 
 /**
-  * (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.
-*/
+ * (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.
+ */
 
 #include <corsika/process/stack_inspector/StackInspector.h>
 #include <corsika/units/PhysicalUnits.h>
diff --git a/Processes/StackInspector/StackInspector.h b/Processes/StackInspector/StackInspector.h
index c0ffae88b35506d63dd50a605a7c9ef8d148c283..d608eda37c74df42a7ca058ddec06f0d91f3c114 100644
--- a/Processes/StackInspector/StackInspector.h
+++ b/Processes/StackInspector/StackInspector.h
@@ -1,13 +1,13 @@
 
 /**
-  * (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.
-*/
+ * (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.
+ */
 
 #ifndef _Physics_StackInspector_StackInspector_h_
 #define _Physics_StackInspector_StackInspector_h_
diff --git a/Processes/StackInspector/testStackInspector.cc b/Processes/StackInspector/testStackInspector.cc
index bc17ef6ccc1f1417d80baae45076305c1ae01a53..c098b025b678427f1e244fc8052d0dd889f11d08 100644
--- a/Processes/StackInspector/testStackInspector.cc
+++ b/Processes/StackInspector/testStackInspector.cc
@@ -1,13 +1,13 @@
 
 /**
-  * (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.
-*/
+ * (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.
+ */
 
 #define CATCH_CONFIG_MAIN // This tells Catch to provide a main() - only do this in one
                           // cpp file
diff --git a/Setup/SetupEnvironment.h b/Setup/SetupEnvironment.h
index 44f3a0418539077b04a3a6dd470b3fb678c75a3e..1beb2748052770fc25b84991fdf3e651744c3dc8 100644
--- a/Setup/SetupEnvironment.h
+++ b/Setup/SetupEnvironment.h
@@ -1,13 +1,13 @@
 
 /**
-  * (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.
-*/
+ * (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.
+ */
 
 #ifndef _include_corsika_setup_environment_h_
 #define _include_corsika_setup_environment_h_
diff --git a/Setup/SetupLogger.h b/Setup/SetupLogger.h
index c866060851c0413ccda2a40fa9401131626e891c..2760bc7623fd244f38647d03e956e06ba39e84cd 100644
--- a/Setup/SetupLogger.h
+++ b/Setup/SetupLogger.h
@@ -1,13 +1,13 @@
 
 /**
-  * (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.
-*/
+ * (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.
+ */
 
 #ifndef _include_corsika_setup_logger_h_
 #define _include_corsika_setup_logger_h_
diff --git a/Setup/SetupStack.h b/Setup/SetupStack.h
index 9fcc7425709234d636168cbd8e5be05c11ec651d..053d485f9e2352112f8c3db9dddfeba6bee775bf 100644
--- a/Setup/SetupStack.h
+++ b/Setup/SetupStack.h
@@ -1,13 +1,13 @@
 
 /**
-  * (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.
-*/
+ * (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.
+ */
 
 #ifndef _corsika_setup_setupstack_h_
 #define _corsika_setup_setupstack_h_
diff --git a/Setup/SetupTrajectory.h b/Setup/SetupTrajectory.h
index 4ef15b3f71a99422fd0ca148e348cf6f3fde58f5..ab95732be88bcc44489c78b7cf6343b4f4ee9dd7 100644
--- a/Setup/SetupTrajectory.h
+++ b/Setup/SetupTrajectory.h
@@ -1,13 +1,13 @@
 
 /**
-  * (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.
-*/
+ * (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.
+ */
 
 #ifndef _corsika_setup_setuptrajectory_h_
 #define _corsika_setup_setuptrajectory_h_