diff --git a/Environment/FlatAtmosphere/FlatAtmosphere.h b/Environment/FlatAtmosphere/FlatAtmosphere.h
index 4227e0de4f5490ee2ac5a90857d68c5653e865ec..6839def48c2f6fddfafd0beb5fd4ca46058ebd09 100644
--- a/Environment/FlatAtmosphere/FlatAtmosphere.h
+++ b/Environment/FlatAtmosphere/FlatAtmosphere.h
@@ -8,5 +8,3 @@
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
  */
-
-
diff --git a/Framework/StackInterface/SecondaryView.h b/Framework/StackInterface/SecondaryView.h
index 563de91539ee39fd32730eb1baae6144f0e8d634..1bbbe02ccaad07fcc533d5782c753427c0dddbf1 100644
--- a/Framework/StackInterface/SecondaryView.h
+++ b/Framework/StackInterface/SecondaryView.h
@@ -54,7 +54,7 @@ namespace corsika::stack {
    */
 
   template <typename StackDataType, template <typename> typename ParticleInterface>
-  class SecondaryView : public corsika::stack::Stack<StackDataType&, ParticleInterface> {
+  class SecondaryView : public Stack<StackDataType&, ParticleInterface> {
 
     using ViewType = SecondaryView<StackDataType, ParticleInterface>;
 
diff --git a/Framework/StackInterface/Stack.h b/Framework/StackInterface/Stack.h
index a666e0ff02817164564576245b990348f1dfb48c..2f183af2a9d7b64def393ea698966cfdabe0d413 100644
--- a/Framework/StackInterface/Stack.h
+++ b/Framework/StackInterface/Stack.h
@@ -13,6 +13,7 @@
 #define _include_Stack_h__
 
 #include <corsika/stack/StackIteratorInterface.h>
+// must be after StackIteratorInterface
 #include <corsika/stack/SecondaryView.h>
 
 #include <stdexcept>
diff --git a/Main/Environment.h b/Main/Environment.h
index 4227e0de4f5490ee2ac5a90857d68c5653e865ec..6839def48c2f6fddfafd0beb5fd4ca46058ebd09 100644
--- a/Main/Environment.h
+++ b/Main/Environment.h
@@ -8,5 +8,3 @@
  * 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 4227e0de4f5490ee2ac5a90857d68c5653e865ec..6839def48c2f6fddfafd0beb5fd4ca46058ebd09 100644
--- a/Main/Stack.h
+++ b/Main/Stack.h
@@ -8,5 +8,3 @@
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
  */
-
-