diff --git a/DiscImageChef.Tests.Devices/ATA.cs b/DiscImageChef.Tests.Devices/ATA.cs
index f90f5ad56..98d807e6d 100644
--- a/DiscImageChef.Tests.Devices/ATA.cs
+++ b/DiscImageChef.Tests.Devices/ATA.cs
@@ -34,7 +34,7 @@ namespace DiscImageChef.Tests.Devices
 {
     partial class MainClass
     {
-        public static void ATA(string devPath, Device dev)
+        public static void Ata(string devPath, Device dev)
         {
             while(true)
             {
@@ -65,7 +65,7 @@ namespace DiscImageChef.Tests.Devices
                         DicConsole.WriteLine("Returning to command class menu...");
                         return;
                     case 1:
-                        AtaCHS.Menu(devPath, dev);
+                        AtaChs.Menu(devPath, dev);
                         continue;
                     case 2:
                         Ata28.Menu(devPath, dev);
@@ -80,7 +80,7 @@ namespace DiscImageChef.Tests.Devices
                         Cfa.Menu(devPath, dev);
                         continue;
                     case 6:
-                        MCPT.Menu(devPath, dev);
+                        Mcpt.Menu(devPath, dev);
                         continue;
                     case 7:
                         Smart.Menu(devPath, dev);
diff --git a/DiscImageChef.Tests.Devices/ATA/Ata28.cs b/DiscImageChef.Tests.Devices/ATA/Ata28.cs
index 5840e5588..816a95fb0 100644
--- a/DiscImageChef.Tests.Devices/ATA/Ata28.cs
+++ b/DiscImageChef.Tests.Devices/ATA/Ata28.cs
@@ -121,7 +121,7 @@ namespace DiscImageChef.Tests.Devices.ATA
             DicConsole.WriteLine("Sending READ BUFFER to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
@@ -159,7 +159,7 @@ namespace DiscImageChef.Tests.Devices.ATA
                     System.Console.Clear();
                     DicConsole.WriteLine("Device: {0}", devPath);
                     DicConsole.WriteLine("READ BUFFER status registers:");
-                    DicConsole.Write("{0}", MainClass.DecodeATARegisters(errorRegisters));
+                    DicConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
                     DicConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
@@ -186,7 +186,7 @@ namespace DiscImageChef.Tests.Devices.ATA
             DicConsole.WriteLine("Sending READ BUFFER DMA to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
@@ -224,7 +224,7 @@ namespace DiscImageChef.Tests.Devices.ATA
                     System.Console.Clear();
                     DicConsole.WriteLine("Device: {0}", devPath);
                     DicConsole.WriteLine("READ BUFFER DMA status registers:");
-                    DicConsole.Write("{0}", MainClass.DecodeATARegisters(errorRegisters));
+                    DicConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
                     DicConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
@@ -315,7 +315,7 @@ namespace DiscImageChef.Tests.Devices.ATA
             DicConsole.WriteLine("Sending READ DMA {0}to the device:", retries ? "WITH RETRIES " : "");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
@@ -354,7 +354,7 @@ namespace DiscImageChef.Tests.Devices.ATA
                     System.Console.Clear();
                     DicConsole.WriteLine("Device: {0}", devPath);
                     DicConsole.WriteLine("READ DMA {0}status registers:", retries ? "WITH RETRIES " : "");
-                    DicConsole.Write("{0}", MainClass.DecodeATARegisters(errorRegisters));
+                    DicConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
                     DicConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
@@ -437,7 +437,7 @@ namespace DiscImageChef.Tests.Devices.ATA
             DicConsole.WriteLine("Sending READ LONG {0}to the device:", retries ? "WITH RETRIES " : "");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
@@ -476,7 +476,7 @@ namespace DiscImageChef.Tests.Devices.ATA
                     System.Console.Clear();
                     DicConsole.WriteLine("Device: {0}", devPath);
                     DicConsole.WriteLine("READ LONG {0}status registers:", retries ? "WITH RETRIES " : "");
-                    DicConsole.Write("{0}", MainClass.DecodeATARegisters(errorRegisters));
+                    DicConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
                     DicConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
@@ -568,7 +568,7 @@ namespace DiscImageChef.Tests.Devices.ATA
             DicConsole.WriteLine("Sending READ MULTIPLE to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
@@ -607,7 +607,7 @@ namespace DiscImageChef.Tests.Devices.ATA
                     System.Console.Clear();
                     DicConsole.WriteLine("Device: {0}", devPath);
                     DicConsole.WriteLine("READ MULTIPLE status registers:");
-                    DicConsole.Write("{0}", MainClass.DecodeATARegisters(errorRegisters));
+                    DicConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
                     DicConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
@@ -661,7 +661,7 @@ namespace DiscImageChef.Tests.Devices.ATA
                     System.Console.Clear();
                     DicConsole.WriteLine("Device: {0}", devPath);
                     DicConsole.WriteLine("READ NATIVE MAX ADDRESS status registers:");
-                    DicConsole.Write("{0}", MainClass.DecodeATARegisters(errorRegisters));
+                    DicConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
                     DicConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
@@ -752,7 +752,7 @@ namespace DiscImageChef.Tests.Devices.ATA
             DicConsole.WriteLine("Sending READ SECTORS {0}to the device:", retries ? "WITH RETRIES " : "");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
@@ -791,7 +791,7 @@ namespace DiscImageChef.Tests.Devices.ATA
                     System.Console.Clear();
                     DicConsole.WriteLine("Device: {0}", devPath);
                     DicConsole.WriteLine("READ SECTORS {0}status registers:", retries ? "WITH RETRIES " : "");
-                    DicConsole.Write("{0}", MainClass.DecodeATARegisters(errorRegisters));
+                    DicConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
                     DicConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
@@ -897,7 +897,7 @@ namespace DiscImageChef.Tests.Devices.ATA
                     System.Console.Clear();
                     DicConsole.WriteLine("Device: {0}", devPath);
                     DicConsole.WriteLine("SEEK status registers:");
-                    DicConsole.Write("{0}", MainClass.DecodeATARegisters(errorRegisters));
+                    DicConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
                     DicConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
diff --git a/DiscImageChef.Tests.Devices/ATA/Ata48.cs b/DiscImageChef.Tests.Devices/ATA/Ata48.cs
index c3467e515..348c7bea2 100644
--- a/DiscImageChef.Tests.Devices/ATA/Ata48.cs
+++ b/DiscImageChef.Tests.Devices/ATA/Ata48.cs
@@ -131,7 +131,7 @@ namespace DiscImageChef.Tests.Devices.ATA
                     System.Console.Clear();
                     DicConsole.WriteLine("Device: {0}", devPath);
                     DicConsole.WriteLine("GET NATIVE MAX ADDRESS EXT status registers:");
-                    DicConsole.Write("{0}", MainClass.DecodeATARegisters(errorRegisters));
+                    DicConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
                     DicConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
@@ -222,7 +222,7 @@ namespace DiscImageChef.Tests.Devices.ATA
             DicConsole.WriteLine("Sending READ DMA EXT to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
@@ -261,7 +261,7 @@ namespace DiscImageChef.Tests.Devices.ATA
                     System.Console.Clear();
                     DicConsole.WriteLine("Device: {0}", devPath);
                     DicConsole.WriteLine("READ DMA EXT status registers:");
-                    DicConsole.Write("{0}", MainClass.DecodeATARegisters(errorRegisters));
+                    DicConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
                     DicConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
@@ -358,7 +358,7 @@ namespace DiscImageChef.Tests.Devices.ATA
             DicConsole.WriteLine("Sending READ LOG EXT to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
@@ -397,7 +397,7 @@ namespace DiscImageChef.Tests.Devices.ATA
                     System.Console.Clear();
                     DicConsole.WriteLine("Device: {0}", devPath);
                     DicConsole.WriteLine("READ LOG EXT status registers:");
-                    DicConsole.Write("{0}", MainClass.DecodeATARegisters(errorRegisters));
+                    DicConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
                     DicConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
@@ -494,7 +494,7 @@ namespace DiscImageChef.Tests.Devices.ATA
             DicConsole.WriteLine("Sending READ LOG DMA EXT to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
@@ -533,7 +533,7 @@ namespace DiscImageChef.Tests.Devices.ATA
                     System.Console.Clear();
                     DicConsole.WriteLine("Device: {0}", devPath);
                     DicConsole.WriteLine("READ LOG DMA EXT status registers:");
-                    DicConsole.Write("{0}", MainClass.DecodeATARegisters(errorRegisters));
+                    DicConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
                     DicConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
@@ -625,7 +625,7 @@ namespace DiscImageChef.Tests.Devices.ATA
             DicConsole.WriteLine("Sending READ MULTIPLE EXT to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
@@ -664,7 +664,7 @@ namespace DiscImageChef.Tests.Devices.ATA
                     System.Console.Clear();
                     DicConsole.WriteLine("Device: {0}", devPath);
                     DicConsole.WriteLine("READ MULTIPLE EXT status registers:");
-                    DicConsole.Write("{0}", MainClass.DecodeATARegisters(errorRegisters));
+                    DicConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
                     DicConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
@@ -718,7 +718,7 @@ namespace DiscImageChef.Tests.Devices.ATA
                     System.Console.Clear();
                     DicConsole.WriteLine("Device: {0}", devPath);
                     DicConsole.WriteLine("READ NATIVE MAX ADDRESS status registers:");
-                    DicConsole.Write("{0}", MainClass.DecodeATARegisters(errorRegisters));
+                    DicConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
                     DicConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
@@ -809,7 +809,7 @@ namespace DiscImageChef.Tests.Devices.ATA
             DicConsole.WriteLine("Sending READ SECTORS EXT to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
@@ -848,7 +848,7 @@ namespace DiscImageChef.Tests.Devices.ATA
                     System.Console.Clear();
                     DicConsole.WriteLine("Device: {0}", devPath);
                     DicConsole.WriteLine("READ SECTORS EXT status registers:");
-                    DicConsole.Write("{0}", MainClass.DecodeATARegisters(errorRegisters));
+                    DicConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
                     DicConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
diff --git a/DiscImageChef.Tests.Devices/ATA/AtaCHS.cs b/DiscImageChef.Tests.Devices/ATA/AtaCHS.cs
index 0ca84e7b9..ec183acd6 100644
--- a/DiscImageChef.Tests.Devices/ATA/AtaCHS.cs
+++ b/DiscImageChef.Tests.Devices/ATA/AtaCHS.cs
@@ -32,7 +32,7 @@ using DiscImageChef.Devices;
 
 namespace DiscImageChef.Tests.Devices.ATA
 {
-     static class AtaCHS
+     static class AtaChs
     {
         internal static void Menu(string devPath, Device dev)
         {
@@ -113,7 +113,7 @@ namespace DiscImageChef.Tests.Devices.ATA
             DicConsole.WriteLine("Sending IDENTIFY DEVICE to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
@@ -162,7 +162,7 @@ namespace DiscImageChef.Tests.Devices.ATA
                     System.Console.Clear();
                     DicConsole.WriteLine("Device: {0}", devPath);
                     DicConsole.WriteLine("IDENTIFY DEVICE status registers:");
-                    DicConsole.Write("{0}", MainClass.DecodeATARegisters(errorRegisters));
+                    DicConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
                     DicConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
@@ -275,7 +275,7 @@ namespace DiscImageChef.Tests.Devices.ATA
             DicConsole.WriteLine("Sending READ DMA {0}to the device:", retries ? "WITH RETRIES " : "");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
@@ -314,7 +314,7 @@ namespace DiscImageChef.Tests.Devices.ATA
                     System.Console.Clear();
                     DicConsole.WriteLine("Device: {0}", devPath);
                     DicConsole.WriteLine("READ DMA {0}status registers:", retries ? "WITH RETRIES " : "");
-                    DicConsole.Write("{0}", MainClass.DecodeATARegisters(errorRegisters));
+                    DicConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
                     DicConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
@@ -428,7 +428,7 @@ namespace DiscImageChef.Tests.Devices.ATA
             DicConsole.WriteLine("Sending READ LONG {0}to the device:", retries ? "WITH RETRIES " : "");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
@@ -467,7 +467,7 @@ namespace DiscImageChef.Tests.Devices.ATA
                     System.Console.Clear();
                     DicConsole.WriteLine("Device: {0}", devPath);
                     DicConsole.WriteLine("READ LONG {0}status registers:", retries ? "WITH RETRIES " : "");
-                    DicConsole.Write("{0}", MainClass.DecodeATARegisters(errorRegisters));
+                    DicConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
                     DicConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
@@ -581,7 +581,7 @@ namespace DiscImageChef.Tests.Devices.ATA
             DicConsole.WriteLine("Sending READ MULTIPLE to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
@@ -620,7 +620,7 @@ namespace DiscImageChef.Tests.Devices.ATA
                     System.Console.Clear();
                     DicConsole.WriteLine("Device: {0}", devPath);
                     DicConsole.WriteLine("READ MULTIPLE status registers:");
-                    DicConsole.Write("{0}", MainClass.DecodeATARegisters(errorRegisters));
+                    DicConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
                     DicConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
@@ -734,7 +734,7 @@ namespace DiscImageChef.Tests.Devices.ATA
             DicConsole.WriteLine("Sending READ SECTORS {0}to the device:", retries ? "WITH RETRIES " : "");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
@@ -773,7 +773,7 @@ namespace DiscImageChef.Tests.Devices.ATA
                     System.Console.Clear();
                     DicConsole.WriteLine("Device: {0}", devPath);
                     DicConsole.WriteLine("READ SECTORS {0}status registers:", retries ? "WITH RETRIES " : "");
-                    DicConsole.Write("{0}", MainClass.DecodeATARegisters(errorRegisters));
+                    DicConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
                     DicConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
@@ -901,7 +901,7 @@ namespace DiscImageChef.Tests.Devices.ATA
                     System.Console.Clear();
                     DicConsole.WriteLine("Device: {0}", devPath);
                     DicConsole.WriteLine("SEEK status registers:");
-                    DicConsole.Write("{0}", MainClass.DecodeATARegisters(errorRegisters));
+                    DicConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
                     DicConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
diff --git a/DiscImageChef.Tests.Devices/ATA/Atapi.cs b/DiscImageChef.Tests.Devices/ATA/Atapi.cs
index 74e67fda4..61d1567ae 100644
--- a/DiscImageChef.Tests.Devices/ATA/Atapi.cs
+++ b/DiscImageChef.Tests.Devices/ATA/Atapi.cs
@@ -81,7 +81,7 @@ namespace DiscImageChef.Tests.Devices.ATA
             DicConsole.WriteLine("Sending IDENTIFY PACKET DEVICE to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
@@ -130,7 +130,7 @@ namespace DiscImageChef.Tests.Devices.ATA
                     System.Console.Clear();
                     DicConsole.WriteLine("Device: {0}", devPath);
                     DicConsole.WriteLine("IDENTIFY PACKET DEVICE status registers:");
-                    DicConsole.Write("{0}", MainClass.DecodeATARegisters(errorRegisters));
+                    DicConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
                     DicConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
diff --git a/DiscImageChef.Tests.Devices/ATA/Cfa.cs b/DiscImageChef.Tests.Devices/ATA/Cfa.cs
index e38b7ef0d..65d9850e5 100644
--- a/DiscImageChef.Tests.Devices/ATA/Cfa.cs
+++ b/DiscImageChef.Tests.Devices/ATA/Cfa.cs
@@ -115,7 +115,7 @@ namespace DiscImageChef.Tests.Devices.ATA
                     System.Console.Clear();
                     DicConsole.WriteLine("Device: {0}", devPath);
                     DicConsole.WriteLine("REQUEST EXTENDED ERROR CODE status registers:");
-                    DicConsole.Write("{0}", MainClass.DecodeATARegisters(errorRegisters));
+                    DicConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
                     DicConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
@@ -216,7 +216,7 @@ namespace DiscImageChef.Tests.Devices.ATA
             DicConsole.WriteLine("Sending TRANSLATE SECTOR to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
@@ -255,7 +255,7 @@ namespace DiscImageChef.Tests.Devices.ATA
                     System.Console.Clear();
                     DicConsole.WriteLine("Device: {0}", devPath);
                     DicConsole.WriteLine("TRANSLATE SECTOR status registers:");
-                    DicConsole.Write("{0}", MainClass.DecodeATARegisters(errorRegisters));
+                    DicConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
                     DicConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
@@ -336,7 +336,7 @@ namespace DiscImageChef.Tests.Devices.ATA
             DicConsole.WriteLine("Sending TRANSLATE SECTOR to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
@@ -375,7 +375,7 @@ namespace DiscImageChef.Tests.Devices.ATA
                     System.Console.Clear();
                     DicConsole.WriteLine("Device: {0}", devPath);
                     DicConsole.WriteLine("TRANSLATE SECTOR status registers:");
-                    DicConsole.Write("{0}", MainClass.DecodeATARegisters(errorRegisters));
+                    DicConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
                     DicConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
diff --git a/DiscImageChef.Tests.Devices/ATA/MCPT.cs b/DiscImageChef.Tests.Devices/ATA/MCPT.cs
index 44cea8cc8..e741e846a 100644
--- a/DiscImageChef.Tests.Devices/ATA/MCPT.cs
+++ b/DiscImageChef.Tests.Devices/ATA/MCPT.cs
@@ -32,7 +32,7 @@ using DiscImageChef.Devices;
 
 namespace DiscImageChef.Tests.Devices.ATA
 {
-     static class MCPT
+     static class Mcpt
     {
         internal static void Menu(string devPath, Device dev)
         {
@@ -127,7 +127,7 @@ namespace DiscImageChef.Tests.Devices.ATA
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
             DicConsole.WriteLine("CHECK MEDIA CARD TYPE status registers:");
-            DicConsole.Write("{0}", MainClass.DecodeATARegisters(errorRegisters));
+            DicConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
             DicConsole.WriteLine("1.- Send command again.");
diff --git a/DiscImageChef.Tests.Devices/ATA/Smart.cs b/DiscImageChef.Tests.Devices/ATA/Smart.cs
index b71793011..be3d22017 100644
--- a/DiscImageChef.Tests.Devices/ATA/Smart.cs
+++ b/DiscImageChef.Tests.Devices/ATA/Smart.cs
@@ -111,7 +111,7 @@ namespace DiscImageChef.Tests.Devices.ATA
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
             DicConsole.WriteLine("DISABLE ATTRIBUTE AUTOSAVE status registers:");
-            DicConsole.Write("{0}", MainClass.DecodeATARegisters(errorRegisters));
+            DicConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
             DicConsole.WriteLine("1.- Send command again.");
@@ -153,7 +153,7 @@ namespace DiscImageChef.Tests.Devices.ATA
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
             DicConsole.WriteLine("DISABLE OPERATIONS status registers:");
-            DicConsole.Write("{0}", MainClass.DecodeATARegisters(errorRegisters));
+            DicConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
             DicConsole.WriteLine("1.- Send command again.");
@@ -197,7 +197,7 @@ namespace DiscImageChef.Tests.Devices.ATA
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
             DicConsole.WriteLine("ENABLE ATTRIBUTE AUTOSAVE status registers:");
-            DicConsole.Write("{0}", MainClass.DecodeATARegisters(errorRegisters));
+            DicConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
             DicConsole.WriteLine("1.- Send command again.");
@@ -239,7 +239,7 @@ namespace DiscImageChef.Tests.Devices.ATA
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
             DicConsole.WriteLine("ENABLE OPERATIONS status registers:");
-            DicConsole.Write("{0}", MainClass.DecodeATARegisters(errorRegisters));
+            DicConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
             DicConsole.WriteLine("1.- Send command again.");
@@ -327,7 +327,7 @@ namespace DiscImageChef.Tests.Devices.ATA
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
             DicConsole.WriteLine("EXECUTE OFF-LINE IMMEDIATE status registers:");
-            DicConsole.Write("{0}", MainClass.DecodeATARegisters(errorRegisters));
+            DicConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
             DicConsole.WriteLine("1.- Send command again.");
@@ -371,7 +371,7 @@ namespace DiscImageChef.Tests.Devices.ATA
             DicConsole.WriteLine("Sending READ DATA to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
@@ -409,7 +409,7 @@ namespace DiscImageChef.Tests.Devices.ATA
                     System.Console.Clear();
                     DicConsole.WriteLine("Device: {0}", devPath);
                     DicConsole.WriteLine("READ DATA status registers:");
-                    DicConsole.Write("{0}", MainClass.DecodeATARegisters(errorRegisters));
+                    DicConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
                     DicConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
@@ -481,7 +481,7 @@ namespace DiscImageChef.Tests.Devices.ATA
             DicConsole.WriteLine("Sending READ LOG to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
@@ -520,7 +520,7 @@ namespace DiscImageChef.Tests.Devices.ATA
                     System.Console.Clear();
                     DicConsole.WriteLine("Device: {0}", devPath);
                     DicConsole.WriteLine("READ LOG status registers:");
-                    DicConsole.Write("{0}", MainClass.DecodeATARegisters(errorRegisters));
+                    DicConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
                     DicConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
@@ -549,7 +549,7 @@ namespace DiscImageChef.Tests.Devices.ATA
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
             DicConsole.WriteLine("RETURN STATUS status registers:");
-            DicConsole.Write("{0}", MainClass.DecodeATARegisters(errorRegisters));
+            DicConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
             DicConsole.WriteLine("1.- Send command again.");
diff --git a/DiscImageChef.Tests.Devices/Command.cs b/DiscImageChef.Tests.Devices/Command.cs
index 6faeef60b..aef23ce89 100644
--- a/DiscImageChef.Tests.Devices/Command.cs
+++ b/DiscImageChef.Tests.Devices/Command.cs
@@ -61,10 +61,10 @@ namespace DiscImageChef.Tests.Devices
                         DicConsole.WriteLine("Returning to device menu...");
                         return;
                     case 1:
-                        SCSI(devPath, dev);
+                        Scsi(devPath, dev);
                         continue;
                     case 2:
-                        ATA(devPath, dev);
+                        Ata(devPath, dev);
                         continue;
                     case 3:
                         SecureDigital(devPath, dev);
diff --git a/DiscImageChef.Tests.Devices/DecodeATARegisters.cs b/DiscImageChef.Tests.Devices/DecodeATARegisters.cs
index f9b702d1b..d84016e9f 100644
--- a/DiscImageChef.Tests.Devices/DecodeATARegisters.cs
+++ b/DiscImageChef.Tests.Devices/DecodeATARegisters.cs
@@ -34,7 +34,7 @@ namespace DiscImageChef.Tests.Devices
 {
     partial class MainClass
     {
-        public static string DecodeATAStatus(byte status)
+        static string DecodeAtaStatus(byte status)
         {
             string ret = "";
 
@@ -50,7 +50,7 @@ namespace DiscImageChef.Tests.Devices
             return ret;
         }
 
-        public static string DecodeATAError(byte status)
+        static string DecodeAtaError(byte status)
         {
             string ret = "";
 
@@ -66,11 +66,11 @@ namespace DiscImageChef.Tests.Devices
             return ret;
         }
 
-        public static string DecodeATARegisters(AtaErrorRegistersChs registers)
+        public static string DecodeAtaRegisters(AtaErrorRegistersChs registers)
         {
             StringBuilder sb = new StringBuilder();
-            sb.AppendFormat("Status: {0}", DecodeATAStatus(registers.Status)).AppendLine();
-            sb.AppendFormat("Error: {0}", DecodeATAStatus(registers.Error)).AppendLine();
+            sb.AppendFormat("Status: {0}", DecodeAtaStatus(registers.Status)).AppendLine();
+            sb.AppendFormat("Error: {0}", DecodeAtaStatus(registers.Error)).AppendLine();
             sb.AppendFormat("Device: {0}", (registers.DeviceHead >> 4) & 0x01).AppendLine();
             sb.AppendFormat("Cylinder: {0}", registers.CylinderHigh << (8 + registers.CylinderLow)).AppendLine();
             sb.AppendFormat("Head: {0}", registers.DeviceHead & 0xF).AppendLine();
@@ -82,11 +82,11 @@ namespace DiscImageChef.Tests.Devices
             return sb.ToString();
         }
 
-        public static string DecodeATARegisters(AtaErrorRegistersLba28 registers)
+        public static string DecodeAtaRegisters(AtaErrorRegistersLba28 registers)
         {
             StringBuilder sb = new StringBuilder();
-            sb.AppendFormat("Status: {0}", DecodeATAStatus(registers.Status)).AppendLine();
-            sb.AppendFormat("Error: {0}", DecodeATAStatus(registers.Error)).AppendLine();
+            sb.AppendFormat("Status: {0}", DecodeAtaStatus(registers.Status)).AppendLine();
+            sb.AppendFormat("Error: {0}", DecodeAtaStatus(registers.Error)).AppendLine();
             sb.AppendFormat("Device: {0}", (registers.DeviceHead >> 4) & 0x01).AppendLine();
             sb.AppendFormat("LBA: {0}",
                             ((registers.DeviceHead & 0xF) << 24) + (registers.LbaHigh << 16) + (registers.LbaMid << 8) +
@@ -98,11 +98,11 @@ namespace DiscImageChef.Tests.Devices
             return sb.ToString();
         }
 
-        public static string DecodeATARegisters(AtaErrorRegistersLba48 registers)
+        public static string DecodeAtaRegisters(AtaErrorRegistersLba48 registers)
         {
             StringBuilder sb = new StringBuilder();
-            sb.AppendFormat("Status: {0}", DecodeATAStatus(registers.Status)).AppendLine();
-            sb.AppendFormat("Error: {0}", DecodeATAStatus(registers.Error)).AppendLine();
+            sb.AppendFormat("Status: {0}", DecodeAtaStatus(registers.Status)).AppendLine();
+            sb.AppendFormat("Error: {0}", DecodeAtaStatus(registers.Error)).AppendLine();
             sb.AppendFormat("Device: {0}", (registers.DeviceHead >> 4) & 0x01).AppendLine();
             sb.AppendFormat("LBA: {0}",
                             (ulong)(registers.DeviceHead & 0xF) * 0x100000000000 +
diff --git a/DiscImageChef.Tests.Devices/Device.cs b/DiscImageChef.Tests.Devices/Device.cs
index 34a468606..3ffdb28e5 100644
--- a/DiscImageChef.Tests.Devices/Device.cs
+++ b/DiscImageChef.Tests.Devices/Device.cs
@@ -58,7 +58,7 @@ namespace DiscImageChef.Tests.Devices
                 DicConsole.WriteLine("dev.USBVendorID = 0x{0:X4}", dev.UsbVendorId);
                 DicConsole.WriteLine("dev.USBProductID = 0x{0:X4}", dev.UsbProductId);
                 DicConsole.WriteLine("dev.USBDescriptors.Length = {0}",
-                                     dev.UsbDescriptors == null ? "null" : dev.UsbDescriptors.Length.ToString());
+                                     dev.UsbDescriptors?.Length.ToString() ?? "null");
                 DicConsole.WriteLine("dev.USBManufacturerString = \"{0}\"", dev.UsbManufacturerString);
                 DicConsole.WriteLine("dev.USBProductString = \"{0}\"", dev.UsbProductString);
                 DicConsole.WriteLine("dev.USBSerialString = \"{0}\"", dev.UsbSerialString);
@@ -70,7 +70,7 @@ namespace DiscImageChef.Tests.Devices
                 DicConsole.WriteLine("dev.FireWireVendorName = \"{0}\"", dev.FireWireVendorName);
                 DicConsole.WriteLine("dev.IsCompactFlash = {0}", dev.IsCompactFlash);
                 DicConsole.WriteLine("dev.IsPCMCIA = {0}", dev.IsPcmcia);
-                DicConsole.WriteLine("dev.CIS.Length = {0}", dev.Cis == null ? "null" : dev.Cis.Length.ToString());
+                DicConsole.WriteLine("dev.CIS.Length = {0}", dev.Cis?.Length.ToString() ?? "null");
 
                 DicConsole.WriteLine("Press any key to continue...", devPath);
                 System.Console.ReadKey();
diff --git a/DiscImageChef.Tests.Devices/Main.cs b/DiscImageChef.Tests.Devices/Main.cs
index b6ce5f835..8d561eaa1 100644
--- a/DiscImageChef.Tests.Devices/Main.cs
+++ b/DiscImageChef.Tests.Devices/Main.cs
@@ -52,9 +52,6 @@ namespace DiscImageChef.Tests.Devices
 
             devices = devices.OrderBy(d => d.Path).ToArray();
 
-            int item;
-            string strDev;
-
             while(true)
             {
                 System.Console.Clear();
@@ -72,8 +69,8 @@ namespace DiscImageChef.Tests.Devices
                                          devices[i].Supported, i + 1);
 
                 DicConsole.Write("Please choose which drive to test (0 to exit): ");
-                strDev = System.Console.ReadLine();
-                if(!int.TryParse(strDev, out item))
+                string strDev = System.Console.ReadLine();
+                if(!int.TryParse(strDev, out int item))
                 {
                     DicConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
diff --git a/DiscImageChef.Tests.Devices/SCSI.cs b/DiscImageChef.Tests.Devices/SCSI.cs
index 8c8a0f3e3..94ffd5ed1 100644
--- a/DiscImageChef.Tests.Devices/SCSI.cs
+++ b/DiscImageChef.Tests.Devices/SCSI.cs
@@ -34,7 +34,7 @@ namespace DiscImageChef.Tests.Devices
 {
     partial class MainClass
     {
-        public static void SCSI(string devPath, Device dev)
+        public static void Scsi(string devPath, Device dev)
         {
             while(true)
             {
@@ -87,19 +87,19 @@ namespace DiscImageChef.Tests.Devices
                         Fujitsu.Menu(devPath, dev);
                         continue;
                     case 5:
-                        HL_DT_ST.Menu(devPath, dev);
+                        HlDtSt.Menu(devPath, dev);
                         continue;
                     case 6:
-                        HP.Menu(devPath, dev);
+                        Hp.Menu(devPath, dev);
                         continue;
                     case 7:
                         Kreon.Menu(devPath, dev);
                         continue;
                     case 8:
-                        MMC.Menu(devPath, dev);
+                        Mmc.Menu(devPath, dev);
                         continue;
                     case 9:
-                        NEC.Menu(devPath, dev);
+                        Nec.Menu(devPath, dev);
                         continue;
                     case 10:
                         Pioneer.Menu(devPath, dev);
@@ -111,16 +111,16 @@ namespace DiscImageChef.Tests.Devices
                         Plextor.Menu(devPath, dev);
                         continue;
                     case 13:
-                        SBC.Menu(devPath, dev);
+                        Sbc.Menu(devPath, dev);
                         continue;
                     case 14:
-                        SMC.Menu(devPath, dev);
+                        Smc.Menu(devPath, dev);
                         continue;
                     case 15:
-                        SPC.Menu(devPath, dev);
+                        Spc.Menu(devPath, dev);
                         continue;
                     case 16:
-                        SSC.Menu(devPath, dev);
+                        Ssc.Menu(devPath, dev);
                         continue;
                     case 17:
                         SyQuest.Menu(devPath, dev);
diff --git a/DiscImageChef.Tests.Devices/SCSI/Adaptec.cs b/DiscImageChef.Tests.Devices/SCSI/Adaptec.cs
index 4703cf90b..50bcf9cde 100644
--- a/DiscImageChef.Tests.Devices/SCSI/Adaptec.cs
+++ b/DiscImageChef.Tests.Devices/SCSI/Adaptec.cs
@@ -138,10 +138,10 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("Sending READ/RESET USAGE COUNTER to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
@@ -219,10 +219,10 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("Sending READ DATA BUFFER to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
@@ -357,7 +357,7 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine("SET ERROR THRESHOLD decoded sense:");
             DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
@@ -472,10 +472,10 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("Sending TRANSLATE to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
diff --git a/DiscImageChef.Tests.Devices/SCSI/ArchiveCorp.cs b/DiscImageChef.Tests.Devices/SCSI/ArchiveCorp.cs
index 904607f7e..e71b5aa78 100644
--- a/DiscImageChef.Tests.Devices/SCSI/ArchiveCorp.cs
+++ b/DiscImageChef.Tests.Devices/SCSI/ArchiveCorp.cs
@@ -130,10 +130,10 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("Sending REQUEST BLOCK ADDRESS to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
@@ -269,7 +269,7 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine("SEEK BLOCK decoded sense:");
             DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
diff --git a/DiscImageChef.Tests.Devices/SCSI/Certance.cs b/DiscImageChef.Tests.Devices/SCSI/Certance.cs
index edde6e191..8ee1f3897 100644
--- a/DiscImageChef.Tests.Devices/SCSI/Certance.cs
+++ b/DiscImageChef.Tests.Devices/SCSI/Certance.cs
@@ -85,7 +85,7 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine("PARK decoded sense:");
             DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
@@ -141,7 +141,7 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine("UNPARK decoded sense:");
             DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
diff --git a/DiscImageChef.Tests.Devices/SCSI/Fujitsu.cs b/DiscImageChef.Tests.Devices/SCSI/Fujitsu.cs
index a809bad3c..95903bf16 100644
--- a/DiscImageChef.Tests.Devices/SCSI/Fujitsu.cs
+++ b/DiscImageChef.Tests.Devices/SCSI/Fujitsu.cs
@@ -150,7 +150,7 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine("DISPLAY decoded sense:");
             DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
diff --git a/DiscImageChef.Tests.Devices/SCSI/HL-DT-ST.cs b/DiscImageChef.Tests.Devices/SCSI/HL-DT-ST.cs
index ed076d2f4..04845fada 100644
--- a/DiscImageChef.Tests.Devices/SCSI/HL-DT-ST.cs
+++ b/DiscImageChef.Tests.Devices/SCSI/HL-DT-ST.cs
@@ -32,7 +32,7 @@ using DiscImageChef.Devices;
 
 namespace DiscImageChef.Tests.Devices.SCSI
 {
-    static class HL_DT_ST
+    static class HlDtSt
     {
         internal static void Menu(string devPath, Device dev)
         {
@@ -138,10 +138,10 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("Sending READ DVD (RAW) to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
diff --git a/DiscImageChef.Tests.Devices/SCSI/HP.cs b/DiscImageChef.Tests.Devices/SCSI/HP.cs
index 7a31d3501..c0151f50c 100644
--- a/DiscImageChef.Tests.Devices/SCSI/HP.cs
+++ b/DiscImageChef.Tests.Devices/SCSI/HP.cs
@@ -32,7 +32,7 @@ using DiscImageChef.Devices;
 
 namespace DiscImageChef.Tests.Devices.SCSI
 {
-    static class HP
+    static class Hp
     {
         internal static void Menu(string devPath, Device dev)
         {
@@ -187,10 +187,10 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("Sending READ LONG to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
diff --git a/DiscImageChef.Tests.Devices/SCSI/Kreon.cs b/DiscImageChef.Tests.Devices/SCSI/Kreon.cs
index e5caaf8e4..126d4f5fc 100644
--- a/DiscImageChef.Tests.Devices/SCSI/Kreon.cs
+++ b/DiscImageChef.Tests.Devices/SCSI/Kreon.cs
@@ -139,10 +139,10 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("Sending EXTRACT SS to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
@@ -221,7 +221,7 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine("Features: {0}.", features);
             DicConsole.WriteLine("GET FEATURE LIST decoded sense:");
@@ -370,7 +370,7 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine("UNLOCK decoded sense:");
             DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
diff --git a/DiscImageChef.Tests.Devices/SCSI/MMC.cs b/DiscImageChef.Tests.Devices/SCSI/MMC.cs
index bc8816143..dd7b3e361 100644
--- a/DiscImageChef.Tests.Devices/SCSI/MMC.cs
+++ b/DiscImageChef.Tests.Devices/SCSI/MMC.cs
@@ -35,7 +35,7 @@ using DiscImageChef.Devices;
 
 namespace DiscImageChef.Tests.Devices.SCSI
 {
-    static class MMC
+    static class Mmc
     {
         internal static void Menu(string devPath, Device dev)
         {
@@ -173,10 +173,10 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("Sending GET CONFIGURATION to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
@@ -574,7 +574,7 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine("PREVENT ALLOW MEDIUM REMOVAL decoded sense:");
             DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
@@ -824,10 +824,10 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("Sending READ CD to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
@@ -1131,10 +1131,10 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("Sending READ CD MSF to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
@@ -1262,10 +1262,10 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("Sending READ DISC INFORMATION to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
@@ -1500,10 +1500,10 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("Sending READ DISC STRUCTURE to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
@@ -1661,10 +1661,10 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("Sending READ TOC/PMA/ATIP to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
@@ -1887,7 +1887,7 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine("START STOP UNIT decoded sense:");
             DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
diff --git a/DiscImageChef.Tests.Devices/SCSI/NEC.cs b/DiscImageChef.Tests.Devices/SCSI/NEC.cs
index 3a299447a..99d2e1090 100644
--- a/DiscImageChef.Tests.Devices/SCSI/NEC.cs
+++ b/DiscImageChef.Tests.Devices/SCSI/NEC.cs
@@ -32,7 +32,7 @@ using DiscImageChef.Devices;
 
 namespace DiscImageChef.Tests.Devices.SCSI
 {
-    static class NEC
+    static class Nec
     {
         internal static void Menu(string devPath, Device dev)
         {
@@ -138,10 +138,10 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("Sending READ CD-DA to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
diff --git a/DiscImageChef.Tests.Devices/SCSI/Pioneer.cs b/DiscImageChef.Tests.Devices/SCSI/Pioneer.cs
index 07b96f59c..437ee2138 100644
--- a/DiscImageChef.Tests.Devices/SCSI/Pioneer.cs
+++ b/DiscImageChef.Tests.Devices/SCSI/Pioneer.cs
@@ -181,10 +181,10 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("Sending READ CD-DA to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
@@ -399,10 +399,10 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("Sending READ CD-DA MSF to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
@@ -561,10 +561,10 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("Sending READ CD-XA to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
diff --git a/DiscImageChef.Tests.Devices/SCSI/Plasmon.cs b/DiscImageChef.Tests.Devices/SCSI/Plasmon.cs
index df1ec7349..4c289f00b 100644
--- a/DiscImageChef.Tests.Devices/SCSI/Plasmon.cs
+++ b/DiscImageChef.Tests.Devices/SCSI/Plasmon.cs
@@ -191,10 +191,10 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("Sending READ LONG to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
@@ -328,10 +328,10 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("Sending READ SECTOR LOCATION to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
diff --git a/DiscImageChef.Tests.Devices/SCSI/Plextor.cs b/DiscImageChef.Tests.Devices/SCSI/Plextor.cs
index 3b487e8b8..3c54f47e6 100644
--- a/DiscImageChef.Tests.Devices/SCSI/Plextor.cs
+++ b/DiscImageChef.Tests.Devices/SCSI/Plextor.cs
@@ -179,10 +179,10 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("Sending GET BOOK BITSETTING to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
@@ -260,10 +260,10 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("Sending GET GIGAREC to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
@@ -339,10 +339,10 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("Sending GET SECUREC to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
@@ -418,10 +418,10 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("Sending GET SILENT MODE to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
@@ -497,10 +497,10 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("Sending GET SINGLE-SESSION / HIDE CD-R to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
@@ -576,10 +576,10 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("Sending GET SPEEDREAD to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
@@ -656,10 +656,10 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("Sending GET TEST WRITE DVD+ to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
@@ -780,10 +780,10 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("Sending GET VARIREC to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
@@ -864,7 +864,7 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("PoweRec is {0}.", enabled ? "enabled" : "disabled");
             DicConsole.WriteLine("Speed: {0}", speed);
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine("POWEREC GET SPEEDS decoded sense:");
             DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
@@ -1013,10 +1013,10 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("Sending READ CD-DA to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
@@ -1151,10 +1151,10 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("Sending READ DVD (RAW) to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
@@ -1232,10 +1232,10 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("Sending READ EEPROM to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
@@ -1368,10 +1368,10 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("Sending READ EEPROM to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
@@ -1449,10 +1449,10 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("Sending READ EEPROM to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
diff --git a/DiscImageChef.Tests.Devices/SCSI/SBC.cs b/DiscImageChef.Tests.Devices/SCSI/SBC.cs
index 703ffd6b3..699f77170 100644
--- a/DiscImageChef.Tests.Devices/SCSI/SBC.cs
+++ b/DiscImageChef.Tests.Devices/SCSI/SBC.cs
@@ -32,7 +32,7 @@ using DiscImageChef.Devices;
 
 namespace DiscImageChef.Tests.Devices.SCSI
 {
-    static class SBC
+    static class Sbc
     {
         internal static void Menu(string devPath, Device dev)
         {
@@ -183,10 +183,10 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("Sending READ (6) to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
@@ -405,10 +405,10 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("Sending READ (10) to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
@@ -639,10 +639,10 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("Sending READ (12) to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
@@ -861,10 +861,10 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("Sending READ (16) to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
@@ -1023,10 +1023,10 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("Sending READ LONG (10) to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
@@ -1173,10 +1173,10 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("Sending READ LONG (16) to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
@@ -1305,7 +1305,7 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine("SEEK (6) decoded sense:");
             DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
@@ -1408,7 +1408,7 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine("SEEK (6) decoded sense:");
             DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
diff --git a/DiscImageChef.Tests.Devices/SCSI/SMC.cs b/DiscImageChef.Tests.Devices/SCSI/SMC.cs
index f6891409b..66ea22a0a 100644
--- a/DiscImageChef.Tests.Devices/SCSI/SMC.cs
+++ b/DiscImageChef.Tests.Devices/SCSI/SMC.cs
@@ -33,7 +33,7 @@ using DiscImageChef.Devices;
 
 namespace DiscImageChef.Tests.Devices.SCSI
 {
-    static class SMC
+    static class Smc
     {
         internal static void Menu(string devPath, Device dev)
         {
@@ -204,10 +204,10 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("Sending READ ATTRIBUTE to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
diff --git a/DiscImageChef.Tests.Devices/SCSI/SPC.cs b/DiscImageChef.Tests.Devices/SCSI/SPC.cs
index b16ac3509..d35173192 100644
--- a/DiscImageChef.Tests.Devices/SCSI/SPC.cs
+++ b/DiscImageChef.Tests.Devices/SCSI/SPC.cs
@@ -33,7 +33,7 @@ using DiscImageChef.Devices;
 
 namespace DiscImageChef.Tests.Devices.SCSI
 {
-    static class SPC
+    static class Spc
     {
         internal static void Menu(string devPath, Device dev)
         {
@@ -117,10 +117,10 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("Sending INQUIRY to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
@@ -252,10 +252,10 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("Sending INQUIRY to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
@@ -418,10 +418,10 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("Sending MODE SENSE (6) to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
@@ -608,10 +608,10 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("Sending MODE SENSE (10) to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
@@ -864,10 +864,10 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("Sending READ CAPACITY (10) to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
@@ -1002,10 +1002,10 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("Sending READ CAPACITY (16) to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
@@ -1083,10 +1083,10 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("Sending READ MEDIA SERIAL NUMBER to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
@@ -1207,7 +1207,7 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine("REQUEST SENSE decoded sense:");
             DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
@@ -1265,7 +1265,7 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine("TEST UNIT READY decoded sense:");
             DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
diff --git a/DiscImageChef.Tests.Devices/SCSI/SSC.cs b/DiscImageChef.Tests.Devices/SCSI/SSC.cs
index 518bf85aa..9465e0479 100644
--- a/DiscImageChef.Tests.Devices/SCSI/SSC.cs
+++ b/DiscImageChef.Tests.Devices/SCSI/SSC.cs
@@ -34,7 +34,7 @@ using DiscImageChef.Devices;
 
 namespace DiscImageChef.Tests.Devices.SCSI
 {
-    static class SSC
+    static class Ssc
     {
         internal static void Menu(string devPath, Device dev)
         {
@@ -229,7 +229,7 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine("LOAD UNLOAD decoded sense:");
             DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
@@ -381,7 +381,7 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine("LOCATE (10) decoded sense:");
             DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
@@ -549,7 +549,7 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine("LOCATE (16) decoded sense:");
             DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
@@ -697,10 +697,10 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("Sending READ (6) to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
@@ -891,10 +891,10 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("Sending READ (16) to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
@@ -972,10 +972,10 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("Sending READ BLOCK LIMITS to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
@@ -1106,7 +1106,7 @@ namespace DiscImageChef.Tests.Devices.SCSI
 
             start:
             System.Console.Clear();
-            bool sense = dev.ReadPosition(out byte[] buffer, out byte[] senseBuffer, responseForm, dev.Timeout,
+            bool sense = dev.ReadPosition(out _, out byte[] senseBuffer, responseForm, dev.Timeout,
                                           out double duration);
 
             menu:
@@ -1115,7 +1115,7 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine("READ POSITION decoded sense:");
             DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
@@ -1275,10 +1275,10 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("Sending READ REVERSE (6) to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
@@ -1481,10 +1481,10 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("Sending READ REVERSE (16) to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
@@ -1652,10 +1652,10 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("Sending RECOVER BUFFERED DATA to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
@@ -1790,10 +1790,10 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("Sending REPORT DENSITY SUPPORT to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
@@ -1834,8 +1834,10 @@ namespace DiscImageChef.Tests.Devices.SCSI
                     System.Console.Clear();
                     DicConsole.WriteLine("Device: {0}", devPath);
                     DicConsole.WriteLine("REPORT DENSITY SUPPORT decoded buffer:");
-                    if(medium) DicConsole.Write("{0}", DensitySupport.PrettifyMediumType(buffer));
-                    else DicConsole.Write("{0}", DensitySupport.PrettifyDensity(buffer));
+                    DicConsole.Write("{0}",
+                                     medium
+                                         ? DensitySupport.PrettifyMediumType(buffer)
+                                         : DensitySupport.PrettifyDensity(buffer));
                     DicConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
@@ -1928,7 +1930,7 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine("REWIND decoded sense:");
             DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
@@ -2047,7 +2049,7 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine("SPACE decoded sense:");
             DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
@@ -2150,7 +2152,7 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine("TRACK SELECT decoded sense:");
             DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
diff --git a/DiscImageChef.Tests.Devices/SCSI/SyQuest.cs b/DiscImageChef.Tests.Devices/SCSI/SyQuest.cs
index b12e0c42f..983ad1534 100644
--- a/DiscImageChef.Tests.Devices/SCSI/SyQuest.cs
+++ b/DiscImageChef.Tests.Devices/SCSI/SyQuest.cs
@@ -183,10 +183,10 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("Sending READ {0}(6) to the device:", readlong ? "LONG " : "");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
@@ -345,10 +345,10 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("Sending READ {0}(10) to the device:", readlong ? "LONG " : "");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
@@ -416,9 +416,6 @@ namespace DiscImageChef.Tests.Devices.SCSI
 
         static void ReadResetUsageCounter(string devPath, Device dev)
         {
-            string strDev;
-            int item;
-
             start:
             System.Console.Clear();
             bool sense =
@@ -430,10 +427,10 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("Sending READ/RESET USAGE COUNTER to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
             DicConsole.WriteLine("Sense buffer is {0} bytes.",
-                                 senseBuffer == null ? "null" : senseBuffer.Length.ToString());
+                                 senseBuffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
@@ -444,8 +441,8 @@ namespace DiscImageChef.Tests.Devices.SCSI
             DicConsole.WriteLine("0.- Return to SyQuest vendor commands menu.");
             DicConsole.Write("Choose: ");
 
-            strDev = System.Console.ReadLine();
-            if(!int.TryParse(strDev, out item))
+            string strDev = System.Console.ReadLine();
+            if(!int.TryParse(strDev, out int item))
             {
                 DicConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
diff --git a/DiscImageChef.Tests.Devices/SecureDigital/MultiMediaCard.cs b/DiscImageChef.Tests.Devices/SecureDigital/MultiMediaCard.cs
index 5f6e333a6..2345e6558 100644
--- a/DiscImageChef.Tests.Devices/SecureDigital/MultiMediaCard.cs
+++ b/DiscImageChef.Tests.Devices/SecureDigital/MultiMediaCard.cs
@@ -71,13 +71,13 @@ namespace DiscImageChef.Tests.Devices.SecureDigital
                         Read(devPath, dev, false);
                         continue;
                     case 3:
-                        SendCID(devPath, dev);
+                        SendCid(devPath, dev);
                         continue;
                     case 4:
-                        SendCSD(devPath, dev);
+                        SendCsd(devPath, dev);
                         continue;
                     case 5:
-                        SendExtendedCSD(devPath, dev);
+                        SendExtendedCsd(devPath, dev);
                         continue;
                     case 6:
                         SendOpCond(devPath, dev);
@@ -191,9 +191,9 @@ namespace DiscImageChef.Tests.Devices.SecureDigital
             DicConsole.WriteLine("Sending READ_{0}_BLOCK to the device:", multiple ? "MULTIPLE" : "SINGLE");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Response has {0} elements.", response == null ? "null" : response.Length.ToString());
+            DicConsole.WriteLine("Response has {0} elements.", response?.Length.ToString() ?? "null");
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
             DicConsole.WriteLine("1.- Print buffer.");
@@ -264,9 +264,9 @@ namespace DiscImageChef.Tests.Devices.SecureDigital
             DicConsole.WriteLine("Sending SEND_OP_COND to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Response has {0} elements.", response == null ? "null" : response.Length.ToString());
+            DicConsole.WriteLine("Response has {0} elements.", response?.Length.ToString() ?? "null");
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
             DicConsole.WriteLine("1.- Print buffer.");
@@ -346,9 +346,9 @@ namespace DiscImageChef.Tests.Devices.SecureDigital
             DicConsole.WriteLine("Sending SEND_STATUS to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Response has {0} elements.", response == null ? "null" : response.Length.ToString());
+            DicConsole.WriteLine("Response has {0} elements.", response?.Length.ToString() ?? "null");
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
             DicConsole.WriteLine("1.- Print buffer.");
@@ -406,7 +406,7 @@ namespace DiscImageChef.Tests.Devices.SecureDigital
             }
         }
 
-        static void SendCID(string devPath, Device dev)
+        static void SendCid(string devPath, Device dev)
         {
             start:
             System.Console.Clear();
@@ -417,9 +417,9 @@ namespace DiscImageChef.Tests.Devices.SecureDigital
             DicConsole.WriteLine("Sending SEND_CID to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Response has {0} elements.", response == null ? "null" : response.Length.ToString());
+            DicConsole.WriteLine("Response has {0} elements.", response?.Length.ToString() ?? "null");
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
             DicConsole.WriteLine("1.- Print buffer.");
@@ -488,7 +488,7 @@ namespace DiscImageChef.Tests.Devices.SecureDigital
             }
         }
 
-        static void SendCSD(string devPath, Device dev)
+        static void SendCsd(string devPath, Device dev)
         {
             start:
             System.Console.Clear();
@@ -499,9 +499,9 @@ namespace DiscImageChef.Tests.Devices.SecureDigital
             DicConsole.WriteLine("Sending SEND_CSD to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Response has {0} elements.", response == null ? "null" : response.Length.ToString());
+            DicConsole.WriteLine("Response has {0} elements.", response?.Length.ToString() ?? "null");
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
             DicConsole.WriteLine("1.- Print buffer.");
@@ -570,7 +570,7 @@ namespace DiscImageChef.Tests.Devices.SecureDigital
             }
         }
 
-        static void SendExtendedCSD(string devPath, Device dev)
+        static void SendExtendedCsd(string devPath, Device dev)
         {
             start:
             System.Console.Clear();
@@ -581,9 +581,9 @@ namespace DiscImageChef.Tests.Devices.SecureDigital
             DicConsole.WriteLine("Sending SEND_EXT_CSD to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Response has {0} elements.", response == null ? "null" : response.Length.ToString());
+            DicConsole.WriteLine("Response has {0} elements.", response?.Length.ToString() ?? "null");
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
             DicConsole.WriteLine("1.- Print buffer.");
@@ -708,7 +708,7 @@ namespace DiscImageChef.Tests.Devices.SecureDigital
             DicConsole.WriteLine("Sending SET_BLOCKLEN to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Response has {0} elements.", response == null ? "null" : response.Length.ToString());
+            DicConsole.WriteLine("Response has {0} elements.", response?.Length.ToString() ?? "null");
             DicConsole.WriteLine("SET_BLOCKLEN response:");
             if(response != null)
             {
diff --git a/DiscImageChef.Tests.Devices/SecureDigital/SecureDigital.cs b/DiscImageChef.Tests.Devices/SecureDigital/SecureDigital.cs
index 9c02d2b2a..837355ffb 100644
--- a/DiscImageChef.Tests.Devices/SecureDigital/SecureDigital.cs
+++ b/DiscImageChef.Tests.Devices/SecureDigital/SecureDigital.cs
@@ -77,13 +77,13 @@ namespace DiscImageChef.Tests.Devices.SecureDigital
                         Status(devPath, dev);
                         continue;
                     case 5:
-                        SendCID(devPath, dev);
+                        SendCid(devPath, dev);
                         continue;
                     case 6:
-                        SendCSD(devPath, dev);
+                        SendCsd(devPath, dev);
                         continue;
                     case 7:
-                        SendSCR(devPath, dev);
+                        SendScr(devPath, dev);
                         continue;
                     case 8:
                         SetBlockLength(devPath, dev);
@@ -191,9 +191,9 @@ namespace DiscImageChef.Tests.Devices.SecureDigital
             DicConsole.WriteLine("Sending READ_{0}_BLOCK to the device:", multiple ? "MULTIPLE" : "SINGLE");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Response has {0} elements.", response == null ? "null" : response.Length.ToString());
+            DicConsole.WriteLine("Response has {0} elements.", response?.Length.ToString() ?? "null");
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
             DicConsole.WriteLine("1.- Print buffer.");
@@ -264,9 +264,9 @@ namespace DiscImageChef.Tests.Devices.SecureDigital
             DicConsole.WriteLine("Sending SD_SEND_OP_COND to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Response has {0} elements.", response == null ? "null" : response.Length.ToString());
+            DicConsole.WriteLine("Response has {0} elements.", response?.Length.ToString() ?? "null");
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
             DicConsole.WriteLine("1.- Print buffer.");
@@ -346,9 +346,9 @@ namespace DiscImageChef.Tests.Devices.SecureDigital
             DicConsole.WriteLine("Sending SD_STATUS to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Response has {0} elements.", response == null ? "null" : response.Length.ToString());
+            DicConsole.WriteLine("Response has {0} elements.", response?.Length.ToString() ?? "null");
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
             DicConsole.WriteLine("1.- Print buffer.");
@@ -406,7 +406,7 @@ namespace DiscImageChef.Tests.Devices.SecureDigital
             }
         }
 
-        static void SendCID(string devPath, Device dev)
+        static void SendCid(string devPath, Device dev)
         {
             start:
             System.Console.Clear();
@@ -417,9 +417,9 @@ namespace DiscImageChef.Tests.Devices.SecureDigital
             DicConsole.WriteLine("Sending SEND_CID to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Response has {0} elements.", response == null ? "null" : response.Length.ToString());
+            DicConsole.WriteLine("Response has {0} elements.", response?.Length.ToString() ?? "null");
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
             DicConsole.WriteLine("1.- Print buffer.");
@@ -488,7 +488,7 @@ namespace DiscImageChef.Tests.Devices.SecureDigital
             }
         }
 
-        static void SendCSD(string devPath, Device dev)
+        static void SendCsd(string devPath, Device dev)
         {
             start:
             System.Console.Clear();
@@ -499,9 +499,9 @@ namespace DiscImageChef.Tests.Devices.SecureDigital
             DicConsole.WriteLine("Sending SEND_CSD to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Response has {0} elements.", response == null ? "null" : response.Length.ToString());
+            DicConsole.WriteLine("Response has {0} elements.", response?.Length.ToString() ?? "null");
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
             DicConsole.WriteLine("1.- Print buffer.");
@@ -570,7 +570,7 @@ namespace DiscImageChef.Tests.Devices.SecureDigital
             }
         }
 
-        static void SendSCR(string devPath, Device dev)
+        static void SendScr(string devPath, Device dev)
         {
             start:
             System.Console.Clear();
@@ -581,9 +581,9 @@ namespace DiscImageChef.Tests.Devices.SecureDigital
             DicConsole.WriteLine("Sending SEND_SCR to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Buffer is {0} bytes.", buffer == null ? "null" : buffer.Length.ToString());
+            DicConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
             DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Response has {0} elements.", response == null ? "null" : response.Length.ToString());
+            DicConsole.WriteLine("Response has {0} elements.", response?.Length.ToString() ?? "null");
             DicConsole.WriteLine();
             DicConsole.WriteLine("Choose what to do:");
             DicConsole.WriteLine("1.- Print buffer.");
@@ -708,7 +708,7 @@ namespace DiscImageChef.Tests.Devices.SecureDigital
             DicConsole.WriteLine("Sending SET_BLOCKLEN to the device:");
             DicConsole.WriteLine("Command took {0} ms.", duration);
             DicConsole.WriteLine("Sense is {0}.", sense);
-            DicConsole.WriteLine("Response has {0} elements.", response == null ? "null" : response.Length.ToString());
+            DicConsole.WriteLine("Response has {0} elements.", response?.Length.ToString() ?? "null");
             DicConsole.WriteLine("SET_BLOCKLEN response:");
             if(response != null)
             {