diff --git a/runloop.h b/runloop.h
index fa5021333e..e4ea026d01 100644
--- a/runloop.h
+++ b/runloop.h
@@ -43,7 +43,6 @@ enum runloop_ctl_state
    RUNLOOP_CTL_IS_IDLE,
    RUNLOOP_CTL_SET_IDLE,
 
-
    RUNLOOP_CTL_GET_WINDOWED_SCALE,
    RUNLOOP_CTL_SET_WINDOWED_SCALE,
 
@@ -67,12 +66,10 @@ enum runloop_ctl_state
 
    RUNLOOP_CTL_IS_SLOWMOTION,
    RUNLOOP_CTL_SET_SLOWMOTION,
-
+   
    RUNLOOP_CTL_IS_PAUSED,
    RUNLOOP_CTL_SET_PAUSED,
    RUNLOOP_CTL_SET_MAX_FRAMES,
-   RUNLOOP_CTL_CLEAR_STATE,
-   RUNLOOP_CTL_STATE_FREE,
    RUNLOOP_CTL_GLOBAL_FREE,
 
    RUNLOOP_CTL_SET_CORE_SHUTDOWN,
@@ -87,23 +84,29 @@ enum runloop_ctl_state
    RUNLOOP_CTL_UNSET_EXEC,
    RUNLOOP_CTL_IS_EXEC,
 
+   /* Runloop state */
+   RUNLOOP_CTL_CLEAR_STATE,
+   RUNLOOP_CTL_STATE_FREE,
+
+   /* Performance counters */
    RUNLOOP_CTL_GET_PERFCNT,
    RUNLOOP_CTL_SET_PERFCNT_ENABLE,
    RUNLOOP_CTL_UNSET_PERFCNT_ENABLE,
    RUNLOOP_CTL_IS_PERFCNT_ENABLE,
 
+   /* Key event */
    RUNLOOP_CTL_FRONTEND_KEY_EVENT_GET,
    RUNLOOP_CTL_KEY_EVENT_GET,
    RUNLOOP_CTL_DATA_DEINIT,
 
-   /* Initializes message queue. */
+   /* Message queue */
    RUNLOOP_CTL_MSG_QUEUE_INIT,
-   /* Deinitializes message queue. */
    RUNLOOP_CTL_MSG_QUEUE_DEINIT,
    RUNLOOP_CTL_MSG_QUEUE_FREE,
    RUNLOOP_CTL_MSG_QUEUE_PULL,
    RUNLOOP_CTL_MSG_QUEUE_CLEAR,
 
+   /* Core options */
    RUNLOOP_CTL_HAS_CORE_OPTIONS,
    RUNLOOP_CTL_GET_CORE_OPTION_SIZE,
    RUNLOOP_CTL_IS_CORE_OPTION_UPDATED,
@@ -115,9 +118,11 @@ enum runloop_ctl_state
    RUNLOOP_CTL_CORE_OPTIONS_DEINIT,
    RUNLOOP_CTL_CORE_OPTIONS_FREE,
 
+   /* Shader dir */
    RUNLOOP_CTL_SHADER_DIR_DEINIT,
    RUNLOOP_CTL_SHADER_DIR_INIT,
 
+   /* System info */
    RUNLOOP_CTL_SYSTEM_INFO_GET,
    RUNLOOP_CTL_SYSTEM_INFO_INIT,
    RUNLOOP_CTL_SYSTEM_INFO_FREE