diff --git a/managers/cheat_manager.c b/managers/cheat_manager.c
index 4121eab91f..2ab0e34e0b 100644
--- a/managers/cheat_manager.c
+++ b/managers/cheat_manager.c
@@ -937,65 +937,20 @@ static void cheat_manager_setup_search_meta(unsigned int bitsize, unsigned int *
    }
 }
 
-int cheat_manager_search_exact(rarch_setting_t *setting, bool wraparound)
-{
-   return cheat_manager_search(CHEAT_SEARCH_TYPE_EXACT);
-}
-
-int cheat_manager_search_lt(rarch_setting_t *setting, bool wraparound)
-{
-   return cheat_manager_search(CHEAT_SEARCH_TYPE_LT);
-}
-
-int cheat_manager_search_gt(rarch_setting_t *setting, bool wraparound)
-{
-   return cheat_manager_search(CHEAT_SEARCH_TYPE_GT);
-}
-
-int cheat_manager_search_lte(rarch_setting_t *setting, bool wraparound)
-{
-   return cheat_manager_search(CHEAT_SEARCH_TYPE_LTE);
-}
-
-int cheat_manager_search_gte(rarch_setting_t *setting, bool wraparound)
-{
-   return cheat_manager_search(CHEAT_SEARCH_TYPE_GTE);
-}
-
-int cheat_manager_search_eq(rarch_setting_t *setting, bool wraparound)
-{
-   return cheat_manager_search(CHEAT_SEARCH_TYPE_EQ);
-}
-
-int cheat_manager_search_neq(rarch_setting_t *setting, bool wraparound)
-{
-   return cheat_manager_search(CHEAT_SEARCH_TYPE_NEQ);
-}
-
-int cheat_manager_search_eqplus(rarch_setting_t *setting, bool wraparound)
-{
-   return cheat_manager_search(CHEAT_SEARCH_TYPE_EQPLUS);
-}
-
-int cheat_manager_search_eqminus(rarch_setting_t *setting, bool wraparound)
-{
-   return cheat_manager_search(CHEAT_SEARCH_TYPE_EQMINUS);
-}
-
-int cheat_manager_search(enum cheat_search_type search_type)
+static int cheat_manager_search(enum cheat_search_type search_type)
 {
    char msg[100];
-   unsigned char *curr = cheat_manager_state.curr_memory_buf;
-   unsigned char *prev = cheat_manager_state.prev_memory_buf;
-   unsigned int idx = 0;
-   unsigned int curr_val = 0;
-   unsigned int prev_val = 0;
-   unsigned int mask = 0;
+   unsigned char *curr         = cheat_manager_state.curr_memory_buf;
+   unsigned char *prev         = cheat_manager_state.prev_memory_buf;
+   unsigned int idx            = 0;
+   unsigned int curr_val       = 0;
+   unsigned int prev_val       = 0;
+   unsigned int mask           = 0;
    unsigned int bytes_per_item = 1;
-   unsigned int bits = 8;
-   unsigned int offset = 0;
-   unsigned int i = 0;
-   bool refresh = false;
+   unsigned int bits           = 8;
+   unsigned int offset         = 0;
+   unsigned int i              = 0;
+   bool refresh                = false;
 
    if (cheat_manager_state.num_memory_buffers == 0)
    {
@@ -1116,6 +1071,52 @@ int cheat_manager_search(enum cheat_search_type search_type)
    return 0;
 }
 
+
+int cheat_manager_search_exact(rarch_setting_t *setting, bool wraparound)
+{
+   return cheat_manager_search(CHEAT_SEARCH_TYPE_EXACT);
+}
+
+int cheat_manager_search_lt(rarch_setting_t *setting, bool wraparound)
+{
+   return cheat_manager_search(CHEAT_SEARCH_TYPE_LT);
+}
+
+int cheat_manager_search_gt(rarch_setting_t *setting, bool wraparound)
+{
+   return cheat_manager_search(CHEAT_SEARCH_TYPE_GT);
+}
+
+int cheat_manager_search_lte(rarch_setting_t *setting, bool wraparound)
+{
+   return cheat_manager_search(CHEAT_SEARCH_TYPE_LTE);
+}
+
+int cheat_manager_search_gte(rarch_setting_t *setting, bool wraparound)
+{
+   return cheat_manager_search(CHEAT_SEARCH_TYPE_GTE);
+}
+
+int cheat_manager_search_eq(rarch_setting_t *setting, bool wraparound)
+{
+   return cheat_manager_search(CHEAT_SEARCH_TYPE_EQ);
+}
+
+int cheat_manager_search_neq(rarch_setting_t *setting, bool wraparound)
+{
+   return cheat_manager_search(CHEAT_SEARCH_TYPE_NEQ);
+}
+
+int cheat_manager_search_eqplus(rarch_setting_t *setting, bool wraparound)
+{
+   return cheat_manager_search(CHEAT_SEARCH_TYPE_EQPLUS);
+}
+
+int cheat_manager_search_eqminus(rarch_setting_t *setting, bool wraparound)
+{
+   return cheat_manager_search(CHEAT_SEARCH_TYPE_EQMINUS);
+}
+
 bool cheat_manager_add_new_code(unsigned int memory_search_size, unsigned int address, unsigned int address_mask,
       bool big_endian, unsigned int value)
 {
diff --git a/managers/cheat_manager.h b/managers/cheat_manager.h
index b0b73275c1..f2f08cd895 100644
--- a/managers/cheat_manager.h
+++ b/managers/cheat_manager.h
@@ -200,7 +200,8 @@ bool cheat_manager_load(const char *path, bool append);
  *
  * Returns: true (1) if successful, otherwise false (0).
  **/
-bool cheat_manager_save(const char *path, const char *cheat_database, bool overwrite);
+bool cheat_manager_save(const char *path,
+      const char *cheat_database, bool overwrite);
 
 bool cheat_manager_realloc(unsigned new_size, unsigned default_handler);
 
@@ -265,14 +266,16 @@ int cheat_manager_add_matches(const char *path,
 
 void cheat_manager_apply_retro_cheats(void);
 
-int cheat_manager_search(enum cheat_search_type search_type);
-
-void cheat_manager_match_action(enum cheat_match_action_type match_action, unsigned int target_match_idx, unsigned int *address, unsigned int *address_mask,
+void cheat_manager_match_action(
+      enum cheat_match_action_type match_action,
+      unsigned int target_match_idx,
+      unsigned int *address, unsigned int *address_mask,
       unsigned int *prev_value, unsigned int *curr_value);
 
 int cheat_manager_copy_match(rarch_setting_t *setting, bool wraparound);
 
 int cheat_manager_delete_match(rarch_setting_t *setting, bool wraparound);
+
 RETRO_END_DECLS
 
 #endif