diff --git a/source/Lib/CommonLib/Slice.cpp b/source/Lib/CommonLib/Slice.cpp
index 778b83c766d3ef6d3274b2f6d924cd0c1a239c85..0d95b6d2093339609349acb706d4f268ea16694d 100644
--- a/source/Lib/CommonLib/Slice.cpp
+++ b/source/Lib/CommonLib/Slice.cpp
@@ -1581,7 +1581,7 @@ void Slice::destroyMotionLUTs()
 }
 void Slice::resetMotionLUTs()
 {
-   m_MotionCandLut->currCnt = 0;
+  m_MotionCandLut->currCnt = 0;
 }
 
 MotionInfo Slice::getMotionInfoFromLUTs(int MotCandIdx) const
diff --git a/source/Lib/CommonLib/UnitTools.cpp b/source/Lib/CommonLib/UnitTools.cpp
index 056f3ff03931f5e07d7a6212fb22ec4ffacf74dd..ae231f63e4ffc9a483f14cd5d979c23f28c4a1da 100644
--- a/source/Lib/CommonLib/UnitTools.cpp
+++ b/source/Lib/CommonLib/UnitTools.cpp
@@ -503,7 +503,7 @@ bool PU::xCheckSimilarMotion(const int mergeCandIndex, const int prevCnt, const
     {
       continue;
     }
-    if ( (mergeCandList.interDirNeighbours[ui] == mergeCandList.interDirNeighbours[mergeCandIndex]))
+    if (mergeCandList.interDirNeighbours[ui] == mergeCandList.interDirNeighbours[mergeCandIndex])
     {
       if (mergeCandList.interDirNeighbours[ui] == 3)
       {
@@ -524,7 +524,7 @@ bool PU::xCheckSimilarMotion(const int mergeCandIndex, const int prevCnt, const
         int offset0 = (ui * 2) + mergeCandList.interDirNeighbours[ui] - 1;
         int offset1 = (mergeCandIndex * 2) + mergeCandList.interDirNeighbours[ui] - 1;
         if (mergeCandList.mvFieldNeighbours[offset0].refIdx == mergeCandList.mvFieldNeighbours[offset1].refIdx &&
-          mergeCandList.mvFieldNeighbours[offset0].mv == mergeCandList.mvFieldNeighbours[offset1].mv
+            mergeCandList.mvFieldNeighbours[offset0].mv == mergeCandList.mvFieldNeighbours[offset1].mv
           )
         {
           hasPruned[ui] = true;
diff --git a/source/Lib/EncoderLib/EncCu.cpp b/source/Lib/EncoderLib/EncCu.cpp
index 3cfcd864d069e91902ff26eb32c3187d2a23848c..8b34407f7932ebd0cb2f005a6702f0a8479ec6fc 100644
--- a/source/Lib/EncoderLib/EncCu.cpp
+++ b/source/Lib/EncoderLib/EncCu.cpp
@@ -110,17 +110,17 @@ void EncCu::create( EncCfg* encCfg )
         m_pTempMotLUTs[w][h] = new LutMotionCand ;
         m_pBestMotLUTs[w][h] = new LutMotionCand ;
         m_pSplitTempMotLUTs[w][h] = new LutMotionCand;
-          m_pSplitTempMotLUTs[w][h]->currCnt = 0;
-          m_pSplitTempMotLUTs[w][h]->motionCand = nullptr;
-          m_pSplitTempMotLUTs[w][h]->motionCand = new MotionInfo[MAX_NUM_HMVP_CANDS];
+        m_pSplitTempMotLUTs[w][h]->currCnt = 0;
+        m_pSplitTempMotLUTs[w][h]->motionCand = nullptr;
+        m_pSplitTempMotLUTs[w][h]->motionCand = new MotionInfo[MAX_NUM_HMVP_CANDS];
 
-         m_pTempMotLUTs[w][h]->currCnt = 0;
-          m_pTempMotLUTs[w][h]->motionCand = nullptr;
-          m_pTempMotLUTs[w][h]->motionCand = new MotionInfo[MAX_NUM_HMVP_CANDS];
+        m_pTempMotLUTs[w][h]->currCnt = 0;
+        m_pTempMotLUTs[w][h]->motionCand = nullptr;
+        m_pTempMotLUTs[w][h]->motionCand = new MotionInfo[MAX_NUM_HMVP_CANDS];
 
-          m_pBestMotLUTs[w][h]->currCnt = 0;
-          m_pBestMotLUTs[w][h]->motionCand = nullptr;
-          m_pBestMotLUTs[w][h]->motionCand = new MotionInfo[MAX_NUM_HMVP_CANDS];
+        m_pBestMotLUTs[w][h]->currCnt = 0;
+        m_pBestMotLUTs[w][h]->motionCand = nullptr;
+        m_pBestMotLUTs[w][h]->motionCand = new MotionInfo[MAX_NUM_HMVP_CANDS];
 #endif
       }
       else
@@ -554,7 +554,7 @@ void EncCu::xCheckBestMode( CodingStructure *&tempCS, CodingStructure *&bestCS,
 #endif
 {
 #if JVET_L0266_HMVP
-  bool CSUpdated = false;
+  bool bestCSUpdated = false;
 #endif
 
   if( !tempCS->cus.empty() )
@@ -588,7 +588,7 @@ void EncCu::xCheckBestMode( CodingStructure *&tempCS, CodingStructure *&bestCS,
       // store temp best CI for next CU coding
       m_CurrCtx->best = m_CABACEstimator->getCtx();
 #if JVET_L0266_HMVP
-      CSUpdated = true;
+      bestCSUpdated = true;
 #endif
     }
   }
@@ -596,15 +596,15 @@ void EncCu::xCheckBestMode( CodingStructure *&tempCS, CodingStructure *&bestCS,
   // reset context states
   m_CABACEstimator->getCtx() = m_CurrCtx->start;
 #if JVET_L0266_HMVP
-  return CSUpdated;
+  return bestCSUpdated;
 #endif
 
 }
 
 void EncCu::xCompressCU( CodingStructure *&tempCS, CodingStructure *&bestCS, Partitioner &partitioner
 #if JVET_L0266_HMVP
-  , LutMotionCand* &tempMotCandLUTs
-  , LutMotionCand* &bestMotCandLUTs
+  , LutMotionCand *&tempMotCandLUTs
+  , LutMotionCand *&bestMotCandLUTs
 #endif
 )
 {
@@ -1114,12 +1114,12 @@ void EncCu::xCheckModeSplit(CodingStructure *&tempCS, CodingStructure *&bestCS,
         m_CurrCtx--;
         partitioner.exitCurrSplit();
 #if JVET_L0266_HMVP
-        bool CSUpdated =
+        bool bestCSUpdated =
 #endif
         xCheckBestMode( tempCS, bestCS, partitioner, encTestMode );
 
 #if JVET_L0266_HMVP
-        if (CSUpdated)
+        if (bestCSUpdated)
         {
           std::swap(tempMotCandLUTs, bestMotCandLUTs);
         }
@@ -1236,14 +1236,14 @@ void EncCu::xCheckModeSplit(CodingStructure *&tempCS, CodingStructure *&bestCS,
 
   // RD check for sub partitioned coding structure.
 #if JVET_L0266_HMVP
-  bool CSUpdated =
+  bool bestCSUpdated =
 #endif
   xCheckBestMode( tempCS, bestCS, partitioner, encTestMode );
 
 #if JVET_L0266_HMVP
   if (!slice.isIntra())
   {
-    if (CSUpdated)
+    if (bestCSUpdated)
     {
       std::swap(tempMotCandLUTs, bestMotCandLUTs);
     }
diff --git a/source/Lib/EncoderLib/EncCu.h b/source/Lib/EncoderLib/EncCu.h
index f268d076ca71308452bd8b0303b442046b517299..22eb1cc41f41fb4c47bac1b454d4b58e7d759703 100644
--- a/source/Lib/EncoderLib/EncCu.h
+++ b/source/Lib/EncoderLib/EncCu.h
@@ -174,8 +174,8 @@ protected:
 
   void xCompressCU            ( CodingStructure *&tempCS, CodingStructure *&bestCS, Partitioner &pm
 #if JVET_L0266_HMVP
-    , LutMotionCand* &tempMotCandLUTs
-    , LutMotionCand* &bestMotCandLUTs
+    , LutMotionCand *&tempMotCandLUTs
+    , LutMotionCand *&bestMotCandLUTs
 #endif
   );
 #if ENABLE_SPLIT_PARALLELISM