diff --git a/X10D/src/Assembly.cs b/X10D/src/Assembly.cs
index 8c11453..f547610 100644
--- a/X10D/src/Assembly.cs
+++ b/X10D/src/Assembly.cs
@@ -1,3 +1 @@
-using System;
-
-[assembly: CLSCompliant(true)]
+[assembly: CLSCompliant(true)]
diff --git a/X10D/src/ByteExtensions/SByteExtensions.cs b/X10D/src/ByteExtensions/SByteExtensions.cs
index 0037249..f4cd5dd 100644
--- a/X10D/src/ByteExtensions/SByteExtensions.cs
+++ b/X10D/src/ByteExtensions/SByteExtensions.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace X10D
 {
     /// <summary>
diff --git a/X10D/src/DateTimeExtensions/DateTimeExtensions.cs b/X10D/src/DateTimeExtensions/DateTimeExtensions.cs
index 444083e..e1bdd8a 100644
--- a/X10D/src/DateTimeExtensions/DateTimeExtensions.cs
+++ b/X10D/src/DateTimeExtensions/DateTimeExtensions.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace X10D
+namespace X10D
 {
     /// <summary>
     ///     Extension methods for <see cref="DateTime" />.
diff --git a/X10D/src/DateTimeExtensions/DateTimeOffsetExtensions.cs b/X10D/src/DateTimeExtensions/DateTimeOffsetExtensions.cs
index ffdbf2a..6efa016 100644
--- a/X10D/src/DateTimeExtensions/DateTimeOffsetExtensions.cs
+++ b/X10D/src/DateTimeExtensions/DateTimeOffsetExtensions.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace X10D
+namespace X10D
 {
     /// <summary>
     ///     Extension methods for <see cref="DateTimeOffset" />.
diff --git a/X10D/src/RandomExtensions/RandomExtensions.cs b/X10D/src/RandomExtensions/RandomExtensions.cs
index b573178..5974e9c 100644
--- a/X10D/src/RandomExtensions/RandomExtensions.cs
+++ b/X10D/src/RandomExtensions/RandomExtensions.cs
@@ -67,7 +67,7 @@ namespace X10D
                 throw new ArgumentNullException(nameof(random));
             }
 
-            var seed = random.Next();
+            int seed = random.Next();
             var seededRandom = new Random(seed);
 
             var r = (byte)(seededRandom.Next() % (byte.MaxValue + 1));
@@ -196,9 +196,9 @@ namespace X10D
                 throw new ArgumentNullException(nameof(random));
             }
 
-            var sample = random.Next();
+            int sample = random.Next();
             var sampledRandom = new Random(sample);
-            return (long)sample << 32 | sampledRandom.Next();
+            return ((long)sample << 32) | (uint)sampledRandom.Next();
         }
 
         /// <summary>
diff --git a/X10D/src/StringExtensions/StringExtensions.cs b/X10D/src/StringExtensions/StringExtensions.cs
index c6a7217..04a59bb 100644
--- a/X10D/src/StringExtensions/StringExtensions.cs
+++ b/X10D/src/StringExtensions/StringExtensions.cs
@@ -317,12 +317,12 @@ namespace X10D
                 return string.Empty;
             }
 
-            var array = source.ToCharArray();
+            char[] array = source.ToCharArray();
             var builder = new StringBuilder(length);
 
             while (builder.Length < length)
             {
-                var next = random.NextFrom(array);
+                char next = random.NextFrom(array);
                 builder.Append(next);
             }