diff --git a/source/App/DecoderApp/DecApp.cpp b/source/App/DecoderApp/DecApp.cpp
index 96de4a463be6fcd7237c46a4eb9b2fa971fc01bb..0fc7d179c82cc004c425fa5c491989aae9fe886c 100644
--- a/source/App/DecoderApp/DecApp.cpp
+++ b/source/App/DecoderApp/DecApp.cpp
@@ -337,7 +337,6 @@ uint32_t DecApp::decode()
               m_outputBitDepth[channelType] = bitDepths.recon[channelType];
             }
           }
-#if NNVC_DUMP_DATA
           m_jsonFile.open(m_dumpBasename + ".json");
           m_jsonFile << "{\n";
 #if NNVC_USE_REC_BEFORE_DBF
@@ -388,7 +387,6 @@ uint32_t DecApp::decode()
                      << "    \"width\": " << activeSPS->getMaxPicWidthInLumaSamples() << ",\n"
                      << "    \"height\": " << activeSPS->getMaxPicHeightInLumaSamples() << ",\n";
           m_dumpDataCnt = 0;
-#endif
         }
       }
 #endif
diff --git a/source/Lib/CommonLib/NNFilterSet1.h b/source/Lib/CommonLib/NNFilterSet1.h
index 4e84967fc4c53d8bb32db99e7b5b454db03a0ecf..b97214a6830f79383afa2df55595debd0848d89a 100644
--- a/source/Lib/CommonLib/NNFilterSet1.h
+++ b/source/Lib/CommonLib/NNFilterSet1.h
@@ -50,7 +50,7 @@ class NNFilterSet1
 {
 public:
   NNFilterSet1();
-  
+
   std::vector<PelStorage> m_tempBuf;
   std::string m_interLuma, m_interChroma, m_intraLuma, m_intraChroma;
 #if SCALE_NN_RESIDUE
diff --git a/source/Lib/CommonLib/NNInference.h b/source/Lib/CommonLib/NNInference.h
index 3109b420b8fd43ffdbeecd9aa218ef188a298c40..3c32c40dd6a0c3073ce3177be0944c1546847498 100644
--- a/source/Lib/CommonLib/NNInference.h
+++ b/source/Lib/CommonLib/NNInference.h
@@ -166,9 +166,9 @@ public:
   #endif
   }
   template<typename T>
-  static void prepareInputs (Picture* pic, UnitArea inferArea, vector<sadl::Tensor<T>> &inputs, int globalQp, int localQp, int sliceType, std::vector<InputData> listInputData)
+  static void prepareInputs (Picture* pic, UnitArea inferArea, vector<sadl::Tensor<T>> &inputs, int globalQp, int localQp, int sliceType, const std::vector<InputData> &listInputData)
   {
-    for (auto &inputData : listInputData)
+    for (auto inputData : listInputData)
     {
       switch (inputData.nnInputType)
       {
diff --git a/source/Lib/DecoderLib/DecLib.cpp b/source/Lib/DecoderLib/DecLib.cpp
index 04923354e2cc71021d5c31873565bc7bc609e3f8..bb62889561003eda5a08c9e24fe3af9a368c6317 100644
--- a/source/Lib/DecoderLib/DecLib.cpp
+++ b/source/Lib/DecoderLib/DecLib.cpp
@@ -503,9 +503,6 @@ void DecLib::create()
 {
   m_apcSlicePilot = new Slice;
   m_uiSliceSegmentIdx = 0;
-#if NN_FILTERING_SET_1
-  m_pcNNFilterSet1 = new NNFilterSet1;
-#endif
 }
 
 void DecLib::destroy()
@@ -519,12 +516,7 @@ void DecLib::destroy()
     m_dci = NULL;
   }
 #if NN_FILTERING_SET_1
-  if (m_pcNNFilterSet1)
-  {
-    m_pcNNFilterSet1->destroy();
-    delete m_pcNNFilterSet1;
-    m_pcNNFilterSet1 = NULL;
-  }
+  m_pcNNFilterSet1.destroy();
 #endif
   m_cSliceDecoder.destroy();
 }
@@ -648,8 +640,8 @@ void DecLib::executeLoopFilters()
 #if NN_FILTERING_SET_1
   if (cs.sps->getNnlfSet1EnabledFlag())
   {
-    m_pcNNFilterSet1->create(cs.pcv->lumaWidth, cs.pcv->lumaHeight, cs.pcv->chrFormat, cs.sps->getNnlfSet1MaxNumParams());
-    m_pcNNFilterSet1->init(getNnlfSet1InterLumaModelName(), getNnlfSet1InterChromaModelName(), getNnlfSet1IntraLumaModelName(), getNnlfSet1IntraChromaModelName());
+    m_pcNNFilterSet1.create(cs.pcv->lumaWidth, cs.pcv->lumaHeight, cs.pcv->chrFormat, cs.sps->getNnlfSet1MaxNumParams());
+    m_pcNNFilterSet1.init(getNnlfSet1InterLumaModelName(), getNnlfSet1InterChromaModelName(), getNnlfSet1IntraLumaModelName(), getNnlfSet1IntraChromaModelName());
   }
 #endif
 
@@ -724,7 +716,7 @@ void DecLib::executeLoopFilters()
 #if NN_FILTERING_SET_1
   if (cs.sps->getNnlfSet1EnabledFlag())
   {
-    m_pcNNFilterSet1->cnnFilter(m_pcPic);
+    m_pcNNFilterSet1.cnnFilter(m_pcPic);
   }
 #endif
   
diff --git a/source/Lib/DecoderLib/DecLib.h b/source/Lib/DecoderLib/DecLib.h
index 64a897a863681cff5bee487ec4cf474c6ecbd3a9..bd7a03f17134a9eff65515d6686796cbaa0ec100 100644
--- a/source/Lib/DecoderLib/DecLib.h
+++ b/source/Lib/DecoderLib/DecLib.h
@@ -135,7 +135,7 @@ private:
   Reshape                 m_cReshaper;                        ///< reshaper class
   HRD                     m_HRD;
 #if NN_FILTERING_SET_1
-  NNFilterSet1*           m_pcNNFilterSet1;
+  NNFilterSet1            m_pcNNFilterSet1;
 #endif
   // decoder side RD cost computation
   RdCost                  m_cRdCost;                      ///< RD cost computation class
diff --git a/source/Lib/EncoderLib/EncGOP.cpp b/source/Lib/EncoderLib/EncGOP.cpp
index 9013e928b22e4df18637734947a92b617f5b91bc..8f159ad58db12cba04bab5a08ae65ac2e0e9f820 100644
--- a/source/Lib/EncoderLib/EncGOP.cpp
+++ b/source/Lib/EncoderLib/EncGOP.cpp
@@ -178,9 +178,6 @@ void  EncGOP::create()
 {
   m_bLongtermTestPictureHasBeenCoded = 0;
   m_bLongtermTestPictureHasBeenCoded2 = 0;
-#if NN_FILTERING_SET_1
-  m_pcNNFilterSet1 =  new EncNNFilterSet1;
-#endif
 }
 
 void  EncGOP::destroy()
@@ -206,12 +203,7 @@ void  EncGOP::destroy()
     m_picOrig = NULL;
   }
 #if NN_FILTERING_SET_1
-  if (m_pcNNFilterSet1)
-  {
-    m_pcNNFilterSet1->destroy();
-    delete m_pcNNFilterSet1;
-    m_pcNNFilterSet1 = NULL;
-  }
+    m_pcNNFilterSet1.destroy();
 #endif
 }
 
@@ -239,7 +231,7 @@ void EncGOP::init ( EncLib* pcEncLib )
   m_AUWriterIf = pcEncLib->getAUWriterIf();
   
 #if NN_FILTERING_SET_1
-  m_pcNNFilterSet1->create(m_pcCfg->getSourceWidth(), m_pcCfg->getSourceHeight(), m_pcCfg->getChromaFormatIdc(), m_pcCfg->getNnlfSet1MaxNumParams());
+  m_pcNNFilterSet1.create(m_pcCfg->getSourceWidth(), m_pcCfg->getSourceHeight(), m_pcCfg->getChromaFormatIdc(), m_pcCfg->getNnlfSet1MaxNumParams());
 #endif
 
 #if WCG_EXT
@@ -3072,9 +3064,9 @@ void EncGOP::compressGOP( int iPOCLast, int iNumPicRcvd, PicList& rcListPic,
 #if NN_FILTERING_SET_1
       if ( cs.sps->getNnlfSet1EnabledFlag() )
       {
-        m_pcNNFilterSet1->init(m_pcEncLib->getNnlfSet1InterLumaModelName(), m_pcEncLib->getNnlfSet1InterChromaModelName(), m_pcEncLib->getNnlfSet1IntraLumaModelName(), m_pcEncLib->getNnlfSet1IntraChromaModelName());
-        m_pcNNFilterSet1->initCABACEstimator( m_pcEncLib->getCABACEncoder(), m_pcEncLib->getCtxCache(), pcSlice );
-        m_pcNNFilterSet1->cnnFilterEncoder(pcPic, pcSlice->getLambdas());
+        m_pcNNFilterSet1.init(m_pcEncLib->getNnlfSet1InterLumaModelName(), m_pcEncLib->getNnlfSet1InterChromaModelName(), m_pcEncLib->getNnlfSet1IntraLumaModelName(), m_pcEncLib->getNnlfSet1IntraChromaModelName());
+        m_pcNNFilterSet1.initCABACEstimator( m_pcEncLib->getCABACEncoder(), m_pcEncLib->getCtxCache(), pcSlice );
+        m_pcNNFilterSet1.cnnFilterEncoder(pcPic, pcSlice->getLambdas());
       }
 #endif
 
diff --git a/source/Lib/EncoderLib/EncGOP.h b/source/Lib/EncoderLib/EncGOP.h
index 73ba9fef4902b7074e9178e0e4a45dc03ef4b6af..ce428c792e65126f11aa58cfda409b035e2f1018 100644
--- a/source/Lib/EncoderLib/EncGOP.h
+++ b/source/Lib/EncoderLib/EncGOP.h
@@ -144,7 +144,7 @@ private:
   PicList*                m_pcListPic;
 
 #if NN_FILTERING_SET_1
-  EncNNFilterSet1*        m_pcNNFilterSet1;
+  EncNNFilterSet1         m_pcNNFilterSet1;
 #endif
 
   HLSWriter*              m_HLSWriter;
diff --git a/source/Lib/EncoderLib/EncNNFilterSet1.cpp b/source/Lib/EncoderLib/EncNNFilterSet1.cpp
index 9c3d7b9a8f921f19ec9ce0106507e11c702462ba..aba35199c5b28fd0edb382bf458c80b4150881e6 100644
--- a/source/Lib/EncoderLib/EncNNFilterSet1.cpp
+++ b/source/Lib/EncoderLib/EncNNFilterSet1.cpp
@@ -57,7 +57,7 @@
 
 EncNNFilterSet1::EncNNFilterSet1()
 {
-  m_CABACEstimator = NULL;
+  m_CABACEstimator = nullptr;
   m_singleModelISlice = false;
 }