diff --git a/ALICE3/Utils/utilsHfAlice3.h b/ALICE3/Utils/utilsHfAlice3.h
index 4f58316369b..b0106f739e4 100644
--- a/ALICE3/Utils/utilsHfAlice3.h
+++ b/ALICE3/Utils/utilsHfAlice3.h
@@ -9,7 +9,7 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-/// \file HfHelperAlice3.h
+/// \file utilsHfAlice3.h
 /// \brief Class with helper functions for HF analyses
 ///
 /// \author Marcello Di Costanzo <marcello.di.costanzo@cern.ch>, Polytechnic University of Turin and INFN Turin
@@ -26,15 +26,7 @@ enum CharmHadAlice3 { Lc = 1 };
 
 } // namespace o2::analysis
 
-class HfHelperAlice3
-{
- public:
-  /// Default constructor
-  HfHelperAlice3() = default;
-
-  /// Default destructor
-  ~HfHelperAlice3() = default;
-
+struct HfHelperAlice3 {
   /// Get candidate mass (ALICE3 HF data model)
   /// \tparam TCand candidate type
   /// \param cand candidate
diff --git a/PWGHF/Core/HfHelper.h b/PWGHF/Core/HfHelper.h
index 419360c00be..3eb3e8dd0b9 100644
--- a/PWGHF/Core/HfHelper.h
+++ b/PWGHF/Core/HfHelper.h
@@ -38,15 +38,7 @@ concept IsB0ToDstarPiChannel = requires(T candidate) {
   candidate.prongD0Id();
 };
 
-class HfHelper
-{
- public:
-  /// Default constructor
-  HfHelper() = default;
-
-  /// Default destructor
-  ~HfHelper() = default;
-
+struct HfHelper {
   // 2-prong
 
   // D0(bar) → π± K∓
@@ -526,7 +518,7 @@ class HfHelper
     double etaJpsi = RecoDecay::eta(std::array{candidate.pxProng0(), candidate.pyProng0(), candidate.pzProng0()});
     double phiJpsi = RecoDecay::phi(candidate.pxProng0(), candidate.pyProng0());
 
-    double etaPi, phiPi;
+    double etaPi{}, phiPi{};
 
     if (numPi <= 1) {
       etaPi = RecoDecay::eta(std::array{candidate.pxProng1(), candidate.pyProng1(), candidate.pzProng1()});