diff --git a/source/Lib/CommonLib/ContextModelling.cpp b/source/Lib/CommonLib/ContextModelling.cpp
index 23c80166ba5880e2b2a9201a48d611ab51c06afe..d748f3dd8919e7dc3ed2fd427dcfbd4e0366cb2b 100644
--- a/source/Lib/CommonLib/ContextModelling.cpp
+++ b/source/Lib/CommonLib/ContextModelling.cpp
@@ -494,7 +494,7 @@ void MergeCtx::setMergeInfo( PredictionUnit& pu, int candIdx )
   pu.mvpIdx [REF_PIC_LIST_1] = NOT_VALID;
   pu.mvpNum [REF_PIC_LIST_0] = NOT_VALID;
   pu.mvpNum [REF_PIC_LIST_1] = NOT_VALID;
-#if JVET_M0483_IBC // remove macro VCEG_AZ07_MV_ADD_PRECISION_BIT_FOR_STORE
+#if JVET_M0483_IBC
   if (CU::isIBC(*pu.cu))
   {
     pu.bv = pu.mv[REF_PIC_LIST_0];
diff --git a/source/Lib/CommonLib/Slice.cpp b/source/Lib/CommonLib/Slice.cpp
index a28658d0192f3b1a5c3f72c5e14a844f1f1c8f55..4fc931fe1c8bd8b9de1e11365ba91f1f29d87080 100644
--- a/source/Lib/CommonLib/Slice.cpp
+++ b/source/Lib/CommonLib/Slice.cpp
@@ -1762,7 +1762,7 @@ void Slice::updateMotionLUTs(LutMotionCand* lutMC, CodingUnit & cu)
 
   MotionInfo newMi = selectedPU->getMotionInfo();
 #if JVET_M0264_HMVP_WITH_GBIIDX
-    newMi.GBiIdx = (newMi.interDir == 3) ? cu.GBiIdx : GBI_DEFAULT;
+  newMi.GBiIdx = (newMi.interDir == 3) ? cu.GBiIdx : GBI_DEFAULT;
 #endif
 #if JVET_M0483_IBC
   addMotionInfoToLUTs(lutMC, newMi, CU::isIBC(cu));
diff --git a/source/Lib/CommonLib/UnitTools.cpp b/source/Lib/CommonLib/UnitTools.cpp
index b52350c6a6cf5335bc85b5ba4d82d2cdc25f3a8e..4727f055d1302e0927aa197ccc652b2fa6ce398c 100644
--- a/source/Lib/CommonLib/UnitTools.cpp
+++ b/source/Lib/CommonLib/UnitTools.cpp
@@ -722,7 +722,7 @@ bool PU::addMergeHMVPCand(const Slice &slice, MergeCtx& mrgCtx, bool canFastExit
   , int mmvdList
 #endif
 #if JVET_M0483_IBC
-  , bool ibc_flag
+  , bool ibcFlag
 #endif
 #if JVET_M0170_MRG_SHARELIST
   , bool isShared
@@ -747,15 +747,15 @@ bool PU::addMergeHMVPCand(const Slice &slice, MergeCtx& mrgCtx, bool isCandInter
   }
 #if JVET_M0170_MRG_SHARELIST
 #if JVET_M0483_IBC
-  int num_avai_candInLUT = ibc_flag ? slice.getAvailableLUTIBCMrgNum() : (isShared ? slice.getAvailableLUTBkupMrgNum() : slice.getAvailableLUTMrgNum());
-  int offset = ibc_flag ? MAX_NUM_HMVP_CANDS : 0;
+  int num_avai_candInLUT = ibcFlag ? slice.getAvailableLUTIBCMrgNum() : (isShared ? slice.getAvailableLUTBkupMrgNum() : slice.getAvailableLUTMrgNum());
+  int offset = ibcFlag ? MAX_NUM_HMVP_CANDS : 0;
 #else
   int num_avai_candInLUT = (isShared ? slice.getAvailableLUTBkupMrgNum() : slice.getAvailableLUTMrgNum());
 #endif
 #else
 #if JVET_M0483_IBC
-  int num_avai_candInLUT = ibc_flag ? slice.getAvailableLUTIBCMrgNum() : slice.getAvailableLUTMrgNum();
-  int offset = ibc_flag ? MAX_NUM_HMVP_CANDS : 0;
+  int num_avai_candInLUT = ibcFlag ? slice.getAvailableLUTIBCMrgNum() : slice.getAvailableLUTMrgNum();
+  int offset = ibcFlag ? MAX_NUM_HMVP_CANDS : 0;
 #else
   int num_avai_candInLUT = slice.getAvailableLUTMrgNum();
 #endif
@@ -765,7 +765,7 @@ bool PU::addMergeHMVPCand(const Slice &slice, MergeCtx& mrgCtx, bool isCandInter
   {
 #if JVET_M0170_MRG_SHARELIST
 #if JVET_M0483_IBC
-    miNeighbor = ibc_flag ? slice.getMotionInfoFromLUTs(num_avai_candInLUT - mrgIdx + offset)
+    miNeighbor = ibcFlag ? slice.getMotionInfoFromLUTs(num_avai_candInLUT - mrgIdx + offset)
                           : (isShared ? slice.getMotionInfoFromLUTBkup(num_avai_candInLUT - mrgIdx) : slice.getMotionInfoFromLUTs(num_avai_candInLUT - mrgIdx));
 #else
     miNeighbor = isShared ? slice.getMotionInfoFromLUTBkup(num_avai_candInLUT - mrgIdx) : slice.getMotionInfoFromLUTs(num_avai_candInLUT - mrgIdx);
@@ -828,8 +828,8 @@ void PU::getIBCMergeCandidates(const PredictionUnit &pu, MergeCtx& mrgCtx, const
     mrgCtx.GBiIdx[ui] = GBI_DEFAULT;
     mrgCtx.interDirNeighbours[ui] = 0;
     mrgCtx.mrgTypeNeighbours[ui] = MRG_TYPE_IBC;
-    mrgCtx.mvFieldNeighbours[(ui << 1)].refIdx = NOT_VALID;
-    mrgCtx.mvFieldNeighbours[(ui << 1) + 1].refIdx = NOT_VALID;
+    mrgCtx.mvFieldNeighbours[ui * 2].refIdx = NOT_VALID;
+    mrgCtx.mvFieldNeighbours[ui * 2 + 1].refIdx = NOT_VALID;
   }
 
   mrgCtx.numValidMergeCand = maxNumMergeCand;
@@ -2234,13 +2234,9 @@ bool PU::getDerivedBV(PredictionUnit &pu, const Mv& currentMv, Mv& derivedMv)
 }
 
 #if JVET_M0483_IBC
-/** Constructs a list of candidates for IBC AMVP (See specification, section "Derivation process for motion vector predictor candidates")
-* \param uiPartIdx
-* \param uiPartAddr
-* \param eRefPicList
-* \param iRefIdx
-* \param pInfo
-*/
+/** 
+ * Constructs a list of candidates for IBC AMVP (See specification, section "Derivation process for motion vector predictor candidates")
+ */
 void PU::fillIBCMvpCand(PredictionUnit &pu, AMVPInfo &amvpInfo)
 {
   CodingStructure &cs = *pu.cs;
@@ -2268,23 +2264,23 @@ void PU::fillIBCMvpCand(PredictionUnit &pu, AMVPInfo &amvpInfo)
   // Left predictor search
   if (isScaledFlagLX)
   {
-    bool bAdded = addIBCMVPCand(pu, posLB, MD_BELOW_LEFT, *pInfo);
+    bool isAdded = addIBCMVPCand(pu, posLB, MD_BELOW_LEFT, *pInfo);
 
-    if (!bAdded)
+    if (!isAdded)
     {
-      bAdded = addIBCMVPCand(pu, posLB, MD_LEFT, *pInfo);
+      isAdded = addIBCMVPCand(pu, posLB, MD_LEFT, *pInfo);
     }
   }
 
   // Above predictor search
   {
-    bool bAdded = addIBCMVPCand(pu, posRT, MD_ABOVE_RIGHT, *pInfo);
+    bool isAdded = addIBCMVPCand(pu, posRT, MD_ABOVE_RIGHT, *pInfo);
 
-    if (!bAdded)
+    if (!isAdded)
     {
-      bAdded = addIBCMVPCand(pu, posRT, MD_ABOVE, *pInfo);
+      isAdded = addIBCMVPCand(pu, posRT, MD_ABOVE, *pInfo);
 
-      if (!bAdded)
+      if (!isAdded)
       {
         addIBCMVPCand(pu, posLT, MD_ABOVE_LEFT, *pInfo);
       }
diff --git a/source/Lib/CommonLib/UnitTools.h b/source/Lib/CommonLib/UnitTools.h
index b43e63a47bffabe2f78c5fd5b31db773befc5a05..36e1c25042e727b65f4984174b4bdc3d5c55f4ef 100644
--- a/source/Lib/CommonLib/UnitTools.h
+++ b/source/Lib/CommonLib/UnitTools.h
@@ -136,7 +136,7 @@ namespace PU
     , int mmvdList
 #endif
 #if JVET_M0483_IBC
-    , bool ibc_flag
+    , bool ibcFlag
 #endif
 #if JVET_M0170_MRG_SHARELIST
     , bool isShared