diff --git a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.Adapt.cs b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.Adapt.cs
index 80f9e6789..4bb537aeb 100644
--- a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.Adapt.cs
+++ b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.Adapt.cs
@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
-using SixLabors.ImageSharp.ColorSpaces;
 using SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation.RgbColorSapce;
 
 namespace SixLabors.ImageSharp.ColorSpaces.Conversion
@@ -21,9 +20,6 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// <returns>The adapted color</returns>
         public CieXyz Adapt(CieXyz color, CieXyz sourceWhitePoint)
         {
-            Guard.NotNull(color, nameof(color));
-            Guard.NotNull(sourceWhitePoint, nameof(sourceWhitePoint));
-
             if (!this.IsChromaticAdaptationPerformed)
             {
                 throw new InvalidOperationException("Cannot perform chromatic adaptation, provide a chromatic adaptation method and white point.");
@@ -39,8 +35,6 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// <returns>The adapted color</returns>
         public CieLab Adapt(CieLab color)
         {
-            Guard.NotNull(color, nameof(color));
-
             if (!this.IsChromaticAdaptationPerformed)
             {
                 throw new InvalidOperationException("Cannot perform chromatic adaptation, provide a chromatic adaptation method and white point.");
@@ -62,8 +56,6 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// <returns>The adapted color</returns>
         public CieLch Adapt(CieLch color)
         {
-            Guard.NotNull(color, nameof(color));
-
             if (!this.IsChromaticAdaptationPerformed)
             {
                 throw new InvalidOperationException("Cannot perform chromatic adaptation, provide a chromatic adaptation method and white point.");
@@ -85,8 +77,6 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// <returns>The adapted color</returns>
         public CieLchuv Adapt(CieLchuv color)
         {
-            Guard.NotNull(color, nameof(color));
-
             if (!this.IsChromaticAdaptationPerformed)
             {
                 throw new InvalidOperationException("Cannot perform chromatic adaptation, provide a chromatic adaptation method and white point.");
@@ -108,8 +98,6 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// <returns>The adapted color</returns>
         public CieLuv Adapt(CieLuv color)
         {
-            Guard.NotNull(color, nameof(color));
-
             if (!this.IsChromaticAdaptationPerformed)
             {
                 throw new InvalidOperationException("Cannot perform chromatic adaptation, provide a chromatic adaptation method and white point.");
@@ -131,8 +119,6 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// <returns>The adapted color</returns>
         public HunterLab Adapt(HunterLab color)
         {
-            Guard.NotNull(color, nameof(color));
-
             if (!this.IsChromaticAdaptationPerformed)
             {
                 throw new InvalidOperationException("Cannot perform chromatic adaptation, provide a chromatic adaptation method and white point.");
@@ -154,8 +140,6 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// <returns>The adapted color</returns>
         public LinearRgb Adapt(LinearRgb color)
         {
-            Guard.NotNull(color, nameof(color));
-
             if (!this.IsChromaticAdaptationPerformed)
             {
                 throw new InvalidOperationException("Cannot perform chromatic adaptation, provide a chromatic adaptation method and white point.");
@@ -185,8 +169,6 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// <returns>The adapted color</returns>
         public Rgb Adapt(Rgb color)
         {
-            Guard.NotNull(color, nameof(color));
-
             LinearRgb linearInput = this.ToLinearRgb(color);
             LinearRgb linearOutput = this.Adapt(linearInput);
             return this.ToRgb(linearOutput);
diff --git a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.CieLab.cs b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.CieLab.cs
index 3f5c2e246..16e3ec707 100644
--- a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.CieLab.cs
+++ b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.CieLab.cs
@@ -23,8 +23,6 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// <returns>The <see cref="CieLab"/></returns>
         public CieLab ToCieLab(CieLch color)
         {
-            Guard.NotNull(color, nameof(color));
-
             // Conversion (perserving white point)
             CieLab unadapted = CieLchToCieLabConverter.Convert(color);
 
@@ -77,8 +75,6 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// <returns>The <see cref="CieLab"/></returns>
         public CieLab ToCieLab(CieXyz color)
         {
-            Guard.NotNull(color, nameof(color));
-
             // Adaptation
             CieXyz adapted = !this.WhitePoint.Equals(this.TargetLabWhitePoint) && this.IsChromaticAdaptationPerformed
                 ? this.ChromaticAdaptation.Transform(color, this.WhitePoint, this.TargetLabWhitePoint)
@@ -96,8 +92,6 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// <returns>The <see cref="CieLab"/></returns>
         public CieLab ToCieLab(Cmyk color)
         {
-            Guard.NotNull(color, nameof(color));
-
             CieXyz xyzColor = this.ToCieXyz(color);
             return this.ToCieLab(xyzColor);
         }
@@ -120,8 +114,6 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// <returns>The <see cref="CieLab"/></returns>
         public CieLab ToCieLab(Hsv color)
         {
-            Guard.NotNull(color, nameof(color));
-
             CieXyz xyzColor = this.ToCieXyz(color);
             return this.ToCieLab(xyzColor);
         }
diff --git a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.CieLch.cs b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.CieLch.cs
index 469875c02..b13580209 100644
--- a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.CieLch.cs
+++ b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.CieLch.cs
@@ -80,8 +80,6 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// <returns>The <see cref="CieLch"/></returns>
         public CieLch ToCieLch(Cmyk color)
         {
-            Guard.NotNull(color, nameof(color));
-
             CieXyz xyzColor = this.ToCieXyz(color);
             return this.ToCieLch(xyzColor);
         }
diff --git a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.CieXyy.cs b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.CieXyy.cs
index 31e1e218e..5f6aaea6b 100644
--- a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.CieXyy.cs
+++ b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.CieXyy.cs
@@ -19,8 +19,6 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// <returns>The <see cref="CieXyy"/></returns>
         public CieXyy ToCieXyy(CieLab color)
         {
-            Guard.NotNull(color, nameof(color));
-
             var xyzColor = this.ToCieXyz(color);
 
             return this.ToCieXyy(xyzColor);
@@ -33,8 +31,6 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// <returns>The <see cref="CieXyy"/></returns>
         public CieXyy ToCieXyy(CieLch color)
         {
-            Guard.NotNull(color, nameof(color));
-
             var xyzColor = this.ToCieXyz(color);
 
             return this.ToCieXyy(xyzColor);
@@ -47,8 +43,6 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// <returns>The <see cref="CieXyy"/></returns>
         public CieXyy ToCieXyy(CieLchuv color)
         {
-            Guard.NotNull(color, nameof(color));
-
             var xyzColor = this.ToCieXyz(color);
 
             return this.ToCieXyy(xyzColor);
@@ -61,8 +55,6 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// <returns>The <see cref="CieXyy"/></returns>
         public CieXyy ToCieXyy(CieLuv color)
         {
-            Guard.NotNull(color, nameof(color));
-
             var xyzColor = this.ToCieXyz(color);
 
             return this.ToCieXyy(xyzColor);
@@ -75,8 +67,6 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// <returns>The <see cref="CieXyy"/></returns>
         public CieXyy ToCieXyy(CieXyz color)
         {
-            Guard.NotNull(color, nameof(color));
-
             return CieXyzAndCieXyyConverter.Convert(color);
         }
 
@@ -87,8 +77,6 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// <returns>The <see cref="CieXyy"/></returns>
         public CieXyy ToCieXyy(Cmyk color)
         {
-            Guard.NotNull(color, nameof(color));
-
             var xyzColor = this.ToCieXyz(color);
 
             return this.ToCieXyy(xyzColor);
@@ -101,8 +89,6 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// <returns>The <see cref="CieXyy"/></returns>
         public CieXyy ToCieXyy(Hsl color)
         {
-            Guard.NotNull(color, nameof(color));
-
             var xyzColor = this.ToCieXyz(color);
 
             return this.ToCieXyy(xyzColor);
@@ -115,8 +101,6 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// <returns>The <see cref="CieXyy"/></returns>
         public CieXyy ToCieXyy(Hsv color)
         {
-            Guard.NotNull(color, nameof(color));
-
             var xyzColor = this.ToCieXyz(color);
 
             return this.ToCieXyy(xyzColor);
@@ -129,8 +113,6 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// <returns>The <see cref="CieXyy"/></returns>
         public CieXyy ToCieXyy(HunterLab color)
         {
-            Guard.NotNull(color, nameof(color));
-
             var xyzColor = this.ToCieXyz(color);
 
             return this.ToCieXyy(xyzColor);
@@ -143,8 +125,6 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// <returns>The <see cref="CieXyy"/></returns>
         public CieXyy ToCieXyy(LinearRgb color)
         {
-            Guard.NotNull(color, nameof(color));
-
             var xyzColor = this.ToCieXyz(color);
 
             return this.ToCieXyy(xyzColor);
@@ -157,8 +137,6 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// <returns>The <see cref="CieXyy"/></returns>
         public CieXyy ToCieXyy(Lms color)
         {
-            Guard.NotNull(color, nameof(color));
-
             var xyzColor = this.ToCieXyz(color);
 
             return this.ToCieXyy(xyzColor);
@@ -171,8 +149,6 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// <returns>The <see cref="CieXyy"/></returns>
         public CieXyy ToCieXyy(Rgb color)
         {
-            Guard.NotNull(color, nameof(color));
-
             var xyzColor = this.ToCieXyz(color);
 
             return this.ToCieXyy(xyzColor);
@@ -185,8 +161,6 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// <returns>The <see cref="CieXyy"/></returns>
         public CieXyy ToCieXyy(YCbCr color)
         {
-            Guard.NotNull(color, nameof(color));
-
             var xyzColor = this.ToCieXyz(color);
 
             return this.ToCieXyy(xyzColor);
diff --git a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.CieXyz.cs b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.CieXyz.cs
index e6847beaf..cd3f7f3c8 100644
--- a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.CieXyz.cs
+++ b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.CieXyz.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-using SixLabors.ImageSharp.ColorSpaces;
 using SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation.CieLabColorSapce;
 using SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation.CieLuvColorSapce;
 using SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation.HunterLabColorSapce;
@@ -29,8 +28,6 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// <returns>The <see cref="CieXyz"/></returns>
         public CieXyz ToCieXyz(CieLab color)
         {
-            Guard.NotNull(color, nameof(color));
-
             // Conversion
             CieXyz unadapted = CieLabToCieXyzConverter.Convert(color);
 
@@ -49,8 +46,6 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// <returns>The <see cref="CieXyz"/></returns>
         public CieXyz ToCieXyz(CieLch color)
         {
-            Guard.NotNull(color, nameof(color));
-
             // Conversion to Lab
             CieLab labColor = CieLchToCieLabConverter.Convert(color);
 
@@ -65,8 +60,6 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// <returns>The <see cref="CieXyz"/></returns>
         public CieXyz ToCieXyz(CieLchuv color)
         {
-            Guard.NotNull(color, nameof(color));
-
             // Conversion to Luv
             CieLuv luvColor = CieLchuvToCieLuvConverter.Convert(color);
 
@@ -81,8 +74,6 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// <returns>The <see cref="CieXyz"/></returns>
         public CieXyz ToCieXyz(CieLuv color)
         {
-            Guard.NotNull(color, nameof(color));
-
             // Conversion
             CieXyz unadapted = CieLuvToCieXyzConverter.Convert(color);
 
@@ -101,8 +92,6 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// <returns>The <see cref="CieXyz"/></returns>
         public CieXyz ToCieXyz(CieXyy color)
         {
-            Guard.NotNull(color, nameof(color));
-
             // Conversion
             return CieXyzAndCieXyyConverter.Convert(color);
         }
@@ -114,8 +103,6 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// <returns>The <see cref="CieXyz"/></returns>
         public CieXyz ToCieXyz(Cmyk color)
         {
-            Guard.NotNull(color, nameof(color));
-
             // Conversion
             var rgb = this.ToRgb(color);
 
@@ -129,8 +116,6 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// <returns>The <see cref="CieXyz"/></returns>
         public CieXyz ToCieXyz(Hsl color)
         {
-            Guard.NotNull(color, nameof(color));
-
             // Conversion
             var rgb = this.ToRgb(color);
 
@@ -144,8 +129,6 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// <returns>The <see cref="CieXyz"/></returns>
         public CieXyz ToCieXyz(Hsv color)
         {
-            Guard.NotNull(color, nameof(color));
-
             // Conversion
             var rgb = this.ToRgb(color);
 
@@ -159,8 +142,6 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// <returns>The <see cref="CieXyz"/></returns>
         public CieXyz ToCieXyz(HunterLab color)
         {
-            Guard.NotNull(color, nameof(color));
-
             // Conversion
             CieXyz unadapted = HunterLabToCieXyzConverter.Convert(color);
 
@@ -179,8 +160,6 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// <returns>The <see cref="CieXyz"/></returns>
         public CieXyz ToCieXyz(LinearRgb color)
         {
-            Guard.NotNull(color, nameof(color));
-
             // Conversion
             LinearRgbToCieXyzConverter converter = this.GetLinearRgbToCieXyzConverter(color.WorkingSpace);
             CieXyz unadapted = converter.Convert(color);
@@ -198,8 +177,6 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// <returns>The <see cref="CieXyz"/></returns>
         public CieXyz ToCieXyz(Lms color)
         {
-            Guard.NotNull(color, nameof(color));
-
             // Conversion
             return this.cachedCieXyzAndLmsConverter.Convert(color);
         }
@@ -211,8 +188,6 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// <returns>The <see cref="CieXyz"/></returns>
         public CieXyz ToCieXyz(Rgb color)
         {
-            Guard.NotNull(color, nameof(color));
-
             // Conversion
             LinearRgb linear = RgbToLinearRgbConverter.Convert(color);
             return this.ToCieXyz(linear);
@@ -225,8 +200,6 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// <returns>The <see cref="CieXyz"/></returns>
         public CieXyz ToCieXyz(YCbCr color)
         {
-            Guard.NotNull(color, nameof(color));
-
             // Conversion
             var rgb = this.ToRgb(color);
 
diff --git a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.Hsv.cs b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.Hsv.cs
index 640461505..0aa644567 100644
--- a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.Hsv.cs
+++ b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.Hsv.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-using SixLabors.ImageSharp.ColorSpaces;
 using SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation.HsvColorSapce;
 
 namespace SixLabors.ImageSharp.ColorSpaces.Conversion
@@ -20,8 +19,6 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// <returns>The <see cref="Hsv"/></returns>
         public Hsv ToHsv(CieLab color)
         {
-            Guard.NotNull(color, nameof(color));
-
             var xyzColor = this.ToCieXyz(color);
 
             return this.ToHsv(xyzColor);
@@ -34,8 +31,6 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// <returns>The <see cref="Hsv"/></returns>
         public Hsv ToHsv(CieLch color)
         {
-            Guard.NotNull(color, nameof(color));
-
             var xyzColor = this.ToCieXyz(color);
 
             return this.ToHsv(xyzColor);
@@ -48,8 +43,6 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// <returns>The <see cref="Hsv"/></returns>
         public Hsv ToHsv(CieLchuv color)
         {
-            Guard.NotNull(color, nameof(color));
-
             var xyzColor = this.ToCieXyz(color);
 
             return this.ToHsv(xyzColor);
@@ -62,8 +55,6 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// <returns>The <see cref="Hsv"/></returns>
         public Hsv ToHsv(CieLuv color)
         {
-            Guard.NotNull(color, nameof(color));
-
             var xyzColor = this.ToCieXyz(color);
 
             return this.ToHsv(xyzColor);
@@ -76,8 +67,6 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// <returns>The <see cref="Hsv"/></returns>
         public Hsv ToHsv(CieXyy color)
         {
-            Guard.NotNull(color, nameof(color));
-
             var xyzColor = this.ToCieXyz(color);
 
             return this.ToHsv(xyzColor);
@@ -90,8 +79,6 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// <returns>The <see cref="Hsv"/></returns>
         public Hsv ToHsv(CieXyz color)
         {
-            Guard.NotNull(color, nameof(color));
-
             var rgb = this.ToRgb(color);
 
             return HsvAndRgbConverter.Convert(rgb);
@@ -104,8 +91,6 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// <returns>The <see cref="Hsv"/></returns>
         public Hsv ToHsv(Cmyk color)
         {
-            Guard.NotNull(color, nameof(color));
-
             var rgb = this.ToRgb(color);
 
             return HsvAndRgbConverter.Convert(rgb);
@@ -118,8 +103,6 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// <returns>The <see cref="Hsv"/></returns>
         public Hsv ToHsv(Hsl color)
         {
-            Guard.NotNull(color, nameof(color));
-
             var rgb = this.ToRgb(color);
 
             return HsvAndRgbConverter.Convert(rgb);
@@ -132,8 +115,6 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// <returns>The <see cref="Hsv"/></returns>
         public Hsv ToHsv(HunterLab color)
         {
-            Guard.NotNull(color, nameof(color));
-
             var xyzColor = this.ToCieXyz(color);
 
             return this.ToHsv(xyzColor);
@@ -146,8 +127,6 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// <returns>The <see cref="Hsv"/></returns>
         public Hsv ToHsv(LinearRgb color)
         {
-            Guard.NotNull(color, nameof(color));
-
             var rgb = this.ToRgb(color);
 
             return HsvAndRgbConverter.Convert(rgb);
@@ -160,8 +139,6 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// <returns>The <see cref="Hsv"/></returns>
         public Hsv ToHsv(Lms color)
         {
-            Guard.NotNull(color, nameof(color));
-
             var xyzColor = this.ToCieXyz(color);
 
             return this.ToHsv(xyzColor);
@@ -174,8 +151,6 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// <returns>The <see cref="Hsv"/></returns>
         public Hsv ToHsv(Rgb color)
         {
-            Guard.NotNull(color, nameof(color));
-
             return HsvAndRgbConverter.Convert(color);
         }
 
@@ -186,8 +161,6 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// <returns>The <see cref="Hsv"/></returns>
         public Hsv ToHsv(YCbCr color)
         {
-            Guard.NotNull(color, nameof(color));
-
             var rgb = this.ToRgb(color);
 
             return HsvAndRgbConverter.Convert(rgb);
diff --git a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.LinearRgb.cs b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.LinearRgb.cs
index 91c78b3ea..92d2cd861 100644
--- a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.LinearRgb.cs
+++ b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.LinearRgb.cs
@@ -115,8 +115,6 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// <returns>The <see cref="LinearRgb"/></returns>
         public LinearRgb ToLinearRgb(Hsv color)
         {
-            Guard.NotNull(color, nameof(color));
-
             var rgb = this.ToRgb(color);
             return this.ToLinearRgb(rgb);
         }
diff --git a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.Rgb.cs b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.Rgb.cs
index 45beecf66..b609934e9 100644
--- a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.Rgb.cs
+++ b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.Rgb.cs
@@ -110,8 +110,6 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// <returns>The <see cref="Rgb"/></returns>
         public Rgb ToRgb(Hsl color)
         {
-            Guard.NotNull(color, nameof(color));
-
             // Conversion
             return HslAndRgbConverter.Convert(color);
         }
diff --git a/src/ImageSharp/ColorSpaces/Conversion/Implementation/CieLuv/CieXyzToCieLuvConverter.cs b/src/ImageSharp/ColorSpaces/Conversion/Implementation/CieLuv/CieXyzToCieLuvConverter.cs
index 709d8d426..e1c5dde4f 100644
--- a/src/ImageSharp/ColorSpaces/Conversion/Implementation/CieLuv/CieXyzToCieLuvConverter.cs
+++ b/src/ImageSharp/ColorSpaces/Conversion/Implementation/CieLuv/CieXyzToCieLuvConverter.cs
@@ -44,8 +44,6 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation.CieLuvColor
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public CieLuv Convert(CieXyz input)
         {
-            DebugGuard.NotNull(input, nameof(input));
-
             // Conversion algorithm described here: http://www.brucelindbloom.com/index.html?Eqn_XYZ_to_Luv.html
             float yr = input.Y / this.LuvWhitePoint.Y;
             float up = ComputeUp(input);
diff --git a/src/ImageSharp/ColorSpaces/Conversion/Implementation/CieXyy/CieXyzAndCieXyyConverter.cs b/src/ImageSharp/ColorSpaces/Conversion/Implementation/CieXyy/CieXyzAndCieXyyConverter.cs
index bb7d6bb3f..7dfc577dc 100644
--- a/src/ImageSharp/ColorSpaces/Conversion/Implementation/CieXyy/CieXyzAndCieXyyConverter.cs
+++ b/src/ImageSharp/ColorSpaces/Conversion/Implementation/CieXyy/CieXyzAndCieXyyConverter.cs
@@ -16,8 +16,6 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation.CieXyyColor
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public CieXyy Convert(CieXyz input)
         {
-            DebugGuard.NotNull(input, nameof(input));
-
             float x = input.X / (input.X + input.Y + input.Z);
             float y = input.Y / (input.X + input.Y + input.Z);
 
@@ -33,8 +31,6 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation.CieXyyColor
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public CieXyz Convert(CieXyy input)
         {
-            DebugGuard.NotNull(input, nameof(input));
-
             if (MathF.Abs(input.Y) < Constants.Epsilon)
             {
                 return new CieXyz(0, 0, input.Yl);
diff --git a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Hsl/HslAndRgbConverter.cs b/src/ImageSharp/ColorSpaces/Conversion/Implementation/Hsl/HslAndRgbConverter.cs
index 2bdbbceca..7983b6ce4 100644
--- a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Hsl/HslAndRgbConverter.cs
+++ b/src/ImageSharp/ColorSpaces/Conversion/Implementation/Hsl/HslAndRgbConverter.cs
@@ -16,8 +16,6 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation.HslColorSap
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public Rgb Convert(Hsl input)
         {
-            DebugGuard.NotNull(input, nameof(input));
-
             float rangedH = input.H / 360F;
             float r = 0;
             float g = 0;
@@ -49,8 +47,6 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation.HslColorSap
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public Hsl Convert(Rgb input)
         {
-            DebugGuard.NotNull(input, nameof(input));
-
             float r = input.R;
             float g = input.G;
             float b = input.B;
diff --git a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Hsv/HsvAndRgbConverter.cs b/src/ImageSharp/ColorSpaces/Conversion/Implementation/Hsv/HsvAndRgbConverter.cs
index 981b8f3ab..c46d8f26b 100644
--- a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Hsv/HsvAndRgbConverter.cs
+++ b/src/ImageSharp/ColorSpaces/Conversion/Implementation/Hsv/HsvAndRgbConverter.cs
@@ -16,8 +16,6 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation.HsvColorSap
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public Rgb Convert(Hsv input)
         {
-            DebugGuard.NotNull(input, nameof(input));
-
             float s = input.S;
             float v = input.V;
 
@@ -81,8 +79,6 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation.HsvColorSap
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public Hsv Convert(Rgb input)
         {
-            DebugGuard.NotNull(input, nameof(input));
-
             float r = input.R;
             float g = input.G;
             float b = input.B;
diff --git a/src/ImageSharp/ColorSpaces/Conversion/Implementation/HunterLab/CieXyzAndHunterLabConverterBase.cs b/src/ImageSharp/ColorSpaces/Conversion/Implementation/HunterLab/CieXyzAndHunterLabConverterBase.cs
index 2d4e3b0e7..ebf75e0d5 100644
--- a/src/ImageSharp/ColorSpaces/Conversion/Implementation/HunterLab/CieXyzAndHunterLabConverterBase.cs
+++ b/src/ImageSharp/ColorSpaces/Conversion/Implementation/HunterLab/CieXyzAndHunterLabConverterBase.cs
@@ -34,8 +34,6 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation.HunterLabCo
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static float ComputeKb(CieXyz whitePoint)
         {
-            DebugGuard.NotNull(whitePoint, nameof(whitePoint));
-
             if (whitePoint == Illuminants.C)
             {
                 return 70F;
diff --git a/src/ImageSharp/ColorSpaces/Conversion/Implementation/HunterLab/CieXyzToHunterLabConverter.cs b/src/ImageSharp/ColorSpaces/Conversion/Implementation/HunterLab/CieXyzToHunterLabConverter.cs
index 309663796..58363ea2b 100644
--- a/src/ImageSharp/ColorSpaces/Conversion/Implementation/HunterLab/CieXyzToHunterLabConverter.cs
+++ b/src/ImageSharp/ColorSpaces/Conversion/Implementation/HunterLab/CieXyzToHunterLabConverter.cs
@@ -33,18 +33,12 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation.HunterLabCo
         /// <summary>
         /// Gets the target reference white. When not set, <see cref="HunterLab.DefaultWhitePoint"/> is used.
         /// </summary>
-        public CieXyz HunterLabWhitePoint
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get;
-        }
+        public CieXyz HunterLabWhitePoint { get; }
 
         /// <inheritdoc/>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public HunterLab Convert(CieXyz input)
         {
-            DebugGuard.NotNull(input, nameof(input));
-
             // Conversion algorithm described here: http://en.wikipedia.org/wiki/Lab_color_space#Hunter_Lab
             float x = input.X, y = input.Y, z = input.Z;
             float xn = this.HunterLabWhitePoint.X, yn = this.HunterLabWhitePoint.Y, zn = this.HunterLabWhitePoint.Z;
diff --git a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Rgb/CieXyzToLinearRgbConverter.cs b/src/ImageSharp/ColorSpaces/Conversion/Implementation/Rgb/CieXyzToLinearRgbConverter.cs
index fd76a30fb..2f52c2074 100644
--- a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Rgb/CieXyzToLinearRgbConverter.cs
+++ b/src/ImageSharp/ColorSpaces/Conversion/Implementation/Rgb/CieXyzToLinearRgbConverter.cs
@@ -38,8 +38,6 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation.RgbColorSap
         /// <inheritdoc/>
         public LinearRgb Convert(CieXyz input)
         {
-            DebugGuard.NotNull(input, nameof(input));
-
             Matrix4x4.Invert(this.conversionMatrix, out Matrix4x4 inverted);
             Vector3 vector = Vector3.Transform(input.Vector, inverted);
             return new LinearRgb(vector, this.TargetWorkingSpace);
diff --git a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Rgb/LinearRgbToCieXyzConverter.cs b/src/ImageSharp/ColorSpaces/Conversion/Implementation/Rgb/LinearRgbToCieXyzConverter.cs
index bf36e252a..0746c78c3 100644
--- a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Rgb/LinearRgbToCieXyzConverter.cs
+++ b/src/ImageSharp/ColorSpaces/Conversion/Implementation/Rgb/LinearRgbToCieXyzConverter.cs
@@ -38,7 +38,6 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation.RgbColorSap
         /// <inheritdoc/>
         public CieXyz Convert(LinearRgb input)
         {
-            DebugGuard.NotNull(input, nameof(input));
             DebugGuard.IsTrue(input.WorkingSpace.Equals(this.SourceWorkingSpace), nameof(input.WorkingSpace), "Input and source working spaces must be equal.");
 
             Vector3 vector = Vector3.Transform(input.Vector, this.conversionMatrix);
diff --git a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Rgb/LinearRgbToRgbConverter.cs b/src/ImageSharp/ColorSpaces/Conversion/Implementation/Rgb/LinearRgbToRgbConverter.cs
index 29ea0f314..3b70c02af 100644
--- a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Rgb/LinearRgbToRgbConverter.cs
+++ b/src/ImageSharp/ColorSpaces/Conversion/Implementation/Rgb/LinearRgbToRgbConverter.cs
@@ -13,8 +13,6 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation.RgbColorSap
         /// <inheritdoc/>
         public Rgb Convert(LinearRgb input)
         {
-            DebugGuard.NotNull(input, nameof(input));
-
             Vector3 vector = input.Vector;
             vector.X = input.WorkingSpace.Companding.Compress(vector.X);
             vector.Y = input.WorkingSpace.Companding.Compress(vector.Y);
diff --git a/src/ImageSharp/ColorSpaces/Conversion/Implementation/YCbCr/YCbCrAndRgbConverter.cs b/src/ImageSharp/ColorSpaces/Conversion/Implementation/YCbCr/YCbCrAndRgbConverter.cs
index aa9668b82..99149a592 100644
--- a/src/ImageSharp/ColorSpaces/Conversion/Implementation/YCbCr/YCbCrAndRgbConverter.cs
+++ b/src/ImageSharp/ColorSpaces/Conversion/Implementation/YCbCr/YCbCrAndRgbConverter.cs
@@ -19,8 +19,6 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation.YCbCrColorS
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public Rgb Convert(YCbCr input)
         {
-            DebugGuard.NotNull(input, nameof(input));
-
             float y = input.Y;
             float cb = input.Cb - 128F;
             float cr = input.Cr - 128F;
@@ -36,8 +34,6 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation.YCbCrColorS
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public YCbCr Convert(Rgb input)
         {
-            DebugGuard.NotNull(input, nameof(input));
-
             Vector3 rgb = input.Vector * MaxBytes;
             float r = rgb.X;
             float g = rgb.Y;
diff --git a/src/ImageSharp/Common/Helpers/ImageMaths.cs b/src/ImageSharp/Common/Helpers/ImageMaths.cs
index 8a2ece4be..b4e5c094c 100644
--- a/src/ImageSharp/Common/Helpers/ImageMaths.cs
+++ b/src/ImageSharp/Common/Helpers/ImageMaths.cs
@@ -153,8 +153,8 @@ namespace SixLabors.ImageSharp
         {
             int width = bitmap.Width;
             int height = bitmap.Height;
-            var topLeft = default(Point);
-            var bottomRight = default(Point);
+            Point topLeft = default;
+            Point bottomRight = default;
 
             Func<ImageFrame<TPixel>, int, int, float, bool> delegateFunc;
 
diff --git a/src/ImageSharp/Formats/Bmp/BmpDecoderCore.cs b/src/ImageSharp/Formats/Bmp/BmpDecoderCore.cs
index 2ddf4ace4..20175613e 100644
--- a/src/ImageSharp/Formats/Bmp/BmpDecoderCore.cs
+++ b/src/ImageSharp/Formats/Bmp/BmpDecoderCore.cs
@@ -217,7 +217,7 @@ namespace SixLabors.ImageSharp.Formats.Bmp
         private void ReadRle8<TPixel>(Buffer2D<TPixel> pixels, byte[] colors, int width, int height, bool inverted)
             where TPixel : struct, IPixel<TPixel>
         {
-            var color = default(TPixel);
+            TPixel color = default;
             var rgba = new Rgba32(0, 0, 0, 255);
 
             using (Buffer2D<byte> buffer = this.memoryAllocator.AllocateClean2D<byte>(width, height))
@@ -397,7 +397,7 @@ namespace SixLabors.ImageSharp.Formats.Bmp
         {
             int padding = CalculatePadding(width, 2);
             int stride = (width * 2) + padding;
-            var color = default(TPixel);
+            TPixel color = default;
             var rgba = new Rgba32(0, 0, 0, 255);
 
             using (IManagedByteBuffer buffer = this.memoryAllocator.AllocateManagedByteBuffer(stride))
diff --git a/src/ImageSharp/Formats/Bmp/BmpImageFormatDetector.cs b/src/ImageSharp/Formats/Bmp/BmpImageFormatDetector.cs
index 9c9786e0a..bb884019b 100644
--- a/src/ImageSharp/Formats/Bmp/BmpImageFormatDetector.cs
+++ b/src/ImageSharp/Formats/Bmp/BmpImageFormatDetector.cs
@@ -16,12 +16,7 @@ namespace SixLabors.ImageSharp.Formats.Bmp
         /// <inheritdoc/>
         public IImageFormat DetectFormat(ReadOnlySpan<byte> header)
         {
-            if (this.IsSupportedFileFormat(header))
-            {
-                return ImageFormats.Bmp;
-            }
-
-            return null;
+            return this.IsSupportedFileFormat(header) ? ImageFormats.Bmp : null;
         }
 
         private bool IsSupportedFileFormat(ReadOnlySpan<byte> header)
diff --git a/src/ImageSharp/Formats/Gif/GifDecoder.cs b/src/ImageSharp/Formats/Gif/GifDecoder.cs
index c81c51e8b..ac451a355 100644
--- a/src/ImageSharp/Formats/Gif/GifDecoder.cs
+++ b/src/ImageSharp/Formats/Gif/GifDecoder.cs
@@ -38,7 +38,7 @@ namespace SixLabors.ImageSharp.Formats.Gif
         /// <inheritdoc/>
         public IImageInfo Identify(Configuration configuration, Stream stream)
         {
-            Guard.NotNull(stream, "stream");
+            Guard.NotNull(stream, nameof(stream));
 
             var decoder = new GifDecoderCore(configuration, this);
             return decoder.Identify(stream);
diff --git a/src/ImageSharp/Formats/IImageEncoder.cs b/src/ImageSharp/Formats/IImageEncoder.cs
index ac0b6e311..76d831d5a 100644
--- a/src/ImageSharp/Formats/IImageEncoder.cs
+++ b/src/ImageSharp/Formats/IImageEncoder.cs
@@ -1,8 +1,6 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-using System;
-using System.Collections.Generic;
 using System.IO;
 using SixLabors.ImageSharp.PixelFormats;
 
diff --git a/src/ImageSharp/Formats/IImageFormatDetector.cs b/src/ImageSharp/Formats/IImageFormatDetector.cs
index 8266439bd..da3730d20 100644
--- a/src/ImageSharp/Formats/IImageFormatDetector.cs
+++ b/src/ImageSharp/Formats/IImageFormatDetector.cs
@@ -2,8 +2,6 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace SixLabors.ImageSharp.Formats
 {
diff --git a/src/ImageSharp/Formats/ImageFormatManager.cs b/src/ImageSharp/Formats/ImageFormatManager.cs
index 4e33a0445..63fd02d8d 100644
--- a/src/ImageSharp/Formats/ImageFormatManager.cs
+++ b/src/ImageSharp/Formats/ImageFormatManager.cs
@@ -5,7 +5,6 @@ using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
 namespace SixLabors.ImageSharp.Formats
 {
@@ -87,9 +86,9 @@ namespace SixLabors.ImageSharp.Formats
         {
             Guard.NotNullOrWhiteSpace(extension, nameof(extension));
 
-            if (extension[0] == '.')
-            {
-                extension = extension.Substring(1);
+            if (extension[0] == '.')
+            {
+                extension = extension.Substring(1);
             }
 
             return this.imageFormats.FirstOrDefault(x => x.FileExtensions.Contains(extension, StringComparer.OrdinalIgnoreCase));
@@ -158,12 +157,10 @@ namespace SixLabors.ImageSharp.Formats
         public IImageDecoder FindDecoder(IImageFormat format)
         {
             Guard.NotNull(format, nameof(format));
-            if (this.mimeTypeDecoders.TryGetValue(format, out IImageDecoder decoder))
-            {
-                return decoder;
-            }
 
-            return null;
+            return this.mimeTypeDecoders.TryGetValue(format, out IImageDecoder decoder)
+                ? decoder
+                : null;
         }
 
         /// <summary>
@@ -174,12 +171,10 @@ namespace SixLabors.ImageSharp.Formats
         public IImageEncoder FindEncoder(IImageFormat format)
         {
             Guard.NotNull(format, nameof(format));
-            if (this.mimeTypeEncoders.TryGetValue(format, out IImageEncoder encoder))
-            {
-                return encoder;
-            }
 
-            return null;
+            return this.mimeTypeEncoders.TryGetValue(format, out IImageEncoder encoder)
+                ? encoder
+                : null;
         }
 
         /// <summary>
diff --git a/src/ImageSharp/Formats/Jpeg/Components/Block8x8.cs b/src/ImageSharp/Formats/Jpeg/Components/Block8x8.cs
index cb73ee947..5601a9436 100644
--- a/src/ImageSharp/Formats/Jpeg/Components/Block8x8.cs
+++ b/src/ImageSharp/Formats/Jpeg/Components/Block8x8.cs
@@ -184,7 +184,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Components
         /// </summary>
         public Block8x8F AsFloatBlock()
         {
-            var result = default(Block8x8F);
+            Block8x8F result = default;
             result.LoadFrom(ref this);
             return result;
         }
diff --git a/src/ImageSharp/Formats/Jpeg/Components/Block8x8F.cs b/src/ImageSharp/Formats/Jpeg/Components/Block8x8F.cs
index 38974cc76..59fc234c4 100644
--- a/src/ImageSharp/Formats/Jpeg/Components/Block8x8F.cs
+++ b/src/ImageSharp/Formats/Jpeg/Components/Block8x8F.cs
@@ -134,14 +134,14 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Components
 
         public static Block8x8F Load(Span<float> data)
         {
-            var result = default(Block8x8F);
+            Block8x8F result = default;
             result.LoadFrom(data);
             return result;
         }
 
         public static Block8x8F Load(Span<int> data)
         {
-            var result = default(Block8x8F);
+            Block8x8F result = default;
             result.LoadFrom(data);
             return result;
         }
@@ -461,7 +461,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Components
 
         public Block8x8 RoundAsInt16Block()
         {
-            var result = default(Block8x8);
+            Block8x8 result = default;
             this.RoundInto(ref result);
             return result;
         }
diff --git a/src/ImageSharp/Formats/Jpeg/Components/Decoder/ColorConverters/JpegColorConverter.FromYCbCrSimdAvx2.cs b/src/ImageSharp/Formats/Jpeg/Components/Decoder/ColorConverters/JpegColorConverter.FromYCbCrSimdAvx2.cs
index c43713bf4..25342f4d6 100644
--- a/src/ImageSharp/Formats/Jpeg/Components/Decoder/ColorConverters/JpegColorConverter.FromYCbCrSimdAvx2.cs
+++ b/src/ImageSharp/Formats/Jpeg/Components/Decoder/ColorConverters/JpegColorConverter.FromYCbCrSimdAvx2.cs
@@ -62,9 +62,9 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder.ColorConverters
                 // Walking 8 elements at one step:
                 int n = result.Length / 8;
 
-                var rr = default(Vector4Pair);
-                var gg = default(Vector4Pair);
-                var bb = default(Vector4Pair);
+                Vector4Pair rr = default;
+                Vector4Pair gg = default;
+                Vector4Pair bb = default;
 
                 ref Vector<float> rrRefAsVector = ref Unsafe.As<Vector4Pair, Vector<float>>(ref rr);
                 ref Vector<float> ggRefAsVector = ref Unsafe.As<Vector4Pair, Vector<float>>(ref gg);
diff --git a/src/ImageSharp/Formats/Jpeg/Components/Decoder/ColorConverters/JpegColorConverter.cs b/src/ImageSharp/Formats/Jpeg/Components/Decoder/ColorConverters/JpegColorConverter.cs
index 5105e57ab..2937b23a7 100644
--- a/src/ImageSharp/Formats/Jpeg/Components/Decoder/ColorConverters/JpegColorConverter.cs
+++ b/src/ImageSharp/Formats/Jpeg/Components/Decoder/ColorConverters/JpegColorConverter.cs
@@ -62,7 +62,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder.ColorConverters
         /// Returns the <see cref="JpegColorConverter"/> for the YCbCr colorspace that matches the current CPU architecture.
         /// </summary>
         private static JpegColorConverter GetYCbCrConverter() =>
-            JpegColorConverter.FromYCbCrSimdAvx2.IsAvailable ? (JpegColorConverter)new JpegColorConverter.FromYCbCrSimdAvx2() : new JpegColorConverter.FromYCbCrSimd();
+            FromYCbCrSimdAvx2.IsAvailable ? (JpegColorConverter)new FromYCbCrSimdAvx2() : new FromYCbCrSimd();
 
         /// <summary>
         /// A stack-only struct to reference the input buffers using <see cref="ReadOnlySpan{T}"/>-s.
diff --git a/src/ImageSharp/Formats/Jpeg/Components/Decoder/ProfileResolver.cs b/src/ImageSharp/Formats/Jpeg/Components/Decoder/ProfileResolver.cs
index e5de4441c..8273f20ea 100644
--- a/src/ImageSharp/Formats/Jpeg/Components/Decoder/ProfileResolver.cs
+++ b/src/ImageSharp/Formats/Jpeg/Components/Decoder/ProfileResolver.cs
@@ -37,7 +37,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder
         /// <param name="bytesToCheck">The bytes to check</param>
         /// <param name="profileIdentifier">The profile identifier</param>
         /// <returns>The <see cref="bool"/></returns>
-        public static bool IsProfile(Span<byte> bytesToCheck, Span<byte> profileIdentifier)
+        public static bool IsProfile(ReadOnlySpan<byte> bytesToCheck, ReadOnlySpan<byte> profileIdentifier)
         {
             return bytesToCheck.Length >= profileIdentifier.Length
                    && bytesToCheck.Slice(0, profileIdentifier.Length).SequenceEqual(profileIdentifier);
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/GolangJpegScanDecoder.ComputationData.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/GolangJpegScanDecoder.ComputationData.cs
index f1dd2526a..f3c8aa91b 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/GolangJpegScanDecoder.ComputationData.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/GolangJpegScanDecoder.ComputationData.cs
@@ -44,7 +44,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
             /// <returns>The <see cref="ComputationData"/></returns>
             public static ComputationData Create()
             {
-                var data = default(ComputationData);
+                ComputationData data = default;
                 data.Unzig = ZigZag.CreateUnzigTable();
                 return data;
             }
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/GolangJpegDecoderCore.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/GolangJpegDecoderCore.cs
index 61ab47bdf..46cdcddb4 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/GolangJpegDecoderCore.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/GolangJpegDecoderCore.cs
@@ -773,7 +773,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort
         /// </exception>
         private void ProcessStartOfScanMarker(int remaining)
         {
-            var scan = default(GolangJpegScanDecoder);
+            GolangJpegScanDecoder scan = default;
             GolangJpegScanDecoder.InitStreamReading(&scan, this, remaining);
             this.InputProcessor.Bits = default;
             scan.DecodeBlocks(this);
diff --git a/src/ImageSharp/Formats/Jpeg/JpegDecoder.cs b/src/ImageSharp/Formats/Jpeg/JpegDecoder.cs
index e738982cb..eafbb391c 100644
--- a/src/ImageSharp/Formats/Jpeg/JpegDecoder.cs
+++ b/src/ImageSharp/Formats/Jpeg/JpegDecoder.cs
@@ -33,7 +33,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg
         /// <inheritdoc/>
         public IImageInfo Identify(Configuration configuration, Stream stream)
         {
-            Guard.NotNull(stream, "stream");
+            Guard.NotNull(stream, nameof(stream));
 
             using (var decoder = new PdfJsJpegDecoderCore(configuration, this))
             {
diff --git a/src/ImageSharp/Formats/Jpeg/JpegEncoderCore.cs b/src/ImageSharp/Formats/Jpeg/JpegEncoderCore.cs
index 9ffd40c93..1310d90d2 100644
--- a/src/ImageSharp/Formats/Jpeg/JpegEncoderCore.cs
+++ b/src/ImageSharp/Formats/Jpeg/JpegEncoderCore.cs
@@ -544,15 +544,16 @@ namespace SixLabors.ImageSharp.Formats.Jpeg
                 specs = new[] { HuffmanSpec.TheHuffmanSpecs[0], HuffmanSpec.TheHuffmanSpecs[1] };
             }
 
-            foreach (HuffmanSpec s in specs)
+            for (int i = 0; i < specs.Length; i++)
             {
+                ref HuffmanSpec s = ref specs[i];
                 markerlen += 1 + 16 + s.Values.Length;
             }
 
             this.WriteMarkerHeader(JpegConstants.Markers.DHT, markerlen);
             for (int i = 0; i < specs.Length; i++)
             {
-                HuffmanSpec spec = specs[i];
+                ref HuffmanSpec spec = ref specs[i];
                 int len = 0;
 
                 fixed (byte* huffman = this.huffmanBuffer)
diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/PdfJsJpegDecoderCore.cs b/src/ImageSharp/Formats/Jpeg/PdfJsPort/PdfJsJpegDecoderCore.cs
index 55435e3be..bd1d84ecc 100644
--- a/src/ImageSharp/Formats/Jpeg/PdfJsPort/PdfJsJpegDecoderCore.cs
+++ b/src/ImageSharp/Formats/Jpeg/PdfJsPort/PdfJsJpegDecoderCore.cs
@@ -786,7 +786,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort
             int spectralStart = this.temp[0];
             int spectralEnd = this.temp[1];
             int successiveApproximation = this.temp[2];
-            var scanDecoder = default(PdfJsScanDecoder);
+            PdfJsScanDecoder scanDecoder = default;
 
             scanDecoder.DecodeScan(
                  this.Frame,
diff --git a/src/ImageSharp/Formats/Png/PngDecoderCore.cs b/src/ImageSharp/Formats/Png/PngDecoderCore.cs
index 67e32f212..363d51ef9 100644
--- a/src/ImageSharp/Formats/Png/PngDecoderCore.cs
+++ b/src/ImageSharp/Formats/Png/PngDecoderCore.cs
@@ -670,7 +670,7 @@ namespace SixLabors.ImageSharp.Formats.Png
         private void ProcessDefilteredScanline<TPixel>(ReadOnlySpan<byte> defilteredScanline, ImageFrame<TPixel> pixels)
             where TPixel : struct, IPixel<TPixel>
         {
-            var color = default(TPixel);
+            TPixel color = default;
             Span<TPixel> rowSpan = pixels.GetPixelRowSpan(this.currentRow);
 
             // Trim the first marker byte from the buffer
@@ -753,7 +753,7 @@ namespace SixLabors.ImageSharp.Formats.Png
                                 for (int x = 0; x < this.header.Width; x++)
                                 {
                                     ref Rgb24 rgb24 = ref rgb24Span[x];
-                                    var rgba32 = default(Rgba32);
+                                    Rgba32 rgba32 = default;
                                     rgba32.Rgb = rgb24;
                                     rgba32.A = (byte)(rgb24.Equals(this.rgb24Trans) ? 0 : 255);
 
@@ -768,7 +768,7 @@ namespace SixLabors.ImageSharp.Formats.Png
                             for (int x = 0; x < this.header.Width; x++)
                             {
                                 ref readonly Rgb24 rgb24 = ref rgb24Span[x];
-                                var rgba32 = default(Rgba32);
+                                Rgba32 rgba32 = default;
                                 rgba32.Rgb = rgb24;
                                 rgba32.A = (byte)(rgb24.Equals(this.rgb24Trans) ? 0 : 255);
 
@@ -854,9 +854,8 @@ namespace SixLabors.ImageSharp.Formats.Png
         {
             ReadOnlySpan<byte> newScanline = ToArrayByBitsLength(defilteredScanline, this.bytesPerScanline, this.header.BitDepth);
             ReadOnlySpan<Rgb24> pal = MemoryMarshal.Cast<byte, Rgb24>(this.palette);
-            var color = default(TPixel);
-
-            var rgba = default(Rgba32);
+            TPixel color = default;
+            Rgba32 rgba = default;
 
             if (this.paletteAlpha != null && this.paletteAlpha.Length > 0)
             {
@@ -900,7 +899,7 @@ namespace SixLabors.ImageSharp.Formats.Png
         private void ProcessInterlacedDefilteredScanline<TPixel>(ReadOnlySpan<byte> defilteredScanline, Span<TPixel> rowSpan, int pixelOffset = 0, int increment = 1)
             where TPixel : struct, IPixel<TPixel>
         {
-            var color = default(TPixel);
+            TPixel color = default;
 
             // Trim the first marker byte from the buffer
             ReadOnlySpan<byte> scanlineBuffer = defilteredScanline.Slice(1, defilteredScanline.Length - 1);
@@ -943,7 +942,7 @@ namespace SixLabors.ImageSharp.Formats.Png
                 case PngColorType.Palette:
 
                     ReadOnlySpan<byte> newScanline = ToArrayByBitsLength(scanlineBuffer, this.bytesPerScanline, this.header.BitDepth);
-                    var rgba = default(Rgba32);
+                    Rgba32 rgba = default;
                     Span<Rgb24> pal = MemoryMarshal.Cast<byte, Rgb24>(this.palette);
 
                     if (this.paletteAlpha != null && this.paletteAlpha.Length > 0)
diff --git a/src/ImageSharp/Formats/Png/PngEncoderCore.cs b/src/ImageSharp/Formats/Png/PngEncoderCore.cs
index 7ec82c57c..cf869e68a 100644
--- a/src/ImageSharp/Formats/Png/PngEncoderCore.cs
+++ b/src/ImageSharp/Formats/Png/PngEncoderCore.cs
@@ -247,7 +247,7 @@ namespace SixLabors.ImageSharp.Formats.Png
             where TPixel : struct, IPixel<TPixel>
         {
             byte[] rawScanlineArray = this.rawScanline.Array;
-            var rgba = default(Rgba32);
+            Rgba32 rgba = default;
 
             // Copy the pixels across from the image.
             // Reuse the chunk type buffer.
@@ -305,8 +305,9 @@ namespace SixLabors.ImageSharp.Formats.Png
             switch (this.pngColorType)
             {
                 case PngColorType.Palette:
-                    // TODO: Use Span copy!
-                    Buffer.BlockCopy(this.palettePixelData, row * this.rawScanline.Length(), this.rawScanline.Array, 0, this.rawScanline.Length());
+                    int stride = this.rawScanline.Length();
+
+                    this.palettePixelData.AsSpan(row * stride, stride).CopyTo(this.rawScanline.GetSpan());
                     break;
                 case PngColorType.Grayscale:
                 case PngColorType.GrayscaleWithAlpha:
diff --git a/src/ImageSharp/Formats/Png/PngImageFormatDetector.cs b/src/ImageSharp/Formats/Png/PngImageFormatDetector.cs
index 36b43a470..c1c039a1b 100644
--- a/src/ImageSharp/Formats/Png/PngImageFormatDetector.cs
+++ b/src/ImageSharp/Formats/Png/PngImageFormatDetector.cs
@@ -17,12 +17,7 @@ namespace SixLabors.ImageSharp.Formats.Png
         /// <inheritdoc/>
         public IImageFormat DetectFormat(ReadOnlySpan<byte> header)
         {
-            if (this.IsSupportedFileFormat(header))
-            {
-                return ImageFormats.Png;
-            }
-
-            return null;
+            return this.IsSupportedFileFormat(header) ? ImageFormats.Png : null;
         }
 
         private bool IsSupportedFileFormat(ReadOnlySpan<byte> header)
diff --git a/src/ImageSharp/Image.Decode.cs b/src/ImageSharp/Image.Decode.cs
index 443ae6a37..9087db414 100644
--- a/src/ImageSharp/Image.Decode.cs
+++ b/src/ImageSharp/Image.Decode.cs
@@ -48,12 +48,10 @@ namespace SixLabors.ImageSharp
         private static IImageDecoder DiscoverDecoder(Stream stream, Configuration config, out IImageFormat format)
         {
             format = InternalDetectFormat(stream, config);
-            if (format != null)
-            {
-                return config.ImageFormatsManager.FindDecoder(format);
-            }
 
-            return null;
+            return format != null
+                ? config.ImageFormatsManager.FindDecoder(format)
+                : null;
         }
 
 #pragma warning disable SA1008 // Opening parenthesis must be spaced correctly
diff --git a/src/ImageSharp/MetaData/ImageFrameMetaData.cs b/src/ImageSharp/MetaData/ImageFrameMetaData.cs
index ca3012f4a..d507a5b3e 100644
--- a/src/ImageSharp/MetaData/ImageFrameMetaData.cs
+++ b/src/ImageSharp/MetaData/ImageFrameMetaData.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-using SixLabors.ImageSharp.Formats;
 using SixLabors.ImageSharp.Formats.Gif;
 
 namespace SixLabors.ImageSharp.MetaData
diff --git a/src/ImageSharp/PixelFormats/Bgr24.cs b/src/ImageSharp/PixelFormats/Bgr24.cs
index b099bab1c..ff913923e 100644
--- a/src/ImageSharp/PixelFormats/Bgr24.cs
+++ b/src/ImageSharp/PixelFormats/Bgr24.cs
@@ -121,7 +121,7 @@ namespace SixLabors.ImageSharp.PixelFormats
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public void PackFromVector4(Vector4 vector)
         {
-            var rgba = default(Rgba32);
+            Rgba32 rgba = default;
             rgba.PackFromVector4(vector);
             this.PackFromRgba32(rgba);
         }
diff --git a/src/ImageSharp/PixelFormats/PixelBlenders/PorterDuffFunctions.Generated.cs b/src/ImageSharp/PixelFormats/PixelBlenders/PorterDuffFunctions.Generated.cs
index e948c05ca..66cc427de 100644
--- a/src/ImageSharp/PixelFormats/PixelBlenders/PorterDuffFunctions.Generated.cs
+++ b/src/ImageSharp/PixelFormats/PixelBlenders/PorterDuffFunctions.Generated.cs
@@ -261,7 +261,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
         public static TPixel Normal<TPixel>(TPixel backdrop, TPixel source, float amount)
             where TPixel : struct, IPixel<TPixel>
         {
-            TPixel dest = default(TPixel);
+            TPixel dest = default;
             dest.PackFromVector4(Normal(backdrop.ToVector4(), source.ToVector4(), amount));
             return dest;
         }
@@ -270,7 +270,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
         public static TPixel Multiply<TPixel>(TPixel backdrop, TPixel source, float amount)
             where TPixel : struct, IPixel<TPixel>
         {
-            TPixel dest = default(TPixel);
+            TPixel dest = default;
             dest.PackFromVector4(Multiply(backdrop.ToVector4(), source.ToVector4(), amount));
             return dest;
         }
@@ -279,7 +279,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
         public static TPixel Add<TPixel>(TPixel backdrop, TPixel source, float amount)
             where TPixel : struct, IPixel<TPixel>
         {
-            TPixel dest = default(TPixel);
+            TPixel dest = default;
             dest.PackFromVector4(Add(backdrop.ToVector4(), source.ToVector4(), amount));
             return dest;
         }
@@ -288,7 +288,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
         public static TPixel Subtract<TPixel>(TPixel backdrop, TPixel source, float amount)
             where TPixel : struct, IPixel<TPixel>
         {
-            TPixel dest = default(TPixel);
+            TPixel dest = default;
             dest.PackFromVector4(Subtract(backdrop.ToVector4(), source.ToVector4(), amount));
             return dest;
         }
@@ -297,7 +297,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
         public static TPixel Screen<TPixel>(TPixel backdrop, TPixel source, float amount)
             where TPixel : struct, IPixel<TPixel>
         {
-            TPixel dest = default(TPixel);
+            TPixel dest = default;
             dest.PackFromVector4(Screen(backdrop.ToVector4(), source.ToVector4(), amount));
             return dest;
         }
@@ -306,7 +306,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
         public static TPixel Darken<TPixel>(TPixel backdrop, TPixel source, float amount)
             where TPixel : struct, IPixel<TPixel>
         {
-            TPixel dest = default(TPixel);
+            TPixel dest = default;
             dest.PackFromVector4(Darken(backdrop.ToVector4(), source.ToVector4(), amount));
             return dest;
         }
@@ -315,7 +315,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
         public static TPixel Lighten<TPixel>(TPixel backdrop, TPixel source, float amount)
             where TPixel : struct, IPixel<TPixel>
         {
-            TPixel dest = default(TPixel);
+            TPixel dest = default;
             dest.PackFromVector4(Lighten(backdrop.ToVector4(), source.ToVector4(), amount));
             return dest;
         }
@@ -324,7 +324,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
         public static TPixel Overlay<TPixel>(TPixel backdrop, TPixel source, float amount)
             where TPixel : struct, IPixel<TPixel>
         {
-            TPixel dest = default(TPixel);
+            TPixel dest = default;
             dest.PackFromVector4(Overlay(backdrop.ToVector4(), source.ToVector4(), amount));
             return dest;
         }
@@ -333,7 +333,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
         public static TPixel HardLight<TPixel>(TPixel backdrop, TPixel source, float amount)
             where TPixel : struct, IPixel<TPixel>
         {
-            TPixel dest = default(TPixel);
+            TPixel dest = default;
             dest.PackFromVector4(HardLight(backdrop.ToVector4(), source.ToVector4(), amount));
             return dest;
         }
@@ -342,7 +342,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
         public static TPixel Src<TPixel>(TPixel backdrop, TPixel source, float amount)
             where TPixel : struct, IPixel<TPixel>
         {
-            TPixel dest = default(TPixel);
+            TPixel dest = default;
             dest.PackFromVector4(Src(backdrop.ToVector4(), source.ToVector4(), amount));
             return dest;
         }
@@ -351,7 +351,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
         public static TPixel Atop<TPixel>(TPixel backdrop, TPixel source, float amount)
             where TPixel : struct, IPixel<TPixel>
         {
-            TPixel dest = default(TPixel);
+            TPixel dest = default;
             dest.PackFromVector4(Atop(backdrop.ToVector4(), source.ToVector4(), amount));
             return dest;
         }
@@ -360,7 +360,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
         public static TPixel Over<TPixel>(TPixel backdrop, TPixel source, float amount)
             where TPixel : struct, IPixel<TPixel>
         {
-            TPixel dest = default(TPixel);
+            TPixel dest = default;
             dest.PackFromVector4(Over(backdrop.ToVector4(), source.ToVector4(), amount));
             return dest;
         }
@@ -369,7 +369,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
         public static TPixel In<TPixel>(TPixel backdrop, TPixel source, float amount)
             where TPixel : struct, IPixel<TPixel>
         {
-            TPixel dest = default(TPixel);
+            TPixel dest = default;
             dest.PackFromVector4(In(backdrop.ToVector4(), source.ToVector4(), amount));
             return dest;
         }
@@ -378,7 +378,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
         public static TPixel Out<TPixel>(TPixel backdrop, TPixel source, float amount)
             where TPixel : struct, IPixel<TPixel>
         {
-            TPixel dest = default(TPixel);
+            TPixel dest = default;
             dest.PackFromVector4(Out(backdrop.ToVector4(), source.ToVector4(), amount));
             return dest;
         }
@@ -387,7 +387,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
         public static TPixel Dest<TPixel>(TPixel backdrop, TPixel source, float amount)
             where TPixel : struct, IPixel<TPixel>
         {
-            TPixel dest = default(TPixel);
+            TPixel dest = default;
             dest.PackFromVector4(Dest(backdrop.ToVector4(), source.ToVector4(), amount));
             return dest;
         }
@@ -396,7 +396,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
         public static TPixel DestAtop<TPixel>(TPixel backdrop, TPixel source, float amount)
             where TPixel : struct, IPixel<TPixel>
         {
-            TPixel dest = default(TPixel);
+            TPixel dest = default;
             dest.PackFromVector4(DestAtop(backdrop.ToVector4(), source.ToVector4(), amount));
             return dest;
         }
@@ -405,7 +405,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
         public static TPixel DestOver<TPixel>(TPixel backdrop, TPixel source, float amount)
             where TPixel : struct, IPixel<TPixel>
         {
-            TPixel dest = default(TPixel);
+            TPixel dest = default;
             dest.PackFromVector4(DestOver(backdrop.ToVector4(), source.ToVector4(), amount));
             return dest;
         }
@@ -414,7 +414,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
         public static TPixel DestIn<TPixel>(TPixel backdrop, TPixel source, float amount)
             where TPixel : struct, IPixel<TPixel>
         {
-            TPixel dest = default(TPixel);
+            TPixel dest = default;
             dest.PackFromVector4(DestIn(backdrop.ToVector4(), source.ToVector4(), amount));
             return dest;
         }
@@ -423,7 +423,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
         public static TPixel DestOut<TPixel>(TPixel backdrop, TPixel source, float amount)
             where TPixel : struct, IPixel<TPixel>
         {
-            TPixel dest = default(TPixel);
+            TPixel dest = default;
             dest.PackFromVector4(DestOut(backdrop.ToVector4(), source.ToVector4(), amount));
             return dest;
         }
@@ -432,7 +432,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
         public static TPixel Clear<TPixel>(TPixel backdrop, TPixel source, float amount)
             where TPixel : struct, IPixel<TPixel>
         {
-            TPixel dest = default(TPixel);
+            TPixel dest = default;
             dest.PackFromVector4(Clear(backdrop.ToVector4(), source.ToVector4(), amount));
             return dest;
         }
@@ -441,7 +441,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
         public static TPixel Xor<TPixel>(TPixel backdrop, TPixel source, float amount)
             where TPixel : struct, IPixel<TPixel>
         {
-            TPixel dest = default(TPixel);
+            TPixel dest = default;
             dest.PackFromVector4(Xor(backdrop.ToVector4(), source.ToVector4(), amount));
             return dest;
         }
diff --git a/src/ImageSharp/PixelFormats/PixelBlenders/PorterDuffFunctions.Generated.tt b/src/ImageSharp/PixelFormats/PixelBlenders/PorterDuffFunctions.Generated.tt
index 940b585aa..4cbc06861 100644
--- a/src/ImageSharp/PixelFormats/PixelBlenders/PorterDuffFunctions.Generated.tt
+++ b/src/ImageSharp/PixelFormats/PixelBlenders/PorterDuffFunctions.Generated.tt
@@ -30,7 +30,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
         public static TPixel <#=blender#><TPixel>(TPixel backdrop, TPixel source, float amount)
             where TPixel : struct, IPixel<TPixel>
         {
-            TPixel dest = default(TPixel);
+            TPixel dest = default;
             dest.PackFromVector4(<#=blender#>(backdrop.ToVector4(), source.ToVector4(), amount));
             return dest;
         }
diff --git a/src/ImageSharp/PixelFormats/Rgb24.cs b/src/ImageSharp/PixelFormats/Rgb24.cs
index c540a7d12..faee3bbbd 100644
--- a/src/ImageSharp/PixelFormats/Rgb24.cs
+++ b/src/ImageSharp/PixelFormats/Rgb24.cs
@@ -122,7 +122,7 @@ namespace SixLabors.ImageSharp.PixelFormats
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public void PackFromVector4(Vector4 vector)
         {
-            var rgba = default(Rgba32);
+            Rgba32 rgba = default;
             rgba.PackFromVector4(vector);
             this.PackFromRgba32(rgba);
         }
diff --git a/src/ImageSharp/Processing/Binarization/Processors/BinaryErrorDiffusionProcessor.cs b/src/ImageSharp/Processing/Binarization/Processors/BinaryErrorDiffusionProcessor.cs
index 6588bbe5b..64763b657 100644
--- a/src/ImageSharp/Processing/Binarization/Processors/BinaryErrorDiffusionProcessor.cs
+++ b/src/ImageSharp/Processing/Binarization/Processors/BinaryErrorDiffusionProcessor.cs
@@ -78,7 +78,7 @@ namespace SixLabors.ImageSharp.Processing.Binarization.Processors
         protected override void OnFrameApply(ImageFrame<TPixel> source, Rectangle sourceRectangle, Configuration configuration)
         {
             float threshold = this.Threshold * 255F;
-            var rgba = default(Rgba32);
+            Rgba32 rgba = default;
             bool isAlphaOnly = typeof(TPixel) == typeof(Alpha8);
 
             var interest = Rectangle.Intersect(sourceRectangle, source.Bounds());
diff --git a/src/ImageSharp/Processing/Binarization/Processors/BinaryOrderedDitherProcessor.cs b/src/ImageSharp/Processing/Binarization/Processors/BinaryOrderedDitherProcessor.cs
index bd4b3660a..3fe56ff44 100644
--- a/src/ImageSharp/Processing/Binarization/Processors/BinaryOrderedDitherProcessor.cs
+++ b/src/ImageSharp/Processing/Binarization/Processors/BinaryOrderedDitherProcessor.cs
@@ -59,7 +59,7 @@ namespace SixLabors.ImageSharp.Processing.Binarization.Processors
         /// <inheritdoc/>
         protected override void OnFrameApply(ImageFrame<TPixel> source, Rectangle sourceRectangle, Configuration configuration)
         {
-            var rgba = default(Rgba32);
+            Rgba32 rgba = default;
             bool isAlphaOnly = typeof(TPixel) == typeof(Alpha8);
 
             var interest = Rectangle.Intersect(sourceRectangle, source.Bounds());
diff --git a/src/ImageSharp/Processing/Binarization/Processors/BinaryThresholdProcessor.cs b/src/ImageSharp/Processing/Binarization/Processors/BinaryThresholdProcessor.cs
index 455c6ad8c..dc1297d6f 100644
--- a/src/ImageSharp/Processing/Binarization/Processors/BinaryThresholdProcessor.cs
+++ b/src/ImageSharp/Processing/Binarization/Processors/BinaryThresholdProcessor.cs
@@ -77,7 +77,7 @@ namespace SixLabors.ImageSharp.Processing.Binarization.Processors
                 y =>
                 {
                     Span<TPixel> row = source.GetPixelRowSpan(y);
-                    var rgba = default(Rgba32);
+                    Rgba32 rgba = default;
 
                     for (int x = startX; x < endX; x++)
                     {
diff --git a/src/ImageSharp/Processing/Convolution/Processors/Convolution2PassProcessor.cs b/src/ImageSharp/Processing/Convolution/Processors/Convolution2PassProcessor.cs
index a080beb88..4e14882ff 100644
--- a/src/ImageSharp/Processing/Convolution/Processors/Convolution2PassProcessor.cs
+++ b/src/ImageSharp/Processing/Convolution/Processors/Convolution2PassProcessor.cs
@@ -92,7 +92,7 @@ namespace SixLabors.ImageSharp.Processing.Convolution.Processors
 
                     for (int x = startX; x < endX; x++)
                     {
-                        var destination = default(Vector4);
+                        Vector4 destination = default;
 
                         // Apply each matrix multiplier to the color components for each pixel.
                         for (int fy = 0; fy < kernelHeight; fy++)
diff --git a/src/ImageSharp/Processing/Dithering/Processors/ErrorDiffusionPaletteProcessor.cs b/src/ImageSharp/Processing/Dithering/Processors/ErrorDiffusionPaletteProcessor.cs
index c90e91a6b..0f9e2d397 100644
--- a/src/ImageSharp/Processing/Dithering/Processors/ErrorDiffusionPaletteProcessor.cs
+++ b/src/ImageSharp/Processing/Dithering/Processors/ErrorDiffusionPaletteProcessor.cs
@@ -66,7 +66,7 @@ namespace SixLabors.ImageSharp.Processing.Dithering.Processors
         protected override void OnFrameApply(ImageFrame<TPixel> source, Rectangle sourceRectangle, Configuration configuration)
         {
             float threshold = this.Threshold * 255F;
-            var rgba = default(Rgba32);
+            Rgba32 rgba = default;
             bool isAlphaOnly = typeof(TPixel) == typeof(Alpha8);
 
             var interest = Rectangle.Intersect(sourceRectangle, source.Bounds());
diff --git a/src/ImageSharp/Processing/Dithering/Processors/OrderedDitherPaletteProcessor.cs b/src/ImageSharp/Processing/Dithering/Processors/OrderedDitherPaletteProcessor.cs
index ce9b7fb3e..a59826e23 100644
--- a/src/ImageSharp/Processing/Dithering/Processors/OrderedDitherPaletteProcessor.cs
+++ b/src/ImageSharp/Processing/Dithering/Processors/OrderedDitherPaletteProcessor.cs
@@ -47,7 +47,7 @@ namespace SixLabors.ImageSharp.Processing.Dithering.Processors
         /// <inheritdoc/>
         protected override void OnFrameApply(ImageFrame<TPixel> source, Rectangle sourceRectangle, Configuration configuration)
         {
-            var rgba = default(Rgba32);
+            Rgba32 rgba = default;
             bool isAlphaOnly = typeof(TPixel) == typeof(Alpha8);
 
             var interest = Rectangle.Intersect(sourceRectangle, source.Bounds());
diff --git a/src/ImageSharp/Processing/Dithering/Processors/PaletteDitherProcessorBase.cs b/src/ImageSharp/Processing/Dithering/Processors/PaletteDitherProcessorBase.cs
index 89cc7cfb6..683ef7044 100644
--- a/src/ImageSharp/Processing/Dithering/Processors/PaletteDitherProcessorBase.cs
+++ b/src/ImageSharp/Processing/Dithering/Processors/PaletteDitherProcessorBase.cs
@@ -46,8 +46,8 @@ namespace SixLabors.ImageSharp.Processing.Dithering.Processors
             float secondLeastDistance = int.MaxValue;
             var vector = pixel.ToVector4();
 
-            var closest = default(TPixel);
-            var secondClosest = default(TPixel);
+            TPixel closest = default;
+            TPixel secondClosest = default;
             for (int index = 0; index < colorPalette.Length; index++)
             {
                 TPixel temp = colorPalette[index];
diff --git a/src/ImageSharp/Processing/Quantization/FrameQuantizers/OctreeFrameQuantizer{TPixel}.cs b/src/ImageSharp/Processing/Quantization/FrameQuantizers/OctreeFrameQuantizer{TPixel}.cs
index 431064f22..e32022254 100644
--- a/src/ImageSharp/Processing/Quantization/FrameQuantizers/OctreeFrameQuantizer{TPixel}.cs
+++ b/src/ImageSharp/Processing/Quantization/FrameQuantizers/OctreeFrameQuantizer{TPixel}.cs
@@ -68,7 +68,7 @@ namespace SixLabors.ImageSharp.Processing.Quantization.FrameQuantizers
                 ref TPixel scanBaseRef = ref MemoryMarshal.GetReference(row);
 
                 // And loop through each column
-                var rgba = default(Rgba32);
+                Rgba32 rgba = default;
                 for (int x = 0; x < width; x++)
                 {
                     ref TPixel pixel = ref Unsafe.Add(ref scanBaseRef, x);
@@ -87,7 +87,7 @@ namespace SixLabors.ImageSharp.Processing.Quantization.FrameQuantizers
             // pass of the algorithm by avoiding transforming rows of identical color.
             TPixel sourcePixel = source[0, 0];
             TPixel previousPixel = sourcePixel;
-            var rgba = default(Rgba32);
+            Rgba32 rgba = default;
             byte pixelValue = this.QuantizePixel(sourcePixel, ref rgba);
             TPixel[] colorPalette = this.GetPalette();
             TPixel transformedPixel = colorPalette[pixelValue];
@@ -152,7 +152,7 @@ namespace SixLabors.ImageSharp.Processing.Quantization.FrameQuantizers
         {
             // Transparent pixels are much more likely to be found at the end of a palette
             int index = this.colors;
-            var trans = default(Rgba32);
+            Rgba32 trans = default;
             for (int i = this.palette.Length - 1; i >= 0; i--)
             {
                 this.palette[i].ToRgba32(ref trans);
@@ -539,7 +539,7 @@ namespace SixLabors.ImageSharp.Processing.Quantization.FrameQuantizers
                         byte b = (this.blue / this.pixelCount).ToByte();
 
                         // And set the color of the palette entry
-                        var pixel = default(TPixel);
+                        TPixel pixel = default;
                         pixel.PackFromRgba32(new Rgba32(r, g, b, 255));
                         palette[index] = pixel;
 
diff --git a/src/ImageSharp/Processing/Quantization/FrameQuantizers/WuFrameQuantizer{TPixel}.cs b/src/ImageSharp/Processing/Quantization/FrameQuantizers/WuFrameQuantizer{TPixel}.cs
index 4887519e3..78c4bfbf8 100644
--- a/src/ImageSharp/Processing/Quantization/FrameQuantizers/WuFrameQuantizer{TPixel}.cs
+++ b/src/ImageSharp/Processing/Quantization/FrameQuantizers/WuFrameQuantizer{TPixel}.cs
@@ -237,7 +237,7 @@ namespace SixLabors.ImageSharp.Processing.Quantization.FrameQuantizers
                 ref TPixel scanBaseRef = ref MemoryMarshal.GetReference(row);
 
                 // And loop through each column
-                var rgba = default(Rgba32);
+                Rgba32 rgba = default;
                 for (int x = 0; x < width; x++)
                 {
                     ref TPixel pixel = ref Unsafe.Add(ref scanBaseRef, x);
@@ -858,7 +858,7 @@ namespace SixLabors.ImageSharp.Processing.Quantization.FrameQuantizers
             }
 
             // Expected order r->g->b->a
-            var rgba = default(Rgba32);
+            Rgba32 rgba = default;
             pixel.ToRgba32(ref rgba);
 
             int r = rgba.R >> (8 - IndexBits);
diff --git a/src/ImageSharp/Processing/Transforms/TransformHelpers.cs b/src/ImageSharp/Processing/Transforms/TransformHelpers.cs
index 46dd134ce..71d3b35c1 100644
--- a/src/ImageSharp/Processing/Transforms/TransformHelpers.cs
+++ b/src/ImageSharp/Processing/Transforms/TransformHelpers.cs
@@ -12,7 +12,7 @@ namespace SixLabors.ImageSharp.Processing.Transforms
     /// <summary>
     /// Contains helper methods for working with affine and non-affine transforms
     /// </summary>
-    internal class TransformHelpers
+    internal static class TransformHelpers
     {
         /// <summary>
         /// Updates the dimensional metadata of a transformed image