diff --git a/Adler32Context.cs b/Adler32Context.cs
index 8dcc6114d..31d532c47 100644
--- a/Adler32Context.cs
+++ b/Adler32Context.cs
@@ -31,8 +31,8 @@
 // ****************************************************************************/
 
 using System;
-using System.Text;
 using System.IO;
+using System.Text;
 
 namespace DiscImageChef.Checksums
 {
diff --git a/CRC16Context.cs b/CRC16Context.cs
index 885023af7..d2ab1bc8c 100644
--- a/CRC16Context.cs
+++ b/CRC16Context.cs
@@ -30,9 +30,9 @@
 // Copyright © 2011-2018 Natalia Portillo
 // ****************************************************************************/
 
-using System.Text;
-using System.IO;
 using System;
+using System.IO;
+using System.Text;
 
 namespace DiscImageChef.Checksums
 {
diff --git a/CRC32Context.cs b/CRC32Context.cs
index dafdd1a14..1827c44dd 100644
--- a/CRC32Context.cs
+++ b/CRC32Context.cs
@@ -30,9 +30,9 @@
 // Copyright © 2011-2018 Natalia Portillo
 // ****************************************************************************/
 
-using System.Text;
-using System.IO;
 using System;
+using System.IO;
+using System.Text;
 
 namespace DiscImageChef.Checksums
 {
diff --git a/CRC64Context.cs b/CRC64Context.cs
index 368dca2f5..c42fa2010 100644
--- a/CRC64Context.cs
+++ b/CRC64Context.cs
@@ -30,9 +30,8 @@
 // Copyright © 2011-2018 Natalia Portillo
 // ****************************************************************************/
 
-using System.Text;
 using System.IO;
-using System;
+using System.Text;
 
 namespace DiscImageChef.Checksums
 {
diff --git a/FletcherContext.cs b/FletcherContext.cs
index 6ede6f9cd..1e7c241ef 100644
--- a/FletcherContext.cs
+++ b/FletcherContext.cs
@@ -33,8 +33,8 @@
 // Disabled because the speed is abnormally slow
 /*
 using System;
-using System.Text;
 using System.IO;
+using System.Text;
 
 namespace DiscImageChef.Checksums
 {
diff --git a/MD5Context.cs b/MD5Context.cs
index f4c86e987..943d230c9 100644
--- a/MD5Context.cs
+++ b/MD5Context.cs
@@ -30,9 +30,9 @@
 // Copyright © 2011-2018 Natalia Portillo
 // ****************************************************************************/
 
+using System.IO;
 using System.Security.Cryptography;
 using System.Text;
-using System.IO;
 
 namespace DiscImageChef.Checksums
 {
diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
index 7ddf5f1ab..4cdf7a7ff 100644
--- a/Properties/AssemblyInfo.cs
+++ b/Properties/AssemblyInfo.cs
@@ -31,7 +31,6 @@
 // ****************************************************************************/
 
 using System.Reflection;
-using System.Runtime.CompilerServices;
 
 // Information about this assembly is defined by the following attributes.
 // Change them to the values specific to your project.
diff --git a/RIPEMD160Context.cs b/RIPEMD160Context.cs
index 6e9c8b124..3709f9942 100644
--- a/RIPEMD160Context.cs
+++ b/RIPEMD160Context.cs
@@ -30,9 +30,9 @@
 // Copyright © 2011-2018 Natalia Portillo
 // ****************************************************************************/
 
+using System.IO;
 using System.Security.Cryptography;
 using System.Text;
-using System.IO;
 
 namespace DiscImageChef.Checksums
 {
diff --git a/SHA1Context.cs b/SHA1Context.cs
index d2b4b0662..a2c5c94ec 100644
--- a/SHA1Context.cs
+++ b/SHA1Context.cs
@@ -30,9 +30,9 @@
 // Copyright © 2011-2018 Natalia Portillo
 // ****************************************************************************/
 
+using System.IO;
 using System.Security.Cryptography;
 using System.Text;
-using System.IO;
 
 namespace DiscImageChef.Checksums
 {
diff --git a/SHA256Context.cs b/SHA256Context.cs
index e8ae3c14f..eb55465d5 100644
--- a/SHA256Context.cs
+++ b/SHA256Context.cs
@@ -30,9 +30,9 @@
 // Copyright © 2011-2018 Natalia Portillo
 // ****************************************************************************/
 
+using System.IO;
 using System.Security.Cryptography;
 using System.Text;
-using System.IO;
 
 namespace DiscImageChef.Checksums
 {
diff --git a/SHA384Context.cs b/SHA384Context.cs
index 2bb89efe1..4ec218993 100644
--- a/SHA384Context.cs
+++ b/SHA384Context.cs
@@ -30,9 +30,9 @@
 // Copyright © 2011-2018 Natalia Portillo
 // ****************************************************************************/
 
+using System.IO;
 using System.Security.Cryptography;
 using System.Text;
-using System.IO;
 
 namespace DiscImageChef.Checksums
 {
diff --git a/SHA512Context.cs b/SHA512Context.cs
index 61e046b5a..7cf07e4f4 100644
--- a/SHA512Context.cs
+++ b/SHA512Context.cs
@@ -30,9 +30,9 @@
 // Copyright © 2011-2018 Natalia Portillo
 // ****************************************************************************/
 
+using System.IO;
 using System.Security.Cryptography;
 using System.Text;
-using System.IO;
 
 namespace DiscImageChef.Checksums
 {