diff --git a/Calo/CaloTools/CMakeLists.txt b/Calo/CaloTools/CMakeLists.txt
index 08a507f05a8118364e9a246faf8f59b94b422e90..5a6eba4293265e27ca297823e610cb4c966bff5b 100644
--- a/Calo/CaloTools/CMakeLists.txt
+++ b/Calo/CaloTools/CMakeLists.txt
@@ -25,8 +25,6 @@ gaudi_add_module(CaloTools
                  INCLUDE_DIRS Tr/TrackInterfaces
                  LINK_LIBRARIES CaloUtils CaloDetLib LinkerEvent RecEvent TrackEvent GaudiAlgLib LHCbKernel LHCbMathLib RelationsLib)
 
-message("hello world!")
-
 set(CMAKE_PREFIX_PATH /cvmfs/lhcb.cern.ch/lib/lcg/releases/LCG_88/xgboost/0.60/x86_64-slc6-gcc49-opt/lib)
 include_directories(/cvmfs/lhcb.cern.ch/lib/lcg/releases/LCG_88/xgboost/0.60/x86_64-slc6-gcc49-opt/rabit/include/)
 message(${CMAKE_PREFIX_PATH})
diff --git a/Calo/CaloTools/src/CaloHypoEstimator.h b/Calo/CaloTools/src/CaloHypoEstimator.h
index 0fd0dd678e1c1ebea0cc018e6ac8ba8db33da72f..5f2599462bf4f5c632d277fffa81bec2323ebf9b 100644
--- a/Calo/CaloTools/src/CaloHypoEstimator.h
+++ b/Calo/CaloTools/src/CaloHypoEstimator.h
@@ -31,7 +31,6 @@
  *  @date   2010-08-18
  */
 
-
 class CaloHypoEstimator : public GaudiTool, virtual public ICaloHypoEstimator, virtual public IIncidentListener {
 public:
   /// Standard constructor
diff --git a/Calo/CaloTools/src/GammaPi0XGBoostTool.cpp b/Calo/CaloTools/src/GammaPi0XGBoostTool.cpp
index ce8147f8ea9a35d8942833e813a1549af87ee9fa..3c9d4621354cda3feb384cc74ab8fa9ccdc8cf08 100644
--- a/Calo/CaloTools/src/GammaPi0XGBoostTool.cpp
+++ b/Calo/CaloTools/src/GammaPi0XGBoostTool.cpp
@@ -145,7 +145,7 @@ private:
 }
 
 // Declaration of the Tool Factory
-DECLARE_TOOL_FACTORY( GammaPi0XGBoostTool )
+DECLARE_COMPONENT( GammaPi0XGBoostTool )
 
 //=============================================================================
 // Standard constructor, initializes variables
@@ -262,7 +262,7 @@ bool GammaPi0XGBoostTool::GetRawEnergy(const LHCb::CaloHypo* hypo, int& cluster_
   
   std::vector<int> col_numbers = {(int)centerID.col() - 2, (int)centerID.col() - 1, (int)centerID.col(), (int)centerID.col() + 1, (int)centerID.col() + 2};
   std::vector<int> row_numbers = {(int)centerID.row() - 2, (int)centerID.row() - 1, (int)centerID.row(), (int)centerID.row() + 1, (int)centerID.row() + 2};
-  
+
   if (cluster_type > 2)
   {
     for (auto& col_number: col_numbers){