Index: branches/HM-10.0-dev-SHM/source/App/TAppEncoder/TAppEncTop.cpp
===================================================================
--- branches/HM-10.0-dev-SHM/source/App/TAppEncoder/TAppEncTop.cpp	(revision 95)
+++ branches/HM-10.0-dev-SHM/source/App/TAppEncoder/TAppEncTop.cpp	(revision 96)
@@ -110,12 +110,5 @@
 
 #if REF_IDX_MFM
-    if(layer == 0)
-    {
-      m_acTEncTop[layer].setMFMEnabledFlag(false);
-    }
-    else
-    {
-      m_acTEncTop[layer].setMFMEnabledFlag(true);
-    }
+    m_acTEncTop[layer].setMFMEnabledFlag(layer == 0 ? false : true);
 #endif
     // set layer ID 
Index: branches/HM-10.0-dev-SHM/source/Lib/TLibEncoder/TEncSearch.cpp
===================================================================
--- branches/HM-10.0-dev-SHM/source/Lib/TLibEncoder/TEncSearch.cpp	(revision 95)
+++ branches/HM-10.0-dev-SHM/source/Lib/TLibEncoder/TEncSearch.cpp	(revision 96)
@@ -6218,4 +6218,5 @@
     Bool foundILR    = false;
     for( Int refIdx = 0; refIdx < pcCU->getSlice()->getNumRefIdx(eRefPicList); refIdx++ )
+    {
       if( pcCU->getSlice()->getRefPic(eRefPicList, refIdx)->isILR() )
       {
@@ -6224,7 +6225,10 @@
         break;
       }
+    }
 
     if(!foundILR)  //no ILR in eRefPiclist
+    {
       continue;  
+    }
 
     uiBitsTemp = uiMbBits[iRefList];
@@ -6257,5 +6261,7 @@
 
   if( uiCost[0] == MAX_UINT && uiCost[1] == MAX_UINT )  //no ILR in both list0 and list1
+  {
     return false;
+  }
 
   //  Clear Motion Field 
@@ -6297,5 +6303,7 @@
   }
   else
+  {
     assert(0);
+  }
 
   pcCU->setMergeFlagSubParts( false, uiPartAddr, iPartIdx, pcCU->getDepth( uiPartAddr ) );