diff --git a/applications/main/nfc/plugins/supported_cards/umarsh.c b/applications/main/nfc/plugins/supported_cards/umarsh.c
index a85c056f..bf643d21 100644
--- a/applications/main/nfc/plugins/supported_cards/umarsh.c
+++ b/applications/main/nfc/plugins/supported_cards/umarsh.c
@@ -32,8 +32,7 @@
 #include <nfc/nfc_device.h>
 #include <nfc/helpers/nfc_util.h>
 #include <nfc/protocols/mf_classic/mf_classic_poller_sync.h>
-#include <stdbool.h>
-#include <stdint.h>
+
 #include <furi_hal_rtc.h>
 
 #define TAG "Umarsh"
diff --git a/applications/main/nfc/plugins/supported_cards/washcity.c b/applications/main/nfc/plugins/supported_cards/washcity.c
index a0edeef6..c90c8abb 100644
--- a/applications/main/nfc/plugins/supported_cards/washcity.c
+++ b/applications/main/nfc/plugins/supported_cards/washcity.c
@@ -26,7 +26,6 @@
 #include <nfc/nfc_device.h>
 #include <nfc/helpers/nfc_util.h>
 #include <nfc/protocols/mf_classic/mf_classic_poller_sync.h>
-#include <stdint.h>
 
 #define TAG "WashCity"
 
@@ -158,18 +157,12 @@ static bool washcity_parse(const NfcDevice* device, FuriString* parsed_data) {
         const uint8_t* uid = mf_classic_get_uid(data, &uid_len);
 
         // Card Number is printed in HEX (equal to UID)
-        char card_number[2 * uid_len + 1];
-
-        for(size_t i = 0; i < uid_len; ++i) {
-            card_number[2 * i] = "0123456789ABCDEF"[uid[i] >> 4];
-            card_number[2 * i + 1] = "0123456789ABCDEF"[uid[i] & 0xF];
-        }
-
-        card_number[2 * uid_len] = '\0';
+        uint64_t card_number = nfc_util_bytes2num(uid, uid_len);
 
         furi_string_printf(
             parsed_data,
-            "\e#WashCity\nCard number: %s\nBalance: %lu.%02u EUR",
+            "\e#WashCity\nCard number: %0*llX\nBalance: %lu.%02u EUR",
+            uid_len * 2,
             card_number,
             balance_eur,
             balance_cents);