diff --git a/scences/emulation.c b/scences/emulation.c
index 1fb2ad766cb..ad490d8a006 100644
--- a/scences/emulation.c
+++ b/scences/emulation.c
@@ -53,7 +53,7 @@ void nfc_playlist_emulation_stop(NfcPlaylist* nfc_playlist) {
 
 int32_t nfc_playlist_emulation_task(void* context) {
     NfcPlaylist* nfc_playlist = context;
-    // open/alloc resources
+
     Storage* storage = furi_record_open(RECORD_STORAGE);
     Stream* stream = file_stream_alloc(storage);
     FuriString* line = furi_string_alloc();
@@ -62,87 +62,81 @@ int32_t nfc_playlist_emulation_task(void* context) {
     popup_set_context(nfc_playlist->popup, nfc_playlist);
     view_dispatcher_switch_to_view(nfc_playlist->view_dispatcher, NfcPlaylistView_Popup);
 
-    // Read file
     if(file_stream_open(stream, furi_string_get_cstr(nfc_playlist->file_path), FSAM_READ, FSOM_OPEN_EXISTING)) {
         EmulationState = NfcPlaylistEmulationState_Emulating;
         int file_position = 0;
         while(stream_read_line(stream, line) && EmulationState == NfcPlaylistEmulationState_Emulating) {
-            if (strlen(furi_string_get_cstr(line)) > 1) {
-                if (options_emulate_delay[nfc_playlist->emulate_delay] > 0) {
-                    if (file_position > 0) {
-                        popup_set_header(nfc_playlist->popup, "Delaying", 64, 10, AlignCenter, AlignTop);
-                        start_blink(nfc_playlist, NfcPlaylistLedState_Error);
-                        int time_counter_delay_ms = (options_emulate_delay[nfc_playlist->emulate_delay] * 1000);
-                        do {
-                            char display_text[10];
-                            snprintf(display_text, 10, "%ds", (time_counter_delay_ms/1000));
-                            popup_set_text(nfc_playlist->popup, display_text, 64, 50, AlignCenter, AlignTop);
-                            furi_delay_ms(500);
-                            time_counter_delay_ms -= 500;
-                        } while(time_counter_delay_ms > 0 && EmulationState == NfcPlaylistEmulationState_Emulating);
-                    } else {
-                        file_position++;
-                    }
-                }
 
-                if (EmulationState != NfcPlaylistEmulationState_Emulating) {
-                    break;
-                }
+            char* file_path = (char*)furi_string_get_cstr(line);
 
-                char* file_path = (char*)furi_string_get_cstr(line);
-                char* file_name;
-                if (strchr(file_path, '/') != NULL) {
-                    file_name = &strrchr(file_path, '/')[1];
+            if (strlen(file_path) <= 1) {continue;}
+
+            if (nfc_playlist->emulate_delay > 0) {
+                if (file_position > 0) {
+                    popup_set_header(nfc_playlist->popup, "Delaying", 64, 10, AlignCenter, AlignTop);
+                    start_blink(nfc_playlist, NfcPlaylistLedState_Error);
+                    int time_counter_delay_ms = (options_emulate_delay[nfc_playlist->emulate_delay]*1000);
+                    do {
+                        char display_text[10];
+                        snprintf(display_text, 10, "%ds", (time_counter_delay_ms/1000));
+                        popup_set_text(nfc_playlist->popup, display_text, 64, 50, AlignCenter, AlignTop);
+                        furi_delay_ms(50);
+                        time_counter_delay_ms -= 50;
+                    } while(time_counter_delay_ms > 0 && EmulationState == NfcPlaylistEmulationState_Emulating);
                 } else {
-                    file_name = file_path;
+                    file_position++;
                 }
-                char const* file_ext = &strrchr(file_path, '.')[1];
-                int time_counter_ms = (options_emulate_timeout[nfc_playlist->emulate_timeout] * 1000);
+            }
 
-                if (storage_file_exists(storage, file_path) == false) {
-                    char popup_header_text[(18 + strlen(file_name))];
-                    snprintf(popup_header_text, (18 + strlen(file_name)), "%s\n%s", "ERROR not found:", file_name);
-                    popup_set_header(nfc_playlist->popup, popup_header_text, 64, 10, AlignCenter, AlignTop);
-                    start_blink(nfc_playlist, NfcPlaylistLedState_Error);
-                    while(time_counter_ms > 0 && EmulationState == NfcPlaylistEmulationState_Emulating) {
-                        char popup_text[9];
-                        snprintf(popup_text, 9, "%ds", (time_counter_ms/1000));
-                        popup_set_text(nfc_playlist->popup, popup_text, 64, 50, AlignCenter, AlignTop);
-                        furi_delay_ms(500);
-                        time_counter_ms -= 500;
-                    }
+            if (EmulationState != NfcPlaylistEmulationState_Emulating) {break;}
+
+            char* file_name = strchr(file_path, '/') != NULL ? &strrchr(file_path, '/')[1] : file_path;
+            char const* file_ext = &strrchr(file_path, '.')[1];
+            int time_counter_ms = (options_emulate_timeout[nfc_playlist->emulate_timeout]*1000);
+
+            if (storage_file_exists(storage, file_path) == false) {
+                char popup_header_text[(18 + strlen(file_name))];
+                snprintf(popup_header_text, (18 + strlen(file_name)), "%s\n%s", "ERROR not found:", file_name);
+                popup_set_header(nfc_playlist->popup, popup_header_text, 64, 10, AlignCenter, AlignTop);
+                start_blink(nfc_playlist, NfcPlaylistLedState_Error);
+                while(time_counter_ms > 0 && EmulationState == NfcPlaylistEmulationState_Emulating) {
+                    char popup_text[9];
+                    snprintf(popup_text, 9, "%ds", (time_counter_ms/1000));
+                    popup_set_text(nfc_playlist->popup, popup_text, 64, 50, AlignCenter, AlignTop);
+                    furi_delay_ms(50);
+                    time_counter_ms -= 50;
                 }
+            }
 
-                else if (strcasestr(file_ext, "nfc") == NULL) {
-                    char popup_header_text[(21 + strlen(file_name))];
-                    snprintf(popup_header_text, (21 + strlen(file_name)), "%s\n%s", "ERROR invalid file:", file_name);
-                    popup_set_header(nfc_playlist->popup, popup_header_text, 64, 10, AlignCenter, AlignTop);
-                    start_blink(nfc_playlist, NfcPlaylistLedState_Error);
-                    while(time_counter_ms > 0 && EmulationState == NfcPlaylistEmulationState_Emulating) {
-                        char popup_text[9];
-                        snprintf(popup_text, 9, "%ds", (time_counter_ms/1000));
-                        popup_set_text(nfc_playlist->popup, popup_text, 64, 50, AlignCenter, AlignTop);
-                        furi_delay_ms(500);
-                        time_counter_ms -= 500;
-                    }
+            else if (strcasestr(file_ext, "nfc") == NULL) {
+                char popup_header_text[(21 + strlen(file_name))];
+                snprintf(popup_header_text, (21 + strlen(file_name)), "%s\n%s", "ERROR invalid file:", file_name);
+                popup_set_header(nfc_playlist->popup, popup_header_text, 64, 10, AlignCenter, AlignTop);
+                start_blink(nfc_playlist, NfcPlaylistLedState_Error);
+                while(time_counter_ms > 0 && EmulationState == NfcPlaylistEmulationState_Emulating) {
+                    char popup_text[9];
+                    snprintf(popup_text, 9, "%ds", (time_counter_ms/1000));
+                    popup_set_text(nfc_playlist->popup, popup_text, 64, 50, AlignCenter, AlignTop);
+                    furi_delay_ms(50);
+                    time_counter_ms -= 50;
                 }
+            }
 
-                else {
-                    char popup_header_text[(12 + strlen(file_name))];
-                    snprintf(popup_header_text, (12 + strlen(file_name)), "%s\n%s", "Emulating:", file_name);
-                    popup_set_header(nfc_playlist->popup, popup_header_text, 64, 10, AlignCenter, AlignTop);
-                    nfc_playlist_worker_set_nfc_data(nfc_playlist->nfc_playlist_worker, file_path);
-                    nfc_playlist_worker_start(nfc_playlist->nfc_playlist_worker);
-                    start_blink(nfc_playlist, NfcPlaylistLedState_Normal);
-                    while(nfc_playlist_worker_is_emulating(nfc_playlist->nfc_playlist_worker) && time_counter_ms > 0 && EmulationState == NfcPlaylistEmulationState_Emulating) {
-                        char popup_text[9];
-                        snprintf(popup_text, 9, "%ds", (time_counter_ms/1000));
-                        popup_set_text(nfc_playlist->popup, popup_text, 64, 50, AlignCenter, AlignTop);
-                        furi_delay_ms(500);
-                        time_counter_ms -= 500;
-                    }
-                    nfc_playlist_worker_stop(nfc_playlist->nfc_playlist_worker);
+            else {
+                char popup_header_text[(12 + strlen(file_name))];
+                snprintf(popup_header_text, (12 + strlen(file_name)), "%s\n%s", "Emulating:", file_name);
+                popup_set_header(nfc_playlist->popup, popup_header_text, 64, 10, AlignCenter, AlignTop);
+                nfc_playlist_worker_set_nfc_data(nfc_playlist->nfc_playlist_worker, file_path);
+                nfc_playlist_worker_start(nfc_playlist->nfc_playlist_worker);
+                start_blink(nfc_playlist, NfcPlaylistLedState_Normal);
+                while(nfc_playlist_worker_is_emulating(nfc_playlist->nfc_playlist_worker) && time_counter_ms > 0 && EmulationState == NfcPlaylistEmulationState_Emulating) {
+                    char popup_text[9];
+                    snprintf(popup_text, 9, "%ds", (time_counter_ms/1000));
+                    popup_set_text(nfc_playlist->popup, popup_text, 64, 50, AlignCenter, AlignTop);
+                    furi_delay_ms(50);
+                    time_counter_ms -= 50;
                 }
+                nfc_playlist_worker_stop(nfc_playlist->nfc_playlist_worker);
             }
         }
         popup_reset(nfc_playlist->popup);
@@ -154,10 +148,10 @@ int32_t nfc_playlist_emulation_task(void* context) {
         popup_set_header(nfc_playlist->popup, "Failed to open playlist", 64, 10, AlignCenter, AlignTop);
         popup_set_text(nfc_playlist->popup, "Press back", 64, 50, AlignCenter, AlignTop);
     }
-    // Free/close resources
+
     furi_string_free(line);
     file_stream_close(stream);
     stream_free(stream);
-    // Close storage
+
     return 0;
 }
\ No newline at end of file
diff --git a/scences/main_menu.c b/scences/main_menu.c
index 0e661de3cc2..8ef64074320 100644
--- a/scences/main_menu.c
+++ b/scences/main_menu.c
@@ -32,7 +32,6 @@ void nfc_playlist_main_menu_menu_callback(void* context, uint32_t index) {
 
 void nfc_playlist_main_menu_scene_on_enter(void* context) {
     NfcPlaylist* nfc_playlist = context;
-
     if (!nfc_playlist->file_selected) {
         nfc_playlist->file_selected = true;
         scene_manager_next_scene(nfc_playlist->scene_manager, NfcPlaylistScene_FileSelect);
diff --git a/scences/settings.c b/scences/settings.c
index 02792f32639..fb99383b611 100644
--- a/scences/settings.c
+++ b/scences/settings.c
@@ -64,6 +64,7 @@ void nfc_playlist_settings_options_change_callback(VariableItem* item) {
 
 void nfc_playlist_settings_scene_on_enter(void* context) {
     NfcPlaylist* nfc_playlist = context;
+
     variable_item_list_set_header(nfc_playlist->variable_item_list, "Settings");
 
     VariableItem* emulation_timeout_settings = variable_item_list_add(
@@ -100,6 +101,7 @@ void nfc_playlist_settings_scene_on_enter(void* context) {
     variable_item_list_add(nfc_playlist->variable_item_list, "Reset settings", 0, NULL, NULL);
 
     variable_item_list_set_enter_callback(nfc_playlist->variable_item_list, nfc_playlist_settings_menu_callback, nfc_playlist);
+
     view_dispatcher_switch_to_view(nfc_playlist->view_dispatcher, NfcPlaylistView_Settings);
 }