diff --git a/openair-cn/NAS/EURECOM-NAS/src/esm/esm_ebr_context.c b/openair-cn/NAS/EURECOM-NAS/src/esm/esm_ebr_context.c
index 78be8e035f87b32f1fb92574a002142dd44525a3..9b19a3d1b1426dc71f8d3eedd3bfe7052b369fd4 100644
--- a/openair-cn/NAS/EURECOM-NAS/src/esm/esm_ebr_context.c
+++ b/openair-cn/NAS/EURECOM-NAS/src/esm/esm_ebr_context.c
@@ -84,11 +84,10 @@ int esm_ebr_context_create(
     int pid, int ebi, int is_default,
     const network_qos_t *qos, const network_tft_t *tft)
 {
-    int bid;
-    esm_data_context_t *esm_ctx;
-    esm_pdn_t *pdn = NULL;
-
-    unsigned int ueid = 0;
+    int                 bid     = 0;
+    esm_data_context_t *esm_ctx = NULL;
+    esm_pdn_t          *pdn     = NULL;
+    unsigned int        ueid    = 0;
 
     LOG_FUNC_IN;