diff --git a/lib/app/ogs-context.c b/lib/app/ogs-context.c
index 36aa1087c..24b4d900a 100644
--- a/lib/app/ogs-context.c
+++ b/lib/app/ogs-context.c
@@ -350,7 +350,8 @@ int ogs_app_context_parse_config(void)
                 } else if (!strcmp(parameter_key, "no_pfcp_rr_select")) {
                     self.parameter.no_pfcp_rr_select =
                         ogs_yaml_iter_bool(&parameter_iter);
-                } else if (!strcmp(parameter_key, "use_mongodb_change_stream")) {
+                } else if (!strcmp(parameter_key,
+                            "use_mongodb_change_stream")) {
                     self.use_mongodb_change_stream = 
                         ogs_yaml_iter_bool(&parameter_iter);
                 } else
diff --git a/lib/dbi/ogs-mongoc.c b/lib/dbi/ogs-mongoc.c
index 467b2a116..b533ed182 100644
--- a/lib/dbi/ogs-mongoc.c
+++ b/lib/dbi/ogs-mongoc.c
@@ -189,7 +189,8 @@ void ogs_dbi_final()
     ogs_mongoc_final();
 }
 
-int ogs_dbi_collection_watch_init(void) {
+int ogs_dbi_collection_watch_init(void)
+{
     bson_t empty = BSON_INITIALIZER;    
     const bson_t *err_doc;
     bson_error_t error;
@@ -214,7 +215,8 @@ int ogs_dbi_collection_watch_init(void) {
     return OGS_OK;
 }
 
-int ogs_dbi_poll_change_stream(void) {
+int ogs_dbi_poll_change_stream(void)
+{
     int rv;
     
     const bson_t *document;
diff --git a/lib/dbi/path.c b/lib/dbi/path.c
index 256435c09..c15c0f0e7 100644
--- a/lib/dbi/path.c
+++ b/lib/dbi/path.c
@@ -19,7 +19,8 @@
 
 #include "ogs-dbi.h"
 
-int ogs_dbi_process_change_stream(const bson_t *document) {
+int ogs_dbi_process_change_stream(const bson_t *document)
+{
     int rv;
 
     ogs_event_t *e = NULL;
@@ -37,4 +38,4 @@ int ogs_dbi_process_change_stream(const bson_t *document) {
     }
 
     return OGS_OK;
-}
\ No newline at end of file
+}
diff --git a/lib/proto/timer.c b/lib/proto/timer.c
index 7ded98a1e..70e74831d 100644
--- a/lib/proto/timer.c
+++ b/lib/proto/timer.c
@@ -31,8 +31,6 @@ const char *OGS_TIMER_NAME_SUBSCRIPTION_VALIDITY =
     "OGS_TIMER_SUBSCRIPTION_VALIDITY";
 const char *OGS_TIMER_NAME_SBI_CLIENT_WAIT =
     "OGS_TIMER_SBI_CLIENT_WAIT";
-const char *OGS_TIMER_NAME_DBI_POLL_CHANGE_STREAM =
-    "OGS_TIMER_DBI_POLL_CHANGE_STREAM";
 
 const char *ogs_timer_get_name(int timer_id)
 {
@@ -50,7 +48,7 @@ const char *ogs_timer_get_name(int timer_id)
     case OGS_TIMER_SBI_CLIENT_WAIT:
         return OGS_TIMER_NAME_SBI_CLIENT_WAIT;
     case OGS_TIMER_DBI_POLL_CHANGE_STREAM:
-        return OGS_TIMER_NAME_DBI_POLL_CHANGE_STREAM;
+        return "OGS_TIMER_DBI_POLL_CHANGE_STREAM";
     default: 
        break;
     }
diff --git a/src/hss/hss-context.c b/src/hss/hss-context.c
index 473761ec3..f11430112 100644
--- a/src/hss/hss-context.c
+++ b/src/hss/hss-context.c
@@ -1175,7 +1175,8 @@ char *hss_cx_download_user_data(
     return user_data;
 }
 
-int hss_db_poll_change_stream(void) {
+int hss_db_poll_change_stream(void)
+{
     int rv;
 
     ogs_thread_mutex_lock(&self.db_lock);
@@ -1187,7 +1188,8 @@ int hss_db_poll_change_stream(void) {
     return rv;
 }
 
-int hss_handle_change_event(const bson_t *document) {
+int hss_handle_change_event(const bson_t *document)
+{
     bson_iter_t iter, child1_iter, child2_iter, child3_iter;
 
     char *utf8 = NULL;
diff --git a/src/hss/hss-sm.c b/src/hss/hss-sm.c
index 63c857afc..60ce6d4ea 100644
--- a/src/hss/hss-sm.c
+++ b/src/hss/hss-sm.c
@@ -21,6 +21,8 @@
 #include "hss-context.h"
 #include "hss-event.h"
 
+#define DB_POLLING_TIME ogs_time_from_msec(100)
+
 static ogs_timer_t *t_db_polling = NULL;
 
 void hss_state_initial(ogs_fsm_t *s, ogs_event_t *e)
diff --git a/src/hss/hss-sm.h b/src/hss/hss-sm.h
index ec096ce00..ce18d30fa 100644
--- a/src/hss/hss-sm.h
+++ b/src/hss/hss-sm.h
@@ -27,8 +27,6 @@
 extern "C" {
 #endif
 
-#define DB_POLLING_TIME ogs_time_from_msec(100)
-
 void hss_state_initial(ogs_fsm_t *s, ogs_event_t *e);
 void hss_state_final(ogs_fsm_t *s, ogs_event_t *e);
 void hss_state_operational(ogs_fsm_t *s, ogs_event_t *e);