diff --git a/InnerDetector/InDetDigitization/PixelDigitization/src/EfieldInterpolator.cxx b/InnerDetector/InDetDigitization/PixelDigitization/src/EfieldInterpolator.cxx
index dab094338a61dd5830ce9d585737c3c15b4073e2..0be8b63de70aa28092b2483475b4e9d83d66e138 100644
--- a/InnerDetector/InDetDigitization/PixelDigitization/src/EfieldInterpolator.cxx
+++ b/InnerDetector/InDetDigitization/PixelDigitization/src/EfieldInterpolator.cxx
@@ -707,7 +707,8 @@ TH1D* EfieldInterpolator::createEfieldProfile(double aimFluence, double aimVolta
                     case linearField    : m_useSpline = false;  
                                           aimEf = estimateEfield(yvoltage, xfluence, efieldfluvol,aimFluence, aimVoltage )              ; break; 
                     case TCAD           : aimEf = estimateEfieldLinear(aimVoltage)                                                      ;
-                                          if(aimEf < 0.) ATH_MSG_ERROR("TCAD E field negative at" << pixeldepth <<" !")                 ; break;
+                                          if(aimEf < 0.) ATH_MSG_ERROR("TCAD E field negative at" << pixeldepth <<" !")                 ;
+                                          break;
                 }
 
                 if(aimEf < 0.){ 
diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasTools/src/PhysicsValidationTool.h b/Simulation/ISF/ISF_Fatras/ISF_FatrasTools/src/PhysicsValidationTool.h
index faea26e85229db77813ac9616ea093ac3a96ac96..7f5b6c4b5d12bbe3b48afdaf51868b5c30733ca4 100755
--- a/Simulation/ISF/ISF_Fatras/ISF_FatrasTools/src/PhysicsValidationTool.h
+++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasTools/src/PhysicsValidationTool.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 ///////////////////////////////////////////////////////////////////
@@ -78,12 +78,14 @@ namespace iFatras
   private:
      /** templated Tool retrieval - gives unique handling & look and feel */
      template <class T> StatusCode retrieveTool(ToolHandle<T>& thandle){
-        if (!thandle.empty() && thandle.retrieve().isFailure()){
-              ATH_MSG_FATAL( "[ fatras setup ] Cannot retrieve " << thandle << ". Abort.");
-              return StatusCode::FAILURE;
-          } else
-              ATH_MSG_DEBUG("[ fatras setup ] Successfully retrieved " << thandle);
-              return StatusCode::SUCCESS;
+       if (!thandle.empty() && thandle.retrieve().isFailure()){
+         ATH_MSG_FATAL( "[ fatras setup ] Cannot retrieve " << thandle << ". Abort.");
+         return StatusCode::FAILURE;
+       }
+       else {
+         ATH_MSG_DEBUG("[ fatras setup ] Successfully retrieved " << thandle);
+       }
+       return StatusCode::SUCCESS;
      }
      
      void saveInfo(const ISF::ISFParticle& isp) const; 
diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasTools/src/ProcessSamplingTool.h b/Simulation/ISF/ISF_Fatras/ISF_FatrasTools/src/ProcessSamplingTool.h
index 081bc73c3c71eedf9f4f82b284862c81c61c4e25..1e5c949887a3ee6c66ef813ce704a59bb169f560 100755
--- a/Simulation/ISF/ISF_Fatras/ISF_FatrasTools/src/ProcessSamplingTool.h
+++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasTools/src/ProcessSamplingTool.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 ///////////////////////////////////////////////////////////////////
@@ -70,12 +70,14 @@ namespace iFatras
   private:
      /** templated Tool retrieval - gives unique handling & look and feel */
      template <class T> StatusCode retrieveTool(ToolHandle<T>& thandle){
-        if (!thandle.empty() && thandle.retrieve().isFailure()){
-              ATH_MSG_FATAL( "[ fatras setup ] Cannot retrieve " << thandle << ". Abort.");
-              return StatusCode::FAILURE;
-          } else
-              ATH_MSG_DEBUG("[ fatras setup ] Successfully retrieved " << thandle);
-              return StatusCode::SUCCESS;
+       if (!thandle.empty() && thandle.retrieve().isFailure()){
+         ATH_MSG_FATAL( "[ fatras setup ] Cannot retrieve " << thandle << ". Abort.");
+         return StatusCode::FAILURE;
+       }
+       else {
+         ATH_MSG_DEBUG("[ fatras setup ] Successfully retrieved " << thandle);
+       }
+       return StatusCode::SUCCESS;
      }
       
     /*---------------------------------------------------------------------
diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasTools/src/TransportTool.h b/Simulation/ISF/ISF_Fatras/ISF_FatrasTools/src/TransportTool.h
index bd11bdde88359710210583f21500ea66dc797260..cfb58209fa85df29d318c4a23338bc7b6a44ad22 100755
--- a/Simulation/ISF/ISF_Fatras/ISF_FatrasTools/src/TransportTool.h
+++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasTools/src/TransportTool.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 ///////////////////////////////////////////////////////////////////
@@ -75,12 +75,14 @@ namespace iFatras
   private:
      /** templated Tool retrieval - gives unique handling & look and feel */
      template <class T> StatusCode retrieveTool(ToolHandle<T>& thandle){
-        if (!thandle.empty() && thandle.retrieve().isFailure()){
-              ATH_MSG_FATAL( "[ fatras setup ] Cannot retrieve " << thandle << ". Abort.");
-              return StatusCode::FAILURE;
-          } else
-              ATH_MSG_DEBUG("[ fatras setup ] Successfully retrieved " << thandle);
-              return StatusCode::SUCCESS;
+       if (!thandle.empty() && thandle.retrieve().isFailure()){
+         ATH_MSG_FATAL( "[ fatras setup ] Cannot retrieve " << thandle << ". Abort.");
+         return StatusCode::FAILURE;
+       }
+       else {
+         ATH_MSG_DEBUG("[ fatras setup ] Successfully retrieved " << thandle);
+       }
+       return StatusCode::SUCCESS;
      }
       
     /*---------------------------------------------------------------------