diff --git a/source/Lib/CommonLib/InterPrediction.cpp b/source/Lib/CommonLib/InterPrediction.cpp
index a0ca66c7377ea2249358676163b9bcf30d55e45a..6a349d48b132099084984e469885f21312fc58b3 100644
--- a/source/Lib/CommonLib/InterPrediction.cpp
+++ b/source/Lib/CommonLib/InterPrediction.cpp
@@ -278,9 +278,9 @@ bool InterPrediction::xCheckIdenticalMotion( const PredictionUnit &pu )
   return false;
 }
 
-void InterPrediction::xSubPuMC( PredictionUnit& pu, PelUnitBuf& predBuf, const RefPicList &eRefPicList /*= REF_PIC_LIST_X*/, const bool luma /*= true*/, const bool chroma /*= true*/)
+void InterPrediction::xSubPuMC(PredictionUnit &pu, PelUnitBuf &predBuf, const RefPicList &eRefPicList, const bool luma,
+                               const bool chroma)
 {
-
   // compute the location of the current PU
   Position puPos    = pu.lumaPos();
   Size puSize       = pu.lumaSize();
@@ -444,7 +444,9 @@ void InterPrediction::xSubPuBio(PredictionUnit &pu, PelUnitBuf &predBuf, const R
         motionCompensation(subPu, subPredBuf, eRefPicList, true, true, &subPredBufTmp);
       }
       else
-      motionCompensation(subPu, subPredBuf, eRefPicList);
+      {
+        motionCompensation(subPu, subPredBuf, eRefPicList);
+      }
     }
   }
   JVET_J0090_SET_CACHE_ENABLE(true);
@@ -1548,7 +1550,9 @@ void InterPrediction::motionCompensation(PredictionUnit &pu, PelUnitBuf &predBuf
       {
         xPredInterUni(pu, REF_PIC_LIST_0, predBuf, false, false, luma, chroma);
         if (predBufWOBIO)
+        {
           predBufWOBIO->copyFrom(predBuf, (luma && !chroma), (chroma && !luma));
+        }
       }
       else
       {
diff --git a/source/Lib/CommonLib/InterPrediction.h b/source/Lib/CommonLib/InterPrediction.h
index 62934e1915ce820369f7c25260d476e44e0092c2..3c2d83ee84e40103efae33ca186b1d996286a789 100644
--- a/source/Lib/CommonLib/InterPrediction.h
+++ b/source/Lib/CommonLib/InterPrediction.h
@@ -156,9 +156,8 @@ protected:
 
   static bool xCheckIdenticalMotion( const PredictionUnit& pu );
 
-  void xSubPuMC(PredictionUnit& pu, PelUnitBuf& predBuf, const RefPicList &eRefPicList = REF_PIC_LIST_X, const bool luma = true, const bool chroma = true);
-  void xSubPuBio(PredictionUnit &pu, PelUnitBuf &predBuf, const RefPicList &eRefPicList = REF_PIC_LIST_X,
-                 PelUnitBuf *yuvDstTmp = nullptr);
+  void xSubPuMC(PredictionUnit &pu, PelUnitBuf &predBuf, const RefPicList &eRefPicList, bool luma, bool chroma);
+  void xSubPuBio(PredictionUnit &pu, PelUnitBuf &predBuf, const RefPicList &eRefPicList, PelUnitBuf *yuvDstTmp);
   void destroy();