diff --git a/src/dev_io/dev_io_core.c b/src/dev_io/dev_io_core.c
index 3732f1e908c17c661909c1c35e51f92522c9150f..b0895b195954954b0d865a28e871eaea2a7d314b 100644
--- a/src/dev_io/dev_io_core.c
+++ b/src/dev_io/dev_io_core.c
@@ -529,6 +529,10 @@ err_zsock_is:
     return err;
 }
 
+/************************************************************/
+/********************** zloop handlers **********************/
+/************************************************************/
+
 /* zloop handler for timer */
 static int _devio_handle_timer (zloop_t *loop, int timer_id, void *arg)
 {
@@ -698,6 +702,10 @@ static int _devio_handle_pipe_backend (zloop_t *loop, zsock_t *reader, void *arg
     return 0;
 }
 
+/************************************************************/
+/*********************** API methods ************************/
+/************************************************************/
+
 /* Register an specific sm_io modules to this device */
 devio_err_e devio_register_sm (devio_t *self, uint32_t smio_id, uint64_t base,
         uint32_t inst_id)