diff --git a/managers/cheat_manager.c b/managers/cheat_manager.c
index b984b39c90..518fef554c 100644
--- a/managers/cheat_manager.c
+++ b/managers/cheat_manager.c
@@ -489,20 +489,18 @@ void cheat_manager_update(cheat_manager_t *handle, unsigned handle_idx)
 
 void cheat_manager_toggle_index(unsigned i)
 {
+   settings_t *settings                     = config_get_ptr();
    if (!cheat_manager_state.cheats)
       return;
 
    cheat_manager_state.cheats[i].state = !cheat_manager_state.cheats[i].state;
    cheat_manager_update(&cheat_manager_state, i);
 
-   settings_t *settings                     = config_get_ptr();
-
-   if ( !settings )
+   if (!settings)
       return ;
 
-   if ( settings->bools.apply_cheats_after_toggle )
+   if (settings->bools.apply_cheats_after_toggle)
       cheat_manager_apply_cheats();
-
 }
 
 void cheat_manager_toggle(void)
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index 34ceff2a7f..6541c96ec4 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -516,15 +516,15 @@ static void setting_get_string_representation_uint_cheat_eqminus(void *data,
 static void setting_get_string_representation_uint_cheat_browse_address(void *data,
       char *s, size_t len)
 {
-   rarch_setting_t *setting = (rarch_setting_t*)data;
+   unsigned int address      = cheat_manager_state.browse_address;
+   unsigned int address_mask = 0;
+   unsigned int prev_val     = 0;
+   unsigned int curr_val     = 0 ;
+   rarch_setting_t *setting  = (rarch_setting_t*)data;
    if (setting)
       snprintf(s, len, msg_hash_to_str(MENU_ENUM_LABEL_CHEAT_SEARCH_EQMINUS_VAL),
             *setting->value.target.unsigned_integer, *setting->value.target.unsigned_integer);
 
-   unsigned int address = cheat_manager_state.browse_address;
-   unsigned int address_mask = 0;
-   unsigned int prev_val = 0;
-   unsigned int curr_val = 0 ;
    cheat_manager_match_action(CHEAT_MATCH_ACTION_TYPE_BROWSE, cheat_manager_state.match_idx, &address, &address_mask, &prev_val, &curr_val) ;
 
    snprintf(s, len, "Prev: %u Curr: %u", prev_val, curr_val) ;