diff --git a/PWGLF/Utils/svPoolCreator.h b/PWGLF/Utils/svPoolCreator.h
index c0b32c2574e..ce3473ed65f 100644
--- a/PWGLF/Utils/svPoolCreator.h
+++ b/PWGLF/Utils/svPoolCreator.h
@@ -22,11 +22,6 @@
 #include "DCAFitter/DCAFitterN.h"
 #include "Framework/AnalysisDataModel.h"
 
-using namespace o2;
-using namespace o2::constants;
-using namespace o2::framework;
-using namespace o2::framework::expressions;
-using std::array;
 using CollBracket = o2::math_utils::Bracket<int>;
 
 constexpr uint64_t bOffsetMax = 241; // track compatibility can never go beyond 6 mus (ITS)
@@ -89,7 +84,7 @@ class svPoolCreator
   void appendTrackCand(const T& trackCand, const C& collisions, int pdgHypo, o2::aod::AmbiguousTracks const& ambiTracks, BC const&)
   {
     if (pdgHypo != track0Pdg && pdgHypo != track1Pdg) {
-      LOG(debug) << "Wrong pdg hypothesis";
+      LOGP(debug, "Wrong pdg hypothesis");
       return;
     }
     bool isDau0 = pdgHypo == track0Pdg;
@@ -134,12 +129,12 @@ class svPoolCreator
     }
 
     // now loop over all the collisions to make the pool
-    for (int i = firstCollIdx; i < collisions.size(); i++) {
-      const auto& collision = collisions.rawIteratorAt(i);
+    for (int collIdx = firstCollIdx; collIdx < collisions.size(); collIdx++) {
+      const auto& collision = collisions.rawIteratorAt(collIdx);
       float collTime = collision.collisionTime();
       float collTimeRes2 = collision.collisionTimeRes() * collision.collisionTimeRes();
       uint64_t collBC = collision.template bc_as<BC>().globalBC();
-      int collIdx = collision.globalIndex();
+      // int collIdx = collision.globalIndex();
       int64_t bcOffset = globalBC - static_cast<int64_t>(collBC);
       if (static_cast<uint64_t>(std::abs(bcOffset)) > bOffsetMax) {
         if (bcOffset < 0) {
@@ -153,13 +148,13 @@ class svPoolCreator
       float trackTimeRes{0.};
       if (trackCand.isPVContributor()) {
         trackTime = trackCand.template collision_as<C>().collisionTime(); // if PV contributor, we assume the time to be the one of the collision
-        trackTimeRes = constants::lhc::LHCBunchSpacingNS;                 // 1 BC
+        trackTimeRes = o2::constants::lhc::LHCBunchSpacingNS;             // 1 BC
       } else {
         trackTime = trackCand.trackTime();
         trackTimeRes = trackCand.trackTimeRes();
       }
 
-      const float deltaTime = trackTime - collTime + bcOffset * constants::lhc::LHCBunchSpacingNS;
+      const float deltaTime = trackTime - collTime + bcOffset * o2::constants::lhc::LHCBunchSpacingNS;
       float sigmaTimeRes2 = collTimeRes2 + trackTimeRes * trackTimeRes;
 
       float thresholdTime = 0.;