diff --git a/PWGEM/PhotonMeson/TableProducer/skimmerGammaCalo.cxx b/PWGEM/PhotonMeson/TableProducer/skimmerGammaCalo.cxx
index 4533b0bf09d..3c54a08a4bb 100644
--- a/PWGEM/PhotonMeson/TableProducer/skimmerGammaCalo.cxx
+++ b/PWGEM/PhotonMeson/TableProducer/skimmerGammaCalo.cxx
@@ -258,7 +258,7 @@ struct SkimmerGammaCalo {
                        convertForStorage<int16_t>(emccluster.m02(), Observable::kM02),
                        convertForStorage<int16_t>(emccluster.time(), Observable::kTime));
 
-      if (vEta.size() > 0) {
+      if (!vEta.empty()) {
         for (size_t iPart = 0; iPart < vEta.size(); ++iPart) {
           tableEmEmcMTracks(tableEmEmcClusters.lastIndex(), vEta[iPart], vPhi[iPart], vP[iPart], vPt[iPart]);
           tableMinMTracks(tableMinClusters.lastIndex(),
@@ -268,7 +268,7 @@ struct SkimmerGammaCalo {
                           convertForStorage<uint16_t>(vPt[iPart], Observable::kEnergy));
         }
       }
-      if (vEtaSecondaries.size() > 0) {
+      if (!vEtaSecondaries.empty()) {
         for (size_t iPart = 0; iPart < vEtaSecondaries.size(); ++iPart) {
           tableEmEmcMSTracks(tableEmEmcClusters.lastIndex(), vEtaSecondaries[iPart], vPhiSecondaries[iPart], vPSecondaries[iPart], vPtSecondaries[iPart]);
           tableMinMSTracks(tableMinClusters.lastIndex(),
diff --git a/PWGEM/PhotonMeson/TableProducer/skimmerPrimaryElectronFromDalitzEE.cxx b/PWGEM/PhotonMeson/TableProducer/skimmerPrimaryElectronFromDalitzEE.cxx
index 2ed8523add7..9c0c52b24de 100644
--- a/PWGEM/PhotonMeson/TableProducer/skimmerPrimaryElectronFromDalitzEE.cxx
+++ b/PWGEM/PhotonMeson/TableProducer/skimmerPrimaryElectronFromDalitzEE.cxx
@@ -510,7 +510,7 @@ struct SkimmerPrimaryElectronFromDalitzEE {
         fillPairInfo<false, 2>(collision, negTracksPerColl, negTracksPerColl); // LS--
       }
 
-      if ((v0photonsPerColl.size() >= 1 && acceptedPosTrackIdsPerCollision.size() >= 1 && acceptedNegTrackIdsPerCollision.size() >= 1) || (acceptedPosTrackIdsPerCollision.size() >= 2 && acceptedNegTrackIdsPerCollision.size() >= 2)) { // o2-linter: disable=magic-number (check to see if we have enough particles that it make sense to fill the tables)
+      if ((v0photonsPerColl.size() >= 1 && !acceptedPosTrackIdsPerCollision.empty() && !acceptedNegTrackIdsPerCollision.empty()) || (acceptedPosTrackIdsPerCollision.size() >= 2 && acceptedNegTrackIdsPerCollision.size() >= 2)) { // o2-linter: disable=magic-number (check to see if we have enough particles that it make sense to fill the tables)
         // LOGF(info, "v0photonsPerColl.size() = %d, acceptedPosTrackIdsPerCollision.size() = %d, acceptedNegTrackIdsPerCollision.size() = %d", v0photonsPerColl.size(), acceptedPosTrackIdsPerCollision.size(), acceptedNegTrackIdsPerCollision.size());
         for (const auto& posId : acceptedPosTrackIdsPerCollision) {
           const auto& pos = tracks.rawIteratorAt(posId);
@@ -612,7 +612,7 @@ struct SkimmerPrimaryElectronFromDalitzEE {
         fillPairInfo<true, 1>(collision, posTracksPerColl, posTracksPerColl); // LS++
         fillPairInfo<true, 2>(collision, negTracksPerColl, negTracksPerColl); // LS--
       }
-      if ((v0photonsPerColl.size() >= 1 && acceptedPosTrackIdsPerCollision.size() >= 1 && acceptedNegTrackIdsPerCollision.size() >= 1) || (acceptedPosTrackIdsPerCollision.size() >= 2 && acceptedNegTrackIdsPerCollision.size() >= 2)) { // o2-linter: disable=magic-number (check to see if we have enough particles that it make sense to fill the tables)
+      if ((v0photonsPerColl.size() >= 1 && !acceptedPosTrackIdsPerCollision.empty() && !acceptedNegTrackIdsPerCollision.empty()) || (acceptedPosTrackIdsPerCollision.size() >= 2 && acceptedNegTrackIdsPerCollision.size() >= 2)) { // o2-linter: disable=magic-number (check to see if we have enough particles that it make sense to fill the tables)
         // LOGF(info, "v0photonsPerColl.size() = %d, acceptedPosTrackIdsPerCollision.size() = %d, acceptedNegTrackIdsPerCollision.size() = %d", v0photonsPerColl.size(), acceptedPosTrackIdsPerCollision.size(), acceptedNegTrackIdsPerCollision.size());
         for (const auto& posId : acceptedPosTrackIdsPerCollision) {
           const auto& pos = tracks.rawIteratorAt(posId);