diff --git a/src/common/3gpp_29.571.h b/src/common/3gpp_29.571.h
index dcdf0a2b19e19bc9470af7d2ef0bf57617dc42d3..7668a1a75b0cc81f21eeb6c24c1e6a6d03b7e1aa 100644
--- a/src/common/3gpp_29.571.h
+++ b/src/common/3gpp_29.571.h
@@ -29,8 +29,8 @@
 
 enum access_type_e { ACESS_3GPP = 1, ACESS_NON_3GPP = 2 };
 
-static const std::vector<std::string> access_type_e2str = {"3GPP_ACCESS",
-                                                           "NON_3GPP_ACCESS"};
+static const std::vector<std::string> access_type_e2str = {
+    "3GPP_ACCESS", "NON_3GPP_ACCESS"};
 
 typedef struct sd_range_s {
   std::string start;
diff --git a/src/common/common_defs.h b/src/common/common_defs.h
index d76ad87f2c4b2dc0872e0f6013f558928377dbd3..6e0f8c5ab2654f6d6cbf4b6829246a51d160c9fa 100644
--- a/src/common/common_defs.h
+++ b/src/common/common_defs.h
@@ -44,9 +44,9 @@
   } while (0)
 
 #define NIPADDR(addr)                                                          \
-  (uint8_t)(addr & 0x000000FF), (uint8_t)((addr & 0x0000FF00) >> 8),           \
-      (uint8_t)((addr & 0x00FF0000) >> 16),                                    \
-      (uint8_t)((addr & 0xFF000000) >> 24)
+  (uint8_t)(addr & 0x000000FF), (uint8_t) ((addr & 0x0000FF00) >> 8),          \
+      (uint8_t) ((addr & 0x00FF0000) >> 16),                                   \
+      (uint8_t) ((addr & 0xFF000000) >> 24)
 
 #ifndef UNUSED
 #define UNUSED(x) (void) (x)
diff --git a/src/common/utils/conversions.hpp b/src/common/utils/conversions.hpp
index 75589bb4b760d1d570732cd1c58df15cd7476615..e35e9d64dd58822e404798389c47b2b45128bee0 100644
--- a/src/common/utils/conversions.hpp
+++ b/src/common/utils/conversions.hpp
@@ -36,9 +36,9 @@
 #define IN_ADDR_FMT "%u.%u.%u.%u"
 #define PRI_IN_ADDR(aDDRESS)                                                   \
   (uint8_t)((aDDRESS.s_addr) & 0x000000ff),                                    \
-      (uint8_t)(((aDDRESS.s_addr) & 0x0000ff00) >> 8),                         \
-      (uint8_t)(((aDDRESS.s_addr) & 0x00ff0000) >> 16),                        \
-      (uint8_t)(((aDDRESS.s_addr) & 0xff000000) >> 24)
+      (uint8_t) (((aDDRESS.s_addr) & 0x0000ff00) >> 8),                        \
+      (uint8_t) (((aDDRESS.s_addr) & 0x00ff0000) >> 16),                       \
+      (uint8_t) (((aDDRESS.s_addr) & 0xff000000) >> 24)
 
 #define IPV4_ADDR_DISPLAY_8(aDDRESS)                                           \
   (aDDRESS)[0], (aDDRESS)[1], (aDDRESS)[2], (aDDRESS)[3]
diff --git a/src/pcf_app/pcf_config.cpp b/src/pcf_app/pcf_config.cpp
index 02e78b7c64080f78a802e5100d9a8110d85bf26a..433317605186c260d8ba1fe9d65fc81ff743f234 100644
--- a/src/pcf_app/pcf_config.cpp
+++ b/src/pcf_app/pcf_config.cpp
@@ -33,8 +33,8 @@ oai::config::pcf::pcf_config::pcf_config(
     const std::string& config_path, bool log_stdout, bool log_rot_file)
     : config(
           config_path, oai::config::PCF_CONFIG_NAME, log_stdout, log_rot_file) {
-  m_used_sbi_values    = {oai::config::PCF_CONFIG_NAME,
-                       oai::config::NRF_CONFIG_NAME};
+  m_used_sbi_values = {
+      oai::config::PCF_CONFIG_NAME, oai::config::NRF_CONFIG_NAME};
   m_used_config_values = {
       oai::config::LOG_LEVEL_CONFIG_NAME, oai::config::REGISTER_NF_CONFIG_NAME,
       oai::config::NF_LIST_CONFIG_NAME, oai::config::PCF_CONFIG_NAME,