diff --git a/src/MaterialDesignThemes.Wpf/Converters/NotZeroToVisibilityConverter.cs b/src/MaterialDesignThemes.Wpf/Converters/NotZeroToVisibilityConverter.cs
index fc1c67df58..026fd76687 100644
--- a/src/MaterialDesignThemes.Wpf/Converters/NotZeroToVisibilityConverter.cs
+++ b/src/MaterialDesignThemes.Wpf/Converters/NotZeroToVisibilityConverter.cs
@@ -14,7 +14,5 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
     }
 
     public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-    {
-        return Binding.DoNothing;
-    }
+        => Binding.DoNothing;
 }
diff --git a/src/MaterialDesignThemes.Wpf/Converters/NullableDateTimeToCurrentDateConverter.cs b/src/MaterialDesignThemes.Wpf/Converters/NullableDateTimeToCurrentDateConverter.cs
index 58f2c41c1d..1630ea6633 100644
--- a/src/MaterialDesignThemes.Wpf/Converters/NullableDateTimeToCurrentDateConverter.cs
+++ b/src/MaterialDesignThemes.Wpf/Converters/NullableDateTimeToCurrentDateConverter.cs
@@ -13,7 +13,5 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
     }
 
     public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-    {
-        return value;
-    }
+        => value;
 }
diff --git a/src/MaterialDesignThemes.Wpf/Converters/NullableToVisibilityConverter.cs b/src/MaterialDesignThemes.Wpf/Converters/NullableToVisibilityConverter.cs
index ddb3aeec1e..d81a8cdb79 100644
--- a/src/MaterialDesignThemes.Wpf/Converters/NullableToVisibilityConverter.cs
+++ b/src/MaterialDesignThemes.Wpf/Converters/NullableToVisibilityConverter.cs
@@ -9,12 +9,8 @@ public class NullableToVisibilityConverter : IValueConverter
     public Visibility NotNullValue { get; set; } = Visibility.Visible;
 
     public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-    {
-        return value == null ? NullValue : NotNullValue;
-    }
+        => value == null ? NullValue : NotNullValue;
 
     public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-    {
-        return Binding.DoNothing;
-    }
+        => Binding.DoNothing;
 }
diff --git a/src/MaterialDesignThemes.Wpf/Converters/PointValueConverter.cs b/src/MaterialDesignThemes.Wpf/Converters/PointValueConverter.cs
index c5a723f082..0ce83bace6 100644
--- a/src/MaterialDesignThemes.Wpf/Converters/PointValueConverter.cs
+++ b/src/MaterialDesignThemes.Wpf/Converters/PointValueConverter.cs
@@ -21,12 +21,11 @@ public object Convert(object[] values, Type targetType, object parameter, Cultur
 
     public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
     {
-        if (value is Point)
+        if (value is Point point)
         {
-            var point = (Point)value;
-            return new object[] { point.X, point.Y };
+            return [point.X, point.Y];
         }
 
-        return new object[0];
+        return [];
     }
 }
diff --git a/src/MaterialDesignThemes.Wpf/Converters/RangeLengthConverter.cs b/src/MaterialDesignThemes.Wpf/Converters/RangeLengthConverter.cs
index ce9a890689..e1d068f626 100644
--- a/src/MaterialDesignThemes.Wpf/Converters/RangeLengthConverter.cs
+++ b/src/MaterialDesignThemes.Wpf/Converters/RangeLengthConverter.cs
@@ -17,14 +17,12 @@ public object Convert(object[] values, Type targetType, object parameter, Cultur
 
             return Binding.DoNothing;
 
-        var percent = (value - min) / (max - min);
-        var length = percent * containerLength;
+        double percent = (value - min) / (max - min);
+        double length = percent * containerLength;
 
         return length > containerLength ? containerLength : length;
     }
 
     public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
-    {
-        throw new NotImplementedException();
-    }
+        => throw new NotImplementedException();
 }
diff --git a/src/MaterialDesignThemes.Wpf/Converters/RemoveAlphaBrushConverter.cs b/src/MaterialDesignThemes.Wpf/Converters/RemoveAlphaBrushConverter.cs
index 393fc6015e..6561bd645e 100644
--- a/src/MaterialDesignThemes.Wpf/Converters/RemoveAlphaBrushConverter.cs
+++ b/src/MaterialDesignThemes.Wpf/Converters/RemoveAlphaBrushConverter.cs
@@ -25,8 +25,8 @@ private static Color RgbaToRgb(Color rgba, object background)
             _ => Colors.White
         };
 
-        var alpha = (double)rgba.A / byte.MaxValue;
-        var alphaReverse = 1 - alpha;
+        double alpha = (double)rgba.A / byte.MaxValue;
+        double alphaReverse = 1 - alpha;
 
         return Color.FromRgb(
             (byte)(alpha * rgba.R + alphaReverse * backgroundColor.R),
diff --git a/src/MaterialDesignThemes.Wpf/Converters/ShadowOpacityMaskConverter.cs b/src/MaterialDesignThemes.Wpf/Converters/ShadowOpacityMaskConverter.cs
index b257df569a..6accda5183 100644
--- a/src/MaterialDesignThemes.Wpf/Converters/ShadowOpacityMaskConverter.cs
+++ b/src/MaterialDesignThemes.Wpf/Converters/ShadowOpacityMaskConverter.cs
@@ -29,7 +29,7 @@ public class ShadowOpacityMaskConverter : IMultiValueConverter
 
         double blurRadius = dropShadow.BlurRadius;
 
-        Rect rect = new Rect(
+        var rect = new Rect(
                 -blurRadius,
                 -blurRadius,
                 width + blurRadius + blurRadius,
diff --git a/src/MaterialDesignThemes.Wpf/Converters/SizeToRectConverter.cs b/src/MaterialDesignThemes.Wpf/Converters/SizeToRectConverter.cs
deleted file mode 100644
index f3441d8adf..0000000000
--- a/src/MaterialDesignThemes.Wpf/Converters/SizeToRectConverter.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System.Globalization;
-using System.Windows.Data;
-
-namespace MaterialDesignThemes.Wpf.Converters;
-
-[Obsolete("This will be removed in the 5.0 release as it is no longer used")]
-public class CardClipConverter : IMultiValueConverter
-{
-    /// <summary>
-    /// 1 - Content presenter render size,
-    /// 2 - Clipping border padding (main control padding)
-    /// </summary>
-    /// <param name="values"></param>
-    /// <param name="targetType"></param>
-    /// <param name="parameter"></param>
-    /// <param name="culture"></param>
-    /// <returns></returns>
-    public object? Convert(object?[]? values, Type targetType, object? parameter, CultureInfo culture)
-    {
-        if (values?.Length != 2 || values[0] is not Size || values[1] is not Thickness)
-            return Binding.DoNothing;
-
-        var size = (Size)values[0]!;
-        var farPoint = new Point(
-            Math.Max(0, size.Width),
-            Math.Max(0, size.Height));
-        var padding = (Thickness)values[1]!;
-        farPoint.Offset(padding.Left + padding.Right, padding.Top + padding.Bottom);
-
-        return new Rect(
-            new Point(),
-            new Point(farPoint.X, farPoint.Y));
-    }
-
-    public object?[]? ConvertBack(object? value, Type[] targetTypes, object? parameter, CultureInfo culture)
-        => null;
-}
diff --git a/src/MaterialDesignThemes.Wpf/Converters/SliderValueLabelPositionConverter.cs b/src/MaterialDesignThemes.Wpf/Converters/SliderValueLabelPositionConverter.cs
index 173818dcc2..02787ba3b1 100644
--- a/src/MaterialDesignThemes.Wpf/Converters/SliderValueLabelPositionConverter.cs
+++ b/src/MaterialDesignThemes.Wpf/Converters/SliderValueLabelPositionConverter.cs
@@ -16,7 +16,7 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
             {
                 Orientation.Horizontal => (-width * 0.5) + halfGripWidth,
                 Orientation.Vertical => -width - margin,
-                _ => throw new ArgumentOutOfRangeException()
+                _ => throw new ArgumentOutOfRangeException(nameof(parameter))
             };
         }
 
diff --git a/src/MaterialDesignThemes.Wpf/Converters/SnackbarMessageTypeConverter.cs b/src/MaterialDesignThemes.Wpf/Converters/SnackbarMessageTypeConverter.cs
index 2b7d33b055..4fc89a4bba 100644
--- a/src/MaterialDesignThemes.Wpf/Converters/SnackbarMessageTypeConverter.cs
+++ b/src/MaterialDesignThemes.Wpf/Converters/SnackbarMessageTypeConverter.cs
@@ -6,9 +6,7 @@ namespace MaterialDesignThemes.Wpf.Converters;
 public class SnackbarMessageTypeConverter : TypeConverter
 {
     public override bool CanConvertFrom(ITypeDescriptorContext? context, Type sourceType)
-    {
-        return sourceType == typeof(string) || base.CanConvertFrom(context, sourceType);
-    }
+        => sourceType == typeof(string) || base.CanConvertFrom(context, sourceType);
 
     public override object? ConvertFrom(ITypeDescriptorContext? context, CultureInfo? culture, object value)
     {
diff --git a/src/MaterialDesignThemes.Wpf/Converters/TextFieldHintVisibilityConverter.cs b/src/MaterialDesignThemes.Wpf/Converters/TextFieldHintVisibilityConverter.cs
index 605b393ad9..9d84810532 100644
--- a/src/MaterialDesignThemes.Wpf/Converters/TextFieldHintVisibilityConverter.cs
+++ b/src/MaterialDesignThemes.Wpf/Converters/TextFieldHintVisibilityConverter.cs
@@ -9,12 +9,8 @@ public class TextFieldHintVisibilityConverter : IValueConverter
     public Visibility IsNotEmptyValue { get; set; } = Visibility.Hidden;
 
     public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-    {
-        return string.IsNullOrEmpty((value ?? "").ToString()) ? IsEmptyValue : IsNotEmptyValue;
-    }
+        => string.IsNullOrEmpty((value ?? "").ToString()) ? IsEmptyValue : IsNotEmptyValue;
 
     public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-    {
-        return Binding.DoNothing;
-    }
+        => Binding.DoNothing;
 }
diff --git a/src/MaterialDesignThemes.Wpf/Converters/TimeToVisibilityConverter.cs b/src/MaterialDesignThemes.Wpf/Converters/TimeToVisibilityConverter.cs
index 3ac7ee3ac8..d418336e16 100644
--- a/src/MaterialDesignThemes.Wpf/Converters/TimeToVisibilityConverter.cs
+++ b/src/MaterialDesignThemes.Wpf/Converters/TimeToVisibilityConverter.cs
@@ -7,21 +7,17 @@ namespace MaterialDesignThemes.Wpf.Converters;
 public class TimeToVisibilityConverter : MarkupExtension, IValueConverter
 {
     public override object ProvideValue(IServiceProvider serviceProvider)
-    {
-        return this;
-    }
+        => this;
 
     public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
     {
         var time = (DateTime)value;
 
-        var isPm = ((time.Hour >= 13) || (time.Hour == 0));
+        bool isPm = ((time.Hour >= 13) || (time.Hour == 0));
 
         return isPm ? Visibility.Visible : Visibility.Collapsed;
     }
 
     public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-    {
-        return Binding.DoNothing;
-    }
+        => Binding.DoNothing;
 }
diff --git a/src/MaterialDesignThemes.Wpf/Converters/TreeListViewIndentConverter.cs b/src/MaterialDesignThemes.Wpf/Converters/TreeListViewIndentConverter.cs
index a9dd1f163a..13c8ac2c8a 100644
--- a/src/MaterialDesignThemes.Wpf/Converters/TreeListViewIndentConverter.cs
+++ b/src/MaterialDesignThemes.Wpf/Converters/TreeListViewIndentConverter.cs
@@ -15,7 +15,5 @@ public class TreeListViewIndentConverter : IMultiValueConverter
     }
 
     public object?[]? ConvertBack(object? value, Type[] targetTypes, object? parameter, CultureInfo culture)
-    {
-        throw new NotImplementedException();
-    }
+        => throw new NotImplementedException();
 }