diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoTof.cxx b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoTof.cxx
index c58ea33c58bfe91d8b79e964d8b4997ed0e32b5e..382801fdff1907626a124346374ba18c9121398f 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoTof.cxx
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoTof.cxx
@@ -251,8 +251,7 @@ Bool_t CbmMcbm2018UnpackerAlgoTof::InitParameters() {
 
       case 1:                         // STAR eTOF  modules
         if (fviRpcSide[iGbtx] < 2) {  // mTof modules
-          LOG(info) << "Start eTOF module side " << fviRpcSide[iGbtx] << " at "
-                    << iCh;
+	  LOG(info)<<"Start eTOF module side "<<fviRpcSide[iGbtx]<<" at "<<iCh; 
           const Int_t RpcMap[3] = {0, 1, 2};
           for (Int_t iRpc = 0; iRpc < fviNrOfRpc[iGbtx]; iRpc++) {
             Int_t iStrMax = 32;
@@ -372,8 +371,8 @@ Bool_t CbmMcbm2018UnpackerAlgoTof::InitParameters() {
         LOG(info) << " Map end ceramics  box  at GBTX  -  iCh = " << iCh;
         break;
 
-      case 4:  // intended fallthrough
-        [[fallthrough]];
+      case 4:   // intended fallthrough
+	 [[fallthrough]]; 
       case 9:  // Star2 boxes
       {
         LOG(info) << " Map Star2 box  at GBTX  -  iCh = " << iCh;
@@ -456,18 +455,23 @@ Bool_t CbmMcbm2018UnpackerAlgoTof::InitParameters() {
                   case 0: iRpcMap = 0; break;
                   case 1: iRpcMap = 1; break;
                 }
-                if (iFeet % 2 == 1)
+                if (iFeet%2==1)
                   iModuleIdMap = 1;
                 else
                   iModuleIdMap = 0;
-
-                switch (iFeet) {
-                  case 0:
-                  case 3: iSideMap = 0; break;
-                  case 1:
-                  case 2: iSideMap = 1; break;
-                }
-              } break;
+		
+		switch (iFeet) {
+		  case 0:
+		  case 3: 
+		    iSideMap=0;
+		    break;
+		case 1:
+		case 2:
+		    iSideMap=1;
+		    break;
+		}
+              }
+	       break;
             }
             if (iSideMap > -1)
               fviRpcChUId[iCh] = CbmTofAddress::GetUniqueAddress(