diff --git a/retroarch.h b/retroarch.h
index 0ce529bd78..21b951d2dc 100644
--- a/retroarch.h
+++ b/retroarch.h
@@ -77,37 +77,34 @@ enum rarch_ctl_state
 
    RARCH_CTL_DESTROY,
 
+   /* Menu running? */
    RARCH_CTL_MENU_RUNNING,
-
    RARCH_CTL_MENU_RUNNING_FINISHED,
 
    RARCH_CTL_SET_PATHS_REDIRECT,
 
    RARCH_CTL_SET_SRAM_ENABLE,
 
+   /* Force fullscreen */
    RARCH_CTL_SET_FORCE_FULLSCREEN,
-
    RARCH_CTL_UNSET_FORCE_FULLSCREEN,
-
    RARCH_CTL_IS_FORCE_FULLSCREEN,
 
+   /* Block config read */
    RARCH_CTL_SET_BLOCK_CONFIG_READ,
-
    RARCH_CTL_UNSET_BLOCK_CONFIG_READ,
-
    RARCH_CTL_IS_BLOCK_CONFIG_READ,
 
+   /* Error */
    RARCH_CTL_SET_ERROR_ON_INIT,
-
    RARCH_CTL_UNSET_ERROR_ON_INIT,
+   RARCH_CTL_IS_ERROR_ON_INIT,
 
+   /* Username */
    RARCH_CTL_HAS_SET_USERNAME,
-
    RARCH_CTL_USERNAME_SET,
+   RARCH_CTL_USERNAME_UNSET
 
-   RARCH_CTL_USERNAME_UNSET,
-
-   RARCH_CTL_IS_ERROR_ON_INIT
 };
 
 enum rarch_content_type