diff --git a/MapControl/Shared/MapBase.MapLayer.cs b/MapControl/Shared/MapBase.MapLayer.cs
index 70115306..7a2da4fc 100644
--- a/MapControl/Shared/MapBase.MapLayer.cs
+++ b/MapControl/Shared/MapBase.MapLayer.cs
@@ -238,23 +238,20 @@ namespace MapControl
                 element = (FrameworkElement)template.LoadContent();
             }
 #endif
-            if (element != null)
-            {
-                element.DataContext = layer;
-            }
+            element?.DataContext = layer;
 
             return element;
         }
 
 #if UWP || WINUI
-            private static object TryFindResource(FrameworkElement element, object key)
-            {
-                return element.Resources.ContainsKey(key)
-                    ? element.Resources[key]
-                    : element.Parent is FrameworkElement parent
-                    ? TryFindResource(parent, key)
-                    : null;
-            }
+        private static object TryFindResource(FrameworkElement element, object key)
+        {
+            return element.Resources.ContainsKey(key)
+                ? element.Resources[key]
+                : element.Parent is FrameworkElement parent
+                ? TryFindResource(parent, key)
+                : null;
+        }
 #endif
     }
 }
diff --git a/MapControl/Shared/UIElementExtension.cs b/MapControl/Shared/UIElementExtension.cs
index 2ee6f5b3..490a4881 100644
--- a/MapControl/Shared/UIElementExtension.cs
+++ b/MapControl/Shared/UIElementExtension.cs
@@ -1,9 +1,4 @@
-#if AVALONIA
-global using UIElement = Avalonia.Controls.Control;
-global using FrameworkElement = Avalonia.Controls.Control;
-using Avalonia;
-using Avalonia.Media;
-#elif WPF
+#if WPF
 using System.Windows;
 using System.Windows.Media;
 #elif UWP
@@ -12,6 +7,11 @@ using Windows.UI.Xaml.Media;
 #elif WINUI
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Media;
+#elif AVALONIA
+global using UIElement = Avalonia.Controls.Control;
+global using FrameworkElement = Avalonia.Controls.Control;
+using Avalonia;
+using Avalonia.Media;
 #endif
 
 namespace MapControl