diff --git a/Adler32Context.cs b/Adler32Context.cs
index 109505c..271c665 100644
--- a/Adler32Context.cs
+++ b/Adler32Context.cs
@@ -153,9 +153,8 @@ public sealed class Adler32Context : IChecksum
             return;
         }
 
-        uint sum1 = preSum1;
-        uint sum2 = preSum2;
-        uint n;
+        uint sum1    = preSum1;
+        uint sum2    = preSum2;
         var  dataOff = 0;
 
         /* in case user likes doing a byte at a time, keep it fast */
@@ -200,7 +199,7 @@ public sealed class Adler32Context : IChecksum
         while(len >= NMAX)
         {
             len -= NMAX;
-            n   =  NMAX / 16; /* NMAX is divisible by 16 */
+            uint n = NMAX / 16;
 
             do
             {
diff --git a/CRC32/clmul.cs b/CRC32/clmul.cs
index 540ff00..0203b07 100644
--- a/CRC32/clmul.cs
+++ b/CRC32/clmul.cs
@@ -105,7 +105,6 @@ static class Clmul
 
     internal static uint Step(byte[] src, long len, uint initialCRC)
     {
-        Vector128<uint> xmmT0, xmmT1, xmmT2;
         Vector128<uint> xmmInitial = Sse2.ConvertScalarToVector128UInt32(initialCRC);
         Vector128<uint> xmmCRC0    = Sse2.ConvertScalarToVector128UInt32(0x9db42487);
         Vector128<uint> xmmCRC1    = Vector128<uint>.Zero;
@@ -121,18 +120,18 @@ static class Clmul
 
         while((len -= 64) >= 0)
         {
-            xmmT0 = Vector128.Create(BitConverter.ToUInt32(src, bufPos), BitConverter.ToUInt32(src, bufPos + 4),
-                                     BitConverter.ToUInt32(src, bufPos + 8), BitConverter.ToUInt32(src, bufPos + 12));
+            var xmmT0 = Vector128.Create(BitConverter.ToUInt32(src, bufPos), BitConverter.ToUInt32(src, bufPos + 4),
+                                         BitConverter.ToUInt32(src, bufPos + 8), BitConverter.ToUInt32(src, bufPos + 12));
 
             bufPos += 16;
 
-            xmmT1 = Vector128.Create(BitConverter.ToUInt32(src, bufPos), BitConverter.ToUInt32(src, bufPos + 4),
-                                     BitConverter.ToUInt32(src, bufPos + 8), BitConverter.ToUInt32(src, bufPos + 12));
+            var xmmT1 = Vector128.Create(BitConverter.ToUInt32(src, bufPos), BitConverter.ToUInt32(src, bufPos + 4),
+                                         BitConverter.ToUInt32(src, bufPos + 8), BitConverter.ToUInt32(src, bufPos + 12));
 
             bufPos += 16;
 
-            xmmT2 = Vector128.Create(BitConverter.ToUInt32(src, bufPos), BitConverter.ToUInt32(src, bufPos + 4),
-                                     BitConverter.ToUInt32(src, bufPos + 8), BitConverter.ToUInt32(src, bufPos + 12));
+            var xmmT2 = Vector128.Create(BitConverter.ToUInt32(src, bufPos), BitConverter.ToUInt32(src, bufPos + 4),
+                                         BitConverter.ToUInt32(src, bufPos + 8), BitConverter.ToUInt32(src, bufPos + 12));
 
             bufPos += 16;
 
diff --git a/FletcherContext.cs b/FletcherContext.cs
index ad5a88a..69a1aca 100644
--- a/FletcherContext.cs
+++ b/FletcherContext.cs
@@ -132,9 +132,8 @@ public sealed class Fletcher32Context : IChecksum
             return;
         }
 
-        uint sum1 = previousSum1;
-        uint sum2 = previousSum2;
-        uint n;
+        uint sum1    = previousSum1;
+        uint sum2    = previousSum2;
         var  dataOff = 0;
 
         /* in case user likes doing a byte at a time, keep it fast */
@@ -179,7 +178,7 @@ public sealed class Fletcher32Context : IChecksum
         while(len >= NMAX)
         {
             len -= NMAX;
-            n   =  NMAX / 16; /* NMAX is divisible by 16 */
+            uint n = NMAX / 16;
 
             do
             {
@@ -479,9 +478,8 @@ public sealed class Fletcher16Context : IChecksum
             return;
         }
 
-        uint sum1 = previousSum1;
-        uint sum2 = previousSum2;
-        uint n;
+        uint sum1    = previousSum1;
+        uint sum2    = previousSum2;
         var  dataOff = 0;
 
         /* in case user likes doing a byte at a time, keep it fast */
@@ -526,7 +524,7 @@ public sealed class Fletcher16Context : IChecksum
         while(len >= NMAX)
         {
             len -= NMAX;
-            n   =  NMAX / 11; /* NMAX is divisible by 16 */
+            uint n = NMAX / 11;
 
             do
             {