diff --git a/df_datalink_sp/src/networking/link_layer/link_layer.c b/df_datalink_sp/src/networking/link_layer/link_layer.c
index 7d915bc..651e985 100644
--- a/df_datalink_sp/src/networking/link_layer/link_layer.c
+++ b/df_datalink_sp/src/networking/link_layer/link_layer.c
@@ -340,48 +340,48 @@ void L2_FrameStateUpdate(L2_INST *instPtr)
 	}
 	else
 	{
-	DBG_INFO("A frame received, checking data validation...\n");
-	DBG_INFO("Last frame type is: %" PRId32 ".\n", instPtr->frame.last);
-	Phy_RetrieveRecvData(phyRef, instPtr->recvPktData);
-	instPtr->log.frameRecv++;
+		DBG_INFO("A frame received, checking data validation...\n");
+		DBG_INFO("Last frame type is: %" PRId32 ".\n", instPtr->frame.last);
+		Phy_RetrieveRecvData(phyRef, instPtr->recvPktData);
+		instPtr->log.frameRecv++;
 
-	// Update frame state.
-	switch (recvType)
-	{
-	case L2_SCAN_FRAME:
-	case L2_ADV_FRAME:
-		isValid = L2_CrcCheck(instPtr->recvPktData, L2_ADV_PACK_LEN, L2_CRC16_1021);
-		instPtr->log.advRecvCnt++;
-		instPtr->log.advCorrectCnt = isValid ? instPtr->log.advCorrectCnt + 1 : instPtr->log.advCorrectCnt;
-		break;
-	case L2_CFM_FRAME:
-		isValid = L2_CrcCheck(instPtr->recvPktData, L2_CMF_PACK_LEN, L2_CRC16_1021);
-		instPtr->log.cfmRecvCnt++;
-		instPtr->log.cfmCorrectCnt = isValid ? instPtr->log.cfmCorrectCnt + 1 : instPtr->log.cfmCorrectCnt;
-		break;
-	case L2_SVC_FRAME:
+		// Update frame state.
+		switch (recvType)
+		{
+		case L2_SCAN_FRAME:
+		case L2_ADV_FRAME:
+			isValid = L2_CrcCheck(instPtr->recvPktData, L2_ADV_PACK_LEN, L2_CRC16_1021);
+			instPtr->log.advRecvCnt++;
+			instPtr->log.advCorrectCnt = isValid ? instPtr->log.advCorrectCnt + 1 : instPtr->log.advCorrectCnt;
+			break;
+		case L2_CFM_FRAME:
+			isValid = L2_CrcCheck(instPtr->recvPktData, L2_CMF_PACK_LEN, L2_CRC16_1021);
+			instPtr->log.cfmRecvCnt++;
+			instPtr->log.cfmCorrectCnt = isValid ? instPtr->log.cfmCorrectCnt + 1 : instPtr->log.cfmCorrectCnt;
+			break;
+		case L2_SVC_FRAME:
 #ifndef DATALINK_ENABLE_BERTEST
-		isValid = L2_CrcCheck(instPtr->recvPktData, L2_SVC_PACK_LEN, L2_CRC16_1021);
+			isValid = L2_CrcCheck(instPtr->recvPktData, L2_SVC_PACK_LEN, L2_CRC16_1021);
 #else
-		isValid = true;
+			isValid = true;
 #endif
-		instPtr->log.svcRecvCnt++;
-		instPtr->log.svcCorrectCnt = isValid ? instPtr->log.svcCorrectCnt + 1 : instPtr->log.svcCorrectCnt;
-		break;
+			instPtr->log.svcRecvCnt++;
+			instPtr->log.svcCorrectCnt = isValid ? instPtr->log.svcCorrectCnt + 1 : instPtr->log.svcCorrectCnt;
+			break;
 
-	default:
-		isValid = false;
-		break;
-	}
-	if(isValid)
-	{
-		instPtr->log.frameCorrect++;
-		L2_DataAvailUpdate(instPtr, true);
-	}
-	else
-	{
-		L2_DataAvailUpdate(instPtr, false);
-	}
+		default:
+			isValid = false;
+			break;
+		}
+		if (isValid)
+		{
+			instPtr->log.frameCorrect++;
+			L2_DataAvailUpdate(instPtr, true);
+		}
+		else
+		{
+			L2_DataAvailUpdate(instPtr, false);
+		}
 	}
 }
 
@@ -686,7 +686,7 @@ int32_t Linklayer_Init(L2_INST **instPtr, const L2_CONFIG *config)
 	(*instPtr)->rtneConfig.curr = NULL;
 	(*instPtr)->rtneConfig.next = NULL;
 	(*instPtr)->isEnable = false;
-	(*instPtr)->cxn2Net = (config->myType == L2_NODE_HEAD) ? true : false;;
+	(*instPtr)->cxn2Net = (config->myType == L2_NODE_HEAD) ? true : false;
 	(*instPtr)->dataAvail = false;
 	(*instPtr)->frameNum.last = 0;
 	(*instPtr)->frameNum.curr = 0;
@@ -854,7 +854,8 @@ int32_t Linklayer_Start(L2_INST *instPtr)
 {
 	ASSERT(instPtr != NULL);
 	// Set netStartTime at first call.
-	if (instPtr->netStartTime == NET_START_TIME_INFTY) {
+	if (instPtr->netStartTime == NET_START_TIME_INFTY)
+	{
 		instPtr->netStartTime = TimeCtrl_GetIntCnt(instPtr->config.tmcInstPtr) / L2_SLOTS_PER_FRAME + 1;
 	}
 	instPtr->isEnable = true;
@@ -965,7 +966,7 @@ int32_t Linklayer_EventHandler(L2_INST *instPtr, const L2_EVENT *l2Event)
 		L2_Scan_Reset(instPtr->scanFSM);
 		L2_Service_Reset(instPtr->serviceFSM);
 		UpdateMainSate(instPtr, L2_INIT_STATE);
-		// Log reconnect 
+		// Log reconnect
 		instPtr->log.reconnectCnt++;
 		break;
 	}
@@ -1117,7 +1118,7 @@ static int32_t Linklayer_Routine(L2_INST *instPtr)
 	case L2_SLOT_CONFIRM:
 		Status = L2_Scan_Routine(instPtr, &rtneEntry);
 		break;
-	 case L2_SLOT_SERVICE:
+	case L2_SLOT_SERVICE:
 		Status = L2_Service_Routine(instPtr, &rtneEntry);
 		break;
 	default:
@@ -1137,7 +1138,8 @@ static int32_t Linklayer_Routine(L2_INST *instPtr)
 	L2_IterEditNode(instPtr->nodeList, &increment, IntcNodeTTL);
 
 #ifdef DATALINK_ENABLE_AUTORECONNECT
-	if(L2_GetMainState(instPtr) != L2_INIT_STATE){
+	if (L2_GetMainState(instPtr) != L2_INIT_STATE)
+	{
 		L2_IterDeleteNode(instPtr->nodeList, IsNodeConnected);
 		if (L2_GetNodeListLen(instPtr->nodeList) < instPtr->config.netScale - 1)
 		{
@@ -1224,7 +1226,7 @@ int32_t Linklayer_Proc(L2_INST *instPtr)
 		}
 	}
 
-		// Check if previous runs has error occurred.
+	// Check if previous runs has error occurred.
 	if (Status != SUCCESS)
 	{
 		return Status;
@@ -1255,9 +1257,8 @@ int32_t Linklayer_Proc(L2_INST *instPtr)
 	instPtr->linkLog.svcTxCnt = instPtr->log.svcTxCnt;
 	instPtr->linkLog.svcRecvCnt = instPtr->log.svcRecvCnt;
 	instPtr->linkLog.svcCorrectCnt = instPtr->log.svcCorrectCnt;
-	instPtr->linkLog.timeDev = (instPtr->log.timeDev > INT32_MAX) ?
-								INT32_MAX :
-								((instPtr->log.timeDev < INT32_MIN) ? INT32_MIN : (int32_t) instPtr->log.timeDev);
+	instPtr->linkLog.timeDev = (instPtr->log.timeDev > INT32_MAX) 
+								? INT32_MAX : ((instPtr->log.timeDev < INT32_MIN) ? INT32_MIN : (int32_t)instPtr->log.timeDev);
 	instPtr->linkLog.sendId = instPtr->serviceFSM->txLog.dataId;
 	instPtr->linkLog.recvId = instPtr->serviceFSM->rxLog.dataId;