From 9083dc4c306380cce01a775b686b18625d4fc4fc Mon Sep 17 00:00:00 2001
From: Natalia Portillo <claunia@claunia.com>
Date: Thu, 21 Dec 2017 17:45:39 +0000
Subject: [PATCH] REFACTOR: Replace if statement with null-propagating code.

---
 SCSI/Modes/00_SFF.cs      | 6 ++----
 SCSI/Modes/01.cs          | 6 ++----
 SCSI/Modes/01_MMC.cs      | 6 ++----
 SCSI/Modes/02.cs          | 6 ++----
 SCSI/Modes/03.cs          | 6 ++----
 SCSI/Modes/04.cs          | 6 ++----
 SCSI/Modes/05.cs          | 6 ++----
 SCSI/Modes/06.cs          | 6 ++----
 SCSI/Modes/07.cs          | 6 ++----
 SCSI/Modes/07_MMC.cs      | 6 ++----
 SCSI/Modes/08.cs          | 6 ++----
 SCSI/Modes/0A.cs          | 6 ++----
 SCSI/Modes/0B.cs          | 6 ++----
 SCSI/Modes/0D.cs          | 6 ++----
 SCSI/Modes/0E.cs          | 6 ++----
 SCSI/Modes/0F.cs          | 6 ++----
 SCSI/Modes/10.cs          | 6 ++----
 SCSI/Modes/10_SSC.cs      | 6 ++----
 SCSI/Modes/11.cs          | 6 ++----
 SCSI/Modes/1A.cs          | 6 ++----
 SCSI/Modes/1B.cs          | 6 ++----
 SCSI/Modes/1C.cs          | 6 ++----
 SCSI/Modes/1C_SFF.cs      | 6 ++----
 SCSI/Modes/1D.cs          | 6 ++----
 SCSI/Modes/21_Certance.cs | 6 ++----
 SCSI/Modes/22_Certance.cs | 6 ++----
 SCSI/Modes/24_IBM.cs      | 6 ++----
 SCSI/Modes/2A.cs          | 6 ++----
 SCSI/Modes/2F_IBM.cs      | 6 ++----
 SCSI/Modes/30_Apple.cs    | 6 ++----
 SCSI/Modes/3B_HP.cs       | 6 ++----
 SCSI/Modes/3C_HP.cs       | 6 ++----
 SCSI/Modes/3D_HP.cs       | 6 ++----
 SCSI/Modes/3D_IBM.cs      | 6 ++----
 SCSI/Modes/3E_Fujitsu.cs  | 6 ++----
 SCSI/Modes/3E_HP.cs       | 6 ++----
 36 files changed, 72 insertions(+), 144 deletions(-)

diff --git a/SCSI/Modes/00_SFF.cs b/SCSI/Modes/00_SFF.cs
index ff2f6b9..fde4894 100644
--- a/SCSI/Modes/00_SFF.cs
+++ b/SCSI/Modes/00_SFF.cs
@@ -68,11 +68,9 @@ namespace DiscImageChef.Decoders.SCSI
 
         public static ModePage_00_SFF? DecodeModePage_00_SFF(byte[] pageResponse)
         {
-            if(pageResponse == null) return null;
+            if((pageResponse?[0] & 0x40) == 0x40) return null;
 
-            if((pageResponse[0] & 0x40) == 0x40) return null;
-
-            if((pageResponse[0] & 0x3F) != 0x00) return null;
+            if((pageResponse?[0] & 0x3F) != 0x00) return null;
 
             if(pageResponse[1] + 2 != pageResponse.Length) return null;
 
diff --git a/SCSI/Modes/01.cs b/SCSI/Modes/01.cs
index 8b2d88a..f54424c 100644
--- a/SCSI/Modes/01.cs
+++ b/SCSI/Modes/01.cs
@@ -113,11 +113,9 @@ namespace DiscImageChef.Decoders.SCSI
 
         public static ModePage_01? DecodeModePage_01(byte[] pageResponse)
         {
-            if(pageResponse == null) return null;
+            if((pageResponse?[0] & 0x40) == 0x40) return null;
 
-            if((pageResponse[0] & 0x40) == 0x40) return null;
-
-            if((pageResponse[0] & 0x3F) != 0x01) return null;
+            if((pageResponse?[0] & 0x3F) != 0x01) return null;
 
             if(pageResponse[1] + 2 != pageResponse.Length) return null;
 
diff --git a/SCSI/Modes/01_MMC.cs b/SCSI/Modes/01_MMC.cs
index 4e2e373..affb08c 100644
--- a/SCSI/Modes/01_MMC.cs
+++ b/SCSI/Modes/01_MMC.cs
@@ -69,11 +69,9 @@ namespace DiscImageChef.Decoders.SCSI
 
         public static ModePage_01_MMC? DecodeModePage_01_MMC(byte[] pageResponse)
         {
-            if(pageResponse == null) return null;
+            if((pageResponse?[0] & 0x40) == 0x40) return null;
 
-            if((pageResponse[0] & 0x40) == 0x40) return null;
-
-            if((pageResponse[0] & 0x3F) != 0x01) return null;
+            if((pageResponse?[0] & 0x3F) != 0x01) return null;
 
             if(pageResponse[1] + 2 != pageResponse.Length) return null;
 
diff --git a/SCSI/Modes/02.cs b/SCSI/Modes/02.cs
index 615dec5..94ae2bb 100644
--- a/SCSI/Modes/02.cs
+++ b/SCSI/Modes/02.cs
@@ -97,11 +97,9 @@ namespace DiscImageChef.Decoders.SCSI
 
         public static ModePage_02? DecodeModePage_02(byte[] pageResponse)
         {
-            if(pageResponse == null) return null;
+            if((pageResponse?[0] & 0x40) == 0x40) return null;
 
-            if((pageResponse[0] & 0x40) == 0x40) return null;
-
-            if((pageResponse[0] & 0x3F) != 0x02) return null;
+            if((pageResponse?[0] & 0x3F) != 0x02) return null;
 
             if(pageResponse[1] + 2 != pageResponse.Length) return null;
 
diff --git a/SCSI/Modes/03.cs b/SCSI/Modes/03.cs
index 6a657c3..f88b289 100644
--- a/SCSI/Modes/03.cs
+++ b/SCSI/Modes/03.cs
@@ -105,11 +105,9 @@ namespace DiscImageChef.Decoders.SCSI
 
         public static ModePage_03? DecodeModePage_03(byte[] pageResponse)
         {
-            if(pageResponse == null) return null;
+            if((pageResponse?[0] & 0x40) == 0x40) return null;
 
-            if((pageResponse[0] & 0x40) == 0x40) return null;
-
-            if((pageResponse[0] & 0x3F) != 0x03) return null;
+            if((pageResponse?[0] & 0x3F) != 0x03) return null;
 
             if(pageResponse[1] + 2 != pageResponse.Length) return null;
 
diff --git a/SCSI/Modes/04.cs b/SCSI/Modes/04.cs
index 71aac7e..bb7edbb 100644
--- a/SCSI/Modes/04.cs
+++ b/SCSI/Modes/04.cs
@@ -88,11 +88,9 @@ namespace DiscImageChef.Decoders.SCSI
 
         public static ModePage_04? DecodeModePage_04(byte[] pageResponse)
         {
-            if(pageResponse == null) return null;
+            if((pageResponse?[0] & 0x40) == 0x40) return null;
 
-            if((pageResponse[0] & 0x40) == 0x40) return null;
-
-            if((pageResponse[0] & 0x3F) != 0x04) return null;
+            if((pageResponse?[0] & 0x3F) != 0x04) return null;
 
             if(pageResponse[1] + 2 != pageResponse.Length) return null;
 
diff --git a/SCSI/Modes/05.cs b/SCSI/Modes/05.cs
index 87b6663..6d0e9e1 100644
--- a/SCSI/Modes/05.cs
+++ b/SCSI/Modes/05.cs
@@ -153,11 +153,9 @@ namespace DiscImageChef.Decoders.SCSI
 
         public static ModePage_05? DecodeModePage_05(byte[] pageResponse)
         {
-            if(pageResponse == null) return null;
+            if((pageResponse?[0] & 0x40) == 0x40) return null;
 
-            if((pageResponse[0] & 0x40) == 0x40) return null;
-
-            if((pageResponse[0] & 0x3F) != 0x05) return null;
+            if((pageResponse?[0] & 0x3F) != 0x05) return null;
 
             if(pageResponse[1] + 2 != pageResponse.Length) return null;
 
diff --git a/SCSI/Modes/06.cs b/SCSI/Modes/06.cs
index 3b8d187..1dcc5c0 100644
--- a/SCSI/Modes/06.cs
+++ b/SCSI/Modes/06.cs
@@ -56,11 +56,9 @@ namespace DiscImageChef.Decoders.SCSI
 
     public static ModePage_06? DecodeModePage_06(byte[] pageResponse)
     {
-        if(pageResponse == null) return null;
+        if((pageResponse?[0] & 0x40) == 0x40) return null;
 
-        if((pageResponse[0] & 0x40) == 0x40) return null;
-
-        if((pageResponse[0] & 0x3F) != 0x06) return null;
+        if((pageResponse?[0] & 0x3F) != 0x06) return null;
 
         if(pageResponse[1] + 2 != pageResponse.Length) return null;
 
diff --git a/SCSI/Modes/07.cs b/SCSI/Modes/07.cs
index fdf85de..efba1ae 100644
--- a/SCSI/Modes/07.cs
+++ b/SCSI/Modes/07.cs
@@ -80,11 +80,9 @@ namespace DiscImageChef.Decoders.SCSI
 
         public static ModePage_07? DecodeModePage_07(byte[] pageResponse)
         {
-            if(pageResponse == null) return null;
+            if((pageResponse?[0] & 0x40) == 0x40) return null;
 
-            if((pageResponse[0] & 0x40) == 0x40) return null;
-
-            if((pageResponse[0] & 0x3F) != 0x07) return null;
+            if((pageResponse?[0] & 0x3F) != 0x07) return null;
 
             if(pageResponse[1] + 2 != pageResponse.Length) return null;
 
diff --git a/SCSI/Modes/07_MMC.cs b/SCSI/Modes/07_MMC.cs
index 550592a..5026897 100644
--- a/SCSI/Modes/07_MMC.cs
+++ b/SCSI/Modes/07_MMC.cs
@@ -60,11 +60,9 @@ namespace DiscImageChef.Decoders.SCSI
 
         public static ModePage_07_MMC? DecodeModePage_07_MMC(byte[] pageResponse)
         {
-            if(pageResponse == null) return null;
+            if((pageResponse?[0] & 0x40) == 0x40) return null;
 
-            if((pageResponse[0] & 0x40) == 0x40) return null;
-
-            if((pageResponse[0] & 0x3F) != 0x07) return null;
+            if((pageResponse?[0] & 0x3F) != 0x07) return null;
 
             if(pageResponse[1] + 2 != pageResponse.Length) return null;
 
diff --git a/SCSI/Modes/08.cs b/SCSI/Modes/08.cs
index bdf3683..ae73cbd 100644
--- a/SCSI/Modes/08.cs
+++ b/SCSI/Modes/08.cs
@@ -136,11 +136,9 @@ namespace DiscImageChef.Decoders.SCSI
 
         public static ModePage_08? DecodeModePage_08(byte[] pageResponse)
         {
-            if(pageResponse == null) return null;
+            if((pageResponse?[0] & 0x40) == 0x40) return null;
 
-            if((pageResponse[0] & 0x40) == 0x40) return null;
-
-            if((pageResponse[0] & 0x3F) != 0x08) return null;
+            if((pageResponse?[0] & 0x3F) != 0x08) return null;
 
             if(pageResponse[1] + 2 != pageResponse.Length) return null;
 
diff --git a/SCSI/Modes/0A.cs b/SCSI/Modes/0A.cs
index ca8637f..20323f3 100644
--- a/SCSI/Modes/0A.cs
+++ b/SCSI/Modes/0A.cs
@@ -161,11 +161,9 @@ namespace DiscImageChef.Decoders.SCSI
 
         public static ModePage_0A? DecodeModePage_0A(byte[] pageResponse)
         {
-            if(pageResponse == null) return null;
+            if((pageResponse?[0] & 0x40) == 0x40) return null;
 
-            if((pageResponse[0] & 0x40) == 0x40) return null;
-
-            if((pageResponse[0] & 0x3F) != 0x0A) return null;
+            if((pageResponse?[0] & 0x3F) != 0x0A) return null;
 
             if(pageResponse[1] + 2 != pageResponse.Length) return null;
 
diff --git a/SCSI/Modes/0B.cs b/SCSI/Modes/0B.cs
index d69f06e..491e68b 100644
--- a/SCSI/Modes/0B.cs
+++ b/SCSI/Modes/0B.cs
@@ -56,11 +56,9 @@ namespace DiscImageChef.Decoders.SCSI
 
         public static ModePage_0B? DecodeModePage_0B(byte[] pageResponse)
         {
-            if(pageResponse == null) return null;
+            if((pageResponse?[0] & 0x40) == 0x40) return null;
 
-            if((pageResponse[0] & 0x40) == 0x40) return null;
-
-            if((pageResponse[0] & 0x3F) != 0x0B) return null;
+            if((pageResponse?[0] & 0x3F) != 0x0B) return null;
 
             if(pageResponse[1] + 2 != pageResponse.Length) return null;
 
diff --git a/SCSI/Modes/0D.cs b/SCSI/Modes/0D.cs
index c269c1d..545b374 100644
--- a/SCSI/Modes/0D.cs
+++ b/SCSI/Modes/0D.cs
@@ -64,11 +64,9 @@ namespace DiscImageChef.Decoders.SCSI
 
         public static ModePage_0D? DecodeModePage_0D(byte[] pageResponse)
         {
-            if(pageResponse == null) return null;
+            if((pageResponse?[0] & 0x40) == 0x40) return null;
 
-            if((pageResponse[0] & 0x40) == 0x40) return null;
-
-            if((pageResponse[0] & 0x3F) != 0x0D) return null;
+            if((pageResponse?[0] & 0x3F) != 0x0D) return null;
 
             if(pageResponse[1] + 2 != pageResponse.Length) return null;
 
diff --git a/SCSI/Modes/0E.cs b/SCSI/Modes/0E.cs
index 1a21723..d698c8f 100644
--- a/SCSI/Modes/0E.cs
+++ b/SCSI/Modes/0E.cs
@@ -104,11 +104,9 @@ namespace DiscImageChef.Decoders.SCSI
 
         public static ModePage_0E? DecodeModePage_0E(byte[] pageResponse)
         {
-            if(pageResponse == null) return null;
+            if((pageResponse?[0] & 0x40) == 0x40) return null;
 
-            if((pageResponse[0] & 0x40) == 0x40) return null;
-
-            if((pageResponse[0] & 0x3F) != 0x0E) return null;
+            if((pageResponse?[0] & 0x3F) != 0x0E) return null;
 
             if(pageResponse[1] + 2 != pageResponse.Length) return null;
 
diff --git a/SCSI/Modes/0F.cs b/SCSI/Modes/0F.cs
index a2484f6..a86344e 100644
--- a/SCSI/Modes/0F.cs
+++ b/SCSI/Modes/0F.cs
@@ -76,11 +76,9 @@ namespace DiscImageChef.Decoders.SCSI
 
         public static ModePage_0F? DecodeModePage_0F(byte[] pageResponse)
         {
-            if(pageResponse == null) return null;
+            if((pageResponse?[0] & 0x40) == 0x40) return null;
 
-            if((pageResponse[0] & 0x40) == 0x40) return null;
-
-            if((pageResponse[0] & 0x3F) != 0x0F) return null;
+            if((pageResponse?[0] & 0x3F) != 0x0F) return null;
 
             if(pageResponse[1] + 2 != pageResponse.Length) return null;
 
diff --git a/SCSI/Modes/10.cs b/SCSI/Modes/10.cs
index 7cf39ee..b450a62 100644
--- a/SCSI/Modes/10.cs
+++ b/SCSI/Modes/10.cs
@@ -72,11 +72,9 @@ namespace DiscImageChef.Decoders.SCSI
 
         public static ModePage_10? DecodeModePage_10(byte[] pageResponse)
         {
-            if(pageResponse == null) return null;
+            if((pageResponse?[0] & 0x40) == 0x40) return null;
 
-            if((pageResponse[0] & 0x40) == 0x40) return null;
-
-            if((pageResponse[0] & 0x3F) != 0x10) return null;
+            if((pageResponse?[0] & 0x3F) != 0x10) return null;
 
             if(pageResponse[1] + 2 != pageResponse.Length) return null;
 
diff --git a/SCSI/Modes/10_SSC.cs b/SCSI/Modes/10_SSC.cs
index 9fda7a3..12ebb3a 100644
--- a/SCSI/Modes/10_SSC.cs
+++ b/SCSI/Modes/10_SSC.cs
@@ -162,11 +162,9 @@ namespace DiscImageChef.Decoders.SCSI
 
         public static ModePage_10_SSC? DecodeModePage_10_SSC(byte[] pageResponse)
         {
-            if(pageResponse == null) return null;
+            if((pageResponse?[0] & 0x40) == 0x40) return null;
 
-            if((pageResponse[0] & 0x40) == 0x40) return null;
-
-            if((pageResponse[0] & 0x3F) != 0x10) return null;
+            if((pageResponse?[0] & 0x3F) != 0x10) return null;
 
             if(pageResponse[1] + 2 != pageResponse.Length) return null;
 
diff --git a/SCSI/Modes/11.cs b/SCSI/Modes/11.cs
index 503ee8e..089c0cb 100644
--- a/SCSI/Modes/11.cs
+++ b/SCSI/Modes/11.cs
@@ -128,11 +128,9 @@ namespace DiscImageChef.Decoders.SCSI
 
         public static ModePage_11? DecodeModePage_11(byte[] pageResponse)
         {
-            if(pageResponse == null) return null;
+            if((pageResponse?[0] & 0x40) == 0x40) return null;
 
-            if((pageResponse[0] & 0x40) == 0x40) return null;
-
-            if((pageResponse[0] & 0x3F) != 0x11) return null;
+            if((pageResponse?[0] & 0x3F) != 0x11) return null;
 
             if(pageResponse[1] + 2 != pageResponse.Length) return null;
 
diff --git a/SCSI/Modes/1A.cs b/SCSI/Modes/1A.cs
index 8367632..69dd53d 100644
--- a/SCSI/Modes/1A.cs
+++ b/SCSI/Modes/1A.cs
@@ -101,11 +101,9 @@ namespace DiscImageChef.Decoders.SCSI
 
         public static ModePage_1A? DecodeModePage_1A(byte[] pageResponse)
         {
-            if(pageResponse == null) return null;
+            if((pageResponse?[0] & 0x40) == 0x40) return null;
 
-            if((pageResponse[0] & 0x40) == 0x40) return null;
-
-            if((pageResponse[0] & 0x3F) != 0x1A) return null;
+            if((pageResponse?[0] & 0x3F) != 0x1A) return null;
 
             if(pageResponse[1] + 2 != pageResponse.Length) return null;
 
diff --git a/SCSI/Modes/1B.cs b/SCSI/Modes/1B.cs
index fe986ea..9a7f02e 100644
--- a/SCSI/Modes/1B.cs
+++ b/SCSI/Modes/1B.cs
@@ -72,11 +72,9 @@ namespace DiscImageChef.Decoders.SCSI
 
         public static ModePage_1B? DecodeModePage_1B(byte[] pageResponse)
         {
-            if(pageResponse == null) return null;
+            if((pageResponse?[0] & 0x40) == 0x40) return null;
 
-            if((pageResponse[0] & 0x40) == 0x40) return null;
-
-            if((pageResponse[0] & 0x3F) != 0x1B) return null;
+            if((pageResponse?[0] & 0x3F) != 0x1B) return null;
 
             if(pageResponse[1] + 2 != pageResponse.Length) return null;
 
diff --git a/SCSI/Modes/1C.cs b/SCSI/Modes/1C.cs
index 155a675..80e9349 100644
--- a/SCSI/Modes/1C.cs
+++ b/SCSI/Modes/1C.cs
@@ -94,11 +94,9 @@ namespace DiscImageChef.Decoders.SCSI
 
         public static ModePage_1C? DecodeModePage_1C(byte[] pageResponse)
         {
-            if(pageResponse == null) return null;
+            if((pageResponse?[0] & 0x40) == 0x40) return null;
 
-            if((pageResponse[0] & 0x40) == 0x40) return null;
-
-            if((pageResponse[0] & 0x3F) != 0x1C) return null;
+            if((pageResponse?[0] & 0x3F) != 0x1C) return null;
 
             if(pageResponse[1] + 2 != pageResponse.Length) return null;
 
diff --git a/SCSI/Modes/1C_SFF.cs b/SCSI/Modes/1C_SFF.cs
index d293fef..8cee682 100644
--- a/SCSI/Modes/1C_SFF.cs
+++ b/SCSI/Modes/1C_SFF.cs
@@ -64,11 +64,9 @@ namespace DiscImageChef.Decoders.SCSI
 
         public static ModePage_1C_SFF? DecodeModePage_1C_SFF(byte[] pageResponse)
         {
-            if(pageResponse == null) return null;
+            if((pageResponse?[0] & 0x40) == 0x40) return null;
 
-            if((pageResponse[0] & 0x40) == 0x40) return null;
-
-            if((pageResponse[0] & 0x3F) != 0x1C) return null;
+            if((pageResponse?[0] & 0x3F) != 0x1C) return null;
 
             if(pageResponse[1] + 2 != pageResponse.Length) return null;
 
diff --git a/SCSI/Modes/1D.cs b/SCSI/Modes/1D.cs
index 7d5d27f..72a69bb 100644
--- a/SCSI/Modes/1D.cs
+++ b/SCSI/Modes/1D.cs
@@ -50,11 +50,9 @@ namespace DiscImageChef.Decoders.SCSI
 
         public static ModePage_1D? DecodeModePage_1D(byte[] pageResponse)
         {
-            if(pageResponse == null) return null;
+            if((pageResponse?[0] & 0x40) == 0x40) return null;
 
-            if((pageResponse[0] & 0x40) == 0x40) return null;
-
-            if((pageResponse[0] & 0x3F) != 0x1D) return null;
+            if((pageResponse?[0] & 0x3F) != 0x1D) return null;
 
             if(pageResponse[1] + 2 != pageResponse.Length) return null;
 
diff --git a/SCSI/Modes/21_Certance.cs b/SCSI/Modes/21_Certance.cs
index 6d583aa..e11d931 100644
--- a/SCSI/Modes/21_Certance.cs
+++ b/SCSI/Modes/21_Certance.cs
@@ -55,11 +55,9 @@ namespace DiscImageChef.Decoders.SCSI
 
         public static Certance_ModePage_21? DecodeCertanceModePage_21(byte[] pageResponse)
         {
-            if(pageResponse == null) return null;
+            if((pageResponse?[0] & 0x40) == 0x40) return null;
 
-            if((pageResponse[0] & 0x40) == 0x40) return null;
-
-            if((pageResponse[0] & 0x3F) != 0x21) return null;
+            if((pageResponse?[0] & 0x3F) != 0x21) return null;
 
             if(pageResponse[1] + 2 != pageResponse.Length) return null;
 
diff --git a/SCSI/Modes/22_Certance.cs b/SCSI/Modes/22_Certance.cs
index 0ed9cca..bcd7b54 100644
--- a/SCSI/Modes/22_Certance.cs
+++ b/SCSI/Modes/22_Certance.cs
@@ -58,11 +58,9 @@ namespace DiscImageChef.Decoders.SCSI
 
         public static Certance_ModePage_22? DecodeCertanceModePage_22(byte[] pageResponse)
         {
-            if(pageResponse == null) return null;
+            if((pageResponse?[0] & 0x40) == 0x40) return null;
 
-            if((pageResponse[0] & 0x40) == 0x40) return null;
-
-            if((pageResponse[0] & 0x3F) != 0x22) return null;
+            if((pageResponse?[0] & 0x3F) != 0x22) return null;
 
             if(pageResponse[1] + 2 != pageResponse.Length) return null;
 
diff --git a/SCSI/Modes/24_IBM.cs b/SCSI/Modes/24_IBM.cs
index 3a11d61..683a0c4 100644
--- a/SCSI/Modes/24_IBM.cs
+++ b/SCSI/Modes/24_IBM.cs
@@ -51,11 +51,9 @@ namespace DiscImageChef.Decoders.SCSI
 
         public static IBM_ModePage_24? DecodeIBMModePage_24(byte[] pageResponse)
         {
-            if(pageResponse == null) return null;
+            if((pageResponse?[0] & 0x40) == 0x40) return null;
 
-            if((pageResponse[0] & 0x40) == 0x40) return null;
-
-            if((pageResponse[0] & 0x3F) != 0x24) return null;
+            if((pageResponse?[0] & 0x3F) != 0x24) return null;
 
             if(pageResponse[1] + 2 != pageResponse.Length) return null;
 
diff --git a/SCSI/Modes/2A.cs b/SCSI/Modes/2A.cs
index bbed1b6..8ea416d 100644
--- a/SCSI/Modes/2A.cs
+++ b/SCSI/Modes/2A.cs
@@ -186,11 +186,9 @@ namespace DiscImageChef.Decoders.SCSI
 
         public static ModePage_2A? DecodeModePage_2A(byte[] pageResponse)
         {
-            if(pageResponse == null) return null;
+            if((pageResponse?[0] & 0x40) == 0x40) return null;
 
-            if((pageResponse[0] & 0x40) == 0x40) return null;
-
-            if((pageResponse[0] & 0x3F) != 0x2A) return null;
+            if((pageResponse?[0] & 0x3F) != 0x2A) return null;
 
             if(pageResponse[1] + 2 != pageResponse.Length) return null;
 
diff --git a/SCSI/Modes/2F_IBM.cs b/SCSI/Modes/2F_IBM.cs
index 560390f..1d83c5e 100644
--- a/SCSI/Modes/2F_IBM.cs
+++ b/SCSI/Modes/2F_IBM.cs
@@ -58,11 +58,9 @@ namespace DiscImageChef.Decoders.SCSI
 
         public static IBM_ModePage_2F? DecodeIBMModePage_2F(byte[] pageResponse)
         {
-            if(pageResponse == null) return null;
+            if((pageResponse?[0] & 0x40) == 0x40) return null;
 
-            if((pageResponse[0] & 0x40) == 0x40) return null;
-
-            if((pageResponse[0] & 0x3F) != 0x2F) return null;
+            if((pageResponse?[0] & 0x3F) != 0x2F) return null;
 
             if(pageResponse[1] + 2 != pageResponse.Length) return null;
 
diff --git a/SCSI/Modes/30_Apple.cs b/SCSI/Modes/30_Apple.cs
index 988e17f..cd71298 100644
--- a/SCSI/Modes/30_Apple.cs
+++ b/SCSI/Modes/30_Apple.cs
@@ -46,11 +46,9 @@ namespace DiscImageChef.Decoders.SCSI
 
     public static bool IsAppleModePage_30(byte[] pageResponse)
     {
-        if(pageResponse == null) return false;
+        if((pageResponse?[0] & 0x40) == 0x40) return false;
 
-        if((pageResponse[0] & 0x40) == 0x40) return false;
-
-        if((pageResponse[0] & 0x3F) != 0x30) return false;
+        if((pageResponse?[0] & 0x3F) != 0x30) return false;
 
         if(pageResponse[1] + 2 != pageResponse.Length) return false;
 
diff --git a/SCSI/Modes/3B_HP.cs b/SCSI/Modes/3B_HP.cs
index 7c5d6fa..83a1128 100644
--- a/SCSI/Modes/3B_HP.cs
+++ b/SCSI/Modes/3B_HP.cs
@@ -50,11 +50,9 @@ namespace DiscImageChef.Decoders.SCSI
 
         public static HP_ModePage_3B? DecodeHPModePage_3B(byte[] pageResponse)
         {
-            if(pageResponse == null) return null;
+            if((pageResponse?[0] & 0x40) == 0x40) return null;
 
-            if((pageResponse[0] & 0x40) == 0x40) return null;
-
-            if((pageResponse[0] & 0x3F) != 0x3B) return null;
+            if((pageResponse?[0] & 0x3F) != 0x3B) return null;
 
             if(pageResponse[1] + 2 != pageResponse.Length) return null;
 
diff --git a/SCSI/Modes/3C_HP.cs b/SCSI/Modes/3C_HP.cs
index 279dd5e..2d15f9b 100644
--- a/SCSI/Modes/3C_HP.cs
+++ b/SCSI/Modes/3C_HP.cs
@@ -60,11 +60,9 @@ namespace DiscImageChef.Decoders.SCSI
 
         public static HP_ModePage_3C? DecodeHPModePage_3C(byte[] pageResponse)
         {
-            if(pageResponse == null) return null;
+            if((pageResponse?[0] & 0x40) == 0x40) return null;
 
-            if((pageResponse[0] & 0x40) == 0x40) return null;
-
-            if((pageResponse[0] & 0x3F) != 0x3C) return null;
+            if((pageResponse?[0] & 0x3F) != 0x3C) return null;
 
             if(pageResponse[1] + 2 != pageResponse.Length) return null;
 
diff --git a/SCSI/Modes/3D_HP.cs b/SCSI/Modes/3D_HP.cs
index 5a6e374..24291cb 100644
--- a/SCSI/Modes/3D_HP.cs
+++ b/SCSI/Modes/3D_HP.cs
@@ -48,11 +48,9 @@ namespace DiscImageChef.Decoders.SCSI
 
         public static HP_ModePage_3D? DecodeHPModePage_3D(byte[] pageResponse)
         {
-            if(pageResponse == null) return null;
+            if((pageResponse?[0] & 0x40) == 0x40) return null;
 
-            if((pageResponse[0] & 0x40) == 0x40) return null;
-
-            if((pageResponse[0] & 0x3F) != 0x3D) return null;
+            if((pageResponse?[0] & 0x3F) != 0x3D) return null;
 
             if(pageResponse[1] + 2 != pageResponse.Length) return null;
 
diff --git a/SCSI/Modes/3D_IBM.cs b/SCSI/Modes/3D_IBM.cs
index a2825e0..4a722e1 100644
--- a/SCSI/Modes/3D_IBM.cs
+++ b/SCSI/Modes/3D_IBM.cs
@@ -48,11 +48,9 @@ namespace DiscImageChef.Decoders.SCSI
 
     public static IBM_ModePage_3D? DecodeIBMModePage_3D(byte[] pageResponse)
     {
-        if(pageResponse == null) return null;
+        if((pageResponse?[0] & 0x40) == 0x40) return null;
 
-        if((pageResponse[0] & 0x40) == 0x40) return null;
-
-        if((pageResponse[0] & 0x3F) != 0x3D) return null;
+        if((pageResponse?[0] & 0x3F) != 0x3D) return null;
 
         if(pageResponse[1] + 2 != pageResponse.Length) return null;
 
diff --git a/SCSI/Modes/3E_Fujitsu.cs b/SCSI/Modes/3E_Fujitsu.cs
index 830a983..93cce90 100644
--- a/SCSI/Modes/3E_Fujitsu.cs
+++ b/SCSI/Modes/3E_Fujitsu.cs
@@ -84,11 +84,9 @@ namespace DiscImageChef.Decoders.SCSI
 
         public static Fujitsu_ModePage_3E? DecodeFujitsuModePage_3E(byte[] pageResponse)
         {
-            if(pageResponse == null) return null;
+            if((pageResponse?[0] & 0x40) == 0x40) return null;
 
-            if((pageResponse[0] & 0x40) == 0x40) return null;
-
-            if((pageResponse[0] & 0x3F) != 0x3E) return null;
+            if((pageResponse?[0] & 0x3F) != 0x3E) return null;
 
             if(pageResponse[1] + 2 != pageResponse.Length) return null;
 
diff --git a/SCSI/Modes/3E_HP.cs b/SCSI/Modes/3E_HP.cs
index 1ebc707..da5c774 100644
--- a/SCSI/Modes/3E_HP.cs
+++ b/SCSI/Modes/3E_HP.cs
@@ -49,11 +49,9 @@ namespace DiscImageChef.Decoders.SCSI
 
     public static HP_ModePage_3E? DecodeHPModePage_3E(byte[] pageResponse)
     {
-        if(pageResponse == null) return null;
+        if((pageResponse?[0] & 0x40) == 0x40) return null;
 
-        if((pageResponse[0] & 0x40) == 0x40) return null;
-
-        if((pageResponse[0] & 0x3F) != 0x3E) return null;
+        if((pageResponse?[0] & 0x3F) != 0x3E) return null;
 
         if(pageResponse[1] + 2 != pageResponse.Length) return null;