diff --git a/corsika/detail/modules/OnShellCheck.inl b/corsika/detail/modules/OnShellCheck.inl
index aa6b0453fb24400246c96de206fa415dd0ade7cb..bd77def886d2685a97e50a82d49e07cfb915b31c 100644
--- a/corsika/detail/modules/OnShellCheck.inl
+++ b/corsika/detail/modules/OnShellCheck.inl
@@ -14,8 +14,8 @@
 
 namespace corsika {
 
-  OnShellCheck::OnShellCheck(const double vMassTolerance, const double vEnergyTolerance,
-                             const bool vError)
+  OnShellCheck::OnShellCheck(double const vMassTolerance, double const vEnergyTolerance,
+                             bool const vError)
       : mass_tolerance_(vMassTolerance)
       , energy_tolerance_(vEnergyTolerance)
       , throw_error_(vError) {
@@ -73,6 +73,7 @@ namespace corsika {
           if (throw_error_)
             throw std::runtime_error(
                 "OnShellCheck: error! shifted energy by large amount!");
+	  }
         }
 
         // reset energy
diff --git a/corsika/detail/modules/conex/CONEXhybrid.inl b/corsika/detail/modules/conex/CONEXhybrid.inl
index 52bd641012ec622e8dd8165a6e7dffdc820fdefe..29c3886aab16fccc25a42ed48c8ea2a2ee7cfa15 100644
--- a/corsika/detail/modules/conex/CONEXhybrid.inl
+++ b/corsika/detail/modules/conex/CONEXhybrid.inl
@@ -11,6 +11,7 @@
 #include <corsika/modules/conex/CONEX_f.hpp>
 #include <corsika/framework/random/RNGManager.hpp>
 #include <corsika/framework/core/PhysicalConstants.hpp>
+#include <corsika/framework/core/Logging.hpp>
 
 #include <conexConfig.h>
 
@@ -40,13 +41,6 @@ namespace corsika {
         /*
         auto const transform = CoordinateSystem::getTransformation(
             intermediateCS2, c8cs); // either this way or vice versa... TODO: test this!
-        std::cout << transform.matrix() << std::endl << std::endl;
-        std::cout << CoordinateSystem::getTransformation(intermediateCS, c8cs).matrix()
-                  << std::endl
-                  << std::endl;
-        std::cout << CoordinateSystem::getTransformation(intermediateCS2, intermediateCS)
-                         .matrix()
-                  << std::endl;
         */
         return transformCS;
       })}
diff --git a/corsika/detail/modules/qgsjetII/qgsjet-II-04.inl b/corsika/detail/modules/qgsjetII/qgsjet-II-04.inl
index 130ac0173920a78bdd774914c5f285a90caa51ff..aca1429c3bfd93fac96a6519746eb88714ebbf09 100644
--- a/corsika/detail/modules/qgsjetII/qgsjet-II-04.inl
+++ b/corsika/detail/modules/qgsjetII/qgsjet-II-04.inl
@@ -11,14 +11,14 @@
 #include <corsika/modules/qgsjetII/qgsjet-II-04.hpp>
 
 #include <corsika/framework/random/RNGManager.hpp>
+#include <corsika/framework/core/Logging.hpp>
 
 #include <iostream>
 #include <random>
 
 datadir::datadir(const std::string& dir) {
   if (dir.length() > 130) {
-    std::cerr << "QGSJetII error, will cut datadir \"" << dir
-              << "\" to 130 characters: " << std::endl;
+    CORSIKA_LOG_ERROR("QGSJetII error, will cut datadir \"{}\" to 130 characters: ", {});
   }
   int i = 0;
   for (i = 0; i < std::min(130, int(dir.length())); ++i) data[i] = dir[i];