diff --git a/lib/features/extensions/extension_stats_view.dart b/lib/features/extensions/extension_stats_view.dart
index f7788a5..5b0cb1e 100644
--- a/lib/features/extensions/extension_stats_view.dart
+++ b/lib/features/extensions/extension_stats_view.dart
@@ -316,7 +316,9 @@ class _ExtensionStatsViewState extends material.State<ExtensionStatsView> {
             mainAxisSpacing: 16,
             mainAxisExtent: _summaryChipHeight,
           ),
-          children: chips.map((c) => _buildChip(cs, c)).toList(),
+          children: [
+            for (final c in chips) _buildChip(cs, c),
+          ],
         );
       },
     );
diff --git a/lib/features/mongodb/mongo_stats_view.dart b/lib/features/mongodb/mongo_stats_view.dart
index cce26a9..a19f14d 100644
--- a/lib/features/mongodb/mongo_stats_view.dart
+++ b/lib/features/mongodb/mongo_stats_view.dart
@@ -690,7 +690,7 @@ class _MongoStatsViewState extends material.State<MongoStatsView> {
       title,
       _twoColumnMetrics(
         context,
-        data.entries.map((e) => MapEntry(e.key, e.value)).toList(),
+        [ for (final e in data.entries) MapEntry(e.key, e.value) ],
       ),
     );
   }
diff --git a/lib/features/redis/redis_view.dart b/lib/features/redis/redis_view.dart
index 4ffa5d0..db9096d 100644
--- a/lib/features/redis/redis_view.dart
+++ b/lib/features/redis/redis_view.dart
@@ -680,11 +680,10 @@ class _RedisViewState extends material.State<RedisView> {
       {List<String>? keys}) {
     if (data == null || data.isEmpty) return const material.SizedBox.shrink();
     final entries = keys != null
-        ? keys
-            .map((k) => MapEntry(k, data[k]))
-            .where((e) => e.value != null)
-            .map((e) => MapEntry(e.key, e.value as String))
-            .toList()
+        ? <MapEntry<String, String>>[
+            for (final k in keys)
+              if (data[k] != null) MapEntry(k, data[k]!),
+          ]
         : data.entries.toList();
     if (entries.isEmpty) return const material.SizedBox.shrink();
     return _card(
@@ -692,7 +691,7 @@ class _RedisViewState extends material.State<RedisView> {
       title,
       _twoColumnMetrics(
         context,
-        entries.map((e) => MapEntry(_labelFor(e.key), e.value)).toList(),
+        [ for (final e in entries) MapEntry(_labelFor(e.key), e.value) ],
       ),
     );
   }
diff --git a/lib/shared/widgets/querya_dropdown.dart b/lib/shared/widgets/querya_dropdown.dart
index e47b127..4aef0e9 100644
--- a/lib/shared/widgets/querya_dropdown.dart
+++ b/lib/shared/widgets/querya_dropdown.dart
@@ -119,8 +119,9 @@ class _QueryaDropdownState<T> extends material.State<QueryaDropdown<T>> {
     }
     _cachedMenuItems = List<QueryaDropdownItem<T>>.from(widget.items);
     _cachedMenuValue = widget.value;
-    _cachedMenuChildren =
-        widget.items.map((item) => _menuItem(item, cs)).toList();
+    _cachedMenuChildren = [
+      for (final item in widget.items) _menuItem(item, cs),
+    ];
     return _cachedMenuChildren!;
   }