diff --git a/RGB.NET.Core/Devices/AbstractRGBDevice.cs b/RGB.NET.Core/Devices/AbstractRGBDevice.cs
index 07663f3..311c468 100644
--- a/RGB.NET.Core/Devices/AbstractRGBDevice.cs
+++ b/RGB.NET.Core/Devices/AbstractRGBDevice.cs
@@ -43,7 +43,7 @@ public abstract class AbstractRGBDevice<TDeviceInfo> : Placeable, IRGBDevice<TDe
     IRGBDeviceInfo IRGBDevice.DeviceInfo => DeviceInfo;
 
     /// <inheritdoc />
-    public IList<IColorCorrection> ColorCorrections { get; } = new List<IColorCorrection>();
+    public IList<IColorCorrection> ColorCorrections { get; } = [];
 
     /// <summary>
     /// Gets or sets if the device needs to be flushed on every update.
@@ -63,7 +63,7 @@ public abstract class AbstractRGBDevice<TDeviceInfo> : Placeable, IRGBDevice<TDe
     #region Indexer
 
     /// <inheritdoc />
-    Led? IRGBDevice.this[LedId ledId] => LedMapping.TryGetValue(ledId, out Led? led) ? led : null;
+    Led? IRGBDevice.this[LedId ledId] => LedMapping.GetValueOrDefault(ledId);
 
     /// <inheritdoc />
     Led? IRGBDevice.this[Point location] => LedMapping.Values.FirstOrDefault(x => x.Boundary.Contains(location));
diff --git a/RGB.NET.Core/Groups/ListLedGroup.cs b/RGB.NET.Core/Groups/ListLedGroup.cs
index 4bca2fb..511cdad 100644
--- a/RGB.NET.Core/Groups/ListLedGroup.cs
+++ b/RGB.NET.Core/Groups/ListLedGroup.cs
@@ -20,7 +20,7 @@ public sealed class ListLedGroup : AbstractLedGroup
     /// <summary>
     /// Gets the list containing the <see cref="Led"/> of this <see cref="ListLedGroup"/>.
     /// </summary>
-    private readonly IList<Led> _groupLeds = new List<Led>();
+    private readonly IList<Led> _groupLeds = [];
 
     #endregion
 
@@ -142,7 +142,7 @@ public sealed class ListLedGroup : AbstractLedGroup
     public override IList<Led> ToList()
     {
         lock (_groupLeds)
-            return new List<Led>(_groupLeds);
+            return [.._groupLeds];
     }
 
     protected override IDisposable ToListUnsafe(out IList<Led> leds)
diff --git a/RGB.NET.Core/RGBSurface.cs b/RGB.NET.Core/RGBSurface.cs
index 5c3387f..2de9c13 100644
--- a/RGB.NET.Core/RGBSurface.cs
+++ b/RGB.NET.Core/RGBSurface.cs
@@ -20,8 +20,8 @@ public sealed class RGBSurface : AbstractBindable, IDisposable
 
     private readonly Stopwatch _deltaTimeCounter;
 
-    private readonly IList<IRGBDevice> _devices = new List<IRGBDevice>();
-    private readonly IList<IUpdateTrigger> _updateTriggers = new List<IUpdateTrigger>();
+    private readonly IList<IRGBDevice> _devices = [];
+    private readonly IList<IUpdateTrigger> _updateTriggers = [];
     private readonly List<ILedGroup> _ledGroups = [];
 
     /// <summary>
diff --git a/RGB.NET.Core/Update/CustomUpdateData.cs b/RGB.NET.Core/Update/CustomUpdateData.cs
index 0d85aa7..bce97f3 100644
--- a/RGB.NET.Core/Update/CustomUpdateData.cs
+++ b/RGB.NET.Core/Update/CustomUpdateData.cs
@@ -68,7 +68,7 @@ public sealed class CustomUpdateData : ICustomUpdateData
     /// <returns>The value represented by the specified key.</returns>
     public object? this[string key]
     {
-        get => _data.TryGetValue(key, out object? data) ? data : default;
+        get => _data.GetValueOrDefault(key);
         set => _data[key] = value;
     }