diff --git a/openair-cn/NAS/EURECOM-NAS/src/emm/emm_main.c b/openair-cn/NAS/EURECOM-NAS/src/emm/emm_main.c
index ff19d477e90e84fb011332e60a1ba53f52c0c9a6..9150b072b60440ff048a5ac125994e40aac9cc85 100644
--- a/openair-cn/NAS/EURECOM-NAS/src/emm/emm_main.c
+++ b/openair-cn/NAS/EURECOM-NAS/src/emm/emm_main.c
@@ -325,7 +325,8 @@ void emm_main_initialize(emm_indication_callback_t cb, const char *imei)
                               _usim_data.imsi.u.value[3],
                               _usim_data.imsi.u.value[4],
                               _usim_data.imsi.u.value[5],
-                              _usim_data.imsi.u.value[6], _usim_data.imsi.u.value[7]);
+                              _usim_data.imsi.u.value[6],
+                              _usim_data.imsi.u.value[7]);
                     memset(&_emm_data.nvdata.rplmn, 0xFF, sizeof(plmn_t));
                     _emm_data.nvdata.eplmn.n_plmns = 0;
                 }
diff --git a/openair-cn/NAS/EURECOM-NAS/src/emm/msg/TrackingAreaUpdateRequest.c b/openair-cn/NAS/EURECOM-NAS/src/emm/msg/TrackingAreaUpdateRequest.c
index d78ec2818821c40ff7278622e06ea28d871bc276..0173466e211c2897e497f70864df56a0c6900129 100644
--- a/openair-cn/NAS/EURECOM-NAS/src/emm/msg/TrackingAreaUpdateRequest.c
+++ b/openair-cn/NAS/EURECOM-NAS/src/emm/msg/TrackingAreaUpdateRequest.c
@@ -201,20 +201,20 @@ int decode_tracking_area_update_request(tracking_area_update_request_msg *tracki
             case TRACKING_AREA_UPDATE_REQUEST_ADDITIONAL_UPDATE_TYPE_IEI:
                 if ((decoded_result =
                     decode_additional_update_type(&tracking_area_update_request->additionalupdatetype,
-                    TRACKING_AREA_UPDATE_REQUEST_ADDITIONAL_UPDATE_TYPE_IEI,
-                    buffer + decoded, len - decoded)) <= 0)
+                                                  TRACKING_AREA_UPDATE_REQUEST_ADDITIONAL_UPDATE_TYPE_IEI,
+                                                  buffer + decoded, len - decoded)) <= 0)
                     return decoded_result;
                 decoded += decoded_result;
                 /* Set corresponding mask to 1 in presencemask */
                 tracking_area_update_request->presencemask |= TRACKING_AREA_UPDATE_REQUEST_ADDITIONAL_UPDATE_TYPE_PRESENT;
                 break;
 
-	    case TRACKING_AREA_UPDATE_REQUEST_OLD_GUTI_TYPE_IEI:
-		if ((decoded_result = 
-		     decode_guti_type(&tracking_area_update_request->oldgutitype,
-				TRACKING_AREA_UPDATE_REQUEST_OLD_GUTI_TYPE_IEI,
-				buffer + decoded, len - decoded)) <= 0)
-                    return decoded_result;
+            case TRACKING_AREA_UPDATE_REQUEST_OLD_GUTI_TYPE_IEI:
+                if ((decoded_result =
+                     decode_guti_type(&tracking_area_update_request->oldgutitype,
+                                      TRACKING_AREA_UPDATE_REQUEST_OLD_GUTI_TYPE_IEI,
+                                      buffer + decoded, len - decoded)) <= 0)
+                        return decoded_result;
                 decoded += decoded_result;
                 /* Set corresponding mask to 1 in presencemask */
                 tracking_area_update_request->presencemask |= TRACKING_AREA_UPDATE_REQUEST_OLD_GUTI_TYPE_PRESENT;