diff --git a/Processes/Proposal/ContinuousProcess.cc b/Processes/Proposal/ContinuousProcess.cc
index d515dd3a9e1beb4af820a35a5dfa8f49cc31c91c..e552f49dd47e8cd8e744b5b0729dc7e4391b2f5e 100644
--- a/Processes/Proposal/ContinuousProcess.cc
+++ b/Processes/Proposal/ContinuousProcess.cc
@@ -56,7 +56,8 @@ namespace corsika::process::proposal {
     auto c = GetCalculator(vP, calc);
 
     // Cast corsika vector to proposal vector
-    auto d = vP.GetDirection().GetComponents();
+    auto vP_dir = vP.GetDirection();
+    auto d = vP_dir.GetComponents();
     auto direction = PROPOSAL::Vector3D(d.GetX().magnitude(), d.GetY().magnitude(),
                                         d.GetZ().magnitude());
 
@@ -79,9 +80,8 @@ namespace corsika::process::proposal {
     // scattering
     auto vec = corsika::geometry::QuantityVector(
         final_dir.GetX() * E_f, final_dir.GetY() * E_f, final_dir.GetZ() * E_f);
-    vP.SetMomentum(corsika::stack::MomentumVector(
-        corsika::geometry::RootCoordinateSystem::GetInstance().GetRootCoordinateSystem(),
-        vec));
+    vP.SetMomentum(
+        corsika::stack::MomentumVector(vP_dir.GetCoordinateSystem(), vec));
   }
 
   template <>
@@ -90,7 +90,7 @@ namespace corsika::process::proposal {
     using namespace corsika::units::si; // required for operator::_MeV
 
     if (!CanInteract(vP.GetPID())) return process::EProcessReturn::eOk;
-    if (vT.GetLength()==0_m) return process::EProcessReturn::eOk;
+    if (vT.GetLength() == 0_m) return process::EProcessReturn::eOk;
 
     // calculate passed grammage
     auto dX = vP.GetNode()->GetModelProperties().IntegratedGrammage(vT, vT.GetLength());
@@ -138,7 +138,7 @@ namespace corsika::process::proposal {
     // important, the important fact is that its E_kin is zero
     // afterwards.
     //
-    auto energy_lim = std::max(0.9 * vP.GetEnergy(), 0.99*emCut_);
+    auto energy_lim = std::max(0.9 * vP.GetEnergy(), 0.99 * emCut_);
 
     // solving the track integral for giving energy lim
     auto c = GetCalculator(vP, calc);
diff --git a/Processes/Proposal/Interaction.cc b/Processes/Proposal/Interaction.cc
index d1b64dea2ed76dc7168b6863ed34249bd164a915..4a1b767bedd11d228c7cd3430cec0e14fc6d947c 100644
--- a/Processes/Proposal/Interaction.cc
+++ b/Processes/Proposal/Interaction.cc
@@ -72,7 +72,8 @@ namespace corsika::process::proposal {
       auto point = PROPOSAL::Vector3D(vP.GetPosition().GetX() / 1_cm,
                                       vP.GetPosition().GetY() / 1_cm,
                                       vP.GetPosition().GetZ() / 1_cm);
-      auto d = vP.GetDirection().GetComponents();
+      auto vP_dir = vP.GetDirection();
+      auto d = vP_dir.GetComponents();
       auto direction = PROPOSAL::Vector3D(d.GetX().magnitude(), d.GetY().magnitude(),
                                           d.GetZ().magnitude());
       auto loss = make_tuple(static_cast<int>(type), point, direction,
@@ -85,13 +86,9 @@ namespace corsika::process::proposal {
             get<PROPOSAL::Loss::DIRECTION>(s).GetX() * E,
             get<PROPOSAL::Loss::DIRECTION>(s).GetY() * E,
             get<PROPOSAL::Loss::DIRECTION>(s).GetZ() * E);
-        auto p = corsika::stack::MomentumVector(
-            corsika::geometry::RootCoordinateSystem::GetInstance()
-                .GetRootCoordinateSystem(),
-            vec);
+        auto p = corsika::stack::MomentumVector(vP_dir.GetCoordinateSystem(), vec);
         auto sec_code = corsika::particles::ConvertFromPDG(
             static_cast<particles::PDGCode>(get<PROPOSAL::Loss::TYPE>(s)));
-	std::cout << " proposal secondary: " << sec_code << " " << E/1_GeV << std::endl;
         vP.AddSecondary(make_tuple(sec_code, E, p, vP.GetPosition(), vP.GetTime()));
       }
     }