diff --git a/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/IMultiStateExtrapolator.h b/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/IMultiStateExtrapolator.h
index dbd43a68dd09ecdc3a0e95190b993fa2861acbf2..24418f065be71f6256e18247996f25897c412f32 100644
--- a/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/IMultiStateExtrapolator.h
+++ b/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/IMultiStateExtrapolator.h
@@ -62,17 +62,16 @@ public:
     const Layer* m_recallLayer = nullptr;
     //!< Tracking volume for recall (not owning)
     const TrackingVolume* m_recallTrackingVolume = nullptr;
-    // Vector of combined material effects
-    std::vector<GsfMaterial::Combined> m_materialEffectsCaches;
-    //!< Recycle bin for MultiComponentState objects,keep track of them
-    std::vector<MultiComponentState> m_mcsRecycleBin;
-
-    //Element we point at each step
+    // Current State at boundary (not owning)
     const MultiComponentState* m_stateAtBoundary = nullptr;
+    // Current Navigation parameters
     std::unique_ptr<TrackParameters> m_navigationParameters = nullptr;
+    // Ptr to current volume (not owning)
     const TrackingVolume* m_trackingVolume = nullptr;
-
-
+    //!< keep track of the MultiComponentStates
+    std::vector<MultiComponentState> m_mcsRecycleBin;
+    // Vector of combined material effects
+    std::vector<GsfMaterial::Combined> m_materialEffectsCaches;
     Cache() { m_materialEffectsCaches.reserve(12); }
   };
 
diff --git a/Tracking/TrkFitter/TrkGaussianSumFilterUtils/src/ElectronCombinedMaterialEffects.cxx b/Tracking/TrkFitter/TrkGaussianSumFilterUtils/src/ElectronCombinedMaterialEffects.cxx
index ec56274c94a72da38d2a83b559e85ab74a13d944..a8c1eff6b3b7881456143589ba1e0e629b04a266 100644
--- a/Tracking/TrkFitter/TrkGaussianSumFilterUtils/src/ElectronCombinedMaterialEffects.cxx
+++ b/Tracking/TrkFitter/TrkGaussianSumFilterUtils/src/ElectronCombinedMaterialEffects.cxx
@@ -91,7 +91,7 @@ correctWeights(BH::MixtureParameters& mixture, const int numberOfComponents)
 }
 
 BH::MixtureParameters
-getTranformedMixtureParameters(
+getTransformedMixtureParameters(
   const std::array<BH::Polynomial, GSFConstants::maxNumberofMatComponents>&
     polynomialWeights,
   const std::array<BH::Polynomial, GSFConstants::maxNumberofMatComponents>&
@@ -434,7 +434,7 @@ Trk::ElectronCombinedMaterialEffects::BetheHeitler(
   MixtureParameters mixture;
   if (pathlengthInX0 > s_xOverRange) {
     if (m_BHtransformationCodeHighX0) {
-      mixture = getTranformedMixtureParameters(m_BHpolynomialWeightsHighX0,
+      mixture = getTransformedMixtureParameters(m_BHpolynomialWeightsHighX0,
                                                m_BHpolynomialMeansHighX0,
                                                m_BHpolynomialVariancesHighX0,
                                                pathlengthInX0,
@@ -448,7 +448,7 @@ Trk::ElectronCombinedMaterialEffects::BetheHeitler(
     }
   } else {
     if (m_BHtransformationCode) {
-      mixture = getTranformedMixtureParameters(m_BHpolynomialWeights,
+      mixture = getTransformedMixtureParameters(m_BHpolynomialWeights,
                                                m_BHpolynomialMeans,
                                                m_BHpolynomialVariances,
                                                pathlengthInX0,