diff --git a/QRCoder.Xaml/Properties/AssemblyInfo.cs b/QRCoder.Xaml/Properties/AssemblyInfo.cs
index 86eade36..35379fae 100644
--- a/QRCoder.Xaml/Properties/AssemblyInfo.cs
+++ b/QRCoder.Xaml/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
+using System.Reflection;
 using System.Runtime.InteropServices;
 
 // Allgemeine Informationen über eine Assembly werden über die folgenden 
diff --git a/QRCoder/PayloadGenerator.cs b/QRCoder/PayloadGenerator.cs
index 3f9dd132..0ec7f0d7 100644
--- a/QRCoder/PayloadGenerator.cs
+++ b/QRCoder/PayloadGenerator.cs
@@ -1,10 +1,8 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Globalization;
+using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
-using System.Diagnostics.CodeAnalysis;
 #if NETSTANDARD1_3
 using System.Reflection;
 #endif
diff --git a/QRCoder/PayloadGenerator/BitcoinLikeCryptoCurrencyAddress.cs b/QRCoder/PayloadGenerator/BitcoinLikeCryptoCurrencyAddress.cs
index a44d52f7..e850f65e 100644
--- a/QRCoder/PayloadGenerator/BitcoinLikeCryptoCurrencyAddress.cs
+++ b/QRCoder/PayloadGenerator/BitcoinLikeCryptoCurrencyAddress.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Globalization;
+using System.Linq;
 
 namespace QRCoder;
 
diff --git a/QRCoder/Properties/AssemblyInfo.cs b/QRCoder/Properties/AssemblyInfo.cs
index 86eade36..35379fae 100644
--- a/QRCoder/Properties/AssemblyInfo.cs
+++ b/QRCoder/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
+using System.Reflection;
 using System.Runtime.InteropServices;
 
 // Allgemeine Informationen über eine Assembly werden über die folgenden 
diff --git a/QRCoder/SvgQRCode.cs b/QRCoder/SvgQRCode.cs
index 5b9f29e8..a0cd0933 100644
--- a/QRCoder/SvgQRCode.cs
+++ b/QRCoder/SvgQRCode.cs
@@ -1,11 +1,11 @@
 #if !NETSTANDARD1_3
-using QRCoder.Extensions;
 using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Text;
 using System.Text.RegularExpressions;
+using QRCoder.Extensions;
 using static QRCoder.QRCodeGenerator;
 using static QRCoder.SvgQRCode;
 
diff --git a/QRCoderApiTests/ApiApprovalTests.cs b/QRCoderApiTests/ApiApprovalTests.cs
index faccc8cf..aeb7d316 100644
--- a/QRCoderApiTests/ApiApprovalTests.cs
+++ b/QRCoderApiTests/ApiApprovalTests.cs
@@ -1,11 +1,11 @@
-using PublicApiGenerator;
-using Shouldly;
 using System;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Xml.Linq;
+using PublicApiGenerator;
+using Shouldly;
 using Xunit;
 
 /*********************************************
diff --git a/QRCoderBenchmarks/Program.cs b/QRCoderBenchmarks/Program.cs
index 2daaef53..66129296 100644
--- a/QRCoderBenchmarks/Program.cs
+++ b/QRCoderBenchmarks/Program.cs
@@ -1,3 +1,3 @@
-using BenchmarkDotNet.Running;
+using BenchmarkDotNet.Running;
 
 BenchmarkRunner.Run(typeof(Program).Assembly);
diff --git a/QRCoderConsole/Program.cs b/QRCoderConsole/Program.cs
index 78a5ed5b..d9fe372a 100644
--- a/QRCoderConsole/Program.cs
+++ b/QRCoderConsole/Program.cs
@@ -1,11 +1,11 @@
 using System;
 using System.Drawing.Imaging;
 using System.IO;
-using NDesk.Options;
-using QRCoderConsole.DataObjects;
-using QRCoder;
 using System.Text;
 using System.Windows.Markup;
+using NDesk.Options;
+using QRCoder;
+using QRCoderConsole.DataObjects;
 
 namespace QRCoderConsole;
 
diff --git a/QRCoderDemo/Properties/AssemblyInfo.cs b/QRCoderDemo/Properties/AssemblyInfo.cs
index 6751eac2..28432016 100644
--- a/QRCoderDemo/Properties/AssemblyInfo.cs
+++ b/QRCoderDemo/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
+using System.Reflection;
 using System.Runtime.InteropServices;
 
 // Allgemeine Informationen über eine Assembly werden über die folgenden 
diff --git a/QRCoderTests/ArtQRCodeRendererTests.cs b/QRCoderTests/ArtQRCodeRendererTests.cs
index 3d608ac0..cec11dac 100644
--- a/QRCoderTests/ArtQRCodeRendererTests.cs
+++ b/QRCoderTests/ArtQRCodeRendererTests.cs
@@ -1,11 +1,11 @@
 #if SYSTEM_DRAWING
 
-using Xunit;
-using QRCoder;
-using Shouldly;
 using System.Drawing;
-using QRCoderTests.Helpers.XUnitExtenstions;
+using QRCoder;
 using QRCoderTests.Helpers;
+using QRCoderTests.Helpers.XUnitExtenstions;
+using Shouldly;
+using Xunit;
 
 namespace QRCoderTests;
 
diff --git a/QRCoderTests/AsciiQRCodeRendererTests.cs b/QRCoderTests/AsciiQRCodeRendererTests.cs
index 8c8ff812..09d65789 100644
--- a/QRCoderTests/AsciiQRCodeRendererTests.cs
+++ b/QRCoderTests/AsciiQRCodeRendererTests.cs
@@ -1,7 +1,7 @@
-using Xunit;
 using QRCoder;
-using Shouldly;
 using QRCoderTests.Helpers.XUnitExtenstions;
+using Shouldly;
+using Xunit;
 
 
 namespace QRCoderTests;
diff --git a/QRCoderTests/Base64QRCodeRendererTests.cs b/QRCoderTests/Base64QRCodeRendererTests.cs
index f56b180f..4bf011de 100644
--- a/QRCoderTests/Base64QRCodeRendererTests.cs
+++ b/QRCoderTests/Base64QRCodeRendererTests.cs
@@ -1,10 +1,10 @@
 #if !NETCOREAPP1_1
-using QRCoder;
-using QRCoderTests.Helpers.XUnitExtenstions;
-using Shouldly;
 using System;
 using System.Drawing;
 using System.IO;
+using QRCoder;
+using QRCoderTests.Helpers.XUnitExtenstions;
+using Shouldly;
 using Xunit;
 
 namespace QRCoderTests;
diff --git a/QRCoderTests/PostscriptQRCodeRendererTests.cs b/QRCoderTests/PostscriptQRCodeRendererTests.cs
index f012eb44..4d76ee15 100644
--- a/QRCoderTests/PostscriptQRCodeRendererTests.cs
+++ b/QRCoderTests/PostscriptQRCodeRendererTests.cs
@@ -1,12 +1,12 @@
 #if !NETCOREAPP1_1
-using QRCoder;
-using QRCoderTests.Helpers;
-using QRCoderTests.Helpers.XUnitExtenstions;
-using Shouldly;
 using System;
 using System.Drawing;
 using System.IO;
 using System.Text.RegularExpressions;
+using QRCoder;
+using QRCoderTests.Helpers;
+using QRCoderTests.Helpers.XUnitExtenstions;
+using Shouldly;
 using Xunit;
 
 namespace QRCoderTests;
diff --git a/QRCoderTests/QRCodeRendererTests.cs b/QRCoderTests/QRCodeRendererTests.cs
index bc3a2062..5576e394 100644
--- a/QRCoderTests/QRCodeRendererTests.cs
+++ b/QRCoderTests/QRCodeRendererTests.cs
@@ -1,10 +1,10 @@
 #if SYSTEM_DRAWING
-using Xunit;
+using System.Drawing;
 using QRCoder;
-using Shouldly;
-using QRCoderTests.Helpers.XUnitExtenstions;
 using QRCoderTests.Helpers;
-using System.Drawing;
+using QRCoderTests.Helpers.XUnitExtenstions;
+using Shouldly;
+using Xunit;
 
 
 namespace QRCoderTests;
diff --git a/QRCoderTests/QRGeneratorTests.cs b/QRCoderTests/QRGeneratorTests.cs
index f480baf5..19c2ca5e 100644
--- a/QRCoderTests/QRGeneratorTests.cs
+++ b/QRCoderTests/QRGeneratorTests.cs
@@ -1,12 +1,12 @@
-using QRCoder;
-using QRCoderTests.Helpers.XUnitExtenstions;
-using Shouldly;
 using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using System.Text;
+using QRCoder;
+using QRCoderTests.Helpers.XUnitExtenstions;
+using Shouldly;
 using Xunit;
 using ECCLevel = QRCoder.QRCodeGenerator.ECCLevel;
 
diff --git a/QRCoderTests/SvgQRCodeRendererTests.cs b/QRCoderTests/SvgQRCodeRendererTests.cs
index 559823bc..6b91452e 100644
--- a/QRCoderTests/SvgQRCodeRendererTests.cs
+++ b/QRCoderTests/SvgQRCodeRendererTests.cs
@@ -1,12 +1,12 @@
 #if !NETCOREAPP1_1
 using System;
-using Xunit;
-using QRCoder;
-using Shouldly;
-using QRCoderTests.Helpers.XUnitExtenstions;
+using System.Drawing;
 using System.IO;
+using QRCoder;
 using QRCoderTests.Helpers;
-using System.Drawing;
+using QRCoderTests.Helpers.XUnitExtenstions;
+using Shouldly;
+using Xunit;
 
 
 namespace QRCoderTests;
diff --git a/QRCoderTests/XamlQRCodeRendererTests.cs b/QRCoderTests/XamlQRCodeRendererTests.cs
index 69a044e3..eb1eda2a 100644
--- a/QRCoderTests/XamlQRCodeRendererTests.cs
+++ b/QRCoderTests/XamlQRCodeRendererTests.cs
@@ -1,10 +1,10 @@
 #if TEST_XAML
-using Xunit;
 using QRCoder;
 using QRCoder.Xaml;
-using Shouldly;
-using QRCoderTests.Helpers.XUnitExtenstions;
 using QRCoderTests.Helpers;
+using QRCoderTests.Helpers.XUnitExtenstions;
+using Shouldly;
+using Xunit;
 
 namespace QRCoderTests;
 
diff --git a/QRCoderTrimAnalysis/Program.cs b/QRCoderTrimAnalysis/Program.cs
index 3751555c..39946ea1 100644
--- a/QRCoderTrimAnalysis/Program.cs
+++ b/QRCoderTrimAnalysis/Program.cs
@@ -1,2 +1,2 @@
-// See https://aka.ms/new-console-template for more information
+// See https://aka.ms/new-console-template for more information
 Console.WriteLine("Hello, World!");