diff --git a/.editorconfig b/.editorconfig
index 22f64f1b5..940c62067 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -11,8 +11,8 @@ indent_size=4
 brace_style=next_line
 int_align=true
 keep_existing_arrangement=false
-place_simple_blocks_on_single_line=false
-place_simple_declaration_blocks_on_single_line=false
+place_simple_blocks_on_single_line=true
+place_simple_declaration_blocks_on_single_line=true
 place_attribute_on_same_line=false
 space_after_unary_operator=false
 space_after_comma=true
@@ -48,13 +48,13 @@ accessor_owner_body=expression_body
 force_attribute_style=join
 function_braces=next_line
 force_control_statements_braces=always_remove
-
+space_in_singleline_accessorholder=true
 type_declaration_braces=next_line
 invocable_declaration_braces=next_line
 anonymous_method_declaration_braces=next_line
-
+space_between_accessors_in_singleline_property=true
 indent_nested_usings_stmt=true
-
+space_within_empty_braces=false
 indent_nested_fixed_stmt=true
 indent_nested_lock_stmt=true
 indent_nested_for_stmt=true
@@ -175,7 +175,7 @@ wrap_before_linq_expression=false
 place_linq_into_on_new_line=false
 wrap_verbatim_interpolated_strings=wrap_if_long
 extra_spaces=remove_all
-space_after_keywords_in_control_flow_statements=true
+space_after_keywords_in_control_flow_statements=false
 space_between_method_call_name_and_opening_parenthesis=false
 space_between_method_declaration_name_and_open_parenthesis=false
 space_before_typeof_parentheses=false
@@ -206,6 +206,10 @@ blank_lines_around_class_definition=1
 namespace_indentation=all
 space_within_template_argument=false
 align_union_type_usage=true
+space_in_singleline_method=true
+space_in_singleline_anonymous_method=true
+space_within_single_line_array_initializer_braces=true
+space_around_arrow_op=false
 
 # These are for markup languages (HTML, XML, etc)
 spaces_around_eq_in_pi_attribute=false
@@ -583,8 +587,8 @@ csharp_space_before_typeof_parentheses=false
 csharp_space_before_checked_parentheses=false
 csharp_space_before_sizeof_parentheses=false
 csharp_space_before_nameof_parentheses=false
-csharp_space_between_keyword_and_expression=false
-csharp_space_between_keyword_and_type=false
+csharp_space_between_keyword_and_expression=true
+csharp_space_between_keyword_and_type=true
 csharp_space_around_assignment_op=true
 csharp_space_around_logical_op=true
 csharp_space_around_binary_operator=true
diff --git a/.idea/.idea.Aaru/.idea/runConfigurations/GUI.xml b/.idea/.idea.Aaru/.idea/runConfigurations/GUI.xml
index c7854990b..b270724bc 100644
--- a/.idea/.idea.Aaru/.idea/runConfigurations/GUI.xml
+++ b/.idea/.idea.Aaru/.idea/runConfigurations/GUI.xml
@@ -1,14 +1,14 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="GUI" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="" />
-    <option name="PROGRAM_PARAMETERS" value="" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/Aaru/bin/Debug/netcoreapp2.0/Aaru.dll" />
+    <option name="PROGRAM_PARAMETERS" value="help" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/Aaru/bin/Debug/netcoreapp2.0" />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="USE_MONO" value="0" />
     <option name="RUNTIME_ARGUMENTS" value="" />
     <option name="PROJECT_PATH" value="$PROJECT_DIR$/Aaru/Aaru.csproj" />
-    <option name="PROJECT_EXE_PATH_TRACKING" value="0" />
+    <option name="PROJECT_EXE_PATH_TRACKING" value="1" />
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
     <option name="PROJECT_KIND" value="DotNetCore" />
diff --git a/Aaru.Checksums b/Aaru.Checksums
index 2d5bc1f8e..5f2ddad91 160000
--- a/Aaru.Checksums
+++ b/Aaru.Checksums
@@ -1 +1 @@
-Subproject commit 2d5bc1f8edb67001361853d133184fbb374a5c2a
+Subproject commit 5f2ddad918a7823e7c0ca9ab14537d85022d426c
diff --git a/Aaru.CommonTypes b/Aaru.CommonTypes
index c88447c86..f990e1f2f 160000
--- a/Aaru.CommonTypes
+++ b/Aaru.CommonTypes
@@ -1 +1 @@
-Subproject commit c88447c86e11613413f4d1799044f64b58de95e7
+Subproject commit f990e1f2f8967f2db1a8b2d44fa94dae434054fd
diff --git a/Aaru.Compression/AppleRle.cs b/Aaru.Compression/AppleRle.cs
index ac6f6e516..d577c8c53 100644
--- a/Aaru.Compression/AppleRle.cs
+++ b/Aaru.Compression/AppleRle.cs
@@ -65,23 +65,29 @@ namespace Aaru.Compression
             if(repeatMode && count > 0)
             {
                 count--;
+
                 if(nextA)
                 {
                     nextA = false;
+
                     return repeatedbyteA;
                 }
 
                 nextA = true;
+
                 return repeatedbyteB;
             }
 
-            if(!repeatMode && count > 0)
+            if(!repeatMode &&
+               count > 0)
             {
                 count--;
+
                 return inStream.ReadByte();
             }
 
-            if(inStream.Position == inStream.Length) return -1;
+            if(inStream.Position == inStream.Length)
+                return -1;
 
             while(true)
             {
@@ -89,22 +95,28 @@ namespace Aaru.Compression
                 byte  b2 = (byte)inStream.ReadByte();
                 short s  = (short)((b1 << 8) | b2);
 
-                if(s == 0 || s >= DART_CHUNK || s <= -DART_CHUNK) continue;
+                if(s == 0          ||
+                   s >= DART_CHUNK ||
+                   s <= -DART_CHUNK)
+                    continue;
 
                 if(s < 0)
                 {
                     repeatMode    = true;
                     repeatedbyteA = (byte)inStream.ReadByte();
                     repeatedbyteB = (byte)inStream.ReadByte();
-                    count         = -s * 2 - 1;
+                    count         = (-s * 2) - 1;
                     nextA         = false;
+
                     return repeatedbyteA;
                 }
 
-                if(s <= 0) continue;
+                if(s <= 0)
+                    continue;
 
                 repeatMode = false;
-                count      = s * 2 - 1;
+                count      = (s * 2) - 1;
+
                 return inStream.ReadByte();
             }
         }
diff --git a/Aaru.Compression/TeleDiskLzh.cs b/Aaru.Compression/TeleDiskLzh.cs
index 51bc49c34..7eb574edc 100644
--- a/Aaru.Compression/TeleDiskLzh.cs
+++ b/Aaru.Compression/TeleDiskLzh.cs
@@ -66,10 +66,10 @@ namespace Aaru.Compression
 
         /* Huffman coding parameters */
 
-        const int N_CHAR = 256 - THRESHOLD + F;
+        const int N_CHAR = (256 - THRESHOLD) + F;
         /* character code (= 0..N_CHAR-1) */
-        const int T        = N_CHAR * 2 - 1; /* Size of table */
-        const int ROOT     = T          - 1; /* root position */
+        const int T        = (N_CHAR * 2) - 1; /* Size of table */
+        const int ROOT     = T            - 1; /* root position */
         const int MAX_FREQ = 0x8000;
 
         /*
@@ -80,61 +80,59 @@ namespace Aaru.Compression
         /* decoder table */
         readonly byte[] d_code =
         {
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01,
-            0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02,
-            0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x03, 0x03, 0x03, 0x03,
-            0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x04, 0x04, 0x04, 0x04, 0x04,
-            0x04, 0x04, 0x04, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-            0x06, 0x06, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
-            0x08, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A,
-            0x0B, 0x0B, 0x0B, 0x0B, 0x0B, 0x0B, 0x0B, 0x0B, 0x0C, 0x0C, 0x0C, 0x0C, 0x0D, 0x0D, 0x0D, 0x0D, 0x0E,
-            0x0E, 0x0E, 0x0E, 0x0F, 0x0F, 0x0F, 0x0F, 0x10, 0x10, 0x10, 0x10, 0x11, 0x11, 0x11, 0x11, 0x12, 0x12,
-            0x12, 0x12, 0x13, 0x13, 0x13, 0x13, 0x14, 0x14, 0x14, 0x14, 0x15, 0x15, 0x15, 0x15, 0x16, 0x16, 0x16,
-            0x16, 0x17, 0x17, 0x17, 0x17, 0x18, 0x18, 0x19, 0x19, 0x1A, 0x1A, 0x1B, 0x1B, 0x1C, 0x1C, 0x1D, 0x1D,
-            0x1E, 0x1E, 0x1F, 0x1F, 0x20, 0x20, 0x21, 0x21, 0x22, 0x22, 0x23, 0x23, 0x24, 0x24, 0x25, 0x25, 0x26,
-            0x26, 0x27, 0x27, 0x28, 0x28, 0x29, 0x29, 0x2A, 0x2A, 0x2B, 0x2B, 0x2C, 0x2C, 0x2D, 0x2D, 0x2E, 0x2E,
-            0x2F, 0x2F, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x3B, 0x3C, 0x3D, 0x3E,
-            0x3F
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01,
+            0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+            0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
+            0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x05, 0x05,
+            0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x07, 0x07, 0x07, 0x07,
+            0x07, 0x07, 0x07, 0x07, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09,
+            0x09, 0x09, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0B, 0x0B, 0x0B, 0x0B, 0x0B, 0x0B, 0x0B, 0x0B,
+            0x0C, 0x0C, 0x0C, 0x0C, 0x0D, 0x0D, 0x0D, 0x0D, 0x0E, 0x0E, 0x0E, 0x0E, 0x0F, 0x0F, 0x0F, 0x0F, 0x10, 0x10,
+            0x10, 0x10, 0x11, 0x11, 0x11, 0x11, 0x12, 0x12, 0x12, 0x12, 0x13, 0x13, 0x13, 0x13, 0x14, 0x14, 0x14, 0x14,
+            0x15, 0x15, 0x15, 0x15, 0x16, 0x16, 0x16, 0x16, 0x17, 0x17, 0x17, 0x17, 0x18, 0x18, 0x19, 0x19, 0x1A, 0x1A,
+            0x1B, 0x1B, 0x1C, 0x1C, 0x1D, 0x1D, 0x1E, 0x1E, 0x1F, 0x1F, 0x20, 0x20, 0x21, 0x21, 0x22, 0x22, 0x23, 0x23,
+            0x24, 0x24, 0x25, 0x25, 0x26, 0x26, 0x27, 0x27, 0x28, 0x28, 0x29, 0x29, 0x2A, 0x2A, 0x2B, 0x2B, 0x2C, 0x2C,
+            0x2D, 0x2D, 0x2E, 0x2E, 0x2F, 0x2F, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x3B,
+            0x3C, 0x3D, 0x3E, 0x3F
         };
 
         readonly byte[] d_len =
         {
-            0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
-            0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x04, 0x04,
-            0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04,
-            0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04,
-            0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x05, 0x05, 0x05, 0x05, 0x05,
-            0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05,
-            0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05,
-            0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05,
-            0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-            0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-            0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-            0x06, 0x06, 0x06, 0x06, 0x06, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07,
-            0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07,
-            0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07,
-            0x07, 0x07, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
-            0x08
+            0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
+            0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x04, 0x04, 0x04, 0x04,
+            0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04,
+            0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04,
+            0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05,
+            0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05,
+            0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05,
+            0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05,
+            0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+            0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+            0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07,
+            0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07,
+            0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07,
+            0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
+            0x08, 0x08, 0x08, 0x08
         };
+        readonly ushort[] freq = new ushort[T + 1]; /* cumulative freq table */
 
         readonly Stream inStream;
-        ushort[]        freq = new ushort[T + 1]; /* cumulative freq table */
-
-        ushort getbuf;
-        byte   getlen;
 
         /*
          * pointing parent nodes.
          * area [T..(T + N_CHAR - 1)] are pointers for leaves
          */
-        short[] prnt = new short[T + N_CHAR];
+        readonly short[] prnt = new short[T + N_CHAR];
 
         /* pointing children nodes (son[], son[] + 1)*/
-        short[] son = new short[T];
+        readonly short[] son      = new short[T];
+        readonly byte[]  text_buf = new byte[(N + F) - 1];
+
+        ushort getbuf;
+        byte   getlen;
 
         Tdlzhuf tdctl;
-        byte[]  text_buf = new byte[N + F - 1];
 
         public TeleDiskLzh(Stream dataStream)
         {
@@ -145,7 +143,9 @@ namespace Aaru.Compression
             tdctl.Ibufcnt = tdctl.Ibufndx = 0; // input buffer is empty
             tdctl.Bufcnt  = 0;
             StartHuff();
-            for(i = 0; i < N - F; i++) text_buf[i] = 0x20;
+
+            for(i = 0; i < N - F; i++)
+                text_buf[i] = 0x20;
 
             tdctl.R  = N - F;
             inStream = dataStream;
@@ -162,10 +162,12 @@ namespace Aaru.Compression
             short c;
             buf = new byte[len];
             int count; // was an unsigned long, seems unnecessary
+
             for(count = 0; count < len;)
                 if(tdctl.Bufcnt == 0)
                 {
-                    if((c = DecodeChar()) < 0) return count; // fatal error
+                    if((c = DecodeChar()) < 0)
+                        return count; // fatal error
 
                     if(c < 256)
                     {
@@ -177,17 +179,20 @@ namespace Aaru.Compression
                     else
                     {
                         short pos;
-                        if((pos = DecodePosition()) < 0) return count; // fatal error
+
+                        if((pos = DecodePosition()) < 0)
+                            return count; // fatal error
 
                         tdctl.Bufpos = (ushort)((tdctl.R - pos - 1) & (N - 1));
-                        tdctl.Bufcnt = (ushort)(c - 255 + THRESHOLD);
+                        tdctl.Bufcnt = (ushort)((c             - 255) + THRESHOLD);
                         tdctl.Bufndx = 0;
                     }
                 }
                 else
                 {
                     // still chars from last string
-                    while(tdctl.Bufndx < tdctl.Bufcnt && count < len)
+                    while(tdctl.Bufndx < tdctl.Bufcnt &&
+                          count        < len)
                     {
                         c          = text_buf[(tdctl.Bufpos + tdctl.Bufndx) & (N - 1)];
                         buf[count] = (byte)c;
@@ -198,7 +203,8 @@ namespace Aaru.Compression
                     }
 
                     // reset bufcnt after copy string from text_buf[]
-                    if(tdctl.Bufndx >= tdctl.Bufcnt) tdctl.Bufndx = tdctl.Bufcnt = 0;
+                    if(tdctl.Bufndx >= tdctl.Bufcnt)
+                        tdctl.Bufndx = tdctl.Bufcnt = 0;
                 }
 
             return count; // count == len, success
@@ -206,10 +212,12 @@ namespace Aaru.Compression
 
         long DataRead(out byte[] buf, long size)
         {
-            if(size > inStream.Length - inStream.Position) size = inStream.Length - inStream.Position;
+            if(size > inStream.Length - inStream.Position)
+                size = inStream.Length - inStream.Position;
 
             buf = new byte[size];
             inStream.Read(buf, 0, (int)size);
+
             return size;
         }
 
@@ -219,7 +227,9 @@ namespace Aaru.Compression
             {
                 tdctl.Ibufndx = 0;
                 tdctl.Ibufcnt = (ushort)DataRead(out tdctl.Inbuf, BUFSZ);
-                if(tdctl.Ibufcnt <= 0) return -1;
+
+                if(tdctl.Ibufcnt <= 0)
+                    return -1;
             }
 
             while(getlen <= 8)
@@ -234,22 +244,26 @@ namespace Aaru.Compression
 
         int GetBit() /* get one bit */
         {
-            if(NextWord() < 0) return -1;
+            if(NextWord() < 0)
+                return -1;
 
             short i = (short)getbuf;
             getbuf <<= 1;
             getlen--;
+
             return i < 0 ? 1 : 0;
         }
 
         int GetByte() /* get a byte */
         {
-            if(NextWord() != 0) return -1;
+            if(NextWord() != 0)
+                return -1;
 
             ushort i = getbuf;
             getbuf <<= 8;
             getlen -=  8;
             i      =   (ushort)(i >> 8);
+
             return i;
         }
 
@@ -268,6 +282,7 @@ namespace Aaru.Compression
 
             i = 0;
             int j = N_CHAR;
+
             while(j <= ROOT)
             {
                 freq[j] =  (ushort)(freq[i] + freq[i + 1]);
@@ -289,6 +304,7 @@ namespace Aaru.Compression
 
             /* halven cumulative freq for leaf nodes */
             short j = 0;
+
             for(i = 0; i < T; i++)
                 if(son[i] >= T)
                 {
@@ -302,7 +318,8 @@ namespace Aaru.Compression
             {
                 k = (short)(i + 1);
                 ushort f = freq[j] = (ushort)(freq[i] + freq[k]);
-                for(k = (short)(j - 1); f < freq[k]; k--) { }
+
+                for(k = (short)(j - 1); f < freq[k]; k--) {}
 
                 k++;
                 ushort l = (ushort)((j - k) * 2);
@@ -325,17 +342,22 @@ namespace Aaru.Compression
 
         void Update(int c)
         {
-            if(freq[ROOT] == MAX_FREQ) Reconst();
+            if(freq[ROOT] == MAX_FREQ)
+                Reconst();
+
             c = prnt[c + T];
+
             do
             {
                 int k = ++freq[c];
 
                 /* swap nodes to keep the tree freq-ordered */
                 int l;
-                if(k <= freq[l = c + 1]) continue;
 
-                while(k > freq[++l]) { }
+                if(k <= freq[l = c + 1])
+                    continue;
+
+                while(k > freq[++l]) {}
 
                 l--;
                 freq[c] = freq[l];
@@ -343,18 +365,22 @@ namespace Aaru.Compression
 
                 int i = son[c];
                 prnt[i] = (short)l;
-                if(i < T) prnt[i + 1] = (short)l;
+
+                if(i < T)
+                    prnt[i + 1] = (short)l;
 
                 int j = son[l];
                 son[l] = (short)i;
 
                 prnt[j] = (short)c;
-                if(j < T) prnt[j + 1] = (short)c;
+
+                if(j < T)
+                    prnt[j + 1] = (short)c;
+
                 son[c] = (short)j;
 
                 c = l;
-            }
-            while((c = prnt[c]) != 0); /* do it until reaching the root */
+            } while((c = prnt[c]) != 0); /* do it until reaching the root */
         }
 
         short DecodeChar()
@@ -369,7 +395,9 @@ namespace Aaru.Compression
             while(c < T)
             {
                 int ret;
-                if((ret = GetBit()) < 0) return -1;
+
+                if((ret = GetBit()) < 0)
+                    return -1;
 
                 c += (ushort)ret;
                 c =  (ushort)son[c];
@@ -377,6 +405,7 @@ namespace Aaru.Compression
 
             c -= T;
             Update(c);
+
             return (short)c;
         }
 
@@ -385,7 +414,8 @@ namespace Aaru.Compression
             short bit;
 
             /* decode upper 6 bits from given table */
-            if((bit = (short)GetByte()) < 0) return -1;
+            if((bit = (short)GetByte()) < 0)
+                return -1;
 
             ushort i = (ushort)bit;
             ushort c = (ushort)(d_code[i] << 6);
@@ -393,9 +423,11 @@ namespace Aaru.Compression
 
             /* input lower 6 bits directly */
             j -= 2;
+
             while(j-- > 0)
             {
-                if((bit = (short)GetBit()) < 0) return -1;
+                if((bit = (short)GetBit()) < 0)
+                    return -1;
 
                 i = (ushort)((i << 1) + bit);
             }
@@ -407,14 +439,10 @@ namespace Aaru.Compression
 
         struct Tdlzhuf
         {
-            public ushort R,
-                          Bufcnt,
-                          Bufndx,
-                          Bufpos, // string buffer
+            public ushort R, Bufcnt, Bufndx, Bufpos, // string buffer
                           // the following to allow block reads from input in next_word()
-                          Ibufcnt,
-                          Ibufndx; // input buffer counters
-            public byte[] Inbuf;   // input buffer
+                          Ibufcnt, Ibufndx; // input buffer counters
+            public byte[] Inbuf;            // input buffer
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Checksum.cs b/Aaru.Core/Checksum.cs
index 8477c3237..eb93bfe2a 100644
--- a/Aaru.Core/Checksum.cs
+++ b/Aaru.Core/Checksum.cs
@@ -54,42 +54,42 @@ namespace Aaru.Core
     public class Checksum
     {
         readonly IChecksum      adler32Ctx;
-        HashPacket              adlerPkt;
-        Thread                  adlerThread;
         readonly IChecksum      crc16Ctx;
-        HashPacket              crc16Pkt;
-        Thread                  crc16Thread;
         readonly IChecksum      crc32Ctx;
-        HashPacket              crc32Pkt;
-        Thread                  crc32Thread;
         readonly IChecksum      crc64Ctx;
-        HashPacket              crc64Pkt;
-        Thread                  crc64Thread;
         readonly EnableChecksum enabled;
         readonly IChecksum      f16Ctx;
+        readonly IChecksum      f32Ctx;
+        readonly IChecksum      md5Ctx;
+        readonly IChecksum      sha1Ctx;
+        readonly IChecksum      sha256Ctx;
+        readonly IChecksum      sha384Ctx;
+        readonly IChecksum      sha512Ctx;
+        readonly IChecksum      ssctx;
+        HashPacket              adlerPkt;
+        Thread                  adlerThread;
+        HashPacket              crc16Pkt;
+        Thread                  crc16Thread;
+        HashPacket              crc32Pkt;
+        Thread                  crc32Thread;
+        HashPacket              crc64Pkt;
+        Thread                  crc64Thread;
         HashPacket              f16Pkt;
         Thread                  f16Thread;
-        readonly IChecksum      f32Ctx;
         HashPacket              f32Pkt;
         Thread                  f32Thread;
-        readonly IChecksum      md5Ctx;
         HashPacket              md5Pkt;
         Thread                  md5Thread;
-        readonly IChecksum      sha1Ctx;
         HashPacket              sha1Pkt;
         Thread                  sha1Thread;
-        readonly IChecksum      sha256Ctx;
         HashPacket              sha256Pkt;
         Thread                  sha256Thread;
-        readonly IChecksum      sha384Ctx;
         HashPacket              sha384Pkt;
         Thread                  sha384Thread;
-        readonly IChecksum      sha512Ctx;
         HashPacket              sha512Pkt;
         Thread                  sha512Thread;
         HashPacket              spamsumPkt;
         Thread                  spamsumThread;
-        readonly IChecksum      ssctx;
 
         public Checksum(EnableChecksum enabled = EnableChecksum.All)
         {
@@ -314,7 +314,7 @@ namespace Aaru.Core
                   sha512Thread.IsAlive  ||
                   spamsumThread.IsAlive ||
                   f16Thread.IsAlive     ||
-                  f32Thread.IsAlive) { }
+                  f32Thread.IsAlive) {}
 
             if(enabled.HasFlag(EnableChecksum.SpamSum))
                 adlerThread = new Thread(UpdateHash);
@@ -665,7 +665,7 @@ namespace Aaru.Core
                   sha512ThreadData.IsAlive  ||
                   spamsumThreadData.IsAlive ||
                   f16ThreadData.IsAlive     ||
-                  f32ThreadData.IsAlive) { }
+                  f32ThreadData.IsAlive) {}
 
             List<ChecksumType> dataChecksums = new List<ChecksumType>();
             ChecksumType       chk;
diff --git a/Aaru.Core/DataFile.cs b/Aaru.Core/DataFile.cs
index a3492bed1..382797129 100644
--- a/Aaru.Core/DataFile.cs
+++ b/Aaru.Core/DataFile.cs
@@ -36,98 +36,63 @@ using Aaru.Console;
 
 namespace Aaru.Core
 {
-    /// <summary>
-    ///     Abstracts a datafile with a block based interface
-    /// </summary>
+    /// <summary>Abstracts a datafile with a block based interface</summary>
     [SuppressMessage("ReSharper", "UnusedMethodReturnValue.Global")]
     public class DataFile
     {
-        FileStream dataFs;
+        readonly FileStream dataFs;
 
-        /// <summary>
-        ///     Opens, or create, a new file
-        /// </summary>
+        /// <summary>Opens, or create, a new file</summary>
         /// <param name="outputFile">File</param>
-        public DataFile(string outputFile)
-        {
+        public DataFile(string outputFile) =>
             dataFs = new FileStream(outputFile, FileMode.OpenOrCreate, FileAccess.ReadWrite);
-        }
 
-        /// <summary>
-        ///     Closes the file
-        /// </summary>
-        public void Close()
-        {
-            dataFs?.Close();
-        }
+        /// <summary>Closes the file</summary>
+        public void Close() => dataFs?.Close();
 
-        /// <summary>
-        ///     Reads bytes at current position
-        /// </summary>
+        /// <summary>Reads bytes at current position</summary>
         /// <param name="array">Array to place read data within</param>
         /// <param name="offset">Offset of <see cref="array" /> where data will be read</param>
         /// <param name="count">How many bytes to read</param>
         /// <returns>How many bytes were read</returns>
         public int Read(byte[] array, int offset, int count) => dataFs.Read(array, offset, count);
 
-        /// <summary>
-        ///     Seeks to the specified block
-        /// </summary>
+        /// <summary>Seeks to the specified block</summary>
         /// <param name="block">Block to seek to</param>
         /// <param name="blockSize">Block size in bytes</param>
         /// <returns>Position</returns>
         public long Seek(ulong block, ulong blockSize) => dataFs.Seek((long)(block * blockSize), SeekOrigin.Begin);
 
-        /// <summary>
-        ///     Seeks to specified byte position
-        /// </summary>
+        /// <summary>Seeks to specified byte position</summary>
         /// <param name="offset">Byte position</param>
         /// <param name="origin">Where to count for position</param>
         /// <returns>Position</returns>
         public long Seek(ulong offset, SeekOrigin origin) => dataFs.Seek((long)offset, origin);
 
-        /// <summary>
-        ///     Seeks to specified byte position
-        /// </summary>
+        /// <summary>Seeks to specified byte position</summary>
         /// <param name="offset">Byte position</param>
         /// <param name="origin">Where to count for position</param>
         /// <returns>Position</returns>
         public long Seek(long offset, SeekOrigin origin) => dataFs.Seek(offset, origin);
 
-        /// <summary>
-        ///     Writes data at current position
-        /// </summary>
+        /// <summary>Writes data at current position</summary>
         /// <param name="data">Data</param>
-        public void Write(byte[] data)
-        {
-            Write(data, 0, data.Length);
-        }
+        public void Write(byte[] data) => Write(data, 0, data.Length);
 
-        /// <summary>
-        ///     Writes data at current position
-        /// </summary>
+        /// <summary>Writes data at current position</summary>
         /// <param name="data">Data</param>
         /// <param name="offset">Offset of data from where to start taking data to write</param>
         /// <param name="count">How many bytes to write</param>
-        public void Write(byte[] data, int offset, int count)
-        {
-            dataFs.Write(data, offset, count);
-        }
+        public void Write(byte[] data, int offset, int count) => dataFs.Write(data, offset, count);
 
-        /// <summary>
-        ///     Writes data at specified block
-        /// </summary>
+        /// <summary>Writes data at specified block</summary>
         /// <param name="data">Data</param>
         /// <param name="block">Block</param>
         /// <param name="blockSize">Bytes per block</param>
-        public void WriteAt(byte[] data, ulong block, uint blockSize)
-        {
+        public void WriteAt(byte[] data, ulong block, uint blockSize) =>
             WriteAt(data, block, blockSize, 0, data.Length);
-        }
 
-        /// <summary>
-        ///     Writes data at specified block
-        /// </summary>
+        /// <summary>Writes data at specified block</summary>
         /// <param name="data">Data</param>
         /// <param name="block">Block</param>
         /// <param name="blockSize">Bytes per block</param>
@@ -139,14 +104,10 @@ namespace Aaru.Core
             dataFs.Write(data, offset, count);
         }
 
-        /// <summary>
-        ///     Current file position
-        /// </summary>
+        /// <summary>Current file position</summary>
         public long Position => dataFs.Position;
 
-        /// <summary>
-        ///     Writes data to a newly created file
-        /// </summary>
+        /// <summary>Writes data to a newly created file</summary>
         /// <param name="who">Who asked the file to be written (class, plugin, etc.)</param>
         /// <param name="data">Data to write</param>
         /// <param name="outputPrefix">First part of the file name</param>
@@ -155,22 +116,22 @@ namespace Aaru.Core
         public static void WriteTo(string who, string outputPrefix, string outputSuffix, string whatWriting,
                                    byte[] data)
         {
-            if(!string.IsNullOrEmpty(outputPrefix) && !string.IsNullOrEmpty(outputSuffix))
+            if(!string.IsNullOrEmpty(outputPrefix) &&
+               !string.IsNullOrEmpty(outputSuffix))
                 WriteTo(who, outputPrefix + outputSuffix, data, whatWriting);
         }
 
-        /// <summary>
-        ///     Writes data to a newly created file
-        /// </summary>
+        /// <summary>Writes data to a newly created file</summary>
         /// <param name="who">Who asked the file to be written (class, plugin, etc.)</param>
         /// <param name="filename">Filename to create</param>
         /// <param name="data">Data to write</param>
         /// <param name="whatWriting">What is the data about?</param>
         /// <param name="overwrite">If set to <c>true</c> overwrites the file, does nothing otherwise</param>
         public static void WriteTo(string who, string filename, byte[] data, string whatWriting = null,
-                                   bool   overwrite = false)
+                                   bool overwrite = false)
         {
-            if(string.IsNullOrEmpty(filename)) return;
+            if(string.IsNullOrEmpty(filename))
+                return;
 
             if(File.Exists(filename))
                 if(overwrite)
@@ -178,17 +139,21 @@ namespace Aaru.Core
                 else
                 {
                     AaruConsole.ErrorWriteLine("Not overwriting file {0}", filename);
+
                     return;
                 }
 
             try
             {
                 AaruConsole.DebugWriteLine(who, "Writing " + whatWriting + " to {0}", filename);
-                FileStream outputFs = new FileStream(filename, FileMode.CreateNew);
+                var outputFs = new FileStream(filename, FileMode.CreateNew);
                 outputFs.Write(data, 0, data.Length);
                 outputFs.Close();
             }
-            catch { AaruConsole.ErrorWriteLine("Unable to write file {0}", filename); }
+            catch
+            {
+                AaruConsole.ErrorWriteLine("Unable to write file {0}", filename);
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Delegates.cs b/Aaru.Core/Delegates.cs
index d54a9b48b..46a442efa 100644
--- a/Aaru.Core/Delegates.cs
+++ b/Aaru.Core/Delegates.cs
@@ -32,88 +32,56 @@
 
 namespace Aaru.Core
 {
-    /// <summary>
-    ///     Initializates a progress indicator (e.g. makes a progress bar visible)
-    /// </summary>
+    /// <summary>Initializates a progress indicator (e.g. makes a progress bar visible)</summary>
     public delegate void InitProgressHandler();
 
-    /// <summary>
-    ///     Updates a progress indicator with text
-    /// </summary>
+    /// <summary>Updates a progress indicator with text</summary>
     public delegate void UpdateProgressHandler(string text, long current, long maximum);
 
-    /// <summary>
-    ///     Pulses a progress indicator with indeterminate boundaries
-    /// </summary>
+    /// <summary>Pulses a progress indicator with indeterminate boundaries</summary>
     public delegate void PulseProgressHandler(string text);
 
-    /// <summary>
-    ///     Uninitializates a progress indicator (e.g. adds a newline to the console)
-    /// </summary>
+    /// <summary>Uninitializates a progress indicator (e.g. adds a newline to the console)</summary>
     public delegate void EndProgressHandler();
 
-    /// <summary>
-    ///     Initializates a secondary progress indicator (e.g. makes a progress bar visible)
-    /// </summary>
+    /// <summary>Initializates a secondary progress indicator (e.g. makes a progress bar visible)</summary>
     public delegate void InitProgressHandler2();
 
-    /// <summary>
-    ///     Updates a secondary progress indicator with text
-    /// </summary>
+    /// <summary>Updates a secondary progress indicator with text</summary>
     public delegate void UpdateProgressHandler2(string text, long current, long maximum);
 
-    /// <summary>
-    ///     Pulses a secondary progress indicator with indeterminate boundaries
-    /// </summary>
+    /// <summary>Pulses a secondary progress indicator with indeterminate boundaries</summary>
     public delegate void PulseProgressHandler2(string text);
 
-    /// <summary>
-    ///     Uninitializates a secondary progress indicator (e.g. adds a newline to the console)
-    /// </summary>
+    /// <summary>Uninitializates a secondary progress indicator (e.g. adds a newline to the console)</summary>
     public delegate void EndProgressHandler2();
 
-    /// <summary>
-    ///     Initializates two progress indicators (e.g. makes a progress bar visible)
-    /// </summary>
+    /// <summary>Initializates two progress indicators (e.g. makes a progress bar visible)</summary>
     public delegate void InitTwoProgressHandler();
 
-    /// <summary>
-    ///     Updates two progress indicators with text
-    /// </summary>
+    /// <summary>Updates two progress indicators with text</summary>
     public delegate void UpdateTwoProgressHandler(string text, long current, long maximum, string text2, long current2,
-                                                  long   maximum2);
+                                                  long maximum2);
 
-    /// <summary>
-    ///     Pulses a progress indicator with indeterminate boundaries
-    /// </summary>
+    /// <summary>Pulses a progress indicator with indeterminate boundaries</summary>
     public delegate void PulseTwoProgressHandler(string text, string text2);
 
-    /// <summary>
-    ///     Uninitializates a progress indicator (e.g. adds a newline to the console)
-    /// </summary>
+    /// <summary>Uninitializates a progress indicator (e.g. adds a newline to the console)</summary>
     public delegate void EndTwoProgressHandler();
 
-    /// <summary>
-    ///     Updates a status indicator
-    /// </summary>
+    /// <summary>Updates a status indicator</summary>
     public delegate void UpdateStatusHandler(string text);
 
-    /// <summary>
-    ///     Shows an error message
-    /// </summary>
+    /// <summary>Shows an error message</summary>
     public delegate void ErrorMessageHandler(string text);
 
     public delegate void InitBlockMapHandler(ulong blocks, ulong blockSize, ulong blocksToRead, ushort currentProfile);
 
-    /// <summary>
-    ///     Updates lists of time taken on scanning from the specified sector
-    /// </summary>
+    /// <summary>Updates lists of time taken on scanning from the specified sector</summary>
     /// <param name="duration">Time in milliseconds</param>
     public delegate void ScanTimeHandler(ulong sector, double duration);
 
-    /// <summary>
-    ///     Specified a number of blocks could not be read on scan
-    /// </summary>
+    /// <summary>Specified a number of blocks could not be read on scan</summary>
     public delegate void ScanUnreadableHandler(ulong sector);
 
     public delegate void ScanSpeedHandler(ulong sector, double currentSpeed);
diff --git a/Aaru.Core/Devices/Dumping/ATA.cs b/Aaru.Core/Devices/Dumping/ATA.cs
index 4e93229ad..be755da0a 100644
--- a/Aaru.Core/Devices/Dumping/ATA.cs
+++ b/Aaru.Core/Devices/Dumping/ATA.cs
@@ -35,12 +35,12 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Xml.Serialization;
-using Aaru.Core.Logging;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Extents;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs.Devices.ATA;
+using Aaru.Core.Logging;
 using Aaru.Decoders.PCMCIA;
 using Schemas;
 using Tuple = Aaru.Decoders.PCMCIA.Tuple;
diff --git a/Aaru.Core/Devices/Dumping/CompactDisc/Data.cs b/Aaru.Core/Devices/Dumping/CompactDisc/Data.cs
index 42b2ae048..88543eef8 100644
--- a/Aaru.Core/Devices/Dumping/CompactDisc/Data.cs
+++ b/Aaru.Core/Devices/Dumping/CompactDisc/Data.cs
@@ -32,11 +32,11 @@
 
 using System;
 using System.Linq;
-using Aaru.Core.Logging;
 using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Extents;
 using Aaru.CommonTypes.Structs;
 using Aaru.Console;
+using Aaru.Core.Logging;
 using Aaru.Decoders.SCSI;
 using Aaru.Devices;
 using Schemas;
@@ -247,8 +247,7 @@ namespace Aaru.Core.Devices.Dumping
 
                             for(int b = 0; b < blocksToRead; b++)
                             {
-                                Array.Copy(cmdBuf, (int)(0 + (b * blockSize)), data, sectorSize * b,
-                                           sectorSize);
+                                Array.Copy(cmdBuf, (int)(0 + (b * blockSize)), data, sectorSize * b, sectorSize);
 
                                 Array.Copy(cmdBuf, (int)(sectorSize + (b * blockSize)), sub, subSize * b, subSize);
                             }
@@ -276,8 +275,7 @@ namespace Aaru.Core.Devices.Dumping
 
                             for(int b = 0; b < blocksToRead; b++)
                             {
-                                Array.Copy(data, sectorSize * b, cmdBuf, (int)(0 + (b * blockSize)),
-                                           sectorSize);
+                                Array.Copy(data, sectorSize * b, cmdBuf, (int)(0 + (b * blockSize)), sectorSize);
 
                                 Array.Copy(sub, subSize * b, cmdBuf, (int)(sectorSize + (b * blockSize)), subSize);
                             }
diff --git a/Aaru.Core/Devices/Dumping/CompactDisc/Dump.cs b/Aaru.Core/Devices/Dumping/CompactDisc/Dump.cs
index c4ba5d2a4..90b374cff 100644
--- a/Aaru.Core/Devices/Dumping/CompactDisc/Dump.cs
+++ b/Aaru.Core/Devices/Dumping/CompactDisc/Dump.cs
@@ -34,14 +34,14 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using Aaru.Core.Logging;
-using Aaru.Core.Media.Detection;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Extents;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 using Aaru.Console;
+using Aaru.Core.Logging;
+using Aaru.Core.Media.Detection;
 using Aaru.Database.Models;
 using Aaru.Decoders.CD;
 using Aaru.Devices;
diff --git a/Aaru.Core/Devices/Dumping/CompactDisc/LeadOuts.cs b/Aaru.Core/Devices/Dumping/CompactDisc/LeadOuts.cs
index c677c608b..20742d9e5 100644
--- a/Aaru.Core/Devices/Dumping/CompactDisc/LeadOuts.cs
+++ b/Aaru.Core/Devices/Dumping/CompactDisc/LeadOuts.cs
@@ -31,9 +31,9 @@
 // ****************************************************************************/
 
 using System;
-using Aaru.Core.Logging;
 using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Extents;
+using Aaru.Core.Logging;
 using Aaru.Devices;
 using Schemas;
 
@@ -295,8 +295,7 @@ namespace Aaru.Core.Devices.Dumping
 
                             for(int b = 0; b < _maximumReadable; b++)
                             {
-                                Array.Copy(cmdBuf, (int)(0 + (b * blockSize)), data, sectorSize * b,
-                                           sectorSize);
+                                Array.Copy(cmdBuf, (int)(0 + (b * blockSize)), data, sectorSize * b, sectorSize);
 
                                 Array.Copy(cmdBuf, (int)(sectorSize + (b * blockSize)), sub, subSize * b, subSize);
                             }
diff --git a/Aaru.Core/Devices/Dumping/CompactDisc/Pregap.cs b/Aaru.Core/Devices/Dumping/CompactDisc/Pregap.cs
index fe386bd18..12322841a 100644
--- a/Aaru.Core/Devices/Dumping/CompactDisc/Pregap.cs
+++ b/Aaru.Core/Devices/Dumping/CompactDisc/Pregap.cs
@@ -34,11 +34,11 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using Aaru.Core.Logging;
 using Aaru.Checksums;
 using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Structs;
 using Aaru.Console;
+using Aaru.Core.Logging;
 using Aaru.Devices;
 
 // ReSharper disable JoinDeclarationAndInitializer
@@ -124,7 +124,7 @@ namespace Aaru.Core.Devices.Dumping
 
         public static void SolveTrackPregaps(Device dev, DumpLog dumpLog, UpdateStatusHandler updateStatus,
                                              Track[] tracks, bool supportsPqSubchannel, bool supportsRwSubchannel,
-                                             Aaru.Database.Models.Device dbDev, out bool inexactPositioning)
+                                             Database.Models.Device dbDev, out bool inexactPositioning)
         {
             bool                  sense  = true; // Sense indicator
             byte[]                subBuf = null;
@@ -154,10 +154,10 @@ namespace Aaru.Core.Devices.Dumping
             }
 
             AaruConsole.DebugWriteLine("Pregap calculator", bcd == true
-                                                               ? "Subchannel is BCD"
-                                                               : bcd == false
-                                                                   ? "Subchannel is not BCD"
-                                                                   : "Could not detect drive subchannel BCD");
+                                                                ? "Subchannel is BCD"
+                                                                : bcd == false
+                                                                    ? "Subchannel is not BCD"
+                                                                    : "Could not detect drive subchannel BCD");
 
             if(bcd is null)
             {
@@ -209,8 +209,8 @@ namespace Aaru.Core.Devices.Dumping
 
                     if(sense)
                     {
-                        AaruConsole.DebugWriteLine("Pregap calculator", "LBA: {0}, Try {1}, Sense {2}", lba, retries + 1,
-                                                  sense);
+                        AaruConsole.DebugWriteLine("Pregap calculator", "LBA: {0}, Try {1}, Sense {2}", lba,
+                                                   retries + 1, sense);
 
                         continue;
                     }
@@ -221,10 +221,10 @@ namespace Aaru.Core.Devices.Dumping
                     CRC16CCITTContext.Data(subBuf, 10, out crc);
 
                     AaruConsole.DebugWriteLine("Pregap calculator",
-                                              "LBA: {0}, Try {1}, Sense {2}, Q: {3:X2} {4:X2} {5:X2} {6:X2} {7:X2} {8:X2} {9:X2} {10:X2} {11:X2} {12:X2} CRC 0x{13:X2}{14:X2}, Calculated CRC: 0x{15:X2}{16:X2}",
-                                              lba, retries + 1, sense, subBuf[0], subBuf[1], subBuf[2], subBuf[3],
-                                              subBuf[4], subBuf[5], subBuf[6], subBuf[7], subBuf[8], subBuf[9],
-                                              subBuf[10], subBuf[11], crc[0], crc[1]);
+                                               "LBA: {0}, Try {1}, Sense {2}, Q: {3:X2} {4:X2} {5:X2} {6:X2} {7:X2} {8:X2} {9:X2} {10:X2} {11:X2} {12:X2} CRC 0x{13:X2}{14:X2}, Calculated CRC: 0x{15:X2}{16:X2}",
+                                               lba, retries + 1, sense, subBuf[0], subBuf[1], subBuf[2], subBuf[3],
+                                               subBuf[4], subBuf[5], subBuf[6], subBuf[7], subBuf[8], subBuf[9],
+                                               subBuf[10], subBuf[11], crc[0], crc[1]);
 
                     crcOk = crc[0] == subBuf[10] && crc[1] == subBuf[11];
 
@@ -262,10 +262,10 @@ namespace Aaru.Core.Devices.Dumping
                         if(crcOk)
                         {
                             AaruConsole.DebugWriteLine("Pregap calculator",
-                                                      "LBA: {0}, Try {1}, Sense {2}, Q (FIXED): {3:X2} {4:X2} {5:X2} {6:X2} {7:X2} {8:X2} {9:X2} {10:X2} {11:X2} {12:X2} CRC 0x{13:X2}{14:X2}, Calculated CRC: 0x{15:X2}{16:X2}",
-                                                      lba, retries + 1, sense, subBuf[0], subBuf[1], subBuf[2],
-                                                      subBuf[3], subBuf[4], subBuf[5], subBuf[6], subBuf[7], subBuf[8],
-                                                      subBuf[9], subBuf[10], subBuf[11], crc[0], crc[1]);
+                                                       "LBA: {0}, Try {1}, Sense {2}, Q (FIXED): {3:X2} {4:X2} {5:X2} {6:X2} {7:X2} {8:X2} {9:X2} {10:X2} {11:X2} {12:X2} CRC 0x{13:X2}{14:X2}, Calculated CRC: 0x{15:X2}{16:X2}",
+                                                       lba, retries + 1, sense, subBuf[0], subBuf[1], subBuf[2],
+                                                       subBuf[3], subBuf[4], subBuf[5], subBuf[6], subBuf[7], subBuf[8],
+                                                       subBuf[9], subBuf[10], subBuf[11], crc[0], crc[1]);
                         }
                         else
                             continue;
@@ -317,10 +317,10 @@ namespace Aaru.Core.Devices.Dumping
                         CRC16CCITTContext.Data(subBuf, 10, out crc);
 
                         AaruConsole.DebugWriteLine("Pregap calculator",
-                                                  "LBA: {0}, Try {1}, Sense {2}, Q: {3:X2} {4:X2} {5:X2} {6:X2} {7:X2} {8:X2} {9:X2} {10:X2} {11:X2} {12:X2} CRC 0x{13:X2}{14:X2}, Calculated CRC: 0x{15:X2}{16:X2}",
-                                                  lba, retries + 1, sense, subBuf[0], subBuf[1], subBuf[2], subBuf[3],
-                                                  subBuf[4], subBuf[5], subBuf[6], subBuf[7], subBuf[8], subBuf[9],
-                                                  subBuf[10], subBuf[11], crc[0], crc[1]);
+                                                   "LBA: {0}, Try {1}, Sense {2}, Q: {3:X2} {4:X2} {5:X2} {6:X2} {7:X2} {8:X2} {9:X2} {10:X2} {11:X2} {12:X2} CRC 0x{13:X2}{14:X2}, Calculated CRC: 0x{15:X2}{16:X2}",
+                                                   lba, retries + 1, sense, subBuf[0], subBuf[1], subBuf[2], subBuf[3],
+                                                   subBuf[4], subBuf[5], subBuf[6], subBuf[7], subBuf[8], subBuf[9],
+                                                   subBuf[10], subBuf[11], crc[0], crc[1]);
 
                         crcOk = crc[0] == subBuf[10] && crc[1] == subBuf[11];
 
@@ -358,10 +358,11 @@ namespace Aaru.Core.Devices.Dumping
                             if(crcOk)
                             {
                                 AaruConsole.DebugWriteLine("Pregap calculator",
-                                                          "LBA: {0}, Try {1}, Sense {2}, Q (FIXED): {3:X2} {4:X2} {5:X2} {6:X2} {7:X2} {8:X2} {9:X2} {10:X2} {11:X2} {12:X2} CRC 0x{13:X2}{14:X2}, Calculated CRC: 0x{15:X2}{16:X2}",
-                                                          lba, retries + 1, sense, subBuf[0], subBuf[1], subBuf[2],
-                                                          subBuf[3], subBuf[4], subBuf[5], subBuf[6], subBuf[7],
-                                                          subBuf[8], subBuf[9], subBuf[10], subBuf[11], crc[0], crc[1]);
+                                                           "LBA: {0}, Try {1}, Sense {2}, Q (FIXED): {3:X2} {4:X2} {5:X2} {6:X2} {7:X2} {8:X2} {9:X2} {10:X2} {11:X2} {12:X2} CRC 0x{13:X2}{14:X2}, Calculated CRC: 0x{15:X2}{16:X2}",
+                                                           lba, retries + 1, sense, subBuf[0], subBuf[1], subBuf[2],
+                                                           subBuf[3], subBuf[4], subBuf[5], subBuf[6], subBuf[7],
+                                                           subBuf[8], subBuf[9], subBuf[10], subBuf[11], crc[0],
+                                                           crc[1]);
 
                                 break;
                             }
@@ -387,18 +388,18 @@ namespace Aaru.Core.Devices.Dumping
                                         track.TrackType         == TrackType.Audio))
                                     {
                                         dumpLog?.
-                                            WriteLine($"Could not read subchannel for this track, supposing 150 sectors.");
+                                            WriteLine("Could not read subchannel for this track, supposing 150 sectors.");
 
                                         updateStatus?.
-                                            Invoke($"Could not read subchannel for this track, supposing 150 sectors.");
+                                            Invoke("Could not read subchannel for this track, supposing 150 sectors.");
                                     }
                                     else
                                     {
                                         dumpLog?.
-                                            WriteLine($"Could not read subchannel for this track, supposing 0 sectors.");
+                                            WriteLine("Could not read subchannel for this track, supposing 0 sectors.");
 
                                         updateStatus?.
-                                            Invoke($"Could not read subchannel for this track, supposing 0 sectors.");
+                                            Invoke("Could not read subchannel for this track, supposing 0 sectors.");
                                     }
                                 }
                                 else
@@ -501,7 +502,7 @@ namespace Aaru.Core.Devices.Dumping
                     if(diff != 0)
                     {
                         AaruConsole.DebugWriteLine("Pregap calculator", "Invalid Q position for LBA {0}, got {1}", lba,
-                                                  posQ);
+                                                   posQ);
 
                         inexactPositioning = true;
                     }
@@ -513,7 +514,7 @@ namespace Aaru.Core.Devices.Dumping
                         if(crcOk || pregapQ - pregaps[track.TrackSequence] < 10)
                         {
                             AaruConsole.DebugWriteLine("Pregap calculator", "Pregap for track {0}: {1}",
-                                                      track.TrackSequence, pregapQ);
+                                                       track.TrackSequence, pregapQ);
 
                             pregaps[track.TrackSequence] = pregapQ;
                         }
@@ -546,7 +547,7 @@ namespace Aaru.Core.Devices.Dumping
             }
         }
 
-        static bool GetSectorForPregapRaw(Device dev, uint lba, Aaru.Database.Models.Device dbDev, out byte[] subBuf)
+        static bool GetSectorForPregapRaw(Device dev, uint lba, Database.Models.Device dbDev, out byte[] subBuf)
         {
             byte[] cmdBuf;
             bool   sense;
@@ -601,7 +602,7 @@ namespace Aaru.Core.Devices.Dumping
             return sense;
         }
 
-        static bool GetSectorForPregapQ16(Device dev, uint lba, Aaru.Database.Models.Device dbDev, out byte[] subBuf)
+        static bool GetSectorForPregapQ16(Device dev, uint lba, Database.Models.Device dbDev, out byte[] subBuf)
         {
             byte[] cmdBuf;
             bool   sense;
diff --git a/Aaru.Core/Devices/Dumping/CompactDisc/Subchannel.cs b/Aaru.Core/Devices/Dumping/CompactDisc/Subchannel.cs
index 5b0b8d148..4e26e42b4 100644
--- a/Aaru.Core/Devices/Dumping/CompactDisc/Subchannel.cs
+++ b/Aaru.Core/Devices/Dumping/CompactDisc/Subchannel.cs
@@ -46,9 +46,9 @@ namespace Aaru.Core.Devices.Dumping
             dumpLog?.WriteLine("Checking if drive supports full raw subchannel reading...");
             updateStatus?.Invoke("Checking if drive supports full raw subchannel reading...");
 
-            return!dev.ReadCd(out _, out _, 0, 2352 + 96, 1, MmcSectorTypes.AllTypes, false, false, true,
-                              MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None, MmcSubchannel.Raw, dev.Timeout,
-                              out _);
+            return !dev.ReadCd(out _, out _, 0, 2352 + 96, 1, MmcSectorTypes.AllTypes, false, false, true,
+                               MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None, MmcSubchannel.Raw,
+                               dev.Timeout, out _);
         }
 
         public static bool SupportsPqSubchannel(Device dev, DumpLog dumpLog, UpdateStatusHandler updateStatus)
@@ -56,9 +56,9 @@ namespace Aaru.Core.Devices.Dumping
             dumpLog?.WriteLine("Checking if drive supports PQ subchannel reading...");
             updateStatus?.Invoke("Checking if drive supports PQ subchannel reading...");
 
-            return!dev.ReadCd(out _, out _, 0, 2352 + 16, 1, MmcSectorTypes.AllTypes, false, false, true,
-                              MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None, MmcSubchannel.Q16, dev.Timeout,
-                              out _);
+            return !dev.ReadCd(out _, out _, 0, 2352 + 16, 1, MmcSectorTypes.AllTypes, false, false, true,
+                               MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None, MmcSubchannel.Q16,
+                               dev.Timeout, out _);
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Devices/Dumping/CompactDisc/Tracks.cs b/Aaru.Core/Devices/Dumping/CompactDisc/Tracks.cs
index 790b75dd2..87160ef31 100644
--- a/Aaru.Core/Devices/Dumping/CompactDisc/Tracks.cs
+++ b/Aaru.Core/Devices/Dumping/CompactDisc/Tracks.cs
@@ -33,10 +33,10 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Aaru.Core.Logging;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Structs;
+using Aaru.Core.Logging;
 using Aaru.Decoders.CD;
 using Aaru.Devices;
 
diff --git a/Aaru.Core/Devices/Dumping/Dump.cs b/Aaru.Core/Devices/Dumping/Dump.cs
index b865b60b1..e1352c6ac 100644
--- a/Aaru.Core/Devices/Dumping/Dump.cs
+++ b/Aaru.Core/Devices/Dumping/Dump.cs
@@ -4,10 +4,10 @@ using System.IO;
 using System.Linq;
 using System.Text;
 using System.Xml.Serialization;
-using Aaru.Core.Logging;
 using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Metadata;
+using Aaru.Core.Logging;
 using Aaru.Database;
 using Aaru.Devices;
 using Schemas;
@@ -42,8 +42,8 @@ namespace Aaru.Core.Devices.Dumping
         readonly DumpSubchannel             _subchannel;
         readonly bool                       _trim;
         bool                                _aborted;
-        AaruContext                          _ctx;   // Master database context
-        Aaru.Database.Models.Device              _dbDev; // Device database entry
+        AaruContext                         _ctx;   // Master database context
+        Database.Models.Device              _dbDev; // Device database entry
         bool                                _dumpFirstTrackPregap;
         bool                                _fixOffset;
         uint                                _maximumReadable; // Maximum number of sectors drive can read at once
@@ -113,7 +113,7 @@ namespace Aaru.Core.Devices.Dumping
         public void Start()
         {
             // Open master database
-            _ctx = AaruContext.Create(Aaru.Settings.Settings.MasterDbPath);
+            _ctx = AaruContext.Create(Settings.Settings.MasterDbPath);
 
             // Search for device in master database
             _dbDev = _ctx.Devices.FirstOrDefault(d => d.Manufacturer == _dev.Manufacturer && d.Model == _dev.Model &&
diff --git a/Aaru.Core/Devices/Dumping/NVMe.cs b/Aaru.Core/Devices/Dumping/NVMe.cs
index 2797a4cee..e345fc9f4 100644
--- a/Aaru.Core/Devices/Dumping/NVMe.cs
+++ b/Aaru.Core/Devices/Dumping/NVMe.cs
@@ -30,17 +30,12 @@
 // Copyright © 2011-2020 Natalia Portillo
 // ****************************************************************************/
 
-
-
 // ReSharper disable InconsistentNaming
 
 namespace Aaru.Core.Devices.Dumping
 {
     public partial class Dump
     {
-        public void NVMe()
-        {
-            StoppingErrorMessage?.Invoke("NVMe devices not yet supported.");
-        }
+        public void NVMe() => StoppingErrorMessage?.Invoke("NVMe devices not yet supported.");
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Devices/Dumping/PlayStationPortable.cs b/Aaru.Core/Devices/Dumping/PlayStationPortable.cs
index 650403b93..d715b5a92 100644
--- a/Aaru.Core/Devices/Dumping/PlayStationPortable.cs
+++ b/Aaru.Core/Devices/Dumping/PlayStationPortable.cs
@@ -4,7 +4,6 @@ using System.IO;
 using System.Linq;
 using System.Text;
 using System.Xml.Serialization;
-using Aaru.Core.Logging;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Extents;
@@ -13,6 +12,7 @@ using Aaru.CommonTypes.Metadata;
 using Aaru.CommonTypes.Structs;
 using Aaru.CommonTypes.Structs.Devices.SCSI;
 using Aaru.Console;
+using Aaru.Core.Logging;
 using Aaru.Decoders.SCSI;
 using Aaru.Devices;
 using Schemas;
@@ -622,8 +622,7 @@ namespace Aaru.Core.Devices.Dumping
 
             var metadata = new CommonTypes.Structs.ImageInfo
             {
-                Application     = "Aaru", ApplicationVersion = Version.GetVersion(),
-                MediaPartNumber = mediaPartNumber
+                Application = "Aaru", ApplicationVersion = Version.GetVersion(), MediaPartNumber = mediaPartNumber
             };
 
             if(!_outputPlugin.SetMetadata(metadata))
diff --git a/Aaru.Core/Devices/Dumping/ResumeSupport.cs b/Aaru.Core/Devices/Dumping/ResumeSupport.cs
index a8bbc327a..2a68add00 100644
--- a/Aaru.Core/Devices/Dumping/ResumeSupport.cs
+++ b/Aaru.Core/Devices/Dumping/ResumeSupport.cs
@@ -108,7 +108,7 @@ namespace Aaru.Core.Devices.Dumping
                     if(oldTry.Software == null)
                         throw new InvalidOperationException("Found corrupt resume file, cannot continue...");
 
-                    if(oldTry.Software.Name            != "Aaru"     ||
+                    if(oldTry.Software.Name            != "Aaru"              ||
                        oldTry.Software.OperatingSystem != platform.ToString() ||
                        oldTry.Software.Version         != Version.GetVersion())
                         continue;
diff --git a/Aaru.Core/Devices/Dumping/SBC.cs b/Aaru.Core/Devices/Dumping/SBC.cs
index 43090a196..0acf99ec1 100644
--- a/Aaru.Core/Devices/Dumping/SBC.cs
+++ b/Aaru.Core/Devices/Dumping/SBC.cs
@@ -35,7 +35,6 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Xml.Serialization;
-using Aaru.Core.Logging;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Extents;
@@ -44,6 +43,7 @@ using Aaru.CommonTypes.Metadata;
 using Aaru.CommonTypes.Structs;
 using Aaru.CommonTypes.Structs.Devices.SCSI;
 using Aaru.Console;
+using Aaru.Core.Logging;
 using Aaru.Decoders.SCSI;
 using Aaru.Devices;
 using Schemas;
diff --git a/Aaru.Core/Devices/Dumping/SSC.cs b/Aaru.Core/Devices/Dumping/SSC.cs
index ff39b5cc3..f26472d02 100644
--- a/Aaru.Core/Devices/Dumping/SSC.cs
+++ b/Aaru.Core/Devices/Dumping/SSC.cs
@@ -36,13 +36,13 @@ using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Xml.Serialization;
-using Aaru.Core.Logging;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Extents;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Metadata;
 using Aaru.CommonTypes.Structs;
+using Aaru.Core.Logging;
 using Aaru.Decoders.SCSI;
 using Aaru.Decoders.SCSI.SSC;
 using Aaru.Devices;
diff --git a/Aaru.Core/Devices/Dumping/SecureDigital.cs b/Aaru.Core/Devices/Dumping/SecureDigital.cs
index 089bd7673..52844e97f 100644
--- a/Aaru.Core/Devices/Dumping/SecureDigital.cs
+++ b/Aaru.Core/Devices/Dumping/SecureDigital.cs
@@ -35,12 +35,12 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Xml.Serialization;
-using Aaru.Core.Logging;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Extents;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Metadata;
+using Aaru.Core.Logging;
 using Aaru.Decoders.MMC;
 using Schemas;
 using MediaType = Aaru.CommonTypes.MediaType;
@@ -95,7 +95,7 @@ namespace Aaru.Core.Devices.Dumping
 
                     if(!sense)
                     {
-                        ExtendedCSD ecsdDecoded = Aaru.Decoders.MMC.Decoders.DecodeExtendedCSD(ecsd);
+                        ExtendedCSD ecsdDecoded = Decoders.MMC.Decoders.DecodeExtendedCSD(ecsd);
                         blocksToRead = ecsdDecoded.OptimalReadSize;
                         blocks       = ecsdDecoded.SectorCount;
                         blockSize    = (uint)(ecsdDecoded.SectorSize == 1 ? 4096 : 512);
@@ -120,7 +120,7 @@ namespace Aaru.Core.Devices.Dumping
                     {
                         if(blocks == 0)
                         {
-                            CSD csdDecoded = Aaru.Decoders.MMC.Decoders.DecodeCSD(csd);
+                            CSD csdDecoded = Decoders.MMC.Decoders.DecodeCSD(csd);
                             blocks    = (ulong)((csdDecoded.Size + 1) * Math.Pow(2, csdDecoded.SizeMultiplier + 2));
                             blockSize = (uint)Math.Pow(2, csdDecoded.ReadBlockLength);
                         }
@@ -150,7 +150,7 @@ namespace Aaru.Core.Devices.Dumping
 
                     if(!sense)
                     {
-                        Aaru.Decoders.SecureDigital.CSD csdDecoded = Aaru.Decoders.SecureDigital.Decoders.DecodeCSD(csd);
+                        Decoders.SecureDigital.CSD csdDecoded = Decoders.SecureDigital.Decoders.DecodeCSD(csd);
 
                         blocks = (ulong)(csdDecoded.Structure == 0
                                              ? (csdDecoded.Size + 1) * Math.Pow(2, csdDecoded.SizeMultiplier + 2)
diff --git a/Aaru.Core/Devices/Dumping/XGD.cs b/Aaru.Core/Devices/Dumping/XGD.cs
index bb5c7d345..3a1de8cd7 100644
--- a/Aaru.Core/Devices/Dumping/XGD.cs
+++ b/Aaru.Core/Devices/Dumping/XGD.cs
@@ -33,7 +33,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Aaru.Core.Logging;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Extents;
@@ -42,6 +41,7 @@ using Aaru.CommonTypes.Interop;
 using Aaru.CommonTypes.Structs;
 using Aaru.CommonTypes.Structs.Devices.SCSI;
 using Aaru.Console;
+using Aaru.Core.Logging;
 using Aaru.Decoders.DVD;
 using Aaru.Decoders.SCSI;
 using Aaru.Decoders.Xbox;
diff --git a/Aaru.Core/Devices/Info/DeviceInfo.cs b/Aaru.Core/Devices/Info/DeviceInfo.cs
index eb9e409df..5c9913189 100644
--- a/Aaru.Core/Devices/Info/DeviceInfo.cs
+++ b/Aaru.Core/Devices/Info/DeviceInfo.cs
@@ -82,18 +82,18 @@ namespace Aaru.Core.Devices.Info
                         AaruConsole.DebugWriteLine("Device-Info command", "ERROR = 0x{0:X2}", errorRegisters.Error);
 
                         AaruConsole.DebugWriteLine("Device-Info command", "NSECTOR = 0x{0:X2}",
-                                                  errorRegisters.SectorCount);
+                                                   errorRegisters.SectorCount);
 
                         AaruConsole.DebugWriteLine("Device-Info command", "SECTOR = 0x{0:X2}", errorRegisters.Sector);
 
                         AaruConsole.DebugWriteLine("Device-Info command", "CYLHIGH = 0x{0:X2}",
-                                                  errorRegisters.CylinderHigh);
+                                                   errorRegisters.CylinderHigh);
 
                         AaruConsole.DebugWriteLine("Device-Info command", "CYLLOW = 0x{0:X2}",
-                                                  errorRegisters.CylinderLow);
+                                                   errorRegisters.CylinderLow);
 
                         AaruConsole.DebugWriteLine("Device-Info command", "DEVICE = 0x{0:X2}",
-                                                  errorRegisters.DeviceHead);
+                                                   errorRegisters.DeviceHead);
 
                         AaruConsole.DebugWriteLine("Device-Info command", "Error code = {0}", dev.LastError);
 
@@ -128,18 +128,18 @@ namespace Aaru.Core.Devices.Info
                         AaruConsole.DebugWriteLine("Device-Info command", "ERROR = 0x{0:X2}", errorRegisters.Error);
 
                         AaruConsole.DebugWriteLine("Device-Info command", "NSECTOR = 0x{0:X2}",
-                                                  errorRegisters.SectorCount);
+                                                   errorRegisters.SectorCount);
 
                         AaruConsole.DebugWriteLine("Device-Info command", "SECTOR = 0x{0:X2}", errorRegisters.Sector);
 
                         AaruConsole.DebugWriteLine("Device-Info command", "CYLHIGH = 0x{0:X2}",
-                                                  errorRegisters.CylinderHigh);
+                                                   errorRegisters.CylinderHigh);
 
                         AaruConsole.DebugWriteLine("Device-Info command", "CYLLOW = 0x{0:X2}",
-                                                  errorRegisters.CylinderLow);
+                                                   errorRegisters.CylinderLow);
 
                         AaruConsole.DebugWriteLine("Device-Info command", "DEVICE = 0x{0:X2}",
-                                                  errorRegisters.DeviceHead);
+                                                   errorRegisters.DeviceHead);
 
                         AaruConsole.DebugWriteLine("Device-Info command", "Error code = {0}", dev.LastError);
 
@@ -308,20 +308,20 @@ namespace Aaru.Core.Devices.Info
 
                                 switch(dev.Model)
                                 {
-                                    case"DVDR   PX-708A":
-                                    case"DVDR   PX-708A2":
-                                    case"DVDR   PX-712A":
+                                    case "DVDR   PX-708A":
+                                    case "DVDR   PX-708A2":
+                                    case "DVDR   PX-712A":
                                         plxtDvd = true;
 
                                         plxtSense = dev.PlextorReadEeprom(out plxtBuf, out senseBuf, dev.Timeout,
                                                                           out _);
 
                                         break;
-                                    case"DVDR   PX-714A":
-                                    case"DVDR   PX-716A":
-                                    case"DVDR   PX-716AL":
-                                    case"DVDR   PX-755A":
-                                    case"DVDR   PX-760A":
+                                    case "DVDR   PX-714A":
+                                    case "DVDR   PX-716A":
+                                    case "DVDR   PX-716AL":
+                                    case "DVDR   PX-755A":
+                                    case "DVDR   PX-760A":
                                     {
                                         plxtBuf = new byte[256 * 4];
 
@@ -514,22 +514,22 @@ namespace Aaru.Core.Devices.Info
 
                             if(sense)
                                 AaruConsole.ErrorWriteLine("REPORT DENSITY SUPPORT:\n{0}",
-                                                          Sense.PrettifySense(senseBuf));
+                                                           Sense.PrettifySense(senseBuf));
                             else
                             {
                                 DensitySupport       = seqBuf;
-                                DensitySupportHeader = Aaru.Decoders.SCSI.SSC.DensitySupport.DecodeDensity(seqBuf);
+                                DensitySupportHeader = Decoders.SCSI.SSC.DensitySupport.DecodeDensity(seqBuf);
                             }
 
                             sense = dev.ReportDensitySupport(out seqBuf, out senseBuf, true, false, dev.Timeout, out _);
 
                             if(sense)
                                 AaruConsole.ErrorWriteLine("REPORT DENSITY SUPPORT (MEDIUM):\n{0}",
-                                                          Sense.PrettifySense(senseBuf));
+                                                           Sense.PrettifySense(senseBuf));
                             else
                             {
                                 MediumDensitySupport   = seqBuf;
-                                MediaTypeSupportHeader = Aaru.Decoders.SCSI.SSC.DensitySupport.DecodeMediumType(seqBuf);
+                                MediaTypeSupportHeader = Decoders.SCSI.SSC.DensitySupport.DecodeMediumType(seqBuf);
                             }
 
                             break;
diff --git a/Aaru.Core/Devices/ReaderATA.cs b/Aaru.Core/Devices/ReaderATA.cs
index 1e8304c9d..535ae1828 100644
--- a/Aaru.Core/Devices/ReaderATA.cs
+++ b/Aaru.Core/Devices/ReaderATA.cs
@@ -62,7 +62,7 @@ namespace Aaru.Core.Devices
         (uint, byte, byte) GetDeviceChs()
         {
             if(dev.Type != DeviceType.ATA)
-                return(0, 0, 0);
+                return (0, 0, 0);
 
             if(ataId.CurrentCylinders       > 0 &&
                ataId.CurrentHeads           > 0 &&
@@ -78,14 +78,14 @@ namespace Aaru.Core.Devices
                ataId.Cylinders       <= 0                                                                    ||
                ataId.Heads           <= 0                                                                    ||
                ataId.SectorsPerTrack <= 0)
-                return(Cylinders, Heads, Sectors);
+                return (Cylinders, Heads, Sectors);
 
             Cylinders = ataId.Cylinders;
             Heads     = (byte)ataId.Heads;
             Sectors   = (byte)ataId.SectorsPerTrack;
             Blocks    = (ulong)(Cylinders * Heads * Sectors);
 
-            return(Cylinders, Heads, Sectors);
+            return (Cylinders, Heads, Sectors);
         }
 
         ulong AtaGetBlocks()
@@ -333,8 +333,7 @@ namespace Aaru.Core.Devices
             }
             else if(ataReadDmaRetryLba)
             {
-                sense = dev.ReadDma(out buffer, out errorLba, true, (uint)block, (byte)count, timeout,
-                                        out duration);
+                sense = dev.ReadDma(out buffer, out errorLba, true, (uint)block, (byte)count, timeout, out duration);
 
                 error     = !(!sense && (errorLba.Status & 0x27) == 0 && errorLba.Error == 0 && buffer.Length > 0);
                 status    = errorLba.Status;
@@ -342,8 +341,7 @@ namespace Aaru.Core.Devices
             }
             else if(ataReadDmaLba)
             {
-                sense = dev.ReadDma(out buffer, out errorLba, false, (uint)block, (byte)count, timeout,
-                                        out duration);
+                sense = dev.ReadDma(out buffer, out errorLba, false, (uint)block, (byte)count, timeout, out duration);
 
                 error     = !(!sense && (errorLba.Status & 0x27) == 0 && errorLba.Error == 0 && buffer.Length > 0);
                 status    = errorLba.Status;
@@ -381,8 +379,7 @@ namespace Aaru.Core.Devices
 
             if(ataReadDmaRetry)
             {
-                sense = dev.ReadDma(out buffer, out errorChs, true, cylinder, head, sectir, 1, timeout,
-                                        out duration);
+                sense = dev.ReadDma(out buffer, out errorChs, true, cylinder, head, sectir, 1, timeout, out duration);
 
                 error     = !(!sense && (errorChs.Status & 0x27) == 0 && errorChs.Error == 0 && buffer.Length > 0);
                 status    = errorChs.Status;
@@ -390,8 +387,7 @@ namespace Aaru.Core.Devices
             }
             else if(ataReadDma)
             {
-                sense = dev.ReadDma(out buffer, out errorChs, false, cylinder, head, sectir, 1, timeout,
-                                        out duration);
+                sense = dev.ReadDma(out buffer, out errorChs, false, cylinder, head, sectir, 1, timeout, out duration);
 
                 error     = !(!sense && (errorChs.Status & 0x27) == 0 && errorChs.Error == 0 && buffer.Length > 0);
                 status    = errorChs.Status;
@@ -422,14 +418,14 @@ namespace Aaru.Core.Devices
         {
             bool sense = dev.Seek(out AtaErrorRegistersLba28 errorLba, (uint)block, timeout, out duration);
 
-            return!(!sense && (errorLba.Status & 0x27) == 0 && errorLba.Error == 0);
+            return !(!sense && (errorLba.Status & 0x27) == 0 && errorLba.Error == 0);
         }
 
         bool AtaSeekChs(ushort cylinder, byte head, byte sector, out double duration)
         {
             bool sense = dev.Seek(out AtaErrorRegistersChs errorChs, cylinder, head, sector, timeout, out duration);
 
-            return!(!sense && (errorChs.Status & 0x27) == 0 && errorChs.Error == 0);
+            return !(!sense && (errorChs.Status & 0x27) == 0 && errorChs.Error == 0);
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Devices/ReaderSCSI.cs b/Aaru.Core/Devices/ReaderSCSI.cs
index f234189b4..b0da2c51f 100644
--- a/Aaru.Core/Devices/ReaderSCSI.cs
+++ b/Aaru.Core/Devices/ReaderSCSI.cs
@@ -376,11 +376,11 @@ namespace Aaru.Core.Devices
                 {
                     switch(dev.Manufacturer)
                     {
-                        case"HL-DT-ST":
+                        case "HL-DT-ST":
                             hldtstReadRaw = !dev.HlDtStReadRawDvd(out _, out senseBuf, 0, 1, timeout, out _);
 
                             break;
-                        case"PLEXTOR":
+                        case "PLEXTOR":
                             plextorReadRaw = !dev.PlextorReadRawDvd(out _, out senseBuf, 0, 1, timeout, out _);
 
                             break;
diff --git a/Aaru.Core/Devices/Report/ATA.cs b/Aaru.Core/Devices/Report/ATA.cs
index 769d6de42..8880b39fb 100644
--- a/Aaru.Core/Devices/Report/ATA.cs
+++ b/Aaru.Core/Devices/Report/ATA.cs
@@ -183,8 +183,8 @@ namespace Aaru.Core.Devices.Report
                                                 readBuf.Length                     > 0;
 
                 AaruConsole.DebugWriteLine("ATA Report",
-                                          "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense,
-                                          errorChs.Status, errorChs.Error, readBuf.Length);
+                                           "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense,
+                                           errorChs.Status, errorChs.Error, readBuf.Length);
 
                 mediaTest.ReadSectorsData = readBuf;
 
@@ -195,8 +195,8 @@ namespace Aaru.Core.Devices.Report
                                               readBuf.Length                     > 0;
 
                 AaruConsole.DebugWriteLine("ATA Report",
-                                          "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense,
-                                          errorChs.Status, errorChs.Error, readBuf.Length);
+                                           "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense,
+                                           errorChs.Status, errorChs.Error, readBuf.Length);
 
                 mediaTest.ReadSectorsRetryData = readBuf;
 
@@ -207,8 +207,8 @@ namespace Aaru.Core.Devices.Report
                                             readBuf.Length                     > 0;
 
                 AaruConsole.DebugWriteLine("ATA Report",
-                                          "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense,
-                                          errorChs.Status, errorChs.Error, readBuf.Length);
+                                           "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense,
+                                           errorChs.Status, errorChs.Error, readBuf.Length);
 
                 mediaTest.ReadDmaData = readBuf;
 
@@ -219,8 +219,8 @@ namespace Aaru.Core.Devices.Report
                                                  readBuf.Length                     > 0;
 
                 AaruConsole.DebugWriteLine("ATA Report",
-                                          "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense,
-                                          errorChs.Status, errorChs.Error, readBuf.Length);
+                                           "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense,
+                                           errorChs.Status, errorChs.Error, readBuf.Length);
 
                 mediaTest.ReadDmaRetryData = readBuf;
 
@@ -229,7 +229,7 @@ namespace Aaru.Core.Devices.Report
                 mediaTest.SupportsSeek = !sense && (errorChs.Status & 0x01) != 0x01 && errorChs.Error == 0;
 
                 AaruConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}", sense,
-                                          errorChs.Status, errorChs.Error);
+                                           errorChs.Status, errorChs.Error);
 
                 AaruConsole.WriteLine("Trying READ SECTOR(S) in LBA mode...");
                 sense = _dev.Read(out readBuf, out AtaErrorRegistersLba28 errorLba, false, 0, 1, _dev.Timeout, out _);
@@ -238,8 +238,8 @@ namespace Aaru.Core.Devices.Report
                                             readBuf.Length                     > 0;
 
                 AaruConsole.DebugWriteLine("ATA Report",
-                                          "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense,
-                                          errorChs.Status, errorChs.Error, readBuf.Length);
+                                           "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense,
+                                           errorChs.Status, errorChs.Error, readBuf.Length);
 
                 mediaTest.ReadLbaData = readBuf;
 
@@ -250,8 +250,8 @@ namespace Aaru.Core.Devices.Report
                                                  readBuf.Length                     > 0;
 
                 AaruConsole.DebugWriteLine("ATA Report",
-                                          "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense,
-                                          errorChs.Status, errorChs.Error, readBuf.Length);
+                                           "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense,
+                                           errorChs.Status, errorChs.Error, readBuf.Length);
 
                 mediaTest.ReadRetryLbaData = readBuf;
 
@@ -262,8 +262,8 @@ namespace Aaru.Core.Devices.Report
                                                readBuf.Length                     > 0;
 
                 AaruConsole.DebugWriteLine("ATA Report",
-                                          "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense,
-                                          errorChs.Status, errorChs.Error, readBuf.Length);
+                                           "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense,
+                                           errorChs.Status, errorChs.Error, readBuf.Length);
 
                 mediaTest.ReadDmaLbaData = readBuf;
 
@@ -274,8 +274,8 @@ namespace Aaru.Core.Devices.Report
                                                     readBuf.Length                     > 0;
 
                 AaruConsole.DebugWriteLine("ATA Report",
-                                          "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense,
-                                          errorChs.Status, errorChs.Error, readBuf.Length);
+                                           "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense,
+                                           errorChs.Status, errorChs.Error, readBuf.Length);
 
                 mediaTest.ReadDmaRetryLbaData = readBuf;
 
@@ -284,7 +284,7 @@ namespace Aaru.Core.Devices.Report
                 mediaTest.SupportsSeekLba = !sense && (errorLba.Status & 0x01) != 0x01 && errorLba.Error == 0;
 
                 AaruConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}", sense,
-                                          errorChs.Status, errorChs.Error);
+                                           errorChs.Status, errorChs.Error);
 
                 AaruConsole.WriteLine("Trying READ SECTOR(S) in LBA48 mode...");
                 sense = _dev.Read(out readBuf, out AtaErrorRegistersLba48 errorLba48, 0, 1, _dev.Timeout, out _);
@@ -293,8 +293,8 @@ namespace Aaru.Core.Devices.Report
                                               readBuf.Length                       > 0;
 
                 AaruConsole.DebugWriteLine("ATA Report",
-                                          "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense,
-                                          errorChs.Status, errorChs.Error, readBuf.Length);
+                                           "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense,
+                                           errorChs.Status, errorChs.Error, readBuf.Length);
 
                 mediaTest.ReadLba48Data = readBuf;
 
@@ -305,8 +305,8 @@ namespace Aaru.Core.Devices.Report
                                                  errorLba48.Error                     == 0    && readBuf.Length > 0;
 
                 AaruConsole.DebugWriteLine("ATA Report",
-                                          "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense,
-                                          errorChs.Status, errorChs.Error, readBuf.Length);
+                                           "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense,
+                                           errorChs.Status, errorChs.Error, readBuf.Length);
 
                 mediaTest.ReadDmaLba48Data = readBuf;
 
@@ -340,8 +340,8 @@ namespace Aaru.Core.Devices.Report
                                              BitConverter.ToUInt64(readBuf, 0)  != checkCorrectRead;
 
                 AaruConsole.DebugWriteLine("ATA Report",
-                                          "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense,
-                                          errorChs.Status, errorChs.Error, readBuf.Length);
+                                           "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense,
+                                           errorChs.Status, errorChs.Error, readBuf.Length);
 
                 mediaTest.ReadLongData = readBuf;
 
@@ -356,8 +356,8 @@ namespace Aaru.Core.Devices.Report
                                                   checkCorrectRead;
 
                 AaruConsole.DebugWriteLine("ATA Report",
-                                          "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense,
-                                          errorChs.Status, errorChs.Error, readBuf.Length);
+                                           "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense,
+                                           errorChs.Status, errorChs.Error, readBuf.Length);
 
                 mediaTest.ReadLongRetryData = readBuf;
 
@@ -371,8 +371,8 @@ namespace Aaru.Core.Devices.Report
                                                 BitConverter.ToUInt64(readBuf, 0)  != checkCorrectRead;
 
                 AaruConsole.DebugWriteLine("ATA Report",
-                                          "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense,
-                                          errorChs.Status, errorChs.Error, readBuf.Length);
+                                           "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense,
+                                           errorChs.Status, errorChs.Error, readBuf.Length);
 
                 mediaTest.ReadLongLbaData = readBuf;
 
@@ -386,8 +386,8 @@ namespace Aaru.Core.Devices.Report
                                                      BitConverter.ToUInt64(readBuf, 0)  != checkCorrectRead;
 
                 AaruConsole.DebugWriteLine("ATA Report",
-                                          "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense,
-                                          errorChs.Status, errorChs.Error, readBuf.Length);
+                                           "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense,
+                                           errorChs.Status, errorChs.Error, readBuf.Length);
 
                 mediaTest.ReadLongRetryLbaData = readBuf;
             }
@@ -523,7 +523,7 @@ namespace Aaru.Core.Devices.Report
                                                readBuf.Length                     > 0;
 
             AaruConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}",
-                                      sense, errorChs.Status, errorChs.Error, readBuf.Length);
+                                       sense, errorChs.Status, errorChs.Error, readBuf.Length);
 
             capabilities.ReadSectorsData = readBuf;
 
@@ -534,7 +534,7 @@ namespace Aaru.Core.Devices.Report
                 !sense && (errorChs.Status & 0x01) != 0x01 && errorChs.Error == 0 && readBuf.Length > 0;
 
             AaruConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}",
-                                      sense, errorChs.Status, errorChs.Error, readBuf.Length);
+                                       sense, errorChs.Status, errorChs.Error, readBuf.Length);
 
             capabilities.ReadSectorsRetryData = readBuf;
 
@@ -545,7 +545,7 @@ namespace Aaru.Core.Devices.Report
                 !sense && (errorChs.Status & 0x01) != 0x01 && errorChs.Error == 0 && readBuf.Length > 0;
 
             AaruConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}",
-                                      sense, errorChs.Status, errorChs.Error, readBuf.Length);
+                                       sense, errorChs.Status, errorChs.Error, readBuf.Length);
 
             capabilities.ReadDmaData = readBuf;
 
@@ -556,7 +556,7 @@ namespace Aaru.Core.Devices.Report
                                                 readBuf.Length                     > 0;
 
             AaruConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}",
-                                      sense, errorChs.Status, errorChs.Error, readBuf.Length);
+                                       sense, errorChs.Status, errorChs.Error, readBuf.Length);
 
             capabilities.ReadDmaRetryData = readBuf;
 
@@ -565,7 +565,7 @@ namespace Aaru.Core.Devices.Report
             capabilities.SupportsSeek = !sense && (errorChs.Status & 0x01) != 0x01 && errorChs.Error == 0;
 
             AaruConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}", sense,
-                                      errorChs.Status, errorChs.Error);
+                                       errorChs.Status, errorChs.Error);
 
             AaruConsole.WriteLine("Trying READ SECTOR(S) in LBA mode...");
             sense = _dev.Read(out readBuf, out AtaErrorRegistersLba28 errorLba, false, 0, 1, _dev.Timeout, out _);
@@ -574,7 +574,7 @@ namespace Aaru.Core.Devices.Report
                 !sense && (errorLba.Status & 0x01) != 0x01 && errorLba.Error == 0 && readBuf.Length > 0;
 
             AaruConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}",
-                                      sense, errorLba.Status, errorLba.Error, readBuf.Length);
+                                       sense, errorLba.Status, errorLba.Error, readBuf.Length);
 
             capabilities.ReadLbaData = readBuf;
 
@@ -585,7 +585,7 @@ namespace Aaru.Core.Devices.Report
                                                 readBuf.Length                     > 0;
 
             AaruConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}",
-                                      sense, errorLba.Status, errorLba.Error, readBuf.Length);
+                                       sense, errorLba.Status, errorLba.Error, readBuf.Length);
 
             capabilities.ReadRetryLbaData = readBuf;
 
@@ -596,7 +596,7 @@ namespace Aaru.Core.Devices.Report
                                               readBuf.Length                     > 0;
 
             AaruConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}",
-                                      sense, errorLba.Status, errorLba.Error, readBuf.Length);
+                                       sense, errorLba.Status, errorLba.Error, readBuf.Length);
 
             capabilities.ReadDmaLbaData = readBuf;
 
@@ -607,7 +607,7 @@ namespace Aaru.Core.Devices.Report
                 !sense && (errorLba.Status & 0x01) != 0x01 && errorLba.Error == 0 && readBuf.Length > 0;
 
             AaruConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}",
-                                      sense, errorLba.Status, errorLba.Error, readBuf.Length);
+                                       sense, errorLba.Status, errorLba.Error, readBuf.Length);
 
             capabilities.ReadDmaRetryLbaData = readBuf;
 
@@ -616,7 +616,7 @@ namespace Aaru.Core.Devices.Report
             capabilities.SupportsSeekLba = !sense && (errorLba.Status & 0x01) != 0x01 && errorLba.Error == 0;
 
             AaruConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}", sense,
-                                      errorLba.Status, errorLba.Error);
+                                       errorLba.Status, errorLba.Error);
 
             AaruConsole.WriteLine("Trying READ SECTOR(S) in LBA48 mode...");
             sense = _dev.Read(out readBuf, out AtaErrorRegistersLba48 errorLba48, 0, 1, _dev.Timeout, out _);
@@ -625,7 +625,7 @@ namespace Aaru.Core.Devices.Report
                                              readBuf.Length                       > 0;
 
             AaruConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}",
-                                      sense, errorLba48.Status, errorLba48.Error, readBuf.Length);
+                                       sense, errorLba48.Status, errorLba48.Error, readBuf.Length);
 
             capabilities.ReadLba48Data = readBuf;
 
@@ -636,7 +636,7 @@ namespace Aaru.Core.Devices.Report
                                                 readBuf.Length                       > 0;
 
             AaruConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}",
-                                      sense, errorLba48.Status, errorLba48.Error, readBuf.Length);
+                                       sense, errorLba48.Status, errorLba48.Error, readBuf.Length);
 
             capabilities.ReadDmaLba48Data = readBuf;
 
@@ -671,7 +671,7 @@ namespace Aaru.Core.Devices.Report
                                             BitConverter.ToUInt64(readBuf, 0)  != checkCorrectRead;
 
             AaruConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}",
-                                      sense, errorChs.Status, errorChs.Error, readBuf.Length);
+                                       sense, errorChs.Status, errorChs.Error, readBuf.Length);
 
             capabilities.ReadLongData = readBuf;
 
@@ -686,7 +686,7 @@ namespace Aaru.Core.Devices.Report
                                                  checkCorrectRead;
 
             AaruConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}",
-                                      sense, errorChs.Status, errorChs.Error, readBuf.Length);
+                                       sense, errorChs.Status, errorChs.Error, readBuf.Length);
 
             capabilities.ReadLongRetryData = readBuf;
 
@@ -700,7 +700,7 @@ namespace Aaru.Core.Devices.Report
                                                BitConverter.ToUInt64(readBuf, 0)  != checkCorrectRead;
 
             AaruConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}",
-                                      sense, errorLba.Status, errorLba.Error, readBuf.Length);
+                                       sense, errorLba.Status, errorLba.Error, readBuf.Length);
 
             capabilities.ReadLongLbaData = readBuf;
 
@@ -715,7 +715,7 @@ namespace Aaru.Core.Devices.Report
                                                     checkCorrectRead;
 
             AaruConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}",
-                                      sense, errorLba.Status, errorLba.Error, readBuf.Length);
+                                       sense, errorLba.Status, errorLba.Error, readBuf.Length);
 
             capabilities.ReadLongRetryLbaData = readBuf;
 
diff --git a/Aaru.Core/Devices/Report/MMC.cs b/Aaru.Core/Devices/Report/MMC.cs
index 6bb691ece..e3ac97c60 100644
--- a/Aaru.Core/Devices/Report/MMC.cs
+++ b/Aaru.Core/Devices/Report/MMC.cs
@@ -718,8 +718,8 @@ namespace Aaru.Core.Devices.Report
 
             switch(mediaType)
             {
-                case"DVD-ROM":
-                case"HD DVD-ROM":
+                case "DVD-ROM":
+                case "HD DVD-ROM":
                     AaruConsole.WriteLine("Querying DVD BCA...");
 
                     mediaTest.CanReadBCA = !_dev.ReadDiscStructure(out buffer, out senseBuffer,
@@ -743,8 +743,8 @@ namespace Aaru.Core.Devices.Report
                     mediaTest.DvdAacsData = buffer;
 
                     break;
-                case"Nintendo GameCube game":
-                case"Nintendo Wii game":
+                case "Nintendo GameCube game":
+                case "Nintendo Wii game":
                     AaruConsole.WriteLine("Querying DVD BCA...");
 
                     mediaTest.CanReadBCA = !_dev.ReadDiscStructure(out buffer, out senseBuffer,
@@ -757,12 +757,12 @@ namespace Aaru.Core.Devices.Report
                     mediaTest.DvdBcaData = buffer;
 
                     break;
-                case"BD-ROM":
-                case"Ultra HD Blu-ray movie":
-                case"PlayStation 3 game":
-                case"PlayStation 4 game":
-                case"Xbox One game":
-                case"Nintendo Wii U game":
+                case "BD-ROM":
+                case "Ultra HD Blu-ray movie":
+                case "PlayStation 3 game":
+                case "PlayStation 4 game":
+                case "Xbox One game":
+                case "Nintendo Wii U game":
                     AaruConsole.WriteLine("Querying BD BCA...");
 
                     mediaTest.CanReadBCA = !_dev.ReadDiscStructure(out buffer, out senseBuffer,
@@ -775,10 +775,10 @@ namespace Aaru.Core.Devices.Report
                     mediaTest.BluBcaData = buffer;
 
                     break;
-                case"DVD-RAM (1st gen, marked 2.6Gb or 5.2Gb)":
-                case"DVD-RAM (2nd gen, marked 4.7Gb or 9.4Gb)":
-                case"HD DVD-RAM":
-                case"PD-650":
+                case "DVD-RAM (1st gen, marked 2.6Gb or 5.2Gb)":
+                case "DVD-RAM (2nd gen, marked 4.7Gb or 9.4Gb)":
+                case "HD DVD-RAM":
+                case "PD-650":
                     mediaTest.CanReadDDS = !_dev.ReadDiscStructure(out buffer, out senseBuffer,
                                                                    MmcDiscStructureMediaType.Dvd, 0, 0,
                                                                    MmcDiscStructureFormat.DvdramDds, 0, _dev.Timeout,
@@ -1284,7 +1284,7 @@ namespace Aaru.Core.Devices.Report
                                                                                   out _);
 
                     AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}",
-                                              !mediaTest.CanReadCorrectedSubchannelWithC2);
+                                               !mediaTest.CanReadCorrectedSubchannelWithC2);
 
                     mediaTest.CorrectedSubchannelWithC2Data = buffer;
                 }
@@ -1393,7 +1393,7 @@ namespace Aaru.Core.Devices.Report
                                                                                   out _);
 
                     AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}",
-                                              !mediaTest.CanReadCorrectedSubchannelWithC2);
+                                               !mediaTest.CanReadCorrectedSubchannelWithC2);
 
                     mediaTest.CorrectedSubchannelWithC2Data = buffer;
                 }
@@ -1500,7 +1500,7 @@ namespace Aaru.Core.Devices.Report
                                                                                   out _);
 
                     AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}",
-                                              !mediaTest.CanReadCorrectedSubchannelWithC2);
+                                               !mediaTest.CanReadCorrectedSubchannelWithC2);
 
                     mediaTest.CorrectedSubchannelWithC2Data = buffer;
                 }
@@ -1665,13 +1665,13 @@ namespace Aaru.Core.Devices.Report
                         }
 
                         AaruConsole.DebugWriteLine("SCSI Report",
-                                                  "First session Lead-Out starts at {0:D2}:{1:D2}:{2:D2}",
-                                                  firstSessionLeadOutTrack.PMIN, firstSessionLeadOutTrack.PSEC,
-                                                  firstSessionLeadOutTrack.PFRAME);
+                                                   "First session Lead-Out starts at {0:D2}:{1:D2}:{2:D2}",
+                                                   firstSessionLeadOutTrack.PMIN, firstSessionLeadOutTrack.PSEC,
+                                                   firstSessionLeadOutTrack.PFRAME);
 
                         AaruConsole.DebugWriteLine("SCSI Report", "Second session starts at {0:D2}:{1:D2}:{2:D2}",
-                                                  secondSessionFirstTrack.PMIN, secondSessionFirstTrack.PSEC,
-                                                  secondSessionFirstTrack.PFRAME);
+                                                   secondSessionFirstTrack.PMIN, secondSessionFirstTrack.PSEC,
+                                                   secondSessionFirstTrack.PFRAME);
 
                         // Skip Lead-Out pre-gap
                         uint firstSessionLeadOutLba = (uint)((firstSessionLeadOutTrack.PMIN * 60 * 75) +
@@ -1715,7 +1715,7 @@ namespace Aaru.Core.Devices.Report
                         }
 
                         AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}",
-                                                  !mediaTest.CanReadingIntersessionLeadOut);
+                                                   !mediaTest.CanReadingIntersessionLeadOut);
 
                         mediaTest.IntersessionLeadOutData = buffer;
 
@@ -1750,7 +1750,7 @@ namespace Aaru.Core.Devices.Report
                         }
 
                         AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}",
-                                                  !mediaTest.CanReadingIntersessionLeadIn);
+                                                   !mediaTest.CanReadingIntersessionLeadIn);
 
                         mediaTest.IntersessionLeadInData = buffer;
                     }
diff --git a/Aaru.Core/Devices/Scanning/ATA.cs b/Aaru.Core/Devices/Scanning/ATA.cs
index 72e666a65..22fb2c063 100644
--- a/Aaru.Core/Devices/Scanning/ATA.cs
+++ b/Aaru.Core/Devices/Scanning/ATA.cs
@@ -32,8 +32,8 @@
 
 using System;
 using System.Collections.Generic;
-using Aaru.Core.Logging;
 using Aaru.CommonTypes.Structs.Devices.ATA;
+using Aaru.Core.Logging;
 
 namespace Aaru.Core.Devices.Scanning
 {
diff --git a/Aaru.Core/Devices/Scanning/MediaScan.cs b/Aaru.Core/Devices/Scanning/MediaScan.cs
index 8cbd8d666..8dee3e7d7 100644
--- a/Aaru.Core/Devices/Scanning/MediaScan.cs
+++ b/Aaru.Core/Devices/Scanning/MediaScan.cs
@@ -39,34 +39,19 @@ namespace Aaru.Core.Devices.Scanning
             }
         }
 
-        public void Abort()
-        {
-            aborted = true;
-        }
+        public void Abort() => aborted = true;
 
-        /// <summary>
-        ///     Event raised when the progress bar is not longer needed
-        /// </summary>
+        /// <summary>Event raised when the progress bar is not longer needed</summary>
         public event EndProgressHandler EndProgress;
-        /// <summary>
-        ///     Event raised when a progress bar is needed
-        /// </summary>
+        /// <summary>Event raised when a progress bar is needed</summary>
         public event InitProgressHandler InitProgress;
-        /// <summary>
-        ///     Event raised to report status updates
-        /// </summary>
+        /// <summary>Event raised to report status updates</summary>
         public event UpdateStatusHandler UpdateStatus;
-        /// <summary>
-        ///     Event raised to report a fatal error that stops the dumping operation and should call user's attention
-        /// </summary>
+        /// <summary>Event raised to report a fatal error that stops the dumping operation and should call user's attention</summary>
         public event ErrorMessageHandler StoppingErrorMessage;
-        /// <summary>
-        ///     Event raised to update the values of a determinate progress bar
-        /// </summary>
+        /// <summary>Event raised to update the values of a determinate progress bar</summary>
         public event UpdateProgressHandler UpdateProgress;
-        /// <summary>
-        ///     Event raised to update the status of an undeterminate progress bar
-        /// </summary>
+        /// <summary>Event raised to update the status of an undeterminate progress bar</summary>
         public event PulseProgressHandler PulseProgress;
         public event ScanTimeHandler       ScanTime;
         public event ScanUnreadableHandler ScanUnreadable;
diff --git a/Aaru.Core/Devices/Scanning/NVMe.cs b/Aaru.Core/Devices/Scanning/NVMe.cs
index a1b010321..4f9b9bec7 100644
--- a/Aaru.Core/Devices/Scanning/NVMe.cs
+++ b/Aaru.Core/Devices/Scanning/NVMe.cs
@@ -37,6 +37,7 @@ namespace Aaru.Core.Devices.Scanning
         ScanResults Nvme()
         {
             StoppingErrorMessage?.Invoke("NVMe devices not yet supported.");
+
             return default;
         }
     }
diff --git a/Aaru.Core/Devices/Scanning/SCSI.cs b/Aaru.Core/Devices/Scanning/SCSI.cs
index ff26d5903..89611a8b0 100644
--- a/Aaru.Core/Devices/Scanning/SCSI.cs
+++ b/Aaru.Core/Devices/Scanning/SCSI.cs
@@ -33,9 +33,9 @@
 using System;
 using System.Collections.Generic;
 using System.Threading;
-using Aaru.Core.Logging;
 using Aaru.CommonTypes.Structs.Devices.SCSI;
 using Aaru.Console;
+using Aaru.Core.Logging;
 using Aaru.Decoders.CD;
 using Aaru.Decoders.SCSI;
 using Aaru.Decoders.SCSI.MMC;
diff --git a/Aaru.Core/Devices/Scanning/ScanResults.cs b/Aaru.Core/Devices/Scanning/ScanResults.cs
index 06589fa43..701458675 100644
--- a/Aaru.Core/Devices/Scanning/ScanResults.cs
+++ b/Aaru.Core/Devices/Scanning/ScanResults.cs
@@ -34,82 +34,44 @@ using System.Collections.Generic;
 
 namespace Aaru.Core.Devices.Scanning
 {
-    /// <summary>
-    ///     Contains the results of a media scan
-    /// </summary>
+    /// <summary>Contains the results of a media scan</summary>
     public struct ScanResults
     {
-        /// <summary>
-        ///     Total time spent scanning
-        /// </summary>
+        /// <summary>Total time spent scanning</summary>
         public double TotalTime;
-        /// <summary>
-        ///     Total time spent by the device processing commands
-        /// </summary>
+        /// <summary>Total time spent by the device processing commands</summary>
         public double ProcessingTime;
-        /// <summary>
-        ///     Average scan speed
-        /// </summary>
+        /// <summary>Average scan speed</summary>
         public double AvgSpeed;
-        /// <summary>
-        ///     Maximum scan speed burst
-        /// </summary>
+        /// <summary>Maximum scan speed burst</summary>
         public double MaxSpeed;
-        /// <summary>
-        ///     Minimum scan speed
-        /// </summary>
+        /// <summary>Minimum scan speed</summary>
         public double MinSpeed;
-        /// <summary>
-        ///     Sectors that took less than 3 milliseconds to be processed
-        /// </summary>
+        /// <summary>Sectors that took less than 3 milliseconds to be processed</summary>
         public ulong A;
-        /// <summary>
-        ///     Sectors that took less than 10 milliseconds but more than 3 milliseconds to be processed
-        /// </summary>
+        /// <summary>Sectors that took less than 10 milliseconds but more than 3 milliseconds to be processed</summary>
         public ulong B;
-        /// <summary>
-        ///     Sectors that took less than 50 milliseconds but more than 10 milliseconds to be processed
-        /// </summary>
+        /// <summary>Sectors that took less than 50 milliseconds but more than 10 milliseconds to be processed</summary>
         public ulong C;
-        /// <summary>
-        ///     Sectors that took less than 150 milliseconds but more than 50 milliseconds to be processed
-        /// </summary>
+        /// <summary>Sectors that took less than 150 milliseconds but more than 50 milliseconds to be processed</summary>
         public ulong D;
-        /// <summary>
-        ///     Sectors that took less than 500 milliseconds but more than 150 milliseconds to be processed
-        /// </summary>
+        /// <summary>Sectors that took less than 500 milliseconds but more than 150 milliseconds to be processed</summary>
         public ulong E;
-        /// <summary>
-        ///     Sectors that took more than 500 milliseconds to be processed
-        /// </summary>
+        /// <summary>Sectors that took more than 500 milliseconds to be processed</summary>
         public ulong F;
-        /// <summary>
-        ///     List of sectors that could not be read
-        /// </summary>
+        /// <summary>List of sectors that could not be read</summary>
         public List<ulong> UnreadableSectors;
-        /// <summary>
-        ///     Slowest seek
-        /// </summary>
+        /// <summary>Slowest seek</summary>
         public double SeekMax;
-        /// <summary>
-        ///     Fastest seek
-        /// </summary>
+        /// <summary>Fastest seek</summary>
         public double SeekMin;
-        /// <summary>
-        ///     Total time spent seeking
-        /// </summary>
+        /// <summary>Total time spent seeking</summary>
         public double SeekTotal;
-        /// <summary>
-        ///     How many seeks have been done
-        /// </summary>
+        /// <summary>How many seeks have been done</summary>
         public int SeekTimes;
-        /// <summary>
-        ///     How many blocks were scanned
-        /// </summary>
+        /// <summary>How many blocks were scanned</summary>
         public ulong Blocks;
-        /// <summary>
-        ///     How many blocks could not be read
-        /// </summary>
+        /// <summary>How many blocks could not be read</summary>
         public ulong Errored;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Devices/Scanning/SecureDigital.cs b/Aaru.Core/Devices/Scanning/SecureDigital.cs
index 1a06f8bf3..30f1df74b 100644
--- a/Aaru.Core/Devices/Scanning/SecureDigital.cs
+++ b/Aaru.Core/Devices/Scanning/SecureDigital.cs
@@ -32,22 +32,20 @@
 
 using System;
 using System.Collections.Generic;
-using Aaru.Core.Logging;
 using Aaru.CommonTypes.Enums;
+using Aaru.Core.Logging;
 using Aaru.Decoders.MMC;
 
 namespace Aaru.Core.Devices.Scanning
 {
-    /// <summary>
-    ///     Implements scanning a SecureDigital or MultiMediaCard flash card
-    /// </summary>
+    /// <summary>Implements scanning a SecureDigital or MultiMediaCard flash card</summary>
     public partial class MediaScan
     {
         ScanResults SecureDigital()
         {
-            ScanResults results = new ScanResults();
-            byte[]      cmdBuf;
-            bool        sense;
+            var    results = new ScanResults();
+            byte[] cmdBuf;
+            bool   sense;
             results.Blocks = 0;
             const uint   TIMEOUT = 5;
             double       duration;
@@ -61,12 +59,14 @@ namespace Aaru.Core.Devices.Scanning
                 case DeviceType.MMC:
                 {
                     sense = dev.ReadExtendedCsd(out cmdBuf, out _, TIMEOUT, out _);
+
                     if(!sense)
                     {
-                        ExtendedCSD ecsd = Aaru.Decoders.MMC.Decoders.DecodeExtendedCSD(cmdBuf);
+                        ExtendedCSD ecsd = Decoders.MMC.Decoders.DecodeExtendedCSD(cmdBuf);
                         blocksToRead   = ecsd.OptimalReadSize;
                         results.Blocks = ecsd.SectorCount;
                         blockSize      = (uint)(ecsd.SectorSize == 1 ? 4096 : 512);
+
                         // Supposing it's high-capacity MMC if it has Extended CSD...
                         byteAddressed = false;
                     }
@@ -74,9 +74,10 @@ namespace Aaru.Core.Devices.Scanning
                     if(sense || results.Blocks == 0)
                     {
                         sense = dev.ReadCsd(out cmdBuf, out _, TIMEOUT, out _);
+
                         if(!sense)
                         {
-                            CSD csd = Aaru.Decoders.MMC.Decoders.DecodeCSD(cmdBuf);
+                            CSD csd = Decoders.MMC.Decoders.DecodeCSD(cmdBuf);
                             results.Blocks = (ulong)((csd.Size + 1) * Math.Pow(2, csd.SizeMultiplier + 2));
                             blockSize      = (uint)Math.Pow(2, csd.ReadBlockLength);
                         }
@@ -88,13 +89,17 @@ namespace Aaru.Core.Devices.Scanning
                 case DeviceType.SecureDigital:
                 {
                     sense = dev.ReadCsd(out cmdBuf, out _, TIMEOUT, out _);
+
                     if(!sense)
                     {
-                        Aaru.Decoders.SecureDigital.CSD csd = Aaru.Decoders.SecureDigital.Decoders.DecodeCSD(cmdBuf);
+                        Decoders.SecureDigital.CSD csd = Decoders.SecureDigital.Decoders.DecodeCSD(cmdBuf);
+
                         results.Blocks = (ulong)(csd.Structure == 0
                                                      ? (csd.Size + 1) * Math.Pow(2, csd.SizeMultiplier + 2)
                                                      : (csd.Size + 1) * 1024);
+
                         blockSize = (uint)Math.Pow(2, csd.ReadBlockLength);
+
                         // Structure >=1 for SDHC/SDXC, so that's block addressed
                         byteAddressed = csd.Structure == 0;
                     }
@@ -106,6 +111,7 @@ namespace Aaru.Core.Devices.Scanning
             if(results.Blocks == 0)
             {
                 StoppingErrorMessage?.Invoke("Unable to get device size.");
+
                 return results;
             }
 
@@ -113,14 +119,18 @@ namespace Aaru.Core.Devices.Scanning
             {
                 sense = dev.Read(out cmdBuf, out _, 0, blockSize, blocksToRead, byteAddressed, TIMEOUT, out duration);
 
-                if(sense) blocksToRead /= 2;
+                if(sense)
+                    blocksToRead /= 2;
 
-                if(!sense || blocksToRead == 1) break;
+                if(!sense ||
+                   blocksToRead == 1)
+                    break;
             }
 
             if(sense)
             {
                 StoppingErrorMessage?.Invoke($"Device error {dev.LastError} trying to guess ideal transfer length.");
+
                 return results;
             }
 
@@ -143,27 +153,35 @@ namespace Aaru.Core.Devices.Scanning
             results.SeekTotal         = 0;
             const int SEEK_TIMES = 1000;
 
-            Random rnd = new Random();
+            var rnd = new Random();
 
             UpdateStatus?.Invoke($"Reading {blocksToRead} sectors at a time.");
 
             InitBlockMap?.Invoke(results.Blocks, blockSize, blocksToRead, SD_PROFILE);
-            MhddLog mhddLog = new MhddLog(mhddLogPath, dev, results.Blocks, blockSize, blocksToRead);
-            IbgLog  ibgLog  = new IbgLog(ibgLogPath, SD_PROFILE);
+            var mhddLog = new MhddLog(mhddLogPath, dev, results.Blocks, blockSize, blocksToRead);
+            var ibgLog  = new IbgLog(ibgLogPath, SD_PROFILE);
 
             start = DateTime.UtcNow;
             DateTime timeSpeedStart   = DateTime.UtcNow;
             ulong    sectorSpeedStart = 0;
             InitProgress?.Invoke();
+
             for(ulong i = 0; i < results.Blocks; i += blocksToRead)
             {
-                if(aborted) break;
+                if(aborted)
+                    break;
 
-                if(results.Blocks - i < blocksToRead) blocksToRead = (byte)(results.Blocks - i);
+                if(results.Blocks - i < blocksToRead)
+                    blocksToRead = (byte)(results.Blocks - i);
 
                 #pragma warning disable RECS0018 // Comparison of floating point numbers with equality operator
-                if(currentSpeed > results.MaxSpeed && currentSpeed != 0) results.MaxSpeed = currentSpeed;
-                if(currentSpeed < results.MinSpeed && currentSpeed != 0) results.MinSpeed = currentSpeed;
+                if(currentSpeed > results.MaxSpeed &&
+                   currentSpeed != 0)
+                    results.MaxSpeed = currentSpeed;
+
+                if(currentSpeed < results.MinSpeed &&
+                   currentSpeed != 0)
+                    results.MinSpeed = currentSpeed;
                 #pragma warning restore RECS0018 // Comparison of floating point numbers with equality operator
 
                 UpdateProgress?.Invoke($"Reading sector {i} of {results.Blocks} ({currentSpeed:F3} MiB/sec.)", (long)i,
@@ -174,12 +192,18 @@ namespace Aaru.Core.Devices.Scanning
 
                 if(!error)
                 {
-                    if(duration      >= 500) results.F += blocksToRead;
-                    else if(duration >= 150) results.E += blocksToRead;
-                    else if(duration >= 50) results.D  += blocksToRead;
-                    else if(duration >= 10) results.C  += blocksToRead;
-                    else if(duration >= 3) results.B   += blocksToRead;
-                    else results.A                     += blocksToRead;
+                    if(duration >= 500)
+                        results.F += blocksToRead;
+                    else if(duration >= 150)
+                        results.E += blocksToRead;
+                    else if(duration >= 50)
+                        results.D += blocksToRead;
+                    else if(duration >= 10)
+                        results.C += blocksToRead;
+                    else if(duration >= 3)
+                        results.B += blocksToRead;
+                    else
+                        results.A += blocksToRead;
 
                     ScanTime?.Invoke(i, duration);
                     mhddLog.Write(i, duration);
@@ -189,7 +213,9 @@ namespace Aaru.Core.Devices.Scanning
                 {
                     ScanUnreadable?.Invoke(i);
                     results.Errored += blocksToRead;
-                    for(ulong b = i; b < i + blocksToRead; b++) results.UnreadableSectors.Add(b);
+
+                    for(ulong b = i; b < i + blocksToRead; b++)
+                        results.UnreadableSectors.Add(b);
 
                     mhddLog.Write(i, duration < 500 ? 65535 : duration);
 
@@ -199,10 +225,12 @@ namespace Aaru.Core.Devices.Scanning
                 sectorSpeedStart += blocksToRead;
 
                 double elapsed = (DateTime.UtcNow - timeSpeedStart).TotalSeconds;
-                if(elapsed < 1) continue;
 
-                currentSpeed = sectorSpeedStart * blockSize / (1048576 * elapsed);
-                ScanSpeed?.Invoke(i, currentSpeed                      * 1024);
+                if(elapsed < 1)
+                    continue;
+
+                currentSpeed = (sectorSpeedStart  * blockSize) / (1048576 * elapsed);
+                ScanSpeed?.Invoke(i, currentSpeed * 1024);
                 sectorSpeedStart = 0;
                 timeSpeedStart   = DateTime.UtcNow;
             }
@@ -210,14 +238,18 @@ namespace Aaru.Core.Devices.Scanning
             end = DateTime.UtcNow;
             EndProgress?.Invoke();
             mhddLog.Close();
+
             ibgLog.Close(dev, results.Blocks, blockSize, (end - start).TotalSeconds, currentSpeed * 1024,
-                         blockSize * (double)(results.Blocks + 1) / 1024 /
-                         (results.ProcessingTime / 1000), devicePath);
+                         (blockSize              * (double)(results.Blocks + 1)) / 1024 /
+                         (results.ProcessingTime / 1000),
+                         devicePath);
 
             InitProgress?.Invoke();
+
             for(int i = 0; i < SEEK_TIMES; i++)
             {
-                if(aborted) break;
+                if(aborted)
+                    break;
 
                 uint seekPos = (uint)rnd.Next((int)results.Blocks);
 
@@ -227,8 +259,13 @@ namespace Aaru.Core.Devices.Scanning
                          out double seekCur);
 
                 #pragma warning disable RECS0018 // Comparison of floating point numbers with equality operator
-                if(seekCur > results.SeekMax && seekCur != 0) results.SeekMax = seekCur;
-                if(seekCur < results.SeekMin && seekCur != 0) results.SeekMin = seekCur;
+                if(seekCur > results.SeekMax &&
+                   seekCur != 0)
+                    results.SeekMax = seekCur;
+
+                if(seekCur < results.SeekMin &&
+                   seekCur != 0)
+                    results.SeekMin = seekCur;
                 #pragma warning restore RECS0018 // Comparison of floating point numbers with equality operator
 
                 results.SeekTotal += seekCur;
@@ -239,7 +276,7 @@ namespace Aaru.Core.Devices.Scanning
 
             results.ProcessingTime /= 1000;
             results.TotalTime      =  (end - start).TotalSeconds;
-            results.AvgSpeed       =  blockSize * (double)(results.Blocks + 1) / 1048576 / results.ProcessingTime;
+            results.AvgSpeed       =  (blockSize * (double)(results.Blocks + 1)) / 1048576 / results.ProcessingTime;
             results.SeekTimes      =  SEEK_TIMES;
 
             return results;
diff --git a/Aaru.Core/Entropy.cs b/Aaru.Core/Entropy.cs
index 975e764cc..11a3c29bc 100644
--- a/Aaru.Core/Entropy.cs
+++ b/Aaru.Core/Entropy.cs
@@ -42,9 +42,9 @@ namespace Aaru.Core
 {
     public class Entropy
     {
-        bool        debug;
-        IMediaImage inputFormat;
-        bool        verbose;
+        readonly bool        debug;
+        readonly IMediaImage inputFormat;
+        bool                 verbose;
 
         public Entropy(bool debug, bool verbose, IMediaImage inputFormat)
         {
@@ -67,6 +67,7 @@ namespace Aaru.Core
             if(!(inputFormat is IOpticalMediaImage opticalMediaImage))
             {
                 AaruConsole.ErrorWriteLine("The selected image does not support tracks.");
+
                 return entropyResultses.ToArray();
             }
 
@@ -78,46 +79,56 @@ namespace Aaru.Core
 
                 foreach(Track currentTrack in inputTracks)
                 {
-                    EntropyResults trackEntropy = new EntropyResults {Track = currentTrack.TrackSequence, Entropy = 0};
-                    UpdateProgressEvent
-                      ?.Invoke($"Entropying track {currentTrack.TrackSequence} of {inputTracks.Max(t => t.TrackSequence)}",
+                    var trackEntropy = new EntropyResults
+                    {
+                        Track = currentTrack.TrackSequence, Entropy = 0
+                    };
+
+                    UpdateProgressEvent?.
+                        Invoke($"Entropying track {currentTrack.TrackSequence} of {inputTracks.Max(t => t.TrackSequence)}",
                                currentTrack.TrackSequence, inputTracks.Max(t => t.TrackSequence));
 
                     ulong[]      entTable              = new ulong[256];
                     ulong        trackSize             = 0;
                     List<string> uniqueSectorsPerTrack = new List<string>();
 
-                    trackEntropy.Sectors = currentTrack.TrackEndSector - currentTrack.TrackStartSector + 1;
+                    trackEntropy.Sectors = (currentTrack.TrackEndSector - currentTrack.TrackStartSector) + 1;
+
                     AaruConsole.VerboseWriteLine("Track {0} has {1} sectors", currentTrack.TrackSequence,
-                                                trackEntropy.Sectors);
+                                                 trackEntropy.Sectors);
 
                     InitProgress2Event?.Invoke();
 
                     for(ulong i = currentTrack.TrackStartSector; i <= currentTrack.TrackEndSector; i++)
                     {
-                        UpdateProgress2Event
-                          ?.Invoke($"Entropying sector {i             + 1} of track {currentTrack.TrackSequence}",
+                        UpdateProgress2Event?.
+                            Invoke($"Entropying sector {i             + 1} of track {currentTrack.TrackSequence}",
                                    (long)(currentTrack.TrackEndSector - (i + 1)),
                                    (long)trackEntropy.Sectors);
+
                         byte[] sector = opticalMediaImage.ReadSector(i, currentTrack.TrackSequence);
 
                         if(duplicatedSectors)
                         {
                             string sectorHash = Sha1Context.Data(sector, out _);
-                            if(!uniqueSectorsPerTrack.Contains(sectorHash)) uniqueSectorsPerTrack.Add(sectorHash);
+
+                            if(!uniqueSectorsPerTrack.Contains(sectorHash))
+                                uniqueSectorsPerTrack.Add(sectorHash);
                         }
 
-                        foreach(byte b in sector) entTable[b]++;
+                        foreach(byte b in sector)
+                            entTable[b]++;
 
                         trackSize += (ulong)sector.LongLength;
                     }
 
                     EndProgress2Event?.Invoke();
 
-                    trackEntropy.Entropy += entTable.Select(l => (double)l / (double)trackSize)
-                                                    .Select(frequency => -(frequency * Math.Log(frequency, 2))).Sum();
+                    trackEntropy.Entropy += entTable.Select(l => (double)l / (double)trackSize).
+                                                     Select(frequency => -(frequency * Math.Log(frequency, 2))).Sum();
 
-                    if(duplicatedSectors) trackEntropy.UniqueSectors = uniqueSectorsPerTrack.Count;
+                    if(duplicatedSectors)
+                        trackEntropy.UniqueSectors = uniqueSectorsPerTrack.Count;
 
                     entropyResultses.Add(trackEntropy);
                 }
@@ -126,8 +137,10 @@ namespace Aaru.Core
             }
             catch(Exception ex)
             {
-                if(debug) AaruConsole.DebugWriteLine("Could not get tracks because {0}", ex.Message);
-                else AaruConsole.ErrorWriteLine("Unable to get separate tracks, not calculating their entropy");
+                if(debug)
+                    AaruConsole.DebugWriteLine("Could not get tracks because {0}", ex.Message);
+                else
+                    AaruConsole.ErrorWriteLine("Unable to get separate tracks, not calculating their entropy");
             }
 
             return entropyResultses.ToArray();
@@ -135,14 +148,19 @@ namespace Aaru.Core
 
         public EntropyResults CalculateMediaEntropy(bool duplicatedSectors)
         {
-            EntropyResults entropy       = new EntropyResults {Entropy = 0};
-            ulong[]        entTable      = new ulong[256];
-            ulong          diskSize      = 0;
-            List<string>   uniqueSectors = new List<string>();
+            var entropy = new EntropyResults
+            {
+                Entropy = 0
+            };
+
+            ulong[]      entTable      = new ulong[256];
+            ulong        diskSize      = 0;
+            List<string> uniqueSectors = new List<string>();
 
             entropy.Sectors = inputFormat.Info.Sectors;
             AaruConsole.WriteLine("Sectors {0}", entropy.Sectors);
             InitProgressEvent?.Invoke();
+
             for(ulong i = 0; i < entropy.Sectors; i++)
             {
                 UpdateProgressEvent?.Invoke($"Entropying sector {i + 1}", (long)(i + 1), (long)entropy.Sectors);
@@ -151,20 +169,24 @@ namespace Aaru.Core
                 if(duplicatedSectors)
                 {
                     string sectorHash = Sha1Context.Data(sector, out _);
-                    if(!uniqueSectors.Contains(sectorHash)) uniqueSectors.Add(sectorHash);
+
+                    if(!uniqueSectors.Contains(sectorHash))
+                        uniqueSectors.Add(sectorHash);
                 }
 
-                foreach(byte b in sector) entTable[b]++;
+                foreach(byte b in sector)
+                    entTable[b]++;
 
                 diskSize += (ulong)sector.LongLength;
             }
 
             EndProgressEvent?.Invoke();
 
-            entropy.Entropy += entTable.Select(l => (double)l / (double)diskSize)
-                                       .Select(frequency => -(frequency * Math.Log(frequency, 2))).Sum();
+            entropy.Entropy += entTable.Select(l => (double)l / (double)diskSize).
+                                        Select(frequency => -(frequency * Math.Log(frequency, 2))).Sum();
 
-            if(duplicatedSectors) entropy.UniqueSectors = uniqueSectors.Count;
+            if(duplicatedSectors)
+                entropy.UniqueSectors = uniqueSectors.Count;
 
             return entropy;
         }
diff --git a/Aaru.Core/Error.cs b/Aaru.Core/Error.cs
index 6560986e8..12206c71b 100644
--- a/Aaru.Core/Error.cs
+++ b/Aaru.Core/Error.cs
@@ -8,15 +8,14 @@ namespace Aaru.Core
     {
         public static string Print(int errno)
         {
-            switch (DetectOS.GetRealPlatformID())
+            switch(DetectOS.GetRealPlatformID())
             {
                 case PlatformID.Win32S:
                 case PlatformID.Win32Windows:
                 case PlatformID.Win32NT:
                 case PlatformID.WinCE:
                 case PlatformID.WindowsPhone:
-                case PlatformID.Xbox:
-                    return PrintWin32Error(errno);
+                case PlatformID.Xbox: return PrintWin32Error(errno);
                 case PlatformID.Unix:
                 case PlatformID.MacOSX:
                 case PlatformID.iOS:
@@ -41,32 +40,24 @@ namespace Aaru.Core
                 case PlatformID.Ultrix:
                 case PlatformID.OpenServer:
                 case PlatformID.UnixWare:
-                case PlatformID.zOS:
-                    return PrintUnixError(errno);
-                case PlatformID.Wii:
-                    return $"Unknown error code {errno}";
-                case PlatformID.WiiU:
-                    return $"Unknown error code {errno}";
-                case PlatformID.PlayStation3:
-                    return $"Unknown error code {errno}";
-                case PlatformID.PlayStation4:
-                    return $"Unknown error code {errno}";
-                case PlatformID.NonStop:
-                    return $"Unknown error code {errno}";
-                case PlatformID.Unknown:
-                    return $"Unknown error code {errno}";
-                default:
-                    return $"Unknown error code {errno}";
+                case PlatformID.zOS: return PrintUnixError(errno);
+                case PlatformID.Wii:          return $"Unknown error code {errno}";
+                case PlatformID.WiiU:         return $"Unknown error code {errno}";
+                case PlatformID.PlayStation3: return $"Unknown error code {errno}";
+                case PlatformID.PlayStation4: return $"Unknown error code {errno}";
+                case PlatformID.NonStop:      return $"Unknown error code {errno}";
+                case PlatformID.Unknown:      return $"Unknown error code {errno}";
+                default:                      return $"Unknown error code {errno}";
             }
 
             throw new Exception("Arrived an unexpected place");
         }
 
-        private static string PrintUnixError(int errno)
+        static string PrintUnixError(int errno)
         {
-            switch (errno)
+            switch(errno)
             {
-                case 2: // ENOENT
+                case 2:  // ENOENT
                 case 19: // ENODEV
                     return "The specified device cannot be found.";
                 case 13: // EACCESS
@@ -75,14 +66,13 @@ namespace Aaru.Core
                     return "The specified device is in use by another process.";
                 case 30: // EROFS
                     return "Cannot open the device in writable mode, as needed by some commands.";
-                default:
-                    return $"Unknown error code {errno}";
+                default: return $"Unknown error code {errno}";
             }
         }
 
-        private static string PrintWin32Error(int errno)
+        static string PrintWin32Error(int errno)
         {
-            switch (errno)
+            switch(errno)
             {
                 case 2: // ERROR_FILE_NOT_FOUND
                 case 3: // ERROR_PATH_NOT_FOUND
@@ -91,15 +81,14 @@ namespace Aaru.Core
                     return "Not enough permissions to open the device.";
                 case 19: // ERROR_WRITE_PROTECT
                     return "Cannot open the device in writable mode, as needed by some commands.";
-                case 32: // ERROR_SHARING_VIOLATION
-                case 33: // ERROR_LOCK_VIOLATION
+                case 32:  // ERROR_SHARING_VIOLATION
+                case 33:  // ERROR_LOCK_VIOLATION
                 case 108: // ERROR_DRIVE_LOCKED
                 case 170: // ERROR_BUSY
                     return "The specified device is in use by another process.";
                 case 130: // ERROR_DIRECT_ACCESS_HANDLE
                     return "Tried to open a file instead of a device.";
-                default:
-                    return $"Unknown error code {errno}";
+                default: return $"Unknown error code {errno}";
             }
         }
     }
diff --git a/Aaru.Core/Filesystems.cs b/Aaru.Core/Filesystems.cs
index d6f97f05a..4eb0c45f9 100644
--- a/Aaru.Core/Filesystems.cs
+++ b/Aaru.Core/Filesystems.cs
@@ -50,8 +50,7 @@ namespace Aaru.Core
         {
             PluginBase plugins = GetPluginBase.Instance;
 
-            idPlugins = (from plugin in plugins.PluginsList.Values
-                         where plugin.Identify(imagePlugin, partition)
+            idPlugins = (from plugin in plugins.PluginsList.Values where plugin.Identify(imagePlugin, partition)
                          select plugin.Name.ToLower()).ToList();
         }
     }
diff --git a/Aaru.Core/GetPluginBase.cs b/Aaru.Core/GetPluginBase.cs
index 5bf061f0e..1ddd38b87 100644
--- a/Aaru.Core/GetPluginBase.cs
+++ b/Aaru.Core/GetPluginBase.cs
@@ -42,12 +42,12 @@ namespace Aaru.Core
         {
             get
             {
-                PluginBase instance = new PluginBase();
+                var instance = new PluginBase();
 
                 IPluginRegister checksumRegister    = new Register();
-                IPluginRegister imagesRegister      = new Aaru.DiscImages.Register();
+                IPluginRegister imagesRegister      = new DiscImages.Register();
                 IPluginRegister filesystemsRegister = new Aaru.Filesystems.Register();
-                IPluginRegister filtersRegister     = new Aaru.Filters.Register();
+                IPluginRegister filtersRegister     = new Filters.Register();
                 IPluginRegister partitionsRegister  = new Aaru.Partitions.Register();
 
                 instance.AddPlugins(checksumRegister);
diff --git a/Aaru.Core/ImageFormat.cs b/Aaru.Core/ImageFormat.cs
index 5e9e4a9f0..5aaac35e9 100644
--- a/Aaru.Core/ImageFormat.cs
+++ b/Aaru.Core/ImageFormat.cs
@@ -40,9 +40,7 @@ namespace Aaru.Core
 {
     public static class ImageFormat
     {
-        /// <summary>
-        ///     Detects the image plugin that recognizes the data inside a filter
-        /// </summary>
+        /// <summary>Detects the image plugin that recognizes the data inside a filter</summary>
         /// <param name="imageFilter">Filter</param>
         /// <returns>Detected image plugin</returns>
         public static IMediaImage Detect(IFilter imageFilter)
@@ -62,9 +60,12 @@ namespace Aaru.Core
                     try
                     {
                         AaruConsole.DebugWriteLine("Format detection", "Trying plugin {0}", imageplugin.Name);
-                        if(!imageplugin.Identify(imageFilter)) continue;
+
+                        if(!imageplugin.Identify(imageFilter))
+                            continue;
 
                         imageFormat = imageplugin;
+
                         break;
                     }
                     #pragma warning disable RECS0022 // A catch clause that catches System.Exception and has an empty body
@@ -73,7 +74,8 @@ namespace Aaru.Core
                         // ignored
                     }
 
-                if(imageFormat != null) return imageFormat;
+                if(imageFormat != null)
+                    return imageFormat;
 
                 // Check only RAW plugin
                 foreach(IMediaImage imageplugin in plugins.ImagePluginsList.Values.Where(imageplugin =>
@@ -84,9 +86,12 @@ namespace Aaru.Core
                     try
                     {
                         AaruConsole.DebugWriteLine("Format detection", "Trying plugin {0}", imageplugin.Name);
-                        if(!imageplugin.Identify(imageFilter)) continue;
+
+                        if(!imageplugin.Identify(imageFilter))
+                            continue;
 
                         imageFormat = imageplugin;
+
                         break;
                     }
                     #pragma warning disable RECS0022 // A catch clause that catches System.Exception and has an empty body
@@ -98,7 +103,10 @@ namespace Aaru.Core
                 // Still not recognized
                 return imageFormat;
             }
-            catch { return null; }
+            catch
+            {
+                return null;
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/ImageInfo.cs b/Aaru.Core/ImageInfo.cs
index 399ce82ce..c176fefee 100644
--- a/Aaru.Core/ImageInfo.cs
+++ b/Aaru.Core/ImageInfo.cs
@@ -68,15 +68,16 @@ namespace Aaru.Core
             if(!string.IsNullOrWhiteSpace(imageFormat.Info.Application) &&
                !string.IsNullOrWhiteSpace(imageFormat.Info.ApplicationVersion))
                 AaruConsole.WriteLine("Was created with {0} version {1}", imageFormat.Info.Application,
-                                     imageFormat.Info.ApplicationVersion);
+                                      imageFormat.Info.ApplicationVersion);
             else if(!string.IsNullOrWhiteSpace(imageFormat.Info.Application))
                 AaruConsole.WriteLine("Was created with {0}", imageFormat.Info.Application);
 
             AaruConsole.WriteLine("Image without headers is {0} bytes long", imageFormat.Info.ImageSize);
 
-            AaruConsole.WriteLine("Contains a media of {0} sectors with a maximum sector size of {1} bytes (if all sectors are of the same size this would be {2} bytes)",
-                                 imageFormat.Info.Sectors, imageFormat.Info.SectorSize,
-                                 imageFormat.Info.Sectors * imageFormat.Info.SectorSize);
+            AaruConsole.
+                WriteLine("Contains a media of {0} sectors with a maximum sector size of {1} bytes (if all sectors are of the same size this would be {2} bytes)",
+                          imageFormat.Info.Sectors, imageFormat.Info.SectorSize,
+                          imageFormat.Info.Sectors * imageFormat.Info.SectorSize);
 
             if(!string.IsNullOrWhiteSpace(imageFormat.Info.Creator))
                 AaruConsole.WriteLine("Created by: {0}", imageFormat.Info.Creator);
@@ -88,7 +89,7 @@ namespace Aaru.Core
                 AaruConsole.WriteLine("Last modified on {0}", imageFormat.Info.LastModificationTime);
 
             AaruConsole.WriteLine("Contains a media of type {0} and XML type {1}", imageFormat.Info.MediaType,
-                                 imageFormat.Info.XmlMediaType);
+                                  imageFormat.Info.XmlMediaType);
 
             AaruConsole.WriteLine("{0} partitions", imageFormat.Info.HasPartitions ? "Has" : "Doesn't have");
             AaruConsole.WriteLine("{0} sessions", imageFormat.Info.HasSessions ? "Has" : "Doesn't have");
@@ -99,7 +100,7 @@ namespace Aaru.Core
             if(imageFormat.Info.MediaSequence     != 0 &&
                imageFormat.Info.LastMediaSequence != 0)
                 AaruConsole.WriteLine("Media is number {0} on a set of {1} medias", imageFormat.Info.MediaSequence,
-                                     imageFormat.Info.LastMediaSequence);
+                                      imageFormat.Info.LastMediaSequence);
 
             if(!string.IsNullOrWhiteSpace(imageFormat.Info.MediaTitle))
                 AaruConsole.WriteLine("Media title: {0}", imageFormat.Info.MediaTitle);
@@ -137,8 +138,8 @@ namespace Aaru.Core
                imageFormat.Info.XmlMediaType    != XmlMediaType.OpticalDisc &&
                (!(imageFormat is ITapeImage tapeImage) || !tapeImage.IsTape))
                 AaruConsole.WriteLine("Media geometry: {0} cylinders, {1} heads, {2} sectors per track",
-                                     imageFormat.Info.Cylinders, imageFormat.Info.Heads,
-                                     imageFormat.Info.SectorsPerTrack);
+                                      imageFormat.Info.Cylinders, imageFormat.Info.Heads,
+                                      imageFormat.Info.SectorsPerTrack);
 
             if(imageFormat.Info.ReadableMediaTags       != null &&
                imageFormat.Info.ReadableMediaTags.Count > 0)
@@ -339,7 +340,7 @@ namespace Aaru.Core
                 byte[] mcn = imageFormat.ReadDiskTag(MediaTagType.CD_MCN);
 
                 AaruConsole.WriteLine("CompactDisc Media Catalogue Number contained in image: {0}",
-                                     Encoding.UTF8.GetString(mcn));
+                                      Encoding.UTF8.GetString(mcn));
 
                 AaruConsole.WriteLine();
             }
@@ -390,7 +391,7 @@ namespace Aaru.Core
                 byte[] dds = imageFormat.ReadDiskTag(MediaTagType.BD_DDS);
 
                 AaruConsole.WriteLine("Bluray Disc Definition Structure contained in image:");
-                AaruConsole.Write("{0}", Aaru.Decoders.Bluray.DDS.Prettify(dds));
+                AaruConsole.Write("{0}", Decoders.Bluray.DDS.Prettify(dds));
                 AaruConsole.WriteLine();
             }
 
@@ -456,12 +457,12 @@ namespace Aaru.Core
                             case TupleCodes.CISTPL_SWIL:
                             case TupleCodes.CISTPL_VERS_2:
                                 AaruConsole.DebugWriteLine("Device-Info command", "Found undecoded tuple ID {0}",
-                                                          tuple.Code);
+                                                           tuple.Code);
 
                                 break;
                             default:
                                 AaruConsole.DebugWriteLine("Device-Info command", "Found unknown tuple ID 0x{0:X2}",
-                                                          (byte)tuple.Code);
+                                                           (byte)tuple.Code);
 
                                 break;
                         }
@@ -475,7 +476,7 @@ namespace Aaru.Core
                 byte[] cid = imageFormat.ReadDiskTag(MediaTagType.SD_CID);
 
                 AaruConsole.WriteLine("SecureDigital CID contained in image:");
-                AaruConsole.Write("{0}", Aaru.Decoders.SecureDigital.Decoders.PrettifyCID(cid));
+                AaruConsole.Write("{0}", Decoders.SecureDigital.Decoders.PrettifyCID(cid));
                 AaruConsole.WriteLine();
             }
 
@@ -485,7 +486,7 @@ namespace Aaru.Core
                 byte[] csd = imageFormat.ReadDiskTag(MediaTagType.SD_CSD);
 
                 AaruConsole.WriteLine("SecureDigital CSD contained in image:");
-                AaruConsole.Write("{0}", Aaru.Decoders.SecureDigital.Decoders.PrettifyCSD(csd));
+                AaruConsole.Write("{0}", Decoders.SecureDigital.Decoders.PrettifyCSD(csd));
                 AaruConsole.WriteLine();
             }
 
@@ -495,7 +496,7 @@ namespace Aaru.Core
                 byte[] scr = imageFormat.ReadDiskTag(MediaTagType.SD_SCR);
 
                 AaruConsole.WriteLine("SecureDigital SCR contained in image:");
-                AaruConsole.Write("{0}", Aaru.Decoders.SecureDigital.Decoders.PrettifySCR(scr));
+                AaruConsole.Write("{0}", Decoders.SecureDigital.Decoders.PrettifySCR(scr));
                 AaruConsole.WriteLine();
             }
 
@@ -505,7 +506,7 @@ namespace Aaru.Core
                 byte[] ocr = imageFormat.ReadDiskTag(MediaTagType.SD_OCR);
 
                 AaruConsole.WriteLine("SecureDigital OCR contained in image:");
-                AaruConsole.Write("{0}", Aaru.Decoders.SecureDigital.Decoders.PrettifyOCR(ocr));
+                AaruConsole.Write("{0}", Decoders.SecureDigital.Decoders.PrettifyOCR(ocr));
                 AaruConsole.WriteLine();
             }
 
@@ -515,7 +516,7 @@ namespace Aaru.Core
                 byte[] cid = imageFormat.ReadDiskTag(MediaTagType.MMC_CID);
 
                 AaruConsole.WriteLine("MultiMediaCard CID contained in image:");
-                AaruConsole.Write("{0}", Aaru.Decoders.MMC.Decoders.PrettifyCID(cid));
+                AaruConsole.Write("{0}", Decoders.MMC.Decoders.PrettifyCID(cid));
                 AaruConsole.WriteLine();
             }
 
@@ -525,7 +526,7 @@ namespace Aaru.Core
                 byte[] csd = imageFormat.ReadDiskTag(MediaTagType.MMC_CSD);
 
                 AaruConsole.WriteLine("MultiMediaCard CSD contained in image:");
-                AaruConsole.Write("{0}", Aaru.Decoders.MMC.Decoders.PrettifyCSD(csd));
+                AaruConsole.Write("{0}", Decoders.MMC.Decoders.PrettifyCSD(csd));
                 AaruConsole.WriteLine();
             }
 
@@ -535,7 +536,7 @@ namespace Aaru.Core
                 byte[] ecsd = imageFormat.ReadDiskTag(MediaTagType.MMC_ExtendedCSD);
 
                 AaruConsole.WriteLine("MultiMediaCard ExtendedCSD contained in image:");
-                AaruConsole.Write("{0}", Aaru.Decoders.MMC.Decoders.PrettifyExtendedCSD(ecsd));
+                AaruConsole.Write("{0}", Decoders.MMC.Decoders.PrettifyExtendedCSD(ecsd));
                 AaruConsole.WriteLine();
             }
 
@@ -545,7 +546,7 @@ namespace Aaru.Core
                 byte[] ocr = imageFormat.ReadDiskTag(MediaTagType.MMC_OCR);
 
                 AaruConsole.WriteLine("MultiMediaCard OCR contained in image:");
-                AaruConsole.Write("{0}", Aaru.Decoders.MMC.Decoders.PrettifyOCR(ocr));
+                AaruConsole.Write("{0}", Decoders.MMC.Decoders.PrettifyOCR(ocr));
                 AaruConsole.WriteLine();
             }
 
@@ -609,14 +610,14 @@ namespace Aaru.Core
                         AaruConsole.WriteLine("Image sessions:");
 
                         AaruConsole.WriteLine("{0,-9}{1,-13}{2,-12}{3,-12}{4,-12}", "Session", "First track",
-                                             "Last track", "Start", "End");
+                                              "Last track", "Start", "End");
 
                         AaruConsole.WriteLine("=========================================================");
 
                         foreach(Session session in opticalImage.Sessions)
                             AaruConsole.WriteLine("{0,-9}{1,-13}{2,-12}{3,-12}{4,-12}", session.SessionSequence,
-                                                 session.StartTrack, session.EndTrack, session.StartSector,
-                                                 session.EndSector);
+                                                  session.StartTrack, session.EndTrack, session.StartSector,
+                                                  session.EndSector);
 
                         AaruConsole.WriteLine();
                     }
@@ -634,16 +635,16 @@ namespace Aaru.Core
                         AaruConsole.WriteLine("Image tracks:");
 
                         AaruConsole.WriteLine("{0,-7}{1,-17}{2,-6}{3,-8}{4,-12}{5,-8}{6,-12}{7,-12}", "Track", "Type",
-                                             "Bps", "Raw bps", "Subchannel", "Pregap", "Start", "End");
+                                              "Bps", "Raw bps", "Subchannel", "Pregap", "Start", "End");
 
                         AaruConsole.
                             WriteLine("=================================================================================");
 
                         foreach(Track track in opticalImage.Tracks)
                             AaruConsole.WriteLine("{0,-7}{1,-17}{2,-6}{3,-8}{4,-12}{5,-8}{6,-12}{7,-12}",
-                                                 track.TrackSequence, track.TrackType, track.TrackBytesPerSector,
-                                                 track.TrackRawBytesPerSector, track.TrackSubchannelType,
-                                                 track.TrackPregap, track.TrackStartSector, track.TrackEndSector);
+                                                  track.TrackSequence, track.TrackType, track.TrackBytesPerSector,
+                                                  track.TrackRawBytesPerSector, track.TrackSubchannelType,
+                                                  track.TrackPregap, track.TrackStartSector, track.TrackEndSector);
 
                         AaruConsole.WriteLine();
                     }
@@ -724,7 +725,7 @@ namespace Aaru.Core
             AaruConsole.WriteLine("Dump hardware information:");
 
             AaruConsole.WriteLine(format, MANUFACTURER_STRING, MODEL_STRING, SERIAL_STRING, SOFTWARE_STRING,
-                                 VERSION_STRING, OS_STRING, START_STRING, END_STRING);
+                                  VERSION_STRING, OS_STRING, START_STRING, END_STRING);
 
             AaruConsole.WriteLine(new string(separator));
 
@@ -732,8 +733,8 @@ namespace Aaru.Core
             {
                 foreach(ExtentType extent in dump.Extents)
                     AaruConsole.WriteLine(format, dump.Manufacturer, dump.Model, dump.Serial, dump.Software.Name,
-                                         dump.Software.Version, dump.Software.OperatingSystem, extent.Start,
-                                         extent.End);
+                                          dump.Software.Version, dump.Software.OperatingSystem, extent.Start,
+                                          extent.End);
             }
 
             AaruConsole.WriteLine();
diff --git a/Aaru.Core/Media/Detection/MMC.cs b/Aaru.Core/Media/Detection/MMC.cs
index f2e39c8d1..0ae269845 100644
--- a/Aaru.Core/Media/Detection/MMC.cs
+++ b/Aaru.Core/Media/Detection/MMC.cs
@@ -836,7 +836,7 @@ namespace Aaru.Core.Media.Detection
                         string ps2BootSectorsHash = Sha256Context.Data(ps2BootSectors, out _);
 
                         AaruConsole.DebugWriteLine("Media-info Command", "PlayStation 2 boot sectors SHA256: {0}",
-                                                  ps2BootSectorsHash);
+                                                   ps2BootSectorsHash);
 
                         if(ps2BootSectorsHash == PS2_PAL_HASH  ||
                            ps2BootSectorsHash == PS2_NTSC_HASH ||
@@ -942,7 +942,7 @@ namespace Aaru.Core.Media.Detection
                         string ps2BootSectorsHash = Sha256Context.Data(ps2BootSectors, out _);
 
                         AaruConsole.DebugWriteLine("Media-info Command", "PlayStation 2 boot sectors SHA256: {0}",
-                                                  ps2BootSectorsHash);
+                                                   ps2BootSectorsHash);
 
                         if(ps2BootSectorsHash == PS2_PAL_HASH  ||
                            ps2BootSectorsHash == PS2_NTSC_HASH ||
diff --git a/Aaru.Core/Media/Info/CompactDisc.cs b/Aaru.Core/Media/Info/CompactDisc.cs
index 0de2fec77..46ab4d979 100644
--- a/Aaru.Core/Media/Info/CompactDisc.cs
+++ b/Aaru.Core/Media/Info/CompactDisc.cs
@@ -1,11 +1,11 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
-using Aaru.Core.Logging;
-using Aaru.Core.Media.Detection;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Structs;
+using Aaru.Core.Logging;
+using Aaru.Core.Media.Detection;
 using Aaru.Database.Models;
 using Aaru.Decoders.CD;
 using Aaru.Devices;
@@ -125,17 +125,18 @@ namespace Aaru.Core.Media.Info
                                 // Clear cache
                                 for(int i = 0; i < 63; i++)
                                 {
-                                    sense = dev.ReadCd(out _, out _, (uint)(wantedLba + 3 + (16 * i)), sectorSize, 16, MmcSectorTypes.AllTypes, false,
-                                                       false, false, MmcHeaderCodes.None, true, false, MmcErrorField.None,
+                                    sense = dev.ReadCd(out _, out _, (uint)(wantedLba + 3 + (16 * i)), sectorSize, 16,
+                                                       MmcSectorTypes.AllTypes, false, false, false,
+                                                       MmcHeaderCodes.None, true, false, MmcErrorField.None,
                                                        MmcSubchannel.None, dev.Timeout, out _);
 
                                     if(sense || dev.Error)
                                         break;
                                 }
 
-                                sense = dev.ReadCd(out cmdBuf, out _, wantedLba, sectorSize, 3, MmcSectorTypes.Cdda, false,
-                                                   false, false, MmcHeaderCodes.None, true, false, MmcErrorField.None,
-                                                   MmcSubchannel.None, dev.Timeout, out _);
+                                sense = dev.ReadCd(out cmdBuf, out _, wantedLba, sectorSize, 3, MmcSectorTypes.Cdda,
+                                                   false, false, false, MmcHeaderCodes.None, true, false,
+                                                   MmcErrorField.None, MmcSubchannel.None, dev.Timeout, out _);
 
                                 for(int i = 0; i < cmdBuf.Length - sectorSync.Length; i++)
                                 {
diff --git a/Aaru.Core/Media/Info/ScsiInfo.cs b/Aaru.Core/Media/Info/ScsiInfo.cs
index f391477ba..420356d07 100644
--- a/Aaru.Core/Media/Info/ScsiInfo.cs
+++ b/Aaru.Core/Media/Info/ScsiInfo.cs
@@ -34,11 +34,11 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
-using Aaru.Core.Media.Detection;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Structs.Devices.SCSI;
 using Aaru.Console;
+using Aaru.Core.Media.Detection;
 using Aaru.Decoders.CD;
 using Aaru.Decoders.DVD;
 using Aaru.Decoders.SCSI;
@@ -133,7 +133,7 @@ namespace Aaru.Core.Media.Info
                             if(sense)
                             {
                                 AaruConsole.ErrorWriteLine("Error testing unit was ready:\n{0}",
-                                                          Sense.PrettifySense(senseBuf));
+                                                           Sense.PrettifySense(senseBuf));
 
                                 return;
                             }
@@ -141,7 +141,7 @@ namespace Aaru.Core.Media.Info
                         else
                         {
                             AaruConsole.ErrorWriteLine("Error testing unit was ready:\n{0}",
-                                                      Sense.PrettifySense(senseBuf));
+                                                       Sense.PrettifySense(senseBuf));
 
                             return;
                         }
@@ -157,7 +157,7 @@ namespace Aaru.Core.Media.Info
 
             MediaInserted = true;
 
-            DeviceInfo = new Devices.Info.DeviceInfo(dev);
+            DeviceInfo = new DeviceInfo(dev);
 
             byte scsiMediumType  = 0;
             byte scsiDensityCode = 0;
@@ -240,7 +240,7 @@ namespace Aaru.Core.Media.Info
                            !seqBuf.SequenceEqual(medBuf))
                         {
                             DensitySupport       = seqBuf;
-                            DensitySupportHeader = Aaru.Decoders.SCSI.SSC.DensitySupport.DecodeDensity(seqBuf);
+                            DensitySupportHeader = Decoders.SCSI.SSC.DensitySupport.DecodeDensity(seqBuf);
                         }
                     }
 
@@ -254,7 +254,7 @@ namespace Aaru.Core.Media.Info
                            !seqBuf.SequenceEqual(medBuf))
                         {
                             MediaTypeSupport       = medBuf;
-                            MediaTypeSupportHeader = Aaru.Decoders.SCSI.SSC.DensitySupport.DecodeMediumType(seqBuf);
+                            MediaTypeSupportHeader = Decoders.SCSI.SSC.DensitySupport.DecodeMediumType(seqBuf);
                         }
                     }
 
@@ -279,7 +279,7 @@ namespace Aaru.Core.Media.Info
                 if(sense)
                 {
                     AaruConsole.DebugWriteLine("Media-Info command", "READ GET CONFIGURATION:\n{0}",
-                                              Sense.PrettifySense(senseBuf));
+                                               Sense.PrettifySense(senseBuf));
                 }
                 else
                 {
@@ -287,7 +287,7 @@ namespace Aaru.Core.Media.Info
                     Features.SeparatedFeatures ftr = Features.Separate(cmdBuf);
 
                     AaruConsole.DebugWriteLine("Media-Info command", "GET CONFIGURATION current profile is {0:X4}h",
-                                              ftr.CurrentProfile);
+                                               ftr.CurrentProfile);
 
                     switch(ftr.CurrentProfile)
                     {
@@ -451,8 +451,8 @@ namespace Aaru.Core.Media.Info
 
                 if(sense)
                     AaruConsole.DebugWriteLine("Media-Info command",
-                                              "READ DISC STRUCTURE: Recognized Format Layers\n{0}",
-                                              Sense.PrettifySense(senseBuf));
+                                               "READ DISC STRUCTURE: Recognized Format Layers\n{0}",
+                                               Sense.PrettifySense(senseBuf));
                 else
                     RecognizedFormatLayers = cmdBuf;
 
@@ -460,8 +460,9 @@ namespace Aaru.Core.Media.Info
                                               MmcDiscStructureFormat.WriteProtectionStatus, 0, dev.Timeout, out _);
 
                 if(sense)
-                    AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: Write Protection Status\n{0}",
-                                              Sense.PrettifySense(senseBuf));
+                    AaruConsole.DebugWriteLine("Media-Info command",
+                                               "READ DISC STRUCTURE: Write Protection Status\n{0}",
+                                               Sense.PrettifySense(senseBuf));
                 else
                     WriteProtectionStatus = cmdBuf;
 
@@ -499,7 +500,7 @@ namespace Aaru.Core.Media.Info
                     if(sense)
                     {
                         AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: PFI\n{0}",
-                                                  Sense.PrettifySense(senseBuf));
+                                                   Sense.PrettifySense(senseBuf));
                     }
                     else
                     {
@@ -579,7 +580,7 @@ namespace Aaru.Core.Media.Info
                     if(sense)
                     {
                         AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: DMI\n{0}",
-                                                  Sense.PrettifySense(senseBuf));
+                                                   Sense.PrettifySense(senseBuf));
                     }
                     else
                     {
@@ -612,7 +613,7 @@ namespace Aaru.Core.Media.Info
 
                     if(sense)
                         AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: CMI\n{0}",
-                                                  Sense.PrettifySense(senseBuf));
+                                                   Sense.PrettifySense(senseBuf));
                     else
                         DvdCmi = cmdBuf;
                 }
@@ -629,7 +630,7 @@ namespace Aaru.Core.Media.Info
 
                         if(sense)
                             AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: BCA\n{0}",
-                                                      Sense.PrettifySense(senseBuf));
+                                                       Sense.PrettifySense(senseBuf));
                         else
                             DvdBca = cmdBuf;
 
@@ -638,7 +639,7 @@ namespace Aaru.Core.Media.Info
 
                         if(sense)
                             AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: DVD AACS\n{0}",
-                                                      Sense.PrettifySense(senseBuf));
+                                                       Sense.PrettifySense(senseBuf));
                         else
                             DvdAacs = cmdBuf;
 
@@ -653,7 +654,7 @@ namespace Aaru.Core.Media.Info
 
                         if(sense)
                             AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: DDS\n{0}",
-                                                      Sense.PrettifySense(senseBuf));
+                                                       Sense.PrettifySense(senseBuf));
                         else
                             DvdRamDds = cmdBuf;
 
@@ -662,7 +663,7 @@ namespace Aaru.Core.Media.Info
 
                         if(sense)
                             AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: Medium Status\n{0}",
-                                                      Sense.PrettifySense(senseBuf));
+                                                       Sense.PrettifySense(senseBuf));
                         else
                             DvdRamCartridgeStatus = cmdBuf;
 
@@ -672,7 +673,7 @@ namespace Aaru.Core.Media.Info
 
                         if(sense)
                             AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: SAI\n{0}",
-                                                      Sense.PrettifySense(senseBuf));
+                                                       Sense.PrettifySense(senseBuf));
                         else
                             DvdRamSpareArea = cmdBuf;
 
@@ -687,8 +688,8 @@ namespace Aaru.Core.Media.Info
 
                         if(sense)
                             AaruConsole.DebugWriteLine("Media-Info command",
-                                                      "READ DISC STRUCTURE: Last-Out Border RMD\n{0}",
-                                                      Sense.PrettifySense(senseBuf));
+                                                       "READ DISC STRUCTURE: Last-Out Border RMD\n{0}",
+                                                       Sense.PrettifySense(senseBuf));
                         else
                             LastBorderOutRmd = cmdBuf;
 
@@ -765,7 +766,7 @@ namespace Aaru.Core.Media.Info
 
                     if(sense)
                         AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: Pre-Recorded Info\n{0}",
-                                                  Sense.PrettifySense(senseBuf));
+                                                   Sense.PrettifySense(senseBuf));
                     else
                         DvdPreRecordedInfo = cmdBuf;
                 }
@@ -783,7 +784,7 @@ namespace Aaru.Core.Media.Info
 
                         if(sense)
                             AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: DVD-R Media ID\n{0}",
-                                                      Sense.PrettifySense(senseBuf));
+                                                       Sense.PrettifySense(senseBuf));
                         else
                             DvdrMediaIdentifier = cmdBuf;
 
@@ -793,7 +794,7 @@ namespace Aaru.Core.Media.Info
 
                         if(sense)
                             AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: DVD-R PFI\n{0}",
-                                                      Sense.PrettifySense(senseBuf));
+                                                       Sense.PrettifySense(senseBuf));
                         else
                             DvdrPhysicalInformation = cmdBuf;
 
@@ -810,7 +811,7 @@ namespace Aaru.Core.Media.Info
 
                         if(sense)
                             AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: ADIP\n{0}",
-                                                      Sense.PrettifySense(senseBuf));
+                                                       Sense.PrettifySense(senseBuf));
                         else
                             DvdPlusAdip = cmdBuf;
 
@@ -819,7 +820,7 @@ namespace Aaru.Core.Media.Info
 
                         if(sense)
                             AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: DCB\n{0}",
-                                                      Sense.PrettifySense(senseBuf));
+                                                       Sense.PrettifySense(senseBuf));
                         else
                             DvdPlusDcb = cmdBuf;
 
@@ -834,7 +835,7 @@ namespace Aaru.Core.Media.Info
 
                         if(sense)
                             AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: HD DVD CMI\n{0}",
-                                                      Sense.PrettifySense(senseBuf));
+                                                       Sense.PrettifySense(senseBuf));
                         else
                             HddvdCopyrightInformation = cmdBuf;
 
@@ -850,8 +851,8 @@ namespace Aaru.Core.Media.Info
 
                     if(sense)
                         AaruConsole.DebugWriteLine("Media-Info command",
-                                                  "READ DISC STRUCTURE: HD DVD-R Medium Status\n{0}",
-                                                  Sense.PrettifySense(senseBuf));
+                                                   "READ DISC STRUCTURE: HD DVD-R Medium Status\n{0}",
+                                                   Sense.PrettifySense(senseBuf));
                     else
                         HddvdrMediumStatus = cmdBuf;
 
@@ -860,7 +861,7 @@ namespace Aaru.Core.Media.Info
 
                     if(sense)
                         AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: Last RMD\n{0}",
-                                                  Sense.PrettifySense(senseBuf));
+                                                   Sense.PrettifySense(senseBuf));
                     else
                         HddvdrLastRmd = cmdBuf;
                 }
@@ -877,7 +878,7 @@ namespace Aaru.Core.Media.Info
 
                     if(sense)
                         AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: Layer Capacity\n{0}",
-                                                  Sense.PrettifySense(senseBuf));
+                                                   Sense.PrettifySense(senseBuf));
                     else
                         DvdrLayerCapacity = cmdBuf;
                 }
@@ -892,8 +893,8 @@ namespace Aaru.Core.Media.Info
 
                         if(sense)
                             AaruConsole.DebugWriteLine("Media-Info command",
-                                                      "READ DISC STRUCTURE: Middle Zone Start\n{0}",
-                                                      Sense.PrettifySense(senseBuf));
+                                                       "READ DISC STRUCTURE: Middle Zone Start\n{0}",
+                                                       Sense.PrettifySense(senseBuf));
                         else
                             DvdrDlMiddleZoneStart = cmdBuf;
 
@@ -902,8 +903,8 @@ namespace Aaru.Core.Media.Info
 
                         if(sense)
                             AaruConsole.DebugWriteLine("Media-Info command",
-                                                      "READ DISC STRUCTURE: Jump Interval Size\n{0}",
-                                                      Sense.PrettifySense(senseBuf));
+                                                       "READ DISC STRUCTURE: Jump Interval Size\n{0}",
+                                                       Sense.PrettifySense(senseBuf));
                         else
                             DvdrDlJumpIntervalSize = cmdBuf;
 
@@ -913,8 +914,8 @@ namespace Aaru.Core.Media.Info
 
                         if(sense)
                             AaruConsole.DebugWriteLine("Media-Info command",
-                                                      "READ DISC STRUCTURE: Manual Layer Jump Start LBA\n{0}",
-                                                      Sense.PrettifySense(senseBuf));
+                                                       "READ DISC STRUCTURE: Manual Layer Jump Start LBA\n{0}",
+                                                       Sense.PrettifySense(senseBuf));
                         else
                             DvdrDlManualLayerJumpStartLba = cmdBuf;
 
@@ -923,8 +924,8 @@ namespace Aaru.Core.Media.Info
 
                         if(sense)
                             AaruConsole.DebugWriteLine("Media-Info command",
-                                                      "READ DISC STRUCTURE: Remap Anchor Point\n{0}",
-                                                      Sense.PrettifySense(senseBuf));
+                                                       "READ DISC STRUCTURE: Remap Anchor Point\n{0}",
+                                                       Sense.PrettifySense(senseBuf));
                         else
                             DvdrDlRemapAnchorPoint = cmdBuf;
 
@@ -942,7 +943,7 @@ namespace Aaru.Core.Media.Info
 
                         if(sense)
                             AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: DI\n{0}",
-                                                      Sense.PrettifySense(senseBuf));
+                                                       Sense.PrettifySense(senseBuf));
                         else
                             BlurayDiscInformation = cmdBuf;
 
@@ -951,7 +952,7 @@ namespace Aaru.Core.Media.Info
 
                         if(sense)
                             AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: PAC\n{0}",
-                                                      Sense.PrettifySense(senseBuf));
+                                                       Sense.PrettifySense(senseBuf));
                         else
                             BlurayPac = cmdBuf;
 
@@ -968,7 +969,7 @@ namespace Aaru.Core.Media.Info
 
                         if(sense)
                             AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: BCA\n{0}",
-                                                      Sense.PrettifySense(senseBuf));
+                                                       Sense.PrettifySense(senseBuf));
                         else
                             BlurayBurstCuttingArea = cmdBuf;
 
@@ -985,7 +986,7 @@ namespace Aaru.Core.Media.Info
 
                         if(sense)
                             AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: DDS\n{0}",
-                                                      Sense.PrettifySense(senseBuf));
+                                                       Sense.PrettifySense(senseBuf));
                         else
                             BlurayDds = cmdBuf;
 
@@ -994,8 +995,8 @@ namespace Aaru.Core.Media.Info
 
                         if(sense)
                             AaruConsole.DebugWriteLine("Media-Info command",
-                                                      "READ DISC STRUCTURE: Cartridge Status\n{0}",
-                                                      Sense.PrettifySense(senseBuf));
+                                                       "READ DISC STRUCTURE: Cartridge Status\n{0}",
+                                                       Sense.PrettifySense(senseBuf));
                         else
                             BlurayCartridgeStatus = cmdBuf;
 
@@ -1005,8 +1006,8 @@ namespace Aaru.Core.Media.Info
 
                         if(sense)
                             AaruConsole.DebugWriteLine("Media-Info command",
-                                                      "READ DISC STRUCTURE: Spare Area Information\n{0}",
-                                                      Sense.PrettifySense(senseBuf));
+                                                       "READ DISC STRUCTURE: Spare Area Information\n{0}",
+                                                       Sense.PrettifySense(senseBuf));
                         else
                             BluraySpareAreaInformation = cmdBuf;
 
@@ -1015,7 +1016,7 @@ namespace Aaru.Core.Media.Info
 
                         if(sense)
                             AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: Raw DFL\n{0}",
-                                                      Sense.PrettifySense(senseBuf));
+                                                       Sense.PrettifySense(senseBuf));
                         else
                             BlurayRawDfl = cmdBuf;
 
@@ -1024,7 +1025,7 @@ namespace Aaru.Core.Media.Info
 
                         if(sense)
                             AaruConsole.DebugWriteLine("Media-Info command", "READ DISC INFORMATION 001b\n{0}",
-                                                      Sense.PrettifySense(senseBuf));
+                                                       Sense.PrettifySense(senseBuf));
                         else
                             BlurayTrackResources = cmdBuf;
 
@@ -1033,7 +1034,7 @@ namespace Aaru.Core.Media.Info
 
                         if(sense)
                             AaruConsole.DebugWriteLine("Media-Info command", "READ DISC INFORMATION 010b\n{0}",
-                                                      Sense.PrettifySense(senseBuf));
+                                                       Sense.PrettifySense(senseBuf));
                         else
                             BlurayPowResources = cmdBuf;
 
@@ -1053,7 +1054,7 @@ namespace Aaru.Core.Media.Info
                         if(tocSense)
                         {
                             AaruConsole.DebugWriteLine("Media-Info command", "READ TOC/PMA/ATIP: TOC\n{0}",
-                                                      Sense.PrettifySense(senseBuf));
+                                                       Sense.PrettifySense(senseBuf));
                         }
                         else
                         {
@@ -1071,7 +1072,7 @@ namespace Aaru.Core.Media.Info
                         if(sense)
                         {
                             AaruConsole.DebugWriteLine("Media-Info command", "READ TOC/PMA/ATIP: ATIP\n{0}",
-                                                      Sense.PrettifySense(senseBuf));
+                                                       Sense.PrettifySense(senseBuf));
                         }
                         else
                         {
@@ -1094,7 +1095,7 @@ namespace Aaru.Core.Media.Info
                             if(sense)
                             {
                                 AaruConsole.DebugWriteLine("Media-Info command", "READ DISC INFORMATION 000b\n{0}",
-                                                          Sense.PrettifySense(senseBuf));
+                                                           Sense.PrettifySense(senseBuf));
                             }
                             else
                             {
@@ -1121,12 +1122,12 @@ namespace Aaru.Core.Media.Info
                             if(sense)
                             {
                                 AaruConsole.DebugWriteLine("Media-Info command", "READ TOC/PMA/ATIP: Session info\n{0}",
-                                                          Sense.PrettifySense(senseBuf));
+                                                           Sense.PrettifySense(senseBuf));
                             }
                             else
                             {
                                 Session        = cmdBuf;
-                                DecodedSession = Aaru.Decoders.CD.Session.Decode(cmdBuf);
+                                DecodedSession = Decoders.CD.Session.Decode(cmdBuf);
 
                                 if(DecodedSession.HasValue)
                                 {
@@ -1140,7 +1141,7 @@ namespace Aaru.Core.Media.Info
                             if(sense)
                             {
                                 AaruConsole.DebugWriteLine("Media-Info command", "READ TOC/PMA/ATIP: Raw TOC\n{0}",
-                                                          Sense.PrettifySense(senseBuf));
+                                                           Sense.PrettifySense(senseBuf));
                             }
                             else
                             {
@@ -1173,7 +1174,7 @@ namespace Aaru.Core.Media.Info
 
                             if(sense)
                                 AaruConsole.DebugWriteLine("Media-Info command", "READ TOC/PMA/ATIP: PMA\n{0}",
-                                                          Sense.PrettifySense(senseBuf));
+                                                           Sense.PrettifySense(senseBuf));
                             else
                                 Pma = cmdBuf;
 
@@ -1182,7 +1183,7 @@ namespace Aaru.Core.Media.Info
                             if(sense)
                             {
                                 AaruConsole.DebugWriteLine("Media-Info command", "READ TOC/PMA/ATIP: CD-TEXT\n{0}",
-                                                          Sense.PrettifySense(senseBuf));
+                                                           Sense.PrettifySense(senseBuf));
                             }
                             else
                             {
@@ -1227,7 +1228,7 @@ namespace Aaru.Core.Media.Info
                     if(sense)
                     {
                         AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: PFI\n{0}",
-                                                  Sense.PrettifySense(senseBuf));
+                                                   Sense.PrettifySense(senseBuf));
                     }
                     else
                     {
@@ -1260,7 +1261,7 @@ namespace Aaru.Core.Media.Info
 
                     if(sense)
                         AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: DMI\n{0}",
-                                                  Sense.PrettifySense(senseBuf));
+                                                   Sense.PrettifySense(senseBuf));
                     else
                         DvdDmi = cmdBuf;
                 }
@@ -1272,7 +1273,7 @@ namespace Aaru.Core.Media.Info
             if(sense)
             {
                 AaruConsole.DebugWriteLine("Media-Info command", "READ MEDIA SERIAL NUMBER\n{0}",
-                                          Sense.PrettifySense(senseBuf));
+                                           Sense.PrettifySense(senseBuf));
             }
             else
             {
@@ -1300,7 +1301,7 @@ namespace Aaru.Core.Media.Info
 
                             if(sense)
                                 AaruConsole.DebugWriteLine("Media-Info command", "KREON EXTRACT SS:\n{0}",
-                                                          Sense.PrettifySense(senseBuf));
+                                                           Sense.PrettifySense(senseBuf));
                             else
                                 XboxSecuritySector = cmdBuf;
 
@@ -1340,7 +1341,7 @@ namespace Aaru.Core.Media.Info
                             }
 
                             AaruConsole.DebugWriteLine("Dump-media command", "Video partition total size: {0} sectors",
-                                                      totalSize);
+                                                       totalSize);
 
                             ulong l0Video = (PFI.Decode(cmdBuf).Value.Layer0EndPSN -
                                              PFI.Decode(cmdBuf).Value.DataAreaStartPSN) + 1;
@@ -1371,7 +1372,7 @@ namespace Aaru.Core.Media.Info
                                 (ulong)((cmdBuf[0] << 24) + (cmdBuf[1] << 16) + (cmdBuf[2] << 8) + cmdBuf[3]) + 1;
 
                             AaruConsole.DebugWriteLine("Dump-media command", "Game partition total size: {0} sectors",
-                                                      gameSize);
+                                                       gameSize);
 
                             // Get middle zone size
                             AaruConsole.DebugWriteLine("Dump-media command", "Getting middle zone size");
@@ -1406,7 +1407,7 @@ namespace Aaru.Core.Media.Info
                             }
 
                             AaruConsole.DebugWriteLine("Dump-media command", "Unlocked total size: {0} sectors",
-                                                      totalSize);
+                                                       totalSize);
 
                             ulong middleZone =
                                 (totalSize -
@@ -1505,7 +1506,7 @@ namespace Aaru.Core.Media.Info
         public Dictionary<byte, string>                 Isrcs                         { get; }
         public bool                                     MediaInserted                 { get; }
         public MediaType                                MediaType                     { get; }
-        public Devices.Info.DeviceInfo                               DeviceInfo                    { get; }
+        public DeviceInfo                               DeviceInfo                    { get; }
         public byte[]                                   ReadCapacity                  { get; }
         public ulong                                    Blocks                        { get; }
         public uint                                     BlockSize                     { get; }
diff --git a/Aaru.Core/Options.cs b/Aaru.Core/Options.cs
index 905d512b4..8c5cc17b9 100644
--- a/Aaru.Core/Options.cs
+++ b/Aaru.Core/Options.cs
@@ -46,9 +46,10 @@ namespace Aaru.Core
             bool                       inValue = false;
             string                     name    = null;
             string                     value;
-            StringBuilder              sb = new StringBuilder();
+            var                        sb = new StringBuilder();
 
-            if(options == null) return parsed;
+            if(options == null)
+                return parsed;
 
             for(int index = 0; index < options.Length; index++)
             {
@@ -58,31 +59,40 @@ namespace Aaru.Core
                 {
                     case '\\' when !escaped:
                         escaped = true;
+
                         break;
                     case '"' when !escaped:
                         quoted = !quoted;
+
                         break;
                     case '=' when quoted:
                         sb.Append(c);
+
                         break;
                     case '=':
                         name    = sb.ToString().ToLower(CultureInfo.CurrentCulture);
                         sb      = new StringBuilder();
                         inValue = true;
+
                         break;
                     case ',' when quoted:
                         sb.Append(c);
+
                         break;
                     case ',' when inValue:
                         value   = sb.ToString();
                         sb      = new StringBuilder();
                         inValue = false;
 
-                        if(string.IsNullOrEmpty(name) || string.IsNullOrEmpty(value)) continue;
+                        if(string.IsNullOrEmpty(name) ||
+                           string.IsNullOrEmpty(value))
+                            continue;
 
-                        if(parsed.ContainsKey(name)) parsed.Remove(name);
+                        if(parsed.ContainsKey(name))
+                            parsed.Remove(name);
 
                         parsed.Add(name, value);
+
                         break;
                     default:
                         if(escaped)
@@ -91,76 +101,96 @@ namespace Aaru.Core
                                 case 'a':
                                     sb.Append('\a');
                                     escaped = false;
+
                                     break;
                                 case 'b':
                                     sb.Append('\b');
                                     escaped = false;
+
                                     break;
                                 case 'f':
                                     sb.Append('\f');
                                     escaped = false;
+
                                     break;
                                 case 'n':
                                     sb.Append('\n');
                                     escaped = false;
+
                                     break;
                                 case 'r':
                                     sb.Append('\r');
                                     escaped = false;
+
                                     break;
                                 case 't':
                                     sb.Append('\t');
                                     escaped = false;
+
                                     break;
                                 case 'v':
                                     sb.Append('\v');
                                     escaped = false;
+
                                     break;
                                 case '\\':
                                     sb.Append('\\');
                                     escaped = false;
+
                                     break;
                                 case '\'':
                                     sb.Append('\'');
                                     escaped = false;
+
                                     break;
                                 case '"':
                                     sb.Append('"');
                                     escaped = false;
+
                                     break;
                                 case '0':
                                     sb.Append('\0');
                                     escaped = false;
+
                                     break;
                                 case 'u':
                                     string unicode = options.Substring(index + 1, 4);
                                     sb.Append((char)int.Parse(unicode, NumberStyles.HexNumber));
                                     escaped =  false;
                                     index   += 4;
+
                                     break;
                                 case 'U':
                                     string longUnicode = options.Substring(index + 1, 8);
                                     sb.Append((char)int.Parse(longUnicode, NumberStyles.HexNumber));
                                     escaped =  false;
                                     index   += 8;
+
                                     break;
                                 default:
                                     sb.Append(c);
                                     escaped = false;
+
                                     break;
                             }
-                        else sb.Append(c);
+                        else
+                            sb.Append(c);
+
                         break;
                 }
             }
 
-            if(!inValue) return parsed;
+            if(!inValue)
+                return parsed;
 
             value = sb.ToString();
 
-            if(string.IsNullOrEmpty(name) || string.IsNullOrEmpty(value)) return parsed;
+            if(string.IsNullOrEmpty(name) ||
+               string.IsNullOrEmpty(value))
+                return parsed;
 
-            if(parsed.ContainsKey(name)) parsed.Remove(name);
+            if(parsed.ContainsKey(name))
+                parsed.Remove(name);
 
             parsed.Add(name, value);
 
diff --git a/Aaru.Core/Partitions.cs b/Aaru.Core/Partitions.cs
index f99bf8335..b48d57b44 100644
--- a/Aaru.Core/Partitions.cs
+++ b/Aaru.Core/Partitions.cs
@@ -40,14 +40,10 @@ using Aaru.Partitions;
 
 namespace Aaru.Core
 {
-    /// <summary>
-    ///     Implements methods for handling partitions
-    /// </summary>
+    /// <summary>Implements methods for handling partitions</summary>
     public static class Partitions
     {
-        /// <summary>
-        ///     Gets a list of all partitions present in the specified image
-        /// </summary>
+        /// <summary>Gets a list of all partitions present in the specified image</summary>
         /// <param name="image">Image</param>
         /// <returns>List of found partitions</returns>
         public static List<Partition> GetAll(IMediaImage image)
@@ -57,8 +53,8 @@ namespace Aaru.Core
             List<Partition> childPartitions  = new List<Partition>();
             List<ulong>     checkedLocations = new List<ulong>();
 
-            ITapeImage               tapeImage          = image as ITapeImage;
-            IPartitionableMediaImage partitionableImage = image as IPartitionableMediaImage;
+            var tapeImage          = image as ITapeImage;
+            var partitionableImage = image as IPartitionableMediaImage;
 
             // Create partitions from image files
             if(tapeImage?.Files != null)
@@ -68,12 +64,14 @@ namespace Aaru.Core
                         if(partitionPlugin.GetInformation(image, out List<Partition> partitions, tapeFile.FirstBlock))
                         {
                             foundPartitions.AddRange(partitions);
+
                             AaruConsole.DebugWriteLine("Partitions", "Found {0} @ {1}", partitionPlugin.Name,
-                                                      tapeFile.FirstBlock);
+                                                       tapeFile.FirstBlock);
                         }
 
                     checkedLocations.Add(tapeFile.FirstBlock);
                 }
+
             // Getting all partitions from device (e.g. tracks)
             else if(partitionableImage?.Partitions != null)
                 foreach(Partition imagePartition in partitionableImage.Partitions)
@@ -82,12 +80,14 @@ namespace Aaru.Core
                         if(partitionPlugin.GetInformation(image, out List<Partition> partitions, imagePartition.Start))
                         {
                             foundPartitions.AddRange(partitions);
+
                             AaruConsole.DebugWriteLine("Partitions", "Found {0} @ {1}", partitionPlugin.Name,
-                                                      imagePartition.Start);
+                                                       imagePartition.Start);
                         }
 
                     checkedLocations.Add(imagePartition.Start);
                 }
+
             // Getting all partitions at start of device
             else
             {
@@ -107,6 +107,7 @@ namespace Aaru.Core
                 {
                     childPartitions.Add(foundPartitions[0]);
                     foundPartitions.RemoveAt(0);
+
                     continue;
                 }
 
@@ -115,12 +116,14 @@ namespace Aaru.Core
                 foreach(IPartition partitionPlugin in plugins.PartPluginsList.Values)
                 {
                     AaruConsole.DebugWriteLine("Partitions", "Trying {0} @ {1}", partitionPlugin.Name,
-                                              foundPartitions[0].Start);
+                                               foundPartitions[0].Start);
+
                     if(!partitionPlugin.GetInformation(image, out List<Partition> partitions, foundPartitions[0].Start))
                         continue;
 
                     AaruConsole.DebugWriteLine("Partitions", "Found {0} @ {1}", partitionPlugin.Name,
-                                              foundPartitions[0].Start);
+                                               foundPartitions[0].Start);
+
                     childs.AddRange(partitions);
                 }
 
@@ -133,8 +136,10 @@ namespace Aaru.Core
                     foundPartitions.RemoveAt(0);
 
                     foreach(Partition child in childs)
-                        if(checkedLocations.Contains(child.Start)) childPartitions.Add(child);
-                        else foundPartitions.Add(child);
+                        if(checkedLocations.Contains(child.Start))
+                            childPartitions.Add(child);
+                        else
+                            foundPartitions.Add(child);
                 }
                 else
                 {
@@ -142,7 +147,7 @@ namespace Aaru.Core
                     foundPartitions.RemoveAt(0);
                 }
 
-                AaruConsole.DebugWriteLine("Partitions", "Got {0} parents",    foundPartitions.Count);
+                AaruConsole.DebugWriteLine("Partitions", "Got {0} parents", foundPartitions.Count);
                 AaruConsole.DebugWriteLine("Partitions", "Got {0} partitions", childPartitions.Count);
             }
 
@@ -153,12 +158,11 @@ namespace Aaru.Core
                     childPartitions.Select(detectedPartition => detectedPartition.Start).ToList();
 
                 if(tapeImage.Files != null)
-                    childPartitions.AddRange(tapeImage.Files.Where(f => !startLocations.Contains(f.FirstBlock))
-                                                      .Select(tapeFile => new Partition
+                    childPartitions.AddRange(tapeImage.Files.Where(f => !startLocations.Contains(f.FirstBlock)).
+                                                       Select(tapeFile => new Partition
                                                        {
-                                                           Start = tapeFile.FirstBlock,
-                                                           Length = tapeFile.LastBlock -
-                                                                    tapeFile.FirstBlock + 1,
+                                                           Start    = tapeFile.FirstBlock,
+                                                           Length   = (tapeFile.LastBlock - tapeFile.FirstBlock) + 1,
                                                            Sequence = tapeFile.File
                                                        }));
             }
@@ -169,34 +173,36 @@ namespace Aaru.Core
 
                 if(partitionableImage.Partitions != null)
                     childPartitions.AddRange(partitionableImage.Partitions.Where(imagePartition =>
-                                                                                     !startLocations
-                                                                                        .Contains(imagePartition
-                                                                                                     .Start)));
+                                                                                     !startLocations.
+                                                                                         Contains(imagePartition.
+                                                                                                      Start)));
             }
 
-            Partition[] childArray = childPartitions
-                                    .OrderBy(part => part.Start).ThenBy(part => part.Length).ThenBy(part => part.Scheme)
-                                    .ToArray();
+            Partition[] childArray = childPartitions.
+                                     OrderBy(part => part.Start).ThenBy(part => part.Length).
+                                     ThenBy(part => part.Scheme).ToArray();
 
-            for(long i = 0; i < childArray.LongLength; i++) childArray[i].Sequence = (ulong)i;
+            for(long i = 0; i < childArray.LongLength; i++)
+                childArray[i].Sequence = (ulong)i;
 
             return childArray.ToList();
         }
 
-        /// <summary>
-        ///     Adds all partition schemes from the specified list of partitions to statistics
-        /// </summary>
+        /// <summary>Adds all partition schemes from the specified list of partitions to statistics</summary>
         /// <param name="partitions">List of partitions</param>
         public static void AddSchemesToStats(List<Partition> partitions)
         {
-            if(partitions == null || partitions.Count == 0) return;
+            if(partitions       == null ||
+               partitions.Count == 0)
+                return;
 
             List<string> schemes = new List<string>();
 
             foreach(Partition part in partitions.Where(part => !schemes.Contains(part.Scheme)))
                 schemes.Add(part.Scheme);
 
-            foreach(string scheme in schemes) Statistics.AddPartition(scheme);
+            foreach(string scheme in schemes)
+                Statistics.AddPartition(scheme);
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/PrintScsiModePages.cs b/Aaru.Core/PrintScsiModePages.cs
index ba3ef3114..01e6e253f 100644
--- a/Aaru.Core/PrintScsiModePages.cs
+++ b/Aaru.Core/PrintScsiModePages.cs
@@ -59,7 +59,7 @@ namespace Aaru.Core
                         {
                             if(page.Subpage != 0)
                                 AaruConsole.WriteLine("Found unknown vendor mode page {0:X2}h subpage {1:X2}h",
-                                                     page.Page, page.Subpage);
+                                                      page.Page, page.Subpage);
                             else
                                 AaruConsole.WriteLine("Found unknown vendor mode page {0:X2}h", page.Page);
                         }
@@ -70,8 +70,8 @@ namespace Aaru.Core
                     {
                         if(page.Subpage == 0)
                             AaruConsole.WriteLine(devType == PeripheralDeviceTypes.MultiMediaDevice
-                                                     ? Modes.PrettifyModePage_01_MMC(page.PageResponse)
-                                                     : Modes.PrettifyModePage_01(page.PageResponse));
+                                                      ? Modes.PrettifyModePage_01_MMC(page.PageResponse)
+                                                      : Modes.PrettifyModePage_01(page.PageResponse));
                         else
                             goto default;
 
@@ -126,8 +126,8 @@ namespace Aaru.Core
                     {
                         if(page.Subpage == 0)
                             AaruConsole.WriteLine(devType == PeripheralDeviceTypes.MultiMediaDevice
-                                                     ? Modes.PrettifyModePage_07_MMC(page.PageResponse)
-                                                     : Modes.PrettifyModePage_07(page.PageResponse));
+                                                      ? Modes.PrettifyModePage_07_MMC(page.PageResponse)
+                                                      : Modes.PrettifyModePage_07(page.PageResponse));
                         else
                             goto default;
 
@@ -193,8 +193,8 @@ namespace Aaru.Core
                     {
                         if(page.Subpage == 0)
                             AaruConsole.WriteLine(devType == PeripheralDeviceTypes.SequentialAccess
-                                                     ? Modes.PrettifyModePage_10_SSC(page.PageResponse)
-                                                     : Modes.PrettifyModePage_10(page.PageResponse));
+                                                      ? Modes.PrettifyModePage_10_SSC(page.PageResponse)
+                                                      : Modes.PrettifyModePage_10(page.PageResponse));
                         else
                             goto default;
 
@@ -244,8 +244,8 @@ namespace Aaru.Core
                     {
                         if(page.Subpage == 0)
                             AaruConsole.WriteLine(devType == PeripheralDeviceTypes.MultiMediaDevice
-                                                     ? Modes.PrettifyModePage_1C_SFF(page.PageResponse)
-                                                     : Modes.PrettifyModePage_1C(page.PageResponse));
+                                                      ? Modes.PrettifyModePage_1C_SFF(page.PageResponse)
+                                                      : Modes.PrettifyModePage_1C(page.PageResponse));
                         else if(page.Subpage == 1)
                             AaruConsole.WriteLine(Modes.PrettifyModePage_1C_S01(page.PageResponse));
                         else
@@ -360,7 +360,7 @@ namespace Aaru.Core
                     {
                         if(page.Subpage != 0)
                             AaruConsole.WriteLine("Found unknown mode page {0:X2}h subpage {1:X2}h", page.Page,
-                                                 page.Subpage);
+                                                  page.Subpage);
                         else
                             AaruConsole.WriteLine("Found unknown mode page {0:X2}h", page.Page);
 
diff --git a/Aaru.Core/Remote.cs b/Aaru.Core/Remote.cs
index 4ad0986c6..9c6d30873 100644
--- a/Aaru.Core/Remote.cs
+++ b/Aaru.Core/Remote.cs
@@ -50,34 +50,30 @@ using Version = Aaru.CommonTypes.Metadata.Version;
 
 namespace Aaru.Core
 {
-    /// <summary>
-    ///     Handles connections to Aaru.Server
-    /// </summary>
+    /// <summary>Handles connections to Aaru.Server</summary>
     public static class Remote
     {
-        /// <summary>
-        ///     Submits a device report
-        /// </summary>
+        /// <summary>Submits a device report</summary>
         /// <param name="report">Device report</param>
         public static void SubmitReport(DeviceReportV2 report)
         {
-            Thread submitThread = new Thread(() =>
+            var submitThread = new Thread(() =>
             {
                 try
                 {
-                    #if DEBUG
+                #if DEBUG
                     System.Console.WriteLine("Uploading device report");
-                    #else
+                #else
                     Aaru.Console.AaruConsole.DebugWriteLine("Submit stats", "Uploading device report");
-                    #endif
+                #endif
 
-                    string json = JsonConvert.SerializeObject(report, Formatting.Indented,
-                                                              new JsonSerializerSettings
-                                                              {
-                                                                  NullValueHandling = NullValueHandling.Ignore
-                                                              });
-                    byte[]     jsonBytes = Encoding.UTF8.GetBytes(json);
-                    WebRequest request   = WebRequest.Create("https://www.aaru.app/api/uploadreportv2");
+                    string json = JsonConvert.SerializeObject(report, Formatting.Indented, new JsonSerializerSettings
+                    {
+                        NullValueHandling = NullValueHandling.Ignore
+                    });
+
+                    byte[] jsonBytes = Encoding.UTF8.GetBytes(json);
+                    var    request   = WebRequest.Create("https://www.aaru.app/api/uploadreportv2");
                     ((HttpWebRequest)request).UserAgent = $"Aaru {typeof(Version).Assembly.GetName().Version}";
                     request.Method                      = "POST";
                     request.ContentLength               = jsonBytes.Length;
@@ -87,10 +83,11 @@ namespace Aaru.Core
                     reqStream.Close();
                     WebResponse response = request.GetResponse();
 
-                    if(((HttpWebResponse)response).StatusCode != HttpStatusCode.OK) return;
+                    if(((HttpWebResponse)response).StatusCode != HttpStatusCode.OK)
+                        return;
 
-                    Stream       data   = response.GetResponseStream();
-                    StreamReader reader = new StreamReader(data ?? throw new InvalidOperationException());
+                    Stream data   = response.GetResponseStream();
+                    var    reader = new StreamReader(data ?? throw new InvalidOperationException());
 
                     reader.ReadToEnd();
                     data.Close();
@@ -100,20 +97,23 @@ namespace Aaru.Core
                 {
                     // Can't connect to the server, do nothing
                 }
+
                 // ReSharper disable once RedundantCatchClause
                 catch
                 {
-                    #if DEBUG
-                    if(Debugger.IsAttached) throw;
-                    #endif
+                #if DEBUG
+                    if(Debugger.IsAttached)
+                        throw;
+                #endif
                 }
             });
+
             submitThread.Start();
         }
 
         public static void UpdateMasterDatabase(bool create)
         {
-            AaruContext mctx = AaruContext.Create(Aaru.Settings.Settings.MasterDbPath);
+            var mctx = AaruContext.Create(Settings.Settings.MasterDbPath);
             mctx.Database.Migrate();
             mctx.SaveChanges();
 
@@ -125,10 +125,18 @@ namespace Aaru.Core
                 if(!create)
                 {
                     List<DateTime> latestAll = new List<DateTime>();
-                    if(mctx.UsbVendors.Any()) latestAll.Add(mctx.UsbVendors.Max(v => v.ModifiedWhen));
-                    if(mctx.UsbProducts.Any()) latestAll.Add(mctx.UsbProducts.Max(p => p.ModifiedWhen));
-                    if(mctx.CdOffsets.Any()) latestAll.Add(mctx.CdOffsets.Max(o => o.ModifiedWhen));
-                    if(mctx.Devices.Any()) latestAll.Add(mctx.Devices.Max(d => d.LastSynchronized));
+
+                    if(mctx.UsbVendors.Any())
+                        latestAll.Add(mctx.UsbVendors.Max(v => v.ModifiedWhen));
+
+                    if(mctx.UsbProducts.Any())
+                        latestAll.Add(mctx.UsbProducts.Max(p => p.ModifiedWhen));
+
+                    if(mctx.CdOffsets.Any())
+                        latestAll.Add(mctx.CdOffsets.Max(o => o.ModifiedWhen));
+
+                    if(mctx.Devices.Any())
+                        latestAll.Add(mctx.Devices.Max(d => d.LastSynchronized));
 
                     if(latestAll.Any())
                     {
@@ -150,8 +158,7 @@ namespace Aaru.Core
 
                 DateTime updateStart = DateTime.UtcNow;
 
-                WebRequest request =
-                    WebRequest.Create($"https://www.aaru.app/api/update?timestamp={lastUpdate}");
+                var request = WebRequest.Create($"https://www.aaru.app/api/update?timestamp={lastUpdate}");
                 ((HttpWebRequest)request).UserAgent = $"Aaru {typeof(Version).Assembly.GetName().Version}";
                 request.Method                      = "GET";
                 request.ContentType                 = "application/json";
@@ -160,36 +167,48 @@ namespace Aaru.Core
                 if(((HttpWebResponse)response).StatusCode != HttpStatusCode.OK)
                 {
                     AaruConsole.ErrorWriteLine("Error {0} when trying to get updated entities.",
-                                              ((HttpWebResponse)response).StatusCode);
+                                               ((HttpWebResponse)response).StatusCode);
+
                     return;
                 }
 
-                Stream       data   = response.GetResponseStream();
-                StreamReader reader = new StreamReader(data ?? throw new InvalidOperationException());
-                SyncDto      sync   = JsonConvert.DeserializeObject<SyncDto>(reader.ReadToEnd());
+                Stream  data   = response.GetResponseStream();
+                var     reader = new StreamReader(data ?? throw new InvalidOperationException());
+                SyncDto sync   = JsonConvert.DeserializeObject<SyncDto>(reader.ReadToEnd());
 
                 if(create)
                 {
                     AaruConsole.WriteLine("Adding USB vendors");
+
                     foreach(UsbVendorDto vendor in sync.UsbVendors)
                         mctx.UsbVendors.Add(new UsbVendor(vendor.VendorId, vendor.Vendor));
 
                     AaruConsole.WriteLine("Added {0} usb vendors", sync.UsbVendors.Count);
 
                     AaruConsole.WriteLine("Adding USB products");
+
                     foreach(UsbProductDto product in sync.UsbProducts)
                         mctx.UsbProducts.Add(new UsbProduct(product.VendorId, product.ProductId, product.Product));
 
                     AaruConsole.WriteLine("Added {0} usb products", sync.UsbProducts.Count);
 
                     AaruConsole.WriteLine("Adding CompactDisc read offsets");
+
                     foreach(CdOffsetDto offset in sync.Offsets)
-                        mctx.CdOffsets.Add(new CdOffset(offset) {Id = offset.Id});
+                        mctx.CdOffsets.Add(new CdOffset(offset)
+                        {
+                            Id = offset.Id
+                        });
 
                     AaruConsole.WriteLine("Added {0} CompactDisc read offsets", sync.Offsets.Count);
 
                     AaruConsole.WriteLine("Adding known devices");
-                    foreach(DeviceDto device in sync.Devices) mctx.Devices.Add(new Device(device) {Id = device.Id});
+
+                    foreach(DeviceDto device in sync.Devices)
+                        mctx.Devices.Add(new Device(device)
+                        {
+                            Id = device.Id
+                        });
 
                     AaruConsole.WriteLine("Added {0} known devices", sync.Devices.Count);
                 }
@@ -205,6 +224,7 @@ namespace Aaru.Core
                     long modifiedDevices  = 0;
 
                     AaruConsole.WriteLine("Updating USB vendors");
+
                     foreach(UsbVendorDto vendor in sync.UsbVendors)
                     {
                         UsbVendor existing = mctx.UsbVendors.FirstOrDefault(v => v.Id == vendor.VendorId);
@@ -223,10 +243,11 @@ namespace Aaru.Core
                         }
                     }
 
-                    AaruConsole.WriteLine("Added {0} USB vendors",    addedVendors);
+                    AaruConsole.WriteLine("Added {0} USB vendors", addedVendors);
                     AaruConsole.WriteLine("Modified {0} USB vendors", modifiedVendors);
 
                     AaruConsole.WriteLine("Updating USB products");
+
                     foreach(UsbProductDto product in sync.UsbProducts)
                     {
                         UsbProduct existing =
@@ -247,10 +268,11 @@ namespace Aaru.Core
                         }
                     }
 
-                    AaruConsole.WriteLine("Added {0} USB products",    addedProducts);
+                    AaruConsole.WriteLine("Added {0} USB products", addedProducts);
                     AaruConsole.WriteLine("Modified {0} USB products", modifiedProducts);
 
                     AaruConsole.WriteLine("Updating CompactDisc read offsets");
+
                     foreach(CdOffsetDto offset in sync.Offsets)
                     {
                         CdOffset existing = mctx.CdOffsets.FirstOrDefault(o => o.Id == offset.Id);
@@ -269,14 +291,19 @@ namespace Aaru.Core
                         else
                         {
                             addedOffsets++;
-                            mctx.CdOffsets.Add(new CdOffset(offset) {Id = offset.Id});
+
+                            mctx.CdOffsets.Add(new CdOffset(offset)
+                            {
+                                Id = offset.Id
+                            });
                         }
                     }
 
-                    AaruConsole.WriteLine("Added {0} CompactDisc read offsets",    addedOffsets);
+                    AaruConsole.WriteLine("Added {0} CompactDisc read offsets", addedOffsets);
                     AaruConsole.WriteLine("Modified {0} CompactDisc read offsets", modifiedOffsets);
 
                     AaruConsole.WriteLine("Updating known devices");
+
                     foreach(DeviceDto device in sync.Devices)
                     {
                         Device existing = mctx.Devices.FirstOrDefault(d => d.Id == device.Id);
@@ -297,19 +324,22 @@ namespace Aaru.Core
                         else
                         {
                             addedDevices++;
+
                             mctx.Devices.Add(new Device(device)
                             {
-                                Id                         = device.Id,
-                                OptimalMultipleSectorsRead = device.OptimalMultipleSectorsRead
+                                Id = device.Id, OptimalMultipleSectorsRead = device.OptimalMultipleSectorsRead
                             });
                         }
                     }
 
-                    AaruConsole.WriteLine("Added {0} known devices",    addedDevices);
+                    AaruConsole.WriteLine("Added {0} known devices", addedDevices);
                     AaruConsole.WriteLine("Modified {0} known devices", modifiedDevices);
                 }
             }
-            catch(Exception ex) { AaruConsole.ErrorWriteLine("Exception {0} when updating database.", ex); }
+            catch(Exception ex)
+            {
+                AaruConsole.ErrorWriteLine("Exception {0} when updating database.", ex);
+            }
             finally
             {
                 AaruConsole.WriteLine("Saving changes...");
diff --git a/Aaru.Core/Sidecar/AudioMedia.cs b/Aaru.Core/Sidecar/AudioMedia.cs
index 22070be7b..35fab1f44 100644
--- a/Aaru.Core/Sidecar/AudioMedia.cs
+++ b/Aaru.Core/Sidecar/AudioMedia.cs
@@ -43,9 +43,7 @@ namespace Aaru.Core
     public partial class Sidecar
     {
         // TODO: Complete it
-        /// <summary>
-        ///     Creates a metadata sidecar for an audio media (e.g. cassette)
-        /// </summary>
+        /// <summary>Creates a metadata sidecar for an audio media (e.g. cassette)</summary>
         /// <param name="image">Image</param>
         /// <param name="filterId">Filter uuid</param>
         /// <param name="imagePath">Image path</param>
@@ -53,28 +51,26 @@ namespace Aaru.Core
         /// <param name="plugins">Image plugins</param>
         /// <param name="imgChecksums">List of image checksums</param>
         /// <param name="sidecar">Metadata sidecar</param>
-        static void AudioMedia(IMediaImage        image,        Guid                 filterId, string imagePath,
-                               FileInfo           fi,           PluginBase           plugins,
+        static void AudioMedia(IMediaImage image, Guid filterId, string imagePath, FileInfo fi, PluginBase plugins,
                                List<ChecksumType> imgChecksums, ref CICMMetadataType sidecar, Encoding encoding)
         {
             sidecar.AudioMedia = new[]
             {
                 new AudioMediaType
                 {
-                    Checksums = imgChecksums.ToArray(),
-                    Image = new ImageType
+                    Checksums = imgChecksums.ToArray(), Image = new ImageType
                     {
-                        format          = image.Format,
-                        offset          = 0,
-                        offsetSpecified = true,
-                        Value           = Path.GetFileName(imagePath)
+                        format = image.Format, offset = 0, offsetSpecified = true, Value = Path.GetFileName(imagePath)
                     },
-                    Size     = (ulong)fi.Length,
-                    Sequence = new SequenceType {MediaTitle = image.Info.MediaTitle}
+                    Size = (ulong)fi.Length, Sequence = new SequenceType
+                    {
+                        MediaTitle = image.Info.MediaTitle
+                    }
                 }
             };
 
-            if(image.Info.MediaSequence != 0 && image.Info.LastMediaSequence != 0)
+            if(image.Info.MediaSequence     != 0 &&
+               image.Info.LastMediaSequence != 0)
             {
                 sidecar.AudioMedia[0].Sequence.MediaSequence = (uint)image.Info.MediaSequence;
                 sidecar.AudioMedia[0].Sequence.TotalMedia    = (uint)image.Info.LastMediaSequence;
diff --git a/Aaru.Core/Sidecar/BlockMedia.cs b/Aaru.Core/Sidecar/BlockMedia.cs
index 92f9c4047..207112f0a 100644
--- a/Aaru.Core/Sidecar/BlockMedia.cs
+++ b/Aaru.Core/Sidecar/BlockMedia.cs
@@ -40,14 +40,12 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Metadata;
 using Aaru.CommonTypes.Structs;
+using Aaru.CommonTypes.Structs.Devices.ATA;
 using Aaru.Console;
-using Aaru.Decoders.ATA;
 using Aaru.Decoders.PCMCIA;
 using Aaru.DiscImages;
 using Aaru.Filters;
-using Aaru.CommonTypes.Structs.Devices.ATA;
 using Schemas;
-using Identify = Aaru.CommonTypes.Structs.Devices.ATA.Identify;
 using MediaType = Aaru.CommonTypes.Metadata.MediaType;
 using Tuple = Aaru.Decoders.PCMCIA.Tuple;
 
@@ -152,8 +150,7 @@ namespace Aaru.Core
 
                                         if(manfid != null)
                                         {
-                                            sidecar.BlockMedia[0].PCMCIA.ManufacturerCode =
-                                                manfid.ManufacturerID;
+                                            sidecar.BlockMedia[0].PCMCIA.ManufacturerCode = manfid.ManufacturerID;
 
                                             sidecar.BlockMedia[0].PCMCIA.CardCode                  = manfid.CardID;
                                             sidecar.BlockMedia[0].PCMCIA.ManufacturerCodeSpecified = true;
@@ -417,7 +414,7 @@ namespace Aaru.Core
                         //goto skipImageChecksum;
 
                         uint  sectorsToRead = 64;
-                        ulong sectors       = tapePartition.LastBlock - tapePartition.FirstBlock + 1;
+                        ulong sectors       = (tapePartition.LastBlock - tapePartition.FirstBlock) + 1;
                         ulong doneSectors   = 0;
 
                         InitProgress2();
@@ -492,7 +489,7 @@ namespace Aaru.Core
                             //goto skipImageChecksum;
 
                             uint  sectorsToRead = 64;
-                            ulong sectors       = tapeFile.LastBlock - tapeFile.FirstBlock + 1;
+                            ulong sectors       = (tapeFile.LastBlock - tapeFile.FirstBlock) + 1;
                             ulong doneSectors   = 0;
 
                             InitProgress2();
@@ -861,10 +858,10 @@ namespace Aaru.Core
                     {
                         scpImage.Open(scpFilter);
                     }
-                    catch(NotImplementedException) { }
+                    catch(NotImplementedException) {}
 
-                    if(image.Info.Heads == 2 && scpImage.Header.heads == 0 ||
-                       image.Info.Heads == 1 && (scpImage.Header.heads == 1 || scpImage.Header.heads == 2))
+                    if((image.Info.Heads == 2 && scpImage.Header.heads == 0) ||
+                       (image.Info.Heads == 1 && (scpImage.Header.heads == 1 || scpImage.Header.heads == 2)))
                         if(scpImage.Header.end + 1 >= image.Info.Cylinders)
                         {
                             List<BlockTrackType> scpBlockTrackTypes = new List<BlockTrackType>();
@@ -899,8 +896,9 @@ namespace Aaru.Core
                                 if(scpImage.ScpTracks.TryGetValue(t, out SuperCardPro.TrackHeader scpTrack))
                                 {
                                     byte[] trackContents =
-                                        new byte[scpTrack.Entries.Last().dataOffset +
-                                                 scpTrack.Entries.Last().trackLength - scpImage.Header.offsets[t] + 1];
+                                        new byte[((scpTrack.Entries.Last().dataOffset +
+                                                   scpTrack.Entries.Last().trackLength) - scpImage.Header.offsets[t]) +
+                                                 1];
 
                                     scpStream.Position = scpImage.Header.offsets[t];
                                     scpStream.Read(trackContents, 0, trackContents.Length);
@@ -967,7 +965,7 @@ namespace Aaru.Core
                     {
                         kfImage.Open(kfFilter);
                     }
-                    catch(NotImplementedException) { }
+                    catch(NotImplementedException) {}
 
                     if(kfImage.Info.Heads == image.Info.Heads)
                         if(kfImage.Info.Cylinders >= image.Info.Cylinders)
@@ -1051,7 +1049,7 @@ namespace Aaru.Core
             {
                 dfiImage.Open(dfiFilter);
             }
-            catch(NotImplementedException) { }
+            catch(NotImplementedException) {}
 
             UpdateStatus("Hashing DiscFerret image...");
 
diff --git a/Aaru.Core/Sidecar/BlockTape.cs b/Aaru.Core/Sidecar/BlockTape.cs
index f661bf311..a337ea269 100644
--- a/Aaru.Core/Sidecar/BlockTape.cs
+++ b/Aaru.Core/Sidecar/BlockTape.cs
@@ -38,9 +38,7 @@ namespace Aaru.Core
 {
     public partial class Sidecar
     {
-        /// <summary>
-        ///     Creates a metadata sidecar for a block tape (e.g. scsi streaming)
-        /// </summary>
+        /// <summary>Creates a metadata sidecar for a block tape (e.g. scsi streaming)</summary>
         /// <param name="files">List of files</param>
         /// <param name="folderName">Dump path</param>
         /// <param name="blockSize">Expected block size in bytes</param>
@@ -52,24 +50,21 @@ namespace Aaru.Core
                 {
                     new BlockMediaType
                     {
-                        Image =
-                            new ImageType
-                            {
-                                format = "Directory", offsetSpecified = false, Value = folderName
-                            },
-                        Sequence =
-                            new SequenceType {MediaTitle = folderName, MediaSequence = 1, TotalMedia = 1},
-                        PhysicalBlockSize = blockSize,
-                        LogicalBlockSize  = blockSize,
-                        TapeInformation = new[]
+                        Image = new ImageType
+                        {
+                            format = "Directory", offsetSpecified = false, Value = folderName
+                        },
+                        Sequence = new SequenceType
+                        {
+                            MediaTitle = folderName, MediaSequence = 1, TotalMedia = 1
+                        },
+                        PhysicalBlockSize = blockSize, LogicalBlockSize = blockSize, TapeInformation = new[]
                         {
                             new TapePartitionType
                             {
                                 Image = new ImageType
                                 {
-                                    format          = "Directory",
-                                    offsetSpecified = false,
-                                    Value           = folderName
+                                    format = "Directory", offsetSpecified = false, Value = folderName
                                 }
                             }
                         }
@@ -77,32 +72,32 @@ namespace Aaru.Core
                 }
             };
 
-            if(aborted) return sidecar;
+            if(aborted)
+                return sidecar;
 
             ulong              currentBlock = 0;
             ulong              totalSize    = 0;
-            Checksum           tapeWorker   = new Checksum();
+            var                tapeWorker   = new Checksum();
             List<TapeFileType> tapeFiles    = new List<TapeFileType>();
 
             UpdateStatus("Hashing files...");
+
             for(int i = 0; i < files.Count; i++)
             {
-                if(aborted) return sidecar;
+                if(aborted)
+                    return sidecar;
 
                 fs = new FileStream(files[i], FileMode.Open, FileAccess.Read);
-                Checksum fileWorker = new Checksum();
-                TapeFileType tapeFile = new TapeFileType
+                var fileWorker = new Checksum();
+
+                var tapeFile = new TapeFileType
                 {
                     Image = new ImageType
                     {
-                        format = "Raw disk image (sector by sector copy)",
-                        offset = 0,
+                        format = "Raw disk image (sector by sector copy)", offset = 0,
                         Value  = Path.GetFileName(files[i])
                     },
-                    Size       = (ulong)fs.Length,
-                    BlockSize  = blockSize,
-                    StartBlock = currentBlock,
-                    Sequence   = (ulong)i
+                    Size = (ulong)fs.Length, BlockSize = blockSize, StartBlock = currentBlock, Sequence = (ulong)i
                 };
 
                 const uint SECTORS_TO_READ = 512;
@@ -110,11 +105,13 @@ namespace Aaru.Core
                 ulong      doneSectors     = 0;
 
                 InitProgress2();
+
                 while(doneSectors < sectors)
                 {
                     if(aborted)
                     {
                         EndProgress2();
+
                         return sidecar;
                     }
 
@@ -124,16 +121,20 @@ namespace Aaru.Core
                     {
                         sector = new byte[SECTORS_TO_READ * blockSize];
                         fs.Read(sector, 0, sector.Length);
+
                         UpdateProgress2($"Hashing block {doneSectors} of {sectors} on file {i + 1} of {files.Count}",
                                         (long)doneSectors, (long)sectors);
+
                         doneSectors += SECTORS_TO_READ;
                     }
                     else
                     {
                         sector = new byte[(uint)(sectors - doneSectors) * blockSize];
                         fs.Read(sector, 0, sector.Length);
+
                         UpdateProgress2($"Hashing block {doneSectors} of {sectors} on file {i + 1} of {files.Count}",
                                         (long)doneSectors, (long)sectors);
+
                         doneSectors += sectors - doneSectors;
                     }
 
@@ -141,7 +142,7 @@ namespace Aaru.Core
                     tapeWorker.Update(sector);
                 }
 
-                tapeFile.EndBlock  =  tapeFile.StartBlock + sectors - 1;
+                tapeFile.EndBlock  =  (tapeFile.StartBlock + sectors) - 1;
                 currentBlock       += sectors;
                 totalSize          += (ulong)fs.Length;
                 tapeFile.Checksums =  fileWorker.End().ToArray();
@@ -165,19 +166,32 @@ namespace Aaru.Core
             {
                 sidecar.BlockMedia[0].DiskType = "Quarter-inch cartridge";
 
-                if(totalSize      <= 20         * 1048576) sidecar.BlockMedia[0].DiskSubType = "QIC-11";
-                else if(totalSize <= 40         * 1048576) sidecar.BlockMedia[0].DiskSubType = "QIC-40";
-                else if(totalSize <= 60         * 1048576) sidecar.BlockMedia[0].DiskSubType = "QIC-24";
-                else if(totalSize <= 80         * 1048576) sidecar.BlockMedia[0].DiskSubType = "QIC-80";
-                else if(totalSize <= 120        * 1048576) sidecar.BlockMedia[0].DiskSubType = "QIC-120";
-                else if(totalSize <= 150        * 1048576) sidecar.BlockMedia[0].DiskSubType = "QIC-150";
-                else if(totalSize <= 320        * 1048576) sidecar.BlockMedia[0].DiskSubType = "QIC-320";
-                else if(totalSize <= 340        * 1048576) sidecar.BlockMedia[0].DiskSubType = "QIC-3010";
-                else if(totalSize <= 525        * 1048576) sidecar.BlockMedia[0].DiskSubType = "QIC-525";
-                else if(totalSize <= 670        * 1048576) sidecar.BlockMedia[0].DiskSubType = "QIC-3020";
-                else if(totalSize <= 1200       * 1048576) sidecar.BlockMedia[0].DiskSubType = "QIC-3080";
-                else if(totalSize <= 1350       * 1048576) sidecar.BlockMedia[0].DiskSubType = "QIC-1350";
-                else if(totalSize <= (long)4000 * 1048576) sidecar.BlockMedia[0].DiskSubType = "QIC-3095";
+                if(totalSize <= 20 * 1048576)
+                    sidecar.BlockMedia[0].DiskSubType = "QIC-11";
+                else if(totalSize <= 40 * 1048576)
+                    sidecar.BlockMedia[0].DiskSubType = "QIC-40";
+                else if(totalSize <= 60 * 1048576)
+                    sidecar.BlockMedia[0].DiskSubType = "QIC-24";
+                else if(totalSize <= 80 * 1048576)
+                    sidecar.BlockMedia[0].DiskSubType = "QIC-80";
+                else if(totalSize <= 120 * 1048576)
+                    sidecar.BlockMedia[0].DiskSubType = "QIC-120";
+                else if(totalSize <= 150 * 1048576)
+                    sidecar.BlockMedia[0].DiskSubType = "QIC-150";
+                else if(totalSize <= 320 * 1048576)
+                    sidecar.BlockMedia[0].DiskSubType = "QIC-320";
+                else if(totalSize <= 340 * 1048576)
+                    sidecar.BlockMedia[0].DiskSubType = "QIC-3010";
+                else if(totalSize <= 525 * 1048576)
+                    sidecar.BlockMedia[0].DiskSubType = "QIC-525";
+                else if(totalSize <= 670 * 1048576)
+                    sidecar.BlockMedia[0].DiskSubType = "QIC-3020";
+                else if(totalSize <= 1200 * 1048576)
+                    sidecar.BlockMedia[0].DiskSubType = "QIC-3080";
+                else if(totalSize <= 1350 * 1048576)
+                    sidecar.BlockMedia[0].DiskSubType = "QIC-1350";
+                else if(totalSize <= (long)4000 * 1048576)
+                    sidecar.BlockMedia[0].DiskSubType = "QIC-3095";
                 else
                 {
                     sidecar.BlockMedia[0].DiskType    = "Unknown tape";
diff --git a/Aaru.Core/Sidecar/Events.cs b/Aaru.Core/Sidecar/Events.cs
index 4ab8d78f9..9c256a4a9 100644
--- a/Aaru.Core/Sidecar/Events.cs
+++ b/Aaru.Core/Sidecar/Events.cs
@@ -42,39 +42,21 @@ namespace Aaru.Core
         public event EndProgressHandler2    EndProgressEvent2;
         public event UpdateStatusHandler    UpdateStatusEvent;
 
-        public void InitProgress()
-        {
-            InitProgressEvent?.Invoke();
-        }
+        public void InitProgress() => InitProgressEvent?.Invoke();
 
-        public void UpdateProgress(string text, long current, long maximum)
-        {
+        public void UpdateProgress(string text, long current, long maximum) =>
             UpdateProgressEvent?.Invoke(string.Format(text, current, maximum), current, maximum);
-        }
 
-        public void EndProgress()
-        {
-            EndProgressEvent?.Invoke();
-        }
+        public void EndProgress() => EndProgressEvent?.Invoke();
 
-        public void InitProgress2()
-        {
-            InitProgressEvent2?.Invoke();
-        }
+        public void InitProgress2() => InitProgressEvent2?.Invoke();
 
-        public void UpdateProgress2(string text, long current, long maximum)
-        {
+        public void UpdateProgress2(string text, long current, long maximum) =>
             UpdateProgressEvent2?.Invoke(string.Format(text, current, maximum), current, maximum);
-        }
 
-        public void EndProgress2()
-        {
-            EndProgressEvent2?.Invoke();
-        }
+        public void EndProgress2() => EndProgressEvent2?.Invoke();
 
-        public void UpdateStatus(string text, params object[] args)
-        {
+        public void UpdateStatus(string text, params object[] args) =>
             UpdateStatusEvent?.Invoke(string.Format(text, args));
-        }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Sidecar/Files.cs b/Aaru.Core/Sidecar/Files.cs
index c2794cdb3..ed3b2e497 100644
--- a/Aaru.Core/Sidecar/Files.cs
+++ b/Aaru.Core/Sidecar/Files.cs
@@ -11,11 +11,12 @@ namespace Aaru.Core
     {
         FilesystemContentsType Files(IReadOnlyFilesystem filesystem)
         {
-            FilesystemContentsType contents = new FilesystemContentsType();
+            var contents = new FilesystemContentsType();
 
             Errno ret = filesystem.ReadDir("/", out List<string> dirents);
 
-            if(ret != Errno.NoError) return null;
+            if(ret != Errno.NoError)
+                return null;
 
             List<DirectoryType>    directories = new List<DirectoryType>();
             List<ContentsFileType> files       = new List<ContentsFileType>();
@@ -27,27 +28,32 @@ namespace Aaru.Core
                 if(ret != Errno.NoError)
                 {
                     AaruConsole.DebugWriteLine("Create-Sidecar command", "Cannot stat {0}", dirent);
+
                     continue;
                 }
 
                 if(stat.Attributes.HasFlag(FileAttributes.Directory))
                 {
                     directories.Add(SidecarDirectory(filesystem, "", dirent, stat));
+
                     continue;
                 }
 
                 files.Add(SidecarFile(filesystem, "", dirent, stat));
             }
 
-            if(files.Count       > 0) contents.File      = files.OrderBy(f => f.name).ToArray();
-            if(directories.Count > 0) contents.Directory = directories.OrderBy(d => d.name).ToArray();
+            if(files.Count > 0)
+                contents.File = files.OrderBy(f => f.name).ToArray();
+
+            if(directories.Count > 0)
+                contents.Directory = directories.OrderBy(d => d.name).ToArray();
 
             return contents;
         }
 
         DirectoryType SidecarDirectory(IReadOnlyFilesystem filesystem, string path, string filename, FileEntryInfo stat)
         {
-            DirectoryType directory = new DirectoryType();
+            var directory = new DirectoryType();
 
             if(stat.AccessTimeUtc.HasValue)
             {
@@ -112,7 +118,8 @@ namespace Aaru.Core
 
             Errno ret = filesystem.ReadDir(path + "/" + filename, out List<string> dirents);
 
-            if(ret != Errno.NoError) return null;
+            if(ret != Errno.NoError)
+                return null;
 
             List<DirectoryType>    directories = new List<DirectoryType>();
             List<ContentsFileType> files       = new List<ContentsFileType>();
@@ -124,28 +131,33 @@ namespace Aaru.Core
                 if(ret != Errno.NoError)
                 {
                     AaruConsole.DebugWriteLine("Create-Sidecar command", "Cannot stat {0}", dirent);
+
                     continue;
                 }
 
                 if(entryStat.Attributes.HasFlag(FileAttributes.Directory))
                 {
                     directories.Add(SidecarDirectory(filesystem, path + "/" + filename, dirent, entryStat));
+
                     continue;
                 }
 
                 files.Add(SidecarFile(filesystem, path + "/" + filename, dirent, entryStat));
             }
 
-            if(files.Count       > 0) directory.File      = files.OrderBy(f => f.name).ToArray();
-            if(directories.Count > 0) directory.Directory = directories.OrderBy(d => d.name).ToArray();
+            if(files.Count > 0)
+                directory.File = files.OrderBy(f => f.name).ToArray();
+
+            if(directories.Count > 0)
+                directory.Directory = directories.OrderBy(d => d.name).ToArray();
 
             return directory;
         }
 
         ContentsFileType SidecarFile(IReadOnlyFilesystem filesystem, string path, string filename, FileEntryInfo stat)
         {
-            ContentsFileType file          = new ContentsFileType();
-            Checksum         fileChkWorker = new Checksum();
+            var file          = new ContentsFileType();
+            var fileChkWorker = new Checksum();
 
             if(stat.AccessTimeUtc.HasValue)
             {
@@ -210,14 +222,17 @@ namespace Aaru.Core
             }
 
             byte[] data = new byte[0];
+
             if(stat.Length > 0)
             {
                 long position = 0;
                 UpdateStatus($"Hashing file {path}/{filename}...");
                 InitProgress2();
+
                 while(position < stat.Length - 1048576)
                 {
-                    if(aborted) return file;
+                    if(aborted)
+                        return file;
 
                     data = new byte[1048576];
                     filesystem.Read(path + "/" + filename, position, 1048576, ref data);
@@ -240,11 +255,13 @@ namespace Aaru.Core
 
                 file.Checksums = fileChkWorker.End().ToArray();
             }
-            else file.Checksums = emptyChecksums;
+            else
+                file.Checksums = emptyChecksums;
 
             Errno ret = filesystem.ListXAttr(path + "/" + filename, out List<string> xattrs);
 
-            if(ret != Errno.NoError) return file;
+            if(ret != Errno.NoError)
+                return file;
 
             List<ExtendedAttributeType> xattrTypes = new List<ExtendedAttributeType>();
 
@@ -252,20 +269,20 @@ namespace Aaru.Core
             {
                 ret = filesystem.GetXattr(path + "/" + filename, xattr, ref data);
 
-                if(ret != Errno.NoError) continue;
+                if(ret != Errno.NoError)
+                    continue;
 
-                Checksum xattrChkWorker = new Checksum();
+                var xattrChkWorker = new Checksum();
                 xattrChkWorker.Update(data);
 
                 xattrTypes.Add(new ExtendedAttributeType
                 {
-                    Checksums = xattrChkWorker.End().ToArray(),
-                    length    = (ulong)data.Length,
-                    name      = xattr
+                    Checksums = xattrChkWorker.End().ToArray(), length = (ulong)data.Length, name = xattr
                 });
             }
 
-            if(xattrTypes.Count > 0) file.ExtendedAttributes = xattrTypes.OrderBy(x => x.name).ToArray();
+            if(xattrTypes.Count > 0)
+                file.ExtendedAttributes = xattrTypes.OrderBy(x => x.name).ToArray();
 
             return file;
         }
diff --git a/Aaru.Core/Sidecar/Helpers.cs b/Aaru.Core/Sidecar/Helpers.cs
index 08d3badd7..7434965e5 100644
--- a/Aaru.Core/Sidecar/Helpers.cs
+++ b/Aaru.Core/Sidecar/Helpers.cs
@@ -34,14 +34,13 @@ namespace Aaru.Core
 {
     public partial class Sidecar
     {
-        /// <summary>
-        ///     Converts a LBA to MM:SS:FF string for CDs
-        /// </summary>
+        /// <summary>Converts a LBA to MM:SS:FF string for CDs</summary>
         /// <param name="lba">LBA</param>
         /// <returns>MM:SS:FF</returns>
         static string LbaToMsf(long lba)
         {
             long m, s, f;
+
             if(lba >= -150)
             {
                 m   =  (lba + 150) / (75 * 60);
@@ -62,14 +61,13 @@ namespace Aaru.Core
             return $"{m}:{s:D2}:{f:D2}";
         }
 
-        /// <summary>
-        ///     Converts a LBA to MM:SS:FF string for DDCDs
-        /// </summary>
+        /// <summary>Converts a LBA to MM:SS:FF string for DDCDs</summary>
         /// <param name="lba">LBA</param>
         /// <returns>MM:SS:FF</returns>
         static string DdcdLbaToMsf(long lba)
         {
             long h, m, s, f;
+
             if(lba >= -150)
             {
                 h   =  (lba + 150) / (75 * 60 * 60);
@@ -82,13 +80,13 @@ namespace Aaru.Core
             }
             else
             {
-                h   =  (lba + 450150 * 2) / (75 * 60 * 60);
-                lba -= h                  * (75 * 60 * 60);
-                m   =  (lba + 450150 * 2) / (75      * 60);
-                lba -= m                  * (75      * 60);
-                s   =  (lba + 450150 * 2) / 75;
-                lba -= s                  * 75;
-                f   =  lba + 450150 * 2;
+                h   =  (lba + (450150 * 2)) / (75 * 60 * 60);
+                lba -= h                    * (75 * 60 * 60);
+                m   =  (lba + (450150 * 2)) / (75      * 60);
+                lba -= m                    * (75      * 60);
+                s   =  (lba + (450150 * 2)) / 75;
+                lba -= s                    * 75;
+                f   =  lba + (450150 * 2);
             }
 
             return string.Format("{3}:{0:D2}:{1:D2}:{2:D2}", m, s, f, h);
diff --git a/Aaru.Core/Sidecar/LinearMedia.cs b/Aaru.Core/Sidecar/LinearMedia.cs
index 9ebe2153a..cec933d97 100644
--- a/Aaru.Core/Sidecar/LinearMedia.cs
+++ b/Aaru.Core/Sidecar/LinearMedia.cs
@@ -43,9 +43,7 @@ namespace Aaru.Core
     public partial class Sidecar
     {
         // TODO: Complete it
-        /// <summary>
-        ///     Creates a metadata sidecar for linear media (e.g. ROM chip)
-        /// </summary>
+        /// <summary>Creates a metadata sidecar for linear media (e.g. ROM chip)</summary>
         /// <param name="image">Image</param>
         /// <param name="filterId">Filter uuid</param>
         /// <param name="imagePath">Image path</param>
@@ -53,25 +51,18 @@ namespace Aaru.Core
         /// <param name="plugins">Image plugins</param>
         /// <param name="imgChecksums">List of image checksums</param>
         /// <param name="sidecar">Metadata sidecar</param>
-        void LinearMedia(IMediaImage        image,        Guid                 filterId, string imagePath,
-                         FileInfo           fi,           PluginBase           plugins,
-                         List<ChecksumType> imgChecksums, ref CICMMetadataType sidecar, Encoding encoding)
-        {
+        void LinearMedia(IMediaImage image, Guid filterId, string imagePath, FileInfo fi, PluginBase plugins,
+                         List<ChecksumType> imgChecksums, ref CICMMetadataType sidecar, Encoding encoding) =>
             sidecar.LinearMedia = new[]
             {
                 new LinearMediaType
                 {
-                    Checksums = imgChecksums.ToArray(),
-                    Image = new ImageType
+                    Checksums = imgChecksums.ToArray(), Image = new ImageType
                     {
-                        format          = image.Format,
-                        offset          = 0,
-                        offsetSpecified = true,
-                        Value           = Path.GetFileName(imagePath)
+                        format = image.Format, offset = 0, offsetSpecified = true, Value = Path.GetFileName(imagePath)
                     },
                     Size = (ulong)fi.Length
                 }
             };
-        }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Sidecar/OpticalDisc.cs b/Aaru.Core/Sidecar/OpticalDisc.cs
index f8896812e..18493d55a 100644
--- a/Aaru.Core/Sidecar/OpticalDisc.cs
+++ b/Aaru.Core/Sidecar/OpticalDisc.cs
@@ -476,19 +476,19 @@ namespace Aaru.Core
                     case CommonTypes.Enums.TrackType.Data:
                         switch(sidecar.OpticalDisc[0].DiscType)
                         {
-                            case"BD":
+                            case "BD":
                                 xmlTrk.TrackType1 = TrackTypeTrackType.bluray;
 
                                 break;
-                            case"DDCD":
+                            case "DDCD":
                                 xmlTrk.TrackType1 = TrackTypeTrackType.ddcd;
 
                                 break;
-                            case"DVD":
+                            case "DVD":
                                 xmlTrk.TrackType1 = TrackTypeTrackType.dvd;
 
                                 break;
-                            case"HD DVD":
+                            case "HD DVD":
                                 xmlTrk.TrackType1 = TrackTypeTrackType.hddvd;
 
                                 break;
@@ -516,13 +516,13 @@ namespace Aaru.Core
 
                 switch(sidecar.OpticalDisc[0].DiscType)
                 {
-                    case"CD":
-                    case"GD":
+                    case "CD":
+                    case "GD":
                         xmlTrk.StartMSF = LbaToMsf((long)xmlTrk.StartSector);
                         xmlTrk.EndMSF   = LbaToMsf((long)xmlTrk.EndSector);
 
                         break;
-                    case"DDCD":
+                    case "DDCD":
                         xmlTrk.StartMSF = DdcdLbaToMsf((long)xmlTrk.StartSector);
                         xmlTrk.EndMSF   = DdcdLbaToMsf((long)xmlTrk.EndSector);
 
@@ -540,11 +540,12 @@ namespace Aaru.Core
                     xmlTrk.Image.offsetSpecified = true;
                 }
 
-                xmlTrk.Size           = (xmlTrk.EndSector - xmlTrk.StartSector + 1) * (ulong)trk.TrackRawBytesPerSector;
+                xmlTrk.Size = ((xmlTrk.EndSector - xmlTrk.StartSector) + 1) * (ulong)trk.TrackRawBytesPerSector;
+
                 xmlTrk.BytesPerSector = (uint)trk.TrackBytesPerSector;
 
                 uint  sectorsToRead = 512;
-                ulong sectors       = xmlTrk.EndSector - xmlTrk.StartSector + 1;
+                ulong sectors       = (xmlTrk.EndSector - xmlTrk.StartSector) + 1;
                 ulong doneSectors   = 0;
 
                 // If there is only one track, and it's the same as the image file (e.g. ".iso" files), don't re-checksum.
@@ -584,7 +585,7 @@ namespace Aaru.Core
                             sector = image.ReadSectorsLong(doneSectors, sectorsToRead, xmlTrk.Sequence.TrackNumber);
 
                             UpdateProgress2("Hashings sector {0} of {1}", (long)doneSectors,
-                                            (long)(trk.TrackEndSector - trk.TrackStartSector + 1));
+                                            (long)((trk.TrackEndSector - trk.TrackStartSector) + 1));
 
                             doneSectors += sectorsToRead;
                         }
@@ -594,7 +595,7 @@ namespace Aaru.Core
                                                            xmlTrk.Sequence.TrackNumber);
 
                             UpdateProgress2("Hashings sector {0} of {1}", (long)doneSectors,
-                                            (long)(trk.TrackEndSector - trk.TrackStartSector + 1));
+                                            (long)((trk.TrackEndSector - trk.TrackStartSector) + 1));
 
                             doneSectors += sectors - doneSectors;
                         }
@@ -619,7 +620,7 @@ namespace Aaru.Core
                         },
 
                         // TODO: Packed subchannel has different size?
-                        Size = (xmlTrk.EndSector - xmlTrk.StartSector + 1) * 96
+                        Size = ((xmlTrk.EndSector - xmlTrk.StartSector) + 1) * 96
                     };
 
                     switch(trk.TrackSubchannelType)
@@ -649,7 +650,7 @@ namespace Aaru.Core
 
                     var subChkWorker = new Checksum();
 
-                    sectors     = xmlTrk.EndSector - xmlTrk.StartSector + 1;
+                    sectors     = (xmlTrk.EndSector - xmlTrk.StartSector) + 1;
                     doneSectors = 0;
 
                     InitProgress2();
@@ -672,7 +673,7 @@ namespace Aaru.Core
                                                           SectorTagType.CdSectorSubchannel);
 
                             UpdateProgress2("Hashings subchannel sector {0} of {1}", (long)doneSectors,
-                                            (long)(trk.TrackEndSector - trk.TrackStartSector + 1));
+                                            (long)((trk.TrackEndSector - trk.TrackStartSector) + 1));
 
                             doneSectors += sectorsToRead;
                         }
@@ -683,7 +684,7 @@ namespace Aaru.Core
                                                           SectorTagType.CdSectorSubchannel);
 
                             UpdateProgress2("Hashings subchannel sector {0} of {1}", (long)doneSectors,
-                                            (long)(trk.TrackEndSector - trk.TrackStartSector + 1));
+                                            (long)((trk.TrackEndSector - trk.TrackStartSector) + 1));
 
                             doneSectors += sectors - doneSectors;
                         }
@@ -741,19 +742,19 @@ namespace Aaru.Core
 
                                 switch(plugin.XmlFsType.Type)
                                 {
-                                    case"Opera":
+                                    case "Opera":
                                         dskType = MediaType.ThreeDO;
 
                                         break;
-                                    case"PC Engine filesystem":
+                                    case "PC Engine filesystem":
                                         dskType = MediaType.SuperCDROM2;
 
                                         break;
-                                    case"Nintendo Wii filesystem":
+                                    case "Nintendo Wii filesystem":
                                         dskType = MediaType.WOD;
 
                                         break;
-                                    case"Nintendo Gamecube filesystem":
+                                    case "Nintendo Gamecube filesystem":
                                         dskType = MediaType.GOD;
 
                                         break;
@@ -781,7 +782,7 @@ namespace Aaru.Core
 
                     var xmlPart = new Partition
                     {
-                        Start = xmlTrk.StartSector, Length         = xmlTrk.EndSector - xmlTrk.StartSector + 1,
+                        Start = xmlTrk.StartSector, Length         = (xmlTrk.EndSector - xmlTrk.StartSector) + 1,
                         Type  = xmlTrk.TrackType1.ToString(), Size = xmlTrk.Size, Sequence = xmlTrk.Sequence.TrackNumber
                     };
 
@@ -804,19 +805,19 @@ namespace Aaru.Core
 
                             switch(plugin.XmlFsType.Type)
                             {
-                                case"Opera":
+                                case "Opera":
                                     dskType = MediaType.ThreeDO;
 
                                     break;
-                                case"PC Engine filesystem":
+                                case "PC Engine filesystem":
                                     dskType = MediaType.SuperCDROM2;
 
                                     break;
-                                case"Nintendo Wii filesystem":
+                                case "Nintendo Wii filesystem":
                                     dskType = MediaType.WOD;
 
                                     break;
-                                case"Nintendo Gamecube filesystem":
+                                case "Nintendo Gamecube filesystem":
                                     dskType = MediaType.GOD;
 
                                     break;
@@ -845,8 +846,8 @@ namespace Aaru.Core
             if(dskType                             == MediaType.XGD2 &&
                sidecar.OpticalDisc[0].Track.Length == 1)
             {
-                ulong blocks = sidecar.OpticalDisc[0].Track[0].EndSector - sidecar.OpticalDisc[0].Track[0].StartSector +
-                               1;
+                ulong blocks =
+                    (sidecar.OpticalDisc[0].Track[0].EndSector - sidecar.OpticalDisc[0].Track[0].StartSector) + 1;
 
                 if(blocks == 25063   || // Locked (or non compatible drive)
                    blocks == 4229664 || // Xtreme unlock
diff --git a/Aaru.Core/Sidecar/Sidecar.cs b/Aaru.Core/Sidecar/Sidecar.cs
index 9e31207f8..a8a7191d0 100644
--- a/Aaru.Core/Sidecar/Sidecar.cs
+++ b/Aaru.Core/Sidecar/Sidecar.cs
@@ -44,6 +44,7 @@ namespace Aaru.Core
 {
     public partial class Sidecar
     {
+        readonly ChecksumType[] emptyChecksums;
         readonly Encoding       encoding;
         readonly FileInfo       fi;
         readonly Guid           filterId;
@@ -52,7 +53,6 @@ namespace Aaru.Core
         readonly Checksum       imgChkWorker;
         readonly PluginBase     plugins;
         bool                    aborted;
-        readonly ChecksumType[] emptyChecksums;
         FileStream              fs;
         CICMMetadataType        sidecar;
 
@@ -62,7 +62,7 @@ namespace Aaru.Core
             imgChkWorker = new Checksum();
             aborted      = false;
 
-            Checksum emptyChkWorker = new Checksum();
+            var emptyChkWorker = new Checksum();
             emptyChkWorker.Update(new byte[0]);
             emptyChecksums = emptyChkWorker.End().ToArray();
         }
@@ -88,9 +88,7 @@ namespace Aaru.Core
             aborted      = false;
         }
 
-        /// <summary>
-        ///     Implements creating a metadata sidecar
-        /// </summary>
+        /// <summary>Implements creating a metadata sidecar</summary>
         /// <returns>The metadata sidecar</returns>
         public CICMMetadataType Create()
         {
@@ -101,9 +99,11 @@ namespace Aaru.Core
             long   position = 0;
             UpdateStatus("Hashing image file...");
             InitProgress();
+
             while(position < fi.Length - 1048576)
             {
-                if(aborted) return sidecar;
+                if(aborted)
+                    return sidecar;
 
                 data = new byte[1048576];
                 fs.Read(data, 0, 1048576);
@@ -135,7 +135,8 @@ namespace Aaru.Core
             sidecar.AudioMedia  = null;
             sidecar.LinearMedia = null;
 
-            if(aborted) return sidecar;
+            if(aborted)
+                return sidecar;
 
             switch(image.Info.XmlMediaType)
             {
@@ -145,20 +146,24 @@ namespace Aaru.Core
                                     encoding);
                     else
                     {
-                        AaruConsole
-                           .ErrorWriteLine("The specified image says it contains an optical media but at the same time says it does not support them.");
+                        AaruConsole.
+                            ErrorWriteLine("The specified image says it contains an optical media but at the same time says it does not support them.");
+
                         AaruConsole.ErrorWriteLine("Please open an issue at Github.");
                     }
 
                     break;
                 case XmlMediaType.BlockMedia:
                     BlockMedia(image, filterId, imagePath, fi, plugins, imgChecksums, ref sidecar, encoding);
+
                     break;
                 case XmlMediaType.LinearMedia:
                     LinearMedia(image, filterId, imagePath, fi, plugins, imgChecksums, ref sidecar, encoding);
+
                     break;
                 case XmlMediaType.AudioMedia:
                     AudioMedia(image, filterId, imagePath, fi, plugins, imgChecksums, ref sidecar, encoding);
+
                     break;
             }
 
diff --git a/Aaru.Core/Statistics.cs b/Aaru.Core/Statistics.cs
index 89cef31e6..5a0450868 100644
--- a/Aaru.Core/Statistics.cs
+++ b/Aaru.Core/Statistics.cs
@@ -61,14 +61,14 @@ namespace Aaru.Core
         /// <summary>Loads saved statistics from disk</summary>
         public static void LoadStats()
         {
-            var ctx = AaruContext.Create(Aaru.Settings.Settings.LocalDbPath);
+            var ctx = AaruContext.Create(Settings.Settings.LocalDbPath);
 
-            if(File.Exists(Path.Combine(Aaru.Settings.Settings.StatsPath, "Statistics.xml")))
+            if(File.Exists(Path.Combine(Settings.Settings.StatsPath, "Statistics.xml")))
                 try
                 {
                     var allStats = new Stats();
                     var xs       = new XmlSerializer(allStats.GetType());
-                    var sr       = new StreamReader(Path.Combine(Aaru.Settings.Settings.StatsPath, "Statistics.xml"));
+                    var sr       = new StreamReader(Path.Combine(Settings.Settings.StatsPath, "Statistics.xml"));
                     allStats = (Stats)xs.Deserialize(sr);
                     sr.Close();
 
@@ -467,9 +467,9 @@ namespace Aaru.Core
                             if(string.IsNullOrWhiteSpace(media.type))
                                 continue;
 
-                            Aaru.Database.Models.Media existing =
+                            Database.Models.Media existing =
                                 ctx.Medias.FirstOrDefault(c => c.Type == media.type && c.Real == media.real &&
-                                                               c.Synchronized) ?? new Aaru.Database.Models.Media
+                                                               c.Synchronized) ?? new Database.Models.Media
                                 {
                                     Type = media.type, Real = media.real, Synchronized = true
                                 };
@@ -479,14 +479,14 @@ namespace Aaru.Core
                         }
 
                     ctx.SaveChanges();
-                    File.Delete(Path.Combine(Aaru.Settings.Settings.StatsPath, "Statistics.xml"));
+                    File.Delete(Path.Combine(Settings.Settings.StatsPath, "Statistics.xml"));
                 }
                 catch
                 {
                     // Do not care about it
                 }
 
-            if(Aaru.Settings.Settings.Current.Stats == null)
+            if(Settings.Settings.Current.Stats == null)
                 return;
 
             ctx.OperatingSystems.Add(new OperatingSystem
@@ -506,11 +506,11 @@ namespace Aaru.Core
         /// <summary>Saves statistics to disk</summary>
         public static void SaveStats()
         {
-            var ctx = AaruContext.Create(Aaru.Settings.Settings.LocalDbPath);
+            var ctx = AaruContext.Create(Settings.Settings.LocalDbPath);
             ctx.SaveChanges();
 
-            if(Aaru.Settings.Settings.Current.Stats != null &&
-               Aaru.Settings.Settings.Current.Stats.ShareStats)
+            if(Settings.Settings.Current.Stats != null &&
+               Settings.Settings.Current.Stats.ShareStats)
                 SubmitStats();
         }
 
@@ -519,7 +519,7 @@ namespace Aaru.Core
         {
             var submitThread = new Thread(() =>
             {
-                var ctx = AaruContext.Create(Aaru.Settings.Settings.LocalDbPath);
+                var ctx = AaruContext.Create(Settings.Settings.LocalDbPath);
 
                 try
                 {
@@ -746,8 +746,7 @@ namespace Aaru.Core
                         byte[] jsonBytes = Encoding.UTF8.GetBytes(json);
                         var    request   = WebRequest.Create("https://www.aaru.app/api/uploadstatsv2");
 
-                        ((HttpWebRequest)request).UserAgent =
-                            $"Aaru {typeof(Version).Assembly.GetName().Version}";
+                        ((HttpWebRequest)request).UserAgent = $"Aaru {typeof(Version).Assembly.GetName().Version}";
 
                         request.Method        = "POST";
                         request.ContentLength = jsonBytes.Length;
@@ -880,9 +879,9 @@ namespace Aaru.Core
                             {
                                 if(ctx.Medias.Any(c => !c.Synchronized && c.Type == media && c.Real))
                                 {
-                                    Aaru.Database.Models.Media existing =
+                                    Database.Models.Media existing =
                                         ctx.Medias.FirstOrDefault(c => c.Synchronized && c.Type == media && c.Real) ??
-                                        new Aaru.Database.Models.Media
+                                        new Database.Models.Media
                                         {
                                             Synchronized = true, Type = media, Real = true
                                         };
@@ -900,9 +899,9 @@ namespace Aaru.Core
                                     continue;
 
                                 {
-                                    Aaru.Database.Models.Media existing =
+                                    Database.Models.Media existing =
                                         ctx.Medias.FirstOrDefault(c => c.Synchronized && c.Type == media && !c.Real) ??
-                                        new Aaru.Database.Models.Media
+                                        new Database.Models.Media
                                         {
                                             Synchronized = true, Type = media, Real = false
                                         };
@@ -1073,7 +1072,7 @@ namespace Aaru.Core
                 }
 
                 IEnumerable<string> statsFiles =
-                    Directory.EnumerateFiles(Aaru.Settings.Settings.StatsPath, "PartialStats_*.xml",
+                    Directory.EnumerateFiles(Settings.Settings.StatsPath, "PartialStats_*.xml",
                                              SearchOption.TopDirectoryOnly);
 
                 foreach(string statsFile in statsFiles)
@@ -1153,11 +1152,11 @@ namespace Aaru.Core
             if(string.IsNullOrWhiteSpace(command))
                 return;
 
-            if(Aaru.Settings.Settings.Current.Stats == null ||
-               !Aaru.Settings.Settings.Current.Stats.DeviceStats)
+            if(Settings.Settings.Current.Stats == null ||
+               !Settings.Settings.Current.Stats.DeviceStats)
                 return;
 
-            var ctx = AaruContext.Create(Aaru.Settings.Settings.LocalDbPath);
+            var ctx = AaruContext.Create(Settings.Settings.LocalDbPath);
 
             ctx.Commands.Add(new Command
             {
@@ -1174,11 +1173,11 @@ namespace Aaru.Core
             if(string.IsNullOrWhiteSpace(filesystem))
                 return;
 
-            if(Aaru.Settings.Settings.Current.Stats == null ||
-               !Aaru.Settings.Settings.Current.Stats.FilesystemStats)
+            if(Settings.Settings.Current.Stats == null ||
+               !Settings.Settings.Current.Stats.FilesystemStats)
                 return;
 
-            var ctx = AaruContext.Create(Aaru.Settings.Settings.LocalDbPath);
+            var ctx = AaruContext.Create(Settings.Settings.LocalDbPath);
 
             ctx.Filesystems.Add(new Filesystem
             {
@@ -1195,11 +1194,11 @@ namespace Aaru.Core
             if(string.IsNullOrWhiteSpace(partition))
                 return;
 
-            if(Aaru.Settings.Settings.Current.Stats == null ||
-               !Aaru.Settings.Settings.Current.Stats.PartitionStats)
+            if(Settings.Settings.Current.Stats == null ||
+               !Settings.Settings.Current.Stats.PartitionStats)
                 return;
 
-            var ctx = AaruContext.Create(Aaru.Settings.Settings.LocalDbPath);
+            var ctx = AaruContext.Create(Settings.Settings.LocalDbPath);
 
             ctx.Partitions.Add(new Partition
             {
@@ -1216,11 +1215,11 @@ namespace Aaru.Core
             if(string.IsNullOrWhiteSpace(filter))
                 return;
 
-            if(Aaru.Settings.Settings.Current.Stats == null ||
-               !Aaru.Settings.Settings.Current.Stats.FilterStats)
+            if(Settings.Settings.Current.Stats == null ||
+               !Settings.Settings.Current.Stats.FilterStats)
                 return;
 
-            var ctx = AaruContext.Create(Aaru.Settings.Settings.LocalDbPath);
+            var ctx = AaruContext.Create(Settings.Settings.LocalDbPath);
 
             ctx.Filters.Add(new Filter
             {
@@ -1237,11 +1236,11 @@ namespace Aaru.Core
             if(string.IsNullOrWhiteSpace(format))
                 return;
 
-            if(Aaru.Settings.Settings.Current.Stats == null ||
-               !Aaru.Settings.Settings.Current.Stats.MediaImageStats)
+            if(Settings.Settings.Current.Stats == null ||
+               !Settings.Settings.Current.Stats.MediaImageStats)
                 return;
 
-            var ctx = AaruContext.Create(Aaru.Settings.Settings.LocalDbPath);
+            var ctx = AaruContext.Create(Settings.Settings.LocalDbPath);
 
             ctx.MediaFormats.Add(new MediaFormat
             {
@@ -1255,8 +1254,8 @@ namespace Aaru.Core
         /// <param name="dev">Device</param>
         public static void AddDevice(Device dev)
         {
-            if(Aaru.Settings.Settings.Current.Stats == null ||
-               !Aaru.Settings.Settings.Current.Stats.DeviceStats)
+            if(Settings.Settings.Current.Stats == null ||
+               !Settings.Settings.Current.Stats.DeviceStats)
                 return;
 
             string deviceBus;
@@ -1268,7 +1267,7 @@ namespace Aaru.Core
             else
                 deviceBus = dev.Type.ToString();
 
-            var ctx = AaruContext.Create(Aaru.Settings.Settings.LocalDbPath);
+            var ctx = AaruContext.Create(Settings.Settings.LocalDbPath);
 
             ctx.SeenDevices.Add(new DeviceStat
             {
@@ -1285,13 +1284,13 @@ namespace Aaru.Core
         /// <param name="real">Set if media was found on a real device, otherwise found on a media image</param>
         public static void AddMedia(MediaType type, bool real)
         {
-            if(Aaru.Settings.Settings.Current.Stats == null ||
-               !Aaru.Settings.Settings.Current.Stats.MediaStats)
+            if(Settings.Settings.Current.Stats == null ||
+               !Settings.Settings.Current.Stats.MediaStats)
                 return;
 
-            var ctx = AaruContext.Create(Aaru.Settings.Settings.LocalDbPath);
+            var ctx = AaruContext.Create(Settings.Settings.LocalDbPath);
 
-            ctx.Medias.Add(new Aaru.Database.Models.Media
+            ctx.Medias.Add(new Database.Models.Media
             {
                 Real = real, Synchronized = false, Type = type.ToString(), Count = 1
             });
@@ -1303,11 +1302,11 @@ namespace Aaru.Core
         public static void AddRemote(string serverApplication, string serverVersion, string serverOperatingSystem,
                                      string serverOperatingSystemVersion, string serverArchitecture)
         {
-            if(Aaru.Settings.Settings.Current.Stats == null ||
-               !Aaru.Settings.Settings.Current.Stats.MediaStats)
+            if(Settings.Settings.Current.Stats == null ||
+               !Settings.Settings.Current.Stats.MediaStats)
                 return;
 
-            var ctx = AaruContext.Create(Aaru.Settings.Settings.LocalDbPath);
+            var ctx = AaruContext.Create(Settings.Settings.LocalDbPath);
 
             ctx.RemoteApplications.Add(new RemoteApplication
             {
diff --git a/Aaru.Database/Context.cs b/Aaru.Database/Context.cs
index 4e973a7dc..48388eb68 100644
--- a/Aaru.Database/Context.cs
+++ b/Aaru.Database/Context.cs
@@ -37,7 +37,7 @@ namespace Aaru.Database
 {
     public sealed class AaruContext : DbContext
     {
-        public AaruContext(DbContextOptions options) : base(options) { }
+        public AaruContext(DbContextOptions options) : base(options) {}
 
         public DbSet<Device>                Devices                { get; set; }
         public DbSet<Report>                Reports                { get; set; }
diff --git a/Aaru.Database/Migrations/20181126222301_DeviceReportV2.cs b/Aaru.Database/Migrations/20181126222301_DeviceReportV2.cs
index 1ea8ee9a8..ae9cf77f9 100644
--- a/Aaru.Database/Migrations/20181126222301_DeviceReportV2.cs
+++ b/Aaru.Database/Migrations/20181126222301_DeviceReportV2.cs
@@ -7,612 +7,557 @@ namespace Aaru.Database.Migrations
     {
         protected override void Up(MigrationBuilder migrationBuilder)
         {
-            migrationBuilder.CreateTable("Chs",
-                                         table => new
-                                         {
-                                             Id = table.Column<int>(nullable: false)
-                                                       .Annotation("Sqlite:Autoincrement", true),
-                                             Cylinders = table.Column<ushort>(nullable: false),
-                                             Heads     = table.Column<ushort>(nullable: false),
-                                             Sectors   = table.Column<ushort>(nullable: false)
-                                         }, constraints: table => { table.PrimaryKey("PK_Chs", x => x.Id); });
+            migrationBuilder.CreateTable("Chs", table => new
+            {
+                Id        = table.Column<int>().Annotation("Sqlite:Autoincrement", true),
+                Cylinders = table.Column<ushort>(),
+                Heads     = table.Column<ushort>(), Sectors = table.Column<ushort>()
+            }, constraints: table =>
+            {
+                table.PrimaryKey("PK_Chs", x => x.Id);
+            });
 
-            migrationBuilder.CreateTable("FireWire",
-                                         table => new
-                                         {
-                                             Id = table.Column<int>(nullable: false)
-                                                       .Annotation("Sqlite:Autoincrement", true),
-                                             VendorID       = table.Column<uint>(nullable: false),
-                                             ProductID      = table.Column<uint>(nullable: false),
-                                             Manufacturer   = table.Column<string>(nullable: true),
-                                             Product        = table.Column<string>(nullable: true),
-                                             RemovableMedia = table.Column<bool>(nullable: false)
-                                         }, constraints: table => { table.PrimaryKey("PK_FireWire", x => x.Id); });
+            migrationBuilder.CreateTable("FireWire", table => new
+            {
+                Id             = table.Column<int>().Annotation("Sqlite:Autoincrement", true),
+                VendorID       = table.Column<uint>(),
+                ProductID      = table.Column<uint>(),
+                Manufacturer   = table.Column<string>(nullable: true),
+                Product        = table.Column<string>(nullable: true),
+                RemovableMedia = table.Column<bool>()
+            }, constraints: table =>
+            {
+                table.PrimaryKey("PK_FireWire", x => x.Id);
+            });
 
-            migrationBuilder.CreateTable("MmcFeatures",
-                                         table => new
-                                         {
-                                             Id =
-                                                 table.Column<int>(nullable: false)
-                                                      .Annotation("Sqlite:Autoincrement", true),
-                                             AACSVersion                     = table.Column<byte>(nullable: true),
-                                             AGIDs                           = table.Column<byte>(nullable: true),
-                                             BindingNonceBlocks              = table.Column<byte>(nullable: true),
-                                             BlocksPerReadableUnit           = table.Column<ushort>(nullable: true),
-                                             BufferUnderrunFreeInDVD         = table.Column<bool>(nullable: false),
-                                             BufferUnderrunFreeInSAO         = table.Column<bool>(nullable: false),
-                                             BufferUnderrunFreeInTAO         = table.Column<bool>(nullable: false),
-                                             CanAudioScan                    = table.Column<bool>(nullable: false),
-                                             CanEject                        = table.Column<bool>(nullable: false),
-                                             CanEraseSector                  = table.Column<bool>(nullable: false),
-                                             CanExpandBDRESpareArea          = table.Column<bool>(nullable: false),
-                                             CanFormat                       = table.Column<bool>(nullable: false),
-                                             CanFormatBDREWithoutSpare       = table.Column<bool>(nullable: false),
-                                             CanFormatCert                   = table.Column<bool>(nullable: false),
-                                             CanFormatFRF                    = table.Column<bool>(nullable: false),
-                                             CanFormatQCert                  = table.Column<bool>(nullable: false),
-                                             CanFormatRRM                    = table.Column<bool>(nullable: false),
-                                             CanGenerateBindingNonce         = table.Column<bool>(nullable: false),
-                                             CanLoad                         = table.Column<bool>(nullable: false),
-                                             CanMuteSeparateChannels         = table.Column<bool>(nullable: false),
-                                             CanOverwriteSAOTrack            = table.Column<bool>(nullable: false),
-                                             CanOverwriteTAOTrack            = table.Column<bool>(nullable: false),
-                                             CanPlayCDAudio                  = table.Column<bool>(nullable: false),
-                                             CanPseudoOverwriteBDR           = table.Column<bool>(nullable: false),
-                                             CanReadAllDualR                 = table.Column<bool>(nullable: false),
-                                             CanReadAllDualRW                = table.Column<bool>(nullable: false),
-                                             CanReadBD                       = table.Column<bool>(nullable: false),
-                                             CanReadBDR                      = table.Column<bool>(nullable: false),
-                                             CanReadBDRE1                    = table.Column<bool>(nullable: false),
-                                             CanReadBDRE2                    = table.Column<bool>(nullable: false),
-                                             CanReadBDROM                    = table.Column<bool>(nullable: false),
-                                             CanReadBluBCA                   = table.Column<bool>(nullable: false),
-                                             CanReadCD                       = table.Column<bool>(nullable: false),
-                                             CanReadCDMRW                    = table.Column<bool>(nullable: false),
-                                             CanReadCPRM_MKB                 = table.Column<bool>(nullable: false),
-                                             CanReadDDCD                     = table.Column<bool>(nullable: false),
-                                             CanReadDVD                      = table.Column<bool>(nullable: false),
-                                             CanReadDVDPlusMRW               = table.Column<bool>(nullable: false),
-                                             CanReadDVDPlusR                 = table.Column<bool>(nullable: false),
-                                             CanReadDVDPlusRDL               = table.Column<bool>(nullable: false),
-                                             CanReadDVDPlusRW                = table.Column<bool>(nullable: false),
-                                             CanReadDVDPlusRWDL              = table.Column<bool>(nullable: false),
-                                             CanReadDriveAACSCertificate     = table.Column<bool>(nullable: false),
-                                             CanReadHDDVD                    = table.Column<bool>(nullable: false),
-                                             CanReadHDDVDR                   = table.Column<bool>(nullable: false),
-                                             CanReadHDDVDRAM                 = table.Column<bool>(nullable: false),
-                                             CanReadLeadInCDText             = table.Column<bool>(nullable: false),
-                                             CanReadOldBDR                   = table.Column<bool>(nullable: false),
-                                             CanReadOldBDRE                  = table.Column<bool>(nullable: false),
-                                             CanReadOldBDROM                 = table.Column<bool>(nullable: false),
-                                             CanReadSpareAreaInformation     = table.Column<bool>(nullable: false),
-                                             CanReportDriveSerial            = table.Column<bool>(nullable: false),
-                                             CanReportMediaSerial            = table.Column<bool>(nullable: false),
-                                             CanTestWriteDDCDR               = table.Column<bool>(nullable: false),
-                                             CanTestWriteDVD                 = table.Column<bool>(nullable: false),
-                                             CanTestWriteInSAO               = table.Column<bool>(nullable: false),
-                                             CanTestWriteInTAO               = table.Column<bool>(nullable: false),
-                                             CanUpgradeFirmware              = table.Column<bool>(nullable: false),
-                                             CanWriteBD                      = table.Column<bool>(nullable: false),
-                                             CanWriteBDR                     = table.Column<bool>(nullable: false),
-                                             CanWriteBDRE1                   = table.Column<bool>(nullable: false),
-                                             CanWriteBDRE2                   = table.Column<bool>(nullable: false),
-                                             CanWriteBusEncryptedBlocks      = table.Column<bool>(nullable: false),
-                                             CanWriteCDMRW                   = table.Column<bool>(nullable: false),
-                                             CanWriteCDRW                    = table.Column<bool>(nullable: false),
-                                             CanWriteCDRWCAV                 = table.Column<bool>(nullable: false),
-                                             CanWriteCDSAO                   = table.Column<bool>(nullable: false),
-                                             CanWriteCDTAO                   = table.Column<bool>(nullable: false),
-                                             CanWriteCSSManagedDVD           = table.Column<bool>(nullable: false),
-                                             CanWriteDDCDR                   = table.Column<bool>(nullable: false),
-                                             CanWriteDDCDRW                  = table.Column<bool>(nullable: false),
-                                             CanWriteDVDPlusMRW              = table.Column<bool>(nullable: false),
-                                             CanWriteDVDPlusR                = table.Column<bool>(nullable: false),
-                                             CanWriteDVDPlusRDL              = table.Column<bool>(nullable: false),
-                                             CanWriteDVDPlusRW               = table.Column<bool>(nullable: false),
-                                             CanWriteDVDPlusRWDL             = table.Column<bool>(nullable: false),
-                                             CanWriteDVDR                    = table.Column<bool>(nullable: false),
-                                             CanWriteDVDRDL                  = table.Column<bool>(nullable: false),
-                                             CanWriteDVDRW                   = table.Column<bool>(nullable: false),
-                                             CanWriteHDDVDR                  = table.Column<bool>(nullable: false),
-                                             CanWriteHDDVDRAM                = table.Column<bool>(nullable: false),
-                                             CanWriteOldBDR                  = table.Column<bool>(nullable: false),
-                                             CanWriteOldBDRE                 = table.Column<bool>(nullable: false),
-                                             CanWritePackedSubchannelInTAO   = table.Column<bool>(nullable: false),
-                                             CanWriteRWSubchannelInSAO       = table.Column<bool>(nullable: false),
-                                             CanWriteRWSubchannelInTAO       = table.Column<bool>(nullable: false),
-                                             CanWriteRaw                     = table.Column<bool>(nullable: false),
-                                             CanWriteRawMultiSession         = table.Column<bool>(nullable: false),
-                                             CanWriteRawSubchannelInTAO      = table.Column<bool>(nullable: false),
-                                             ChangerIsSideChangeCapable      = table.Column<bool>(nullable: false),
-                                             ChangerSlots                    = table.Column<byte>(nullable: false),
-                                             ChangerSupportsDiscPresent      = table.Column<bool>(nullable: false),
-                                             CPRMVersion                     = table.Column<byte>(nullable: true),
-                                             CSSVersion                      = table.Column<byte>(nullable: true),
-                                             DBML                            = table.Column<bool>(nullable: false),
-                                             DVDMultiRead                    = table.Column<bool>(nullable: false),
-                                             EmbeddedChanger                 = table.Column<bool>(nullable: false),
-                                             ErrorRecoveryPage               = table.Column<bool>(nullable: false),
-                                             FirmwareDate                    = table.Column<DateTime>(nullable: true),
-                                             LoadingMechanismType            = table.Column<byte>(nullable: true),
-                                             Locked                          = table.Column<bool>(nullable: false),
-                                             LogicalBlockSize                = table.Column<uint>(nullable: true),
-                                             MultiRead                       = table.Column<bool>(nullable: false),
-                                             PhysicalInterfaceStandardNumber = table.Column<uint>(nullable: true),
-                                             PreventJumper                   = table.Column<bool>(nullable: false),
-                                             SupportsAACS                    = table.Column<bool>(nullable: false),
-                                             SupportsBusEncryption           = table.Column<bool>(nullable: false),
-                                             SupportsC2                      = table.Column<bool>(nullable: false),
-                                             SupportsCPRM                    = table.Column<bool>(nullable: false),
-                                             SupportsCSS                     = table.Column<bool>(nullable: false),
-                                             SupportsDAP                     = table.Column<bool>(nullable: false),
-                                             SupportsDeviceBusyEvent         = table.Column<bool>(nullable: false),
-                                             SupportsHybridDiscs             = table.Column<bool>(nullable: false),
-                                             SupportsModePage1Ch             = table.Column<bool>(nullable: false),
-                                             SupportsOSSC                    = table.Column<bool>(nullable: false),
-                                             SupportsPWP                     = table.Column<bool>(nullable: false),
-                                             SupportsSWPP                    = table.Column<bool>(nullable: false),
-                                             SupportsSecurDisc               = table.Column<bool>(nullable: false),
-                                             SupportsSeparateVolume          = table.Column<bool>(nullable: false),
-                                             SupportsVCPS                    = table.Column<bool>(nullable: false),
-                                             SupportsWriteInhibitDCB         = table.Column<bool>(nullable: false),
-                                             SupportsWriteProtectPAC         = table.Column<bool>(nullable: false),
-                                             VolumeLevels                    = table.Column<ushort>(nullable: true)
-                                         },
-                                         constraints: table => { table.PrimaryKey("PK_MmcFeatures", x => x.Id); });
+            migrationBuilder.CreateTable("MmcFeatures", table => new
+            {
+                Id                              = table.Column<int>().Annotation("Sqlite:Autoincrement", true),
+                AACSVersion                     = table.Column<byte>(nullable: true),
+                AGIDs                           = table.Column<byte>(nullable: true),
+                BindingNonceBlocks              = table.Column<byte>(nullable: true),
+                BlocksPerReadableUnit           = table.Column<ushort>(nullable: true),
+                BufferUnderrunFreeInDVD         = table.Column<bool>(),
+                BufferUnderrunFreeInSAO         = table.Column<bool>(),
+                BufferUnderrunFreeInTAO         = table.Column<bool>(),
+                CanAudioScan                    = table.Column<bool>(),
+                CanEject                        = table.Column<bool>(),
+                CanEraseSector                  = table.Column<bool>(),
+                CanExpandBDRESpareArea          = table.Column<bool>(),
+                CanFormat                       = table.Column<bool>(),
+                CanFormatBDREWithoutSpare       = table.Column<bool>(),
+                CanFormatCert                   = table.Column<bool>(),
+                CanFormatFRF                    = table.Column<bool>(),
+                CanFormatQCert                  = table.Column<bool>(),
+                CanFormatRRM                    = table.Column<bool>(),
+                CanGenerateBindingNonce         = table.Column<bool>(),
+                CanLoad                         = table.Column<bool>(),
+                CanMuteSeparateChannels         = table.Column<bool>(),
+                CanOverwriteSAOTrack            = table.Column<bool>(),
+                CanOverwriteTAOTrack            = table.Column<bool>(),
+                CanPlayCDAudio                  = table.Column<bool>(),
+                CanPseudoOverwriteBDR           = table.Column<bool>(),
+                CanReadAllDualR                 = table.Column<bool>(),
+                CanReadAllDualRW                = table.Column<bool>(),
+                CanReadBD                       = table.Column<bool>(),
+                CanReadBDR                      = table.Column<bool>(),
+                CanReadBDRE1                    = table.Column<bool>(),
+                CanReadBDRE2                    = table.Column<bool>(),
+                CanReadBDROM                    = table.Column<bool>(),
+                CanReadBluBCA                   = table.Column<bool>(),
+                CanReadCD                       = table.Column<bool>(),
+                CanReadCDMRW                    = table.Column<bool>(),
+                CanReadCPRM_MKB                 = table.Column<bool>(),
+                CanReadDDCD                     = table.Column<bool>(),
+                CanReadDVD                      = table.Column<bool>(),
+                CanReadDVDPlusMRW               = table.Column<bool>(),
+                CanReadDVDPlusR                 = table.Column<bool>(),
+                CanReadDVDPlusRDL               = table.Column<bool>(),
+                CanReadDVDPlusRW                = table.Column<bool>(),
+                CanReadDVDPlusRWDL              = table.Column<bool>(),
+                CanReadDriveAACSCertificate     = table.Column<bool>(),
+                CanReadHDDVD                    = table.Column<bool>(),
+                CanReadHDDVDR                   = table.Column<bool>(),
+                CanReadHDDVDRAM                 = table.Column<bool>(),
+                CanReadLeadInCDText             = table.Column<bool>(),
+                CanReadOldBDR                   = table.Column<bool>(),
+                CanReadOldBDRE                  = table.Column<bool>(),
+                CanReadOldBDROM                 = table.Column<bool>(),
+                CanReadSpareAreaInformation     = table.Column<bool>(),
+                CanReportDriveSerial            = table.Column<bool>(),
+                CanReportMediaSerial            = table.Column<bool>(),
+                CanTestWriteDDCDR               = table.Column<bool>(),
+                CanTestWriteDVD                 = table.Column<bool>(),
+                CanTestWriteInSAO               = table.Column<bool>(),
+                CanTestWriteInTAO               = table.Column<bool>(),
+                CanUpgradeFirmware              = table.Column<bool>(),
+                CanWriteBD                      = table.Column<bool>(),
+                CanWriteBDR                     = table.Column<bool>(),
+                CanWriteBDRE1                   = table.Column<bool>(),
+                CanWriteBDRE2                   = table.Column<bool>(),
+                CanWriteBusEncryptedBlocks      = table.Column<bool>(),
+                CanWriteCDMRW                   = table.Column<bool>(),
+                CanWriteCDRW                    = table.Column<bool>(),
+                CanWriteCDRWCAV                 = table.Column<bool>(),
+                CanWriteCDSAO                   = table.Column<bool>(),
+                CanWriteCDTAO                   = table.Column<bool>(),
+                CanWriteCSSManagedDVD           = table.Column<bool>(),
+                CanWriteDDCDR                   = table.Column<bool>(),
+                CanWriteDDCDRW                  = table.Column<bool>(),
+                CanWriteDVDPlusMRW              = table.Column<bool>(),
+                CanWriteDVDPlusR                = table.Column<bool>(),
+                CanWriteDVDPlusRDL              = table.Column<bool>(),
+                CanWriteDVDPlusRW               = table.Column<bool>(),
+                CanWriteDVDPlusRWDL             = table.Column<bool>(),
+                CanWriteDVDR                    = table.Column<bool>(),
+                CanWriteDVDRDL                  = table.Column<bool>(),
+                CanWriteDVDRW                   = table.Column<bool>(),
+                CanWriteHDDVDR                  = table.Column<bool>(),
+                CanWriteHDDVDRAM                = table.Column<bool>(),
+                CanWriteOldBDR                  = table.Column<bool>(),
+                CanWriteOldBDRE                 = table.Column<bool>(),
+                CanWritePackedSubchannelInTAO   = table.Column<bool>(),
+                CanWriteRWSubchannelInSAO       = table.Column<bool>(),
+                CanWriteRWSubchannelInTAO       = table.Column<bool>(),
+                CanWriteRaw                     = table.Column<bool>(),
+                CanWriteRawMultiSession         = table.Column<bool>(),
+                CanWriteRawSubchannelInTAO      = table.Column<bool>(),
+                ChangerIsSideChangeCapable      = table.Column<bool>(),
+                ChangerSlots                    = table.Column<byte>(),
+                ChangerSupportsDiscPresent      = table.Column<bool>(),
+                CPRMVersion                     = table.Column<byte>(nullable: true),
+                CSSVersion                      = table.Column<byte>(nullable: true),
+                DBML                            = table.Column<bool>(),
+                DVDMultiRead                    = table.Column<bool>(),
+                EmbeddedChanger                 = table.Column<bool>(),
+                ErrorRecoveryPage               = table.Column<bool>(),
+                FirmwareDate                    = table.Column<DateTime>(nullable: true),
+                LoadingMechanismType            = table.Column<byte>(nullable: true), Locked    = table.Column<bool>(),
+                LogicalBlockSize                = table.Column<uint>(nullable: true), MultiRead = table.Column<bool>(),
+                PhysicalInterfaceStandardNumber = table.Column<uint>(nullable: true),
+                PreventJumper                   = table.Column<bool>(), SupportsAACS            = table.Column<bool>(),
+                SupportsBusEncryption           = table.Column<bool>(), SupportsC2              = table.Column<bool>(),
+                SupportsCPRM                    = table.Column<bool>(), SupportsCSS             = table.Column<bool>(),
+                SupportsDAP                     = table.Column<bool>(), SupportsDeviceBusyEvent = table.Column<bool>(),
+                SupportsHybridDiscs             = table.Column<bool>(), SupportsModePage1Ch     = table.Column<bool>(),
+                SupportsOSSC                    = table.Column<bool>(), SupportsPWP             = table.Column<bool>(),
+                SupportsSWPP                    = table.Column<bool>(), SupportsSecurDisc       = table.Column<bool>(),
+                SupportsSeparateVolume          = table.Column<bool>(), SupportsVCPS            = table.Column<bool>(),
+                SupportsWriteInhibitDCB         = table.Column<bool>(), SupportsWriteProtectPAC = table.Column<bool>(),
+                VolumeLevels                    = table.Column<ushort>(nullable: true)
+            }, constraints: table =>
+            {
+                table.PrimaryKey("PK_MmcFeatures", x => x.Id);
+            });
 
-            migrationBuilder.CreateTable("MmcSd",
-                                         table => new
-                                         {
-                                             Id = table.Column<int>(nullable: false)
-                                                       .Annotation("Sqlite:Autoincrement", true),
-                                             CID         = table.Column<byte[]>(nullable: true),
-                                             CSD         = table.Column<byte[]>(nullable: true),
-                                             OCR         = table.Column<byte[]>(nullable: true),
-                                             SCR         = table.Column<byte[]>(nullable: true),
-                                             ExtendedCSD = table.Column<byte[]>(nullable: true)
-                                         }, constraints: table => { table.PrimaryKey("PK_MmcSd", x => x.Id); });
+            migrationBuilder.CreateTable("MmcSd", table => new
+            {
+                Id          = table.Column<int>().Annotation("Sqlite:Autoincrement", true),
+                CID         = table.Column<byte[]>(nullable: true), CSD = table.Column<byte[]>(nullable: true),
+                OCR         = table.Column<byte[]>(nullable: true), SCR = table.Column<byte[]>(nullable: true),
+                ExtendedCSD = table.Column<byte[]>(nullable: true)
+            }, constraints: table =>
+            {
+                table.PrimaryKey("PK_MmcSd", x => x.Id);
+            });
 
-            migrationBuilder.CreateTable("ModePage_2A",
-                                         table => new
-                                         {
-                                             PS                        = table.Column<bool>(nullable: false),
-                                             MultiSession              = table.Column<bool>(nullable: false),
-                                             Mode2Form2                = table.Column<bool>(nullable: false),
-                                             Mode2Form1                = table.Column<bool>(nullable: false),
-                                             AudioPlay                 = table.Column<bool>(nullable: false),
-                                             ISRC                      = table.Column<bool>(nullable: false),
-                                             UPC                       = table.Column<bool>(nullable: false),
-                                             C2Pointer                 = table.Column<bool>(nullable: false),
-                                             DeinterlaveSubchannel     = table.Column<bool>(nullable: false),
-                                             Subchannel                = table.Column<bool>(nullable: false),
-                                             AccurateCDDA              = table.Column<bool>(nullable: false),
-                                             CDDACommand               = table.Column<bool>(nullable: false),
-                                             LoadingMechanism          = table.Column<byte>(nullable: false),
-                                             Eject                     = table.Column<bool>(nullable: false),
-                                             PreventJumper             = table.Column<bool>(nullable: false),
-                                             LockState                 = table.Column<bool>(nullable: false),
-                                             Lock                      = table.Column<bool>(nullable: false),
-                                             SeparateChannelMute       = table.Column<bool>(nullable: false),
-                                             SeparateChannelVolume     = table.Column<bool>(nullable: false),
-                                             MaximumSpeed              = table.Column<ushort>(nullable: false),
-                                             SupportedVolumeLevels     = table.Column<ushort>(nullable: false),
-                                             BufferSize                = table.Column<ushort>(nullable: false),
-                                             CurrentSpeed              = table.Column<ushort>(nullable: false),
-                                             Method2                   = table.Column<bool>(nullable: false),
-                                             ReadCDRW                  = table.Column<bool>(nullable: false),
-                                             ReadCDR                   = table.Column<bool>(nullable: false),
-                                             WriteCDRW                 = table.Column<bool>(nullable: false),
-                                             WriteCDR                  = table.Column<bool>(nullable: false),
-                                             DigitalPort2              = table.Column<bool>(nullable: false),
-                                             DigitalPort1              = table.Column<bool>(nullable: false),
-                                             Composite                 = table.Column<bool>(nullable: false),
-                                             SSS                       = table.Column<bool>(nullable: false),
-                                             SDP                       = table.Column<bool>(nullable: false),
-                                             Length                    = table.Column<byte>(nullable: false),
-                                             LSBF                      = table.Column<bool>(nullable: false),
-                                             RCK                       = table.Column<bool>(nullable: false),
-                                             BCK                       = table.Column<bool>(nullable: false),
-                                             TestWrite                 = table.Column<bool>(nullable: false),
-                                             MaxWriteSpeed             = table.Column<ushort>(nullable: false),
-                                             CurrentWriteSpeed         = table.Column<ushort>(nullable: false),
-                                             ReadBarcode               = table.Column<bool>(nullable: false),
-                                             ReadDVDRAM                = table.Column<bool>(nullable: false),
-                                             ReadDVDR                  = table.Column<bool>(nullable: false),
-                                             ReadDVDROM                = table.Column<bool>(nullable: false),
-                                             WriteDVDRAM               = table.Column<bool>(nullable: false),
-                                             WriteDVDR                 = table.Column<bool>(nullable: false),
-                                             LeadInPW                  = table.Column<bool>(nullable: false),
-                                             SCC                       = table.Column<bool>(nullable: false),
-                                             CMRSupported              = table.Column<ushort>(nullable: false),
-                                             BUF                       = table.Column<bool>(nullable: false),
-                                             RotationControlSelected   = table.Column<byte>(nullable: false),
-                                             CurrentWriteSpeedSelected = table.Column<ushort>(nullable: false),
-                                             Id = table.Column<int>(nullable: false)
-                                                       .Annotation("Sqlite:Autoincrement", true)
-                                         },
-                                         constraints: table => { table.PrimaryKey("PK_ModePage_2A", x => x.Id); });
+            migrationBuilder.CreateTable("ModePage_2A", table => new
+            {
+                PS                        = table.Column<bool>(), MultiSession = table.Column<bool>(),
+                Mode2Form2                = table.Column<bool>(),
+                Mode2Form1                = table.Column<bool>(), AudioPlay = table.Column<bool>(),
+                ISRC                      = table.Column<bool>(),
+                UPC                       = table.Column<bool>(), C2Pointer   = table.Column<bool>(),
+                DeinterlaveSubchannel     = table.Column<bool>(), Subchannel  = table.Column<bool>(),
+                AccurateCDDA              = table.Column<bool>(), CDDACommand = table.Column<bool>(),
+                LoadingMechanism          = table.Column<byte>(), Eject       = table.Column<bool>(),
+                PreventJumper             = table.Column<bool>(), LockState   = table.Column<bool>(),
+                Lock                      = table.Column<bool>(),
+                SeparateChannelMute       = table.Column<bool>(), SeparateChannelVolume   = table.Column<bool>(),
+                MaximumSpeed              = table.Column<ushort>(), SupportedVolumeLevels = table.Column<ushort>(),
+                BufferSize                = table.Column<ushort>(), CurrentSpeed          = table.Column<ushort>(),
+                Method2                   = table.Column<bool>(), ReadCDRW                = table.Column<bool>(),
+                ReadCDR                   = table.Column<bool>(),
+                WriteCDRW                 = table.Column<bool>(), WriteCDR = table.Column<bool>(),
+                DigitalPort2              = table.Column<bool>(),
+                DigitalPort1              = table.Column<bool>(), Composite = table.Column<bool>(),
+                SSS                       = table.Column<bool>(),
+                SDP                       = table.Column<bool>(), Length = table.Column<byte>(),
+                LSBF                      = table.Column<bool>(),
+                RCK                       = table.Column<bool>(), BCK = table.Column<bool>(),
+                TestWrite                 = table.Column<bool>(),
+                MaxWriteSpeed             = table.Column<ushort>(), CurrentWriteSpeed = table.Column<ushort>(),
+                ReadBarcode               = table.Column<bool>(), ReadDVDRAM          = table.Column<bool>(),
+                ReadDVDR                  = table.Column<bool>(),
+                ReadDVDROM                = table.Column<bool>(), WriteDVDRAM = table.Column<bool>(),
+                WriteDVDR                 = table.Column<bool>(),
+                LeadInPW                  = table.Column<bool>(), SCC = table.Column<bool>(),
+                CMRSupported              = table.Column<ushort>(),
+                BUF                       = table.Column<bool>(), RotationControlSelected = table.Column<byte>(),
+                CurrentWriteSpeedSelected = table.Column<ushort>(),
+                Id                        = table.Column<int>().Annotation("Sqlite:Autoincrement", true)
+            }, constraints: table =>
+            {
+                table.PrimaryKey("PK_ModePage_2A", x => x.Id);
+            });
 
-            migrationBuilder.CreateTable("Pcmcia",
-                                         table => new
-                                         {
-                                             Id = table.Column<int>(nullable: false)
-                                                       .Annotation("Sqlite:Autoincrement", true),
-                                             CIS              = table.Column<byte[]>(nullable: true),
-                                             Compliance       = table.Column<string>(nullable: true),
-                                             ManufacturerCode = table.Column<ushort>(nullable: true),
-                                             CardCode         = table.Column<ushort>(nullable: true),
-                                             Manufacturer     = table.Column<string>(nullable: true),
-                                             ProductName      = table.Column<string>(nullable: true)
-                                         }, constraints: table => { table.PrimaryKey("PK_Pcmcia", x => x.Id); });
+            migrationBuilder.CreateTable("Pcmcia", table => new
+            {
+                Id               = table.Column<int>().Annotation("Sqlite:Autoincrement", true),
+                CIS              = table.Column<byte[]>(nullable: true),
+                Compliance       = table.Column<string>(nullable: true),
+                ManufacturerCode = table.Column<ushort>(nullable: true),
+                CardCode         = table.Column<ushort>(nullable: true),
+                Manufacturer     = table.Column<string>(nullable: true),
+                ProductName      = table.Column<string>(nullable: true)
+            }, constraints: table =>
+            {
+                table.PrimaryKey("PK_Pcmcia", x => x.Id);
+            });
 
-            migrationBuilder.CreateTable("ScsiMode",
-                                         table => new
-                                         {
-                                             Id = table.Column<int>(nullable: false)
-                                                       .Annotation("Sqlite:Autoincrement", true),
-                                             MediumType        = table.Column<byte>(nullable: true),
-                                             WriteProtected    = table.Column<bool>(nullable: false),
-                                             Speed             = table.Column<byte>(nullable: true),
-                                             BufferedMode      = table.Column<byte>(nullable: true),
-                                             BlankCheckEnabled = table.Column<bool>(nullable: false),
-                                             DPOandFUA         = table.Column<bool>(nullable: false)
-                                         }, constraints: table => { table.PrimaryKey("PK_ScsiMode", x => x.Id); });
+            migrationBuilder.CreateTable("ScsiMode", table => new
+            {
+                Id                = table.Column<int>().Annotation("Sqlite:Autoincrement", true),
+                MediumType        = table.Column<byte>(nullable: true), WriteProtected = table.Column<bool>(),
+                Speed             = table.Column<byte>(nullable: true),
+                BufferedMode      = table.Column<byte>(nullable: true),
+                BlankCheckEnabled = table.Column<bool>(), DPOandFUA = table.Column<bool>()
+            }, constraints: table =>
+            {
+                table.PrimaryKey("PK_ScsiMode", x => x.Id);
+            });
 
-            migrationBuilder.CreateTable("Ssc",
-                                         table => new
-                                         {
-                                             Id = table.Column<int>(nullable: false)
-                                                       .Annotation("Sqlite:Autoincrement", true),
-                                             BlockSizeGranularity = table.Column<byte>(nullable: true),
-                                             MaxBlockLength       = table.Column<uint>(nullable: true),
-                                             MinBlockLength       = table.Column<uint>(nullable: true)
-                                         }, constraints: table => { table.PrimaryKey("PK_Ssc", x => x.Id); });
+            migrationBuilder.CreateTable("Ssc", table => new
+            {
+                Id                   = table.Column<int>().Annotation("Sqlite:Autoincrement", true),
+                BlockSizeGranularity = table.Column<byte>(nullable: true),
+                MaxBlockLength       = table.Column<uint>(nullable: true),
+                MinBlockLength       = table.Column<uint>(nullable: true)
+            }, constraints: table =>
+            {
+                table.PrimaryKey("PK_Ssc", x => x.Id);
+            });
 
-            migrationBuilder.CreateTable("Usb",
-                                         table => new
-                                         {
-                                             Id = table.Column<int>(nullable: false)
-                                                       .Annotation("Sqlite:Autoincrement", true),
-                                             VendorID       = table.Column<ushort>(nullable: false),
-                                             ProductID      = table.Column<ushort>(nullable: false),
-                                             Manufacturer   = table.Column<string>(nullable: true),
-                                             Product        = table.Column<string>(nullable: true),
-                                             RemovableMedia = table.Column<bool>(nullable: false),
-                                             Descriptors    = table.Column<byte[]>(nullable: true)
-                                         }, constraints: table => { table.PrimaryKey("PK_Usb", x => x.Id); });
+            migrationBuilder.CreateTable("Usb", table => new
+            {
+                Id             = table.Column<int>().Annotation("Sqlite:Autoincrement", true),
+                VendorID       = table.Column<ushort>(),
+                ProductID      = table.Column<ushort>(),
+                Manufacturer   = table.Column<string>(nullable: true),
+                Product        = table.Column<string>(nullable: true),
+                RemovableMedia = table.Column<bool>(),
+                Descriptors    = table.Column<byte[]>(nullable: true)
+            }, constraints: table =>
+            {
+                table.PrimaryKey("PK_Usb", x => x.Id);
+            });
 
-            migrationBuilder.CreateTable("Mmc",
-                                         table => new
-                                         {
-                                             Id = table.Column<int>(nullable: false)
-                                                       .Annotation("Sqlite:Autoincrement", true),
-                                             FeaturesId = table.Column<int>(nullable: true)
-                                         }, constraints: table =>
-                                         {
-                                             table.PrimaryKey("PK_Mmc", x => x.Id);
-                                             table.ForeignKey("FK_Mmc_MmcFeatures_FeaturesId", x => x.FeaturesId,
-                                                              "MmcFeatures", "Id",
-                                                              onDelete: ReferentialAction.Restrict);
-                                         });
+            migrationBuilder.CreateTable("Mmc", table => new
+            {
+                Id         = table.Column<int>().Annotation("Sqlite:Autoincrement", true),
+                FeaturesId = table.Column<int>(nullable: true)
+            }, constraints: table =>
+            {
+                table.PrimaryKey("PK_Mmc", x => x.Id);
 
-            migrationBuilder.CreateTable("BlockDescriptor",
-                                         table => new
-                                         {
-                                             Id = table.Column<int>(nullable: false)
-                                                       .Annotation("Sqlite:Autoincrement", true),
-                                             Density     = table.Column<byte>(nullable: false),
-                                             Blocks      = table.Column<ulong>(nullable: true),
-                                             BlockLength = table.Column<uint>(nullable: true),
-                                             ScsiModeId  = table.Column<int>(nullable: true)
-                                         }, constraints: table =>
-                                         {
-                                             table.PrimaryKey("PK_BlockDescriptor", x => x.Id);
-                                             table.ForeignKey("FK_BlockDescriptor_ScsiMode_ScsiModeId",
-                                                              x => x.ScsiModeId, "ScsiMode", "Id",
-                                                              onDelete: ReferentialAction.Restrict);
-                                         });
+                table.ForeignKey("FK_Mmc_MmcFeatures_FeaturesId", x => x.FeaturesId, "MmcFeatures", "Id",
+                                 onDelete: ReferentialAction.Restrict);
+            });
 
-            migrationBuilder.CreateTable("TestedSequentialMedia",
-                                         table => new
-                                         {
-                                             Id =
-                                                 table.Column<int>(nullable: false)
-                                                      .Annotation("Sqlite:Autoincrement", true),
-                                             CanReadMediaSerial = table.Column<bool>(nullable: true),
-                                             Density            = table.Column<byte>(nullable: true),
-                                             Manufacturer       = table.Column<string>(nullable: true),
-                                             MediaIsRecognized  = table.Column<bool>(nullable: false),
-                                             MediumType         = table.Column<byte>(nullable: true),
-                                             MediumTypeName     = table.Column<string>(nullable: true),
-                                             Model              = table.Column<string>(nullable: true),
-                                             ModeSense6Data     = table.Column<byte[]>(nullable: true),
-                                             ModeSense10Data    = table.Column<byte[]>(nullable: true),
-                                             SscId              = table.Column<int>(nullable: true)
-                                         }, constraints: table =>
-                                         {
-                                             table.PrimaryKey("PK_TestedSequentialMedia", x => x.Id);
-                                             table.ForeignKey("FK_TestedSequentialMedia_Ssc_SscId", x => x.SscId, "Ssc",
-                                                              "Id", onDelete: ReferentialAction.Restrict);
-                                         });
+            migrationBuilder.CreateTable("BlockDescriptor", table => new
+            {
+                Id          = table.Column<int>().Annotation("Sqlite:Autoincrement", true),
+                Density     = table.Column<byte>(),
+                Blocks      = table.Column<ulong>(nullable: true),
+                BlockLength = table.Column<uint>(nullable: true),
+                ScsiModeId  = table.Column<int>(nullable: true)
+            }, constraints: table =>
+            {
+                table.PrimaryKey("PK_BlockDescriptor", x => x.Id);
 
-            migrationBuilder.CreateTable("SscSupportedMedia",
-                                         table => new
-                                         {
-                                             Id =
-                                                 table.Column<int>(nullable: false)
-                                                      .Annotation("Sqlite:Autoincrement", true),
-                                             MediumType              = table.Column<byte>(nullable: false),
-                                             Width                   = table.Column<ushort>(nullable: false),
-                                             Length                  = table.Column<ushort>(nullable: false),
-                                             Organization            = table.Column<string>(nullable: true),
-                                             Name                    = table.Column<string>(nullable: true),
-                                             Description             = table.Column<string>(nullable: true),
-                                             SscId                   = table.Column<int>(nullable: true),
-                                             TestedSequentialMediaId = table.Column<int>(nullable: true)
-                                         }, constraints: table =>
-                                         {
-                                             table.PrimaryKey("PK_SscSupportedMedia", x => x.Id);
-                                             table.ForeignKey("FK_SscSupportedMedia_Ssc_SscId", x => x.SscId, "Ssc",
-                                                              "Id", onDelete: ReferentialAction.Restrict);
-                                             table
-                                                .ForeignKey("FK_SscSupportedMedia_TestedSequentialMedia_TestedSequentialMediaId",
-                                                            x => x.TestedSequentialMediaId, "TestedSequentialMedia",
-                                                            "Id",
-                                                            onDelete: ReferentialAction.Restrict);
-                                         });
+                table.ForeignKey("FK_BlockDescriptor_ScsiMode_ScsiModeId", x => x.ScsiModeId, "ScsiMode", "Id",
+                                 onDelete: ReferentialAction.Restrict);
+            });
 
-            migrationBuilder.CreateTable("SupportedDensity",
-                                         table => new
-                                         {
-                                             Id =
-                                                 table.Column<int>(nullable: false)
-                                                      .Annotation("Sqlite:Autoincrement", true),
-                                             PrimaryCode             = table.Column<byte>(nullable: false),
-                                             SecondaryCode           = table.Column<byte>(nullable: false),
-                                             Writable                = table.Column<bool>(nullable: false),
-                                             Duplicate               = table.Column<bool>(nullable: false),
-                                             DefaultDensity          = table.Column<bool>(nullable: false),
-                                             BitsPerMm               = table.Column<uint>(nullable: false),
-                                             Width                   = table.Column<ushort>(nullable: false),
-                                             Tracks                  = table.Column<ushort>(nullable: false),
-                                             Capacity                = table.Column<uint>(nullable: false),
-                                             Organization            = table.Column<string>(nullable: true),
-                                             Name                    = table.Column<string>(nullable: true),
-                                             Description             = table.Column<string>(nullable: true),
-                                             SscId                   = table.Column<int>(nullable: true),
-                                             TestedSequentialMediaId = table.Column<int>(nullable: true)
-                                         }, constraints: table =>
-                                         {
-                                             table.PrimaryKey("PK_SupportedDensity", x => x.Id);
-                                             table.ForeignKey("FK_SupportedDensity_Ssc_SscId", x => x.SscId, "Ssc",
-                                                              "Id", onDelete: ReferentialAction.Restrict);
-                                             table
-                                                .ForeignKey("FK_SupportedDensity_TestedSequentialMedia_TestedSequentialMediaId",
-                                                            x => x.TestedSequentialMediaId, "TestedSequentialMedia",
-                                                            "Id",
-                                                            onDelete: ReferentialAction.Restrict);
-                                         });
+            migrationBuilder.CreateTable("TestedSequentialMedia", table => new
+            {
+                Id                 = table.Column<int>().Annotation("Sqlite:Autoincrement", true),
+                CanReadMediaSerial = table.Column<bool>(nullable: true),
+                Density            = table.Column<byte>(nullable: true),
+                Manufacturer       = table.Column<string>(nullable: true), MediaIsRecognized = table.Column<bool>(),
+                MediumType         = table.Column<byte>(nullable: true),
+                MediumTypeName     = table.Column<string>(nullable: true),
+                Model              = table.Column<string>(nullable: true),
+                ModeSense6Data     = table.Column<byte[]>(nullable: true),
+                ModeSense10Data    = table.Column<byte[]>(nullable: true),
+                SscId              = table.Column<int>(nullable: true)
+            }, constraints: table =>
+            {
+                table.PrimaryKey("PK_TestedSequentialMedia", x => x.Id);
 
-            migrationBuilder.CreateTable("DensityCode",
-                                         table => new
-                                         {
-                                             Code = table.Column<int>(nullable: false)
-                                                         .Annotation("Sqlite:Autoincrement", true),
-                                             SscSupportedMediaId = table.Column<int>(nullable: true)
-                                         }, constraints: table =>
-                                         {
-                                             table.PrimaryKey("PK_DensityCode", x => x.Code);
-                                             table.ForeignKey("FK_DensityCode_SscSupportedMedia_SscSupportedMediaId",
-                                                              x => x.SscSupportedMediaId, "SscSupportedMedia", "Id",
-                                                              onDelete: ReferentialAction.Restrict);
-                                         });
+                table.ForeignKey("FK_TestedSequentialMedia_Ssc_SscId", x => x.SscId, "Ssc", "Id",
+                                 onDelete: ReferentialAction.Restrict);
+            });
 
-            migrationBuilder.CreateTable("Reports",
-                                         table => new
-                                         {
-                                             Id =
-                                                 table.Column<int>(nullable: false)
-                                                      .Annotation("Sqlite:Autoincrement", true),
-                                             USBId            = table.Column<int>(nullable: true),
-                                             FireWireId       = table.Column<int>(nullable: true),
-                                             PCMCIAId         = table.Column<int>(nullable: true),
-                                             CompactFlash     = table.Column<bool>(nullable: false),
-                                             ATAId            = table.Column<int>(nullable: true),
-                                             ATAPIId          = table.Column<int>(nullable: true),
-                                             SCSIId           = table.Column<int>(nullable: true),
-                                             MultiMediaCardId = table.Column<int>(nullable: true),
-                                             SecureDigitalId  = table.Column<int>(nullable: true),
-                                             Discriminator    = table.Column<string>(nullable: false),
-                                             LastSynchronized = table.Column<DateTime>(nullable: true)
-                                         }, constraints: table =>
-                                         {
-                                             table.PrimaryKey("PK_Reports", x => x.Id);
-                                             table.ForeignKey("FK_Reports_FireWire_FireWireId", x => x.FireWireId,
-                                                              "FireWire", "Id", onDelete: ReferentialAction.Restrict);
-                                             table.ForeignKey("FK_Reports_MmcSd_MultiMediaCardId",
-                                                              x => x.MultiMediaCardId, "MmcSd", "Id",
-                                                              onDelete: ReferentialAction.Restrict);
-                                             table.ForeignKey("FK_Reports_Pcmcia_PCMCIAId", x => x.PCMCIAId, "Pcmcia",
-                                                              "Id", onDelete: ReferentialAction.Restrict);
-                                             table.ForeignKey("FK_Reports_MmcSd_SecureDigitalId",
-                                                              x => x.SecureDigitalId, "MmcSd", "Id",
-                                                              onDelete: ReferentialAction.Restrict);
-                                             table.ForeignKey("FK_Reports_Usb_USBId", x => x.USBId, "Usb", "Id",
-                                                              onDelete: ReferentialAction.Restrict);
-                                         });
+            migrationBuilder.CreateTable("SscSupportedMedia", table => new
+            {
+                Id                      = table.Column<int>().Annotation("Sqlite:Autoincrement", true),
+                MediumType              = table.Column<byte>(),
+                Width                   = table.Column<ushort>(),
+                Length                  = table.Column<ushort>(),
+                Organization            = table.Column<string>(nullable: true),
+                Name                    = table.Column<string>(nullable: true),
+                Description             = table.Column<string>(nullable: true),
+                SscId                   = table.Column<int>(nullable: true),
+                TestedSequentialMediaId = table.Column<int>(nullable: true)
+            }, constraints: table =>
+            {
+                table.PrimaryKey("PK_SscSupportedMedia", x => x.Id);
 
-            migrationBuilder.CreateTable("TestedMedia",
-                                         table => new
-                                         {
-                                             Id =
-                                                 table.Column<int>(nullable: false)
-                                                      .Annotation("Sqlite:Autoincrement", true),
-                                             IdentifyData                     = table.Column<byte[]>(nullable: true),
-                                             Blocks                           = table.Column<ulong>(nullable: true),
-                                             BlockSize                        = table.Column<uint>(nullable: true),
-                                             CanReadAACS                      = table.Column<bool>(nullable: true),
-                                             CanReadADIP                      = table.Column<bool>(nullable: true),
-                                             CanReadATIP                      = table.Column<bool>(nullable: true),
-                                             CanReadBCA                       = table.Column<bool>(nullable: true),
-                                             CanReadC2Pointers                = table.Column<bool>(nullable: true),
-                                             CanReadCMI                       = table.Column<bool>(nullable: true),
-                                             CanReadCorrectedSubchannel       = table.Column<bool>(nullable: true),
-                                             CanReadCorrectedSubchannelWithC2 = table.Column<bool>(nullable: true),
-                                             CanReadDCB                       = table.Column<bool>(nullable: true),
-                                             CanReadDDS                       = table.Column<bool>(nullable: true),
-                                             CanReadDMI                       = table.Column<bool>(nullable: true),
-                                             CanReadDiscInformation           = table.Column<bool>(nullable: true),
-                                             CanReadFullTOC                   = table.Column<bool>(nullable: true),
-                                             CanReadHDCMI                     = table.Column<bool>(nullable: true),
-                                             CanReadLayerCapacity             = table.Column<bool>(nullable: true),
-                                             CanReadFirstTrackPreGap          = table.Column<bool>(nullable: true),
-                                             CanReadLeadIn                    = table.Column<bool>(nullable: true),
-                                             CanReadLeadOut                   = table.Column<bool>(nullable: true),
-                                             CanReadMediaID                   = table.Column<bool>(nullable: true),
-                                             CanReadMediaSerial               = table.Column<bool>(nullable: true),
-                                             CanReadPAC                       = table.Column<bool>(nullable: true),
-                                             CanReadPFI                       = table.Column<bool>(nullable: true),
-                                             CanReadPMA                       = table.Column<bool>(nullable: true),
-                                             CanReadPQSubchannel              = table.Column<bool>(nullable: true),
-                                             CanReadPQSubchannelWithC2        = table.Column<bool>(nullable: true),
-                                             CanReadPRI                       = table.Column<bool>(nullable: true),
-                                             CanReadRWSubchannel              = table.Column<bool>(nullable: true),
-                                             CanReadRWSubchannelWithC2        = table.Column<bool>(nullable: true),
-                                             CanReadRecordablePFI             = table.Column<bool>(nullable: true),
-                                             CanReadSpareAreaInformation      = table.Column<bool>(nullable: true),
-                                             CanReadTOC                       = table.Column<bool>(nullable: true),
-                                             Density                          = table.Column<byte>(nullable: true),
-                                             LongBlockSize                    = table.Column<uint>(nullable: true),
-                                             Manufacturer                     = table.Column<string>(nullable: true),
-                                             MediaIsRecognized                = table.Column<bool>(nullable: false),
-                                             MediumType                       = table.Column<byte>(nullable: true),
-                                             MediumTypeName                   = table.Column<string>(nullable: true),
-                                             Model                            = table.Column<string>(nullable: true),
-                                             SupportsHLDTSTReadRawDVD         = table.Column<bool>(nullable: true),
-                                             SupportsNECReadCDDA              = table.Column<bool>(nullable: true),
-                                             SupportsPioneerReadCDDA          = table.Column<bool>(nullable: true),
-                                             SupportsPioneerReadCDDAMSF       = table.Column<bool>(nullable: true),
-                                             SupportsPlextorReadCDDA          = table.Column<bool>(nullable: true),
-                                             SupportsPlextorReadRawDVD        = table.Column<bool>(nullable: true),
-                                             SupportsRead10                   = table.Column<bool>(nullable: true),
-                                             SupportsRead12                   = table.Column<bool>(nullable: true),
-                                             SupportsRead16                   = table.Column<bool>(nullable: true),
-                                             SupportsRead6                    = table.Column<bool>(nullable: true),
-                                             SupportsReadCapacity16           = table.Column<bool>(nullable: true),
-                                             SupportsReadCapacity             = table.Column<bool>(nullable: true),
-                                             SupportsReadCd                   = table.Column<bool>(nullable: true),
-                                             SupportsReadCdMsf                = table.Column<bool>(nullable: true),
-                                             SupportsReadCdRaw                = table.Column<bool>(nullable: true),
-                                             SupportsReadCdMsfRaw             = table.Column<bool>(nullable: true),
-                                             SupportsReadLong16               = table.Column<bool>(nullable: true),
-                                             SupportsReadLong                 = table.Column<bool>(nullable: true),
-                                             ModeSense6Data                   = table.Column<byte[]>(nullable: true),
-                                             ModeSense10Data                  = table.Column<byte[]>(nullable: true),
-                                             CHSId                            = table.Column<int>(nullable: true),
-                                             CurrentCHSId                     = table.Column<int>(nullable: true),
-                                             LBASectors                       = table.Column<uint>(nullable: true),
-                                             LBA48Sectors                     = table.Column<ulong>(nullable: true),
-                                             LogicalAlignment                 = table.Column<ushort>(nullable: true),
-                                             NominalRotationRate              = table.Column<ushort>(nullable: true),
-                                             PhysicalBlockSize                = table.Column<uint>(nullable: true),
-                                             SolidStateDevice                 = table.Column<bool>(nullable: true),
-                                             UnformattedBPT                   = table.Column<ushort>(nullable: true),
-                                             UnformattedBPS                   = table.Column<ushort>(nullable: true),
-                                             SupportsReadDmaLba               = table.Column<bool>(nullable: true),
-                                             SupportsReadDmaRetryLba          = table.Column<bool>(nullable: true),
-                                             SupportsReadLba                  = table.Column<bool>(nullable: true),
-                                             SupportsReadRetryLba             = table.Column<bool>(nullable: true),
-                                             SupportsReadLongLba              = table.Column<bool>(nullable: true),
-                                             SupportsReadLongRetryLba         = table.Column<bool>(nullable: true),
-                                             SupportsSeekLba                  = table.Column<bool>(nullable: true),
-                                             SupportsReadDmaLba48             = table.Column<bool>(nullable: true),
-                                             SupportsReadLba48                = table.Column<bool>(nullable: true),
-                                             SupportsReadDma                  = table.Column<bool>(nullable: true),
-                                             SupportsReadDmaRetry             = table.Column<bool>(nullable: true),
-                                             SupportsReadRetry                = table.Column<bool>(nullable: true),
-                                             SupportsReadSectors              = table.Column<bool>(nullable: true),
-                                             SupportsReadLongRetry            = table.Column<bool>(nullable: true),
-                                             SupportsSeek                     = table.Column<bool>(nullable: true),
-                                             AtaId                            = table.Column<int>(nullable: true),
-                                             MmcId                            = table.Column<int>(nullable: true),
-                                             ScsiId                           = table.Column<int>(nullable: true)
-                                         }, constraints: table =>
-                                         {
-                                             table.PrimaryKey("PK_TestedMedia", x => x.Id);
-                                             table.ForeignKey("FK_TestedMedia_Chs_CHSId", x => x.CHSId, "Chs", "Id",
-                                                              onDelete: ReferentialAction.Restrict);
-                                             table.ForeignKey("FK_TestedMedia_Chs_CurrentCHSId", x => x.CurrentCHSId,
-                                                              "Chs", "Id", onDelete: ReferentialAction.Restrict);
-                                             table.ForeignKey("FK_TestedMedia_Mmc_MmcId", x => x.MmcId, "Mmc", "Id",
-                                                              onDelete: ReferentialAction.Restrict);
-                                         });
+                table.ForeignKey("FK_SscSupportedMedia_Ssc_SscId", x => x.SscId, "Ssc", "Id",
+                                 onDelete: ReferentialAction.Restrict);
 
-            migrationBuilder.CreateTable("Ata",
-                                         table => new
-                                         {
-                                             Id = table.Column<int>(nullable: false)
-                                                       .Annotation("Sqlite:Autoincrement", true),
-                                             Identify           = table.Column<byte[]>(nullable: true),
-                                             ReadCapabilitiesId = table.Column<int>(nullable: true)
-                                         }, constraints: table =>
-                                         {
-                                             table.PrimaryKey("PK_Ata", x => x.Id);
-                                             table.ForeignKey("FK_Ata_TestedMedia_ReadCapabilitiesId",
-                                                              x => x.ReadCapabilitiesId, "TestedMedia", "Id",
-                                                              onDelete: ReferentialAction.Restrict);
-                                         });
+                table.ForeignKey("FK_SscSupportedMedia_TestedSequentialMedia_TestedSequentialMediaId",
+                                 x => x.TestedSequentialMediaId, "TestedSequentialMedia", "Id",
+                                 onDelete: ReferentialAction.Restrict);
+            });
 
-            migrationBuilder.CreateTable("Scsi",
-                                         table => new
-                                         {
-                                             Id =
-                                                 table.Column<int>(nullable: false)
-                                                      .Annotation("Sqlite:Autoincrement", true),
-                                             InquiryData          = table.Column<byte[]>(nullable: true),
-                                             SupportsModeSense6   = table.Column<bool>(nullable: false),
-                                             SupportsModeSense10  = table.Column<bool>(nullable: false),
-                                             SupportsModeSubpages = table.Column<bool>(nullable: false),
-                                             ModeSenseId          = table.Column<int>(nullable: true),
-                                             MultiMediaDeviceId   = table.Column<int>(nullable: true),
-                                             ReadCapabilitiesId   = table.Column<int>(nullable: true),
-                                             SequentialDeviceId   = table.Column<int>(nullable: true),
-                                             ModeSense6Data       = table.Column<byte[]>(nullable: true),
-                                             ModeSense10Data      = table.Column<byte[]>(nullable: true)
-                                         }, constraints: table =>
-                                         {
-                                             table.PrimaryKey("PK_Scsi", x => x.Id);
-                                             table.ForeignKey("FK_Scsi_ScsiMode_ModeSenseId", x => x.ModeSenseId,
-                                                              "ScsiMode", "Id", onDelete: ReferentialAction.Restrict);
-                                             table.ForeignKey("FK_Scsi_Mmc_MultiMediaDeviceId",
-                                                              x => x.MultiMediaDeviceId, "Mmc", "Id",
-                                                              onDelete: ReferentialAction.Restrict);
-                                             table.ForeignKey("FK_Scsi_TestedMedia_ReadCapabilitiesId",
-                                                              x => x.ReadCapabilitiesId, "TestedMedia", "Id",
-                                                              onDelete: ReferentialAction.Restrict);
-                                             table.ForeignKey("FK_Scsi_Ssc_SequentialDeviceId",
-                                                              x => x.SequentialDeviceId, "Ssc", "Id",
-                                                              onDelete: ReferentialAction.Restrict);
-                                         });
+            migrationBuilder.CreateTable("SupportedDensity", table => new
+            {
+                Id                      = table.Column<int>().Annotation("Sqlite:Autoincrement", true),
+                PrimaryCode             = table.Column<byte>(),
+                SecondaryCode           = table.Column<byte>(),
+                Writable                = table.Column<bool>(),
+                Duplicate               = table.Column<bool>(),
+                DefaultDensity          = table.Column<bool>(),
+                BitsPerMm               = table.Column<uint>(),
+                Width                   = table.Column<ushort>(),
+                Tracks                  = table.Column<ushort>(),
+                Capacity                = table.Column<uint>(),
+                Organization            = table.Column<string>(nullable: true),
+                Name                    = table.Column<string>(nullable: true),
+                Description             = table.Column<string>(nullable: true),
+                SscId                   = table.Column<int>(nullable: true),
+                TestedSequentialMediaId = table.Column<int>(nullable: true)
+            }, constraints: table =>
+            {
+                table.PrimaryKey("PK_SupportedDensity", x => x.Id);
 
-            migrationBuilder.CreateTable("ScsiPage",
-                                         table => new
-                                         {
-                                             Id = table.Column<int>(nullable: false)
-                                                       .Annotation("Sqlite:Autoincrement", true),
-                                             page       = table.Column<byte>(nullable: false),
-                                             subpage    = table.Column<byte>(nullable: true),
-                                             value      = table.Column<byte[]>(nullable: true),
-                                             ScsiId     = table.Column<int>(nullable: true),
-                                             ScsiModeId = table.Column<int>(nullable: true)
-                                         }, constraints: table =>
-                                         {
-                                             table.PrimaryKey("PK_ScsiPage", x => x.Id);
-                                             table.ForeignKey("FK_ScsiPage_Scsi_ScsiId", x => x.ScsiId, "Scsi", "Id",
-                                                              onDelete: ReferentialAction.Restrict);
-                                             table.ForeignKey("FK_ScsiPage_ScsiMode_ScsiModeId", x => x.ScsiModeId,
-                                                              "ScsiMode", "Id", onDelete: ReferentialAction.Restrict);
-                                         });
+                table.ForeignKey("FK_SupportedDensity_Ssc_SscId", x => x.SscId, "Ssc", "Id",
+                                 onDelete: ReferentialAction.Restrict);
+
+                table.ForeignKey("FK_SupportedDensity_TestedSequentialMedia_TestedSequentialMediaId",
+                                 x => x.TestedSequentialMediaId, "TestedSequentialMedia", "Id",
+                                 onDelete: ReferentialAction.Restrict);
+            });
+
+            migrationBuilder.CreateTable("DensityCode", table => new
+            {
+                Code                = table.Column<int>().Annotation("Sqlite:Autoincrement", true),
+                SscSupportedMediaId = table.Column<int>(nullable: true)
+            }, constraints: table =>
+            {
+                table.PrimaryKey("PK_DensityCode", x => x.Code);
+
+                table.ForeignKey("FK_DensityCode_SscSupportedMedia_SscSupportedMediaId", x => x.SscSupportedMediaId,
+                                 "SscSupportedMedia", "Id", onDelete: ReferentialAction.Restrict);
+            });
+
+            migrationBuilder.CreateTable("Reports", table => new
+            {
+                Id               = table.Column<int>().Annotation("Sqlite:Autoincrement", true),
+                USBId            = table.Column<int>(nullable: true),
+                FireWireId       = table.Column<int>(nullable: true),
+                PCMCIAId         = table.Column<int>(nullable: true), CompactFlash = table.Column<bool>(),
+                ATAId            = table.Column<int>(nullable: true),
+                ATAPIId          = table.Column<int>(nullable: true),
+                SCSIId           = table.Column<int>(nullable: true),
+                MultiMediaCardId = table.Column<int>(nullable: true),
+                SecureDigitalId  = table.Column<int>(nullable: true), Discriminator = table.Column<string>(),
+                LastSynchronized = table.Column<DateTime>(nullable: true)
+            }, constraints: table =>
+            {
+                table.PrimaryKey("PK_Reports", x => x.Id);
+
+                table.ForeignKey("FK_Reports_FireWire_FireWireId", x => x.FireWireId, "FireWire", "Id",
+                                 onDelete: ReferentialAction.Restrict);
+
+                table.ForeignKey("FK_Reports_MmcSd_MultiMediaCardId", x => x.MultiMediaCardId, "MmcSd", "Id",
+                                 onDelete: ReferentialAction.Restrict);
+
+                table.ForeignKey("FK_Reports_Pcmcia_PCMCIAId", x => x.PCMCIAId, "Pcmcia", "Id",
+                                 onDelete: ReferentialAction.Restrict);
+
+                table.ForeignKey("FK_Reports_MmcSd_SecureDigitalId", x => x.SecureDigitalId, "MmcSd", "Id",
+                                 onDelete: ReferentialAction.Restrict);
+
+                table.ForeignKey("FK_Reports_Usb_USBId", x => x.USBId, "Usb", "Id",
+                                 onDelete: ReferentialAction.Restrict);
+            });
+
+            migrationBuilder.CreateTable("TestedMedia", table => new
+            {
+                Id                               = table.Column<int>().Annotation("Sqlite:Autoincrement", true),
+                IdentifyData                     = table.Column<byte[]>(nullable: true),
+                Blocks                           = table.Column<ulong>(nullable: true),
+                BlockSize                        = table.Column<uint>(nullable: true),
+                CanReadAACS                      = table.Column<bool>(nullable: true),
+                CanReadADIP                      = table.Column<bool>(nullable: true),
+                CanReadATIP                      = table.Column<bool>(nullable: true),
+                CanReadBCA                       = table.Column<bool>(nullable: true),
+                CanReadC2Pointers                = table.Column<bool>(nullable: true),
+                CanReadCMI                       = table.Column<bool>(nullable: true),
+                CanReadCorrectedSubchannel       = table.Column<bool>(nullable: true),
+                CanReadCorrectedSubchannelWithC2 = table.Column<bool>(nullable: true),
+                CanReadDCB                       = table.Column<bool>(nullable: true),
+                CanReadDDS                       = table.Column<bool>(nullable: true),
+                CanReadDMI                       = table.Column<bool>(nullable: true),
+                CanReadDiscInformation           = table.Column<bool>(nullable: true),
+                CanReadFullTOC                   = table.Column<bool>(nullable: true),
+                CanReadHDCMI                     = table.Column<bool>(nullable: true),
+                CanReadLayerCapacity             = table.Column<bool>(nullable: true),
+                CanReadFirstTrackPreGap          = table.Column<bool>(nullable: true),
+                CanReadLeadIn                    = table.Column<bool>(nullable: true),
+                CanReadLeadOut                   = table.Column<bool>(nullable: true),
+                CanReadMediaID                   = table.Column<bool>(nullable: true),
+                CanReadMediaSerial               = table.Column<bool>(nullable: true),
+                CanReadPAC                       = table.Column<bool>(nullable: true),
+                CanReadPFI                       = table.Column<bool>(nullable: true),
+                CanReadPMA                       = table.Column<bool>(nullable: true),
+                CanReadPQSubchannel              = table.Column<bool>(nullable: true),
+                CanReadPQSubchannelWithC2        = table.Column<bool>(nullable: true),
+                CanReadPRI                       = table.Column<bool>(nullable: true),
+                CanReadRWSubchannel              = table.Column<bool>(nullable: true),
+                CanReadRWSubchannelWithC2        = table.Column<bool>(nullable: true),
+                CanReadRecordablePFI             = table.Column<bool>(nullable: true),
+                CanReadSpareAreaInformation      = table.Column<bool>(nullable: true),
+                CanReadTOC                       = table.Column<bool>(nullable: true),
+                Density                          = table.Column<byte>(nullable: true),
+                LongBlockSize                    = table.Column<uint>(nullable: true),
+                Manufacturer                     = table.Column<string>(nullable: true),
+                MediaIsRecognized                = table.Column<bool>(),
+                MediumType                       = table.Column<byte>(nullable: true),
+                MediumTypeName                   = table.Column<string>(nullable: true),
+                Model                            = table.Column<string>(nullable: true),
+                SupportsHLDTSTReadRawDVD         = table.Column<bool>(nullable: true),
+                SupportsNECReadCDDA              = table.Column<bool>(nullable: true),
+                SupportsPioneerReadCDDA          = table.Column<bool>(nullable: true),
+                SupportsPioneerReadCDDAMSF       = table.Column<bool>(nullable: true),
+                SupportsPlextorReadCDDA          = table.Column<bool>(nullable: true),
+                SupportsPlextorReadRawDVD        = table.Column<bool>(nullable: true),
+                SupportsRead10                   = table.Column<bool>(nullable: true),
+                SupportsRead12                   = table.Column<bool>(nullable: true),
+                SupportsRead16                   = table.Column<bool>(nullable: true),
+                SupportsRead6                    = table.Column<bool>(nullable: true),
+                SupportsReadCapacity16           = table.Column<bool>(nullable: true),
+                SupportsReadCapacity             = table.Column<bool>(nullable: true),
+                SupportsReadCd                   = table.Column<bool>(nullable: true),
+                SupportsReadCdMsf                = table.Column<bool>(nullable: true),
+                SupportsReadCdRaw                = table.Column<bool>(nullable: true),
+                SupportsReadCdMsfRaw             = table.Column<bool>(nullable: true),
+                SupportsReadLong16               = table.Column<bool>(nullable: true),
+                SupportsReadLong                 = table.Column<bool>(nullable: true),
+                ModeSense6Data                   = table.Column<byte[]>(nullable: true),
+                ModeSense10Data                  = table.Column<byte[]>(nullable: true),
+                CHSId                            = table.Column<int>(nullable: true),
+                CurrentCHSId                     = table.Column<int>(nullable: true),
+                LBASectors                       = table.Column<uint>(nullable: true),
+                LBA48Sectors                     = table.Column<ulong>(nullable: true),
+                LogicalAlignment                 = table.Column<ushort>(nullable: true),
+                NominalRotationRate              = table.Column<ushort>(nullable: true),
+                PhysicalBlockSize                = table.Column<uint>(nullable: true),
+                SolidStateDevice                 = table.Column<bool>(nullable: true),
+                UnformattedBPT                   = table.Column<ushort>(nullable: true),
+                UnformattedBPS                   = table.Column<ushort>(nullable: true),
+                SupportsReadDmaLba               = table.Column<bool>(nullable: true),
+                SupportsReadDmaRetryLba          = table.Column<bool>(nullable: true),
+                SupportsReadLba                  = table.Column<bool>(nullable: true),
+                SupportsReadRetryLba             = table.Column<bool>(nullable: true),
+                SupportsReadLongLba              = table.Column<bool>(nullable: true),
+                SupportsReadLongRetryLba         = table.Column<bool>(nullable: true),
+                SupportsSeekLba                  = table.Column<bool>(nullable: true),
+                SupportsReadDmaLba48             = table.Column<bool>(nullable: true),
+                SupportsReadLba48                = table.Column<bool>(nullable: true),
+                SupportsReadDma                  = table.Column<bool>(nullable: true),
+                SupportsReadDmaRetry             = table.Column<bool>(nullable: true),
+                SupportsReadRetry                = table.Column<bool>(nullable: true),
+                SupportsReadSectors              = table.Column<bool>(nullable: true),
+                SupportsReadLongRetry            = table.Column<bool>(nullable: true),
+                SupportsSeek                     = table.Column<bool>(nullable: true),
+                AtaId                            = table.Column<int>(nullable: true),
+                MmcId                            = table.Column<int>(nullable: true),
+                ScsiId                           = table.Column<int>(nullable: true)
+            }, constraints: table =>
+            {
+                table.PrimaryKey("PK_TestedMedia", x => x.Id);
+
+                table.ForeignKey("FK_TestedMedia_Chs_CHSId", x => x.CHSId, "Chs", "Id",
+                                 onDelete: ReferentialAction.Restrict);
+
+                table.ForeignKey("FK_TestedMedia_Chs_CurrentCHSId", x => x.CurrentCHSId, "Chs", "Id",
+                                 onDelete: ReferentialAction.Restrict);
+
+                table.ForeignKey("FK_TestedMedia_Mmc_MmcId", x => x.MmcId, "Mmc", "Id",
+                                 onDelete: ReferentialAction.Restrict);
+            });
+
+            migrationBuilder.CreateTable("Ata", table => new
+            {
+                Id       = table.Column<int>().Annotation("Sqlite:Autoincrement", true),
+                Identify = table.Column<byte[]>(nullable: true), ReadCapabilitiesId = table.Column<int>(nullable: true)
+            }, constraints: table =>
+            {
+                table.PrimaryKey("PK_Ata", x => x.Id);
+
+                table.ForeignKey("FK_Ata_TestedMedia_ReadCapabilitiesId", x => x.ReadCapabilitiesId, "TestedMedia",
+                                 "Id", onDelete: ReferentialAction.Restrict);
+            });
+
+            migrationBuilder.CreateTable("Scsi", table => new
+            {
+                Id                  = table.Column<int>().Annotation("Sqlite:Autoincrement", true),
+                InquiryData         = table.Column<byte[]>(nullable: true), SupportsModeSense6 = table.Column<bool>(),
+                SupportsModeSense10 = table.Column<bool>(), SupportsModeSubpages               = table.Column<bool>(),
+                ModeSenseId         = table.Column<int>(nullable: true),
+                MultiMediaDeviceId  = table.Column<int>(nullable: true),
+                ReadCapabilitiesId  = table.Column<int>(nullable: true),
+                SequentialDeviceId  = table.Column<int>(nullable: true),
+                ModeSense6Data      = table.Column<byte[]>(nullable: true),
+                ModeSense10Data     = table.Column<byte[]>(nullable: true)
+            }, constraints: table =>
+            {
+                table.PrimaryKey("PK_Scsi", x => x.Id);
+
+                table.ForeignKey("FK_Scsi_ScsiMode_ModeSenseId", x => x.ModeSenseId, "ScsiMode", "Id",
+                                 onDelete: ReferentialAction.Restrict);
+
+                table.ForeignKey("FK_Scsi_Mmc_MultiMediaDeviceId", x => x.MultiMediaDeviceId, "Mmc", "Id",
+                                 onDelete: ReferentialAction.Restrict);
+
+                table.ForeignKey("FK_Scsi_TestedMedia_ReadCapabilitiesId", x => x.ReadCapabilitiesId, "TestedMedia",
+                                 "Id", onDelete: ReferentialAction.Restrict);
+
+                table.ForeignKey("FK_Scsi_Ssc_SequentialDeviceId", x => x.SequentialDeviceId, "Ssc", "Id",
+                                 onDelete: ReferentialAction.Restrict);
+            });
+
+            migrationBuilder.CreateTable("ScsiPage", table => new
+            {
+                Id         = table.Column<int>().Annotation("Sqlite:Autoincrement", true), page = table.Column<byte>(),
+                subpage    = table.Column<byte>(nullable: true),
+                value      = table.Column<byte[]>(nullable: true),
+                ScsiId     = table.Column<int>(nullable: true),
+                ScsiModeId = table.Column<int>(nullable: true)
+            }, constraints: table =>
+            {
+                table.PrimaryKey("PK_ScsiPage", x => x.Id);
+
+                table.ForeignKey("FK_ScsiPage_Scsi_ScsiId", x => x.ScsiId, "Scsi", "Id",
+                                 onDelete: ReferentialAction.Restrict);
+
+                table.ForeignKey("FK_ScsiPage_ScsiMode_ScsiModeId", x => x.ScsiModeId, "ScsiMode", "Id",
+                                 onDelete: ReferentialAction.Restrict);
+            });
 
             migrationBuilder.CreateIndex("IX_Ata_ReadCapabilitiesId", "Ata", "ReadCapabilitiesId");
 
diff --git a/Aaru.Database/Migrations/20181127013131_CorrectReportsDbSet.cs b/Aaru.Database/Migrations/20181127013131_CorrectReportsDbSet.cs
index 56b051904..6058671e6 100644
--- a/Aaru.Database/Migrations/20181127013131_CorrectReportsDbSet.cs
+++ b/Aaru.Database/Migrations/20181127013131_CorrectReportsDbSet.cs
@@ -9,47 +9,47 @@ namespace Aaru.Database.Migrations
         {
             migrationBuilder.DropTable("Reports");
 
-            migrationBuilder.CreateTable("Reports",
-                                         table => new
-                                         {
-                                             Id =
-                                                 table.Column<int>(nullable: false)
-                                                      .Annotation("Sqlite:Autoincrement", true),
-                                             USBId            = table.Column<int>(nullable: true),
-                                             FireWireId       = table.Column<int>(nullable: true),
-                                             PCMCIAId         = table.Column<int>(nullable: true),
-                                             CompactFlash     = table.Column<bool>(nullable: false),
-                                             ATAId            = table.Column<int>(nullable: true),
-                                             ATAPIId          = table.Column<int>(nullable: true),
-                                             SCSIId           = table.Column<int>(nullable: true),
-                                             MultiMediaCardId = table.Column<int>(nullable: true),
-                                             SecureDigitalId  = table.Column<int>(nullable: true),
-                                             Manufacturer     = table.Column<string>(nullable: true),
-                                             Model            = table.Column<string>(nullable: true),
-                                             Revision         = table.Column<string>(nullable: true),
-                                             Type             = table.Column<int>(nullable: false)
-                                         }, constraints: table =>
-                                         {
-                                             table.PrimaryKey("PK_Devices", x => x.Id);
-                                             table.ForeignKey("FK_Reports_Ata_ATAId", x => x.ATAId, "Ata", "Id",
-                                                              onDelete: ReferentialAction.Restrict);
-                                             table.ForeignKey("FK_Reports_Ata_ATAPIId", x => x.ATAPIId, "Ata", "Id",
-                                                              onDelete: ReferentialAction.Restrict);
-                                             table.ForeignKey("FK_Reports_FireWire_FireWireId", x => x.FireWireId,
-                                                              "FireWire", "Id", onDelete: ReferentialAction.Restrict);
-                                             table.ForeignKey("FK_Reports_MmcSd_MultiMediaCardId",
-                                                              x => x.MultiMediaCardId, "MmcSd", "Id",
-                                                              onDelete: ReferentialAction.Restrict);
-                                             table.ForeignKey("FK_Reports_Pcmcia_PCMCIAId", x => x.PCMCIAId, "Pcmcia",
-                                                              "Id", onDelete: ReferentialAction.Restrict);
-                                             table.ForeignKey("FK_Reports_Scsi_SCSIId", x => x.SCSIId, "Scsi", "Id",
-                                                              onDelete: ReferentialAction.Restrict);
-                                             table.ForeignKey("FK_Reports_MmcSd_SecureDigitalId",
-                                                              x => x.SecureDigitalId, "MmcSd", "Id",
-                                                              onDelete: ReferentialAction.Restrict);
-                                             table.ForeignKey("FK_Reports_Usb_USBId", x => x.USBId, "Usb", "Id",
-                                                              onDelete: ReferentialAction.Restrict);
-                                         });
+            migrationBuilder.CreateTable("Reports", table => new
+            {
+                Id               = table.Column<int>().Annotation("Sqlite:Autoincrement", true),
+                USBId            = table.Column<int>(nullable: true),
+                FireWireId       = table.Column<int>(nullable: true),
+                PCMCIAId         = table.Column<int>(nullable: true), CompactFlash = table.Column<bool>(),
+                ATAId            = table.Column<int>(nullable: true),
+                ATAPIId          = table.Column<int>(nullable: true),
+                SCSIId           = table.Column<int>(nullable: true),
+                MultiMediaCardId = table.Column<int>(nullable: true),
+                SecureDigitalId  = table.Column<int>(nullable: true),
+                Manufacturer     = table.Column<string>(nullable: true), Model = table.Column<string>(nullable: true),
+                Revision         = table.Column<string>(nullable: true), Type  = table.Column<int>()
+            }, constraints: table =>
+            {
+                table.PrimaryKey("PK_Devices", x => x.Id);
+
+                table.ForeignKey("FK_Reports_Ata_ATAId", x => x.ATAId, "Ata", "Id",
+                                 onDelete: ReferentialAction.Restrict);
+
+                table.ForeignKey("FK_Reports_Ata_ATAPIId", x => x.ATAPIId, "Ata", "Id",
+                                 onDelete: ReferentialAction.Restrict);
+
+                table.ForeignKey("FK_Reports_FireWire_FireWireId", x => x.FireWireId, "FireWire", "Id",
+                                 onDelete: ReferentialAction.Restrict);
+
+                table.ForeignKey("FK_Reports_MmcSd_MultiMediaCardId", x => x.MultiMediaCardId, "MmcSd", "Id",
+                                 onDelete: ReferentialAction.Restrict);
+
+                table.ForeignKey("FK_Reports_Pcmcia_PCMCIAId", x => x.PCMCIAId, "Pcmcia", "Id",
+                                 onDelete: ReferentialAction.Restrict);
+
+                table.ForeignKey("FK_Reports_Scsi_SCSIId", x => x.SCSIId, "Scsi", "Id",
+                                 onDelete: ReferentialAction.Restrict);
+
+                table.ForeignKey("FK_Reports_MmcSd_SecureDigitalId", x => x.SecureDigitalId, "MmcSd", "Id",
+                                 onDelete: ReferentialAction.Restrict);
+
+                table.ForeignKey("FK_Reports_Usb_USBId", x => x.USBId, "Usb", "Id",
+                                 onDelete: ReferentialAction.Restrict);
+            });
 
             migrationBuilder.AddColumn<DateTime>("Created", "Reports", nullable: false,
                                                  defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0,
@@ -57,48 +57,48 @@ namespace Aaru.Database.Migrations
 
             migrationBuilder.AddColumn<bool>("Uploaded", "Reports", nullable: false, defaultValue: false);
 
-            migrationBuilder.CreateTable("Devices",
-                                         table => new
-                                         {
-                                             Id =
-                                                 table.Column<int>(nullable: false)
-                                                      .Annotation("Sqlite:Autoincrement", true),
-                                             USBId            = table.Column<int>(nullable: true),
-                                             FireWireId       = table.Column<int>(nullable: true),
-                                             PCMCIAId         = table.Column<int>(nullable: true),
-                                             CompactFlash     = table.Column<bool>(nullable: false),
-                                             ATAId            = table.Column<int>(nullable: true),
-                                             ATAPIId          = table.Column<int>(nullable: true),
-                                             SCSIId           = table.Column<int>(nullable: true),
-                                             MultiMediaCardId = table.Column<int>(nullable: true),
-                                             SecureDigitalId  = table.Column<int>(nullable: true),
-                                             Manufacturer     = table.Column<string>(nullable: true),
-                                             Model            = table.Column<string>(nullable: true),
-                                             Revision         = table.Column<string>(nullable: true),
-                                             Type             = table.Column<int>(nullable: false),
-                                             LastSynchronized = table.Column<DateTime>(nullable: false)
-                                         }, constraints: table =>
-                                         {
-                                             table.PrimaryKey("PK_Devices", x => x.Id);
-                                             table.ForeignKey("FK_Devices_Ata_ATAId", x => x.ATAId, "Ata", "Id",
-                                                              onDelete: ReferentialAction.Restrict);
-                                             table.ForeignKey("FK_Devices_Ata_ATAPIId", x => x.ATAPIId, "Ata", "Id",
-                                                              onDelete: ReferentialAction.Restrict);
-                                             table.ForeignKey("FK_Devices_FireWire_FireWireId", x => x.FireWireId,
-                                                              "FireWire", "Id", onDelete: ReferentialAction.Restrict);
-                                             table.ForeignKey("FK_Devices_MmcSd_MultiMediaCardId",
-                                                              x => x.MultiMediaCardId, "MmcSd", "Id",
-                                                              onDelete: ReferentialAction.Restrict);
-                                             table.ForeignKey("FK_Devices_Pcmcia_PCMCIAId", x => x.PCMCIAId, "Pcmcia",
-                                                              "Id", onDelete: ReferentialAction.Restrict);
-                                             table.ForeignKey("FK_Devices_Scsi_SCSIId", x => x.SCSIId, "Scsi", "Id",
-                                                              onDelete: ReferentialAction.Restrict);
-                                             table.ForeignKey("FK_Devices_MmcSd_SecureDigitalId",
-                                                              x => x.SecureDigitalId, "MmcSd", "Id",
-                                                              onDelete: ReferentialAction.Restrict);
-                                             table.ForeignKey("FK_Devices_Usb_USBId", x => x.USBId, "Usb", "Id",
-                                                              onDelete: ReferentialAction.Restrict);
-                                         });
+            migrationBuilder.CreateTable("Devices", table => new
+            {
+                Id               = table.Column<int>().Annotation("Sqlite:Autoincrement", true),
+                USBId            = table.Column<int>(nullable: true),
+                FireWireId       = table.Column<int>(nullable: true),
+                PCMCIAId         = table.Column<int>(nullable: true), CompactFlash = table.Column<bool>(),
+                ATAId            = table.Column<int>(nullable: true),
+                ATAPIId          = table.Column<int>(nullable: true),
+                SCSIId           = table.Column<int>(nullable: true),
+                MultiMediaCardId = table.Column<int>(nullable: true),
+                SecureDigitalId  = table.Column<int>(nullable: true),
+                Manufacturer     = table.Column<string>(nullable: true), Model = table.Column<string>(nullable: true),
+                Revision         = table.Column<string>(nullable: true), Type  = table.Column<int>(),
+                LastSynchronized = table.Column<DateTime>()
+            }, constraints: table =>
+            {
+                table.PrimaryKey("PK_Devices", x => x.Id);
+
+                table.ForeignKey("FK_Devices_Ata_ATAId", x => x.ATAId, "Ata", "Id",
+                                 onDelete: ReferentialAction.Restrict);
+
+                table.ForeignKey("FK_Devices_Ata_ATAPIId", x => x.ATAPIId, "Ata", "Id",
+                                 onDelete: ReferentialAction.Restrict);
+
+                table.ForeignKey("FK_Devices_FireWire_FireWireId", x => x.FireWireId, "FireWire", "Id",
+                                 onDelete: ReferentialAction.Restrict);
+
+                table.ForeignKey("FK_Devices_MmcSd_MultiMediaCardId", x => x.MultiMediaCardId, "MmcSd", "Id",
+                                 onDelete: ReferentialAction.Restrict);
+
+                table.ForeignKey("FK_Devices_Pcmcia_PCMCIAId", x => x.PCMCIAId, "Pcmcia", "Id",
+                                 onDelete: ReferentialAction.Restrict);
+
+                table.ForeignKey("FK_Devices_Scsi_SCSIId", x => x.SCSIId, "Scsi", "Id",
+                                 onDelete: ReferentialAction.Restrict);
+
+                table.ForeignKey("FK_Devices_MmcSd_SecureDigitalId", x => x.SecureDigitalId, "MmcSd", "Id",
+                                 onDelete: ReferentialAction.Restrict);
+
+                table.ForeignKey("FK_Devices_Usb_USBId", x => x.USBId, "Usb", "Id",
+                                 onDelete: ReferentialAction.Restrict);
+            });
 
             migrationBuilder.CreateIndex("IX_Devices_ATAId", "Devices", "ATAId");
 
diff --git a/Aaru.Database/Migrations/20181221015906_NameValueStatistics.cs b/Aaru.Database/Migrations/20181221015906_NameValueStatistics.cs
index ef1370ab3..663522618 100644
--- a/Aaru.Database/Migrations/20181221015906_NameValueStatistics.cs
+++ b/Aaru.Database/Migrations/20181221015906_NameValueStatistics.cs
@@ -6,52 +6,50 @@ namespace Aaru.Database.Migrations
     {
         protected override void Up(MigrationBuilder migrationBuilder)
         {
-            migrationBuilder.CreateTable("Commands",
-                                         table => new
-                                         {
-                                             Id = table.Column<int>(nullable: false)
-                                                       .Annotation("Sqlite:Autoincrement", true),
-                                             Name         = table.Column<string>(nullable: true),
-                                             Synchronized = table.Column<bool>(nullable: false)
-                                         }, constraints: table => { table.PrimaryKey("PK_Commands", x => x.Id); });
+            migrationBuilder.CreateTable("Commands", table => new
+            {
+                Id   = table.Column<int>().Annotation("Sqlite:Autoincrement", true),
+                Name = table.Column<string>(nullable: true), Synchronized = table.Column<bool>()
+            }, constraints: table =>
+            {
+                table.PrimaryKey("PK_Commands", x => x.Id);
+            });
 
-            migrationBuilder.CreateTable("Filesystems",
-                                         table => new
-                                         {
-                                             Id = table.Column<int>(nullable: false)
-                                                       .Annotation("Sqlite:Autoincrement", true),
-                                             Name         = table.Column<string>(nullable: true),
-                                             Synchronized = table.Column<bool>(nullable: false)
-                                         },
-                                         constraints: table => { table.PrimaryKey("PK_Filesystems", x => x.Id); });
+            migrationBuilder.CreateTable("Filesystems", table => new
+            {
+                Id   = table.Column<int>().Annotation("Sqlite:Autoincrement", true),
+                Name = table.Column<string>(nullable: true), Synchronized = table.Column<bool>()
+            }, constraints: table =>
+            {
+                table.PrimaryKey("PK_Filesystems", x => x.Id);
+            });
 
-            migrationBuilder.CreateTable("Filters",
-                                         table => new
-                                         {
-                                             Id = table.Column<int>(nullable: false)
-                                                       .Annotation("Sqlite:Autoincrement", true),
-                                             Name         = table.Column<string>(nullable: true),
-                                             Synchronized = table.Column<bool>(nullable: false)
-                                         }, constraints: table => { table.PrimaryKey("PK_Filters", x => x.Id); });
+            migrationBuilder.CreateTable("Filters", table => new
+            {
+                Id   = table.Column<int>().Annotation("Sqlite:Autoincrement", true),
+                Name = table.Column<string>(nullable: true), Synchronized = table.Column<bool>()
+            }, constraints: table =>
+            {
+                table.PrimaryKey("PK_Filters", x => x.Id);
+            });
 
-            migrationBuilder.CreateTable("MediaFormats",
-                                         table => new
-                                         {
-                                             Id = table.Column<int>(nullable: false)
-                                                       .Annotation("Sqlite:Autoincrement", true),
-                                             Name         = table.Column<string>(nullable: true),
-                                             Synchronized = table.Column<bool>(nullable: false)
-                                         },
-                                         constraints: table => { table.PrimaryKey("PK_MediaFormats", x => x.Id); });
+            migrationBuilder.CreateTable("MediaFormats", table => new
+            {
+                Id   = table.Column<int>().Annotation("Sqlite:Autoincrement", true),
+                Name = table.Column<string>(nullable: true), Synchronized = table.Column<bool>()
+            }, constraints: table =>
+            {
+                table.PrimaryKey("PK_MediaFormats", x => x.Id);
+            });
 
-            migrationBuilder.CreateTable("Partitions",
-                                         table => new
-                                         {
-                                             Id = table.Column<int>(nullable: false)
-                                                       .Annotation("Sqlite:Autoincrement", true),
-                                             Name         = table.Column<string>(nullable: true),
-                                             Synchronized = table.Column<bool>(nullable: false)
-                                         }, constraints: table => { table.PrimaryKey("PK_Partitions", x => x.Id); });
+            migrationBuilder.CreateTable("Partitions", table => new
+            {
+                Id   = table.Column<int>().Annotation("Sqlite:Autoincrement", true),
+                Name = table.Column<string>(nullable: true), Synchronized = table.Column<bool>()
+            }, constraints: table =>
+            {
+                table.PrimaryKey("PK_Partitions", x => x.Id);
+            });
         }
 
         protected override void Down(MigrationBuilder migrationBuilder)
diff --git a/Aaru.Database/Migrations/20181221032605_MediaStatistics.cs b/Aaru.Database/Migrations/20181221032605_MediaStatistics.cs
index c978655d7..20b3384b8 100644
--- a/Aaru.Database/Migrations/20181221032605_MediaStatistics.cs
+++ b/Aaru.Database/Migrations/20181221032605_MediaStatistics.cs
@@ -4,22 +4,42 @@ namespace Aaru.Database.Migrations
 {
     public partial class MediaStatistics : Migration
     {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateTable("Medias",
-                                         table => new
-                                         {
-                                             Id = table.Column<int>(nullable: false)
-                                                       .Annotation("Sqlite:Autoincrement", true),
-                                             Type         = table.Column<string>(nullable: true),
-                                             Real         = table.Column<bool>(nullable: false),
-                                             Synchronized = table.Column<bool>(nullable: false)
-                                         }, constraints: table => { table.PrimaryKey("PK_Medias", x => x.Id); });
-        }
+        protected override void Up(MigrationBuilder migrationBuilder) => migrationBuilder.CreateTable("Medias", table =>
+                                                                                                          new
+                                                                                                          {
+                                                                                                              Id =
+                                                                                                                  table.
+                                                                                                                      Column
+                                                                                                                      <int
+                                                                                                                      >().
+                                                                                                                      Annotation("Sqlite:Autoincrement",
+                                                                                                                                 true),
+                                                                                                              Type =
+                                                                                                                  table.
+                                                                                                                      Column
+                                                                                                                      <string
+                                                                                                                      >(nullable
+                                                                                                                        : true),
+                                                                                                              Real =
+                                                                                                                  table.
+                                                                                                                      Column
+                                                                                                                      <bool
+                                                                                                                      >(),
+                                                                                                              Synchronized
+                                                                                                                  = table.
+                                                                                                                      Column
+                                                                                                                      <bool
+                                                                                                                      >()
+                                                                                                          }, constraints
+                                                                                                      : table =>
+                                                                                                      {
+                                                                                                          table.
+                                                                                                              PrimaryKey("PK_Medias",
+                                                                                                                         x =>
+                                                                                                                             x.
+                                                                                                                                 Id);
+                                                                                                      });
 
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable("Medias");
-        }
+        protected override void Down(MigrationBuilder migrationBuilder) => migrationBuilder.DropTable("Medias");
     }
 }
\ No newline at end of file
diff --git a/Aaru.Database/Migrations/20181221034941_SeenDevicesStatistics.cs b/Aaru.Database/Migrations/20181221034941_SeenDevicesStatistics.cs
index 333e729cf..8658da6f0 100644
--- a/Aaru.Database/Migrations/20181221034941_SeenDevicesStatistics.cs
+++ b/Aaru.Database/Migrations/20181221034941_SeenDevicesStatistics.cs
@@ -4,25 +4,52 @@ namespace Aaru.Database.Migrations
 {
     public partial class SeenDevicesStatistics : Migration
     {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateTable("SeenDevices",
-                                         table => new
-                                         {
-                                             Id = table.Column<int>(nullable: false)
-                                                       .Annotation("Sqlite:Autoincrement", true),
-                                             Manufacturer = table.Column<string>(nullable: true),
-                                             Model        = table.Column<string>(nullable: true),
-                                             Revision     = table.Column<string>(nullable: true),
-                                             Bus          = table.Column<string>(nullable: true),
-                                             Synchronized = table.Column<bool>(nullable: false)
-                                         },
-                                         constraints: table => { table.PrimaryKey("PK_SeenDevices", x => x.Id); });
-        }
+        protected override void Up(MigrationBuilder migrationBuilder) => migrationBuilder.CreateTable("SeenDevices",
+                                                                                                      table => new
+                                                                                                      {
+                                                                                                          Id = table.
+                                                                                                               Column<
+                                                                                                                   int
+                                                                                                               >().
+                                                                                                               Annotation("Sqlite:Autoincrement",
+                                                                                                                          true),
+                                                                                                          Manufacturer =
+                                                                                                              table.
+                                                                                                                  Column
+                                                                                                                  <string
+                                                                                                                  >(nullable
+                                                                                                                    : true),
+                                                                                                          Model = table.
+                                                                                                              Column<
+                                                                                                                  string
+                                                                                                              >(nullable
+                                                                                                                : true),
+                                                                                                          Revision =
+                                                                                                              table.
+                                                                                                                  Column
+                                                                                                                  <string
+                                                                                                                  >(nullable
+                                                                                                                    : true),
+                                                                                                          Bus = table.
+                                                                                                              Column<
+                                                                                                                  string
+                                                                                                              >(nullable
+                                                                                                                : true),
+                                                                                                          Synchronized =
+                                                                                                              table.
+                                                                                                                  Column
+                                                                                                                  <bool
+                                                                                                                  >()
+                                                                                                      }, constraints:
+                                                                                                      table =>
+                                                                                                      {
+                                                                                                          table.
+                                                                                                              PrimaryKey("PK_SeenDevices",
+                                                                                                                         x =>
+                                                                                                                             x.
+                                                                                                                                 Id);
+                                                                                                      });
 
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable("SeenDevices");
-        }
+        protected override void Down(MigrationBuilder migrationBuilder) => migrationBuilder.DropTable("SeenDevices");
     }
 }
\ No newline at end of file
diff --git a/Aaru.Database/Migrations/20181221040408_OperatingSystemStatistics.cs b/Aaru.Database/Migrations/20181221040408_OperatingSystemStatistics.cs
index 9804d740d..fcce48769 100644
--- a/Aaru.Database/Migrations/20181221040408_OperatingSystemStatistics.cs
+++ b/Aaru.Database/Migrations/20181221040408_OperatingSystemStatistics.cs
@@ -4,23 +4,18 @@ namespace Aaru.Database.Migrations
 {
     public partial class OperatingSystemStatistics : Migration
     {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateTable("OperatingSystems",
-                                         table => new
-                                         {
-                                             Id = table.Column<int>(nullable: false)
-                                                       .Annotation("Sqlite:Autoincrement", true),
-                                             Name         = table.Column<string>(nullable: true),
-                                             Version      = table.Column<string>(nullable: true),
-                                             Synchronized = table.Column<bool>(nullable: false)
-                                         },
-                                         constraints: table => { table.PrimaryKey("PK_OperatingSystems", x => x.Id); });
-        }
+        protected override void Up(MigrationBuilder migrationBuilder) =>
+            migrationBuilder.CreateTable("OperatingSystems", table => new
+            {
+                Id           = table.Column<int>().Annotation("Sqlite:Autoincrement", true),
+                Name         = table.Column<string>(nullable: true), Version = table.Column<string>(nullable: true),
+                Synchronized = table.Column<bool>()
+            }, constraints: table =>
+            {
+                table.PrimaryKey("PK_OperatingSystems", x => x.Id);
+            });
 
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
+        protected override void Down(MigrationBuilder migrationBuilder) =>
             migrationBuilder.DropTable("OperatingSystems");
-        }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Database/Migrations/20181221041242_VersionStatistics.cs b/Aaru.Database/Migrations/20181221041242_VersionStatistics.cs
index ed9d86b45..9612ff7cf 100644
--- a/Aaru.Database/Migrations/20181221041242_VersionStatistics.cs
+++ b/Aaru.Database/Migrations/20181221041242_VersionStatistics.cs
@@ -4,21 +4,35 @@ namespace Aaru.Database.Migrations
 {
     public partial class VersionStatistics : Migration
     {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateTable("Versions",
-                                         table => new
-                                         {
-                                             Id = table.Column<int>(nullable: false)
-                                                       .Annotation("Sqlite:Autoincrement", true),
-                                             Value        = table.Column<string>(nullable: true),
-                                             Synchronized = table.Column<bool>(nullable: false)
-                                         }, constraints: table => { table.PrimaryKey("PK_Versions", x => x.Id); });
-        }
+        protected override void Up(MigrationBuilder migrationBuilder) => migrationBuilder.CreateTable("Versions",
+                                                                                                      table => new
+                                                                                                      {
+                                                                                                          Id = table.
+                                                                                                               Column<
+                                                                                                                   int
+                                                                                                               >().
+                                                                                                               Annotation("Sqlite:Autoincrement",
+                                                                                                                          true),
+                                                                                                          Value = table.
+                                                                                                              Column<
+                                                                                                                  string
+                                                                                                              >(nullable
+                                                                                                                : true),
+                                                                                                          Synchronized =
+                                                                                                              table.
+                                                                                                                  Column
+                                                                                                                  <bool
+                                                                                                                  >()
+                                                                                                      }, constraints:
+                                                                                                      table =>
+                                                                                                      {
+                                                                                                          table.
+                                                                                                              PrimaryKey("PK_Versions",
+                                                                                                                         x =>
+                                                                                                                             x.
+                                                                                                                                 Id);
+                                                                                                      });
 
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable("Versions");
-        }
+        protected override void Down(MigrationBuilder migrationBuilder) => migrationBuilder.DropTable("Versions");
     }
 }
\ No newline at end of file
diff --git a/Aaru.Database/Migrations/20181223214411_UseBinaryDataForIdentifyInquiryAndModesInReports.cs b/Aaru.Database/Migrations/20181223214411_UseBinaryDataForIdentifyInquiryAndModesInReports.cs
index 4b46e3fda..333e27342 100644
--- a/Aaru.Database/Migrations/20181223214411_UseBinaryDataForIdentifyInquiryAndModesInReports.cs
+++ b/Aaru.Database/Migrations/20181223214411_UseBinaryDataForIdentifyInquiryAndModesInReports.cs
@@ -15,66 +15,63 @@ namespace Aaru.Database.Migrations
         {
             migrationBuilder.DropColumn("ModeSense2AData", "Mmc");
 
-            migrationBuilder.CreateTable("ModePage_2A",
-                                         table => new
-                                         {
-                                             Id =
-                                                 table.Column<int>(nullable: false)
-                                                      .Annotation("Sqlite:Autoincrement", true),
-                                             AccurateCDDA              = table.Column<bool>(nullable: false),
-                                             AudioPlay                 = table.Column<bool>(nullable: false),
-                                             BCK                       = table.Column<bool>(nullable: false),
-                                             BUF                       = table.Column<bool>(nullable: false),
-                                             BufferSize                = table.Column<ushort>(nullable: false),
-                                             C2Pointer                 = table.Column<bool>(nullable: false),
-                                             CDDACommand               = table.Column<bool>(nullable: false),
-                                             CMRSupported              = table.Column<ushort>(nullable: false),
-                                             Composite                 = table.Column<bool>(nullable: false),
-                                             CurrentSpeed              = table.Column<ushort>(nullable: false),
-                                             CurrentWriteSpeed         = table.Column<ushort>(nullable: false),
-                                             CurrentWriteSpeedSelected = table.Column<ushort>(nullable: false),
-                                             DeinterlaveSubchannel     = table.Column<bool>(nullable: false),
-                                             DigitalPort1              = table.Column<bool>(nullable: false),
-                                             DigitalPort2              = table.Column<bool>(nullable: false),
-                                             Eject                     = table.Column<bool>(nullable: false),
-                                             ISRC                      = table.Column<bool>(nullable: false),
-                                             LSBF                      = table.Column<bool>(nullable: false),
-                                             LeadInPW                  = table.Column<bool>(nullable: false),
-                                             Length                    = table.Column<byte>(nullable: false),
-                                             LoadingMechanism          = table.Column<byte>(nullable: false),
-                                             Lock                      = table.Column<bool>(nullable: false),
-                                             LockState                 = table.Column<bool>(nullable: false),
-                                             MaxWriteSpeed             = table.Column<ushort>(nullable: false),
-                                             MaximumSpeed              = table.Column<ushort>(nullable: false),
-                                             Method2                   = table.Column<bool>(nullable: false),
-                                             Mode2Form1                = table.Column<bool>(nullable: false),
-                                             Mode2Form2                = table.Column<bool>(nullable: false),
-                                             MultiSession              = table.Column<bool>(nullable: false),
-                                             PS                        = table.Column<bool>(nullable: false),
-                                             PreventJumper             = table.Column<bool>(nullable: false),
-                                             RCK                       = table.Column<bool>(nullable: false),
-                                             ReadBarcode               = table.Column<bool>(nullable: false),
-                                             ReadCDR                   = table.Column<bool>(nullable: false),
-                                             ReadCDRW                  = table.Column<bool>(nullable: false),
-                                             ReadDVDR                  = table.Column<bool>(nullable: false),
-                                             ReadDVDRAM                = table.Column<bool>(nullable: false),
-                                             ReadDVDROM                = table.Column<bool>(nullable: false),
-                                             RotationControlSelected   = table.Column<byte>(nullable: false),
-                                             SCC                       = table.Column<bool>(nullable: false),
-                                             SDP                       = table.Column<bool>(nullable: false),
-                                             SSS                       = table.Column<bool>(nullable: false),
-                                             SeparateChannelMute       = table.Column<bool>(nullable: false),
-                                             SeparateChannelVolume     = table.Column<bool>(nullable: false),
-                                             Subchannel                = table.Column<bool>(nullable: false),
-                                             SupportedVolumeLevels     = table.Column<ushort>(nullable: false),
-                                             TestWrite                 = table.Column<bool>(nullable: false),
-                                             UPC                       = table.Column<bool>(nullable: false),
-                                             WriteCDR                  = table.Column<bool>(nullable: false),
-                                             WriteCDRW                 = table.Column<bool>(nullable: false),
-                                             WriteDVDR                 = table.Column<bool>(nullable: false),
-                                             WriteDVDRAM               = table.Column<bool>(nullable: false)
-                                         },
-                                         constraints: table => { table.PrimaryKey("PK_ModePage_2A", x => x.Id); });
+            migrationBuilder.CreateTable("ModePage_2A", table => new
+            {
+                Id                        = table.Column<int>().Annotation("Sqlite:Autoincrement", true),
+                AccurateCDDA              = table.Column<bool>(),
+                AudioPlay                 = table.Column<bool>(),
+                BCK                       = table.Column<bool>(), BUF = table.Column<bool>(),
+                BufferSize                = table.Column<ushort>(),
+                C2Pointer                 = table.Column<bool>(),
+                CDDACommand               = table.Column<bool>(),
+                CMRSupported              = table.Column<ushort>(),
+                Composite                 = table.Column<bool>(),
+                CurrentSpeed              = table.Column<ushort>(),
+                CurrentWriteSpeed         = table.Column<ushort>(),
+                CurrentWriteSpeedSelected = table.Column<ushort>(),
+                DeinterlaveSubchannel     = table.Column<bool>(),
+                DigitalPort1              = table.Column<bool>(),
+                DigitalPort2              = table.Column<bool>(),
+                Eject                     = table.Column<bool>(),
+                ISRC                      = table.Column<bool>(),
+                LSBF                      = table.Column<bool>(),
+                LeadInPW                  = table.Column<bool>(),
+                Length                    = table.Column<byte>(),
+                LoadingMechanism          = table.Column<byte>(),
+                Lock                      = table.Column<bool>(),
+                LockState                 = table.Column<bool>(),
+                MaxWriteSpeed             = table.Column<ushort>(),
+                MaximumSpeed              = table.Column<ushort>(),
+                Method2                   = table.Column<bool>(),
+                Mode2Form1                = table.Column<bool>(),
+                Mode2Form2                = table.Column<bool>(),
+                MultiSession              = table.Column<bool>(),
+                PS                        = table.Column<bool>(),
+                PreventJumper             = table.Column<bool>(),
+                RCK                       = table.Column<bool>(),
+                ReadBarcode               = table.Column<bool>(),
+                ReadCDR                   = table.Column<bool>(),
+                ReadCDRW                  = table.Column<bool>(),
+                ReadDVDR                  = table.Column<bool>(),
+                ReadDVDRAM                = table.Column<bool>(),
+                ReadDVDROM                = table.Column<bool>(),
+                RotationControlSelected   = table.Column<byte>(),
+                SCC                       = table.Column<bool>(),
+                SDP                       = table.Column<bool>(), SSS = table.Column<bool>(),
+                SeparateChannelMute       = table.Column<bool>(),
+                SeparateChannelVolume     = table.Column<bool>(),
+                Subchannel                = table.Column<bool>(),
+                SupportedVolumeLevels     = table.Column<ushort>(),
+                TestWrite                 = table.Column<bool>(),
+                UPC                       = table.Column<bool>(),
+                WriteCDR                  = table.Column<bool>(),
+                WriteCDRW                 = table.Column<bool>(),
+                WriteDVDR                 = table.Column<bool>(),
+                WriteDVDRAM               = table.Column<bool>()
+            }, constraints: table =>
+            {
+                table.PrimaryKey("PK_ModePage_2A", x => x.Id);
+            });
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Database/Migrations/20181224044809_StoreUsbIdsInDatabase.cs b/Aaru.Database/Migrations/20181224044809_StoreUsbIdsInDatabase.cs
index f0cfc4165..5f33df98b 100644
--- a/Aaru.Database/Migrations/20181224044809_StoreUsbIdsInDatabase.cs
+++ b/Aaru.Database/Migrations/20181224044809_StoreUsbIdsInDatabase.cs
@@ -7,31 +7,30 @@ namespace Aaru.Database.Migrations
     {
         protected override void Up(MigrationBuilder migrationBuilder)
         {
-            migrationBuilder.CreateTable("UsbVendors",
-                                         table => new
-                                         {
-                                             Id           = table.Column<ushort>(nullable: false),
-                                             Vendor       = table.Column<string>(nullable: true),
-                                             AddedWhen    = table.Column<DateTime>(nullable: false),
-                                             ModifiedWhen = table.Column<DateTime>(nullable: false)
-                                         }, constraints: table => { table.PrimaryKey("PK_UsbVendors", x => x.Id); });
+            migrationBuilder.CreateTable("UsbVendors", table => new
+            {
+                Id        = table.Column<ushort>(), Vendor         = table.Column<string>(nullable: true),
+                AddedWhen = table.Column<DateTime>(), ModifiedWhen = table.Column<DateTime>()
+            }, constraints: table =>
+            {
+                table.PrimaryKey("PK_UsbVendors", x => x.Id);
+            });
 
-            migrationBuilder.CreateTable("UsbProducts",
-                                         table => new
-                                         {
-                                             Id = table.Column<int>(nullable: false)
-                                                       .Annotation("Sqlite:Autoincrement", true),
-                                             ProductId    = table.Column<ushort>(nullable: false),
-                                             Product      = table.Column<string>(nullable: true),
-                                             AddedWhen    = table.Column<DateTime>(nullable: false),
-                                             ModifiedWhen = table.Column<DateTime>(nullable: false),
-                                             VendorId     = table.Column<ushort>(nullable: false)
-                                         }, constraints: table =>
-                                         {
-                                             table.PrimaryKey("PK_UsbProducts", x => x.Id);
-                                             table.ForeignKey("FK_UsbProducts_UsbVendors_VendorId", x => x.VendorId,
-                                                              "UsbVendors", "Id", onDelete: ReferentialAction.Cascade);
-                                         });
+            migrationBuilder.CreateTable("UsbProducts", table => new
+            {
+                Id           = table.Column<int>().Annotation("Sqlite:Autoincrement", true),
+                ProductId    = table.Column<ushort>(),
+                Product      = table.Column<string>(nullable: true),
+                AddedWhen    = table.Column<DateTime>(),
+                ModifiedWhen = table.Column<DateTime>(),
+                VendorId     = table.Column<ushort>()
+            }, constraints: table =>
+            {
+                table.PrimaryKey("PK_UsbProducts", x => x.Id);
+
+                table.ForeignKey("FK_UsbProducts_UsbVendors_VendorId", x => x.VendorId, "UsbVendors", "Id",
+                                 onDelete: ReferentialAction.Cascade);
+            });
 
             migrationBuilder.CreateIndex("IX_UsbProducts_VendorId", "UsbProducts", "VendorId");
         }
diff --git a/Aaru.Database/Migrations/20181224172147_FixUsbIdsAndIndexes.cs b/Aaru.Database/Migrations/20181224172147_FixUsbIdsAndIndexes.cs
index 1effb0785..6469eda72 100644
--- a/Aaru.Database/Migrations/20181224172147_FixUsbIdsAndIndexes.cs
+++ b/Aaru.Database/Migrations/20181224172147_FixUsbIdsAndIndexes.cs
@@ -6,16 +6,16 @@ namespace Aaru.Database.Migrations
     {
         protected override void Up(MigrationBuilder migrationBuilder)
         {
-            migrationBuilder.CreateIndex("IX_UsbProducts_ProductId",    "UsbProducts", "ProductId");
+            migrationBuilder.CreateIndex("IX_UsbProducts_ProductId", "UsbProducts", "ProductId");
             migrationBuilder.CreateIndex("IX_UsbProducts_ModifiedWhen", "UsbProducts", "ModifiedWhen");
-            migrationBuilder.CreateIndex("IX_UsbVendors_ModifiedWhen",  "UsbVendors",  "ModifiedWhen");
+            migrationBuilder.CreateIndex("IX_UsbVendors_ModifiedWhen", "UsbVendors", "ModifiedWhen");
         }
 
         protected override void Down(MigrationBuilder migrationBuilder)
         {
-            migrationBuilder.DropIndex("IX_UsbProducts_ProductId",    "UsbProducts");
+            migrationBuilder.DropIndex("IX_UsbProducts_ProductId", "UsbProducts");
             migrationBuilder.DropIndex("IX_UsbProducts_ModifiedWhen", "UsbProducts");
-            migrationBuilder.DropIndex("IX_UsbVendors_ModifiedWhen",  "UsbVendors");
+            migrationBuilder.DropIndex("IX_UsbVendors_ModifiedWhen", "UsbVendors");
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Database/Migrations/20181225002740_AddCdOffsets.cs b/Aaru.Database/Migrations/20181225002740_AddCdOffsets.cs
index 79a0bef92..610d69c68 100644
--- a/Aaru.Database/Migrations/20181225002740_AddCdOffsets.cs
+++ b/Aaru.Database/Migrations/20181225002740_AddCdOffsets.cs
@@ -5,26 +5,61 @@ namespace Aaru.Database.Migrations
 {
     public partial class AddCdOffsets : Migration
     {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateTable("CdOffsets",
-                                         table => new
-                                         {
-                                             Manufacturer = table.Column<string>(nullable: true),
-                                             Model        = table.Column<string>(nullable: true),
-                                             Offset       = table.Column<short>(nullable: false),
-                                             Submissions  = table.Column<int>(nullable: false),
-                                             Agreement    = table.Column<float>(nullable: false),
-                                             Id = table.Column<int>(nullable: false)
-                                                       .Annotation("Sqlite:Autoincrement", true),
-                                             AddedWhen    = table.Column<DateTime>(nullable: false),
-                                             ModifiedWhen = table.Column<DateTime>(nullable: false)
-                                         }, constraints: table => { table.PrimaryKey("PK_CdOffsets", x => x.Id); });
-        }
+        protected override void Up(MigrationBuilder migrationBuilder) => migrationBuilder.CreateTable("CdOffsets",
+                                                                                                      table => new
+                                                                                                      {
+                                                                                                          Manufacturer =
+                                                                                                              table.
+                                                                                                                  Column
+                                                                                                                  <string
+                                                                                                                  >(nullable
+                                                                                                                    : true),
+                                                                                                          Model = table.
+                                                                                                              Column<
+                                                                                                                  string
+                                                                                                              >(nullable
+                                                                                                                : true),
+                                                                                                          Offset =
+                                                                                                              table.
+                                                                                                                  Column
+                                                                                                                  <short
+                                                                                                                  >(),
+                                                                                                          Submissions =
+                                                                                                              table.
+                                                                                                                  Column
+                                                                                                                  <int
+                                                                                                                  >(),
+                                                                                                          Agreement =
+                                                                                                              table.
+                                                                                                                  Column
+                                                                                                                  <float
+                                                                                                                  >(),
+                                                                                                          Id = table.
+                                                                                                               Column<
+                                                                                                                   int
+                                                                                                               >().
+                                                                                                               Annotation("Sqlite:Autoincrement",
+                                                                                                                          true),
+                                                                                                          AddedWhen =
+                                                                                                              table.
+                                                                                                                  Column
+                                                                                                                  <DateTime
+                                                                                                                  >(),
+                                                                                                          ModifiedWhen =
+                                                                                                              table.
+                                                                                                                  Column
+                                                                                                                  <DateTime
+                                                                                                                  >()
+                                                                                                      }, constraints:
+                                                                                                      table =>
+                                                                                                      {
+                                                                                                          table.
+                                                                                                              PrimaryKey("PK_CdOffsets",
+                                                                                                                         x =>
+                                                                                                                             x.
+                                                                                                                                 Id);
+                                                                                                      });
 
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable("CdOffsets");
-        }
+        protected override void Down(MigrationBuilder migrationBuilder) => migrationBuilder.DropTable("CdOffsets");
     }
 }
\ No newline at end of file
diff --git a/Aaru.Database/Migrations/20190102230036_AddOptimalReadMultipleCount.cs b/Aaru.Database/Migrations/20190102230036_AddOptimalReadMultipleCount.cs
index 965859d77..3f630b893 100644
--- a/Aaru.Database/Migrations/20190102230036_AddOptimalReadMultipleCount.cs
+++ b/Aaru.Database/Migrations/20190102230036_AddOptimalReadMultipleCount.cs
@@ -4,14 +4,10 @@ namespace Aaru.Database.Migrations
 {
     public partial class AddOptimalReadMultipleCount : Migration
     {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
+        protected override void Up(MigrationBuilder migrationBuilder) =>
             migrationBuilder.AddColumn<int>("OptimalMultipleSectorsRead", "Devices", nullable: false, defaultValue: 0);
-        }
 
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
+        protected override void Down(MigrationBuilder migrationBuilder) =>
             migrationBuilder.DropColumn("OptimalMultipleSectorsRead", "Devices");
-        }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Database/Migrations/20190525183723_IdForDensityCode.cs b/Aaru.Database/Migrations/20190525183723_IdForDensityCode.cs
index cda05caef..52eb75e53 100644
--- a/Aaru.Database/Migrations/20190525183723_IdForDensityCode.cs
+++ b/Aaru.Database/Migrations/20190525183723_IdForDensityCode.cs
@@ -8,23 +8,21 @@ namespace Aaru.Database.Migrations
         {
             migrationBuilder.RenameTable("DensityCode", newName: "DensityCode_old");
 
-            migrationBuilder.CreateTable("DensityCode",
-                                         table => new
-                                         {
-                                             Code                = table.Column<int>(nullable: false, defaultValue: 0),
-                                             SscSupportedMediaId = table.Column<int>(nullable: true),
-                                             Id = table.Column<int>()
-                                                                        .Annotation("Sqlite:Autoincrement", true)
-                                         }, constraints: table =>
-                                         {
-                                             table.PrimaryKey("PK_DensityCode", x => x.Id);
-                                             table.ForeignKey("FK_DensityCode_SscSupportedMedia_SscSupportedMediaId",
-                                                              x => x.SscSupportedMediaId, "SscSupportedMedia", "Id",
-                                                              onDelete: ReferentialAction.Restrict);
-                                         });
+            migrationBuilder.CreateTable("DensityCode", table => new
+            {
+                Code                = table.Column<int>(nullable: false, defaultValue: 0),
+                SscSupportedMediaId = table.Column<int>(nullable: true),
+                Id                  = table.Column<int>().Annotation("Sqlite:Autoincrement", true)
+            }, constraints: table =>
+            {
+                table.PrimaryKey("PK_DensityCode", x => x.Id);
 
-            migrationBuilder
-               .Sql("INSERT INTO DensityCode (Code, SscSupportedMediaId) SELECT Code, SscSupportedMediaId FROM DensityCode_old");
+                table.ForeignKey("FK_DensityCode_SscSupportedMedia_SscSupportedMediaId", x => x.SscSupportedMediaId,
+                                 "SscSupportedMedia", "Id", onDelete: ReferentialAction.Restrict);
+            });
+
+            migrationBuilder.
+                Sql("INSERT INTO DensityCode (Code, SscSupportedMediaId) SELECT Code, SscSupportedMediaId FROM DensityCode_old");
 
             migrationBuilder.DropTable("DensityCode_old");
         }
@@ -33,22 +31,20 @@ namespace Aaru.Database.Migrations
         {
             migrationBuilder.RenameTable("DensityCode", newName: "DensityCode_old");
 
-            migrationBuilder.CreateTable("DensityCode",
-                                         table => new
-                                         {
-                                             Code = table.Column<int>()
-                                                                        .Annotation("Sqlite:Autoincrement", true),
-                                             SscSupportedMediaId = table.Column<int>(nullable: true)
-                                         }, constraints: table =>
-                                         {
-                                             table.PrimaryKey("PK_DensityCode", x => x.Code);
-                                             table.ForeignKey("FK_DensityCode_SscSupportedMedia_SscSupportedMediaId",
-                                                              x => x.SscSupportedMediaId, "SscSupportedMedia", "Id",
-                                                              onDelete: ReferentialAction.Restrict);
-                                         });
+            migrationBuilder.CreateTable("DensityCode", table => new
+            {
+                Code                = table.Column<int>().Annotation("Sqlite:Autoincrement", true),
+                SscSupportedMediaId = table.Column<int>(nullable: true)
+            }, constraints: table =>
+            {
+                table.PrimaryKey("PK_DensityCode", x => x.Code);
 
-            migrationBuilder
-               .Sql("INSERT INTO DensityCode (Code, SscSupportedMediaId) SELECT Code, SscSupportedMediaId FROM DensityCode_old");
+                table.ForeignKey("FK_DensityCode_SscSupportedMedia_SscSupportedMediaId", x => x.SscSupportedMediaId,
+                                 "SscSupportedMedia", "Id", onDelete: ReferentialAction.Restrict);
+            });
+
+            migrationBuilder.
+                Sql("INSERT INTO DensityCode (Code, SscSupportedMediaId) SELECT Code, SscSupportedMediaId FROM DensityCode_old");
 
             migrationBuilder.DropTable("DensityCode_old");
         }
diff --git a/Aaru.Database/Migrations/20191207183522_AddNameCountModel.cs b/Aaru.Database/Migrations/20191207183522_AddNameCountModel.cs
index 69c273dd0..38964a13b 100644
--- a/Aaru.Database/Migrations/20191207183522_AddNameCountModel.cs
+++ b/Aaru.Database/Migrations/20191207183522_AddNameCountModel.cs
@@ -4,20 +4,10 @@ namespace Aaru.Database.Migrations
 {
     public partial class AddNameCountModel : Migration
     {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.RenameColumn(
-                name: "Value",
-                table: "Versions",
-                newName: "Name");
-        }
+        protected override void Up(MigrationBuilder migrationBuilder) =>
+            migrationBuilder.RenameColumn("Value", "Versions", "Name");
 
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.RenameColumn(
-                name: "Name",
-                table: "Versions",
-                newName: "Value");
-        }
+        protected override void Down(MigrationBuilder migrationBuilder) =>
+            migrationBuilder.RenameColumn("Name", "Versions", "Value");
     }
-}
+}
\ No newline at end of file
diff --git a/Aaru.Database/Migrations/AaruContextModelSnapshot.cs b/Aaru.Database/Migrations/AaruContextModelSnapshot.cs
index ca179cda4..dc5131d00 100644
--- a/Aaru.Database/Migrations/AaruContextModelSnapshot.cs
+++ b/Aaru.Database/Migrations/AaruContextModelSnapshot.cs
@@ -1337,8 +1337,7 @@ namespace Aaru.Database.Migrations
 
             modelBuilder.Entity("Aaru.CommonTypes.Metadata.BlockDescriptor", b =>
             {
-                b.HasOne("Aaru.CommonTypes.Metadata.ScsiMode").WithMany("BlockDescriptors").
-                  HasForeignKey("ScsiModeId");
+                b.HasOne("Aaru.CommonTypes.Metadata.ScsiMode").WithMany("BlockDescriptors").HasForeignKey("ScsiModeId");
             });
 
             modelBuilder.Entity("Aaru.CommonTypes.Metadata.DensityCode", b =>
@@ -1349,14 +1348,12 @@ namespace Aaru.Database.Migrations
 
             modelBuilder.Entity("Aaru.CommonTypes.Metadata.Mmc", b =>
             {
-                b.HasOne("Aaru.CommonTypes.Metadata.MmcFeatures", "Features").WithMany().
-                  HasForeignKey("FeaturesId");
+                b.HasOne("Aaru.CommonTypes.Metadata.MmcFeatures", "Features").WithMany().HasForeignKey("FeaturesId");
             });
 
             modelBuilder.Entity("Aaru.CommonTypes.Metadata.Scsi", b =>
             {
-                b.HasOne("Aaru.CommonTypes.Metadata.ScsiMode", "ModeSense").WithMany().
-                  HasForeignKey("ModeSenseId");
+                b.HasOne("Aaru.CommonTypes.Metadata.ScsiMode", "ModeSense").WithMany().HasForeignKey("ModeSenseId");
 
                 b.HasOne("Aaru.CommonTypes.Metadata.Mmc", "MultiMediaDevice").WithMany().
                   HasForeignKey("MultiMediaDeviceId");
@@ -1372,14 +1369,12 @@ namespace Aaru.Database.Migrations
             {
                 b.HasOne("Aaru.CommonTypes.Metadata.Scsi").WithMany("EVPDPages").HasForeignKey("ScsiId");
 
-                b.HasOne("Aaru.CommonTypes.Metadata.ScsiMode").WithMany("ModePages").
-                  HasForeignKey("ScsiModeId");
+                b.HasOne("Aaru.CommonTypes.Metadata.ScsiMode").WithMany("ModePages").HasForeignKey("ScsiModeId");
             });
 
             modelBuilder.Entity("Aaru.CommonTypes.Metadata.SscSupportedMedia", b =>
             {
-                b.HasOne("Aaru.CommonTypes.Metadata.Ssc").WithMany("SupportedMediaTypes").
-                  HasForeignKey("SscId");
+                b.HasOne("Aaru.CommonTypes.Metadata.Ssc").WithMany("SupportedMediaTypes").HasForeignKey("SscId");
 
                 b.HasOne("Aaru.CommonTypes.Metadata.TestedSequentialMedia").WithMany("SupportedMediaTypes").
                   HasForeignKey("TestedSequentialMediaId");
@@ -1387,8 +1382,7 @@ namespace Aaru.Database.Migrations
 
             modelBuilder.Entity("Aaru.CommonTypes.Metadata.SupportedDensity", b =>
             {
-                b.HasOne("Aaru.CommonTypes.Metadata.Ssc").WithMany("SupportedDensities").
-                  HasForeignKey("SscId");
+                b.HasOne("Aaru.CommonTypes.Metadata.Ssc").WithMany("SupportedDensities").HasForeignKey("SscId");
 
                 b.HasOne("Aaru.CommonTypes.Metadata.TestedSequentialMedia").WithMany("SupportedDensities").
                   HasForeignKey("TestedSequentialMediaId");
@@ -1400,8 +1394,7 @@ namespace Aaru.Database.Migrations
 
                 b.HasOne("Aaru.CommonTypes.Metadata.Chs", "CHS").WithMany().HasForeignKey("CHSId");
 
-                b.HasOne("Aaru.CommonTypes.Metadata.Chs", "CurrentCHS").WithMany().
-                  HasForeignKey("CurrentCHSId");
+                b.HasOne("Aaru.CommonTypes.Metadata.Chs", "CurrentCHS").WithMany().HasForeignKey("CurrentCHSId");
 
                 b.HasOne("Aaru.CommonTypes.Metadata.Mmc").WithMany("TestedMedia").HasForeignKey("MmcId");
 
@@ -1419,8 +1412,7 @@ namespace Aaru.Database.Migrations
 
                 b.HasOne("Aaru.CommonTypes.Metadata.Ata", "ATAPI").WithMany().HasForeignKey("ATAPIId");
 
-                b.HasOne("Aaru.CommonTypes.Metadata.FireWire", "FireWire").WithMany().
-                  HasForeignKey("FireWireId");
+                b.HasOne("Aaru.CommonTypes.Metadata.FireWire", "FireWire").WithMany().HasForeignKey("FireWireId");
 
                 b.HasOne("Aaru.CommonTypes.Metadata.MmcSd", "MultiMediaCard").WithMany().
                   HasForeignKey("MultiMediaCardId");
@@ -1441,8 +1433,7 @@ namespace Aaru.Database.Migrations
 
                 b.HasOne("Aaru.CommonTypes.Metadata.Ata", "ATAPI").WithMany().HasForeignKey("ATAPIId");
 
-                b.HasOne("Aaru.CommonTypes.Metadata.FireWire", "FireWire").WithMany().
-                  HasForeignKey("FireWireId");
+                b.HasOne("Aaru.CommonTypes.Metadata.FireWire", "FireWire").WithMany().HasForeignKey("FireWireId");
 
                 b.HasOne("Aaru.CommonTypes.Metadata.MmcSd", "MultiMediaCard").WithMany().
                   HasForeignKey("MultiMediaCardId");
@@ -1459,8 +1450,8 @@ namespace Aaru.Database.Migrations
 
             modelBuilder.Entity("Aaru.Database.Models.UsbProduct", b =>
             {
-                b.HasOne("Aaru.Database.Models.UsbVendor", "Vendor").WithMany("Products").
-                  HasForeignKey("VendorId").OnDelete(DeleteBehavior.Cascade);
+                b.HasOne("Aaru.Database.Models.UsbVendor", "Vendor").WithMany("Products").HasForeignKey("VendorId").
+                  OnDelete(DeleteBehavior.Cascade);
             });
             #pragma warning restore 612, 618
         }
diff --git a/Aaru.Database/Models/CdOffset.cs b/Aaru.Database/Models/CdOffset.cs
index 65cbc72ea..a6973ab7b 100644
--- a/Aaru.Database/Models/CdOffset.cs
+++ b/Aaru.Database/Models/CdOffset.cs
@@ -37,7 +37,7 @@ namespace Aaru.Database.Models
 {
     public class CdOffset : CommonTypes.Metadata.CdOffset
     {
-        public CdOffset() { }
+        public CdOffset() {}
 
         public CdOffset(string manufacturer, string model, short offset, int submissions, float agreement)
         {
diff --git a/Aaru.Database/Models/Command.cs b/Aaru.Database/Models/Command.cs
index 97da80b86..0522f16f3 100644
--- a/Aaru.Database/Models/Command.cs
+++ b/Aaru.Database/Models/Command.cs
@@ -32,5 +32,5 @@
 
 namespace Aaru.Database.Models
 {
-    public class Command : NameCountModel<int> { }
+    public class Command : NameCountModel<int> {}
 }
\ No newline at end of file
diff --git a/Aaru.Database/Models/Device.cs b/Aaru.Database/Models/Device.cs
index 99d3082ea..66d5ce2c8 100644
--- a/Aaru.Database/Models/Device.cs
+++ b/Aaru.Database/Models/Device.cs
@@ -38,10 +38,7 @@ namespace Aaru.Database.Models
 {
     public class Device : DeviceReportV2
     {
-        public Device()
-        {
-            LastSynchronized = DateTime.UtcNow;
-        }
+        public Device() => LastSynchronized = DateTime.UtcNow;
 
         public Device(DeviceReportV2 report)
         {
diff --git a/Aaru.Database/Models/Filesystem.cs b/Aaru.Database/Models/Filesystem.cs
index f5c4614ff..45e05b046 100644
--- a/Aaru.Database/Models/Filesystem.cs
+++ b/Aaru.Database/Models/Filesystem.cs
@@ -32,5 +32,5 @@
 
 namespace Aaru.Database.Models
 {
-    public class Filesystem : NameCountModel<int> { }
+    public class Filesystem : NameCountModel<int> {}
 }
\ No newline at end of file
diff --git a/Aaru.Database/Models/Filter.cs b/Aaru.Database/Models/Filter.cs
index 97548666b..20b8e56bf 100644
--- a/Aaru.Database/Models/Filter.cs
+++ b/Aaru.Database/Models/Filter.cs
@@ -32,5 +32,5 @@
 
 namespace Aaru.Database.Models
 {
-    public class Filter : NameCountModel<int> { }
+    public class Filter : NameCountModel<int> {}
 }
\ No newline at end of file
diff --git a/Aaru.Database/Models/MediaFormat.cs b/Aaru.Database/Models/MediaFormat.cs
index 72ae8fcdc..d85f0f970 100644
--- a/Aaru.Database/Models/MediaFormat.cs
+++ b/Aaru.Database/Models/MediaFormat.cs
@@ -32,5 +32,5 @@
 
 namespace Aaru.Database.Models
 {
-    public class MediaFormat : NameCountModel<int> { }
+    public class MediaFormat : NameCountModel<int> {}
 }
\ No newline at end of file
diff --git a/Aaru.Database/Models/OperatingSystem.cs b/Aaru.Database/Models/OperatingSystem.cs
index 8533b0f25..4ebecdb58 100644
--- a/Aaru.Database/Models/OperatingSystem.cs
+++ b/Aaru.Database/Models/OperatingSystem.cs
@@ -32,5 +32,5 @@
 
 namespace Aaru.Database.Models
 {
-    public class OperatingSystem : BaseOperatingSystem { }
+    public class OperatingSystem : BaseOperatingSystem {}
 }
\ No newline at end of file
diff --git a/Aaru.Database/Models/Partition.cs b/Aaru.Database/Models/Partition.cs
index 8d73297fd..a1076b913 100644
--- a/Aaru.Database/Models/Partition.cs
+++ b/Aaru.Database/Models/Partition.cs
@@ -32,5 +32,5 @@
 
 namespace Aaru.Database.Models
 {
-    public class Partition : NameCountModel<int> { }
+    public class Partition : NameCountModel<int> {}
 }
\ No newline at end of file
diff --git a/Aaru.Database/Models/RemoteApplication.cs b/Aaru.Database/Models/RemoteApplication.cs
index 109e24bb2..8afe3372d 100644
--- a/Aaru.Database/Models/RemoteApplication.cs
+++ b/Aaru.Database/Models/RemoteApplication.cs
@@ -1,4 +1,4 @@
 namespace Aaru.Database.Models
 {
-    public class RemoteApplication : BaseOperatingSystem { }
+    public class RemoteApplication : BaseOperatingSystem {}
 }
\ No newline at end of file
diff --git a/Aaru.Database/Models/RemoteArchitecture.cs b/Aaru.Database/Models/RemoteArchitecture.cs
index db456ba2b..7d48cd643 100644
--- a/Aaru.Database/Models/RemoteArchitecture.cs
+++ b/Aaru.Database/Models/RemoteArchitecture.cs
@@ -1,4 +1,4 @@
 namespace Aaru.Database.Models
 {
-    public class RemoteArchitecture : NameCountModel<int> { }
+    public class RemoteArchitecture : NameCountModel<int> {}
 }
\ No newline at end of file
diff --git a/Aaru.Database/Models/RemoteOperatingSystem.cs b/Aaru.Database/Models/RemoteOperatingSystem.cs
index 1a810f3ae..a8d2ab0f0 100644
--- a/Aaru.Database/Models/RemoteOperatingSystem.cs
+++ b/Aaru.Database/Models/RemoteOperatingSystem.cs
@@ -1,4 +1,4 @@
 namespace Aaru.Database.Models
 {
-    public class RemoteOperatingSystem : BaseOperatingSystem { }
+    public class RemoteOperatingSystem : BaseOperatingSystem {}
 }
\ No newline at end of file
diff --git a/Aaru.Database/Models/UsbProduct.cs b/Aaru.Database/Models/UsbProduct.cs
index 206680340..5d5a181e7 100644
--- a/Aaru.Database/Models/UsbProduct.cs
+++ b/Aaru.Database/Models/UsbProduct.cs
@@ -38,7 +38,7 @@ namespace Aaru.Database.Models
 {
     public class UsbProduct
     {
-        public UsbProduct() { }
+        public UsbProduct() {}
 
         public UsbProduct(ushort vendorId, ushort id, string product)
         {
diff --git a/Aaru.Database/Models/UsbVendor.cs b/Aaru.Database/Models/UsbVendor.cs
index 97f2d4b2a..65f5c32fe 100644
--- a/Aaru.Database/Models/UsbVendor.cs
+++ b/Aaru.Database/Models/UsbVendor.cs
@@ -39,7 +39,7 @@ namespace Aaru.Database.Models
 {
     public class UsbVendor
     {
-        public UsbVendor() { }
+        public UsbVendor() {}
 
         public UsbVendor(ushort id, string vendor)
         {
diff --git a/Aaru.Database/Models/Version.cs b/Aaru.Database/Models/Version.cs
index 728631cd8..a26fedeac 100644
--- a/Aaru.Database/Models/Version.cs
+++ b/Aaru.Database/Models/Version.cs
@@ -32,5 +32,5 @@
 
 namespace Aaru.Database.Models
 {
-    public class Version : NameCountModel<int> { }
+    public class Version : NameCountModel<int> {}
 }
\ No newline at end of file
diff --git a/Aaru.Decoders b/Aaru.Decoders
index 9abc95637..a43b4132e 160000
--- a/Aaru.Decoders
+++ b/Aaru.Decoders
@@ -1 +1 @@
-Subproject commit 9abc956373b4b093290f9653ffb49d57c86afbce
+Subproject commit a43b4132eed9d66cf686da5e3fff0595a9578fbf
diff --git a/Aaru.Devices/Command.cs b/Aaru.Devices/Command.cs
index 79638f3b6..d01bd81d2 100644
--- a/Aaru.Devices/Command.cs
+++ b/Aaru.Devices/Command.cs
@@ -31,10 +31,10 @@
 // ****************************************************************************/
 
 using System;
-using Aaru.Devices.FreeBSD;
-using Aaru.Devices.Windows;
 using Aaru.CommonTypes.Interop;
 using Aaru.Decoders.ATA;
+using Aaru.Devices.FreeBSD;
+using Aaru.Devices.Windows;
 using Microsoft.Win32.SafeHandles;
 using PlatformID = Aaru.CommonTypes.Interop.PlatformID;
 
@@ -42,9 +42,7 @@ namespace Aaru.Devices
 {
     internal static class Command
     {
-        /// <summary>
-        ///     Sends a SCSI command
-        /// </summary>
+        /// <summary>Sends a SCSI command</summary>
         /// <returns>0 if no error occurred, otherwise, errno</returns>
         /// <param name="fd">File handle</param>
         /// <param name="cdb">SCSI CDB</param>
@@ -58,20 +56,16 @@ namespace Aaru.Devices
         ///     sense
         /// </param>
         /// <exception cref="InvalidOperationException">If the specified platform is not supported</exception>
-        internal static int SendScsiCommand(object fd, byte[] cdb, ref byte[] buffer,
-            out byte[] senseBuffer,
-            uint timeout, ScsiDirection direction, out double duration,
-            out bool sense)
+        internal static int SendScsiCommand(object fd, byte[] cdb, ref byte[] buffer, out byte[] senseBuffer,
+                                            uint timeout, ScsiDirection direction, out double duration, out bool sense)
         {
-            var ptId = DetectOS.GetRealPlatformID();
+            PlatformID ptId = DetectOS.GetRealPlatformID();
 
             return SendScsiCommand(ptId, fd, cdb, ref buffer, out senseBuffer, timeout, direction, out duration,
-                out sense);
+                                   out sense);
         }
 
-        /// <summary>
-        ///     Sends a SCSI command
-        /// </summary>
+        /// <summary>Sends a SCSI command</summary>
         /// <returns>0 if no error occurred, otherwise, errno</returns>
         /// <param name="ptId">Platform ID for executing the command</param>
         /// <param name="fd">File handle</param>
@@ -86,92 +80,101 @@ namespace Aaru.Devices
         ///     sense
         /// </param>
         /// <exception cref="InvalidOperationException">If the specified platform is not supported</exception>
-        internal static int SendScsiCommand(PlatformID ptId, object fd, byte[] cdb,
-            ref byte[] buffer,
-            out byte[] senseBuffer, uint timeout, ScsiDirection direction,
-            out double duration, out bool sense)
+        internal static int SendScsiCommand(PlatformID ptId, object fd, byte[] cdb, ref byte[] buffer,
+                                            out byte[] senseBuffer, uint timeout, ScsiDirection direction,
+                                            out double duration, out bool sense)
         {
-            switch (ptId)
+            switch(ptId)
             {
                 case PlatformID.Win32NT:
                 {
                     ScsiIoctlDirection dir;
 
-                    switch (direction)
+                    switch(direction)
                     {
                         case ScsiDirection.In:
                             dir = ScsiIoctlDirection.In;
+
                             break;
                         case ScsiDirection.Out:
                             dir = ScsiIoctlDirection.Out;
+
                             break;
                         default:
                             dir = ScsiIoctlDirection.Unspecified;
+
                             break;
                     }
 
-                    return Windows.Command.SendScsiCommand((SafeFileHandle) fd, cdb, ref buffer, out senseBuffer,
-                        timeout, dir, out duration, out sense);
+                    return Windows.Command.SendScsiCommand((SafeFileHandle)fd, cdb, ref buffer, out senseBuffer,
+                                                           timeout, dir, out duration, out sense);
                 }
                 case PlatformID.Linux:
                 {
                     Linux.ScsiIoctlDirection dir;
 
-                    switch (direction)
+                    switch(direction)
                     {
                         case ScsiDirection.In:
                             dir = Linux.ScsiIoctlDirection.In;
+
                             break;
                         case ScsiDirection.Out:
                             dir = Linux.ScsiIoctlDirection.Out;
+
                             break;
                         case ScsiDirection.Bidirectional:
                             dir = Linux.ScsiIoctlDirection.Unspecified;
+
                             break;
                         case ScsiDirection.None:
                             dir = Linux.ScsiIoctlDirection.None;
+
                             break;
                         default:
                             dir = Linux.ScsiIoctlDirection.Unknown;
+
                             break;
                     }
 
-                    return Linux.Command.SendScsiCommand((int) fd, cdb, ref buffer, out senseBuffer, timeout, dir,
-                        out duration, out sense);
+                    return Linux.Command.SendScsiCommand((int)fd, cdb, ref buffer, out senseBuffer, timeout, dir,
+                                                         out duration, out sense);
                 }
                 case PlatformID.FreeBSD:
                 {
                     CcbFlags flags = 0;
 
-                    switch (direction)
+                    switch(direction)
                     {
                         case ScsiDirection.In:
                             flags = CcbFlags.CamDirIn;
+
                             break;
                         case ScsiDirection.Out:
                             flags = CcbFlags.CamDirOut;
+
                             break;
                         case ScsiDirection.Bidirectional:
                             flags = CcbFlags.CamDirBoth;
+
                             break;
                         case ScsiDirection.None:
                             flags = CcbFlags.CamDirNone;
+
                             break;
                     }
 
                     return IntPtr.Size == 8
-                        ? FreeBSD.Command.SendScsiCommand64((IntPtr) fd, cdb, ref buffer, out senseBuffer,
-                            timeout, flags, out duration, out sense)
-                        : FreeBSD.Command.SendScsiCommand((IntPtr) fd, cdb, ref buffer, out senseBuffer, timeout,
-                            flags, out duration, out sense);
+                               ? FreeBSD.Command.SendScsiCommand64((IntPtr)fd, cdb, ref buffer, out senseBuffer,
+                                                                   timeout, flags, out duration, out sense)
+                               : FreeBSD.Command.SendScsiCommand((IntPtr)fd, cdb, ref buffer, out senseBuffer, timeout,
+                                                                 flags, out duration, out sense);
                 }
                 default: throw new InvalidOperationException($"Platform {ptId} not yet supported.");
             }
         }
 
-        /// <summary>
-        ///     Sends an ATA command in CHS format
-        /// </summary>
+        /// <summary>Sends an ATA command in CHS format</summary>
         /// <returns>0 if no error occurred, otherwise, errno</returns>
         /// <param name="fd">File handle</param>
         /// <param name="buffer">Buffer for SCSI command response</param>
@@ -185,22 +188,17 @@ namespace Aaru.Devices
         /// <param name="transferBlocks">Set to <c>true</c> if the transfer length is in block, otherwise it is in bytes</param>
         /// <exception cref="InvalidOperationException">If the specified platform is not supported</exception>
         internal static int SendAtaCommand(object fd, AtaRegistersChs registers,
-            out AtaErrorRegistersChs errorRegisters, AtaProtocol protocol,
-            AtaTransferRegister transferRegister, ref byte[] buffer,
-            uint timeout,
-            bool transferBlocks, out double duration,
-            out bool sense)
+                                           out AtaErrorRegistersChs errorRegisters, AtaProtocol protocol,
+                                           AtaTransferRegister transferRegister, ref byte[] buffer, uint timeout,
+                                           bool transferBlocks, out double duration, out bool sense)
         {
-            var ptId = DetectOS.GetRealPlatformID();
+            PlatformID ptId = DetectOS.GetRealPlatformID();
 
-            return SendAtaCommand(ptId, fd, registers, out errorRegisters, protocol, transferRegister,
-                ref buffer,
-                timeout, transferBlocks, out duration, out sense);
+            return SendAtaCommand(ptId, fd, registers, out errorRegisters, protocol, transferRegister, ref buffer,
+                                  timeout, transferBlocks, out duration, out sense);
         }
 
-        /// <summary>
-        ///     Sends an ATA command in CHS format
-        /// </summary>
+        /// <summary>Sends an ATA command in CHS format</summary>
         /// <returns>0 if no error occurred, otherwise, errno</returns>
         /// <param name="ptId">Platform ID for executing the command</param>
         /// <param name="fd">File handle</param>
@@ -214,49 +212,44 @@ namespace Aaru.Devices
         /// <param name="transferRegister">What register contains the transfer length</param>
         /// <param name="transferBlocks">Set to <c>true</c> if the transfer length is in block, otherwise it is in bytes</param>
         /// <exception cref="InvalidOperationException">If the specified platform is not supported</exception>
-        internal static int SendAtaCommand(PlatformID ptId, object fd,
-            AtaRegistersChs registers,
-            out AtaErrorRegistersChs errorRegisters, AtaProtocol protocol,
-            AtaTransferRegister transferRegister, ref byte[] buffer,
-            uint timeout,
-            bool transferBlocks, out double duration,
-            out bool sense)
+        internal static int SendAtaCommand(PlatformID ptId, object fd, AtaRegistersChs registers,
+                                           out AtaErrorRegistersChs errorRegisters, AtaProtocol protocol,
+                                           AtaTransferRegister transferRegister, ref byte[] buffer, uint timeout,
+                                           bool transferBlocks, out double duration, out bool sense)
         {
-            switch (ptId)
+            switch(ptId)
             {
                 case PlatformID.Win32NT:
                 {
-                    if (Environment.OSVersion.Version.Major == 5 && Environment.OSVersion.Version.Minor == 1 &&
+                    if((Environment.OSVersion.Version.Major == 5 && Environment.OSVersion.Version.Minor == 1 &&
                         (Environment.OSVersion.ServicePack == "Service Pack 1" ||
-                         Environment.OSVersion.ServicePack == "") ||
-                        Environment.OSVersion.Version.Major == 5 && Environment.OSVersion.Version.Minor == 0)
+                         Environment.OSVersion.ServicePack == "")) ||
+                       (Environment.OSVersion.Version.Major == 5 && Environment.OSVersion.Version.Minor == 0))
                         throw new InvalidOperationException("Windows XP or earlier is not supported.");
 
                     // Windows NT 4 or earlier, requires special ATA pass thru SCSI. But Aaru cannot run there (or can it?)
-                    if (Environment.OSVersion.Version.Major <= 4)
+                    if(Environment.OSVersion.Version.Major <= 4)
                         throw new InvalidOperationException("Windows NT 4.0 or earlier is not supported.");
 
-                    return Windows.Command.SendAtaCommand((SafeFileHandle) fd, registers, out errorRegisters, protocol,
-                        ref buffer, timeout, out duration, out sense);
+                    return Windows.Command.SendAtaCommand((SafeFileHandle)fd, registers, out errorRegisters, protocol,
+                                                          ref buffer, timeout, out duration, out sense);
                 }
                 case PlatformID.Linux:
                 {
-                    return Linux.Command.SendAtaCommand((int) fd, registers, out errorRegisters, protocol,
-                        transferRegister, ref buffer, timeout, transferBlocks,
-                        out duration, out sense);
+                    return Linux.Command.SendAtaCommand((int)fd, registers, out errorRegisters, protocol,
+                                                        transferRegister, ref buffer, timeout, transferBlocks,
+                                                        out duration, out sense);
                 }
                 case PlatformID.FreeBSD:
                 {
-                    return FreeBSD.Command.SendAtaCommand((IntPtr) fd, registers, out errorRegisters, protocol,
-                        ref buffer, timeout, out duration, out sense);
+                    return FreeBSD.Command.SendAtaCommand((IntPtr)fd, registers, out errorRegisters, protocol,
+                                                          ref buffer, timeout, out duration, out sense);
                 }
                 default: throw new InvalidOperationException($"Platform {ptId} not yet supported.");
             }
         }
 
-        /// <summary>
-        ///     Sends an ATA command in CHS format
-        /// </summary>
+        /// <summary>Sends an ATA command in CHS format</summary>
         /// <returns>0 if no error occurred, otherwise, errno</returns>
         /// <param name="fd">File handle</param>
         /// <param name="buffer">Buffer for SCSI command response</param>
@@ -270,22 +263,17 @@ namespace Aaru.Devices
         /// <param name="transferBlocks">Set to <c>true</c> if the transfer length is in block, otherwise it is in bytes</param>
         /// <exception cref="InvalidOperationException">If the specified platform is not supported</exception>
         internal static int SendAtaCommand(object fd, AtaRegistersLba28 registers,
-            out AtaErrorRegistersLba28 errorRegisters, AtaProtocol protocol,
-            AtaTransferRegister transferRegister, ref byte[] buffer,
-            uint timeout,
-            bool transferBlocks, out double duration,
-            out bool sense)
+                                           out AtaErrorRegistersLba28 errorRegisters, AtaProtocol protocol,
+                                           AtaTransferRegister transferRegister, ref byte[] buffer, uint timeout,
+                                           bool transferBlocks, out double duration, out bool sense)
         {
-            var ptId = DetectOS.GetRealPlatformID();
+            PlatformID ptId = DetectOS.GetRealPlatformID();
 
-            return SendAtaCommand(ptId, fd, registers, out errorRegisters, protocol, transferRegister,
-                ref buffer,
-                timeout, transferBlocks, out duration, out sense);
+            return SendAtaCommand(ptId, fd, registers, out errorRegisters, protocol, transferRegister, ref buffer,
+                                  timeout, transferBlocks, out duration, out sense);
         }
 
-        /// <summary>
-        ///     Sends an ATA command in 28-bit LBA format
-        /// </summary>
+        /// <summary>Sends an ATA command in 28-bit LBA format</summary>
         /// <returns>0 if no error occurred, otherwise, errno</returns>
         /// <param name="ptId">Platform ID for executing the command</param>
         /// <param name="fd">File handle</param>
@@ -299,49 +287,44 @@ namespace Aaru.Devices
         /// <param name="transferRegister">What register contains the transfer length</param>
         /// <param name="transferBlocks">Set to <c>true</c> if the transfer length is in block, otherwise it is in bytes</param>
         /// <exception cref="InvalidOperationException">If the specified platform is not supported</exception>
-        internal static int SendAtaCommand(PlatformID ptId, object fd,
-            AtaRegistersLba28 registers,
-            out AtaErrorRegistersLba28 errorRegisters, AtaProtocol protocol,
-            AtaTransferRegister transferRegister, ref byte[] buffer,
-            uint timeout,
-            bool transferBlocks, out double duration,
-            out bool sense)
+        internal static int SendAtaCommand(PlatformID ptId, object fd, AtaRegistersLba28 registers,
+                                           out AtaErrorRegistersLba28 errorRegisters, AtaProtocol protocol,
+                                           AtaTransferRegister transferRegister, ref byte[] buffer, uint timeout,
+                                           bool transferBlocks, out double duration, out bool sense)
         {
-            switch (ptId)
+            switch(ptId)
             {
                 case PlatformID.Win32NT:
                 {
-                    if (Environment.OSVersion.Version.Major == 5 && Environment.OSVersion.Version.Minor == 1 &&
+                    if((Environment.OSVersion.Version.Major == 5 && Environment.OSVersion.Version.Minor == 1 &&
                         (Environment.OSVersion.ServicePack == "Service Pack 1" ||
-                         Environment.OSVersion.ServicePack == "") ||
-                        Environment.OSVersion.Version.Major == 5 && Environment.OSVersion.Version.Minor == 0)
+                         Environment.OSVersion.ServicePack == "")) ||
+                       (Environment.OSVersion.Version.Major == 5 && Environment.OSVersion.Version.Minor == 0))
                         throw new InvalidOperationException("Windows XP or earlier is not supported.");
 
                     // Windows NT 4 or earlier, requires special ATA pass thru SCSI. But Aaru cannot run there (or can it?)
-                    if (Environment.OSVersion.Version.Major <= 4)
+                    if(Environment.OSVersion.Version.Major <= 4)
                         throw new InvalidOperationException("Windows NT 4.0 or earlier is not supported.");
 
-                    return Windows.Command.SendAtaCommand((SafeFileHandle) fd, registers, out errorRegisters, protocol,
-                        ref buffer, timeout, out duration, out sense);
+                    return Windows.Command.SendAtaCommand((SafeFileHandle)fd, registers, out errorRegisters, protocol,
+                                                          ref buffer, timeout, out duration, out sense);
                 }
                 case PlatformID.Linux:
                 {
-                    return Linux.Command.SendAtaCommand((int) fd, registers, out errorRegisters, protocol,
-                        transferRegister, ref buffer, timeout, transferBlocks,
-                        out duration, out sense);
+                    return Linux.Command.SendAtaCommand((int)fd, registers, out errorRegisters, protocol,
+                                                        transferRegister, ref buffer, timeout, transferBlocks,
+                                                        out duration, out sense);
                 }
                 case PlatformID.FreeBSD:
                 {
-                    return FreeBSD.Command.SendAtaCommand((IntPtr) fd, registers, out errorRegisters, protocol,
-                        ref buffer, timeout, out duration, out sense);
+                    return FreeBSD.Command.SendAtaCommand((IntPtr)fd, registers, out errorRegisters, protocol,
+                                                          ref buffer, timeout, out duration, out sense);
                 }
                 default: throw new InvalidOperationException($"Platform {ptId} not yet supported.");
             }
         }
 
-        /// <summary>
-        ///     Sends an ATA command in 48-bit LBA format
-        /// </summary>
+        /// <summary>Sends an ATA command in 48-bit LBA format</summary>
         /// <returns>0 if no error occurred, otherwise, errno</returns>
         /// <param name="fd">File handle</param>
         /// <param name="buffer">Buffer for SCSI command response</param>
@@ -355,22 +338,17 @@ namespace Aaru.Devices
         /// <param name="transferBlocks">Set to <c>true</c> if the transfer length is in block, otherwise it is in bytes</param>
         /// <exception cref="InvalidOperationException">If the specified platform is not supported</exception>
         internal static int SendAtaCommand(object fd, AtaRegistersLba48 registers,
-            out AtaErrorRegistersLba48 errorRegisters, AtaProtocol protocol,
-            AtaTransferRegister transferRegister, ref byte[] buffer,
-            uint timeout,
-            bool transferBlocks, out double duration,
-            out bool sense)
+                                           out AtaErrorRegistersLba48 errorRegisters, AtaProtocol protocol,
+                                           AtaTransferRegister transferRegister, ref byte[] buffer, uint timeout,
+                                           bool transferBlocks, out double duration, out bool sense)
         {
-            var ptId = DetectOS.GetRealPlatformID();
+            PlatformID ptId = DetectOS.GetRealPlatformID();
 
-            return SendAtaCommand(ptId, fd, registers, out errorRegisters, protocol, transferRegister,
-                ref buffer,
-                timeout, transferBlocks, out duration, out sense);
+            return SendAtaCommand(ptId, fd, registers, out errorRegisters, protocol, transferRegister, ref buffer,
+                                  timeout, transferBlocks, out duration, out sense);
         }
 
-        /// <summary>
-        ///     Sends an ATA command in 48-bit format
-        /// </summary>
+        /// <summary>Sends an ATA command in 48-bit format</summary>
         /// <returns>0 if no error occurred, otherwise, errno</returns>
         /// <param name="ptId">Platform ID for executing the command</param>
         /// <param name="fd">File handle</param>
@@ -384,40 +362,35 @@ namespace Aaru.Devices
         /// <param name="transferRegister">What register contains the transfer length</param>
         /// <param name="transferBlocks">Set to <c>true</c> if the transfer length is in block, otherwise it is in bytes</param>
         /// <exception cref="InvalidOperationException">If the specified platform is not supported</exception>
-        internal static int SendAtaCommand(PlatformID ptId, object fd,
-            AtaRegistersLba48 registers,
-            out AtaErrorRegistersLba48 errorRegisters, AtaProtocol protocol,
-            AtaTransferRegister transferRegister, ref byte[] buffer,
-            uint timeout,
-            bool transferBlocks, out double duration,
-            out bool sense)
+        internal static int SendAtaCommand(PlatformID ptId, object fd, AtaRegistersLba48 registers,
+                                           out AtaErrorRegistersLba48 errorRegisters, AtaProtocol protocol,
+                                           AtaTransferRegister transferRegister, ref byte[] buffer, uint timeout,
+                                           bool transferBlocks, out double duration, out bool sense)
         {
-            switch (ptId)
+            switch(ptId)
             {
                 case PlatformID.Win32NT:
                 {
                     // No check for Windows version. A 48-bit ATA disk simply does not work on earlier systems
-                    return Windows.Command.SendAtaCommand((SafeFileHandle) fd, registers, out errorRegisters, protocol,
-                        ref buffer, timeout, out duration, out sense);
+                    return Windows.Command.SendAtaCommand((SafeFileHandle)fd, registers, out errorRegisters, protocol,
+                                                          ref buffer, timeout, out duration, out sense);
                 }
                 case PlatformID.Linux:
                 {
-                    return Linux.Command.SendAtaCommand((int) fd, registers, out errorRegisters, protocol,
-                        transferRegister, ref buffer, timeout, transferBlocks,
-                        out duration, out sense);
+                    return Linux.Command.SendAtaCommand((int)fd, registers, out errorRegisters, protocol,
+                                                        transferRegister, ref buffer, timeout, transferBlocks,
+                                                        out duration, out sense);
                 }
                 case PlatformID.FreeBSD:
                 {
-                    return FreeBSD.Command.SendAtaCommand((IntPtr) fd, registers, out errorRegisters, protocol,
-                        ref buffer, timeout, out duration, out sense);
+                    return FreeBSD.Command.SendAtaCommand((IntPtr)fd, registers, out errorRegisters, protocol,
+                                                          ref buffer, timeout, out duration, out sense);
                 }
                 default: throw new InvalidOperationException($"Platform {ptId} not yet supported.");
             }
         }
 
-        /// <summary>
-        ///     Sends a MMC/SD command
-        /// </summary>
+        /// <summary>Sends a MMC/SD command</summary>
         /// <returns>The result of the command.</returns>
         /// <param name="fd">File handle</param>
         /// <param name="command">MMC/SD opcode</param>
@@ -433,24 +406,18 @@ namespace Aaru.Devices
         /// <param name="response">Response registers</param>
         /// <param name="blockSize">Size of block in bytes</param>
         /// <exception cref="InvalidOperationException">If the specified platform is not supported</exception>
-        internal static int SendMmcCommand(object fd, MmcCommands command, bool write,
-            bool isApplication,
-            MmcFlags flags, uint argument, uint blockSize,
-            uint blocks,
-            ref byte[] buffer, out uint[] response, out double duration,
-            out bool sense,
-            uint timeout = 0)
+        internal static int SendMmcCommand(object fd, MmcCommands command, bool write, bool isApplication,
+                                           MmcFlags flags, uint argument, uint blockSize, uint blocks,
+                                           ref byte[] buffer, out uint[] response, out double duration, out bool sense,
+                                           uint timeout = 0)
         {
-            var ptId = DetectOS.GetRealPlatformID();
+            PlatformID ptId = DetectOS.GetRealPlatformID();
 
-            return SendMmcCommand(ptId, (int) fd, command, write, isApplication, flags, argument,
-                blockSize, blocks,
-                ref buffer, out response, out duration, out sense, timeout);
+            return SendMmcCommand(ptId, (int)fd, command, write, isApplication, flags, argument, blockSize, blocks,
+                                  ref buffer, out response, out duration, out sense, timeout);
         }
 
-        /// <summary>
-        ///     Sends a MMC/SD command
-        /// </summary>
+        /// <summary>Sends a MMC/SD command</summary>
         /// <returns>The result of the command.</returns>
         /// <param name="ptId">Platform ID for executing the command</param>
         /// <param name="fd">File handle</param>
@@ -467,27 +434,24 @@ namespace Aaru.Devices
         /// <param name="response">Response registers</param>
         /// <param name="blockSize">Size of block in bytes</param>
         /// <exception cref="InvalidOperationException">If the specified platform is not supported</exception>
-        internal static int SendMmcCommand(PlatformID ptId, object fd, MmcCommands command,
-            bool write,
-            bool isApplication, MmcFlags flags, uint argument,
-            uint blockSize,
-            uint blocks, ref byte[] buffer, out uint[] response,
-            out double duration,
-            out bool sense, uint timeout = 0)
+        internal static int SendMmcCommand(PlatformID ptId, object fd, MmcCommands command, bool write,
+                                           bool isApplication, MmcFlags flags, uint argument, uint blockSize,
+                                           uint blocks, ref byte[] buffer, out uint[] response, out double duration,
+                                           out bool sense, uint timeout = 0)
         {
-            switch (ptId)
+            switch(ptId)
             {
                 case PlatformID.Win32NT:
                 {
-                    return Windows.Command.SendMmcCommand((SafeFileHandle) fd, command, write, isApplication, flags,
-                        argument, blockSize, blocks, ref buffer, out response,
-                        out duration, out sense, timeout);
+                    return Windows.Command.SendMmcCommand((SafeFileHandle)fd, command, write, isApplication, flags,
+                                                          argument, blockSize, blocks, ref buffer, out response,
+                                                          out duration, out sense, timeout);
                 }
                 case PlatformID.Linux:
                 {
-                    return Linux.Command.SendMmcCommand((int) fd, command, write, isApplication, flags, argument,
-                        blockSize, blocks, ref buffer, out response, out duration,
-                        out sense, timeout);
+                    return Linux.Command.SendMmcCommand((int)fd, command, write, isApplication, flags, argument,
+                                                        blockSize, blocks, ref buffer, out response, out duration,
+                                                        out sense, timeout);
                 }
                 default: throw new InvalidOperationException($"Platform {ptId} not yet supported.");
             }
diff --git a/Aaru.Devices/Device/AtaCommands/Ata28.cs b/Aaru.Devices/Device/AtaCommands/Ata28.cs
index 9ce61dde7..0ec77a74c 100644
--- a/Aaru.Devices/Device/AtaCommands/Ata28.cs
+++ b/Aaru.Devices/Device/AtaCommands/Ata28.cs
@@ -41,12 +41,16 @@ namespace Aaru.Devices
                                out double duration)
         {
             buffer = new byte[512];
-            AtaRegistersLba28 registers = new AtaRegistersLba28 {Command = (byte)AtaCommands.ReadBuffer};
 
-            LastError = SendAtaCommand(registers,                      out statusRegisters, AtaProtocol.PioIn,
-                                       AtaTransferRegister.NoTransfer, ref buffer,          timeout, false,
-                                       out duration,
+            var registers = new AtaRegistersLba28
+            {
+                Command = (byte)AtaCommands.ReadBuffer
+            };
+
+            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.PioIn,
+                                       AtaTransferRegister.NoTransfer, ref buffer, timeout, false, out duration,
                                        out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("ATA Device", "READ BUFFER took {0} ms.", duration);
@@ -58,10 +62,15 @@ namespace Aaru.Devices
                                   out double duration)
         {
             buffer = new byte[512];
-            AtaRegistersLba28 registers = new AtaRegistersLba28 {Command = (byte)AtaCommands.ReadBufferDma};
 
-            LastError = SendAtaCommand(registers,  out statusRegisters, AtaProtocol.Dma, AtaTransferRegister.NoTransfer,
-                                       ref buffer, timeout,             false,           out duration, out bool sense);
+            var registers = new AtaRegistersLba28
+            {
+                Command = (byte)AtaCommands.ReadBufferDma
+            };
+
+            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.Dma, AtaTransferRegister.NoTransfer,
+                                       ref buffer, timeout, false, out duration, out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("ATA Device", "READ BUFFER DMA took {0} ms.", duration);
@@ -69,29 +78,29 @@ namespace Aaru.Devices
             return sense;
         }
 
-        public bool ReadDma(out byte[] buffer,  out AtaErrorRegistersLba28 statusRegisters, uint lba, byte count,
-                            uint       timeout, out double                 duration) =>
+        public bool ReadDma(out byte[] buffer, out AtaErrorRegistersLba28 statusRegisters, uint lba, byte count,
+                            uint timeout, out double duration) =>
             ReadDma(out buffer, out statusRegisters, true, lba, count, timeout, out duration);
 
-        public bool ReadDma(out byte[] buffer, out AtaErrorRegistersLba28 statusRegisters, bool       retry, uint lba,
-                            byte       count,  uint                       timeout,         out double duration)
+        public bool ReadDma(out byte[] buffer, out AtaErrorRegistersLba28 statusRegisters, bool retry, uint lba,
+                            byte count, uint timeout, out double duration)
         {
             buffer = count == 0 ? new byte[512 * 256] : new byte[512 * count];
-            AtaRegistersLba28 registers = new AtaRegistersLba28
+
+            var registers = new AtaRegistersLba28
             {
-                SectorCount = count,
-                DeviceHead  = (byte)((lba & 0xF000000) / 0x1000000),
-                LbaHigh     = (byte)((lba & 0xFF0000)  / 0x10000),
-                LbaMid      = (byte)((lba & 0xFF00)    / 0x100),
-                LbaLow      = (byte)((lba & 0xFF)      / 0x1),
+                SectorCount = count, DeviceHead = (byte)((lba & 0xF000000) / 0x1000000),
+                LbaHigh     = (byte)((lba                     & 0xFF0000)  / 0x10000),
+                LbaMid      = (byte)((lba                     & 0xFF00)    / 0x100),
+                LbaLow      = (byte)((lba                     & 0xFF)      / 0x1),
                 Command     = retry ? (byte)AtaCommands.ReadDmaRetry : (byte)AtaCommands.ReadDma
             };
 
             registers.DeviceHead += 0x40;
 
-            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.Dma,
-                                       AtaTransferRegister.SectorCount,
+            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.Dma, AtaTransferRegister.SectorCount,
                                        ref buffer, timeout, true, out duration, out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("ATA Device", "READ DMA took {0} ms.", duration);
@@ -99,26 +108,24 @@ namespace Aaru.Devices
             return sense;
         }
 
-        public bool ReadMultiple(out byte[] buffer,  out AtaErrorRegistersLba28 statusRegisters, uint lba, byte count,
-                                 uint       timeout, out double                 duration)
+        public bool ReadMultiple(out byte[] buffer, out AtaErrorRegistersLba28 statusRegisters, uint lba, byte count,
+                                 uint timeout, out double duration)
         {
             buffer = count == 0 ? new byte[512 * 256] : new byte[512 * count];
-            AtaRegistersLba28 registers = new AtaRegistersLba28
+
+            var registers = new AtaRegistersLba28
             {
-                Command     = (byte)AtaCommands.ReadMultiple,
-                SectorCount = count,
-                DeviceHead  = (byte)((lba & 0xF000000) / 0x1000000),
-                LbaHigh     = (byte)((lba & 0xFF0000)  / 0x10000),
-                LbaMid      = (byte)((lba & 0xFF00)    / 0x100),
-                LbaLow      = (byte)((lba & 0xFF)      / 0x1)
+                Command    = (byte)AtaCommands.ReadMultiple, SectorCount    = count,
+                DeviceHead = (byte)((lba & 0xF000000) / 0x1000000), LbaHigh = (byte)((lba & 0xFF0000) / 0x10000),
+                LbaMid     = (byte)((lba & 0xFF00)    / 0x100), LbaLow      = (byte)((lba & 0xFF)     / 0x1)
             };
 
             registers.DeviceHead += 0x40;
 
-            LastError = SendAtaCommand(registers,                       out statusRegisters, AtaProtocol.PioIn,
-                                       AtaTransferRegister.SectorCount, ref buffer,          timeout, true,
-                                       out duration,
+            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.PioIn,
+                                       AtaTransferRegister.SectorCount, ref buffer, timeout, true, out duration,
                                        out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("ATA Device", "READ MULTIPLE took {0} ms.", duration);
@@ -126,19 +133,23 @@ namespace Aaru.Devices
             return sense;
         }
 
-        public bool ReadNativeMaxAddress(out uint   lba, out AtaErrorRegistersLba28 statusRegisters, uint timeout,
+        public bool ReadNativeMaxAddress(out uint lba, out AtaErrorRegistersLba28 statusRegisters, uint timeout,
                                          out double duration)
         {
             lba = 0;
-            byte[]            buffer    = new byte[0];
-            AtaRegistersLba28 registers = new AtaRegistersLba28 {Command = (byte)AtaCommands.ReadNativeMaxAddress};
+            byte[] buffer = new byte[0];
+
+            var registers = new AtaRegistersLba28
+            {
+                Command = (byte)AtaCommands.ReadNativeMaxAddress
+            };
 
             registers.DeviceHead += 0x40;
 
-            LastError = SendAtaCommand(registers,                      out statusRegisters, AtaProtocol.NonData,
-                                       AtaTransferRegister.NoTransfer, ref buffer,          timeout, false,
-                                       out duration,
+            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.NonData,
+                                       AtaTransferRegister.NoTransfer, ref buffer, timeout, false, out duration,
                                        out bool sense);
+
             Error = LastError != 0;
 
             if((statusRegisters.Status & 0x23) == 0)
@@ -155,30 +166,30 @@ namespace Aaru.Devices
             return sense;
         }
 
-        public bool Read(out byte[] buffer,  out AtaErrorRegistersLba28 statusRegisters, uint lba, byte count,
-                         uint       timeout, out double                 duration) =>
+        public bool Read(out byte[] buffer, out AtaErrorRegistersLba28 statusRegisters, uint lba, byte count,
+                         uint timeout, out double duration) =>
             Read(out buffer, out statusRegisters, true, lba, count, timeout, out duration);
 
-        public bool Read(out byte[] buffer, out AtaErrorRegistersLba28 statusRegisters, bool       retry, uint lba,
-                         byte       count,  uint                       timeout,         out double duration)
+        public bool Read(out byte[] buffer, out AtaErrorRegistersLba28 statusRegisters, bool retry, uint lba,
+                         byte count, uint timeout, out double duration)
         {
             buffer = count == 0 ? new byte[512 * 256] : new byte[512 * count];
-            AtaRegistersLba28 registers = new AtaRegistersLba28
+
+            var registers = new AtaRegistersLba28
             {
-                SectorCount = count,
-                DeviceHead  = (byte)((lba & 0xF000000) / 0x1000000),
-                LbaHigh     = (byte)((lba & 0xFF0000)  / 0x10000),
-                LbaMid      = (byte)((lba & 0xFF00)    / 0x100),
-                LbaLow      = (byte)((lba & 0xFF)      / 0x1),
+                SectorCount = count, DeviceHead = (byte)((lba & 0xF000000) / 0x1000000),
+                LbaHigh     = (byte)((lba                     & 0xFF0000)  / 0x10000),
+                LbaMid      = (byte)((lba                     & 0xFF00)    / 0x100),
+                LbaLow      = (byte)((lba                     & 0xFF)      / 0x1),
                 Command     = retry ? (byte)AtaCommands.ReadRetry : (byte)AtaCommands.Read
             };
 
             registers.DeviceHead += 0x40;
 
-            LastError = SendAtaCommand(registers,                       out statusRegisters, AtaProtocol.PioIn,
-                                       AtaTransferRegister.SectorCount, ref buffer,          timeout, true,
-                                       out duration,
+            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.PioIn,
+                                       AtaTransferRegister.SectorCount, ref buffer, timeout, true, out duration,
                                        out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("ATA Device", "READ SECTORS took {0} ms.", duration);
@@ -186,31 +197,30 @@ namespace Aaru.Devices
             return sense;
         }
 
-        public bool ReadLong(out byte[] buffer,  out AtaErrorRegistersLba28 statusRegisters, uint lba, uint blockSize,
-                             uint       timeout, out double                 duration) =>
+        public bool ReadLong(out byte[] buffer, out AtaErrorRegistersLba28 statusRegisters, uint lba, uint blockSize,
+                             uint timeout, out double duration) =>
             ReadLong(out buffer, out statusRegisters, true, lba, blockSize, timeout, out duration);
 
-        public bool ReadLong(out byte[] buffer, out AtaErrorRegistersLba28 statusRegisters, bool retry,
-                             uint       lba,
-                             uint       blockSize, uint timeout, out double duration)
+        public bool ReadLong(out byte[] buffer, out AtaErrorRegistersLba28 statusRegisters, bool retry, uint lba,
+                             uint blockSize, uint timeout, out double duration)
         {
             buffer = new byte[blockSize];
-            AtaRegistersLba28 registers = new AtaRegistersLba28
+
+            var registers = new AtaRegistersLba28
             {
-                SectorCount = 1,
-                DeviceHead  = (byte)((lba & 0xF000000) / 0x1000000),
-                LbaHigh     = (byte)((lba & 0xFF0000)  / 0x10000),
-                LbaMid      = (byte)((lba & 0xFF00)    / 0x100),
-                LbaLow      = (byte)((lba & 0xFF)      / 0x1),
+                SectorCount = 1, DeviceHead = (byte)((lba & 0xF000000) / 0x1000000),
+                LbaHigh     = (byte)((lba                 & 0xFF0000)  / 0x10000),
+                LbaMid      = (byte)((lba                 & 0xFF00)    / 0x100),
+                LbaLow      = (byte)((lba                 & 0xFF)      / 0x1),
                 Command     = retry ? (byte)AtaCommands.ReadLongRetry : (byte)AtaCommands.ReadLong
             };
 
             registers.DeviceHead += 0x40;
 
-            LastError = SendAtaCommand(registers,                       out statusRegisters, AtaProtocol.PioIn,
-                                       AtaTransferRegister.SectorCount, ref buffer,          timeout, true,
-                                       out duration,
+            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.PioIn,
+                                       AtaTransferRegister.SectorCount, ref buffer, timeout, true, out duration,
                                        out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("ATA Device", "READ LONG took {0} ms.", duration);
@@ -221,21 +231,21 @@ namespace Aaru.Devices
         public bool Seek(out AtaErrorRegistersLba28 statusRegisters, uint lba, uint timeout, out double duration)
         {
             byte[] buffer = new byte[0];
-            AtaRegistersLba28 registers = new AtaRegistersLba28
+
+            var registers = new AtaRegistersLba28
             {
-                Command    = (byte)AtaCommands.Seek,
-                DeviceHead = (byte)((lba & 0xF000000) / 0x1000000),
-                LbaHigh    = (byte)((lba & 0xFF0000)  / 0x10000),
-                LbaMid     = (byte)((lba & 0xFF00)    / 0x100),
-                LbaLow     = (byte)((lba & 0xFF)      / 0x1)
+                Command = (byte)AtaCommands.Seek, DeviceHead = (byte)((lba & 0xF000000) / 0x1000000),
+                LbaHigh = (byte)((lba                                      & 0xFF0000)  / 0x10000),
+                LbaMid  = (byte)((lba                                      & 0xFF00)    / 0x100),
+                LbaLow  = (byte)((lba                                      & 0xFF)      / 0x1)
             };
 
             registers.DeviceHead += 0x40;
 
-            LastError = SendAtaCommand(registers,                      out statusRegisters, AtaProtocol.NonData,
-                                       AtaTransferRegister.NoTransfer, ref buffer,          timeout, false,
-                                       out duration,
+            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.NonData,
+                                       AtaTransferRegister.NoTransfer, ref buffer, timeout, false, out duration,
                                        out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("ATA Device", "SEEK took {0} ms.", duration);
diff --git a/Aaru.Devices/Device/AtaCommands/Ata48.cs b/Aaru.Devices/Device/AtaCommands/Ata48.cs
index 124652d9e..466dd7e6e 100644
--- a/Aaru.Devices/Device/AtaCommands/Ata48.cs
+++ b/Aaru.Devices/Device/AtaCommands/Ata48.cs
@@ -37,18 +37,21 @@ namespace Aaru.Devices
 {
     public partial class Device
     {
-        public bool GetNativeMaxAddressExt(out ulong  lba, out AtaErrorRegistersLba48 statusRegisters, uint timeout,
+        public bool GetNativeMaxAddressExt(out ulong lba, out AtaErrorRegistersLba48 statusRegisters, uint timeout,
                                            out double duration)
         {
             lba = 0;
             byte[] buffer = new byte[0];
-            AtaRegistersLba48 registers =
-                new AtaRegistersLba48 {Command = (byte)AtaCommands.NativeMaxAddress, Feature = 0x0000};
 
-            LastError = SendAtaCommand(registers,                      out statusRegisters, AtaProtocol.NonData,
-                                       AtaTransferRegister.NoTransfer, ref buffer,          timeout, false,
-                                       out duration,
+            var registers = new AtaRegistersLba48
+            {
+                Command = (byte)AtaCommands.NativeMaxAddress, Feature = 0x0000
+            };
+
+            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.NonData,
+                                       AtaTransferRegister.NoTransfer, ref buffer, timeout, false, out duration,
                                        out bool sense);
+
             Error = LastError != 0;
 
             if((statusRegisters.Status & 0x23) == 0)
@@ -64,24 +67,23 @@ namespace Aaru.Devices
             return sense;
         }
 
-        public bool ReadDma(out byte[] buffer,  out AtaErrorRegistersLba48 statusRegisters, ulong lba, ushort count,
-                            uint       timeout, out double                 duration)
+        public bool ReadDma(out byte[] buffer, out AtaErrorRegistersLba48 statusRegisters, ulong lba, ushort count,
+                            uint timeout, out double duration)
         {
             buffer = count == 0 ? new byte[512 * 65536] : new byte[512 * count];
-            AtaRegistersLba48 registers = new AtaRegistersLba48
+
+            var registers = new AtaRegistersLba48
             {
-                Command     = (byte)AtaCommands.ReadDmaExt,
-                SectorCount = count,
-                LbaHigh     = (ushort)((lba & 0xFFFF00000000) / 0x100000000),
-                LbaMid      = (ushort)((lba & 0xFFFF0000)     / 0x10000),
-                LbaLow      = (ushort)((lba & 0xFFFF)         / 0x1)
+                Command = (byte)AtaCommands.ReadDmaExt, SectorCount = count,
+                LbaHigh = (ushort)((lba & 0xFFFF00000000) / 0x100000000),
+                LbaMid  = (ushort)((lba & 0xFFFF0000)     / 0x10000), LbaLow = (ushort)((lba & 0xFFFF) / 0x1)
             };
 
             registers.DeviceHead += 0x40;
 
-            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.Dma,
-                                       AtaTransferRegister.SectorCount,
+            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.Dma, AtaTransferRegister.SectorCount,
                                        ref buffer, timeout, true, out duration, out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("ATA Device", "READ DMA EXT took {0} ms.", duration);
@@ -89,25 +91,23 @@ namespace Aaru.Devices
             return sense;
         }
 
-        public bool ReadLog(out byte[] buffer,     out AtaErrorRegistersLba48 statusRegisters, byte logAddress,
-                            ushort     pageNumber, ushort                     count,           uint timeout,
-                            out double duration)
+        public bool ReadLog(out byte[] buffer, out AtaErrorRegistersLba48 statusRegisters, byte logAddress,
+                            ushort pageNumber, ushort count, uint timeout, out double duration)
         {
             buffer = new byte[512 * count];
-            AtaRegistersLba48 registers = new AtaRegistersLba48
+
+            var registers = new AtaRegistersLba48
             {
-                Command     = (byte)AtaCommands.ReadLogExt,
-                SectorCount = count,
-                LbaLow      = (ushort)((pageNumber & 0xFF)   * 0x100),
-                LbaHigh     = (ushort)((pageNumber & 0xFF00) / 0x100)
+                Command = (byte)AtaCommands.ReadLogExt, SectorCount      = count,
+                LbaLow  = (ushort)((pageNumber & 0xFF) * 0x100), LbaHigh = (ushort)((pageNumber & 0xFF00) / 0x100)
             };
 
             registers.LbaLow += logAddress;
 
-            LastError = SendAtaCommand(registers,                       out statusRegisters, AtaProtocol.PioIn,
-                                       AtaTransferRegister.SectorCount, ref buffer,          timeout, true,
-                                       out duration,
+            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.PioIn,
+                                       AtaTransferRegister.SectorCount, ref buffer, timeout, true, out duration,
                                        out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("ATA Device", "READ LOG EXT took {0} ms.", duration);
@@ -115,24 +115,22 @@ namespace Aaru.Devices
             return sense;
         }
 
-        public bool ReadLogDma(out byte[] buffer,     out AtaErrorRegistersLba48 statusRegisters, byte logAddress,
-                               ushort     pageNumber, ushort                     count,           uint timeout,
-                               out double duration)
+        public bool ReadLogDma(out byte[] buffer, out AtaErrorRegistersLba48 statusRegisters, byte logAddress,
+                               ushort pageNumber, ushort count, uint timeout, out double duration)
         {
             buffer = new byte[512 * count];
-            AtaRegistersLba48 registers = new AtaRegistersLba48
+
+            var registers = new AtaRegistersLba48
             {
-                Command     = (byte)AtaCommands.ReadLogDmaExt,
-                SectorCount = count,
-                LbaLow      = (ushort)((pageNumber & 0xFF)   * 0x100),
-                LbaHigh     = (ushort)((pageNumber & 0xFF00) / 0x100)
+                Command = (byte)AtaCommands.ReadLogDmaExt, SectorCount   = count,
+                LbaLow  = (ushort)((pageNumber & 0xFF) * 0x100), LbaHigh = (ushort)((pageNumber & 0xFF00) / 0x100)
             };
 
             registers.LbaLow += logAddress;
 
-            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.Dma,
-                                       AtaTransferRegister.SectorCount,
+            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.Dma, AtaTransferRegister.SectorCount,
                                        ref buffer, timeout, true, out duration, out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("ATA Device", "READ LOG DMA EXT took {0} ms.", duration);
@@ -140,26 +138,24 @@ namespace Aaru.Devices
             return sense;
         }
 
-        public bool ReadMultiple(out byte[] buffer, out AtaErrorRegistersLba48 statusRegisters, ulong lba,
-                                 ushort     count,
-                                 uint       timeout, out double duration)
+        public bool ReadMultiple(out byte[] buffer, out AtaErrorRegistersLba48 statusRegisters, ulong lba, ushort count,
+                                 uint timeout, out double duration)
         {
             buffer = count == 0 ? new byte[512 * 65536] : new byte[512 * count];
-            AtaRegistersLba48 registers = new AtaRegistersLba48
+
+            var registers = new AtaRegistersLba48
             {
-                Command     = (byte)AtaCommands.ReadMultipleExt,
-                SectorCount = count,
-                LbaHigh     = (ushort)((lba & 0xFFFF00000000) / 0x100000000),
-                LbaMid      = (ushort)((lba & 0xFFFF0000)     / 0x10000),
-                LbaLow      = (ushort)((lba & 0xFFFF)         / 0x1)
+                Command = (byte)AtaCommands.ReadMultipleExt, SectorCount = count,
+                LbaHigh = (ushort)((lba & 0xFFFF00000000) / 0x100000000),
+                LbaMid  = (ushort)((lba & 0xFFFF0000)     / 0x10000), LbaLow = (ushort)((lba & 0xFFFF) / 0x1)
             };
 
             registers.DeviceHead += 0x40;
 
-            LastError = SendAtaCommand(registers,                       out statusRegisters, AtaProtocol.PioIn,
-                                       AtaTransferRegister.SectorCount, ref buffer,          timeout, true,
-                                       out duration,
+            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.PioIn,
+                                       AtaTransferRegister.SectorCount, ref buffer, timeout, true, out duration,
                                        out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("ATA Device", "READ MULTIPLE EXT took {0} ms.", duration);
@@ -167,19 +163,23 @@ namespace Aaru.Devices
             return sense;
         }
 
-        public bool ReadNativeMaxAddress(out ulong  lba, out AtaErrorRegistersLba48 statusRegisters, uint timeout,
+        public bool ReadNativeMaxAddress(out ulong lba, out AtaErrorRegistersLba48 statusRegisters, uint timeout,
                                          out double duration)
         {
             lba = 0;
-            byte[]            buffer    = new byte[0];
-            AtaRegistersLba48 registers = new AtaRegistersLba48 {Command = (byte)AtaCommands.ReadNativeMaxAddressExt};
+            byte[] buffer = new byte[0];
+
+            var registers = new AtaRegistersLba48
+            {
+                Command = (byte)AtaCommands.ReadNativeMaxAddressExt
+            };
 
             registers.DeviceHead += 0x40;
 
-            LastError = SendAtaCommand(registers,                      out statusRegisters, AtaProtocol.NonData,
-                                       AtaTransferRegister.NoTransfer, ref buffer,          timeout, false,
-                                       out duration,
+            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.NonData,
+                                       AtaTransferRegister.NoTransfer, ref buffer, timeout, false, out duration,
                                        out bool sense);
+
             Error = LastError != 0;
 
             if((statusRegisters.Status & 0x23) == 0)
@@ -195,25 +195,24 @@ namespace Aaru.Devices
             return sense;
         }
 
-        public bool Read(out byte[] buffer,  out AtaErrorRegistersLba48 statusRegisters, ulong lba, ushort count,
-                         uint       timeout, out double                 duration)
+        public bool Read(out byte[] buffer, out AtaErrorRegistersLba48 statusRegisters, ulong lba, ushort count,
+                         uint timeout, out double duration)
         {
             buffer = count == 0 ? new byte[512 * 65536] : new byte[512 * count];
-            AtaRegistersLba48 registers = new AtaRegistersLba48
+
+            var registers = new AtaRegistersLba48
             {
-                Command     = (byte)AtaCommands.ReadExt,
-                SectorCount = count,
-                LbaHigh     = (ushort)((lba & 0xFFFF00000000) / 0x100000000),
-                LbaMid      = (ushort)((lba & 0xFFFF0000)     / 0x10000),
-                LbaLow      = (ushort)((lba & 0xFFFF)         / 0x1)
+                Command = (byte)AtaCommands.ReadExt, SectorCount = count,
+                LbaHigh = (ushort)((lba & 0xFFFF00000000) / 0x100000000),
+                LbaMid  = (ushort)((lba & 0xFFFF0000)     / 0x10000), LbaLow = (ushort)((lba & 0xFFFF) / 0x1)
             };
 
             registers.DeviceHead += 0x40;
 
-            LastError = SendAtaCommand(registers,                       out statusRegisters, AtaProtocol.PioIn,
-                                       AtaTransferRegister.SectorCount, ref buffer,          timeout, true,
-                                       out duration,
+            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.PioIn,
+                                       AtaTransferRegister.SectorCount, ref buffer, timeout, true, out duration,
                                        out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("ATA Device", "READ SECTORS EXT took {0} ms.", duration);
diff --git a/Aaru.Devices/Device/AtaCommands/AtaCHS.cs b/Aaru.Devices/Device/AtaCommands/AtaCHS.cs
index b0944420c..0b8f7e12b 100644
--- a/Aaru.Devices/Device/AtaCommands/AtaCHS.cs
+++ b/Aaru.Devices/Device/AtaCommands/AtaCHS.cs
@@ -37,18 +37,14 @@ namespace Aaru.Devices
 {
     public partial class Device
     {
-        /// <summary>
-        ///     Sends the ATA IDENTIFY DEVICE command to the device, using default device timeout
-        /// </summary>
+        /// <summary>Sends the ATA IDENTIFY DEVICE command to the device, using default device timeout</summary>
         /// <returns><c>true</c> if the command failed and <paramref name="statusRegisters" /> contains the error registers.</returns>
         /// <param name="buffer">Buffer.</param>
         /// <param name="statusRegisters">Status registers.</param>
         public bool AtaIdentify(out byte[] buffer, out AtaErrorRegistersChs statusRegisters) =>
             AtaIdentify(out buffer, out statusRegisters, Timeout);
 
-        /// <summary>
-        ///     Sends the ATA IDENTIFY DEVICE command to the device, using default device timeout
-        /// </summary>
+        /// <summary>Sends the ATA IDENTIFY DEVICE command to the device, using default device timeout</summary>
         /// <returns><c>true</c> if the command failed and <paramref name="statusRegisters" /> contains the error registers.</returns>
         /// <param name="buffer">Buffer.</param>
         /// <param name="statusRegisters">Status registers.</param>
@@ -56,9 +52,7 @@ namespace Aaru.Devices
         public bool AtaIdentify(out byte[] buffer, out AtaErrorRegistersChs statusRegisters, out double duration) =>
             AtaIdentify(out buffer, out statusRegisters, Timeout, out duration);
 
-        /// <summary>
-        ///     Sends the ATA IDENTIFY DEVICE command to the device
-        /// </summary>
+        /// <summary>Sends the ATA IDENTIFY DEVICE command to the device</summary>
         /// <returns><c>true</c> if the command failed and <paramref name="statusRegisters" /> contains the error registers.</returns>
         /// <param name="buffer">Buffer.</param>
         /// <param name="statusRegisters">Status registers.</param>
@@ -66,9 +60,7 @@ namespace Aaru.Devices
         public bool AtaIdentify(out byte[] buffer, out AtaErrorRegistersChs statusRegisters, uint timeout) =>
             AtaIdentify(out buffer, out statusRegisters, timeout, out _);
 
-        /// <summary>
-        ///     Sends the ATA IDENTIFY DEVICE command to the device
-        /// </summary>
+        /// <summary>Sends the ATA IDENTIFY DEVICE command to the device</summary>
         /// <returns><c>true</c> if the command failed and <paramref name="statusRegisters" /> contains the error registers.</returns>
         /// <param name="buffer">Buffer.</param>
         /// <param name="statusRegisters">Status registers.</param>
@@ -78,12 +70,16 @@ namespace Aaru.Devices
                                 out double duration)
         {
             buffer = new byte[512];
-            AtaRegistersChs registers = new AtaRegistersChs {Command = (byte)AtaCommands.IdentifyDevice};
 
-            LastError = SendAtaCommand(registers,                      out statusRegisters, AtaProtocol.PioIn,
-                                       AtaTransferRegister.NoTransfer, ref buffer,          timeout, false,
-                                       out duration,
+            var registers = new AtaRegistersChs
+            {
+                Command = (byte)AtaCommands.IdentifyDevice
+            };
+
+            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.PioIn,
+                                       AtaTransferRegister.NoTransfer, ref buffer, timeout, false, out duration,
                                        out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("ATA Device", "IDENTIFY DEVICE took {0} ms.", duration);
@@ -91,30 +87,26 @@ namespace Aaru.Devices
             return sense;
         }
 
-        public bool ReadDma(out byte[] buffer, out AtaErrorRegistersChs statusRegisters, ushort cylinder,
-                            byte       head,
-                            byte       sector, byte count, uint timeout,
-                            out double duration) =>
+        public bool ReadDma(out byte[] buffer, out AtaErrorRegistersChs statusRegisters, ushort cylinder, byte head,
+                            byte sector, byte count, uint timeout, out double duration) =>
             ReadDma(out buffer, out statusRegisters, true, cylinder, head, sector, count, timeout, out duration);
 
         public bool ReadDma(out byte[] buffer, out AtaErrorRegistersChs statusRegisters, bool retry, ushort cylinder,
-                            byte       head,   byte                     sector,          byte count, uint   timeout,
-                            out double duration)
+                            byte head, byte sector, byte count, uint timeout, out double duration)
         {
             buffer = count == 0 ? new byte[512 * 256] : new byte[512 * count];
-            AtaRegistersChs registers = new AtaRegistersChs
+
+            var registers = new AtaRegistersChs
             {
-                SectorCount  = count,
-                CylinderHigh = (byte)((cylinder & 0xFF00) / 0x100),
-                CylinderLow  = (byte)((cylinder & 0xFF)   / 0x1),
-                DeviceHead   = (byte)(head & 0x0F),
-                Sector       = sector,
-                Command      = retry ? (byte)AtaCommands.ReadDmaRetry : (byte)AtaCommands.ReadDma
+                SectorCount = count, CylinderHigh = (byte)((cylinder & 0xFF00) / 0x100),
+                CylinderLow = (byte)((cylinder                       & 0xFF)   / 0x1), DeviceHead = (byte)(head & 0x0F),
+                Sector      = sector,
+                Command     = retry ? (byte)AtaCommands.ReadDmaRetry : (byte)AtaCommands.ReadDma
             };
 
-            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.Dma,
-                                       AtaTransferRegister.SectorCount,
+            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.Dma, AtaTransferRegister.SectorCount,
                                        ref buffer, timeout, true, out duration, out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("ATA Device", "READ DMA took {0} ms.", duration);
@@ -122,25 +114,22 @@ namespace Aaru.Devices
             return sense;
         }
 
-        public bool ReadMultiple(out byte[] buffer,  out AtaErrorRegistersChs statusRegisters, ushort cylinder,
-                                 byte       head,    byte                     sector,          byte   count,
-                                 uint       timeout, out double               duration)
+        public bool ReadMultiple(out byte[] buffer, out AtaErrorRegistersChs statusRegisters, ushort cylinder,
+                                 byte head, byte sector, byte count, uint timeout, out double duration)
         {
             buffer = count == 0 ? new byte[512 * 256] : new byte[512 * count];
-            AtaRegistersChs registers = new AtaRegistersChs
+
+            var registers = new AtaRegistersChs
             {
-                Command      = (byte)AtaCommands.ReadMultiple,
-                SectorCount  = count,
-                CylinderHigh = (byte)((cylinder & 0xFF00) / 0x100),
-                CylinderLow  = (byte)((cylinder & 0xFF)   / 0x1),
-                DeviceHead   = (byte)(head & 0x0F),
-                Sector       = sector
+                Command      = (byte)AtaCommands.ReadMultiple, SectorCount      = count,
+                CylinderHigh = (byte)((cylinder & 0xFF00) / 0x100), CylinderLow = (byte)((cylinder & 0xFF) / 0x1),
+                DeviceHead   = (byte)(head & 0x0F), Sector                      = sector
             };
 
-            LastError = SendAtaCommand(registers,                       out statusRegisters, AtaProtocol.PioIn,
-                                       AtaTransferRegister.SectorCount, ref buffer,          timeout, true,
-                                       out duration,
+            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.PioIn,
+                                       AtaTransferRegister.SectorCount, ref buffer, timeout, true, out duration,
                                        out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("ATA Device", "READ MULTIPLE took {0} ms.", duration);
@@ -149,29 +138,26 @@ namespace Aaru.Devices
         }
 
         public bool Read(out byte[] buffer, out AtaErrorRegistersChs statusRegisters, ushort cylinder, byte head,
-                         byte       sector, byte                     count,           uint   timeout,
-                         out double duration) =>
+                         byte sector, byte count, uint timeout, out double duration) =>
             Read(out buffer, out statusRegisters, true, cylinder, head, sector, count, timeout, out duration);
 
         public bool Read(out byte[] buffer, out AtaErrorRegistersChs statusRegisters, bool retry, ushort cylinder,
-                         byte       head,   byte                     sector,          byte count, uint   timeout,
-                         out double duration)
+                         byte head, byte sector, byte count, uint timeout, out double duration)
         {
             buffer = count == 0 ? new byte[512 * 256] : new byte[512 * count];
-            AtaRegistersChs registers = new AtaRegistersChs
+
+            var registers = new AtaRegistersChs
             {
-                Command      = retry ? (byte)AtaCommands.ReadRetry : (byte)AtaCommands.Read,
-                SectorCount  = count,
+                Command      = retry ? (byte)AtaCommands.ReadRetry : (byte)AtaCommands.Read, SectorCount = count,
                 CylinderHigh = (byte)((cylinder & 0xFF00) / 0x100),
                 CylinderLow  = (byte)((cylinder & 0xFF)   / 0x1),
-                DeviceHead   = (byte)(head & 0x0F),
-                Sector       = sector
+                DeviceHead   = (byte)(head & 0x0F), Sector = sector
             };
 
-            LastError = SendAtaCommand(registers,                       out statusRegisters, AtaProtocol.PioIn,
-                                       AtaTransferRegister.SectorCount, ref buffer,          timeout, true,
-                                       out duration,
+            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.PioIn,
+                                       AtaTransferRegister.SectorCount, ref buffer, timeout, true, out duration,
                                        out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("ATA Device", "READ SECTORS took {0} ms.", duration);
@@ -179,32 +165,28 @@ namespace Aaru.Devices
             return sense;
         }
 
-        public bool ReadLong(out byte[] buffer, out AtaErrorRegistersChs statusRegisters, ushort cylinder,
-                             byte       head,
-                             byte       sector, uint blockSize, uint timeout,
-                             out double duration) =>
+        public bool ReadLong(out byte[] buffer, out AtaErrorRegistersChs statusRegisters, ushort cylinder, byte head,
+                             byte sector, uint blockSize, uint timeout, out double duration) =>
             ReadLong(out buffer, out statusRegisters, true, cylinder, head, sector, blockSize, timeout, out duration);
 
-        public bool ReadLong(out byte[] buffer, out AtaErrorRegistersChs statusRegisters, bool retry,
-                             ushort     cylinder,
-                             byte       head,    byte       sector, uint blockSize,
-                             uint       timeout, out double duration)
+        public bool ReadLong(out byte[] buffer, out AtaErrorRegistersChs statusRegisters, bool retry, ushort cylinder,
+                             byte head, byte sector, uint blockSize, uint timeout, out double duration)
         {
             buffer = new byte[blockSize];
-            AtaRegistersChs registers = new AtaRegistersChs
+
+            var registers = new AtaRegistersChs
             {
-                Command      = retry ? (byte)AtaCommands.ReadLongRetry : (byte)AtaCommands.ReadLong,
-                SectorCount  = 1,
+                Command      = retry ? (byte)AtaCommands.ReadLongRetry : (byte)AtaCommands.ReadLong, SectorCount = 1,
                 CylinderHigh = (byte)((cylinder & 0xFF00) / 0x100),
                 CylinderLow  = (byte)((cylinder & 0xFF)   / 0x1),
                 DeviceHead   = (byte)(head & 0x0F),
                 Sector       = sector
             };
 
-            LastError = SendAtaCommand(registers,                       out statusRegisters, AtaProtocol.PioIn,
-                                       AtaTransferRegister.SectorCount, ref buffer,          timeout, true,
-                                       out duration,
+            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.PioIn,
+                                       AtaTransferRegister.SectorCount, ref buffer, timeout, true, out duration,
                                        out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("ATA Device", "READ LONG took {0} ms.", duration);
@@ -212,22 +194,22 @@ namespace Aaru.Devices
             return sense;
         }
 
-        public bool Seek(out AtaErrorRegistersChs statusRegisters, ushort     cylinder, byte head, byte sector,
-                         uint                     timeout,         out double duration)
+        public bool Seek(out AtaErrorRegistersChs statusRegisters, ushort cylinder, byte head, byte sector,
+                         uint timeout, out double duration)
         {
             byte[] buffer = new byte[0];
-            AtaRegistersChs registers = new AtaRegistersChs
+
+            var registers = new AtaRegistersChs
             {
-                Command      = (byte)AtaCommands.Seek,
-                CylinderHigh = (byte)((cylinder & 0xFF00) / 0x100),
-                CylinderLow  = (byte)((cylinder & 0xFF)   / 0x1),
-                DeviceHead   = (byte)(head & 0x0F),
-                Sector       = sector
+                Command     = (byte)AtaCommands.Seek, CylinderHigh = (byte)((cylinder & 0xFF00) / 0x100),
+                CylinderLow = (byte)((cylinder                                        & 0xFF)   / 0x1),
+                DeviceHead  = (byte)(head & 0x0F), Sector = sector
             };
 
-            LastError = SendAtaCommand(registers,                      out statusRegisters, AtaProtocol.NonData,
-                                       AtaTransferRegister.NoTransfer, ref buffer,          timeout, true, out duration,
+            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.NonData,
+                                       AtaTransferRegister.NoTransfer, ref buffer, timeout, true, out duration,
                                        out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("ATA Device", "SEEK took {0} ms.", duration);
@@ -236,28 +218,27 @@ namespace Aaru.Devices
         }
 
         public bool SetFeatures(out AtaErrorRegistersChs statusRegisters, AtaFeatures feature, uint timeout,
-                                out double               duration) =>
+                                out double duration) =>
             SetFeatures(out statusRegisters, feature, 0, 0, 0, 0, timeout, out duration);
 
         public bool SetFeatures(out AtaErrorRegistersChs statusRegisters, AtaFeatures feature, ushort cylinder,
-                                byte                     head,            byte        sector,  byte   sectorCount,
-                                uint                     timeout,         out double  duration)
+                                byte head, byte sector, byte sectorCount, uint timeout, out double duration)
         {
             byte[] buffer = new byte[0];
-            AtaRegistersChs registers = new AtaRegistersChs
+
+            var registers = new AtaRegistersChs
             {
-                Command      = (byte)AtaCommands.SetFeatures,
-                CylinderHigh = (byte)((cylinder & 0xFF00) / 0x100),
-                CylinderLow  = (byte)((cylinder & 0xFF)   / 0x1),
-                DeviceHead   = (byte)(head & 0x0F),
-                Sector       = sector,
-                SectorCount  = sectorCount,
-                Feature      = (byte)feature
+                Command     = (byte)AtaCommands.SetFeatures, CylinderHigh = (byte)((cylinder & 0xFF00) / 0x100),
+                CylinderLow = (byte)((cylinder                                               & 0xFF)   / 0x1),
+                DeviceHead  = (byte)(head & 0x0F), Sector = sector,
+                SectorCount = sectorCount,
+                Feature     = (byte)feature
             };
 
-            LastError = SendAtaCommand(registers,                      out statusRegisters, AtaProtocol.NonData,
-                                       AtaTransferRegister.NoTransfer, ref buffer,          timeout, true, out duration,
+            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.NonData,
+                                       AtaTransferRegister.NoTransfer, ref buffer, timeout, true, out duration,
                                        out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("ATA Device", "SET FEATURES took {0} ms.", duration);
diff --git a/Aaru.Devices/Device/AtaCommands/Atapi.cs b/Aaru.Devices/Device/AtaCommands/Atapi.cs
index 7dca4adfe..354ef861b 100644
--- a/Aaru.Devices/Device/AtaCommands/Atapi.cs
+++ b/Aaru.Devices/Device/AtaCommands/Atapi.cs
@@ -37,18 +37,14 @@ namespace Aaru.Devices
 {
     public partial class Device
     {
-        /// <summary>
-        ///     Sends the ATA IDENTIFY PACKET DEVICE command to the device, using default device timeout
-        /// </summary>
+        /// <summary>Sends the ATA IDENTIFY PACKET DEVICE command to the device, using default device timeout</summary>
         /// <returns><c>true</c> if the command failed and <paramref name="statusRegisters" /> contains the error registers.</returns>
         /// <param name="buffer">Buffer.</param>
         /// <param name="statusRegisters">Status registers.</param>
         public bool AtapiIdentify(out byte[] buffer, out AtaErrorRegistersChs statusRegisters) =>
             AtapiIdentify(out buffer, out statusRegisters, Timeout);
 
-        /// <summary>
-        ///     Sends the ATA IDENTIFY PACKET DEVICE command to the device, using default device timeout
-        /// </summary>
+        /// <summary>Sends the ATA IDENTIFY PACKET DEVICE command to the device, using default device timeout</summary>
         /// <returns><c>true</c> if the command failed and <paramref name="statusRegisters" /> contains the error registers.</returns>
         /// <param name="buffer">Buffer.</param>
         /// <param name="statusRegisters">Status registers.</param>
@@ -56,9 +52,7 @@ namespace Aaru.Devices
         public bool AtapiIdentify(out byte[] buffer, out AtaErrorRegistersChs statusRegisters, out double duration) =>
             AtapiIdentify(out buffer, out statusRegisters, Timeout, out duration);
 
-        /// <summary>
-        ///     Sends the ATA IDENTIFY PACKET DEVICE command to the device
-        /// </summary>
+        /// <summary>Sends the ATA IDENTIFY PACKET DEVICE command to the device</summary>
         /// <returns><c>true</c> if the command failed and <paramref name="statusRegisters" /> contains the error registers.</returns>
         /// <param name="buffer">Buffer.</param>
         /// <param name="statusRegisters">Status registers.</param>
@@ -66,9 +60,7 @@ namespace Aaru.Devices
         public bool AtapiIdentify(out byte[] buffer, out AtaErrorRegistersChs statusRegisters, uint timeout) =>
             AtapiIdentify(out buffer, out statusRegisters, timeout, out _);
 
-        /// <summary>
-        ///     Sends the ATA IDENTIFY PACKET DEVICE command to the device
-        /// </summary>
+        /// <summary>Sends the ATA IDENTIFY PACKET DEVICE command to the device</summary>
         /// <returns><c>true</c> if the command failed and <paramref name="statusRegisters" /> contains the error registers.</returns>
         /// <param name="buffer">Buffer.</param>
         /// <param name="statusRegisters">Status registers.</param>
@@ -78,12 +70,16 @@ namespace Aaru.Devices
                                   out double duration)
         {
             buffer = new byte[512];
-            AtaRegistersChs registers = new AtaRegistersChs {Command = (byte)AtaCommands.IdentifyPacketDevice};
 
-            LastError = SendAtaCommand(registers,                      out statusRegisters, AtaProtocol.PioIn,
-                                       AtaTransferRegister.NoTransfer, ref buffer,          timeout, false,
-                                       out duration,
+            var registers = new AtaRegistersChs
+            {
+                Command = (byte)AtaCommands.IdentifyPacketDevice
+            };
+
+            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.PioIn,
+                                       AtaTransferRegister.NoTransfer, ref buffer, timeout, false, out duration,
                                        out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("ATA Device", "IDENTIFY PACKET DEVICE took {0} ms.", duration);
diff --git a/Aaru.Devices/Device/AtaCommands/Cfa.cs b/Aaru.Devices/Device/AtaCommands/Cfa.cs
index 8cb1c03b3..341ed8f8a 100644
--- a/Aaru.Devices/Device/AtaCommands/Cfa.cs
+++ b/Aaru.Devices/Device/AtaCommands/Cfa.cs
@@ -37,25 +37,25 @@ namespace Aaru.Devices
 {
     public partial class Device
     {
-        public bool TranslateSector(out byte[] buffer,  out AtaErrorRegistersLba28 statusRegisters, uint lba,
-                                    uint       timeout, out double                 duration)
+        public bool TranslateSector(out byte[] buffer, out AtaErrorRegistersLba28 statusRegisters, uint lba,
+                                    uint timeout, out double duration)
         {
             buffer = new byte[512];
-            AtaRegistersLba28 registers = new AtaRegistersLba28
+
+            var registers = new AtaRegistersLba28
             {
-                Command    = (byte)AtaCommands.TranslateSector,
-                DeviceHead = (byte)((lba & 0xF000000) / 0x1000000),
-                LbaHigh    = (byte)((lba & 0xFF0000)  / 0x10000),
-                LbaMid     = (byte)((lba & 0xFF00)    / 0x100),
-                LbaLow     = (byte)((lba & 0xFF)      / 0x1)
+                Command = (byte)AtaCommands.TranslateSector, DeviceHead = (byte)((lba & 0xF000000) / 0x1000000),
+                LbaHigh = (byte)((lba                                                 & 0xFF0000)  / 0x10000),
+                LbaMid  = (byte)((lba                                                 & 0xFF00)    / 0x100),
+                LbaLow  = (byte)((lba                                                 & 0xFF)      / 0x1)
             };
 
             registers.DeviceHead += 0x40;
 
-            LastError = SendAtaCommand(registers,                      out statusRegisters, AtaProtocol.PioIn,
-                                       AtaTransferRegister.NoTransfer, ref buffer,          timeout, false,
-                                       out duration,
+            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.PioIn,
+                                       AtaTransferRegister.NoTransfer, ref buffer, timeout, false, out duration,
                                        out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("ATA Device", "CFA TRANSLATE SECTOR took {0} ms.", duration);
@@ -64,23 +64,21 @@ namespace Aaru.Devices
         }
 
         public bool TranslateSector(out byte[] buffer, out AtaErrorRegistersChs statusRegisters, ushort cylinder,
-                                    byte       head,   byte                     sector,          uint   timeout,
-                                    out double duration)
+                                    byte head, byte sector, uint timeout, out double duration)
         {
             buffer = new byte[512];
-            AtaRegistersChs registers = new AtaRegistersChs
+
+            var registers = new AtaRegistersChs
             {
-                Command      = (byte)AtaCommands.TranslateSector,
-                CylinderHigh = (byte)((cylinder & 0xFF00) / 0x100),
-                CylinderLow  = (byte)((cylinder & 0xFF)   / 0x1),
-                Sector       = sector,
-                DeviceHead   = (byte)(head & 0x0F)
+                Command     = (byte)AtaCommands.TranslateSector, CylinderHigh = (byte)((cylinder & 0xFF00) / 0x100),
+                CylinderLow = (byte)((cylinder                                                   & 0xFF)   / 0x1),
+                Sector      = sector, DeviceHead = (byte)(head & 0x0F)
             };
 
-            LastError = SendAtaCommand(registers,                      out statusRegisters, AtaProtocol.PioIn,
-                                       AtaTransferRegister.NoTransfer, ref buffer,          timeout, false,
-                                       out duration,
+            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.PioIn,
+                                       AtaTransferRegister.NoTransfer, ref buffer, timeout, false, out duration,
                                        out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("ATA Device", "CFA TRANSLATE SECTOR took {0} ms.", duration);
@@ -89,15 +87,19 @@ namespace Aaru.Devices
         }
 
         public bool RequestExtendedErrorCode(out byte errorCode, out AtaErrorRegistersLba28 statusRegisters,
-                                             uint     timeout,   out double                 duration)
+                                             uint timeout, out double duration)
         {
-            byte[]            buffer    = new byte[0];
-            AtaRegistersLba28 registers = new AtaRegistersLba28 {Command = (byte)AtaCommands.RequestSense};
+            byte[] buffer = new byte[0];
 
-            LastError = SendAtaCommand(registers,                      out statusRegisters, AtaProtocol.PioIn,
-                                       AtaTransferRegister.NoTransfer, ref buffer,          timeout, false,
-                                       out duration,
+            var registers = new AtaRegistersLba28
+            {
+                Command = (byte)AtaCommands.RequestSense
+            };
+
+            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.PioIn,
+                                       AtaTransferRegister.NoTransfer, ref buffer, timeout, false, out duration,
                                        out bool sense);
+
             Error = LastError != 0;
 
             errorCode = statusRegisters.Error;
diff --git a/Aaru.Devices/Device/AtaCommands/MCPT.cs b/Aaru.Devices/Device/AtaCommands/MCPT.cs
index 1b29363ac..2b782a024 100644
--- a/Aaru.Devices/Device/AtaCommands/MCPT.cs
+++ b/Aaru.Devices/Device/AtaCommands/MCPT.cs
@@ -38,24 +38,27 @@ namespace Aaru.Devices
     public partial class Device
     {
         public bool EnableMediaCardPassThrough(out AtaErrorRegistersChs statusRegisters, uint timeout,
-                                               out double               duration) =>
+                                               out double duration) =>
             CheckMediaCardType(1, out statusRegisters, timeout, out duration);
 
         public bool DisableMediaCardPassThrough(out AtaErrorRegistersChs statusRegisters, uint timeout,
-                                                out double               duration) =>
+                                                out double duration) =>
             CheckMediaCardType(0, out statusRegisters, timeout, out duration);
 
-        public bool CheckMediaCardType(byte       feature, out AtaErrorRegistersChs statusRegisters, uint timeout,
+        public bool CheckMediaCardType(byte feature, out AtaErrorRegistersChs statusRegisters, uint timeout,
                                        out double duration)
         {
             byte[] buffer = new byte[0];
-            AtaRegistersChs registers =
-                new AtaRegistersChs {Command = (byte)AtaCommands.CheckMediaCardType, Feature = feature};
 
-            LastError = SendAtaCommand(registers,                      out statusRegisters, AtaProtocol.NonData,
-                                       AtaTransferRegister.NoTransfer, ref buffer,          timeout, false,
-                                       out duration,
+            var registers = new AtaRegistersChs
+            {
+                Command = (byte)AtaCommands.CheckMediaCardType, Feature = feature
+            };
+
+            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.NonData,
+                                       AtaTransferRegister.NoTransfer, ref buffer, timeout, false, out duration,
                                        out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("ATA Device", "CHECK MEDIA CARD TYPE took {0} ms.", duration);
diff --git a/Aaru.Devices/Device/AtaCommands/Smart.cs b/Aaru.Devices/Device/AtaCommands/Smart.cs
index b598e0df1..fa045594a 100644
--- a/Aaru.Devices/Device/AtaCommands/Smart.cs
+++ b/Aaru.Devices/Device/AtaCommands/Smart.cs
@@ -40,18 +40,17 @@ namespace Aaru.Devices
         public bool SmartDisable(out AtaErrorRegistersLba28 statusRegisters, uint timeout, out double duration)
         {
             byte[] buffer = new byte[0];
-            AtaRegistersLba28 registers = new AtaRegistersLba28
+
+            var registers = new AtaRegistersLba28
             {
-                Command = (byte)AtaCommands.Smart,
-                Feature = (byte)AtaSmartSubCommands.Disable,
-                LbaHigh = 0xC2,
+                Command = (byte)AtaCommands.Smart, Feature = (byte)AtaSmartSubCommands.Disable, LbaHigh = 0xC2,
                 LbaMid  = 0x4F
             };
 
-            LastError = SendAtaCommand(registers,                      out statusRegisters, AtaProtocol.NonData,
-                                       AtaTransferRegister.NoTransfer, ref buffer,          timeout, false,
-                                       out duration,
+            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.NonData,
+                                       AtaTransferRegister.NoTransfer, ref buffer, timeout, false, out duration,
                                        out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("ATA Device", "SMART DISABLE OPERATIONS took {0} ms.", duration);
@@ -60,22 +59,20 @@ namespace Aaru.Devices
         }
 
         public bool SmartEnableAttributeAutosave(out AtaErrorRegistersLba28 statusRegisters, uint timeout,
-                                                 out double                 duration)
+                                                 out double duration)
         {
             byte[] buffer = new byte[0];
-            AtaRegistersLba28 registers = new AtaRegistersLba28
+
+            var registers = new AtaRegistersLba28
             {
-                Command     = (byte)AtaCommands.Smart,
-                Feature     = (byte)AtaSmartSubCommands.EnableDisableAttributeAutosave,
-                LbaHigh     = 0xC2,
-                LbaMid      = 0x4F,
-                SectorCount = 0xF1
+                Command = (byte)AtaCommands.Smart, Feature = (byte)AtaSmartSubCommands.EnableDisableAttributeAutosave,
+                LbaHigh = 0xC2, LbaMid                     = 0x4F, SectorCount = 0xF1
             };
 
-            LastError = SendAtaCommand(registers,                      out statusRegisters, AtaProtocol.NonData,
-                                       AtaTransferRegister.NoTransfer, ref buffer,          timeout, false,
-                                       out duration,
+            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.NonData,
+                                       AtaTransferRegister.NoTransfer, ref buffer, timeout, false, out duration,
                                        out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("ATA Device", "SMART ENABLE ATTRIBUTE AUTOSAVE took {0} ms.", duration);
@@ -84,21 +81,20 @@ namespace Aaru.Devices
         }
 
         public bool SmartDisableAttributeAutosave(out AtaErrorRegistersLba28 statusRegisters, uint timeout,
-                                                  out double                 duration)
+                                                  out double duration)
         {
             byte[] buffer = new byte[0];
-            AtaRegistersLba28 registers = new AtaRegistersLba28
+
+            var registers = new AtaRegistersLba28
             {
-                Command = (byte)AtaCommands.Smart,
-                Feature = (byte)AtaSmartSubCommands.EnableDisableAttributeAutosave,
-                LbaHigh = 0xC2,
-                LbaMid  = 0x4F
+                Command = (byte)AtaCommands.Smart, Feature = (byte)AtaSmartSubCommands.EnableDisableAttributeAutosave,
+                LbaHigh = 0xC2, LbaMid                     = 0x4F
             };
 
-            LastError = SendAtaCommand(registers,                      out statusRegisters, AtaProtocol.NonData,
-                                       AtaTransferRegister.NoTransfer, ref buffer,          timeout, false,
-                                       out duration,
+            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.NonData,
+                                       AtaTransferRegister.NoTransfer, ref buffer, timeout, false, out duration,
                                        out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("ATA Device", "SMART DISABLE ATTRIBUTE AUTOSAVE took {0} ms.", duration);
@@ -109,18 +105,17 @@ namespace Aaru.Devices
         public bool SmartEnable(out AtaErrorRegistersLba28 statusRegisters, uint timeout, out double duration)
         {
             byte[] buffer = new byte[0];
-            AtaRegistersLba28 registers = new AtaRegistersLba28
+
+            var registers = new AtaRegistersLba28
             {
-                Command = (byte)AtaCommands.Smart,
-                Feature = (byte)AtaSmartSubCommands.Enable,
-                LbaHigh = 0xC2,
+                Command = (byte)AtaCommands.Smart, Feature = (byte)AtaSmartSubCommands.Enable, LbaHigh = 0xC2,
                 LbaMid  = 0x4F
             };
 
-            LastError = SendAtaCommand(registers,                      out statusRegisters, AtaProtocol.NonData,
-                                       AtaTransferRegister.NoTransfer, ref buffer,          timeout, false,
-                                       out duration,
+            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.NonData,
+                                       AtaTransferRegister.NoTransfer, ref buffer, timeout, false, out duration,
                                        out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("ATA Device", "SMART ENABLE OPERATIONS took {0} ms.", duration);
@@ -128,23 +123,21 @@ namespace Aaru.Devices
             return sense;
         }
 
-        public bool SmartExecuteOffLineImmediate(out AtaErrorRegistersLba28 statusRegisters, byte       subcommand,
-                                                 uint                       timeout,         out double duration)
+        public bool SmartExecuteOffLineImmediate(out AtaErrorRegistersLba28 statusRegisters, byte subcommand,
+                                                 uint timeout, out double duration)
         {
             byte[] buffer = new byte[0];
-            AtaRegistersLba28 registers = new AtaRegistersLba28
+
+            var registers = new AtaRegistersLba28
             {
-                Command = (byte)AtaCommands.Smart,
-                Feature = (byte)AtaSmartSubCommands.ExecuteOfflineImmediate,
-                LbaHigh = 0xC2,
-                LbaMid  = 0x4F,
-                LbaLow  = subcommand
+                Command = (byte)AtaCommands.Smart, Feature = (byte)AtaSmartSubCommands.ExecuteOfflineImmediate,
+                LbaHigh = 0xC2, LbaMid                     = 0x4F, LbaLow = subcommand
             };
 
-            LastError = SendAtaCommand(registers,                      out statusRegisters, AtaProtocol.NonData,
-                                       AtaTransferRegister.NoTransfer, ref buffer,          timeout, false,
-                                       out duration,
+            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.NonData,
+                                       AtaTransferRegister.NoTransfer, ref buffer, timeout, false, out duration,
                                        out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("ATA Device", "SMART EXECUTE OFF-LINE IMMEDIATE took {0} ms.", duration);
@@ -156,18 +149,17 @@ namespace Aaru.Devices
                                   out double duration)
         {
             buffer = new byte[512];
-            AtaRegistersLba28 registers = new AtaRegistersLba28
+
+            var registers = new AtaRegistersLba28
             {
-                Command = (byte)AtaCommands.Smart,
-                Feature = (byte)AtaSmartSubCommands.ReadData,
-                LbaHigh = 0xC2,
+                Command = (byte)AtaCommands.Smart, Feature = (byte)AtaSmartSubCommands.ReadData, LbaHigh = 0xC2,
                 LbaMid  = 0x4F
             };
 
-            LastError = SendAtaCommand(registers,                      out statusRegisters, AtaProtocol.PioIn,
-                                       AtaTransferRegister.NoTransfer, ref buffer,          timeout, false,
-                                       out duration,
+            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.PioIn,
+                                       AtaTransferRegister.NoTransfer, ref buffer, timeout, false, out duration,
                                        out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("ATA Device", "SMART READ DATA took {0} ms.", duration);
@@ -175,23 +167,21 @@ namespace Aaru.Devices
             return sense;
         }
 
-        public bool SmartReadLog(out byte[] buffer,  out AtaErrorRegistersLba28 statusRegisters, byte logAddress,
-                                 uint       timeout, out double                 duration)
+        public bool SmartReadLog(out byte[] buffer, out AtaErrorRegistersLba28 statusRegisters, byte logAddress,
+                                 uint timeout, out double duration)
         {
             buffer = new byte[512];
-            AtaRegistersLba28 registers = new AtaRegistersLba28
+
+            var registers = new AtaRegistersLba28
             {
-                Command = (byte)AtaCommands.Smart,
-                Feature = (byte)AtaSmartSubCommands.ReadLog,
-                LbaHigh = 0xC2,
-                LbaMid  = 0x4F,
-                LbaLow  = logAddress
+                Command = (byte)AtaCommands.Smart, Feature = (byte)AtaSmartSubCommands.ReadLog, LbaHigh = 0xC2,
+                LbaMid  = 0x4F, LbaLow                     = logAddress
             };
 
-            LastError = SendAtaCommand(registers,                      out statusRegisters, AtaProtocol.PioIn,
-                                       AtaTransferRegister.NoTransfer, ref buffer,          timeout, false,
-                                       out duration,
+            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.PioIn,
+                                       AtaTransferRegister.NoTransfer, ref buffer, timeout, false, out duration,
                                        out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("ATA Device", "SMART READ LOG took {0} ms.", duration);
@@ -202,18 +192,17 @@ namespace Aaru.Devices
         public bool SmartReturnStatus(out AtaErrorRegistersLba28 statusRegisters, uint timeout, out double duration)
         {
             byte[] buffer = new byte[0];
-            AtaRegistersLba28 registers = new AtaRegistersLba28
+
+            var registers = new AtaRegistersLba28
             {
-                Command = (byte)AtaCommands.Smart,
-                Feature = (byte)AtaSmartSubCommands.ReturnStatus,
-                LbaHigh = 0xC2,
+                Command = (byte)AtaCommands.Smart, Feature = (byte)AtaSmartSubCommands.ReturnStatus, LbaHigh = 0xC2,
                 LbaMid  = 0x4F
             };
 
-            LastError = SendAtaCommand(registers,                      out statusRegisters, AtaProtocol.NonData,
-                                       AtaTransferRegister.NoTransfer, ref buffer,          timeout, false,
-                                       out duration,
+            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.NonData,
+                                       AtaTransferRegister.NoTransfer, ref buffer, timeout, false, out duration,
                                        out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("ATA Device", "SMART RETURN STATUS took {0} ms.", duration);
diff --git a/Aaru.Devices/Device/Commands.cs b/Aaru.Devices/Device/Commands.cs
index 9334e9ab6..7e40a1006 100644
--- a/Aaru.Devices/Device/Commands.cs
+++ b/Aaru.Devices/Device/Commands.cs
@@ -39,9 +39,7 @@ namespace Aaru.Devices
     [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
     public partial class Device
     {
-        /// <summary>
-        ///     Sends a SCSI command to this device
-        /// </summary>
+        /// <summary>Sends a SCSI command to this device</summary>
         /// <returns>0 if no error occurred, otherwise, errno</returns>
         /// <param name="cdb">SCSI CDB</param>
         /// <param name="buffer">Buffer for SCSI command response</param>
@@ -54,19 +52,17 @@ namespace Aaru.Devices
         ///     SCSI sense
         /// </param>
         public int SendScsiCommand(byte[] cdb, ref byte[] buffer, out byte[] senseBuffer, uint timeout,
-            ScsiDirection direction, out double duration, out bool sense)
+                                   ScsiDirection direction, out double duration, out bool sense)
         {
-            if (!(_remote is null))
-                return _remote.SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout,
-                    direction, out duration, out sense);
+            if(!(_remote is null))
+                return _remote.SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, direction, out duration,
+                                               out sense);
 
             return Command.SendScsiCommand(PlatformId, FileHandle, cdb, ref buffer, out senseBuffer, timeout, direction,
-                out duration, out sense);
+                                           out duration, out sense);
         }
 
-        /// <summary>
-        ///     Sends an ATA/ATAPI command to this device using CHS addressing
-        /// </summary>
+        /// <summary>Sends an ATA/ATAPI command to this device using CHS addressing</summary>
         /// <returns>0 if no error occurred, otherwise, errno</returns>
         /// <param name="registers">ATA registers.</param>
         /// <param name="errorRegisters">Status/error registers.</param>
@@ -81,26 +77,19 @@ namespace Aaru.Devices
         /// <param name="duration">Time it took to execute the command in milliseconds</param>
         /// <param name="sense"><c>True</c> if ATA/ATAPI command returned non-OK status</param>
         public int SendAtaCommand(AtaRegistersChs registers, out AtaErrorRegistersChs errorRegisters,
-            AtaProtocol protocol, AtaTransferRegister transferRegister,
-            ref byte[] buffer,
-            uint timeout, bool transferBlocks,
-            out double duration, out bool sense)
+                                  AtaProtocol protocol, AtaTransferRegister transferRegister, ref byte[] buffer,
+                                  uint timeout, bool transferBlocks, out double duration, out bool sense)
         {
-            if (!(_remote is null))
-                return _remote.SendAtaCommand(registers, out errorRegisters,
-                    protocol, transferRegister,
-                    ref buffer,
-                    timeout, transferBlocks,
-                    out duration, out sense);
+            if(!(_remote is null))
+                return _remote.SendAtaCommand(registers, out errorRegisters, protocol, transferRegister, ref buffer,
+                                              timeout, transferBlocks, out duration, out sense);
 
             return Command.SendAtaCommand(PlatformId, FileHandle, registers, out errorRegisters, protocol,
-                transferRegister,
-                ref buffer, timeout, transferBlocks, out duration, out sense);
+                                          transferRegister, ref buffer, timeout, transferBlocks, out duration,
+                                          out sense);
         }
 
-        /// <summary>
-        ///     Sends an ATA/ATAPI command to this device using 28-bit LBA addressing
-        /// </summary>
+        /// <summary>Sends an ATA/ATAPI command to this device using 28-bit LBA addressing</summary>
         /// <returns>0 if no error occurred, otherwise, errno</returns>
         /// <param name="registers">ATA registers.</param>
         /// <param name="errorRegisters">Status/error registers.</param>
@@ -115,26 +104,19 @@ namespace Aaru.Devices
         /// <param name="duration">Time it took to execute the command in milliseconds</param>
         /// <param name="sense"><c>True</c> if ATA/ATAPI command returned non-OK status</param>
         public int SendAtaCommand(AtaRegistersLba28 registers, out AtaErrorRegistersLba28 errorRegisters,
-            AtaProtocol protocol, AtaTransferRegister transferRegister,
-            ref byte[] buffer,
-            uint timeout, bool transferBlocks,
-            out double duration, out bool sense)
+                                  AtaProtocol protocol, AtaTransferRegister transferRegister, ref byte[] buffer,
+                                  uint timeout, bool transferBlocks, out double duration, out bool sense)
         {
-            if (!(_remote is null))
-                return _remote.SendAtaCommand(registers, out errorRegisters,
-                    protocol, transferRegister,
-                    ref buffer,
-                    timeout, transferBlocks,
-                    out duration, out sense);
+            if(!(_remote is null))
+                return _remote.SendAtaCommand(registers, out errorRegisters, protocol, transferRegister, ref buffer,
+                                              timeout, transferBlocks, out duration, out sense);
 
             return Command.SendAtaCommand(PlatformId, FileHandle, registers, out errorRegisters, protocol,
-                transferRegister,
-                ref buffer, timeout, transferBlocks, out duration, out sense);
+                                          transferRegister, ref buffer, timeout, transferBlocks, out duration,
+                                          out sense);
         }
 
-        /// <summary>
-        ///     Sends an ATA/ATAPI command to this device using 48-bit LBA addressing
-        /// </summary>
+        /// <summary>Sends an ATA/ATAPI command to this device using 48-bit LBA addressing</summary>
         /// <returns>0 if no error occurred, otherwise, errno</returns>
         /// <param name="registers">ATA registers.</param>
         /// <param name="errorRegisters">Status/error registers.</param>
@@ -149,26 +131,19 @@ namespace Aaru.Devices
         /// <param name="duration">Time it took to execute the command in milliseconds</param>
         /// <param name="sense"><c>True</c> if ATA/ATAPI command returned non-OK status</param>
         public int SendAtaCommand(AtaRegistersLba48 registers, out AtaErrorRegistersLba48 errorRegisters,
-            AtaProtocol protocol, AtaTransferRegister transferRegister,
-            ref byte[] buffer,
-            uint timeout, bool transferBlocks,
-            out double duration, out bool sense)
+                                  AtaProtocol protocol, AtaTransferRegister transferRegister, ref byte[] buffer,
+                                  uint timeout, bool transferBlocks, out double duration, out bool sense)
         {
-            if (!(_remote is null))
-                return _remote.SendAtaCommand(registers, out errorRegisters,
-                    protocol, transferRegister,
-                    ref buffer,
-                    timeout, transferBlocks,
-                    out duration, out sense);
+            if(!(_remote is null))
+                return _remote.SendAtaCommand(registers, out errorRegisters, protocol, transferRegister, ref buffer,
+                                              timeout, transferBlocks, out duration, out sense);
 
             return Command.SendAtaCommand(PlatformId, FileHandle, registers, out errorRegisters, protocol,
-                transferRegister,
-                ref buffer, timeout, transferBlocks, out duration, out sense);
+                                          transferRegister, ref buffer, timeout, transferBlocks, out duration,
+                                          out sense);
         }
 
-        /// <summary>
-        ///     Sends a MMC/SD command to this device
-        /// </summary>
+        /// <summary>Sends a MMC/SD command to this device</summary>
         /// <returns>The result of the command.</returns>
         /// <param name="command">MMC/SD opcode</param>
         /// <param name="buffer">Buffer for MMC/SD command response</param>
@@ -182,69 +157,70 @@ namespace Aaru.Devices
         /// <param name="argument">Command argument</param>
         /// <param name="response">Response registers</param>
         /// <param name="blockSize">Size of block in bytes</param>
-        public int SendMmcCommand(MmcCommands command, bool write, bool isApplication, MmcFlags flags,
-            uint argument,
-            uint blockSize, uint blocks, ref byte[] buffer, out uint[] response,
-            out double duration, out bool sense, uint timeout = 0)
+        public int SendMmcCommand(MmcCommands command, bool write, bool isApplication, MmcFlags flags, uint argument,
+                                  uint blockSize, uint blocks, ref byte[] buffer, out uint[] response,
+                                  out double duration, out bool sense, uint timeout = 0)
         {
-            switch (command)
+            switch(command)
             {
                 case MmcCommands.SendCid when cachedCid != null:
                 {
-                    var start = DateTime.Now;
+                    DateTime start = DateTime.Now;
                     buffer = new byte[cachedCid.Length];
                     Array.Copy(cachedCid, buffer, buffer.Length);
                     response = new uint[4];
-                    sense = false;
-                    var end = DateTime.Now;
+                    sense    = false;
+                    DateTime end = DateTime.Now;
                     duration = (end - start).TotalMilliseconds;
+
                     return 0;
                 }
                 case MmcCommands.SendCsd when cachedCid != null:
                 {
-                    var start = DateTime.Now;
+                    DateTime start = DateTime.Now;
                     buffer = new byte[cachedCsd.Length];
                     Array.Copy(cachedCsd, buffer, buffer.Length);
                     response = new uint[4];
-                    sense = false;
-                    var end = DateTime.Now;
+                    sense    = false;
+                    DateTime end = DateTime.Now;
                     duration = (end - start).TotalMilliseconds;
+
                     return 0;
                 }
-                case (MmcCommands) SecureDigitalCommands.SendScr when cachedScr != null:
+                case (MmcCommands)SecureDigitalCommands.SendScr when cachedScr != null:
                 {
-                    var start = DateTime.Now;
+                    DateTime start = DateTime.Now;
                     buffer = new byte[cachedScr.Length];
                     Array.Copy(cachedScr, buffer, buffer.Length);
                     response = new uint[4];
-                    sense = false;
-                    var end = DateTime.Now;
+                    sense    = false;
+                    DateTime end = DateTime.Now;
                     duration = (end - start).TotalMilliseconds;
+
                     return 0;
                 }
-                case (MmcCommands) SecureDigitalCommands.SendOperatingCondition when cachedOcr != null:
-                case MmcCommands.SendOpCond when cachedOcr != null:
+                case (MmcCommands)SecureDigitalCommands.SendOperatingCondition when cachedOcr != null:
+                case MmcCommands.SendOpCond when cachedOcr                                    != null:
                 {
-                    var start = DateTime.Now;
+                    DateTime start = DateTime.Now;
                     buffer = new byte[cachedOcr.Length];
                     Array.Copy(cachedOcr, buffer, buffer.Length);
                     response = new uint[4];
-                    sense = false;
-                    var end = DateTime.Now;
+                    sense    = false;
+                    DateTime end = DateTime.Now;
                     duration = (end - start).TotalMilliseconds;
+
                     return 0;
                 }
             }
 
-            if (!(_remote is null))
-                return _remote.SendMmcCommand(command, write, isApplication, flags,
-                    argument,
-                    blockSize, blocks, ref buffer, out response,
-                    out duration, out sense, timeout);
+            if(!(_remote is null))
+                return _remote.SendMmcCommand(command, write, isApplication, flags, argument, blockSize, blocks,
+                                              ref buffer, out response, out duration, out sense, timeout);
 
             return Command.SendMmcCommand(PlatformId, FileHandle, command, write, isApplication, flags, argument,
-                blockSize, blocks, ref buffer, out response, out duration, out sense,
-                timeout);
+                                          blockSize, blocks, ref buffer, out response, out duration, out sense,
+                                          timeout);
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Devices/Device/Constructor.cs b/Aaru.Devices/Device/Constructor.cs
index 0ca4e7ec8..4a4a7c7e5 100644
--- a/Aaru.Devices/Device/Constructor.cs
+++ b/Aaru.Devices/Device/Constructor.cs
@@ -86,10 +86,10 @@ namespace Aaru.Devices
                 {
                     case PlatformID.Win32NT:
                     {
-                        FileHandle = Windows.Extern.CreateFile(devicePath, FileAccess.GenericRead | FileAccess.GenericWrite,
-                                                               FileShare.Read                     | FileShare.Write,
-                                                               IntPtr.Zero,
-                                                               FileMode.OpenExisting, FileAttributes.Normal, IntPtr.Zero);
+                        FileHandle = Extern.CreateFile(devicePath, FileAccess.GenericRead | FileAccess.GenericWrite,
+                                                       FileShare.Read                     | FileShare.Write,
+                                                       IntPtr.Zero,
+                                                       FileMode.OpenExisting, FileAttributes.Normal, IntPtr.Zero);
 
                         if(((SafeFileHandle)FileHandle).IsInvalid)
                         {
@@ -184,10 +184,10 @@ namespace Aaru.Devices
                         int  error    = 0;
 
                         bool hasError = !Extern.DeviceIoControlStorageQuery((SafeFileHandle)FileHandle,
-                                                                                    WindowsIoctl.IoctlStorageQueryProperty,
-                                                                                    ref query, (uint)Marshal.SizeOf(query),
-                                                                                    descriptorPtr, 1000, ref returned,
-                                                                                    IntPtr.Zero);
+                                                                            WindowsIoctl.IoctlStorageQueryProperty,
+                                                                            ref query, (uint)Marshal.SizeOf(query),
+                                                                            descriptorPtr, 1000, ref returned,
+                                                                            IntPtr.Zero);
 
                         if(hasError)
                             error = Marshal.GetLastWin32Error();
@@ -440,7 +440,7 @@ namespace Aaru.Devices
                 if(cachedScr != null)
                 {
                     Type = DeviceType.SecureDigital;
-                    CID decoded = Aaru.Decoders.SecureDigital.Decoders.DecodeCID(cachedCid);
+                    CID decoded = Decoders.SecureDigital.Decoders.DecodeCID(cachedCid);
                     Manufacturer = VendorString.Prettify(decoded.Manufacturer);
                     Model        = decoded.ProductName;
 
diff --git a/Aaru.Devices/Device/Destructor.cs b/Aaru.Devices/Device/Destructor.cs
index ed9bcc7f2..7e34f3818 100644
--- a/Aaru.Devices/Device/Destructor.cs
+++ b/Aaru.Devices/Device/Destructor.cs
@@ -40,35 +40,37 @@ namespace Aaru.Devices
     public partial class Device
     {
         /// <summary>
-        ///     Releases unmanaged resources and performs other cleanup operations before the
-        ///     <see cref="Device" /> is reclaimed by garbage collection.
+        ///     Releases unmanaged resources and performs other cleanup operations before the <see cref="Device" /> is
+        ///     reclaimed by garbage collection.
         /// </summary>
-        ~Device()
-        {
-            Close();
-        }
+        ~Device() => Close();
 
         public void Close()
         {
-            if (_remote != null)
+            if(_remote != null)
             {
                 _remote.Close();
                 _remote.Disconnect();
+
                 return;
             }
 
-            if (FileHandle == null) return;
+            if(FileHandle == null)
+                return;
 
-            switch (PlatformId)
+            switch(PlatformId)
             {
                 case PlatformID.Win32NT:
                     (FileHandle as SafeFileHandle)?.Close();
+
                     break;
                 case PlatformID.Linux:
-                    Extern.close((int) FileHandle);
+                    Extern.close((int)FileHandle);
+
                     break;
                 case PlatformID.FreeBSD:
-                    FreeBSD.Extern.cam_close_device((IntPtr) FileHandle);
+                    FreeBSD.Extern.cam_close_device((IntPtr)FileHandle);
+
                     break;
             }
 
diff --git a/Aaru.Devices/Device/DeviceException.cs b/Aaru.Devices/Device/DeviceException.cs
index 8455fd03b..2d873f07d 100644
--- a/Aaru.Devices/Device/DeviceException.cs
+++ b/Aaru.Devices/Device/DeviceException.cs
@@ -2,23 +2,14 @@ using System;
 
 namespace Aaru.Devices
 {
-    /// <summary>
-    ///     Exception to be returned by the device constructor
-    /// </summary>
+    /// <summary>Exception to be returned by the device constructor</summary>
     public class DeviceException : Exception
     {
-        internal DeviceException(string message) : base(message)
-        {
-        }
+        internal DeviceException(string message) : base(message) {}
 
-        internal DeviceException(int lastError)
-        {
-            LastError = lastError;
-        }
+        internal DeviceException(int lastError) => LastError = lastError;
 
-        /// <summary>
-        ///     Last error sent by the operating systen
-        /// </summary>
+        /// <summary>Last error sent by the operating systen</summary>
         public int LastError { get; }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Devices/Device/MmcCommands/MMC.cs b/Aaru.Devices/Device/MmcCommands/MMC.cs
index 3fb83a370..3d63188cc 100644
--- a/Aaru.Devices/Device/MmcCommands/MMC.cs
+++ b/Aaru.Devices/Device/MmcCommands/MMC.cs
@@ -40,12 +40,10 @@ namespace Aaru.Devices
         {
             buffer = new byte[16];
 
-            LastError = SendMmcCommand(MmcCommands.SendCsd, false,
-                                       false,
-                                       MmcFlags.ResponseSpiR2 | MmcFlags.ResponseR2 | MmcFlags.CommandAc, 0,
-                                       16,                                                                1,
-                                       ref buffer,                                                        out response,
-                                       out duration,                                                      out bool sense, timeout);
+            LastError = SendMmcCommand(MmcCommands.SendCsd, false, false,
+                                       MmcFlags.ResponseSpiR2 | MmcFlags.ResponseR2 | MmcFlags.CommandAc, 0, 16, 1,
+                                       ref buffer, out response, out duration, out bool sense, timeout);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("MMC Device", "SEND_CSD took {0} ms.", duration);
@@ -57,12 +55,10 @@ namespace Aaru.Devices
         {
             buffer = new byte[16];
 
-            LastError = SendMmcCommand(MmcCommands.SendCid, false,
-                                       false,
-                                       MmcFlags.ResponseSpiR2 | MmcFlags.ResponseR2 | MmcFlags.CommandAc, 0,
-                                       16,                                                                1,
-                                       ref buffer,                                                        out response,
-                                       out duration,                                                      out bool sense, timeout);
+            LastError = SendMmcCommand(MmcCommands.SendCid, false, false,
+                                       MmcFlags.ResponseSpiR2 | MmcFlags.ResponseR2 | MmcFlags.CommandAc, 0, 16, 1,
+                                       ref buffer, out response, out duration, out bool sense, timeout);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("MMC Device", "SEND_CID took {0} ms.", duration);
@@ -74,12 +70,10 @@ namespace Aaru.Devices
         {
             buffer = new byte[4];
 
-            LastError = SendMmcCommand(MmcCommands.SendOpCond, false,
-                                       true,
-                                       MmcFlags.ResponseSpiR3 | MmcFlags.ResponseR3 | MmcFlags.CommandBcr, 0,
-                                       4,                                                                  1,
-                                       ref buffer,                                                         out response,
-                                       out duration,                                                       out bool sense, timeout);
+            LastError = SendMmcCommand(MmcCommands.SendOpCond, false, true,
+                                       MmcFlags.ResponseSpiR3 | MmcFlags.ResponseR3 | MmcFlags.CommandBcr, 0, 4, 1,
+                                       ref buffer, out response, out duration, out bool sense, timeout);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("SecureDigital Device", "SEND_OP_COND took {0} ms.", duration);
@@ -91,12 +85,10 @@ namespace Aaru.Devices
         {
             buffer = new byte[512];
 
-            LastError = SendMmcCommand(MmcCommands.SendExtCsd, false,
-                                       false,
-                                       MmcFlags.ResponseSpiR1 | MmcFlags.ResponseR1 | MmcFlags.CommandAdtc, 0,
-                                       512,                                                                 1,
-                                       ref buffer,
-                                       out response, out duration, out bool sense, timeout);
+            LastError = SendMmcCommand(MmcCommands.SendExtCsd, false, false,
+                                       MmcFlags.ResponseSpiR1 | MmcFlags.ResponseR1 | MmcFlags.CommandAdtc, 0, 512, 1,
+                                       ref buffer, out response, out duration, out bool sense, timeout);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("MMC Device", "SEND_EXT_CSD took {0} ms.", duration);
@@ -108,12 +100,10 @@ namespace Aaru.Devices
         {
             byte[] buffer = new byte[0];
 
-            LastError = SendMmcCommand(MmcCommands.SetBlocklen, false,
-                                       false,
-                                       MmcFlags.ResponseSpiR1 | MmcFlags.ResponseR1 | MmcFlags.CommandAc, length,
-                                       0,                                                                 0,
-                                       ref buffer,                                                        out response,
-                                       out duration,                                                      out bool sense, timeout);
+            LastError = SendMmcCommand(MmcCommands.SetBlocklen, false, false,
+                                       MmcFlags.ResponseSpiR1 | MmcFlags.ResponseR1 | MmcFlags.CommandAc, length, 0, 0,
+                                       ref buffer, out response, out duration, out bool sense, timeout);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("MMC Device", "SET_BLOCKLEN took {0} ms.", duration);
@@ -121,38 +111,39 @@ namespace Aaru.Devices
             return sense;
         }
 
-        public bool Read(out byte[] buffer, out uint[] response, uint lba, uint blockSize,
-                         uint       transferLength,
-                         bool       byteAddressed, uint timeout, out double duration)
+        public bool Read(out byte[] buffer, out uint[] response, uint lba, uint blockSize, uint transferLength,
+                         bool byteAddressed, uint timeout, out double duration)
         {
             buffer = new byte[transferLength * blockSize];
             uint address;
-            if(byteAddressed) address = lba * blockSize;
-            else address              = lba;
+
+            if(byteAddressed)
+                address = lba * blockSize;
+            else
+                address = lba;
 
             MmcCommands command = transferLength > 1 ? MmcCommands.ReadMultipleBlock : MmcCommands.ReadSingleBlock;
 
-            LastError = SendMmcCommand(command, false,
-                                       false,
+            LastError = SendMmcCommand(command, false, false,
                                        MmcFlags.ResponseSpiR1 | MmcFlags.ResponseR1 | MmcFlags.CommandAdtc, address,
-                                       blockSize,
-                                       transferLength, ref buffer, out response, out duration,
+                                       blockSize, transferLength, ref buffer, out response, out duration,
                                        out bool sense, timeout);
+
             Error = LastError != 0;
 
             if(transferLength > 1)
             {
                 byte[] foo = new byte[0];
-                SendMmcCommand(MmcCommands.StopTransmission, false,
-                               false,
-                               MmcFlags.ResponseR1B | MmcFlags.ResponseSpiR1B | MmcFlags.CommandAc, 0,
-                               0,                                                                   0, ref foo,
-                               out _,
-                               out double stopDuration, out bool _, timeout);
+
+                SendMmcCommand(MmcCommands.StopTransmission, false, false,
+                               MmcFlags.ResponseR1B | MmcFlags.ResponseSpiR1B | MmcFlags.CommandAc, 0, 0, 0, ref foo,
+                               out _, out double stopDuration, out bool _, timeout);
+
                 duration += stopDuration;
                 AaruConsole.DebugWriteLine("MMC Device", "READ_MULTIPLE_BLOCK took {0} ms.", duration);
             }
-            else AaruConsole.DebugWriteLine("MMC Device", "READ_SINGLE_BLOCK took {0} ms.", duration);
+            else
+                AaruConsole.DebugWriteLine("MMC Device", "READ_SINGLE_BLOCK took {0} ms.", duration);
 
             return sense;
         }
@@ -161,12 +152,10 @@ namespace Aaru.Devices
         {
             buffer = new byte[4];
 
-            LastError = SendMmcCommand(MmcCommands.SendStatus, false,
-                                       true,
-                                       MmcFlags.ResponseSpiR1 | MmcFlags.ResponseR1 | MmcFlags.CommandAc, 0,
-                                       4,                                                                 1,
-                                       ref buffer,                                                        out response,
-                                       out duration,                                                      out bool sense, timeout);
+            LastError = SendMmcCommand(MmcCommands.SendStatus, false, true,
+                                       MmcFlags.ResponseSpiR1 | MmcFlags.ResponseR1 | MmcFlags.CommandAc, 0, 4, 1,
+                                       ref buffer, out response, out duration, out bool sense, timeout);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("SecureDigital Device", "SEND_STATUS took {0} ms.", duration);
diff --git a/Aaru.Devices/Device/MmcCommands/SecureDigital.cs b/Aaru.Devices/Device/MmcCommands/SecureDigital.cs
index fd6fedd49..f4f94f17a 100644
--- a/Aaru.Devices/Device/MmcCommands/SecureDigital.cs
+++ b/Aaru.Devices/Device/MmcCommands/SecureDigital.cs
@@ -40,12 +40,10 @@ namespace Aaru.Devices
         {
             buffer = new byte[64];
 
-            LastError = SendMmcCommand((MmcCommands)SecureDigitalCommands.SendStatus, false,
-                                       true,
-                                       MmcFlags.ResponseSpiR1 | MmcFlags.ResponseR1 | MmcFlags.CommandAdtc, 0,
-                                       64,                                                                  1,
-                                       ref buffer,
-                                       out response, out duration, out bool sense, timeout);
+            LastError = SendMmcCommand((MmcCommands)SecureDigitalCommands.SendStatus, false, true,
+                                       MmcFlags.ResponseSpiR1 | MmcFlags.ResponseR1 | MmcFlags.CommandAdtc, 0, 64, 1,
+                                       ref buffer, out response, out duration, out bool sense, timeout);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("SecureDigital Device", "SD_STATUS took {0} ms.", duration);
@@ -57,12 +55,10 @@ namespace Aaru.Devices
         {
             buffer = new byte[4];
 
-            LastError = SendMmcCommand((MmcCommands)SecureDigitalCommands.SendOperatingCondition, false,
-                                       true,
-                                       MmcFlags.ResponseSpiR3 | MmcFlags.ResponseR3 | MmcFlags.CommandBcr, 0,
-                                       4,                                                                  1,
-                                       ref buffer,                                                         out response,
-                                       out duration,                                                       out bool sense, timeout);
+            LastError = SendMmcCommand((MmcCommands)SecureDigitalCommands.SendOperatingCondition, false, true,
+                                       MmcFlags.ResponseSpiR3 | MmcFlags.ResponseR3 | MmcFlags.CommandBcr, 0, 4, 1,
+                                       ref buffer, out response, out duration, out bool sense, timeout);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("SecureDigital Device", "SD_SEND_OP_COND took {0} ms.", duration);
@@ -74,12 +70,10 @@ namespace Aaru.Devices
         {
             buffer = new byte[8];
 
-            LastError = SendMmcCommand((MmcCommands)SecureDigitalCommands.SendScr, false,
-                                       true,
-                                       MmcFlags.ResponseSpiR1 | MmcFlags.ResponseR1 | MmcFlags.CommandAdtc, 0,
-                                       8,                                                                   1,
-                                       ref buffer,
-                                       out response, out duration, out bool sense, timeout);
+            LastError = SendMmcCommand((MmcCommands)SecureDigitalCommands.SendScr, false, true,
+                                       MmcFlags.ResponseSpiR1 | MmcFlags.ResponseR1 | MmcFlags.CommandAdtc, 0, 8, 1,
+                                       ref buffer, out response, out duration, out bool sense, timeout);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("SecureDigital Device", "SEND_SCR took {0} ms.", duration);
diff --git a/Aaru.Devices/Device/ScsiCommands/Adaptec.cs b/Aaru.Devices/Device/ScsiCommands/Adaptec.cs
index 42aa91f87..28ce7e7fa 100644
--- a/Aaru.Devices/Device/ScsiCommands/Adaptec.cs
+++ b/Aaru.Devices/Device/ScsiCommands/Adaptec.cs
@@ -38,9 +38,7 @@ namespace Aaru.Devices
 {
     public partial class Device
     {
-        /// <summary>
-        ///     Gets the underlying drive cylinder, head and index bytes for the specified SCSI LBA.
-        /// </summary>
+        /// <summary>Gets the underlying drive cylinder, head and index bytes for the specified SCSI LBA.</summary>
         /// <param name="buffer">Buffer.</param>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="lba">SCSI Logical Block Address.</param>
@@ -50,9 +48,7 @@ namespace Aaru.Devices
                                      out double duration) =>
             AdaptecTranslate(out buffer, out senseBuffer, false, lba, timeout, out duration);
 
-        /// <summary>
-        ///     Gets the underlying drive cylinder, head and index bytes for the specified SCSI LBA.
-        /// </summary>
+        /// <summary>Gets the underlying drive cylinder, head and index bytes for the specified SCSI LBA.</summary>
         /// <param name="buffer">Buffer.</param>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="drive1">If set to <c>true</c> request the data from drive 1.</param>
@@ -70,10 +66,13 @@ namespace Aaru.Devices
             cdb[1] = (byte)((lba & 0x1F0000) >> 16);
             cdb[2] = (byte)((lba & 0xFF00)   >> 8);
             cdb[3] = (byte)(lba & 0xFF);
-            if(drive1) cdb[1] += 0x20;
+
+            if(drive1)
+                cdb[1] += 0x20;
 
             LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
                                         out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("SCSI Device", "ADAPTEC TRANSLATE took {0} ms.", duration);
@@ -81,9 +80,7 @@ namespace Aaru.Devices
             return sense;
         }
 
-        /// <summary>
-        ///     Sets the error threshold
-        /// </summary>
+        /// <summary>Sets the error threshold</summary>
         /// <returns><c>true</c>, if set error threshold was adapteced, <c>false</c> otherwise.</returns>
         /// <param name="threshold">Threshold. 0 to disable error reporting.</param>
         /// <param name="senseBuffer">Sense buffer.</param>
@@ -93,16 +90,14 @@ namespace Aaru.Devices
             AdaptecSetErrorThreshold(byte threshold, out byte[] senseBuffer, uint timeout, out double duration) =>
             AdaptecSetErrorThreshold(threshold, out senseBuffer, false, timeout, out duration);
 
-        /// <summary>
-        ///     Sets the error threshold
-        /// </summary>
+        /// <summary>Sets the error threshold</summary>
         /// <returns><c>true</c>, if set error threshold was adapteced, <c>false</c> otherwise.</returns>
         /// <param name="threshold">Threshold. 0 to disable error reporting.</param>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="drive1">If set to <c>true</c> set the threshold from drive 1.</param>
         /// <param name="timeout">Timeout.</param>
         /// <param name="duration">Duration.</param>
-        public bool AdaptecSetErrorThreshold(byte       threshold, out byte[] senseBuffer, bool drive1, uint timeout,
+        public bool AdaptecSetErrorThreshold(byte threshold, out byte[] senseBuffer, bool drive1, uint timeout,
                                              out double duration)
         {
             byte[] buffer = new byte[1];
@@ -111,11 +106,15 @@ namespace Aaru.Devices
             senseBuffer = new byte[32];
 
             cdb[0] = (byte)ScsiCommands.AdaptecSetErrorThreshold;
-            if(drive1) cdb[1] += 0x20;
+
+            if(drive1)
+                cdb[1] += 0x20;
+
             cdb[4] = 1;
 
             LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.Out, out duration,
                                         out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("SCSI Device", "ADAPTEC SET ERROR THRESHOLD took {0} ms.", duration);
@@ -123,9 +122,7 @@ namespace Aaru.Devices
             return sense;
         }
 
-        /// <summary>
-        ///     Requests the usage, seek and error counters, and resets them
-        /// </summary>
+        /// <summary>Requests the usage, seek and error counters, and resets them</summary>
         /// <param name="buffer">Buffer.</param>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="timeout">Timeout.</param>
@@ -134,9 +131,7 @@ namespace Aaru.Devices
                                             out double duration) =>
             AdaptecReadUsageCounter(out buffer, out senseBuffer, false, timeout, out duration);
 
-        /// <summary>
-        ///     Requests the usage, seek and error counters, and resets them
-        /// </summary>
+        /// <summary>Requests the usage, seek and error counters, and resets them</summary>
         /// <param name="buffer">Buffer.</param>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="drive1">If set to <c>true</c> get the counters from drive 1.</param>
@@ -150,11 +145,15 @@ namespace Aaru.Devices
             senseBuffer = new byte[32];
 
             cdb[0] = (byte)ScsiCommands.AdaptecTranslate;
-            if(drive1) cdb[1] += 0x20;
+
+            if(drive1)
+                cdb[1] += 0x20;
+
             cdb[4] = (byte)buffer.Length;
 
             LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
                                         out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("SCSI Device", "ADAPTEC READ/RESET USAGE COUNTER took {0} ms.", duration);
@@ -162,9 +161,7 @@ namespace Aaru.Devices
             return sense;
         }
 
-        /// <summary>
-        ///     Fills the Adaptec controller RAM with 1K bytes of data
-        /// </summary>
+        /// <summary>Fills the Adaptec controller RAM with 1K bytes of data</summary>
         /// <param name="buffer">Data to fill the buffer with.</param>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="timeout">Timeout.</param>
@@ -181,6 +178,7 @@ namespace Aaru.Devices
 
             LastError = SendScsiCommand(cdb, ref oneKBuffer, out senseBuffer, timeout, ScsiDirection.Out, out duration,
                                         out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("SCSI Device", "ADAPTEC WRITE DATA BUFFER took {0} ms.", duration);
@@ -188,9 +186,7 @@ namespace Aaru.Devices
             return sense;
         }
 
-        /// <summary>
-        ///     Reads 1K bytes of data from the Adaptec controller RAM
-        /// </summary>
+        /// <summary>Reads 1K bytes of data from the Adaptec controller RAM</summary>
         /// <param name="buffer">Buffer.</param>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="timeout">Timeout.</param>
@@ -205,6 +201,7 @@ namespace Aaru.Devices
 
             LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
                                         out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("SCSI Device", "ADAPTEC READ DATA BUFFER took {0} ms.", duration);
diff --git a/Aaru.Devices/Device/ScsiCommands/ArchiveCorp.cs b/Aaru.Devices/Device/ScsiCommands/ArchiveCorp.cs
index 9fb50c450..129e9586c 100644
--- a/Aaru.Devices/Device/ScsiCommands/ArchiveCorp.cs
+++ b/Aaru.Devices/Device/ScsiCommands/ArchiveCorp.cs
@@ -36,9 +36,7 @@ namespace Aaru.Devices
 {
     public partial class Device
     {
-        /// <summary>
-        ///     Gets the underlying drive cylinder, head and index bytes for the specified SCSI LBA.
-        /// </summary>
+        /// <summary>Gets the underlying drive cylinder, head and index bytes for the specified SCSI LBA.</summary>
         /// <param name="buffer">Buffer.</param>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="lba">Address.</param>
@@ -59,6 +57,7 @@ namespace Aaru.Devices
 
             LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
                                         out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("SCSI Device", "ARCHIVE CORP. REQUEST BLOCK ADDRESS took {0} ms.", duration);
@@ -66,9 +65,7 @@ namespace Aaru.Devices
             return sense;
         }
 
-        /// <summary>
-        ///     Gets the underlying drive cylinder, head and index bytes for the specified SCSI LBA.
-        /// </summary>
+        /// <summary>Gets the underlying drive cylinder, head and index bytes for the specified SCSI LBA.</summary>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="lba">Logical Block Address, starting from 1.</param>
         /// <param name="timeout">Timeout.</param>
@@ -76,9 +73,7 @@ namespace Aaru.Devices
         public bool ArchiveCorpSeekBlock(out byte[] senseBuffer, uint lba, uint timeout, out double duration) =>
             ArchiveCorpSeekBlock(out senseBuffer, false, lba, timeout, out duration);
 
-        /// <summary>
-        ///     Positions the tape at the specified block address
-        /// </summary>
+        /// <summary>Positions the tape at the specified block address</summary>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="immediate">If set to <c>true</c>, return from the command immediately.</param>
         /// <param name="lba">Logical Block Address, starting from 1.</param>
@@ -95,10 +90,13 @@ namespace Aaru.Devices
             cdb[1] = (byte)((lba & 0x1F0000) >> 16);
             cdb[2] = (byte)((lba & 0xFF00)   >> 8);
             cdb[3] = (byte)(lba & 0xFF);
-            if(immediate) cdb[1] += 0x01;
+
+            if(immediate)
+                cdb[1] += 0x01;
 
             LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.None, out duration,
                                         out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("SCSI Device", "ARCHIVE CORP. SEEK BLOCK took {0} ms.", duration);
diff --git a/Aaru.Devices/Device/ScsiCommands/Certance.cs b/Aaru.Devices/Device/ScsiCommands/Certance.cs
index f829518e2..b78f474b8 100644
--- a/Aaru.Devices/Device/ScsiCommands/Certance.cs
+++ b/Aaru.Devices/Device/ScsiCommands/Certance.cs
@@ -38,27 +38,21 @@ namespace Aaru.Devices
     [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
     public partial class Device
     {
-        /// <summary>
-        ///     Parks the load arm in preparation for transport
-        /// </summary>
+        /// <summary>Parks the load arm in preparation for transport</summary>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="timeout">Timeout.</param>
         /// <param name="duration">Duration.</param>
         public bool CertancePark(out byte[] senseBuffer, uint timeout, out double duration) =>
             CertanceParkUnpark(out senseBuffer, true, timeout, out duration);
 
-        /// <summary>
-        ///     Unparks the load arm prior to operation
-        /// </summary>
+        /// <summary>Unparks the load arm prior to operation</summary>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="timeout">Timeout.</param>
         /// <param name="duration">Duration.</param>
         public bool CertanceUnpark(out byte[] senseBuffer, uint timeout, out double duration) =>
             CertanceParkUnpark(out senseBuffer, false, timeout, out duration);
 
-        /// <summary>
-        ///     Parks the load arm in preparation for transport or unparks it prior to operation
-        /// </summary>
+        /// <summary>Parks the load arm in preparation for transport or unparks it prior to operation</summary>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="park">If set to <c>true</c>, parks the load arm</param>
         /// <param name="timeout">Timeout.</param>
@@ -70,10 +64,13 @@ namespace Aaru.Devices
             senseBuffer = new byte[32];
 
             cdb[0] = (byte)ScsiCommands.CertanceParkUnpark;
-            if(park) cdb[4] = 1;
+
+            if(park)
+                cdb[4] = 1;
 
             LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.None, out duration,
                                         out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("SCSI Device", "CERTANCE PARK UNPARK took {0} ms.", duration);
diff --git a/Aaru.Devices/Device/ScsiCommands/Fujitsu.cs b/Aaru.Devices/Device/ScsiCommands/Fujitsu.cs
index 0df264d4c..d9fae37dd 100644
--- a/Aaru.Devices/Device/ScsiCommands/Fujitsu.cs
+++ b/Aaru.Devices/Device/ScsiCommands/Fujitsu.cs
@@ -38,8 +38,8 @@ namespace Aaru.Devices
 {
     public partial class Device
     {
-        public bool FujitsuDisplay(out byte[] senseBuffer, bool flash,   FujitsuDisplayModes mode, string firstHalf,
-                                   string     secondHalf,  uint timeout, out double          duration)
+        public bool FujitsuDisplay(out byte[] senseBuffer, bool flash, FujitsuDisplayModes mode, string firstHalf,
+                                   string secondHalf, uint timeout, out double duration)
         {
             byte[] tmp;
             byte[] firstHalfBytes  = new byte[8];
@@ -66,15 +66,23 @@ namespace Aaru.Devices
                    !ArrayHelpers.ArrayIsNullOrWhiteSpace(secondHalfBytes))
                     displayLen = true;
                 else if(!ArrayHelpers.ArrayIsNullOrWhiteSpace(firstHalfBytes) &&
-                        ArrayHelpers.ArrayIsNullOrWhiteSpace(secondHalfBytes)) halfMsg = true;
+                        ArrayHelpers.ArrayIsNullOrWhiteSpace(secondHalfBytes))
+                    halfMsg = true;
 
             buffer[0] = (byte)((byte)mode << 5);
-            if(displayLen) buffer[0] += 0x10;
-            if(flash) buffer[0]      += 0x08;
-            if(halfMsg) buffer[0]    += 0x04;
+
+            if(displayLen)
+                buffer[0] += 0x10;
+
+            if(flash)
+                buffer[0] += 0x08;
+
+            if(halfMsg)
+                buffer[0] += 0x04;
+
             buffer[0] += 0x01; // Always ASCII
 
-            Array.Copy(firstHalfBytes,  0, buffer, 1, 8);
+            Array.Copy(firstHalfBytes, 0, buffer, 1, 8);
             Array.Copy(secondHalfBytes, 0, buffer, 9, 8);
 
             cdb[0] = (byte)ScsiCommands.FujitsuDisplay;
@@ -82,6 +90,7 @@ namespace Aaru.Devices
 
             LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.Out, out duration,
                                         out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("SCSI Device", "FUJITSU DISPLAY took {0} ms.", duration);
diff --git a/Aaru.Devices/Device/ScsiCommands/HL-DT-ST.cs b/Aaru.Devices/Device/ScsiCommands/HL-DT-ST.cs
index 8dcf92b89..2986b75dc 100644
--- a/Aaru.Devices/Device/ScsiCommands/HL-DT-ST.cs
+++ b/Aaru.Devices/Device/ScsiCommands/HL-DT-ST.cs
@@ -36,9 +36,7 @@ namespace Aaru.Devices
 {
     public partial class Device
     {
-        /// <summary>
-        ///     Reads a "raw" sector from DVD on HL-DT-ST drives.
-        /// </summary>
+        /// <summary>Reads a "raw" sector from DVD on HL-DT-ST drives.</summary>
         /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
         /// <param name="buffer">Buffer where the HL-DT-ST READ DVD (RAW) response will be stored</param>
         /// <param name="senseBuffer">Sense buffer.</param>
@@ -46,8 +44,8 @@ namespace Aaru.Devices
         /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
         /// <param name="lba">Start block address.</param>
         /// <param name="transferLength">How many blocks to read.</param>
-        public bool HlDtStReadRawDvd(out byte[] buffer,  out byte[] senseBuffer, uint lba, uint transferLength,
-                                     uint       timeout, out double duration)
+        public bool HlDtStReadRawDvd(out byte[] buffer, out byte[] senseBuffer, uint lba, uint transferLength,
+                                     uint timeout, out double duration)
         {
             senseBuffer = new byte[32];
             byte[] cdb = new byte[12];
@@ -67,6 +65,7 @@ namespace Aaru.Devices
 
             LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
                                         out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("SCSI Device", "HL-DT-ST READ DVD (RAW) took {0} ms.", duration);
diff --git a/Aaru.Devices/Device/ScsiCommands/HP.cs b/Aaru.Devices/Device/ScsiCommands/HP.cs
index 4beadc990..0be8c3f57 100644
--- a/Aaru.Devices/Device/ScsiCommands/HP.cs
+++ b/Aaru.Devices/Device/ScsiCommands/HP.cs
@@ -36,9 +36,7 @@ namespace Aaru.Devices
 {
     public partial class Device
     {
-        /// <summary>
-        ///     Sends the HP READ LONG vendor command
-        /// </summary>
+        /// <summary>Sends the HP READ LONG vendor command</summary>
         /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
         /// <param name="buffer">Buffer where the SCSI READ LONG response will be stored</param>
         /// <param name="senseBuffer">Sense buffer.</param>
@@ -48,14 +46,11 @@ namespace Aaru.Devices
         /// <param name="pba">If set to <c>true</c> address contain physical block address.</param>
         /// <param name="timeout">Timeout in seconds.</param>
         /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        public bool HpReadLong(out byte[] buffer, out byte[] senseBuffer, bool relAddr, uint address,
-                               ushort     blockBytes,
-                               bool       pba, uint timeout, out double duration) =>
+        public bool HpReadLong(out byte[] buffer, out byte[] senseBuffer, bool relAddr, uint address, ushort blockBytes,
+                               bool pba, uint timeout, out double duration) =>
             HpReadLong(out buffer, out senseBuffer, relAddr, address, 0, blockBytes, pba, false, timeout, out duration);
 
-        /// <summary>
-        ///     Sends the HP READ LONG vendor command
-        /// </summary>
+        /// <summary>Sends the HP READ LONG vendor command</summary>
         /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
         /// <param name="buffer">Buffer where the SCSI READ LONG response will be stored</param>
         /// <param name="senseBuffer">Sense buffer.</param>
@@ -70,29 +65,36 @@ namespace Aaru.Devices
         /// </param>
         /// <param name="timeout">Timeout in seconds.</param>
         /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        public bool HpReadLong(out byte[] buffer,      out byte[] senseBuffer, bool relAddr, uint address,
-                               ushort     transferLen, ushort     blockBytes,  bool pba,     bool sectorCount,
-                               uint       timeout,
+        public bool HpReadLong(out byte[] buffer, out byte[] senseBuffer, bool relAddr, uint address,
+                               ushort transferLen, ushort blockBytes, bool pba, bool sectorCount, uint timeout,
                                out double duration)
         {
             senseBuffer = new byte[32];
             byte[] cdb = new byte[10];
 
             cdb[0] = (byte)ScsiCommands.ReadLong;
-            if(relAddr) cdb[1] += 0x01;
+
+            if(relAddr)
+                cdb[1] += 0x01;
+
             cdb[2] = (byte)((address & 0xFF000000) >> 24);
             cdb[3] = (byte)((address & 0xFF0000)   >> 16);
             cdb[4] = (byte)((address & 0xFF00)     >> 8);
             cdb[5] = (byte)(address & 0xFF);
             cdb[7] = (byte)((transferLen & 0xFF00) >> 8);
             cdb[8] = (byte)(transferLen & 0xFF);
-            if(pba) cdb[9]         += 0x80;
-            if(sectorCount) cdb[9] += 0x40;
+
+            if(pba)
+                cdb[9] += 0x80;
+
+            if(sectorCount)
+                cdb[9] += 0x40;
 
             buffer = sectorCount ? new byte[blockBytes * transferLen] : new byte[transferLen];
 
             LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
                                         out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("SCSI Device", "HP READ LONG took {0} ms.", duration);
diff --git a/Aaru.Devices/Device/ScsiCommands/Kreon.cs b/Aaru.Devices/Device/ScsiCommands/Kreon.cs
index e0f4dccd8..c6cf31e5c 100644
--- a/Aaru.Devices/Device/ScsiCommands/Kreon.cs
+++ b/Aaru.Devices/Device/ScsiCommands/Kreon.cs
@@ -37,9 +37,7 @@ namespace Aaru.Devices
 {
     public partial class Device
     {
-        /// <summary>
-        ///     Sets the drive to the xtreme unlocked state
-        /// </summary>
+        /// <summary>Sets the drive to the xtreme unlocked state</summary>
         /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="timeout">Timeout.</param>
@@ -57,6 +55,7 @@ namespace Aaru.Devices
 
             LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.None, out duration,
                                         out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("SCSI Device", "KREON DEPRECATED UNLOCK took {0} ms.", duration);
@@ -64,9 +63,7 @@ namespace Aaru.Devices
             return sense;
         }
 
-        /// <summary>
-        ///     Sets the drive to the locked state.
-        /// </summary>
+        /// <summary>Sets the drive to the locked state.</summary>
         /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="timeout">Timeout.</param>
@@ -74,9 +71,7 @@ namespace Aaru.Devices
         public bool KreonLock(out byte[] senseBuffer, uint timeout, out double duration) =>
             KreonSetLockState(out senseBuffer, KreonLockStates.Locked, timeout, out duration);
 
-        /// <summary>
-        ///     Sets the drive to the xtreme unlocked state
-        /// </summary>
+        /// <summary>Sets the drive to the xtreme unlocked state</summary>
         /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="timeout">Timeout.</param>
@@ -84,9 +79,7 @@ namespace Aaru.Devices
         public bool KreonUnlockXtreme(out byte[] senseBuffer, uint timeout, out double duration) =>
             KreonSetLockState(out senseBuffer, KreonLockStates.Xtreme, timeout, out duration);
 
-        /// <summary>
-        ///     Sets the drive to the wxripper unlocked state
-        /// </summary>
+        /// <summary>Sets the drive to the wxripper unlocked state</summary>
         /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="timeout">Timeout.</param>
@@ -94,9 +87,7 @@ namespace Aaru.Devices
         public bool KreonUnlockWxripper(out byte[] senseBuffer, uint timeout, out double duration) =>
             KreonSetLockState(out senseBuffer, KreonLockStates.Wxripper, timeout, out duration);
 
-        /// <summary>
-        ///     Sets the drive to the specified lock state
-        /// </summary>
+        /// <summary>Sets the drive to the specified lock state</summary>
         /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="timeout">Timeout.</param>
@@ -116,6 +107,7 @@ namespace Aaru.Devices
 
             LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.None, out duration,
                                         out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("SCSI Device", "KREON SET LOCK STATE took {0} ms.", duration);
@@ -123,9 +115,7 @@ namespace Aaru.Devices
             return sense;
         }
 
-        /// <summary>
-        ///     Gets a list of supported features
-        /// </summary>
+        /// <summary>Gets a list of supported features</summary>
         /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="timeout">Timeout.</param>
@@ -146,51 +136,68 @@ namespace Aaru.Devices
 
             LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
                                         out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("SCSI Device", "KREON GET FEATURE LIST took {0} ms.", duration);
 
-            if(sense) return true;
+            if(sense)
+                return true;
 
-            if(buffer[0] != 0xA5 || buffer[1] != 0x5A || buffer[2] != 0x5A || buffer[3] != 0xA5) return true;
+            if(buffer[0] != 0xA5 ||
+               buffer[1] != 0x5A ||
+               buffer[2] != 0x5A ||
+               buffer[3] != 0xA5)
+                return true;
 
             for(int i = 4; i < 26; i += 2)
             {
                 ushort feature = BitConverter.ToUInt16(buffer, i);
 
-                if(feature == 0x0000) break;
+                if(feature == 0x0000)
+                    break;
 
                 switch(feature)
                 {
                     case 0x0001:
                         features |= KreonFeatures.XtremeUnlock360;
+
                         break;
                     case 0x0101:
                         features |= KreonFeatures.WxripperUnlock360;
+
                         break;
                     case 0x2001:
                         features |= KreonFeatures.DecryptSs360;
+
                         break;
                     case 0x2101:
                         features |= KreonFeatures.ChallengeResponse360;
+
                         break;
                     case 0x0002:
                         features |= KreonFeatures.XtremeUnlock;
+
                         break;
                     case 0x0102:
                         features |= KreonFeatures.WxripperUnlock;
+
                         break;
                     case 0x2002:
                         features |= KreonFeatures.DecryptSs;
+
                         break;
                     case 0x2102:
                         features |= KreonFeatures.ChallengeResponse;
+
                         break;
                     case 0x00F0:
                         features |= KreonFeatures.Lock;
+
                         break;
                     case 0x01F0:
                         features |= KreonFeatures.ErrorSkipping;
+
                         break;
                 }
             }
@@ -198,9 +205,7 @@ namespace Aaru.Devices
             return false;
         }
 
-        /// <summary>
-        ///     Gets the SS sector.
-        /// </summary>
+        /// <summary>Gets the SS sector.</summary>
         /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="timeout">Timeout.</param>
@@ -208,7 +213,7 @@ namespace Aaru.Devices
         /// <param name="buffer">The SS sector.</param>
         /// <param name="requestNumber">Request number.</param>
         public bool KreonExtractSs(out byte[] buffer, out byte[] senseBuffer, uint timeout, out double duration,
-                                   byte       requestNumber = 0x00)
+                                   byte requestNumber = 0x00)
         {
             buffer = new byte[2048];
             byte[] cdb = new byte[12];
@@ -229,6 +234,7 @@ namespace Aaru.Devices
 
             LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
                                         out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("SCSI Device", "KREON EXTRACT SS took {0} ms.", duration);
diff --git a/Aaru.Devices/Device/ScsiCommands/MMC.cs b/Aaru.Devices/Device/ScsiCommands/MMC.cs
index 66f21ff70..ea9305cb2 100644
--- a/Aaru.Devices/Device/ScsiCommands/MMC.cs
+++ b/Aaru.Devices/Device/ScsiCommands/MMC.cs
@@ -102,8 +102,8 @@ namespace Aaru.Devices
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("SCSI Device",
-                                      "GET CONFIGURATION (Starting Feature Number: {1}, Return Type: {2}, Sense: {3}, Last Error: {4}) took {0} ms.",
-                                      duration, startingFeatureNumber, rt, sense, LastError);
+                                       "GET CONFIGURATION (Starting Feature Number: {1}, Return Type: {2}, Sense: {3}, Last Error: {4}) took {0} ms.",
+                                       duration, startingFeatureNumber, rt, sense, LastError);
 
             return sense;
         }
@@ -191,8 +191,8 @@ namespace Aaru.Devices
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("SCSI Device",
-                                      "READ DISC STRUCTURE (Media Type: {1}, Address: {2}, Layer Number: {3}, Format: {4}, AGID: {5}, Sense: {6}, Last Error: {7}) took {0} ms.",
-                                      duration, mediaType, address, layerNumber, format, agid, sense, LastError);
+                                       "READ DISC STRUCTURE (Media Type: {1}, Address: {2}, Layer Number: {3}, Format: {4}, AGID: {5}, Sense: {6}, Last Error: {7}) took {0} ms.",
+                                       duration, mediaType, address, layerNumber, format, agid, sense, LastError);
 
             return sense;
         }
@@ -317,8 +317,8 @@ namespace Aaru.Devices
                 Array.Copy(tmpBuffer, 0, buffer, 0, buffer.Length);
 
                 AaruConsole.DebugWriteLine("SCSI Device",
-                                          "READ TOC/PMA/ATIP took (MSF: {1}, Format: {2}, Track/Session Number: {3}, Sense: {4}, LastError: {5}) {0} ms.",
-                                          duration, msf, format, trackSessionNumber, sense, LastError);
+                                           "READ TOC/PMA/ATIP took (MSF: {1}, Format: {2}, Track/Session Number: {3}, Sense: {4}, LastError: {5}) {0} ms.",
+                                           duration, msf, format, trackSessionNumber, sense, LastError);
 
                 return sense;
             }
@@ -333,8 +333,8 @@ namespace Aaru.Devices
             duration += tmpDuration;
 
             AaruConsole.DebugWriteLine("SCSI Device",
-                                      "READ TOC/PMA/ATIP took (MSF: {1}, Format: {2}, Track/Session Number: {3}, Sense: {4}, LastError: {5}) {0} ms.",
-                                      duration, msf, format, trackSessionNumber, sense, LastError);
+                                       "READ TOC/PMA/ATIP took (MSF: {1}, Format: {2}, Track/Session Number: {3}, Sense: {4}, LastError: {5}) {0} ms.",
+                                       duration, msf, format, trackSessionNumber, sense, LastError);
 
             return sense;
         }
@@ -382,8 +382,8 @@ namespace Aaru.Devices
             Array.Copy(tmpBuffer, 0, buffer, 0, buffer.Length);
 
             AaruConsole.DebugWriteLine("SCSI Device",
-                                      "READ DISC INFORMATION (Data Type: {1}, Sense: {2}, Last Error: {3}) took {0} ms.",
-                                      duration, dataType, sense, LastError);
+                                       "READ DISC INFORMATION (Data Type: {1}, Sense: {2}, Last Error: {3}) took {0} ms.",
+                                       duration, dataType, sense, LastError);
 
             return sense;
         }
@@ -452,9 +452,9 @@ namespace Aaru.Devices
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("SCSI Device",
-                                      "READ CD (LBA: {1}, Block Size: {2}, Transfer Length: {3}, Expected Sector Type: {4}, DAP: {5}, Relative Address: {6}, Sync: {7}, Headers: {8}, User Data: {9}, ECC/EDC: {10}, C2: {11}, Subchannel: {12}, Sense: {13}, Last Error: {14}) took {0} ms.",
-                                      duration, lba, blockSize, transferLength, expectedSectorType, dap, relAddr, sync,
-                                      headerCodes, userData, edcEcc, c2Error, subchannel, sense, LastError);
+                                       "READ CD (LBA: {1}, Block Size: {2}, Transfer Length: {3}, Expected Sector Type: {4}, DAP: {5}, Relative Address: {6}, Sync: {7}, Headers: {8}, User Data: {9}, ECC/EDC: {10}, C2: {11}, Subchannel: {12}, Sense: {13}, Last Error: {14}) took {0} ms.",
+                                       duration, lba, blockSize, transferLength, expectedSectorType, dap, relAddr, sync,
+                                       headerCodes, userData, edcEcc, c2Error, subchannel, sense, LastError);
 
             return sense;
         }
@@ -520,9 +520,9 @@ namespace Aaru.Devices
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("SCSI Device",
-                                      "READ CD MSF (Start MSF: {1}, End MSF: {2}, Block Size: {3}, Expected Sector Type: {4}, DAP: {5}, Sync: {6}, Headers: {7}, User Data: {8}, ECC/EDC: {9}, C2: {10}, Subchannel: {11}, Sense: {12}, LastError: {13}) took {0} ms.",
-                                      duration, startMsf, endMsf, blockSize, expectedSectorType, dap, sync, headerCodes,
-                                      userData, edcEcc, c2Error, subchannel, sense, LastError);
+                                       "READ CD MSF (Start MSF: {1}, End MSF: {2}, Block Size: {3}, Expected Sector Type: {4}, DAP: {5}, Sync: {6}, Headers: {7}, User Data: {8}, ECC/EDC: {9}, C2: {10}, Subchannel: {11}, Sense: {12}, LastError: {13}) took {0} ms.",
+                                       duration, startMsf, endMsf, blockSize, expectedSectorType, dap, sync,
+                                       headerCodes, userData, edcEcc, c2Error, subchannel, sense, LastError);
 
             return sense;
         }
@@ -554,8 +554,8 @@ namespace Aaru.Devices
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("SCSI Device",
-                                      "PREVENT ALLOW MEDIUM REMOVAL (Persistent: {1}, Prevent: {2}, Sense: {3}, LastError: {4}) took {0} ms.",
-                                      duration, persistent, prevent, sense, LastError);
+                                       "PREVENT ALLOW MEDIUM REMOVAL (Persistent: {1}, Prevent: {2}, Sense: {3}, LastError: {4}) took {0} ms.",
+                                       duration, persistent, prevent, sense, LastError);
 
             return sense;
         }
@@ -606,9 +606,9 @@ namespace Aaru.Devices
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("SCSI Device",
-                                      "START STOP UNIT (Immediate: {1}, FormatLayer: {2}, Power Conditions: {3}, Change Format Layer: {4}, Load/Eject: {5}, Start: {6}, Sense: {7}, Last Error: {8}) took {0} ms.",
-                                      duration, immediate, formatLayer, powerConditions, changeFormatLayer, loadEject,
-                                      start, sense, LastError);
+                                       "START STOP UNIT (Immediate: {1}, FormatLayer: {2}, Power Conditions: {3}, Change Format Layer: {4}, Load/Eject: {5}, Start: {6}, Sense: {7}, Last Error: {8}) took {0} ms.",
+                                       duration, immediate, formatLayer, powerConditions, changeFormatLayer, loadEject,
+                                       start, sense, LastError);
 
             return sense;
         }
@@ -635,8 +635,8 @@ namespace Aaru.Devices
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("SCSI Device",
-                                      "READ READ SUB-CHANNEL (MCN, Sense {1}, Last Error {2}) took {0} ms.", duration,
-                                      sense, LastError);
+                                       "READ READ SUB-CHANNEL (MCN, Sense {1}, Last Error {2}) took {0} ms.", duration,
+                                       sense, LastError);
 
             if(!sense &&
                (buffer[8] & 0x80) == 0x80)
@@ -668,8 +668,8 @@ namespace Aaru.Devices
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("SCSI Device",
-                                      "READ READ SUB-CHANNEL (ISRC, Track Number: {1}, Sense: {2}, Last Error: {3}) took {0} ms.",
-                                      duration, trackNumber, sense, LastError);
+                                       "READ READ SUB-CHANNEL (ISRC, Track Number: {1}, Sense: {2}, Last Error: {3}) took {0} ms.",
+                                       duration, trackNumber, sense, LastError);
 
             if(!sense &&
                (buffer[8] & 0x80) == 0x80)
@@ -698,8 +698,8 @@ namespace Aaru.Devices
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("SCSI Device",
-                                      "SET CD SPEED (Rotational Control: {1}, Read Speed: {2}, Write Speed: {3}, Sense: {4}, Last Error: {5}) took {0} ms.",
-                                      duration, rotationalControl, readSpeed, writeSpeed, sense, LastError);
+                                       "SET CD SPEED (Rotational Control: {1}, Read Speed: {2}, Write Speed: {3}, Sense: {4}, Last Error: {5}) took {0} ms.",
+                                       duration, rotationalControl, readSpeed, writeSpeed, sense, LastError);
 
             return sense;
         }
diff --git a/Aaru.Devices/Device/ScsiCommands/NEC.cs b/Aaru.Devices/Device/ScsiCommands/NEC.cs
index 446cd23b8..175a6ba6a 100644
--- a/Aaru.Devices/Device/ScsiCommands/NEC.cs
+++ b/Aaru.Devices/Device/ScsiCommands/NEC.cs
@@ -36,9 +36,7 @@ namespace Aaru.Devices
 {
     public partial class Device
     {
-        /// <summary>
-        ///     Sends the NEC READ CD-DA command
-        /// </summary>
+        /// <summary>Sends the NEC READ CD-DA command</summary>
         /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
         /// <param name="buffer">Buffer where the NEC READ CD-DA response will be stored</param>
         /// <param name="senseBuffer">Sense buffer.</param>
@@ -64,6 +62,7 @@ namespace Aaru.Devices
 
             LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
                                         out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("SCSI Device", "READ CD-DA took {0} ms.", duration);
diff --git a/Aaru.Devices/Device/ScsiCommands/Pioneer.cs b/Aaru.Devices/Device/ScsiCommands/Pioneer.cs
index 7737705d6..b40011c1a 100644
--- a/Aaru.Devices/Device/ScsiCommands/Pioneer.cs
+++ b/Aaru.Devices/Device/ScsiCommands/Pioneer.cs
@@ -36,9 +36,7 @@ namespace Aaru.Devices
 {
     public partial class Device
     {
-        /// <summary>
-        ///     Sends the Pioneer READ CD-DA command
-        /// </summary>
+        /// <summary>Sends the Pioneer READ CD-DA command</summary>
         /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
         /// <param name="buffer">Buffer where the Pioneer READ CD-DA response will be stored</param>
         /// <param name="senseBuffer">Sense buffer.</param>
@@ -48,8 +46,8 @@ namespace Aaru.Devices
         /// <param name="transferLength">How many blocks to read.</param>
         /// <param name="blockSize">Block size.</param>
         /// <param name="subchannel">Subchannel selection.</param>
-        public bool PioneerReadCdDa(out byte[] buffer,         out byte[]        senseBuffer, uint lba, uint blockSize,
-                                    uint       transferLength, PioneerSubchannel subchannel,  uint timeout,
+        public bool PioneerReadCdDa(out byte[] buffer, out byte[] senseBuffer, uint lba, uint blockSize,
+                                    uint transferLength, PioneerSubchannel subchannel, uint timeout,
                                     out double duration)
         {
             senseBuffer = new byte[32];
@@ -69,6 +67,7 @@ namespace Aaru.Devices
 
             LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
                                         out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("SCSI Device", "PIONEER READ CD-DA took {0} ms.", duration);
@@ -76,9 +75,7 @@ namespace Aaru.Devices
             return sense;
         }
 
-        /// <summary>
-        ///     Sends the Pioneer READ CD-DA MSF command
-        /// </summary>
+        /// <summary>Sends the Pioneer READ CD-DA MSF command</summary>
         /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
         /// <param name="buffer">Buffer where the Pioneer READ CD-DA MSF response will be stored</param>
         /// <param name="senseBuffer">Sense buffer.</param>
@@ -88,10 +85,8 @@ namespace Aaru.Devices
         /// <param name="endMsf">End MM:SS:FF of read encoded as 0x00MMSSFF.</param>
         /// <param name="blockSize">Block size.</param>
         /// <param name="subchannel">Subchannel selection.</param>
-        public bool PioneerReadCdDaMsf(out byte[] buffer, out byte[] senseBuffer, uint startMsf,
-                                       uint       endMsf,
-                                       uint       blockSize, PioneerSubchannel subchannel, uint timeout,
-                                       out double duration)
+        public bool PioneerReadCdDaMsf(out byte[] buffer, out byte[] senseBuffer, uint startMsf, uint endMsf,
+                                       uint blockSize, PioneerSubchannel subchannel, uint timeout, out double duration)
         {
             senseBuffer = new byte[32];
             byte[] cdb = new byte[12];
@@ -105,11 +100,12 @@ namespace Aaru.Devices
             cdb[9]  = (byte)(endMsf & 0xFF);
             cdb[10] = (byte)subchannel;
 
-            uint transferLength = (uint)((cdb[7] - cdb[3]) * 60 * 75 + (cdb[8] - cdb[4]) * 75 + (cdb[9] - cdb[5]));
+            uint transferLength = (uint)(((cdb[7] - cdb[3]) * 60 * 75) + ((cdb[8] - cdb[4]) * 75) + (cdb[9] - cdb[5]));
             buffer = new byte[blockSize * transferLength];
 
             LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
                                         out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("SCSI Device", "PIONEER READ CD-DA MSF took {0} ms.", duration);
@@ -117,9 +113,7 @@ namespace Aaru.Devices
             return sense;
         }
 
-        /// <summary>
-        ///     Sends the Pioneer READ CD-XA command
-        /// </summary>
+        /// <summary>Sends the Pioneer READ CD-XA command</summary>
         /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
         /// <param name="buffer">Buffer where the Pioneer READ CD-XA response will be stored</param>
         /// <param name="senseBuffer">Sense buffer.</param>
@@ -132,9 +126,8 @@ namespace Aaru.Devices
         /// <param name="wholeSector">If set to <c>true</c>, returns all 2352 bytes of sector data.</param>
         /// <param name="lba">Start block address.</param>
         /// <param name="transferLength">How many blocks to read.</param>
-        public bool PioneerReadCdXa(out byte[] buffer, out byte[] senseBuffer, uint lba,
-                                    uint       transferLength,
-                                    bool       errorFlags, bool wholeSector, uint timeout, out double duration)
+        public bool PioneerReadCdXa(out byte[] buffer, out byte[] senseBuffer, uint lba, uint transferLength,
+                                    bool errorFlags, bool wholeSector, uint timeout, out double duration)
         {
             senseBuffer = new byte[32];
             byte[] cdb = new byte[12];
@@ -166,6 +159,7 @@ namespace Aaru.Devices
 
             LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
                                         out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("SCSI Device", "PIONEER READ CD-XA took {0} ms.", duration);
diff --git a/Aaru.Devices/Device/ScsiCommands/Plasmon.cs b/Aaru.Devices/Device/ScsiCommands/Plasmon.cs
index 2f057d613..1573b841b 100644
--- a/Aaru.Devices/Device/ScsiCommands/Plasmon.cs
+++ b/Aaru.Devices/Device/ScsiCommands/Plasmon.cs
@@ -36,9 +36,7 @@ namespace Aaru.Devices
 {
     public partial class Device
     {
-        /// <summary>
-        ///     Sends the Plasmon READ LONG vendor command
-        /// </summary>
+        /// <summary>Sends the Plasmon READ LONG vendor command</summary>
         /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
         /// <param name="buffer">Buffer where the Plasmon READ LONG response will be stored</param>
         /// <param name="senseBuffer">Sense buffer.</param>
@@ -48,13 +46,11 @@ namespace Aaru.Devices
         /// <param name="pba">If set to <c>true</c> address contain physical block address.</param>
         /// <param name="timeout">Timeout in seconds.</param>
         /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        public bool PlasmonReadLong(out byte[] buffer,     out byte[] senseBuffer, bool relAddr, uint       address,
-                                    ushort     blockBytes, bool       pba,         uint timeout, out double duration) =>
+        public bool PlasmonReadLong(out byte[] buffer, out byte[] senseBuffer, bool relAddr, uint address,
+                                    ushort blockBytes, bool pba, uint timeout, out double duration) =>
             HpReadLong(out buffer, out senseBuffer, relAddr, address, 0, blockBytes, pba, false, timeout, out duration);
 
-        /// <summary>
-        ///     Sends the Plasmon READ LONG vendor command
-        /// </summary>
+        /// <summary>Sends the Plasmon READ LONG vendor command</summary>
         /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
         /// <param name="buffer">Buffer where the Plasmon READ LONG response will be stored</param>
         /// <param name="senseBuffer">Sense buffer.</param>
@@ -69,16 +65,13 @@ namespace Aaru.Devices
         /// </param>
         /// <param name="timeout">Timeout in seconds.</param>
         /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        public bool PlasmonReadLong(out byte[] buffer,      out byte[] senseBuffer, bool relAddr, uint address,
-                                    ushort     transferLen, ushort     blockBytes,  bool pba,     bool sectorCount,
-                                    uint       timeout,
+        public bool PlasmonReadLong(out byte[] buffer, out byte[] senseBuffer, bool relAddr, uint address,
+                                    ushort transferLen, ushort blockBytes, bool pba, bool sectorCount, uint timeout,
                                     out double duration) =>
             HpReadLong(out buffer, out senseBuffer, relAddr, address, transferLen, blockBytes, pba, sectorCount,
-                       timeout,    out duration);
+                       timeout, out duration);
 
-        /// <summary>
-        ///     Retrieves the logical or physical block address for the specified <paramref name="address" />
-        /// </summary>
+        /// <summary>Retrieves the logical or physical block address for the specified <paramref name="address" /></summary>
         /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
         /// <param name="buffer">Buffer where the block address will be stored</param>
         /// <param name="senseBuffer">Sense buffer.</param>
@@ -86,8 +79,8 @@ namespace Aaru.Devices
         /// <param name="pba">If set to <c>true</c> address contain a physical block address.</param>
         /// <param name="timeout">Timeout in seconds.</param>
         /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        public bool PlasmonReadSectorLocation(out byte[] buffer,  out byte[] senseBuffer, uint address, bool pba,
-                                              uint       timeout, out double duration)
+        public bool PlasmonReadSectorLocation(out byte[] buffer, out byte[] senseBuffer, uint address, bool pba,
+                                              uint timeout, out double duration)
         {
             senseBuffer = new byte[32];
             byte[] cdb = new byte[10];
@@ -97,12 +90,15 @@ namespace Aaru.Devices
             cdb[3] = (byte)((address & 0xFF0000)   >> 16);
             cdb[4] = (byte)((address & 0xFF00)     >> 8);
             cdb[5] = (byte)(address & 0xFF);
-            if(pba) cdb[9] += 0x80;
+
+            if(pba)
+                cdb[9] += 0x80;
 
             buffer = new byte[8];
 
             LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
                                         out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("SCSI Device", "PLASMON READ SECTOR LOCATION took {0} ms.", duration);
diff --git a/Aaru.Devices/Device/ScsiCommands/Plextor.cs b/Aaru.Devices/Device/ScsiCommands/Plextor.cs
index 9a0ef43fd..84321d8a0 100644
--- a/Aaru.Devices/Device/ScsiCommands/Plextor.cs
+++ b/Aaru.Devices/Device/ScsiCommands/Plextor.cs
@@ -72,8 +72,8 @@ namespace Aaru.Devices
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("SCSI Device",
-                                      "Plextor READ CD-DA (LBA: {1}, Block Size: {2}, Transfer Length: {3}, Subchannel: {4}, Sense: {5}, Last Error: {6}) took {0} ms.",
-                                      duration, lba, blockSize, transferLength, subchannel, sense, LastError);
+                                       "Plextor READ CD-DA (LBA: {1}, Block Size: {2}, Transfer Length: {3}, Subchannel: {4}, Sense: {5}, Last Error: {6}) took {0} ms.",
+                                       duration, lba, blockSize, transferLength, subchannel, sense, LastError);
 
             return sense;
         }
diff --git a/Aaru.Devices/Device/ScsiCommands/SBC.cs b/Aaru.Devices/Device/ScsiCommands/SBC.cs
index 79ec7262d..22062b036 100644
--- a/Aaru.Devices/Device/ScsiCommands/SBC.cs
+++ b/Aaru.Devices/Device/ScsiCommands/SBC.cs
@@ -37,9 +37,7 @@ namespace Aaru.Devices
 {
     public partial class Device
     {
-        /// <summary>
-        ///     Sends the SBC READ (6) command
-        /// </summary>
+        /// <summary>Sends the SBC READ (6) command</summary>
         /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
         /// <param name="buffer">Buffer where the SCSI READ response will be stored</param>
         /// <param name="senseBuffer">Sense buffer.</param>
@@ -51,9 +49,7 @@ namespace Aaru.Devices
                           out double duration) =>
             Read6(out buffer, out senseBuffer, lba, blockSize, 1, timeout, out duration);
 
-        /// <summary>
-        ///     Sends the SBC READ (6) command
-        /// </summary>
+        /// <summary>Sends the SBC READ (6) command</summary>
         /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
         /// <param name="buffer">Buffer where the SCSI READ response will be stored</param>
         /// <param name="senseBuffer">Sense buffer.</param>
@@ -62,8 +58,8 @@ namespace Aaru.Devices
         /// <param name="lba">Starting block.</param>
         /// <param name="blockSize">Block size in bytes.</param>
         /// <param name="transferLength">How many blocks to read.</param>
-        public bool Read6(out byte[] buffer,  out byte[] senseBuffer, uint lba, uint blockSize, byte transferLength,
-                          uint       timeout, out double duration)
+        public bool Read6(out byte[] buffer, out byte[] senseBuffer, uint lba, uint blockSize, byte transferLength,
+                          uint timeout, out double duration)
         {
             senseBuffer = new byte[32];
             byte[] cdb = new byte[6];
@@ -74,11 +70,14 @@ namespace Aaru.Devices
             cdb[3] = (byte)(lba & 0xFF);
             cdb[4] = transferLength;
 
-            if(transferLength == 0) buffer = new byte[256            * blockSize];
-            else buffer                    = new byte[transferLength * blockSize];
+            if(transferLength == 0)
+                buffer = new byte[256 * blockSize];
+            else
+                buffer = new byte[transferLength * blockSize];
 
             LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
                                         out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("SCSI Device", "READ (6) took {0} ms.", duration);
@@ -86,9 +85,7 @@ namespace Aaru.Devices
             return sense;
         }
 
-        /// <summary>
-        ///     Sends the SBC READ (10) command
-        /// </summary>
+        /// <summary>Sends the SBC READ (10) command</summary>
         /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
         /// <param name="buffer">Buffer where the SCSI READ response will be stored</param>
         /// <param name="senseBuffer">Sense buffer.</param>
@@ -109,21 +106,28 @@ namespace Aaru.Devices
         /// <param name="groupNumber">Group number where attributes associated with this command should be collected.</param>
         /// <param name="transferLength">How many blocks to read.</param>
         /// <param name="relAddr">If set to <c>true</c> address is relative to current position.</param>
-        public bool Read10(out byte[] buffer, out byte[] senseBuffer, byte rdprotect, bool dpo, bool fua,
-                           bool       fuaNv,
-                           bool       relAddr, uint lba, uint blockSize, byte groupNumber,
-                           ushort     transferLength,
-                           uint       timeout, out double duration)
+        public bool Read10(out byte[] buffer, out byte[] senseBuffer, byte rdprotect, bool dpo, bool fua, bool fuaNv,
+                           bool relAddr, uint lba, uint blockSize, byte groupNumber, ushort transferLength,
+                           uint timeout, out double duration)
         {
             senseBuffer = new byte[32];
             byte[] cdb = new byte[10];
 
             cdb[0] = (byte)ScsiCommands.Read10;
             cdb[1] = (byte)((rdprotect & 0x07) << 5);
-            if(dpo) cdb[1]     += 0x10;
-            if(fua) cdb[1]     += 0x08;
-            if(fuaNv) cdb[1]   += 0x02;
-            if(relAddr) cdb[1] += 0x01;
+
+            if(dpo)
+                cdb[1] += 0x10;
+
+            if(fua)
+                cdb[1] += 0x08;
+
+            if(fuaNv)
+                cdb[1] += 0x02;
+
+            if(relAddr)
+                cdb[1] += 0x01;
+
             cdb[2] = (byte)((lba & 0xFF000000) >> 24);
             cdb[3] = (byte)((lba & 0xFF0000)   >> 16);
             cdb[4] = (byte)((lba & 0xFF00)     >> 8);
@@ -136,6 +140,7 @@ namespace Aaru.Devices
 
             LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
                                         out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("SCSI Device", "READ (10) took {0} ms.", duration);
@@ -143,9 +148,7 @@ namespace Aaru.Devices
             return sense;
         }
 
-        /// <summary>
-        ///     Sends the SBC READ (12) command
-        /// </summary>
+        /// <summary>Sends the SBC READ (12) command</summary>
         /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
         /// <param name="buffer">Buffer where the SCSI READ response will be stored</param>
         /// <param name="senseBuffer">Sense buffer.</param>
@@ -167,21 +170,28 @@ namespace Aaru.Devices
         /// <param name="transferLength">How many blocks to read.</param>
         /// <param name="streaming">If set to <c>true</c> the stream playback operation should be used (MMC only).</param>
         /// <param name="relAddr">If set to <c>true</c> address is relative to current position.</param>
-        public bool Read12(out byte[] buffer,  out byte[] senseBuffer, byte rdprotect, bool dpo,
-                           bool       fua,     bool       fuaNv,
-                           bool       relAddr, uint       lba, uint blockSize, byte groupNumber,
-                           uint       transferLength,
-                           bool       streaming, uint timeout, out double duration)
+        public bool Read12(out byte[] buffer, out byte[] senseBuffer, byte rdprotect, bool dpo, bool fua, bool fuaNv,
+                           bool relAddr, uint lba, uint blockSize, byte groupNumber, uint transferLength,
+                           bool streaming, uint timeout, out double duration)
         {
             senseBuffer = new byte[32];
             byte[] cdb = new byte[12];
 
             cdb[0] = (byte)ScsiCommands.Read12;
             cdb[1] = (byte)((rdprotect & 0x07) << 5);
-            if(dpo) cdb[1]     += 0x10;
-            if(fua) cdb[1]     += 0x08;
-            if(fuaNv) cdb[1]   += 0x02;
-            if(relAddr) cdb[1] += 0x01;
+
+            if(dpo)
+                cdb[1] += 0x10;
+
+            if(fua)
+                cdb[1] += 0x08;
+
+            if(fuaNv)
+                cdb[1] += 0x02;
+
+            if(relAddr)
+                cdb[1] += 0x01;
+
             cdb[2]  = (byte)((lba & 0xFF000000) >> 24);
             cdb[3]  = (byte)((lba & 0xFF0000)   >> 16);
             cdb[4]  = (byte)((lba & 0xFF00)     >> 8);
@@ -191,12 +201,15 @@ namespace Aaru.Devices
             cdb[8]  = (byte)((transferLength & 0xFF00)     >> 8);
             cdb[9]  = (byte)(transferLength & 0xFF);
             cdb[10] = (byte)(groupNumber    & 0x1F);
-            if(streaming) cdb[10] += 0x80;
+
+            if(streaming)
+                cdb[10] += 0x80;
 
             buffer = new byte[transferLength * blockSize];
 
             LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
                                         out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("SCSI Device", "READ (12) took {0} ms.", duration);
@@ -204,9 +217,7 @@ namespace Aaru.Devices
             return sense;
         }
 
-        /// <summary>
-        ///     Sends the SBC READ (16) command
-        /// </summary>
+        /// <summary>Sends the SBC READ (16) command</summary>
         /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
         /// <param name="buffer">Buffer where the SCSI READ response will be stored</param>
         /// <param name="senseBuffer">Sense buffer.</param>
@@ -227,11 +238,9 @@ namespace Aaru.Devices
         /// <param name="groupNumber">Group number where attributes associated with this command should be collected.</param>
         /// <param name="transferLength">How many blocks to read.</param>
         /// <param name="streaming">If set to <c>true</c> the stream playback operation should be used (MMC only).</param>
-        public bool Read16(out byte[] buffer, out byte[] senseBuffer, byte rdprotect, bool dpo, bool fua,
-                           bool       fuaNv,
-                           ulong      lba, uint blockSize, byte groupNumber, uint transferLength,
-                           bool       streaming,
-                           uint       timeout, out double duration)
+        public bool Read16(out byte[] buffer, out byte[] senseBuffer, byte rdprotect, bool dpo, bool fua, bool fuaNv,
+                           ulong lba, uint blockSize, byte groupNumber, uint transferLength, bool streaming,
+                           uint timeout, out double duration)
         {
             senseBuffer = new byte[32];
             byte[] cdb      = new byte[16];
@@ -239,9 +248,16 @@ namespace Aaru.Devices
 
             cdb[0] = (byte)ScsiCommands.Read16;
             cdb[1] = (byte)((rdprotect & 0x07) << 5);
-            if(dpo) cdb[1]   += 0x10;
-            if(fua) cdb[1]   += 0x08;
-            if(fuaNv) cdb[1] += 0x02;
+
+            if(dpo)
+                cdb[1] += 0x10;
+
+            if(fua)
+                cdb[1] += 0x08;
+
+            if(fuaNv)
+                cdb[1] += 0x02;
+
             cdb[2]  = lbaBytes[7];
             cdb[3]  = lbaBytes[6];
             cdb[4]  = lbaBytes[5];
@@ -255,12 +271,15 @@ namespace Aaru.Devices
             cdb[12] = (byte)((transferLength & 0xFF00)     >> 8);
             cdb[13] = (byte)(transferLength & 0xFF);
             cdb[14] = (byte)(groupNumber    & 0x1F);
-            if(streaming) cdb[14] += 0x80;
+
+            if(streaming)
+                cdb[14] += 0x80;
 
             buffer = new byte[transferLength * blockSize];
 
             LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
                                         out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("SCSI Device", "READ (16) took {0} ms.", duration);
@@ -268,9 +287,7 @@ namespace Aaru.Devices
             return sense;
         }
 
-        /// <summary>
-        ///     Sends the SBC READ LONG (10) command
-        /// </summary>
+        /// <summary>Sends the SBC READ LONG (10) command</summary>
         /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
         /// <param name="buffer">Buffer where the SCSI READ LONG response will be stored</param>
         /// <param name="senseBuffer">Sense buffer.</param>
@@ -283,16 +300,20 @@ namespace Aaru.Devices
         ///     How many bytes to read. If the number is not exactly the drive's size, the command will
         ///     fail and incidate a delta of the size in SENSE.
         /// </param>
-        public bool ReadLong10(out byte[] buffer, out byte[] senseBuffer, bool correct, bool relAddr,
-                               uint       lba,
-                               ushort     transferBytes, uint timeout, out double duration)
+        public bool ReadLong10(out byte[] buffer, out byte[] senseBuffer, bool correct, bool relAddr, uint lba,
+                               ushort transferBytes, uint timeout, out double duration)
         {
             senseBuffer = new byte[32];
             byte[] cdb = new byte[10];
 
             cdb[0] = (byte)ScsiCommands.ReadLong;
-            if(correct) cdb[1] += 0x02;
-            if(relAddr) cdb[1] += 0x01;
+
+            if(correct)
+                cdb[1] += 0x02;
+
+            if(relAddr)
+                cdb[1] += 0x01;
+
             cdb[2] = (byte)((lba & 0xFF000000) >> 24);
             cdb[3] = (byte)((lba & 0xFF0000)   >> 16);
             cdb[4] = (byte)((lba & 0xFF00)     >> 8);
@@ -304,6 +325,7 @@ namespace Aaru.Devices
 
             LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
                                         out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("SCSI Device", "READ LONG (10) took {0} ms.", duration);
@@ -311,9 +333,7 @@ namespace Aaru.Devices
             return sense;
         }
 
-        /// <summary>
-        ///     Sends the SBC READ LONG (16) command
-        /// </summary>
+        /// <summary>Sends the SBC READ LONG (16) command</summary>
         /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
         /// <param name="buffer">Buffer where the SCSI READ LONG response will be stored</param>
         /// <param name="senseBuffer">Sense buffer.</param>
@@ -325,8 +345,8 @@ namespace Aaru.Devices
         ///     How many bytes to read. If the number is not exactly the drive's size, the command will
         ///     fail and incidate a delta of the size in SENSE.
         /// </param>
-        public bool ReadLong16(out byte[] buffer,  out byte[] senseBuffer, bool correct, ulong lba, uint transferBytes,
-                               uint       timeout, out double duration)
+        public bool ReadLong16(out byte[] buffer, out byte[] senseBuffer, bool correct, ulong lba, uint transferBytes,
+                               uint timeout, out double duration)
         {
             senseBuffer = new byte[32];
             byte[] cdb      = new byte[16];
@@ -344,12 +364,15 @@ namespace Aaru.Devices
             cdb[9]  = lbaBytes[0];
             cdb[12] = (byte)((transferBytes & 0xFF00) >> 8);
             cdb[13] = (byte)(transferBytes & 0xFF);
-            if(correct) cdb[14] += 0x01;
+
+            if(correct)
+                cdb[14] += 0x01;
 
             buffer = new byte[transferBytes];
 
             LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
                                         out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("SCSI Device", "READ LONG (16) took {0} ms.", duration);
@@ -357,9 +380,7 @@ namespace Aaru.Devices
             return sense;
         }
 
-        /// <summary>
-        ///     Moves the device reading element to the specified block address
-        /// </summary>
+        /// <summary>Moves the device reading element to the specified block address</summary>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="lba">LBA.</param>
         /// <param name="timeout">Timeout.</param>
@@ -377,6 +398,7 @@ namespace Aaru.Devices
 
             LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.None, out duration,
                                         out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("SCSI Device", "SEEK (6) took {0} ms.", duration);
@@ -384,9 +406,7 @@ namespace Aaru.Devices
             return sense;
         }
 
-        /// <summary>
-        ///     Moves the device reading element to the specified block address
-        /// </summary>
+        /// <summary>Moves the device reading element to the specified block address</summary>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="lba">LBA.</param>
         /// <param name="timeout">Timeout.</param>
@@ -405,6 +425,7 @@ namespace Aaru.Devices
 
             LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.None, out duration,
                                         out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("SCSI Device", "SEEK (10) took {0} ms.", duration);
diff --git a/Aaru.Devices/Device/ScsiCommands/SMC.cs b/Aaru.Devices/Device/ScsiCommands/SMC.cs
index 758192fb8..cb7d46e29 100644
--- a/Aaru.Devices/Device/ScsiCommands/SMC.cs
+++ b/Aaru.Devices/Device/ScsiCommands/SMC.cs
@@ -36,9 +36,7 @@ namespace Aaru.Devices
 {
     public partial class Device
     {
-        /// <summary>
-        ///     Reads an attribute from the medium auxiliary memory, or reports which elements in the changer contain one
-        /// </summary>
+        /// <summary>Reads an attribute from the medium auxiliary memory, or reports which elements in the changer contain one</summary>
         /// <param name="buffer">Buffer.</param>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="action">What to do, <see cref="ScsiAttributeAction" />.</param>
@@ -50,11 +48,9 @@ namespace Aaru.Devices
         /// <param name="cache">If set to <c>true</c> device can return cached data.</param>
         /// <param name="timeout">Timeout.</param>
         /// <param name="duration">Duration.</param>
-        public bool ReadAttribute(out byte[] buffer, out byte[] senseBuffer, ScsiAttributeAction action,
-                                  ushort     element,
-                                  byte       elementType,    byte       volume, byte partition,
-                                  ushort     firstAttribute, bool       cache,
-                                  uint       timeout,        out double duration)
+        public bool ReadAttribute(out byte[] buffer, out byte[] senseBuffer, ScsiAttributeAction action, ushort element,
+                                  byte elementType, byte volume, byte partition, ushort firstAttribute, bool cache,
+                                  uint timeout, out double duration)
         {
             buffer = new byte[256];
             byte[] cdb = new byte[16];
@@ -73,13 +69,17 @@ namespace Aaru.Devices
             cdb[11] = (byte)((buffer.Length & 0xFF0000)   >> 16);
             cdb[12] = (byte)((buffer.Length & 0xFF00)     >> 8);
             cdb[13] = (byte)(buffer.Length & 0xFF);
-            if(cache) cdb[14] += 0x01;
+
+            if(cache)
+                cdb[14] += 0x01;
 
             LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
                                         out bool sense);
+
             Error = LastError != 0;
 
-            if(sense) return true;
+            if(sense)
+                return true;
 
             uint attrLen = (uint)((buffer[0] << 24) + (buffer[1] << 16) + (buffer[2] << 8) + buffer[3] + 4);
             buffer      = new byte[attrLen];
@@ -91,6 +91,7 @@ namespace Aaru.Devices
 
             LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
                                         out sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("SCSI Device", "READ ATTRIBUTE took {0} ms.", duration);
diff --git a/Aaru.Devices/Device/ScsiCommands/SPC.cs b/Aaru.Devices/Device/ScsiCommands/SPC.cs
index e8c547978..a60cf96fb 100644
--- a/Aaru.Devices/Device/ScsiCommands/SPC.cs
+++ b/Aaru.Devices/Device/ScsiCommands/SPC.cs
@@ -40,18 +40,14 @@ namespace Aaru.Devices
     [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
     public partial class Device
     {
-        /// <summary>
-        ///     Sends the SPC INQUIRY command to the device using default device timeout.
-        /// </summary>
+        /// <summary>Sends the SPC INQUIRY command to the device using default device timeout.</summary>
         /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
         /// <param name="buffer">Buffer where the SCSI INQUIRY response will be stored</param>
         /// <param name="senseBuffer">Sense buffer.</param>
         public bool ScsiInquiry(out byte[] buffer, out byte[] senseBuffer) =>
             ScsiInquiry(out buffer, out senseBuffer, Timeout);
 
-        /// <summary>
-        ///     Sends the SPC INQUIRY command to the device using default device timeout.
-        /// </summary>
+        /// <summary>Sends the SPC INQUIRY command to the device using default device timeout.</summary>
         /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
         /// <param name="buffer">Buffer where the SCSI INQUIRY response will be stored</param>
         /// <param name="senseBuffer">Sense buffer.</param>
@@ -59,9 +55,7 @@ namespace Aaru.Devices
         public bool ScsiInquiry(out byte[] buffer, out byte[] senseBuffer, out double duration) =>
             ScsiInquiry(out buffer, out senseBuffer, Timeout, out duration);
 
-        /// <summary>
-        ///     Sends the SPC INQUIRY command to the device.
-        /// </summary>
+        /// <summary>Sends the SPC INQUIRY command to the device.</summary>
         /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
         /// <param name="buffer">Buffer where the SCSI INQUIRY response will be stored</param>
         /// <param name="senseBuffer">Sense buffer.</param>
@@ -69,9 +63,7 @@ namespace Aaru.Devices
         public bool ScsiInquiry(out byte[] buffer, out byte[] senseBuffer, uint timeout) =>
             ScsiInquiry(out buffer, out senseBuffer, timeout, out _);
 
-        /// <summary>
-        ///     Sends the SPC INQUIRY command to the device.
-        /// </summary>
+        /// <summary>Sends the SPC INQUIRY command to the device.</summary>
         /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
         /// <param name="buffer">Buffer where the SCSI INQUIRY response will be stored</param>
         /// <param name="senseBuffer">Sense buffer.</param>
@@ -81,22 +73,33 @@ namespace Aaru.Devices
         {
             buffer      = new byte[36];
             senseBuffer = new byte[32];
-            byte[] cdb = {(byte)ScsiCommands.Inquiry, 0, 0, 0, 36, 0};
+
+            byte[] cdb =
+            {
+                (byte)ScsiCommands.Inquiry, 0, 0, 0, 36, 0
+            };
 
             LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
                                         out bool sense);
+
             Error = LastError != 0;
 
-            if(sense) return true;
+            if(sense)
+                return true;
 
             byte pagesLength = (byte)(buffer[4] + 5);
 
-            cdb         = new byte[] {(byte)ScsiCommands.Inquiry, 0, 0, 0, pagesLength, 0};
+            cdb = new byte[]
+            {
+                (byte)ScsiCommands.Inquiry, 0, 0, 0, pagesLength, 0
+            };
+
             buffer      = new byte[pagesLength];
             senseBuffer = new byte[32];
 
             LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
                                         out sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("SCSI Device", "INQUIRY took {0} ms.", duration);
@@ -105,7 +108,8 @@ namespace Aaru.Devices
         }
 
         /// <summary>
-        ///     Sends the SPC INQUIRY command to the device with an Extended Vital Product Data page using default device timeout.
+        ///     Sends the SPC INQUIRY command to the device with an Extended Vital Product Data page using default device
+        ///     timeout.
         /// </summary>
         /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
         /// <param name="buffer">Buffer where the SCSI INQUIRY response will be stored</param>
@@ -115,7 +119,8 @@ namespace Aaru.Devices
             ScsiInquiry(out buffer, out senseBuffer, page, Timeout);
 
         /// <summary>
-        ///     Sends the SPC INQUIRY command to the device with an Extended Vital Product Data page using default device timeout.
+        ///     Sends the SPC INQUIRY command to the device with an Extended Vital Product Data page using default device
+        ///     timeout.
         /// </summary>
         /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
         /// <param name="buffer">Buffer where the SCSI INQUIRY response will be stored</param>
@@ -125,9 +130,7 @@ namespace Aaru.Devices
         public bool ScsiInquiry(out byte[] buffer, out byte[] senseBuffer, byte page, out double duration) =>
             ScsiInquiry(out buffer, out senseBuffer, page, Timeout, out duration);
 
-        /// <summary>
-        ///     Sends the SPC INQUIRY command to the device with an Extended Vital Product Data page.
-        /// </summary>
+        /// <summary>Sends the SPC INQUIRY command to the device with an Extended Vital Product Data page.</summary>
         /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
         /// <param name="buffer">Buffer where the SCSI INQUIRY response will be stored</param>
         /// <param name="senseBuffer">Sense buffer.</param>
@@ -136,9 +139,7 @@ namespace Aaru.Devices
         public bool ScsiInquiry(out byte[] buffer, out byte[] senseBuffer, byte page, uint timeout) =>
             ScsiInquiry(out buffer, out senseBuffer, page, timeout, out _);
 
-        /// <summary>
-        ///     Sends the SPC INQUIRY command to the device with an Extended Vital Product Data page.
-        /// </summary>
+        /// <summary>Sends the SPC INQUIRY command to the device with an Extended Vital Product Data page.</summary>
         /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
         /// <param name="buffer">Buffer where the SCSI INQUIRY response will be stored</param>
         /// <param name="senseBuffer">Sense buffer.</param>
@@ -149,25 +150,37 @@ namespace Aaru.Devices
         {
             buffer      = new byte[36];
             senseBuffer = new byte[32];
-            byte[] cdb = {(byte)ScsiCommands.Inquiry, 1, page, 0, 36, 0};
+
+            byte[] cdb =
+            {
+                (byte)ScsiCommands.Inquiry, 1, page, 0, 36, 0
+            };
 
             LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
                                         out bool sense);
+
             Error = LastError != 0;
 
-            if(sense) return true;
+            if(sense)
+                return true;
 
             // This is because INQ was returned instead of EVPD
-            if(buffer[1] != page) return true;
+            if(buffer[1] != page)
+                return true;
 
             byte pagesLength = (byte)(buffer[3] + 4);
 
-            cdb         = new byte[] {(byte)ScsiCommands.Inquiry, 1, page, 0, pagesLength, 0};
+            cdb = new byte[]
+            {
+                (byte)ScsiCommands.Inquiry, 1, page, 0, pagesLength, 0
+            };
+
             buffer      = new byte[pagesLength];
             senseBuffer = new byte[32];
 
             LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
                                         out sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("SCSI Device", "INQUIRY took {0} ms.", duration);
@@ -175,9 +188,7 @@ namespace Aaru.Devices
             return sense;
         }
 
-        /// <summary>
-        ///     Sends the SPC TEST UNIT READY command to the device
-        /// </summary>
+        /// <summary>Sends the SPC TEST UNIT READY command to the device</summary>
         /// <returns><c>true</c>, if unit is NOT ready, <c>false</c> otherwise.</returns>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="timeout">Timeout in seconds.</param>
@@ -185,11 +196,17 @@ namespace Aaru.Devices
         public bool ScsiTestUnitReady(out byte[] senseBuffer, uint timeout, out double duration)
         {
             senseBuffer = new byte[32];
-            byte[] cdb    = {(byte)ScsiCommands.TestUnitReady, 0, 0, 0, 0, 0};
+
+            byte[] cdb =
+            {
+                (byte)ScsiCommands.TestUnitReady, 0, 0, 0, 0, 0
+            };
+
             byte[] buffer = new byte[0];
 
             LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.None, out duration,
                                         out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("SCSI Device", "TEST UNIT READY took {0} ms.", duration);
@@ -197,9 +214,7 @@ namespace Aaru.Devices
             return sense;
         }
 
-        /// <summary>
-        ///     Sends the SPC MODE SENSE(6) command to the device as introduced in SCSI-1
-        /// </summary>
+        /// <summary>Sends the SPC MODE SENSE(6) command to the device as introduced in SCSI-1</summary>
         /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
         /// <param name="buffer">Buffer where the SCSI MODE SENSE(6) response will be stored</param>
         /// <param name="senseBuffer">Sense buffer.</param>
@@ -209,9 +224,7 @@ namespace Aaru.Devices
             ModeSense6(out buffer, out senseBuffer, false, ScsiModeSensePageControl.Current, 0, 0, timeout,
                        out duration);
 
-        /// <summary>
-        ///     Sends the SPC MODE SENSE(6) command to the device as introduced in SCSI-2
-        /// </summary>
+        /// <summary>Sends the SPC MODE SENSE(6) command to the device as introduced in SCSI-2</summary>
         /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
         /// <param name="buffer">Buffer where the SCSI MODE SENSE(6) response will be stored</param>
         /// <param name="senseBuffer">Sense buffer.</param>
@@ -220,14 +233,12 @@ namespace Aaru.Devices
         /// <param name="dbd">If set to <c>true</c> device MUST not return any block descriptor.</param>
         /// <param name="pageControl">Page control.</param>
         /// <param name="pageCode">Page code.</param>
-        public bool ModeSense6(out byte[]               buffer,      out byte[] senseBuffer, bool dbd,
-                               ScsiModeSensePageControl pageControl, byte       pageCode,    uint timeout,
-                               out double               duration) =>
-            ModeSense6(out buffer, out senseBuffer, dbd, pageControl, pageCode, 0, timeout, out duration);
+        public bool ModeSense6(out byte[] buffer, out byte[] senseBuffer, bool dbd,
+                               ScsiModeSensePageControl pageControl, byte pageCode, uint timeout,
+                               out double duration) => ModeSense6(out buffer, out senseBuffer, dbd, pageControl,
+                                                                  pageCode, 0, timeout, out duration);
 
-        /// <summary>
-        ///     Sends the SPC MODE SENSE(6) command to the device as introduced in SCSI-3 SPC-3
-        /// </summary>
+        /// <summary>Sends the SPC MODE SENSE(6) command to the device as introduced in SCSI-3 SPC-3</summary>
         /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
         /// <param name="buffer">Buffer where the SCSI MODE SENSE(6) response will be stored</param>
         /// <param name="senseBuffer">Sense buffer.</param>
@@ -237,17 +248,19 @@ namespace Aaru.Devices
         /// <param name="pageControl">Page control.</param>
         /// <param name="pageCode">Page code.</param>
         /// <param name="subPageCode">Sub-page code.</param>
-        public bool ModeSense6(out byte[]               buffer,      out byte[] senseBuffer, bool dbd,
-                               ScsiModeSensePageControl pageControl, byte       pageCode,    byte subPageCode,
-                               uint                     timeout,
-                               out double               duration)
+        public bool ModeSense6(out byte[] buffer, out byte[] senseBuffer, bool dbd,
+                               ScsiModeSensePageControl pageControl, byte pageCode, byte subPageCode, uint timeout,
+                               out double duration)
         {
             senseBuffer = new byte[32];
             byte[] cdb = new byte[6];
             buffer = new byte[255];
 
             cdb[0] = (byte)ScsiCommands.ModeSense;
-            if(dbd) cdb[1] = 0x08;
+
+            if(dbd)
+                cdb[1] = 0x08;
+
             cdb[2] |= (byte)pageControl;
             cdb[2] |= (byte)(pageCode & 0x3F);
             cdb[3] =  subPageCode;
@@ -256,9 +269,11 @@ namespace Aaru.Devices
 
             LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
                                         out bool sense);
+
             Error = LastError != 0;
 
-            if(sense) return true;
+            if(sense)
+                return true;
 
             byte modeLength = (byte)(buffer[0] + 1);
             buffer      = new byte[modeLength];
@@ -267,6 +282,7 @@ namespace Aaru.Devices
 
             LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
                                         out sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("SCSI Device", "MODE SENSE(6) took {0} ms.", duration);
@@ -274,9 +290,7 @@ namespace Aaru.Devices
             return sense;
         }
 
-        /// <summary>
-        ///     Sends the SPC MODE SENSE(10) command to the device as introduced in SCSI-2
-        /// </summary>
+        /// <summary>Sends the SPC MODE SENSE(10) command to the device as introduced in SCSI-2</summary>
         /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
         /// <param name="buffer">Buffer where the SCSI MODE SENSE(10) response will be stored</param>
         /// <param name="senseBuffer">Sense buffer.</param>
@@ -285,14 +299,12 @@ namespace Aaru.Devices
         /// <param name="dbd">If set to <c>true</c> device MUST not return any block descriptor.</param>
         /// <param name="pageControl">Page control.</param>
         /// <param name="pageCode">Page code.</param>
-        public bool ModeSense10(out byte[]               buffer,      out byte[] senseBuffer, bool dbd,
-                                ScsiModeSensePageControl pageControl, byte       pageCode,    uint timeout,
-                                out double               duration) =>
-            ModeSense10(out buffer, out senseBuffer, false, dbd, pageControl, pageCode, 0, timeout, out duration);
+        public bool ModeSense10(out byte[] buffer, out byte[] senseBuffer, bool dbd,
+                                ScsiModeSensePageControl pageControl, byte pageCode, uint timeout,
+                                out double duration) => ModeSense10(out buffer, out senseBuffer, false, dbd,
+                                                                    pageControl, pageCode, 0, timeout, out duration);
 
-        /// <summary>
-        ///     Sends the SPC MODE SENSE(10) command to the device as introduced in SCSI-3 SPC-2
-        /// </summary>
+        /// <summary>Sends the SPC MODE SENSE(10) command to the device as introduced in SCSI-3 SPC-2</summary>
         /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
         /// <param name="buffer">Buffer where the SCSI MODE SENSE(10) response will be stored</param>
         /// <param name="senseBuffer">Sense buffer.</param>
@@ -302,14 +314,12 @@ namespace Aaru.Devices
         /// <param name="pageControl">Page control.</param>
         /// <param name="pageCode">Page code.</param>
         /// <param name="llbaa">If set means 64-bit LBAs are accepted by the caller.</param>
-        public bool ModeSense10(out byte[]               buffer,      out byte[] senseBuffer, bool llbaa, bool dbd,
-                                ScsiModeSensePageControl pageControl, byte       pageCode,    uint timeout,
-                                out double               duration) =>
-            ModeSense10(out buffer, out senseBuffer, llbaa, dbd, pageControl, pageCode, 0, timeout, out duration);
+        public bool ModeSense10(out byte[] buffer, out byte[] senseBuffer, bool llbaa, bool dbd,
+                                ScsiModeSensePageControl pageControl, byte pageCode, uint timeout,
+                                out double duration) => ModeSense10(out buffer, out senseBuffer, llbaa, dbd,
+                                                                    pageControl, pageCode, 0, timeout, out duration);
 
-        /// <summary>
-        ///     Sends the SPC MODE SENSE(10) command to the device as introduced in SCSI-3 SPC-3
-        /// </summary>
+        /// <summary>Sends the SPC MODE SENSE(10) command to the device as introduced in SCSI-3 SPC-3</summary>
         /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
         /// <param name="buffer">Buffer where the SCSI MODE SENSE(10) response will be stored</param>
         /// <param name="senseBuffer">Sense buffer.</param>
@@ -320,19 +330,22 @@ namespace Aaru.Devices
         /// <param name="pageCode">Page code.</param>
         /// <param name="subPageCode">Sub-page code.</param>
         /// <param name="llbaa">If set means 64-bit LBAs are accepted by the caller.</param>
-        public bool ModeSense10(out byte[]               buffer, out byte[] senseBuffer, bool llbaa,
-                                bool                     dbd,
-                                ScsiModeSensePageControl pageControl, byte pageCode, byte subPageCode,
-                                uint                     timeout,
-                                out double               duration)
+        public bool ModeSense10(out byte[] buffer, out byte[] senseBuffer, bool llbaa, bool dbd,
+                                ScsiModeSensePageControl pageControl, byte pageCode, byte subPageCode, uint timeout,
+                                out double duration)
         {
             senseBuffer = new byte[32];
             byte[] cdb = new byte[10];
             buffer = new byte[4096];
 
             cdb[0] = (byte)ScsiCommands.ModeSense10;
-            if(llbaa) cdb[1] |= 0x10;
-            if(dbd) cdb[1]   |= 0x08;
+
+            if(llbaa)
+                cdb[1] |= 0x10;
+
+            if(dbd)
+                cdb[1] |= 0x08;
+
             cdb[2] |= (byte)pageControl;
             cdb[2] |= (byte)(pageCode & 0x3F);
             cdb[3] =  subPageCode;
@@ -342,9 +355,11 @@ namespace Aaru.Devices
 
             LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
                                         out bool sense);
+
             Error = LastError != 0;
 
-            if(sense) return true;
+            if(sense)
+                return true;
 
             ushort modeLength = (ushort)((buffer[0] << 8) + buffer[1] + 2);
             buffer      = new byte[modeLength];
@@ -354,6 +369,7 @@ namespace Aaru.Devices
 
             LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
                                         out sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("SCSI Device", "MODE SENSE(10) took {0} ms.", duration);
@@ -361,9 +377,7 @@ namespace Aaru.Devices
             return sense;
         }
 
-        /// <summary>
-        ///     Sends the SPC PREVENT ALLOW MEDIUM REMOVAL command to prevent medium removal
-        /// </summary>
+        /// <summary>Sends the SPC PREVENT ALLOW MEDIUM REMOVAL command to prevent medium removal</summary>
         /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="timeout">Timeout in seconds.</param>
@@ -371,9 +385,7 @@ namespace Aaru.Devices
         public bool SpcPreventMediumRemoval(out byte[] senseBuffer, uint timeout, out double duration) =>
             SpcPreventAllowMediumRemoval(out senseBuffer, ScsiPreventAllowMode.Prevent, timeout, out duration);
 
-        /// <summary>
-        ///     Sends the SPC PREVENT ALLOW MEDIUM REMOVAL command to allow medium removal
-        /// </summary>
+        /// <summary>Sends the SPC PREVENT ALLOW MEDIUM REMOVAL command to allow medium removal</summary>
         /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="timeout">Timeout in seconds.</param>
@@ -381,9 +393,7 @@ namespace Aaru.Devices
         public bool SpcAllowMediumRemoval(out byte[] senseBuffer, uint timeout, out double duration) =>
             SpcPreventAllowMediumRemoval(out senseBuffer, ScsiPreventAllowMode.Allow, timeout, out duration);
 
-        /// <summary>
-        ///     Sends the SPC PREVENT ALLOW MEDIUM REMOVAL command
-        /// </summary>
+        /// <summary>Sends the SPC PREVENT ALLOW MEDIUM REMOVAL command</summary>
         /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="timeout">Timeout in seconds.</param>
@@ -399,9 +409,7 @@ namespace Aaru.Devices
             return SpcPreventAllowMediumRemoval(out senseBuffer, ScsiPreventAllowMode.Allow, timeout, out duration);
         }
 
-        /// <summary>
-        ///     Sends the SPC PREVENT ALLOW MEDIUM REMOVAL command
-        /// </summary>
+        /// <summary>Sends the SPC PREVENT ALLOW MEDIUM REMOVAL command</summary>
         /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="timeout">Timeout in seconds.</param>
@@ -419,6 +427,7 @@ namespace Aaru.Devices
 
             LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.None, out duration,
                                         out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("SCSI Device", "PREVENT ALLOW MEDIUM REMOVAL took {0} ms.", duration);
@@ -426,9 +435,7 @@ namespace Aaru.Devices
             return sense;
         }
 
-        /// <summary>
-        ///     Sends the SPC READ CAPACITY command
-        /// </summary>
+        /// <summary>Sends the SPC READ CAPACITY command</summary>
         /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
         /// <param name="buffer">Buffer where the SCSI READ CAPACITY response will be stored</param>
         /// <param name="senseBuffer">Sense buffer.</param>
@@ -437,9 +444,7 @@ namespace Aaru.Devices
         public bool ReadCapacity(out byte[] buffer, out byte[] senseBuffer, uint timeout, out double duration) =>
             ReadCapacity(out buffer, out senseBuffer, false, 0, false, timeout, out duration);
 
-        /// <summary>
-        ///     Sends the SPC READ CAPACITY command
-        /// </summary>
+        /// <summary>Sends the SPC READ CAPACITY command</summary>
         /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
         /// <param name="buffer">Buffer where the SCSI READ CAPACITY response will be stored</param>
         /// <param name="senseBuffer">Sense buffer.</param>
@@ -448,8 +453,8 @@ namespace Aaru.Devices
         /// <param name="pmi">If set, it is requesting partial media capacity</param>
         /// <param name="timeout">Timeout in seconds.</param>
         /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        public bool ReadCapacity(out byte[] buffer,  out byte[] senseBuffer, bool relAddr, uint address, bool pmi,
-                                 uint       timeout, out double duration)
+        public bool ReadCapacity(out byte[] buffer, out byte[] senseBuffer, bool relAddr, uint address, bool pmi,
+                                 uint timeout, out double duration)
         {
             senseBuffer = new byte[32];
             byte[] cdb = new byte[10];
@@ -460,7 +465,9 @@ namespace Aaru.Devices
             if(pmi)
             {
                 cdb[8] = 0x01;
-                if(relAddr) cdb[1] = 0x01;
+
+                if(relAddr)
+                    cdb[1] = 0x01;
 
                 cdb[2] = (byte)((address & 0xFF000000) >> 24);
                 cdb[3] = (byte)((address & 0xFF0000)   >> 16);
@@ -470,6 +477,7 @@ namespace Aaru.Devices
 
             LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
                                         out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("SCSI Device", "READ CAPACITY took {0} ms.", duration);
@@ -477,9 +485,7 @@ namespace Aaru.Devices
             return sense;
         }
 
-        /// <summary>
-        ///     Sends the SPC READ CAPACITY(16) command
-        /// </summary>
+        /// <summary>Sends the SPC READ CAPACITY(16) command</summary>
         /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
         /// <param name="buffer">Buffer where the SCSI READ CAPACITY(16) response will be stored</param>
         /// <param name="senseBuffer">Sense buffer.</param>
@@ -488,9 +494,7 @@ namespace Aaru.Devices
         public bool ReadCapacity16(out byte[] buffer, out byte[] senseBuffer, uint timeout, out double duration) =>
             ReadCapacity16(out buffer, out senseBuffer, 0, false, timeout, out duration);
 
-        /// <summary>
-        ///     Sends the SPC READ CAPACITY(16) command
-        /// </summary>
+        /// <summary>Sends the SPC READ CAPACITY(16) command</summary>
         /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
         /// <param name="buffer">Buffer where the SCSI READ CAPACITY(16) response will be stored</param>
         /// <param name="senseBuffer">Sense buffer.</param>
@@ -529,6 +533,7 @@ namespace Aaru.Devices
 
             LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
                                         out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("SCSI Device", "READ CAPACITY(16) took {0} ms.", duration);
@@ -536,9 +541,7 @@ namespace Aaru.Devices
             return sense;
         }
 
-        /// <summary>
-        ///     Sends the SPC READ MEDIA SERIAL NUMBER command
-        /// </summary>
+        /// <summary>Sends the SPC READ MEDIA SERIAL NUMBER command</summary>
         /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
         /// <param name="buffer">Buffer where the SCSI READ MEDIA SERIAL NUMBER response will be stored</param>
         /// <param name="senseBuffer">Sense buffer.</param>
@@ -559,9 +562,11 @@ namespace Aaru.Devices
 
             LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
                                         out bool sense);
+
             Error = LastError != 0;
 
-            if(sense) return true;
+            if(sense)
+                return true;
 
             uint strctLength = (uint)((buffer[0] << 24) + (buffer[1] << 16) + (buffer[2] << 8) + buffer[3] + 4);
             buffer      = new byte[strctLength];
@@ -573,6 +578,7 @@ namespace Aaru.Devices
 
             LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
                                         out sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("SCSI Device", "READ MEDIA SERIAL NUMBER took {0} ms.", duration);
@@ -580,9 +586,7 @@ namespace Aaru.Devices
             return sense;
         }
 
-        /// <summary>
-        ///     Reads an attribute from the medium auxiliary memory
-        /// </summary>
+        /// <summary>Reads an attribute from the medium auxiliary memory</summary>
         /// <param name="buffer">Buffer.</param>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="action">What to do, <see cref="ScsiAttributeAction" />.</param>
@@ -591,16 +595,12 @@ namespace Aaru.Devices
         /// <param name="cache">If set to <c>true</c> device can return cached data.</param>
         /// <param name="timeout">Timeout.</param>
         /// <param name="duration">Duration.</param>
-        public bool ReadAttribute(out byte[] buffer, out byte[] senseBuffer, ScsiAttributeAction action,
-                                  byte       partition,
-                                  ushort     firstAttribute, bool cache, uint timeout,
-                                  out double duration) =>
+        public bool ReadAttribute(out byte[] buffer, out byte[] senseBuffer, ScsiAttributeAction action, byte partition,
+                                  ushort firstAttribute, bool cache, uint timeout, out double duration) =>
             ReadAttribute(out buffer, out senseBuffer, action, 0, 0, 0, partition, firstAttribute, cache, timeout,
                           out duration);
 
-        /// <summary>
-        ///     Reads an attribute from the medium auxiliary memory
-        /// </summary>
+        /// <summary>Reads an attribute from the medium auxiliary memory</summary>
         /// <param name="buffer">Buffer.</param>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="action">What to do, <see cref="ScsiAttributeAction" />.</param>
@@ -608,15 +608,12 @@ namespace Aaru.Devices
         /// <param name="cache">If set to <c>true</c> device can return cached data.</param>
         /// <param name="timeout">Timeout.</param>
         /// <param name="duration">Duration.</param>
-        public bool ReadAttribute(out byte[] buffer,         out byte[] senseBuffer, ScsiAttributeAction action,
-                                  ushort     firstAttribute, bool       cache,       uint                timeout,
-                                  out double duration) =>
+        public bool ReadAttribute(out byte[] buffer, out byte[] senseBuffer, ScsiAttributeAction action,
+                                  ushort firstAttribute, bool cache, uint timeout, out double duration) =>
             ReadAttribute(out buffer, out senseBuffer, action, 0, 0, 0, 0, firstAttribute, cache, timeout,
                           out duration);
 
-        /// <summary>
-        ///     Reads an attribute from the medium auxiliary memory
-        /// </summary>
+        /// <summary>Reads an attribute from the medium auxiliary memory</summary>
         /// <param name="buffer">Buffer.</param>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="action">What to do, <see cref="ScsiAttributeAction" />.</param>
@@ -624,29 +621,24 @@ namespace Aaru.Devices
         /// <param name="firstAttribute">First attribute identifier.</param>
         /// <param name="timeout">Timeout.</param>
         /// <param name="duration">Duration.</param>
-        public bool ReadAttribute(out byte[] buffer, out byte[] senseBuffer, ScsiAttributeAction action,
-                                  byte       partition,
-                                  ushort     firstAttribute, uint timeout, out double duration) =>
+        public bool ReadAttribute(out byte[] buffer, out byte[] senseBuffer, ScsiAttributeAction action, byte partition,
+                                  ushort firstAttribute, uint timeout, out double duration) =>
             ReadAttribute(out buffer, out senseBuffer, action, 0, 0, 0, partition, firstAttribute, false, timeout,
                           out duration);
 
-        /// <summary>
-        ///     Reads an attribute from the medium auxiliary memory
-        /// </summary>
+        /// <summary>Reads an attribute from the medium auxiliary memory</summary>
         /// <param name="buffer">Buffer.</param>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="action">What to do, <see cref="ScsiAttributeAction" />.</param>
         /// <param name="firstAttribute">First attribute identifier.</param>
         /// <param name="timeout">Timeout.</param>
         /// <param name="duration">Duration.</param>
-        public bool ReadAttribute(out byte[] buffer,         out byte[] senseBuffer, ScsiAttributeAction action,
-                                  ushort     firstAttribute, uint       timeout,     out double          duration) =>
+        public bool ReadAttribute(out byte[] buffer, out byte[] senseBuffer, ScsiAttributeAction action,
+                                  ushort firstAttribute, uint timeout, out double duration) =>
             ReadAttribute(out buffer, out senseBuffer, action, 0, 0, 0, 0, firstAttribute, false, timeout,
                           out duration);
 
-        /// <summary>
-        ///     Reads an attribute from the medium auxiliary memory
-        /// </summary>
+        /// <summary>Reads an attribute from the medium auxiliary memory</summary>
         /// <param name="buffer">Buffer.</param>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="action">What to do, <see cref="ScsiAttributeAction" />.</param>
@@ -655,16 +647,12 @@ namespace Aaru.Devices
         /// <param name="firstAttribute">First attribute identifier.</param>
         /// <param name="timeout">Timeout.</param>
         /// <param name="duration">Duration.</param>
-        public bool ReadAttribute(out byte[] buffer, out byte[] senseBuffer, ScsiAttributeAction action,
-                                  byte       volume,
-                                  byte       partition, ushort firstAttribute, uint timeout,
-                                  out double duration) =>
+        public bool ReadAttribute(out byte[] buffer, out byte[] senseBuffer, ScsiAttributeAction action, byte volume,
+                                  byte partition, ushort firstAttribute, uint timeout, out double duration) =>
             ReadAttribute(out buffer, out senseBuffer, action, 0, 0, volume, partition, firstAttribute, false, timeout,
                           out duration);
 
-        /// <summary>
-        ///     Reads an attribute from the medium auxiliary memory
-        /// </summary>
+        /// <summary>Reads an attribute from the medium auxiliary memory</summary>
         /// <param name="buffer">Buffer.</param>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="action">What to do, <see cref="ScsiAttributeAction" />.</param>
@@ -674,17 +662,13 @@ namespace Aaru.Devices
         /// <param name="cache">If set to <c>true</c> device can return cached data.</param>
         /// <param name="timeout">Timeout.</param>
         /// <param name="duration">Duration.</param>
-        public bool ReadAttribute(out byte[] buffer, out byte[] senseBuffer, ScsiAttributeAction action,
-                                  byte       volume,
-                                  byte       partition, ushort firstAttribute, bool cache,
-                                  uint       timeout,
+        public bool ReadAttribute(out byte[] buffer, out byte[] senseBuffer, ScsiAttributeAction action, byte volume,
+                                  byte partition, ushort firstAttribute, bool cache, uint timeout,
                                   out double duration) =>
             ReadAttribute(out buffer, out senseBuffer, action, 0, 0, volume, partition, firstAttribute, cache, timeout,
                           out duration);
 
-        /// <summary>
-        ///     Sends the SPC MODE SELECT(6) command
-        /// </summary>
+        /// <summary>Sends the SPC MODE SELECT(6) command</summary>
         /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
         /// <param name="buffer">Buffer with the data to be sent to the device</param>
         /// <param name="senseBuffer">Sense buffer.</param>
@@ -692,7 +676,7 @@ namespace Aaru.Devices
         /// <param name="timeout">Timeout in seconds.</param>
         /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
         /// <param name="pageFormat">Set if page is formatted.</param>
-        public bool ModeSelect(byte[]     buffer, out byte[] senseBuffer, bool pageFormat, bool savePages, uint timeout,
+        public bool ModeSelect(byte[] buffer, out byte[] senseBuffer, bool pageFormat, bool savePages, uint timeout,
                                out double duration)
         {
             senseBuffer = new byte[32];
@@ -700,24 +684,37 @@ namespace Aaru.Devices
             // Prevent overflows
             if(buffer.Length > 255)
             {
-                if(PlatformId != PlatformID.Win32NT      && PlatformId != PlatformID.Win32S &&
-                   PlatformId != PlatformID.Win32Windows && PlatformId != PlatformID.WinCE  &&
-                   PlatformId != PlatformID.WindowsPhone && PlatformId != PlatformID.Xbox) LastError = 75;
-                else LastError                                                                       = 111;
+                if(PlatformId != PlatformID.Win32NT      &&
+                   PlatformId != PlatformID.Win32S       &&
+                   PlatformId != PlatformID.Win32Windows &&
+                   PlatformId != PlatformID.WinCE        &&
+                   PlatformId != PlatformID.WindowsPhone &&
+                   PlatformId != PlatformID.Xbox)
+                    LastError = 75;
+                else
+                    LastError = 111;
+
                 Error    = true;
                 duration = 0;
+
                 return true;
             }
 
             byte[] cdb = new byte[6];
 
             cdb[0] = (byte)ScsiCommands.ModeSelect;
-            if(pageFormat) cdb[1] += 0x10;
-            if(savePages) cdb[1]  += 0x01;
+
+            if(pageFormat)
+                cdb[1] += 0x10;
+
+            if(savePages)
+                cdb[1] += 0x01;
+
             cdb[4] = (byte)buffer.Length;
 
             LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.Out, out duration,
                                         out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("SCSI Device", "MODE SELECT(6) took {0} ms.", duration);
@@ -725,9 +722,7 @@ namespace Aaru.Devices
             return sense;
         }
 
-        /// <summary>
-        ///     Sends the SPC MODE SELECT(10) command
-        /// </summary>
+        /// <summary>Sends the SPC MODE SELECT(10) command</summary>
         /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
         /// <param name="buffer">Buffer with the data to be sent to the device</param>
         /// <param name="savePages">Set to save pages between resets.</param>
@@ -735,8 +730,7 @@ namespace Aaru.Devices
         /// <param name="timeout">Timeout in seconds.</param>
         /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
         /// <param name="pageFormat">Set if page is formatted.</param>
-        public bool ModeSelect10(byte[]     buffer, out byte[] senseBuffer, bool pageFormat, bool savePages,
-                                 uint       timeout,
+        public bool ModeSelect10(byte[] buffer, out byte[] senseBuffer, bool pageFormat, bool savePages, uint timeout,
                                  out double duration)
         {
             senseBuffer = new byte[32];
@@ -744,25 +738,38 @@ namespace Aaru.Devices
             // Prevent overflows
             if(buffer.Length > 65535)
             {
-                if(PlatformId != PlatformID.Win32NT      && PlatformId != PlatformID.Win32S &&
-                   PlatformId != PlatformID.Win32Windows && PlatformId != PlatformID.WinCE  &&
-                   PlatformId != PlatformID.WindowsPhone && PlatformId != PlatformID.Xbox) LastError = 75;
-                else LastError                                                                       = 111;
+                if(PlatformId != PlatformID.Win32NT      &&
+                   PlatformId != PlatformID.Win32S       &&
+                   PlatformId != PlatformID.Win32Windows &&
+                   PlatformId != PlatformID.WinCE        &&
+                   PlatformId != PlatformID.WindowsPhone &&
+                   PlatformId != PlatformID.Xbox)
+                    LastError = 75;
+                else
+                    LastError = 111;
+
                 Error    = true;
                 duration = 0;
+
                 return true;
             }
 
             byte[] cdb = new byte[10];
 
             cdb[0] = (byte)ScsiCommands.ModeSelect10;
-            if(pageFormat) cdb[1] += 0x10;
-            if(savePages) cdb[1]  += 0x01;
+
+            if(pageFormat)
+                cdb[1] += 0x10;
+
+            if(savePages)
+                cdb[1] += 0x01;
+
             cdb[7] = (byte)((buffer.Length & 0xFF00) << 8);
             cdb[8] = (byte)(buffer.Length & 0xFF);
 
             LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.Out, out duration,
                                         out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("SCSI Device", "MODE SELECT(10) took {0} ms.", duration);
@@ -779,7 +786,10 @@ namespace Aaru.Devices
             buffer = new byte[252];
 
             cdb[0] = (byte)ScsiCommands.RequestSense;
-            if(descriptor) cdb[1] = 0x01;
+
+            if(descriptor)
+                cdb[1] = 0x01;
+
             cdb[2] = 0;
             cdb[3] = 0;
             cdb[4] = (byte)buffer.Length;
@@ -787,6 +797,7 @@ namespace Aaru.Devices
 
             LastError = SendScsiCommand(cdb, ref buffer, out _, timeout, ScsiDirection.In, out duration,
                                         out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("SCSI Device", "REQUEST SENSE took {0} ms.", duration);
diff --git a/Aaru.Devices/Device/ScsiCommands/SSC.cs b/Aaru.Devices/Device/ScsiCommands/SSC.cs
index 8aa322db2..217bd36f3 100644
--- a/Aaru.Devices/Device/ScsiCommands/SSC.cs
+++ b/Aaru.Devices/Device/ScsiCommands/SSC.cs
@@ -37,9 +37,7 @@ namespace Aaru.Devices
 {
     public partial class Device
     {
-        /// <summary>
-        ///     Prepares the medium for reading
-        /// </summary>
+        /// <summary>Prepares the medium for reading</summary>
         /// <returns><c>true</c>, if load was successful, <c>false</c> otherwise.</returns>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="timeout">Timeout.</param>
@@ -47,9 +45,7 @@ namespace Aaru.Devices
         public bool Load(out byte[] senseBuffer, uint timeout, out double duration) =>
             LoadUnload(out senseBuffer, false, true, false, false, false, timeout, out duration);
 
-        /// <summary>
-        ///     Prepares the medium for ejection
-        /// </summary>
+        /// <summary>Prepares the medium for ejection</summary>
         /// <returns><c>true</c>, if unload was successful, <c>false</c> otherwise.</returns>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="timeout">Timeout.</param>
@@ -57,9 +53,7 @@ namespace Aaru.Devices
         public bool Unload(out byte[] senseBuffer, uint timeout, out double duration) =>
             LoadUnload(out senseBuffer, false, false, false, false, false, timeout, out duration);
 
-        /// <summary>
-        ///     Prepares the medium for reading or ejection
-        /// </summary>
+        /// <summary>Prepares the medium for reading or ejection</summary>
         /// <returns><c>true</c>, if load/unload was successful, <c>false</c> otherwise.</returns>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="immediate">If set to <c>true</c>, return from the command immediately.</param>
@@ -72,22 +66,33 @@ namespace Aaru.Devices
         /// </param>
         /// <param name="timeout">Timeout.</param>
         /// <param name="duration">Duration.</param>
-        public bool LoadUnload(out byte[] senseBuffer, bool immediate, bool       load, bool retense, bool endOfTape,
-                               bool       hold,        uint timeout,   out double duration)
+        public bool LoadUnload(out byte[] senseBuffer, bool immediate, bool load, bool retense, bool endOfTape,
+                               bool hold, uint timeout, out double duration)
         {
             senseBuffer = new byte[32];
             byte[] cdb    = new byte[6];
             byte[] buffer = new byte[0];
 
             cdb[0] = (byte)ScsiCommands.LoadUnload;
-            if(immediate) cdb[1] =  0x01;
-            if(load) cdb[4]      += 0x01;
-            if(retense) cdb[4]   += 0x02;
-            if(endOfTape) cdb[4] += 0x04;
-            if(hold) cdb[4]      += 0x08;
+
+            if(immediate)
+                cdb[1] = 0x01;
+
+            if(load)
+                cdb[4] += 0x01;
+
+            if(retense)
+                cdb[4] += 0x02;
+
+            if(endOfTape)
+                cdb[4] += 0x04;
+
+            if(hold)
+                cdb[4] += 0x08;
 
             LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.None, out duration,
                                         out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("SCSI Device", "LOAD UNLOAD (6) took {0} ms.", duration);
@@ -95,9 +100,7 @@ namespace Aaru.Devices
             return sense;
         }
 
-        /// <summary>
-        ///     Positions the medium to the specified block in the current partition
-        /// </summary>
+        /// <summary>Positions the medium to the specified block in the current partition</summary>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="lba">Logical block address.</param>
         /// <param name="timeout">Timeout.</param>
@@ -105,9 +108,7 @@ namespace Aaru.Devices
         public bool Locate(out byte[] senseBuffer, uint lba, uint timeout, out double duration) =>
             Locate(out senseBuffer, false, false, false, 0, lba, timeout, out duration);
 
-        /// <summary>
-        ///     Positions the medium to the specified block in the specified partition
-        /// </summary>
+        /// <summary>Positions the medium to the specified block in the specified partition</summary>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="partition">Partition to position to.</param>
         /// <param name="lba">Logical block address.</param>
@@ -116,9 +117,7 @@ namespace Aaru.Devices
         public bool Locate(out byte[] senseBuffer, byte partition, uint lba, uint timeout, out double duration) =>
             Locate(out senseBuffer, false, false, false, partition, lba, timeout, out duration);
 
-        /// <summary>
-        ///     Positions the medium to the specified block in the current partition
-        /// </summary>
+        /// <summary>Positions the medium to the specified block in the current partition</summary>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="immediate">If set to <c>true</c>, return from the command immediately.</param>
         /// <param name="lba">Logical block address.</param>
@@ -127,9 +126,7 @@ namespace Aaru.Devices
         public bool Locate(out byte[] senseBuffer, bool immediate, uint lba, uint timeout, out double duration) =>
             Locate(out senseBuffer, immediate, false, false, 0, lba, timeout, out duration);
 
-        /// <summary>
-        ///     Positions the medium to the specified block in the specified partition
-        /// </summary>
+        /// <summary>Positions the medium to the specified block in the specified partition</summary>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="immediate">If set to <c>true</c>, return from the command immediately.</param>
         /// <param name="partition">Partition to position to.</param>
@@ -137,12 +134,10 @@ namespace Aaru.Devices
         /// <param name="timeout">Timeout.</param>
         /// <param name="duration">Duration.</param>
         public bool Locate(out byte[] senseBuffer, bool immediate, byte partition, uint lba, uint timeout,
-                           out double duration) =>
-            Locate(out senseBuffer, immediate, false, false, partition, lba, timeout, out duration);
+                           out double duration) => Locate(out senseBuffer, immediate, false, false, partition, lba,
+                                                          timeout, out duration);
 
-        /// <summary>
-        ///     Positions the medium to the specified object identifier
-        /// </summary>
+        /// <summary>Positions the medium to the specified object identifier</summary>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="immediate">If set to <c>true</c>, return from the command immediately.</param>
         /// <param name="blockType">If set to <c>true</c> object identifier is vendor specified.</param>
@@ -151,18 +146,24 @@ namespace Aaru.Devices
         /// <param name="objectId">Object identifier.</param>
         /// <param name="timeout">Timeout.</param>
         /// <param name="duration">Duration.</param>
-        public bool Locate(out byte[] senseBuffer, bool immediate, bool blockType, bool changePartition,
-                           byte       partition,
-                           uint       objectId, uint timeout, out double duration)
+        public bool Locate(out byte[] senseBuffer, bool immediate, bool blockType, bool changePartition, byte partition,
+                           uint objectId, uint timeout, out double duration)
         {
             senseBuffer = new byte[32];
             byte[] cdb    = new byte[10];
             byte[] buffer = new byte[0];
 
             cdb[0] = (byte)ScsiCommands.Locate;
-            if(immediate) cdb[1]       += 0x01;
-            if(changePartition) cdb[1] += 0x02;
-            if(blockType) cdb[1]       += 0x04;
+
+            if(immediate)
+                cdb[1] += 0x01;
+
+            if(changePartition)
+                cdb[1] += 0x02;
+
+            if(blockType)
+                cdb[1] += 0x04;
+
             cdb[3] = (byte)((objectId & 0xFF000000) >> 24);
             cdb[4] = (byte)((objectId & 0xFF0000)   >> 16);
             cdb[5] = (byte)((objectId & 0xFF00)     >> 8);
@@ -171,6 +172,7 @@ namespace Aaru.Devices
 
             LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.None, out duration,
                                         out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("SCSI Device", "LOCATE (10) took {0} ms.", duration);
@@ -178,9 +180,7 @@ namespace Aaru.Devices
             return sense;
         }
 
-        /// <summary>
-        ///     Positions the medium to the specified block in the current partition
-        /// </summary>
+        /// <summary>Positions the medium to the specified block in the current partition</summary>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="lba">Logical block address.</param>
         /// <param name="timeout">Timeout.</param>
@@ -188,9 +188,7 @@ namespace Aaru.Devices
         public bool Locate16(out byte[] senseBuffer, ulong lba, uint timeout, out double duration) =>
             Locate16(out senseBuffer, false, false, SscLogicalIdTypes.ObjectId, false, 0, lba, timeout, out duration);
 
-        /// <summary>
-        ///     Positions the medium to the specified block in the specified partition
-        /// </summary>
+        /// <summary>Positions the medium to the specified block in the specified partition</summary>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="partition">Partition to position to.</param>
         /// <param name="lba">Logical block address.</param>
@@ -200,9 +198,7 @@ namespace Aaru.Devices
             Locate16(out senseBuffer, false, false, SscLogicalIdTypes.ObjectId, false, partition, lba, timeout,
                      out duration);
 
-        /// <summary>
-        ///     Positions the medium to the specified block in the current partition
-        /// </summary>
+        /// <summary>Positions the medium to the specified block in the current partition</summary>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="immediate">If set to <c>true</c>, return from the command immediately.</param>
         /// <param name="lba">Logical block address.</param>
@@ -212,9 +208,7 @@ namespace Aaru.Devices
             Locate16(out senseBuffer, immediate, false, SscLogicalIdTypes.ObjectId, false, 0, lba, timeout,
                      out duration);
 
-        /// <summary>
-        ///     Positions the medium to the specified block in the specified partition
-        /// </summary>
+        /// <summary>Positions the medium to the specified block in the specified partition</summary>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="immediate">If set to <c>true</c>, return from the command immediately.</param>
         /// <param name="partition">Partition to position to.</param>
@@ -222,13 +216,11 @@ namespace Aaru.Devices
         /// <param name="timeout">Timeout.</param>
         /// <param name="duration">Duration.</param>
         public bool Locate16(out byte[] senseBuffer, bool immediate, byte partition, ulong lba, uint timeout,
-                             out double duration) =>
-            Locate16(out senseBuffer, immediate, false, SscLogicalIdTypes.ObjectId, false, partition, lba, timeout,
-                     out duration);
+                             out double duration) => Locate16(out senseBuffer, immediate, false,
+                                                              SscLogicalIdTypes.ObjectId, false, partition, lba,
+                                                              timeout, out duration);
 
-        /// <summary>
-        ///     Positions the medium to the specified object identifier
-        /// </summary>
+        /// <summary>Positions the medium to the specified object identifier</summary>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="immediate">If set to <c>true</c>, return from the command immediately.</param>
         /// <param name="changePartition">If set to <c>true</c> change partition.</param>
@@ -238,9 +230,8 @@ namespace Aaru.Devices
         /// <param name="identifier">Destination identifier.</param>
         /// <param name="timeout">Timeout.</param>
         /// <param name="duration">Duration.</param>
-        public bool Locate16(out byte[] senseBuffer, bool immediate, bool  changePartition, SscLogicalIdTypes destType,
-                             bool       bam,         byte partition, ulong identifier,      uint              timeout,
-                             out double duration)
+        public bool Locate16(out byte[] senseBuffer, bool immediate, bool changePartition, SscLogicalIdTypes destType,
+                             bool bam, byte partition, ulong identifier, uint timeout, out double duration)
         {
             senseBuffer = new byte[32];
             byte[] cdb     = new byte[16];
@@ -249,9 +240,16 @@ namespace Aaru.Devices
 
             cdb[0] = (byte)ScsiCommands.Locate16;
             cdb[1] = (byte)((byte)destType << 3);
-            if(immediate) cdb[1]       += 0x01;
-            if(changePartition) cdb[1] += 0x02;
-            if(bam) cdb[2]             =  0x01;
+
+            if(immediate)
+                cdb[1] += 0x01;
+
+            if(changePartition)
+                cdb[1] += 0x02;
+
+            if(bam)
+                cdb[2] = 0x01;
+
             cdb[3] = partition;
 
             cdb[4]  = idBytes[7];
@@ -265,6 +263,7 @@ namespace Aaru.Devices
 
             LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.None, out duration,
                                         out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("SCSI Device", "LOCATE (16) took {0} ms.", duration);
@@ -286,9 +285,7 @@ namespace Aaru.Devices
             return Read6(out buffer, out senseBuffer, false, true, blocks, blockSize, timeout, out duration);
         }*/
 
-        /// <summary>
-        ///     Reads the specified number of bytes or of blocks from the medium
-        /// </summary>
+        /// <summary>Reads the specified number of bytes or of blocks from the medium</summary>
         /// <param name="buffer">Buffer.</param>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="sili">If set to <c>true</c> suppress the incorrect-length indication.</param>
@@ -296,13 +293,11 @@ namespace Aaru.Devices
         /// <param name="blockSize">Block size in bytes.</param>
         /// <param name="timeout">Timeout.</param>
         /// <param name="duration">Duration.</param>
-        public bool Read6(out byte[] buffer,  out byte[] senseBuffer, bool sili, uint transferLen, uint blockSize,
-                          uint       timeout, out double duration) =>
-            Read6(out buffer, out senseBuffer, sili, false, transferLen, blockSize, timeout, out duration);
+        public bool Read6(out byte[] buffer, out byte[] senseBuffer, bool sili, uint transferLen, uint blockSize,
+                          uint timeout, out double duration) => Read6(out buffer, out senseBuffer, sili, false,
+                                                                      transferLen, blockSize, timeout, out duration);
 
-        /// <summary>
-        ///     Reads the specified number of bytes or of blocks from the medium
-        /// </summary>
+        /// <summary>Reads the specified number of bytes or of blocks from the medium</summary>
         /// <param name="buffer">Buffer.</param>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="sili">
@@ -317,23 +312,28 @@ namespace Aaru.Devices
         /// <param name="blockSize">Block size in bytes.</param>
         /// <param name="timeout">Timeout.</param>
         /// <param name="duration">Duration.</param>
-        public bool Read6(out byte[] buffer, out byte[] senseBuffer, bool sili, bool fixedLen,
-                          uint       transferLen,
-                          uint       blockSize, uint timeout, out double duration)
+        public bool Read6(out byte[] buffer, out byte[] senseBuffer, bool sili, bool fixedLen, uint transferLen,
+                          uint blockSize, uint timeout, out double duration)
         {
             buffer = fixedLen ? new byte[blockSize * transferLen] : new byte[transferLen];
             byte[] cdb = new byte[6];
             senseBuffer = new byte[32];
 
             cdb[0] = (byte)ScsiCommands.Read6;
-            if(fixedLen) cdb[1] += 0x01;
-            if(sili) cdb[1]     += 0x02;
+
+            if(fixedLen)
+                cdb[1] += 0x01;
+
+            if(sili)
+                cdb[1] += 0x02;
+
             cdb[2] = (byte)((transferLen & 0xFF0000) >> 16);
             cdb[3] = (byte)((transferLen & 0xFF00)   >> 8);
             cdb[4] = (byte)(transferLen & 0xFF);
 
             LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
                                         out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("SCSI Device", "READ (6) took {0} ms.", duration);
@@ -341,9 +341,7 @@ namespace Aaru.Devices
             return sense;
         }
 
-        /// <summary>
-        ///     Reads a number of fixed-length blocks starting at specified object
-        /// </summary>
+        /// <summary>Reads a number of fixed-length blocks starting at specified object</summary>
         /// <param name="buffer">Buffer.</param>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="sili">If set to <c>true</c> suppress the incorrect-length indication.</param>
@@ -352,13 +350,11 @@ namespace Aaru.Devices
         /// <param name="blockSize">Object size in bytes.</param>
         /// <param name="timeout">Timeout.</param>
         /// <param name="duration">Duration.</param>
-        public bool Read16(out byte[] buffer,    out byte[] senseBuffer, bool       sili, ulong objectId, uint blocks,
-                           uint       blockSize, uint       timeout,     out double duration) =>
+        public bool Read16(out byte[] buffer, out byte[] senseBuffer, bool sili, ulong objectId, uint blocks,
+                           uint blockSize, uint timeout, out double duration) =>
             Read16(out buffer, out senseBuffer, sili, false, 0, objectId, blocks, blockSize, timeout, out duration);
 
-        /// <summary>
-        ///     Reads a number of fixed-length blocks starting at specified block from the specified partition
-        /// </summary>
+        /// <summary>Reads a number of fixed-length blocks starting at specified block from the specified partition</summary>
         /// <param name="buffer">Buffer.</param>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="sili">If set to <c>true</c> suppress the incorrect-length indication.</param>
@@ -368,15 +364,12 @@ namespace Aaru.Devices
         /// <param name="blockSize">Object size in bytes.</param>
         /// <param name="timeout">Timeout.</param>
         /// <param name="duration">Duration.</param>
-        public bool Read16(out byte[] buffer, out byte[] senseBuffer, bool sili, byte partition,
-                           ulong      objectId,
-                           uint       blocks, uint blockSize, uint timeout, out double duration) =>
+        public bool Read16(out byte[] buffer, out byte[] senseBuffer, bool sili, byte partition, ulong objectId,
+                           uint blocks, uint blockSize, uint timeout, out double duration) =>
             Read16(out buffer, out senseBuffer, sili, false, partition, objectId, blocks, blockSize, timeout,
                    out duration);
 
-        /// <summary>
-        ///     Reads a number of fixed-length blocks starting at specified object
-        /// </summary>
+        /// <summary>Reads a number of fixed-length blocks starting at specified object</summary>
         /// <param name="buffer">Buffer.</param>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="objectId">Object identifier.</param>
@@ -384,13 +377,11 @@ namespace Aaru.Devices
         /// <param name="blockSize">Object size in bytes.</param>
         /// <param name="timeout">Timeout.</param>
         /// <param name="duration">Duration.</param>
-        public bool Read16(out byte[] buffer,  out byte[] senseBuffer, ulong objectId, uint blocks, uint blockSize,
-                           uint       timeout, out double duration) =>
+        public bool Read16(out byte[] buffer, out byte[] senseBuffer, ulong objectId, uint blocks, uint blockSize,
+                           uint timeout, out double duration) =>
             Read16(out buffer, out senseBuffer, false, true, 0, objectId, blocks, blockSize, timeout, out duration);
 
-        /// <summary>
-        ///     Reads a number of fixed-length blocks starting at specified block from the specified partition
-        /// </summary>
+        /// <summary>Reads a number of fixed-length blocks starting at specified block from the specified partition</summary>
         /// <param name="buffer">Buffer.</param>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="partition">Partition to read object from.</param>
@@ -399,15 +390,12 @@ namespace Aaru.Devices
         /// <param name="blockSize">Object size in bytes.</param>
         /// <param name="timeout">Timeout.</param>
         /// <param name="duration">Duration.</param>
-        public bool Read16(out byte[] buffer, out byte[] senseBuffer, byte partition, ulong objectId,
-                           uint       blocks,
-                           uint       blockSize, uint timeout, out double duration) =>
+        public bool Read16(out byte[] buffer, out byte[] senseBuffer, byte partition, ulong objectId, uint blocks,
+                           uint blockSize, uint timeout, out double duration) =>
             Read16(out buffer, out senseBuffer, false, true, partition, objectId, blocks, blockSize, timeout,
                    out duration);
 
-        /// <summary>
-        ///     Reads a number of bytes or objects starting at specified object from the specified partition
-        /// </summary>
+        /// <summary>Reads a number of bytes or objects starting at specified object from the specified partition</summary>
         /// <param name="buffer">Buffer.</param>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="sili">
@@ -424,10 +412,8 @@ namespace Aaru.Devices
         /// <param name="objectSize">Object size in bytes.</param>
         /// <param name="timeout">Timeout.</param>
         /// <param name="duration">Duration.</param>
-        public bool Read16(out byte[] buffer, out byte[] senseBuffer, bool sili, bool fixedLen,
-                           byte       partition,
-                           ulong      objectId, uint transferLen, uint objectSize, uint timeout,
-                           out double duration)
+        public bool Read16(out byte[] buffer, out byte[] senseBuffer, bool sili, bool fixedLen, byte partition,
+                           ulong objectId, uint transferLen, uint objectSize, uint timeout, out double duration)
         {
             buffer = fixedLen ? new byte[objectSize * transferLen] : new byte[transferLen];
             byte[] cdb = new byte[6];
@@ -435,8 +421,13 @@ namespace Aaru.Devices
             byte[] idBytes = BitConverter.GetBytes(objectId);
 
             cdb[0] = (byte)ScsiCommands.Read16;
-            if(fixedLen) cdb[1] += 0x01;
-            if(sili) cdb[1]     += 0x02;
+
+            if(fixedLen)
+                cdb[1] += 0x01;
+
+            if(sili)
+                cdb[1] += 0x02;
+
             cdb[3]  = partition;
             cdb[4]  = idBytes[7];
             cdb[5]  = idBytes[6];
@@ -452,6 +443,7 @@ namespace Aaru.Devices
 
             LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
                                         out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("SCSI Device", "READ (16) took {0} ms.", duration);
@@ -459,9 +451,7 @@ namespace Aaru.Devices
             return sense;
         }
 
-        /// <summary>
-        ///     Requests the drive the maximum and minimum block size
-        /// </summary>
+        /// <summary>Requests the drive the maximum and minimum block size</summary>
         /// <param name="buffer">Buffer.</param>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="timeout">Timeout.</param>
@@ -476,6 +466,7 @@ namespace Aaru.Devices
 
             LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
                                         out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("SCSI Device", "READ BLOCK LIMITS took {0} ms.", duration);
@@ -483,9 +474,7 @@ namespace Aaru.Devices
             return sense;
         }
 
-        /// <summary>
-        ///     Reports current reading/writing elements position on the medium
-        /// </summary>
+        /// <summary>Reports current reading/writing elements position on the medium</summary>
         /// <param name="buffer">Buffer.</param>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="timeout">Timeout.</param>
@@ -493,9 +482,7 @@ namespace Aaru.Devices
         public bool ReadPosition(out byte[] buffer, out byte[] senseBuffer, uint timeout, out double duration) =>
             ReadPosition(out buffer, out senseBuffer, SscPositionForms.Short, timeout, out duration);
 
-        /// <summary>
-        ///     Reports current reading/writing elements position on the medium using 32 bytes response
-        /// </summary>
+        /// <summary>Reports current reading/writing elements position on the medium using 32 bytes response</summary>
         /// <param name="buffer">Buffer.</param>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="timeout">Timeout.</param>
@@ -503,9 +490,7 @@ namespace Aaru.Devices
         public bool ReadPositionLong(out byte[] buffer, out byte[] senseBuffer, uint timeout, out double duration) =>
             ReadPosition(out buffer, out senseBuffer, SscPositionForms.Long, timeout, out duration);
 
-        /// <summary>
-        ///     Reports current reading/writing elements position on the medium
-        /// </summary>
+        /// <summary>Reports current reading/writing elements position on the medium</summary>
         /// <param name="buffer">Buffer.</param>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="vendorType">Requests the position to be given in vendor-specified meaning.</param>
@@ -513,20 +498,24 @@ namespace Aaru.Devices
         /// <param name="totalPosition">Requests current logical position.</param>
         /// <param name="timeout">Timeout.</param>
         /// <param name="duration">Duration.</param>
-        public bool ReadPosition(out byte[] buffer,        out byte[] senseBuffer, bool       vendorType, bool longForm,
-                                 bool       totalPosition, uint       timeout,     out double duration)
+        public bool ReadPosition(out byte[] buffer, out byte[] senseBuffer, bool vendorType, bool longForm,
+                                 bool totalPosition, uint timeout, out double duration)
         {
-            byte responseForm              = 0;
-            if(vendorType) responseForm    += 0x01;
-            if(longForm) responseForm      += 0x02;
-            if(totalPosition) responseForm += 0x04;
+            byte responseForm = 0;
+
+            if(vendorType)
+                responseForm += 0x01;
+
+            if(longForm)
+                responseForm += 0x02;
+
+            if(totalPosition)
+                responseForm += 0x04;
 
             return ReadPosition(out buffer, out senseBuffer, (SscPositionForms)responseForm, timeout, out duration);
         }
 
-        /// <summary>
-        ///     Reports current reading/writing elements position on the medium
-        /// </summary>
+        /// <summary>Reports current reading/writing elements position on the medium</summary>
         /// <param name="buffer">Buffer.</param>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="responseForm">Response form.</param>
@@ -543,15 +532,18 @@ namespace Aaru.Devices
                 case SscPositionForms.OldLongVendor:
                 case SscPositionForms.Extended:
                     buffer = new byte[32];
+
                     break;
                 case SscPositionForms.OldTclp:
                 case SscPositionForms.OldTclpVendor:
                 case SscPositionForms.Short:
                 case SscPositionForms.VendorShort:
                     buffer = new byte[20];
+
                     break;
                 default:
                     buffer = new byte[32]; // Invalid
+
                     break;
             }
 
@@ -560,6 +552,7 @@ namespace Aaru.Devices
 
             cdb[0] = (byte)ScsiCommands.ReadPosition;
             cdb[1] = (byte)((byte)responseForm & 0x1F);
+
             if(responseForm == SscPositionForms.Extended)
             {
                 cdb[7] = (byte)((buffer.Length & 0xFF00) >> 8);
@@ -568,6 +561,7 @@ namespace Aaru.Devices
 
             LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
                                         out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("SCSI Device", "READ POSITION took {0} ms.", duration);
@@ -575,9 +569,7 @@ namespace Aaru.Devices
             return sense;
         }
 
-        /// <summary>
-        ///     Reads the specified number of blocks from the medium, backwards
-        /// </summary>
+        /// <summary>Reads the specified number of blocks from the medium, backwards</summary>
         /// <param name="buffer">Buffer.</param>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="blocks">How many blocks to read.</param>
@@ -588,9 +580,7 @@ namespace Aaru.Devices
                                  out double duration) =>
             ReadReverse6(out buffer, out senseBuffer, false, false, true, blocks, blockSize, timeout, out duration);
 
-        /// <summary>
-        ///     Reads the specified number of bytes or of blocks from the medium, backwards
-        /// </summary>
+        /// <summary>Reads the specified number of bytes or of blocks from the medium, backwards</summary>
         /// <param name="buffer">Buffer.</param>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="sili">If set to <c>true</c> suppress the incorrect-length indication.</param>
@@ -598,15 +588,12 @@ namespace Aaru.Devices
         /// <param name="blockSize">Block size in bytes.</param>
         /// <param name="timeout">Timeout.</param>
         /// <param name="duration">Duration.</param>
-        public bool ReadReverse6(out byte[] buffer, out byte[] senseBuffer, bool sili, uint transferLen,
-                                 uint       blockSize,
-                                 uint       timeout, out double duration) =>
+        public bool ReadReverse6(out byte[] buffer, out byte[] senseBuffer, bool sili, uint transferLen, uint blockSize,
+                                 uint timeout, out double duration) =>
             ReadReverse6(out buffer, out senseBuffer, false, sili, false, transferLen, blockSize, timeout,
                          out duration);
 
-        /// <summary>
-        ///     Reads the specified number of bytes or of blocks from the medium, backwards
-        /// </summary>
+        /// <summary>Reads the specified number of bytes or of blocks from the medium, backwards</summary>
         /// <param name="buffer">Buffer.</param>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="byteOrder">If set to <c>true</c> drive should un-reverse the blocks and bytes</param>
@@ -622,24 +609,31 @@ namespace Aaru.Devices
         /// <param name="blockSize">Block size in bytes.</param>
         /// <param name="timeout">Timeout.</param>
         /// <param name="duration">Duration.</param>
-        public bool ReadReverse6(out byte[] buffer, out byte[] senseBuffer, bool byteOrder, bool sili,
-                                 bool       fixedLen,
-                                 uint       transferLen, uint blockSize, uint timeout, out double duration)
+        public bool ReadReverse6(out byte[] buffer, out byte[] senseBuffer, bool byteOrder, bool sili, bool fixedLen,
+                                 uint transferLen, uint blockSize, uint timeout, out double duration)
         {
             buffer = fixedLen ? new byte[blockSize * transferLen] : new byte[transferLen];
             byte[] cdb = new byte[6];
             senseBuffer = new byte[32];
 
             cdb[0] = (byte)ScsiCommands.ReadReverse;
-            if(fixedLen) cdb[1]  += 0x01;
-            if(sili) cdb[1]      += 0x02;
-            if(byteOrder) cdb[1] += 0x04;
+
+            if(fixedLen)
+                cdb[1] += 0x01;
+
+            if(sili)
+                cdb[1] += 0x02;
+
+            if(byteOrder)
+                cdb[1] += 0x04;
+
             cdb[2] = (byte)((transferLen & 0xFF0000) >> 16);
             cdb[3] = (byte)((transferLen & 0xFF00)   >> 8);
             cdb[4] = (byte)(transferLen & 0xFF);
 
             LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
                                         out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("SCSI Device", "READ REVERSE (6) took {0} ms.", duration);
@@ -647,9 +641,7 @@ namespace Aaru.Devices
             return sense;
         }
 
-        /// <summary>
-        ///     Reads a number of fixed-length blocks starting at specified object, backwards
-        /// </summary>
+        /// <summary>Reads a number of fixed-length blocks starting at specified object, backwards</summary>
         /// <param name="buffer">Buffer.</param>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="sili">If set to <c>true</c> suppress the incorrect-length indication.</param>
@@ -658,15 +650,12 @@ namespace Aaru.Devices
         /// <param name="blockSize">Object size in bytes.</param>
         /// <param name="timeout">Timeout.</param>
         /// <param name="duration">Duration.</param>
-        public bool ReadReverse16(out byte[] buffer, out byte[] senseBuffer, bool sili, ulong objectId,
-                                  uint       blocks,
-                                  uint       blockSize, uint timeout, out double duration) =>
+        public bool ReadReverse16(out byte[] buffer, out byte[] senseBuffer, bool sili, ulong objectId, uint blocks,
+                                  uint blockSize, uint timeout, out double duration) =>
             ReadReverse16(out buffer, out senseBuffer, false, sili, false, 0, objectId, blocks, blockSize, timeout,
                           out duration);
 
-        /// <summary>
-        ///     Reads a number of fixed-length blocks starting at specified block from the specified partition, backwards
-        /// </summary>
+        /// <summary>Reads a number of fixed-length blocks starting at specified block from the specified partition, backwards</summary>
         /// <param name="buffer">Buffer.</param>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="sili">If set to <c>true</c> suppress the incorrect-length indication.</param>
@@ -676,15 +665,12 @@ namespace Aaru.Devices
         /// <param name="blockSize">Object size in bytes.</param>
         /// <param name="timeout">Timeout.</param>
         /// <param name="duration">Duration.</param>
-        public bool ReadReverse16(out byte[] buffer, out byte[] senseBuffer, bool sili, byte partition,
-                                  ulong      objectId,
-                                  uint       blocks, uint blockSize, uint timeout, out double duration) =>
+        public bool ReadReverse16(out byte[] buffer, out byte[] senseBuffer, bool sili, byte partition, ulong objectId,
+                                  uint blocks, uint blockSize, uint timeout, out double duration) =>
             ReadReverse16(out buffer, out senseBuffer, false, sili, false, partition, objectId, blocks, blockSize,
-                          timeout,    out duration);
+                          timeout, out duration);
 
-        /// <summary>
-        ///     Reads a number of fixed-length blocks starting at specified object, backwards
-        /// </summary>
+        /// <summary>Reads a number of fixed-length blocks starting at specified object, backwards</summary>
         /// <param name="buffer">Buffer.</param>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="objectId">Object identifier.</param>
@@ -692,14 +678,12 @@ namespace Aaru.Devices
         /// <param name="blockSize">Object size in bytes.</param>
         /// <param name="timeout">Timeout.</param>
         /// <param name="duration">Duration.</param>
-        public bool ReadReverse16(out byte[] buffer,    out byte[] senseBuffer, ulong      objectId, uint blocks,
-                                  uint       blockSize, uint       timeout,     out double duration) =>
+        public bool ReadReverse16(out byte[] buffer, out byte[] senseBuffer, ulong objectId, uint blocks,
+                                  uint blockSize, uint timeout, out double duration) =>
             ReadReverse16(out buffer, out senseBuffer, false, false, true, 0, objectId, blocks, blockSize, timeout,
                           out duration);
 
-        /// <summary>
-        ///     Reads a number of fixed-length blocks starting at specified block from the specified partition, backwards
-        /// </summary>
+        /// <summary>Reads a number of fixed-length blocks starting at specified block from the specified partition, backwards</summary>
         /// <param name="buffer">Buffer.</param>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="partition">Partition to read object from.</param>
@@ -708,14 +692,12 @@ namespace Aaru.Devices
         /// <param name="blockSize">Object size in bytes.</param>
         /// <param name="timeout">Timeout.</param>
         /// <param name="duration">Duration.</param>
-        public bool ReadReverse16(out byte[] buffer, out byte[] senseBuffer, byte partition, ulong      objectId,
-                                  uint       blocks, uint       blockSize,   uint timeout,   out double duration) =>
+        public bool ReadReverse16(out byte[] buffer, out byte[] senseBuffer, byte partition, ulong objectId,
+                                  uint blocks, uint blockSize, uint timeout, out double duration) =>
             ReadReverse16(out buffer, out senseBuffer, false, false, true, partition, objectId, blocks, blockSize,
-                          timeout,    out duration);
+                          timeout, out duration);
 
-        /// <summary>
-        ///     Reads a number of bytes or objects starting at specified object from the specified partition, backwards
-        /// </summary>
+        /// <summary>Reads a number of bytes or objects starting at specified object from the specified partition, backwards</summary>
         /// <param name="buffer">Buffer.</param>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="byteOrder">If set to <c>true</c> drive should un-reverse the blocks and bytes</param>
@@ -733,10 +715,8 @@ namespace Aaru.Devices
         /// <param name="objectSize">Object size in bytes.</param>
         /// <param name="timeout">Timeout.</param>
         /// <param name="duration">Duration.</param>
-        public bool ReadReverse16(out byte[] buffer, out byte[] senseBuffer, bool byteOrder, bool sili,
-                                  bool       fixedLen,
-                                  byte       partition, ulong objectId, uint transferLen, uint objectSize,
-                                  uint       timeout,
+        public bool ReadReverse16(out byte[] buffer, out byte[] senseBuffer, bool byteOrder, bool sili, bool fixedLen,
+                                  byte partition, ulong objectId, uint transferLen, uint objectSize, uint timeout,
                                   out double duration)
         {
             buffer = fixedLen ? new byte[objectSize * transferLen] : new byte[transferLen];
@@ -745,9 +725,16 @@ namespace Aaru.Devices
             byte[] idBytes = BitConverter.GetBytes(objectId);
 
             cdb[0] = (byte)ScsiCommands.Read16;
-            if(fixedLen) cdb[1]  += 0x01;
-            if(sili) cdb[1]      += 0x02;
-            if(byteOrder) cdb[1] += 0x04;
+
+            if(fixedLen)
+                cdb[1] += 0x01;
+
+            if(sili)
+                cdb[1] += 0x02;
+
+            if(byteOrder)
+                cdb[1] += 0x04;
+
             cdb[3]  = partition;
             cdb[4]  = idBytes[7];
             cdb[5]  = idBytes[6];
@@ -763,6 +750,7 @@ namespace Aaru.Devices
 
             LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
                                         out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("SCSI Device", "READ REVERSE (16) took {0} ms.", duration);
@@ -770,22 +758,18 @@ namespace Aaru.Devices
             return sense;
         }
 
-        /// <summary>
-        ///     Reads the specified number of blocks from the device's buffer
-        /// </summary>
+        /// <summary>Reads the specified number of blocks from the device's buffer</summary>
         /// <param name="buffer">Buffer.</param>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="blocks">How many blocks to read.</param>
         /// <param name="blockSize">Block size in bytes.</param>
         /// <param name="timeout">Timeout.</param>
         /// <param name="duration">Duration.</param>
-        public bool RecoverBufferedData(out byte[] buffer,  out byte[] senseBuffer, uint blocks, uint blockSize,
-                                        uint       timeout, out double duration) =>
+        public bool RecoverBufferedData(out byte[] buffer, out byte[] senseBuffer, uint blocks, uint blockSize,
+                                        uint timeout, out double duration) =>
             RecoverBufferedData(out buffer, out senseBuffer, false, true, blocks, blockSize, timeout, out duration);
 
-        /// <summary>
-        ///     Reads the specified number of bytes or of blocks from the device's buffer
-        /// </summary>
+        /// <summary>Reads the specified number of bytes or of blocks from the device's buffer</summary>
         /// <param name="buffer">Buffer.</param>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="sili">If set to <c>true</c> suppress the incorrect-length indication.</param>
@@ -793,14 +777,12 @@ namespace Aaru.Devices
         /// <param name="blockSize">Block size in bytes.</param>
         /// <param name="timeout">Timeout.</param>
         /// <param name="duration">Duration.</param>
-        public bool RecoverBufferedData(out byte[] buffer,    out byte[] senseBuffer, bool       sili, uint transferLen,
-                                        uint       blockSize, uint       timeout,     out double duration) =>
+        public bool RecoverBufferedData(out byte[] buffer, out byte[] senseBuffer, bool sili, uint transferLen,
+                                        uint blockSize, uint timeout, out double duration) =>
             RecoverBufferedData(out buffer, out senseBuffer, sili, false, transferLen, blockSize, timeout,
                                 out duration);
 
-        /// <summary>
-        ///     Reads the specified number of bytes or of blocks from the device's buffer
-        /// </summary>
+        /// <summary>Reads the specified number of bytes or of blocks from the device's buffer</summary>
         /// <param name="buffer">Buffer.</param>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="sili">
@@ -815,24 +797,28 @@ namespace Aaru.Devices
         /// <param name="blockSize">Block size in bytes.</param>
         /// <param name="timeout">Timeout.</param>
         /// <param name="duration">Duration.</param>
-        public bool RecoverBufferedData(out byte[] buffer, out byte[] senseBuffer, bool sili,
-                                        bool       fixedLen,
-                                        uint       transferLen, uint blockSize, uint timeout,
-                                        out double duration)
+        public bool RecoverBufferedData(out byte[] buffer, out byte[] senseBuffer, bool sili, bool fixedLen,
+                                        uint transferLen, uint blockSize, uint timeout, out double duration)
         {
             buffer = fixedLen ? new byte[blockSize * transferLen] : new byte[transferLen];
             byte[] cdb = new byte[6];
             senseBuffer = new byte[32];
 
             cdb[0] = (byte)ScsiCommands.RecoverBufferedData;
-            if(fixedLen) cdb[1] += 0x01;
-            if(sili) cdb[1]     += 0x02;
+
+            if(fixedLen)
+                cdb[1] += 0x01;
+
+            if(sili)
+                cdb[1] += 0x02;
+
             cdb[2] = (byte)((transferLen & 0xFF0000) >> 16);
             cdb[3] = (byte)((transferLen & 0xFF00)   >> 8);
             cdb[4] = (byte)(transferLen & 0xFF);
 
             LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
                                         out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("SCSI Device", "RECOVER BUFFERED DATA took {0} ms.", duration);
@@ -840,9 +826,7 @@ namespace Aaru.Devices
             return sense;
         }
 
-        /// <summary>
-        ///     Requests the device to return descriptors for supported densities or medium types
-        /// </summary>
+        /// <summary>Requests the device to return descriptors for supported densities or medium types</summary>
         /// <param name="buffer">Buffer.</param>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="timeout">Timeout.</param>
@@ -851,9 +835,7 @@ namespace Aaru.Devices
             ReportDensitySupport(out byte[] buffer, out byte[] senseBuffer, uint timeout, out double duration) =>
             ReportDensitySupport(out buffer, out senseBuffer, false, false, timeout, out duration);
 
-        /// <summary>
-        ///     Requests the device to return descriptors for supported densities or medium types
-        /// </summary>
+        /// <summary>Requests the device to return descriptors for supported densities or medium types</summary>
         /// <param name="buffer">Buffer.</param>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="currentMedia">If set to <c>true</c> descriptors should apply to currently inserted media.</param>
@@ -863,33 +845,38 @@ namespace Aaru.Devices
                                          out double duration) =>
             ReportDensitySupport(out buffer, out senseBuffer, false, currentMedia, timeout, out duration);
 
-        /// <summary>
-        ///     Requests the device to return descriptors for supported densities or medium types
-        /// </summary>
+        /// <summary>Requests the device to return descriptors for supported densities or medium types</summary>
         /// <param name="buffer">Buffer.</param>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="mediumType">If set to <c>true</c> descriptors should be about medium types.</param>
         /// <param name="currentMedia">If set to <c>true</c> descriptors should apply to currently inserted media.</param>
         /// <param name="timeout">Timeout.</param>
         /// <param name="duration">Duration.</param>
-        public bool ReportDensitySupport(out byte[] buffer,  out byte[] senseBuffer, bool mediumType, bool currentMedia,
-                                         uint       timeout, out double duration)
+        public bool ReportDensitySupport(out byte[] buffer, out byte[] senseBuffer, bool mediumType, bool currentMedia,
+                                         uint timeout, out double duration)
         {
             buffer = new byte[256];
             byte[] cdb = new byte[10];
             senseBuffer = new byte[32];
 
             cdb[0] = (byte)ScsiCommands.ReportDensitySupport;
-            if(currentMedia) cdb[1] += 0x01;
-            if(mediumType) cdb[1]   += 0x02;
+
+            if(currentMedia)
+                cdb[1] += 0x01;
+
+            if(mediumType)
+                cdb[1] += 0x02;
+
             cdb[7] = (byte)((buffer.Length & 0xFF00) >> 8);
             cdb[8] = (byte)(buffer.Length & 0xFF);
 
             LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
                                         out bool sense);
+
             Error = LastError != 0;
 
-            if(sense) return true;
+            if(sense)
+                return true;
 
             ushort availableLength = (ushort)((buffer[0] << 8) + buffer[1] + 2);
             buffer      = new byte[availableLength];
@@ -899,6 +886,7 @@ namespace Aaru.Devices
 
             LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
                                         out sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("SCSI Device", "REPORT DENSITY SUPPORT took {0} ms.", duration);
@@ -906,18 +894,14 @@ namespace Aaru.Devices
             return sense;
         }
 
-        /// <summary>
-        ///     Positions the reading/writing element to the beginning of current partition
-        /// </summary>
+        /// <summary>Positions the reading/writing element to the beginning of current partition</summary>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="timeout">Timeout.</param>
         /// <param name="duration">Duration.</param>
         public bool Rewind(out byte[] senseBuffer, uint timeout, out double duration) =>
             Rewind(out senseBuffer, false, timeout, out duration);
 
-        /// <summary>
-        ///     Positions the reading/writing element to the beginning of current partition
-        /// </summary>
+        /// <summary>Positions the reading/writing element to the beginning of current partition</summary>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="immediate">If set to <c>true</c> return from the command immediately.</param>
         /// <param name="timeout">Timeout.</param>
@@ -929,10 +913,13 @@ namespace Aaru.Devices
             byte[] buffer = new byte[0];
 
             cdb[0] = (byte)ScsiCommands.Rewind;
-            if(immediate) cdb[1] += 0x01;
+
+            if(immediate)
+                cdb[1] += 0x01;
 
             LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.None, out duration,
                                         out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("SCSI Device", "REWIND took {0} ms.", duration);
@@ -940,9 +927,7 @@ namespace Aaru.Devices
             return sense;
         }
 
-        /// <summary>
-        ///     Selects the specified track
-        /// </summary>
+        /// <summary>Selects the specified track</summary>
         /// <returns><c>true</c>, if select was tracked, <c>false</c> otherwise.</returns>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="track">Track.</param>
@@ -959,6 +944,7 @@ namespace Aaru.Devices
 
             LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.None, out duration,
                                         out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("SCSI Device", "TRACK SELECT took {0} ms.", duration);
@@ -981,6 +967,7 @@ namespace Aaru.Devices
 
             LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.None, out duration,
                                         out bool sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("SCSI Device", "SPACE took {0} ms.", duration);
diff --git a/Aaru.Devices/Device/ScsiCommands/SyQuest.cs b/Aaru.Devices/Device/ScsiCommands/SyQuest.cs
index aec047800..fd5fdd4c9 100644
--- a/Aaru.Devices/Device/ScsiCommands/SyQuest.cs
+++ b/Aaru.Devices/Device/ScsiCommands/SyQuest.cs
@@ -36,9 +36,7 @@ namespace Aaru.Devices
 {
     public partial class Device
     {
-        /// <summary>
-        ///     Sends the SyQuest READ (6) command
-        /// </summary>
+        /// <summary>Sends the SyQuest READ (6) command</summary>
         /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
         /// <param name="buffer">Buffer where the SCSI READ response will be stored</param>
         /// <param name="senseBuffer">Sense buffer.</param>
@@ -50,9 +48,7 @@ namespace Aaru.Devices
                                  out double duration) =>
             SyQuestRead6(out buffer, out senseBuffer, lba, blockSize, 1, false, false, timeout, out duration);
 
-        /// <summary>
-        ///     Sends the SyQuest READ LONG (6) command
-        /// </summary>
+        /// <summary>Sends the SyQuest READ LONG (6) command</summary>
         /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
         /// <param name="buffer">Buffer where the SCSI READ response will be stored</param>
         /// <param name="senseBuffer">Sense buffer.</param>
@@ -64,9 +60,7 @@ namespace Aaru.Devices
                                      out double duration) =>
             SyQuestRead6(out buffer, out senseBuffer, lba, blockSize, 1, false, true, timeout, out duration);
 
-        /// <summary>
-        ///     Sends the SyQuest READ (6) command
-        /// </summary>
+        /// <summary>Sends the SyQuest READ (6) command</summary>
         /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
         /// <param name="buffer">Buffer where the SCSI READ response will be stored</param>
         /// <param name="senseBuffer">Sense buffer.</param>
@@ -77,9 +71,8 @@ namespace Aaru.Devices
         /// <param name="readLong">If set to <c>true</c> drive will return ECC bytes and disable error detection.</param>
         /// <param name="blockSize">Block size in bytes.</param>
         /// <param name="transferLength">How many blocks to read.</param>
-        public bool SyQuestRead6(out byte[] buffer,         out byte[] senseBuffer, uint lba,      uint blockSize,
-                                 byte       transferLength, bool       inhibitDma,  bool readLong, uint timeout,
-                                 out double duration)
+        public bool SyQuestRead6(out byte[] buffer, out byte[] senseBuffer, uint lba, uint blockSize,
+                                 byte transferLength, bool inhibitDma, bool readLong, uint timeout, out double duration)
         {
             senseBuffer = new byte[32];
             byte[] cdb = new byte[6];
@@ -90,17 +83,23 @@ namespace Aaru.Devices
             cdb[2] = (byte)((lba & 0xFF00)   >> 8);
             cdb[3] = (byte)(lba & 0xFF);
             cdb[4] = transferLength;
-            if(inhibitDma) cdb[5] += 0x80;
-            if(readLong) cdb[5]   += 0x40;
 
-            if(!inhibitDma && !readLong)
+            if(inhibitDma)
+                cdb[5] += 0x80;
+
+            if(readLong)
+                cdb[5] += 0x40;
+
+            if(!inhibitDma &&
+               !readLong)
                 buffer = transferLength == 0 ? new byte[256 * blockSize] : new byte[transferLength * blockSize];
             else if(readLong)
             {
                 buffer = new byte[blockSize];
                 cdb[4] = 1;
             }
-            else buffer = new byte[0];
+            else
+                buffer = new byte[0];
 
             if(!inhibitDma)
                 LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
@@ -116,9 +115,7 @@ namespace Aaru.Devices
             return sense;
         }
 
-        /// <summary>
-        ///     Requests the usage, seek and error counters, and resets them
-        /// </summary>
+        /// <summary>Requests the usage, seek and error counters, and resets them</summary>
         /// <param name="buffer">Buffer.</param>
         /// <param name="senseBuffer">Sense buffer.</param>
         /// <param name="timeout">Timeout.</param>
@@ -127,9 +124,7 @@ namespace Aaru.Devices
                                             out double duration) =>
             AdaptecReadUsageCounter(out buffer, out senseBuffer, false, timeout, out duration);
 
-        /// <summary>
-        ///     Sends the SyQuest READ LONG (10) command
-        /// </summary>
+        /// <summary>Sends the SyQuest READ LONG (10) command</summary>
         /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
         /// <param name="buffer">Buffer where the SCSI READ response will be stored</param>
         /// <param name="senseBuffer">Sense buffer.</param>
@@ -141,9 +136,7 @@ namespace Aaru.Devices
                                       out double duration) =>
             SyQuestRead10(out buffer, out senseBuffer, lba, blockSize, 1, false, true, timeout, out duration);
 
-        /// <summary>
-        ///     Sends the SyQuest READ (10) command
-        /// </summary>
+        /// <summary>Sends the SyQuest READ (10) command</summary>
         /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
         /// <param name="buffer">Buffer where the SCSI READ response will be stored</param>
         /// <param name="senseBuffer">Sense buffer.</param>
@@ -154,8 +147,8 @@ namespace Aaru.Devices
         /// <param name="readLong">If set to <c>true</c> drive will return ECC bytes and disable error detection.</param>
         /// <param name="blockSize">Block size in bytes.</param>
         /// <param name="transferLength">How many blocks to read.</param>
-        public bool SyQuestRead10(out byte[] buffer,         out byte[] senseBuffer, uint lba,      uint blockSize,
-                                  ushort     transferLength, bool       inhibitDma,  bool readLong, uint timeout,
+        public bool SyQuestRead10(out byte[] buffer, out byte[] senseBuffer, uint lba, uint blockSize,
+                                  ushort transferLength, bool inhibitDma, bool readLong, uint timeout,
                                   out double duration)
         {
             senseBuffer = new byte[32];
@@ -169,16 +162,23 @@ namespace Aaru.Devices
             cdb[5] = (byte)(lba & 0xFF);
             cdb[7] = (byte)((transferLength & 0xFF00) >> 8);
             cdb[8] = (byte)(transferLength & 0xFF);
-            if(inhibitDma) cdb[9] += 0x80;
-            if(readLong) cdb[9]   += 0x40;
 
-            if(!inhibitDma && !readLong) buffer = new byte[transferLength * blockSize];
+            if(inhibitDma)
+                cdb[9] += 0x80;
+
+            if(readLong)
+                cdb[9] += 0x40;
+
+            if(!inhibitDma &&
+               !readLong)
+                buffer = new byte[transferLength * blockSize];
             else if(readLong)
             {
                 buffer = new byte[blockSize];
                 cdb[4] = 1;
             }
-            else buffer = new byte[0];
+            else
+                buffer = new byte[0];
 
             if(!inhibitDma)
                 LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
@@ -186,6 +186,7 @@ namespace Aaru.Devices
             else
                 LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.None, out duration,
                                             out sense);
+
             Error = LastError != 0;
 
             AaruConsole.DebugWriteLine("SCSI Device", "SYQUEST READ (10) took {0} ms.", duration);
diff --git a/Aaru.Devices/FreeBSD/Command.cs b/Aaru.Devices/FreeBSD/Command.cs
index 1845b81cb..46515e23c 100644
--- a/Aaru.Devices/FreeBSD/Command.cs
+++ b/Aaru.Devices/FreeBSD/Command.cs
@@ -41,13 +41,11 @@ using static Aaru.Devices.FreeBSD.Extern;
 namespace Aaru.Devices.FreeBSD
 {
     [SuppressMessage("ReSharper", "BitwiseOperatorOnEnumWithoutFlags")]
-    static class Command
+    internal static class Command
     {
         const int CAM_MAX_CDBLEN = 16;
 
-        /// <summary>
-        ///     Sends a SCSI command (64-bit arch)
-        /// </summary>
+        /// <summary>Sends a SCSI command (64-bit arch)</summary>
         /// <returns>0 if no error occurred, otherwise, errno</returns>
         /// <param name="dev">CAM device</param>
         /// <param name="cdb">SCSI CDB</param>
@@ -60,15 +58,15 @@ namespace Aaru.Devices.FreeBSD
         ///     <c>True</c> if SCSI error returned non-OK status and <paramref name="senseBuffer" /> contains SCSI
         ///     sense
         /// </param>
-        internal static int SendScsiCommand64(IntPtr     dev, byte[] cdb, ref byte[] buffer,
-                                              out byte[] senseBuffer,
-                                              uint       timeout, CcbFlags direction, out double duration, out bool sense)
+        internal static int SendScsiCommand64(IntPtr dev, byte[] cdb, ref byte[] buffer, out byte[] senseBuffer,
+                                              uint timeout, CcbFlags direction, out double duration, out bool sense)
         {
             senseBuffer = null;
             duration    = 0;
             sense       = false;
 
-            if(buffer == null) return -1;
+            if(buffer == null)
+                return -1;
 
             IntPtr ccbPtr = cam_getccb(dev);
             IntPtr cdbPtr = IntPtr.Zero;
@@ -76,10 +74,11 @@ namespace Aaru.Devices.FreeBSD
             if(ccbPtr.ToInt64() == 0)
             {
                 sense = true;
+
                 return Marshal.GetLastWin32Error();
             }
 
-            CcbScsiio64 csio = (CcbScsiio64)Marshal.PtrToStructure(ccbPtr, typeof(CcbScsiio64));
+            var csio = (CcbScsiio64)Marshal.PtrToStructure(ccbPtr, typeof(CcbScsiio64));
             csio.ccb_h.func_code   = XptOpcode.XptScsiIo;
             csio.ccb_h.flags       = direction;
             csio.ccb_h.xflags      = 0;
@@ -90,10 +89,13 @@ namespace Aaru.Devices.FreeBSD
             csio.dxfer_len         = (uint)buffer.Length;
             csio.sense_len         = 32;
             csio.cdb_len           = (byte)cdb.Length;
+
             // TODO: Create enum?
             csio.tag_action = 0x20;
             csio.cdb_bytes  = new byte[CAM_MAX_CDBLEN];
-            if(cdb.Length <= CAM_MAX_CDBLEN) Array.Copy(cdb, 0, csio.cdb_bytes, 0, cdb.Length);
+
+            if(cdb.Length <= CAM_MAX_CDBLEN)
+                Array.Copy(cdb, 0, csio.cdb_bytes, 0, cdb.Length);
             else
             {
                 cdbPtr = Marshal.AllocHGlobal(cdb.Length);
@@ -111,7 +113,8 @@ namespace Aaru.Devices.FreeBSD
             int      error = cam_send_ccb(dev, ccbPtr);
             DateTime end   = DateTime.UtcNow;
 
-            if(error < 0) error = Marshal.GetLastWin32Error();
+            if(error < 0)
+                error = Marshal.GetLastWin32Error();
 
             csio = (CcbScsiio64)Marshal.PtrToStructure(ccbPtr, typeof(CcbScsiio64));
 
@@ -143,21 +146,24 @@ namespace Aaru.Devices.FreeBSD
             cdb    = new byte[csio.cdb_len];
 
             Marshal.Copy(csio.data_ptr, buffer, 0, buffer.Length);
+
             if(csio.ccb_h.flags.HasFlag(CcbFlags.CamCdbPointer))
                 Marshal.Copy(new IntPtr(BitConverter.ToInt64(csio.cdb_bytes, 0)), cdb, 0, cdb.Length);
-            else Array.Copy(csio.cdb_bytes, 0, cdb, 0, cdb.Length);
+            else
+                Array.Copy(csio.cdb_bytes, 0, cdb, 0, cdb.Length);
+
             duration = (end - start).TotalMilliseconds;
 
-            if(csio.ccb_h.flags.HasFlag(CcbFlags.CamCdbPointer)) Marshal.FreeHGlobal(cdbPtr);
+            if(csio.ccb_h.flags.HasFlag(CcbFlags.CamCdbPointer))
+                Marshal.FreeHGlobal(cdbPtr);
+
             Marshal.FreeHGlobal(csio.data_ptr);
             cam_freeccb(ccbPtr);
 
             return error;
         }
 
-        /// <summary>
-        ///     Sends a SCSI command (32-bit arch)
-        /// </summary>
+        /// <summary>Sends a SCSI command (32-bit arch)</summary>
         /// <returns>0 if no error occurred, otherwise, errno</returns>
         /// <param name="dev">CAM device</param>
         /// <param name="cdb">SCSI CDB</param>
@@ -170,15 +176,15 @@ namespace Aaru.Devices.FreeBSD
         ///     <c>True</c> if SCSI error returned non-OK status and <paramref name="senseBuffer" /> contains SCSI
         ///     sense
         /// </param>
-        internal static int SendScsiCommand(IntPtr     dev, byte[] cdb, ref byte[] buffer,
-                                            out byte[] senseBuffer,
-                                            uint       timeout, CcbFlags direction, out double duration, out bool sense)
+        internal static int SendScsiCommand(IntPtr dev, byte[] cdb, ref byte[] buffer, out byte[] senseBuffer,
+                                            uint timeout, CcbFlags direction, out double duration, out bool sense)
         {
             senseBuffer = null;
             duration    = 0;
             sense       = false;
 
-            if(buffer == null) return -1;
+            if(buffer == null)
+                return -1;
 
             IntPtr ccbPtr = cam_getccb(dev);
             IntPtr cdbPtr = IntPtr.Zero;
@@ -186,10 +192,11 @@ namespace Aaru.Devices.FreeBSD
             if(ccbPtr.ToInt32() == 0)
             {
                 sense = true;
+
                 return Marshal.GetLastWin32Error();
             }
 
-            CcbScsiio csio = (CcbScsiio)Marshal.PtrToStructure(ccbPtr, typeof(CcbScsiio));
+            var csio = (CcbScsiio)Marshal.PtrToStructure(ccbPtr, typeof(CcbScsiio));
             csio.ccb_h.func_code   = XptOpcode.XptScsiIo;
             csio.ccb_h.flags       = direction;
             csio.ccb_h.xflags      = 0;
@@ -200,10 +207,13 @@ namespace Aaru.Devices.FreeBSD
             csio.dxfer_len         = (uint)buffer.Length;
             csio.sense_len         = 32;
             csio.cdb_len           = (byte)cdb.Length;
+
             // TODO: Create enum?
             csio.tag_action = 0x20;
             csio.cdb_bytes  = new byte[CAM_MAX_CDBLEN];
-            if(cdb.Length <= CAM_MAX_CDBLEN) Array.Copy(cdb, 0, csio.cdb_bytes, 0, cdb.Length);
+
+            if(cdb.Length <= CAM_MAX_CDBLEN)
+                Array.Copy(cdb, 0, csio.cdb_bytes, 0, cdb.Length);
             else
             {
                 cdbPtr = Marshal.AllocHGlobal(cdb.Length);
@@ -221,7 +231,8 @@ namespace Aaru.Devices.FreeBSD
             int      error = cam_send_ccb(dev, ccbPtr);
             DateTime end   = DateTime.UtcNow;
 
-            if(error < 0) error = Marshal.GetLastWin32Error();
+            if(error < 0)
+                error = Marshal.GetLastWin32Error();
 
             csio = (CcbScsiio)Marshal.PtrToStructure(ccbPtr, typeof(CcbScsiio));
 
@@ -253,21 +264,24 @@ namespace Aaru.Devices.FreeBSD
             cdb    = new byte[csio.cdb_len];
 
             Marshal.Copy(csio.data_ptr, buffer, 0, buffer.Length);
+
             if(csio.ccb_h.flags.HasFlag(CcbFlags.CamCdbPointer))
                 Marshal.Copy(new IntPtr(BitConverter.ToInt32(csio.cdb_bytes, 0)), cdb, 0, cdb.Length);
-            else Array.Copy(csio.cdb_bytes, 0, cdb, 0, cdb.Length);
+            else
+                Array.Copy(csio.cdb_bytes, 0, cdb, 0, cdb.Length);
+
             duration = (end - start).TotalMilliseconds;
 
-            if(csio.ccb_h.flags.HasFlag(CcbFlags.CamCdbPointer)) Marshal.FreeHGlobal(cdbPtr);
+            if(csio.ccb_h.flags.HasFlag(CcbFlags.CamCdbPointer))
+                Marshal.FreeHGlobal(cdbPtr);
+
             Marshal.FreeHGlobal(csio.data_ptr);
             cam_freeccb(ccbPtr);
 
             return error;
         }
 
-        /// <summary>
-        ///     Converts ATA protocol to CAM flags
-        /// </summary>
+        /// <summary>Converts ATA protocol to CAM flags</summary>
         /// <param name="protocol">ATA protocol</param>
         /// <returns>CAM flags</returns>
         static CcbFlags AtaProtocolToCamFlags(AtaProtocol protocol)
@@ -288,9 +302,7 @@ namespace Aaru.Devices.FreeBSD
             }
         }
 
-        /// <summary>
-        ///     Sends an ATA command in CHS mode
-        /// </summary>
+        /// <summary>Sends an ATA command in CHS mode</summary>
         /// <returns>0 if no error occurred, otherwise, errno</returns>
         /// <param name="dev">CAM device</param>
         /// <param name="buffer">Buffer for SCSI command response</param>
@@ -300,20 +312,20 @@ namespace Aaru.Devices.FreeBSD
         /// <param name="registers">Registers to send to drive</param>
         /// <param name="errorRegisters">Registers returned by drive</param>
         /// <param name="protocol">ATA protocol to use</param>
-        internal static int SendAtaCommand(IntPtr                   dev,            AtaRegistersChs registers,
-                                           out AtaErrorRegistersChs errorRegisters, AtaProtocol     protocol,
-                                           ref byte[]               buffer,         uint            timeout,
-                                           out double               duration,       out bool        sense)
+        internal static int SendAtaCommand(IntPtr dev, AtaRegistersChs registers,
+                                           out AtaErrorRegistersChs errorRegisters, AtaProtocol protocol,
+                                           ref byte[] buffer, uint timeout, out double duration, out bool sense)
         {
             duration       = 0;
             sense          = false;
             errorRegisters = new AtaErrorRegistersChs();
 
-            if(buffer == null) return -1;
+            if(buffer == null)
+                return -1;
 
             IntPtr ccbPtr = cam_getccb(dev);
 
-            CcbAtaio ataio = (CcbAtaio)Marshal.PtrToStructure(ccbPtr, typeof(CcbAtaio));
+            var ataio = (CcbAtaio)Marshal.PtrToStructure(ccbPtr, typeof(CcbAtaio));
             ataio.ccb_h.func_code   =  XptOpcode.XptAtaIo;
             ataio.ccb_h.flags       =  AtaProtocolToCamFlags(protocol);
             ataio.ccb_h.xflags      =  0;
@@ -324,6 +336,7 @@ namespace Aaru.Devices.FreeBSD
             ataio.dxfer_len         =  (uint)buffer.Length;
             ataio.ccb_h.flags       |= CcbFlags.CamDevQfrzdis;
             ataio.cmd.flags         =  CamAtaIoFlags.NeedResult;
+
             switch(protocol)
             {
                 case AtaProtocol.Dma:
@@ -331,9 +344,11 @@ namespace Aaru.Devices.FreeBSD
                 case AtaProtocol.UDmaIn:
                 case AtaProtocol.UDmaOut:
                     ataio.cmd.flags |= CamAtaIoFlags.Dma;
+
                     break;
                 case AtaProtocol.FpDma:
                     ataio.cmd.flags |= CamAtaIoFlags.Fpdma;
+
                     break;
             }
 
@@ -352,7 +367,8 @@ namespace Aaru.Devices.FreeBSD
             int      error = cam_send_ccb(dev, ccbPtr);
             DateTime end   = DateTime.UtcNow;
 
-            if(error < 0) error = Marshal.GetLastWin32Error();
+            if(error < 0)
+                error = Marshal.GetLastWin32Error();
 
             ataio = (CcbAtaio)Marshal.PtrToStructure(ccbPtr, typeof(CcbAtaio));
 
@@ -364,7 +380,8 @@ namespace Aaru.Devices.FreeBSD
                 sense = true;
             }
 
-            if((ataio.ccb_h.status & CamStatus.CamStatusMask) == CamStatus.CamAtaStatusError) sense = true;
+            if((ataio.ccb_h.status & CamStatus.CamStatusMask) == CamStatus.CamAtaStatusError)
+                sense = true;
 
             errorRegisters.CylinderHigh = ataio.res.lba_high;
             errorRegisters.CylinderLow  = ataio.res.lba_mid;
@@ -387,9 +404,7 @@ namespace Aaru.Devices.FreeBSD
             return error;
         }
 
-        /// <summary>
-        ///     Sends an ATA command in 28-bit LBA mode
-        /// </summary>
+        /// <summary>Sends an ATA command in 28-bit LBA mode</summary>
         /// <returns>0 if no error occurred, otherwise, errno</returns>
         /// <param name="dev">CAM device</param>
         /// <param name="buffer">Buffer for SCSI command response</param>
@@ -399,20 +414,20 @@ namespace Aaru.Devices.FreeBSD
         /// <param name="registers">Registers to send to drive</param>
         /// <param name="errorRegisters">Registers returned by drive</param>
         /// <param name="protocol">ATA protocol to use</param>
-        internal static int SendAtaCommand(IntPtr                     dev,            AtaRegistersLba28 registers,
-                                           out AtaErrorRegistersLba28 errorRegisters, AtaProtocol       protocol,
-                                           ref byte[]                 buffer,         uint              timeout,
-                                           out double                 duration,       out bool          sense)
+        internal static int SendAtaCommand(IntPtr dev, AtaRegistersLba28 registers,
+                                           out AtaErrorRegistersLba28 errorRegisters, AtaProtocol protocol,
+                                           ref byte[] buffer, uint timeout, out double duration, out bool sense)
         {
             duration       = 0;
             sense          = false;
             errorRegisters = new AtaErrorRegistersLba28();
 
-            if(buffer == null) return -1;
+            if(buffer == null)
+                return -1;
 
             IntPtr ccbPtr = cam_getccb(dev);
 
-            CcbAtaio ataio = (CcbAtaio)Marshal.PtrToStructure(ccbPtr, typeof(CcbAtaio));
+            var ataio = (CcbAtaio)Marshal.PtrToStructure(ccbPtr, typeof(CcbAtaio));
             ataio.ccb_h.func_code   =  XptOpcode.XptAtaIo;
             ataio.ccb_h.flags       =  AtaProtocolToCamFlags(protocol);
             ataio.ccb_h.xflags      =  0;
@@ -423,6 +438,7 @@ namespace Aaru.Devices.FreeBSD
             ataio.dxfer_len         =  (uint)buffer.Length;
             ataio.ccb_h.flags       |= CcbFlags.CamDevQfrzdis;
             ataio.cmd.flags         =  CamAtaIoFlags.NeedResult;
+
             switch(protocol)
             {
                 case AtaProtocol.Dma:
@@ -430,9 +446,11 @@ namespace Aaru.Devices.FreeBSD
                 case AtaProtocol.UDmaIn:
                 case AtaProtocol.UDmaOut:
                     ataio.cmd.flags |= CamAtaIoFlags.Dma;
+
                     break;
                 case AtaProtocol.FpDma:
                     ataio.cmd.flags |= CamAtaIoFlags.Fpdma;
+
                     break;
             }
 
@@ -451,7 +469,8 @@ namespace Aaru.Devices.FreeBSD
             int      error = cam_send_ccb(dev, ccbPtr);
             DateTime end   = DateTime.UtcNow;
 
-            if(error < 0) error = Marshal.GetLastWin32Error();
+            if(error < 0)
+                error = Marshal.GetLastWin32Error();
 
             ataio = (CcbAtaio)Marshal.PtrToStructure(ccbPtr, typeof(CcbAtaio));
 
@@ -463,7 +482,8 @@ namespace Aaru.Devices.FreeBSD
                 sense = true;
             }
 
-            if((ataio.ccb_h.status & CamStatus.CamStatusMask) == CamStatus.CamAtaStatusError) sense = true;
+            if((ataio.ccb_h.status & CamStatus.CamStatusMask) == CamStatus.CamAtaStatusError)
+                sense = true;
 
             errorRegisters.LbaHigh     = ataio.res.lba_high;
             errorRegisters.LbaMid      = ataio.res.lba_mid;
@@ -486,9 +506,7 @@ namespace Aaru.Devices.FreeBSD
             return error;
         }
 
-        /// <summary>
-        ///     Sends an ATA command in 48-bit mode
-        /// </summary>
+        /// <summary>Sends an ATA command in 48-bit mode</summary>
         /// <returns>0 if no error occurred, otherwise, errno</returns>
         /// <param name="dev">CAM device</param>
         /// <param name="buffer">Buffer for SCSI command response</param>
@@ -498,24 +516,25 @@ namespace Aaru.Devices.FreeBSD
         /// <param name="registers">Registers to send to drive</param>
         /// <param name="errorRegisters">Registers returned by drive</param>
         /// <param name="protocol">ATA protocol to use</param>
-        internal static int SendAtaCommand(IntPtr                     dev,            AtaRegistersLba48 registers,
-                                           out AtaErrorRegistersLba48 errorRegisters, AtaProtocol       protocol,
-                                           ref byte[]                 buffer,         uint              timeout,
-                                           out double                 duration,       out bool          sense)
+        internal static int SendAtaCommand(IntPtr dev, AtaRegistersLba48 registers,
+                                           out AtaErrorRegistersLba48 errorRegisters, AtaProtocol protocol,
+                                           ref byte[] buffer, uint timeout, out double duration, out bool sense)
         {
             duration       = 0;
             sense          = false;
             errorRegisters = new AtaErrorRegistersLba48();
 
             // 48-bit ATA CAM commands can crash FreeBSD < 9.2-RELEASE
-            if(Environment.Version.Major == 9 && Environment.Version.Minor < 2 ||
-               Environment.Version.Major < 9) return -1;
+            if((Environment.Version.Major == 9 && Environment.Version.Minor < 2) ||
+               Environment.Version.Major < 9)
+                return -1;
 
-            if(buffer == null) return -1;
+            if(buffer == null)
+                return -1;
 
             IntPtr ccbPtr = cam_getccb(dev);
 
-            CcbAtaio ataio = (CcbAtaio)Marshal.PtrToStructure(ccbPtr, typeof(CcbAtaio));
+            var ataio = (CcbAtaio)Marshal.PtrToStructure(ccbPtr, typeof(CcbAtaio));
             ataio.ccb_h.func_code   =  XptOpcode.XptAtaIo;
             ataio.ccb_h.flags       =  AtaProtocolToCamFlags(protocol);
             ataio.ccb_h.xflags      =  0;
@@ -526,6 +545,7 @@ namespace Aaru.Devices.FreeBSD
             ataio.dxfer_len         =  (uint)buffer.Length;
             ataio.ccb_h.flags       |= CcbFlags.CamDevQfrzdis;
             ataio.cmd.flags         =  CamAtaIoFlags.NeedResult | CamAtaIoFlags.ExtendedCommand;
+
             switch(protocol)
             {
                 case AtaProtocol.Dma:
@@ -533,9 +553,11 @@ namespace Aaru.Devices.FreeBSD
                 case AtaProtocol.UDmaIn:
                 case AtaProtocol.UDmaOut:
                     ataio.cmd.flags |= CamAtaIoFlags.Dma;
+
                     break;
                 case AtaProtocol.FpDma:
                     ataio.cmd.flags |= CamAtaIoFlags.Fpdma;
+
                     break;
             }
 
@@ -559,7 +581,8 @@ namespace Aaru.Devices.FreeBSD
             int      error = cam_send_ccb(dev, ccbPtr);
             DateTime end   = DateTime.UtcNow;
 
-            if(error < 0) error = Marshal.GetLastWin32Error();
+            if(error < 0)
+                error = Marshal.GetLastWin32Error();
 
             ataio = (CcbAtaio)Marshal.PtrToStructure(ccbPtr, typeof(CcbAtaio));
 
@@ -571,7 +594,8 @@ namespace Aaru.Devices.FreeBSD
                 sense = true;
             }
 
-            if((ataio.ccb_h.status & CamStatus.CamStatusMask) == CamStatus.CamAtaStatusError) sense = true;
+            if((ataio.ccb_h.status & CamStatus.CamStatusMask) == CamStatus.CamAtaStatusError)
+                sense = true;
 
             errorRegisters.SectorCount = (ushort)((ataio.res.sector_count_exp << 8) + ataio.res.sector_count);
             errorRegisters.LbaLow      = (ushort)((ataio.res.lba_low_exp      << 8) + ataio.res.lba_low);
diff --git a/Aaru.Devices/FreeBSD/Enums.cs b/Aaru.Devices/FreeBSD/Enums.cs
index ea9abd4bd..ae036d564 100644
--- a/Aaru.Devices/FreeBSD/Enums.cs
+++ b/Aaru.Devices/FreeBSD/Enums.cs
@@ -36,120 +36,71 @@ using System;
 namespace Aaru.Devices.FreeBSD
 {
     [Flags]
-    enum FileFlags
+    internal enum FileFlags
     {
-        /// <summary>
-        ///     O_RDONLY
-        /// </summary>
+        /// <summary>O_RDONLY</summary>
         ReadOnly = 0x00000000,
-        /// <summary>
-        ///     O_WRONLY
-        /// </summary>
+        /// <summary>O_WRONLY</summary>
         WriteOnly = 0x00000001,
-        /// <summary>
-        ///     O_RDWR
-        /// </summary>
+        /// <summary>O_RDWR</summary>
         ReadWrite = 0x00000002,
-        /// <summary>
-        ///     O_NONBLOCK
-        /// </summary>
+        /// <summary>O_NONBLOCK</summary>
         NonBlocking = 0x00000004,
-        /// <summary>
-        ///     O_APPEND
-        /// </summary>
+        /// <summary>O_APPEND</summary>
         Append = 0x00000008,
-        /// <summary>
-        ///     O_SHLOCK
-        /// </summary>
+        /// <summary>O_SHLOCK</summary>
         SharedLock = 0x00000010,
-        /// <summary>
-        ///     O_EXLOCK
-        /// </summary>
+        /// <summary>O_EXLOCK</summary>
         ExclusiveLock = 0x00000020,
-        /// <summary>
-        ///     O_ASYNC
-        /// </summary>
+        /// <summary>O_ASYNC</summary>
         Async = 0x00000040,
-        /// <summary>
-        ///     O_FSYNC
-        /// </summary>
+        /// <summary>O_FSYNC</summary>
         SyncWrites = 0x00000080,
-        /// <summary>
-        ///     O_NOFOLLOW
-        /// </summary>
+        /// <summary>O_NOFOLLOW</summary>
         NoFollowSymlink = 0x00000100,
-        /// <summary>
-        ///     O_CREAT
-        /// </summary>
+        /// <summary>O_CREAT</summary>
         OpenOrCreate = 0x00000200,
-        /// <summary>
-        ///     O_TRUNC
-        /// </summary>
+        /// <summary>O_TRUNC</summary>
         Truncate = 0x00000400,
-        /// <summary>
-        ///     O_EXCL
-        /// </summary>
+        /// <summary>O_EXCL</summary>
         CreateNew = 0x00000800,
-        /// <summary>
-        ///     O_NOCTTY
-        /// </summary>
+        /// <summary>O_NOCTTY</summary>
         NoControlTty = 0x00008000,
-        /// <summary>
-        ///     O_DIRECT
-        /// </summary>
+        /// <summary>O_DIRECT</summary>
         Direct = 0x00010000,
-        /// <summary>
-        ///     O_DIRECTORY
-        /// </summary>
+        /// <summary>O_DIRECTORY</summary>
         Directory = 0x00020000,
-        /// <summary>
-        ///     O_EXEC
-        /// </summary>
+        /// <summary>O_EXEC</summary>
         Execute = 0x00040000,
-        /// <summary>
-        ///     O_TTY_INIT
-        /// </summary>
+        /// <summary>O_TTY_INIT</summary>
         InitializeTty = 0x00080000,
-        /// <summary>
-        ///     O_CLOEXEC
-        /// </summary>
+        /// <summary>O_CLOEXEC</summary>
         CloseOnExec = 0x00100000
     }
 
     [Flags]
-    enum CamAtaIoFlags : byte
+    internal enum CamAtaIoFlags : byte
     {
-        /// <summary>
-        ///     48-bit command
-        /// </summary>
+        /// <summary>48-bit command</summary>
         ExtendedCommand = 0x01,
-        /// <summary>
-        ///     FPDMA command
-        /// </summary>
+        /// <summary>FPDMA command</summary>
         Fpdma = 0x02,
-        /// <summary>
-        ///     Control, not a command
-        /// </summary>
+        /// <summary>Control, not a command</summary>
         Control = 0x04,
-        /// <summary>
-        ///     Needs result
-        /// </summary>
+        /// <summary>Needs result</summary>
         NeedResult = 0x08,
-        /// <summary>
-        ///     DMA command
-        /// </summary>
+        /// <summary>DMA command</summary>
         Dma = 0x10
     }
 
     /// <summary>XPT Opcodes for xpt_action</summary>
     [Flags]
-    enum XptOpcode
+    internal enum XptOpcode
     {
         // Function code flags are bits greater than 0xff
 
         /// <summary>Non-immediate function code</summary>
-        XptFcQueued = 0x100,
-        XptFcUserCcb = 0x200,
+        XptFcQueued = 0x100, XptFcUserCcb = 0x200,
         /// <summary>Only for the transport layer device</summary>
         XptFcXptOnly = 0x400,
         /// <summary>Passes through the device queues</summary>
@@ -250,316 +201,195 @@ namespace Aaru.Devices.FreeBSD
         XptVunique = 0x80
     }
 
-    enum CcbDevMatchStatus
+    internal enum CcbDevMatchStatus
     {
-        CamDevMatchLast,
-        CamDevMatchMore,
-        CamDevMatchListChanged,
-        CamDevMatchSizeError,
-        CamDevMatchError
+        CamDevMatchLast, CamDevMatchMore, CamDevMatchListChanged,
+        CamDevMatchSizeError, CamDevMatchError
     }
 
-    enum DevMatchType
+    internal enum DevMatchType
     {
-        DevMatchPeriph = 0,
-        DevMatchDevice,
-        DevMatchBus
+        DevMatchPeriph = 0, DevMatchDevice, DevMatchBus
     }
 
     [Flags]
-    enum PeriphPatternFlags
+    internal enum PeriphPatternFlags
     {
-        PeriphMatchNone   = 0x000,
-        PeriphMatchPath   = 0x001,
-        PeriphMatchTarget = 0x002,
-        PeriphMatchLun    = 0x004,
-        PeriphMatchName   = 0x008,
-        PeriphMatchUnit   = 0x010
+        PeriphMatchNone = 0x000, PeriphMatchPath = 0x001, PeriphMatchTarget = 0x002,
+        PeriphMatchLun  = 0x004, PeriphMatchName = 0x008, PeriphMatchUnit   = 0x010
+
         //  PERIPH_MATCH_ANY = 0x01f
     }
 
     [Flags]
-    enum DevPatternFlags
+    internal enum DevPatternFlags
     {
-        DevMatchNone    = 0x000,
-        DevMatchPath    = 0x001,
-        DevMatchTarget  = 0x002,
-        DevMatchLun     = 0x004,
-        DevMatchInquiry = 0x008,
-        DevMatchDevid   = 0x010
+        DevMatchNone = 0x000, DevMatchPath    = 0x001, DevMatchTarget = 0x002,
+        DevMatchLun  = 0x004, DevMatchInquiry = 0x008, DevMatchDevid  = 0x010
+
         //  DEV_MATCH_ANY = 0x00f
     }
 
     [Flags]
-    enum BusPatternFlags
+    internal enum BusPatternFlags
     {
-        BusMatchNone  = 0x000,
-        BusMatchPath  = 0x001,
-        BusMatchName  = 0x002,
-        BusMatchUnit  = 0x004,
-        BusMatchBusId = 0x008
+        BusMatchNone = 0x000, BusMatchPath  = 0x001, BusMatchName = 0x002,
+        BusMatchUnit = 0x004, BusMatchBusId = 0x008
+
         //  BUS_MATCH_ANY = 0x00f
     }
 
     [Flags]
-    enum DevResultFlags
+    internal enum DevResultFlags
     {
-        DevResultNoflag       = 0x00,
-        DevResultUnconfigured = 0x01
+        DevResultNoflag = 0x00, DevResultUnconfigured = 0x01
     }
 
-    enum CamProto
+    internal enum CamProto
     {
-        ProtoUnknown,
-        ProtoUnspecified,
+        ProtoUnknown, ProtoUnspecified,
 
-        /// <summary>
-        ///     Small Computer System Interface
-        /// </summary>
+        /// <summary>Small Computer System Interface</summary>
         ProtoScsi,
 
-        /// <summary>
-        ///     AT Attachment
-        /// </summary>
+        /// <summary>AT Attachment</summary>
         ProtoAta,
 
-        /// <summary>
-        ///     AT Attachment Packetized Interface
-        /// </summary>
+        /// <summary>AT Attachment Packetized Interface</summary>
         ProtoAtapi,
 
-        /// <summary>
-        ///     SATA Port Multiplier
-        /// </summary>
+        /// <summary>SATA Port Multiplier</summary>
         ProtoSatapm,
 
-        /// <summary>
-        ///     SATA Enclosure Management Bridge
-        /// </summary>
+        /// <summary>SATA Enclosure Management Bridge</summary>
         ProtoSemb,
 
-        /// <summary>
-        ///     NVMe
-        /// </summary>
+        /// <summary>NVMe</summary>
         ProtoNvme,
 
-        /// <summary>
-        ///     MMC, SD, SDIO
-        /// </summary>
+        /// <summary>MMC, SD, SDIO</summary>
         ProtoMmcsd
     }
 
     [Flags]
-    enum MmcCardFeatures
+    internal enum MmcCardFeatures
     {
-        CardFeatureMemory = 0x1,
-        CardFeatureSdhc   = 0x1 << 1,
-        CardFeatureSdio   = 0x1 << 2,
-        CardFeatureSd20   = 0x1 << 3,
-        CardFeatureMmc    = 0x1 << 4,
-        CardFeature18V    = 0x1 << 5
+        CardFeatureMemory = 0x1, CardFeatureSdhc = 0x1 << 1, CardFeatureSdio = 0x1 << 2,
+        CardFeatureSd20   = 0x1                        << 3, CardFeatureMmc  = 0x1 << 4, CardFeature18V = 0x1 << 5
     }
 
-    enum CamGenerations : uint
+    internal enum CamGenerations : uint
     {
-        CamBusGeneration    = 0x00,
-        CamTargetGeneration = 0x01,
-        CamDevGeneration    = 0x02,
+        CamBusGeneration    = 0x00, CamTargetGeneration = 0x01, CamDevGeneration = 0x02,
         CamPeriphGeneration = 0x03
     }
 
     [Flags]
-    enum DevPosType
+    internal enum DevPosType
     {
-        CamDevPosNone   = 0x000,
-        CamDevPosBus    = 0x001,
-        CamDevPosTarget = 0x002,
-        CamDevPosDevice = 0x004,
-        CamDevPosPeriph = 0x008,
-        CamDevPosPdptr  = 0x010,
+        CamDevPosNone   = 0x000, CamDevPosBus    = 0x001, CamDevPosTarget = 0x002,
+        CamDevPosDevice = 0x004, CamDevPosPeriph = 0x008, CamDevPosPdptr  = 0x010,
+
         //  CAM_DEV_POS_TYPEMASK = 0xf00,
-        CamDevPosEdt  = 0x100,
-        CamDevPosPdrv = 0x200
+        CamDevPosEdt = 0x100, CamDevPosPdrv = 0x200
     }
 
-    enum FreebsdIoctl : uint
+    internal enum FreebsdIoctl : uint
     {
         Camiocommand = 0xC4D81802
     }
 
     [Flags]
-    enum CcbFlags : uint
+    internal enum CcbFlags : uint
     {
-        /// <summary>
-        ///     The CDB field is a pointer
-        /// </summary>
+        /// <summary>The CDB field is a pointer</summary>
         CamCdbPointer = 0x00000001,
-        /// <summary>
-        ///     SIM queue actions are enabled
-        /// </summary>
+        /// <summary>SIM queue actions are enabled</summary>
         CamQueueEnable = 0x00000002,
-        /// <summary>
-        ///     CCB contains a linked CDB
-        /// </summary>
+        /// <summary>CCB contains a linked CDB</summary>
         CamCdbLinked = 0x00000004,
-        /// <summary>
-        ///     Perform transport negotiation with this command.
-        /// </summary>
+        /// <summary>Perform transport negotiation with this command.</summary>
         CamNegotiate = 0x00000008,
-        /// <summary>
-        ///     Data type with physical addrs
-        /// </summary>
+        /// <summary>Data type with physical addrs</summary>
         CamDataIsphys = 0x00000010,
-        /// <summary>
-        ///     Disable autosense feature
-        /// </summary>
+        /// <summary>Disable autosense feature</summary>
         CamDisAutosense = 0x00000020,
-        /// <summary>
-        ///     Data direction (00:IN/OUT)
-        /// </summary>
+        /// <summary>Data direction (00:IN/OUT)</summary>
         CamDirBoth = 0x00000000,
-        /// <summary>
-        ///     Data direction (01:DATA IN)
-        /// </summary>
+        /// <summary>Data direction (01:DATA IN)</summary>
         CamDirIn = 0x00000040,
-        /// <summary>
-        ///     Data direction (10:DATA OUT)
-        /// </summary>
+        /// <summary>Data direction (10:DATA OUT)</summary>
         CamDirOut = 0x00000080,
-        /// <summary>
-        ///     Data direction (11:no data)
-        /// </summary>
+        /// <summary>Data direction (11:no data)</summary>
         CamDirNone = 0x000000C0,
-        /// <summary>
-        ///     Data type (000:Virtual)
-        /// </summary>
+        /// <summary>Data type (000:Virtual)</summary>
         CamDataVaddr = 0x00000000,
-        /// <summary>
-        ///     Data type (001:Physical)
-        /// </summary>
+        /// <summary>Data type (001:Physical)</summary>
         CamDataPaddr = 0x00000010,
-        /// <summary>
-        ///     Data type (010:sglist)
-        /// </summary>
+        /// <summary>Data type (010:sglist)</summary>
         CamDataSg = 0x00040000,
-        /// <summary>
-        ///     Data type (011:sglist phys)
-        /// </summary>
+        /// <summary>Data type (011:sglist phys)</summary>
         CamDataSgPaddr = 0x00040010,
-        /// <summary>
-        ///     Data type (100:bio)
-        /// </summary>
+        /// <summary>Data type (100:bio)</summary>
         CamDataBio = 0x00200000,
-        /// <summary>
-        ///     Use Soft reset alternative
-        /// </summary>
+        /// <summary>Use Soft reset alternative</summary>
         CamSoftRstOp = 0x00000100,
-        /// <summary>
-        ///     Flush resid bytes on complete
-        /// </summary>
+        /// <summary>Flush resid bytes on complete</summary>
         CamEngSync = 0x00000200,
-        /// <summary>
-        ///     Disable DEV Q freezing
-        /// </summary>
+        /// <summary>Disable DEV Q freezing</summary>
         CamDevQfrzdis = 0x00000400,
-        /// <summary>
-        ///     Freeze DEV Q on execution
-        /// </summary>
+        /// <summary>Freeze DEV Q on execution</summary>
         CamDevQfreeze = 0x00000800,
-        /// <summary>
-        ///     Command takes a lot of power
-        /// </summary>
+        /// <summary>Command takes a lot of power</summary>
         CamHighPower = 0x00001000,
-        /// <summary>
-        ///     Sense data is a pointer
-        /// </summary>
+        /// <summary>Sense data is a pointer</summary>
         CamSensePtr = 0x00002000,
-        /// <summary>
-        ///     Sense pointer is physical addr
-        /// </summary>
+        /// <summary>Sense pointer is physical addr</summary>
         CamSensePhys = 0x00004000,
-        /// <summary>
-        ///     Use the tag action in this ccb
-        /// </summary>
+        /// <summary>Use the tag action in this ccb</summary>
         CamTagActionValid = 0x00008000,
-        /// <summary>
-        ///     Pass driver does err. recovery
-        /// </summary>
+        /// <summary>Pass driver does err. recovery</summary>
         CamPassErrRecover = 0x00010000,
-        /// <summary>
-        ///     Disable disconnect
-        /// </summary>
+        /// <summary>Disable disconnect</summary>
         CamDisDisconnect = 0x00020000,
-        /// <summary>
-        ///     Message buffer ptr is physical
-        /// </summary>
+        /// <summary>Message buffer ptr is physical</summary>
         CamMsgBufPhys = 0x00080000,
-        /// <summary>
-        ///     Autosense data ptr is physical
-        /// </summary>
+        /// <summary>Autosense data ptr is physical</summary>
         CamSnsBufPhys = 0x00100000,
-        /// <summary>
-        ///     CDB poiner is physical
-        /// </summary>
+        /// <summary>CDB poiner is physical</summary>
         CamCdbPhys = 0x00400000,
-        /// <summary>
-        ///     SG list is for the HBA engine
-        /// </summary>
+        /// <summary>SG list is for the HBA engine</summary>
         CamEngSglist = 0x00800000,
 
         /* Phase cognizant mode flags */
-        /// <summary>
-        ///     Disable autosave/restore ptrs
-        /// </summary>
+        /// <summary>Disable autosave/restore ptrs</summary>
         CamDisAutosrp = 0x01000000,
-        /// <summary>
-        ///     Disable auto disconnect
-        /// </summary>
+        /// <summary>Disable auto disconnect</summary>
         CamDisAutodisc = 0x02000000,
-        /// <summary>
-        ///     Target CCB available
-        /// </summary>
+        /// <summary>Target CCB available</summary>
         CamTgtCcbAvail = 0x04000000,
-        /// <summary>
-        ///     The SIM runs in phase mode
-        /// </summary>
+        /// <summary>The SIM runs in phase mode</summary>
         CamTgtPhaseMode = 0x08000000,
-        /// <summary>
-        ///     Message buffer valid
-        /// </summary>
+        /// <summary>Message buffer valid</summary>
         CamMsgbValid = 0x10000000,
-        /// <summary>
-        ///     Status buffer valid
-        /// </summary>
+        /// <summary>Status buffer valid</summary>
         CamStatusValid = 0x20000000,
-        /// <summary>
-        ///     Data buffer valid
-        /// </summary>
+        /// <summary>Data buffer valid</summary>
         CamDatabValid = 0x40000000,
         /* Host target Mode flags */
-        /// <summary>
-        ///     Send sense data with status
-        /// </summary>
+        /// <summary>Send sense data with status</summary>
         CamSendSense = 0x08000000,
-        /// <summary>
-        ///     Terminate I/O Message sup.
-        /// </summary>
+        /// <summary>Terminate I/O Message sup.</summary>
         CamTermIo = 0x10000000,
-        /// <summary>
-        ///     Disconnects are mandatory
-        /// </summary>
+        /// <summary>Disconnects are mandatory</summary>
         CamDisconnect = 0x20000000,
-        /// <summary>
-        ///     Send status after data phase
-        /// </summary>
+        /// <summary>Send status after data phase</summary>
         CamSendStatus = 0x40000000,
-        /// <summary>
-        ///     Call callback without lock.
-        /// </summary>
+        /// <summary>Call callback without lock.</summary>
         CamUnlocked = 0x80000000
     }
 
-    enum CamStatus : uint
+    internal enum CamStatus : uint
     {
         /// <summary>CCB request is in progress</summary>
         CamReqInprog = 0x00,
diff --git a/Aaru.Devices/FreeBSD/Extern.cs b/Aaru.Devices/FreeBSD/Extern.cs
index 7fba6d536..f47c1f26b 100644
--- a/Aaru.Devices/FreeBSD/Extern.cs
+++ b/Aaru.Devices/FreeBSD/Extern.cs
@@ -36,7 +36,7 @@ using System.Runtime.InteropServices;
 
 namespace Aaru.Devices.FreeBSD
 {
-    static class Extern
+    internal static class Extern
     {
         [DllImport("libc", CharSet = CharSet.Ansi, SetLastError = true)]
         internal static extern int open(string pathname, [MarshalAs(UnmanagedType.U4)] FileFlags flags);
diff --git a/Aaru.Devices/FreeBSD/Structs.cs b/Aaru.Devices/FreeBSD/Structs.cs
index 4b4555625..30704ebc6 100644
--- a/Aaru.Devices/FreeBSD/Structs.cs
+++ b/Aaru.Devices/FreeBSD/Structs.cs
@@ -45,9 +45,8 @@ using target_id_t = System.UInt32;
 
 namespace Aaru.Devices.FreeBSD
 {
-    [StructLayout(LayoutKind.Sequential)]
-    [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
-    struct AtaCmd
+    [StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
+    internal struct AtaCmd
     {
         public CamAtaIoFlags flags;
         public byte          command;
@@ -65,9 +64,8 @@ namespace Aaru.Devices.FreeBSD
         public byte          control;
     }
 
-    [StructLayout(LayoutKind.Sequential)]
-    [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
-    struct AtaRes
+    [StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
+    internal struct AtaRes
     {
         public CamAtaIoFlags flags;
         public byte          status;
@@ -83,9 +81,8 @@ namespace Aaru.Devices.FreeBSD
         public byte          sector_count_exp;
     }
 
-    [StructLayout(LayoutKind.Sequential)]
-    [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
-    struct CamPinfo
+    [StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
+    internal struct CamPinfo
     {
         public uint priority;
         public uint generation;
@@ -93,52 +90,39 @@ namespace Aaru.Devices.FreeBSD
     }
 
     [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
-    struct ListEntry
+    internal struct ListEntry
     {
-        /// <summary>
-        ///     LIST_ENTRY(ccb_hdr)=le->*le_next
-        /// </summary>
+        /// <summary>LIST_ENTRY(ccb_hdr)=le->*le_next</summary>
         public IntPtr LeNext;
-        /// <summary>
-        ///     LIST_ENTRY(ccb_hdr)=le->**le_prev
-        /// </summary>
+        /// <summary>LIST_ENTRY(ccb_hdr)=le->**le_prev</summary>
         public IntPtr LePrev;
     }
 
     [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
-    struct SlistEntry
+    internal struct SlistEntry
     {
-        /// <summary>
-        ///     SLIST_ENTRY(ccb_hdr)=sle->*sle_next
-        /// </summary>
+        /// <summary>SLIST_ENTRY(ccb_hdr)=sle->*sle_next</summary>
         public IntPtr SleNext;
     }
 
     [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
-    struct TailqEntry
+    internal struct TailqEntry
     {
-        /// <summary>
-        ///     TAILQ_ENTRY(ccb_hdr)=tqe->*tqe_next
-        /// </summary>
+        /// <summary>TAILQ_ENTRY(ccb_hdr)=tqe->*tqe_next</summary>
         public IntPtr TqeNext;
-        /// <summary>
-        ///     TAILQ_ENTRY(ccb_hdr)=tqe->**tqe_prev
-        /// </summary>
+        /// <summary>TAILQ_ENTRY(ccb_hdr)=tqe->**tqe_prev</summary>
         public IntPtr TqePrev;
     }
 
     [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
-    struct StailqEntry
+    internal struct StailqEntry
     {
-        /// <summary>
-        ///     STAILQ_ENTRY(ccb_hdr)=stqe->*stqe_next
-        /// </summary>
+        /// <summary>STAILQ_ENTRY(ccb_hdr)=stqe->*stqe_next</summary>
         public IntPtr StqeNext;
     }
 
-    [StructLayout(LayoutKind.Explicit)]
-    [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
-    struct CamqEntry
+    [StructLayout(LayoutKind.Explicit), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
+    internal struct CamqEntry
     {
         [FieldOffset(0)]
         public ListEntry le;
@@ -150,27 +134,24 @@ namespace Aaru.Devices.FreeBSD
         public StailqEntry stqe;
     }
 
-    [StructLayout(LayoutKind.Sequential)]
-    [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
-    struct Timeval
+    [StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
+    internal struct Timeval
     {
         public long tv_sec;
         /// <summary>long</summary>
         public IntPtr tv_usec;
     }
 
-    [StructLayout(LayoutKind.Sequential)]
-    [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
-    struct CcbQosArea
+    [StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
+    internal struct CcbQosArea
     {
         public Timeval etime;
         public UIntPtr sim_data;
         public UIntPtr periph_data;
     }
 
-    [StructLayout(LayoutKind.Sequential)]
-    [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
-    struct CcbHdr
+    [StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
+    internal struct CcbHdr
     {
         public CamPinfo  pinfo;
         public CamqEntry xpt_links;
@@ -195,9 +176,8 @@ namespace Aaru.Devices.FreeBSD
         public Timeval    softtimeout;
     }
 
-    [StructLayout(LayoutKind.Sequential)]
-    [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
-    struct ScsiSenseData
+    [StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
+    internal struct ScsiSenseData
     {
         const  int  SSD_FULL_SIZE = 252;
         public byte error_code;
@@ -205,12 +185,9 @@ namespace Aaru.Devices.FreeBSD
         public byte[] sense_buf;
     }
 
-    /// <summary>
-    ///     SCSI I/O Request CCB used for the XPT_SCSI_IO and XPT_CONT_TARGET_IO function codes.
-    /// </summary>
-    [StructLayout(LayoutKind.Sequential)]
-    [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
-    struct CcbScsiio
+    /// <summary>SCSI I/O Request CCB used for the XPT_SCSI_IO and XPT_CONT_TARGET_IO function codes.</summary>
+    [StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
+    internal struct CcbScsiio
     {
         public CcbHdr ccb_h;
         /// <summary>Ptr for next CCB for action</summary>
@@ -235,9 +212,7 @@ namespace Aaru.Devices.FreeBSD
         public sbyte sense_resid;
         /// <summary>Transfer residual length: 2's comp</summary>
         public int resid;
-        /// <summary>
-        ///     Area for the CDB send, or pointer to the CDB bytes to send
-        /// </summary>
+        /// <summary>Area for the CDB send, or pointer to the CDB bytes to send</summary>
         const int IOCDBLEN = 16;
         [MarshalAs(UnmanagedType.ByValArray, SizeConst = IOCDBLEN)]
         public byte[] cdb_bytes;
@@ -256,12 +231,9 @@ namespace Aaru.Devices.FreeBSD
         public uint init_id;
     }
 
-    /// <summary>
-    ///     SCSI I/O Request CCB used for the XPT_SCSI_IO and XPT_CONT_TARGET_IO function codes.
-    /// </summary>
-    [StructLayout(LayoutKind.Sequential)]
-    [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
-    struct CcbScsiio64
+    /// <summary>SCSI I/O Request CCB used for the XPT_SCSI_IO and XPT_CONT_TARGET_IO function codes.</summary>
+    [StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
+    internal struct CcbScsiio64
     {
         public CcbHdr ccb_h;
         /// <summary>Ptr for next CCB for action</summary>
@@ -287,9 +259,7 @@ namespace Aaru.Devices.FreeBSD
         /// <summary>Transfer residual length: 2's comp</summary>
         public int resid;
         public uint alignment;
-        /// <summary>
-        ///     Area for the CDB send, or pointer to the CDB bytes to send
-        /// </summary>
+        /// <summary>Area for the CDB send, or pointer to the CDB bytes to send</summary>
         const int IOCDBLEN = 16;
         [MarshalAs(UnmanagedType.ByValArray, SizeConst = IOCDBLEN)]
         public byte[] cdb_bytes;
@@ -308,12 +278,9 @@ namespace Aaru.Devices.FreeBSD
         public uint init_id;
     }
 
-    /// <summary>
-    ///     ATA I/O Request CCB used for the XPT_ATA_IO function code.
-    /// </summary>
-    [StructLayout(LayoutKind.Sequential)]
-    [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
-    struct CcbAtaio
+    /// <summary>ATA I/O Request CCB used for the XPT_ATA_IO function code.</summary>
+    [StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
+    internal struct CcbAtaio
     {
         public CcbHdr ccb_h;
         /// <summary>Ptr for next CCB for action</summary>
@@ -334,153 +301,93 @@ namespace Aaru.Devices.FreeBSD
         public uint unused;
     }
 
-    [StructLayout(LayoutKind.Sequential)]
-    [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
-    struct NvmeCommand
+    [StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
+    internal struct NvmeCommand
     {
-        ushort opc_fuse_rsvd1;
-        /// <summary>
-        ///     command identifier
-        /// </summary>
+        readonly ushort opc_fuse_rsvd1;
+        /// <summary>command identifier</summary>
         public ushort cid;
-        /// <summary>
-        ///     namespace identifier
-        /// </summary>
+        /// <summary>namespace identifier</summary>
         public uint nsid;
-        /// <summary>
-        ///     reserved
-        /// </summary>
+        /// <summary>reserved</summary>
         public uint rsvd2;
-        /// <summary>
-        ///     reserved
-        /// </summary>
+        /// <summary>reserved</summary>
         public uint rsvd3;
-        /// <summary>
-        ///     metadata pointer
-        /// </summary>
+        /// <summary>metadata pointer</summary>
         public ulong mptr;
-        /// <summary>
-        ///     prp entry 1
-        /// </summary>
+        /// <summary>prp entry 1</summary>
         public ulong prp1;
-        /// <summary>
-        ///     prp entry 2
-        /// </summary>
+        /// <summary>prp entry 2</summary>
         public ulong prp2;
-        /// <summary>
-        ///     command-specific
-        /// </summary>
+        /// <summary>command-specific</summary>
         public uint cdw10;
-        /// <summary>
-        ///     command-specific
-        /// </summary>
+        /// <summary>command-specific</summary>
         public uint cdw11;
-        /// <summary>
-        ///     command-specific
-        /// </summary>
+        /// <summary>command-specific</summary>
         public uint cdw12;
-        /// <summary>
-        ///     command-specific
-        /// </summary>
+        /// <summary>command-specific</summary>
         public uint cdw13;
-        /// <summary>
-        ///     command-specific
-        /// </summary>
+        /// <summary>command-specific</summary>
         public uint cdw14;
-        /// <summary>
-        ///     command-specific
-        /// </summary>
+        /// <summary>command-specific</summary>
         public uint cdw15;
 
-        /// <summary>
-        ///     opcode
-        /// </summary>
+        /// <summary>opcode</summary>
         public byte Opc => (byte)((opc_fuse_rsvd1 & 0xFF00) >> 8);
-        /// <summary>
-        ///     fused operation
-        /// </summary>
+        /// <summary>fused operation</summary>
         public byte Fuse => (byte)((opc_fuse_rsvd1 & 0xC0) >> 6);
-        /// <summary>
-        ///     reserved
-        /// </summary>
+        /// <summary>reserved</summary>
         public byte Rsvd1 => (byte)(opc_fuse_rsvd1 & 0x3F);
     }
 
-    [StructLayout(LayoutKind.Sequential)]
-    [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
-    struct NvmeStatus
+    [StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
+    internal struct NvmeStatus
     {
-        ushort status;
+        readonly ushort status;
 
-        /// <summary>
-        ///     phase tag
-        /// </summary>
+        /// <summary>phase tag</summary>
         public byte P => (byte)((status & 0x8000) >> 15);
 
-        /// <summary>
-        ///     status code
-        /// </summary>
+        /// <summary>status code</summary>
         public byte Sc => (byte)((status & 0x7F80) >> 7);
 
-        /// <summary>
-        ///     status code type
-        /// </summary>
+        /// <summary>status code type</summary>
         public byte Sct => (byte)((status & 0x70) >> 4);
 
-        /// <summary>
-        ///     reserved
-        /// </summary>
+        /// <summary>reserved</summary>
         public byte Rsvd2 => (byte)((status & 0xC) >> 15);
 
-        /// <summary>
-        ///     more
-        /// </summary>
+        /// <summary>more</summary>
         public byte M => (byte)((status & 0x2) >> 1);
 
-        /// <summary>
-        ///     do not retry
-        /// </summary>
+        /// <summary>do not retry</summary>
         public byte Dnr => (byte)(status & 0x1);
     }
 
-    [StructLayout(LayoutKind.Sequential)]
-    [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
-    struct NvmeCompletion
+    [StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
+    internal struct NvmeCompletion
     {
-        /// <summary>
-        ///     command-specific
-        /// </summary>
+        /// <summary>command-specific</summary>
         public uint cdw0;
 
-        /// <summary>
-        ///     reserved
-        /// </summary>
+        /// <summary>reserved</summary>
         public uint rsvd1;
 
-        /// <summary>
-        ///     submission queue head pointer
-        /// </summary>
+        /// <summary>submission queue head pointer</summary>
         public ushort sqhd;
 
-        /// <summary>
-        ///     submission queue identifier
-        /// </summary>
+        /// <summary>submission queue identifier</summary>
         public ushort sqid;
 
-        /// <summary>
-        ///     command identifier
-        /// </summary>
+        /// <summary>command identifier</summary>
         public ushort cid;
 
         public NvmeStatus status;
     }
 
-    /// <summary>
-    ///     NVMe I/O Request CCB used for the XPT_NVME_IO and XPT_NVME_ADMIN function codes.
-    /// </summary>
-    [StructLayout(LayoutKind.Sequential)]
-    [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
-    struct CcbNvmeio
+    /// <summary>NVMe I/O Request CCB used for the XPT_NVME_IO and XPT_NVME_ADMIN function codes.</summary>
+    [StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
+    internal struct CcbNvmeio
     {
         public CcbHdr ccb_h;
         /// <summary>Ptr for next CCB for action</summary>
@@ -499,9 +406,8 @@ namespace Aaru.Devices.FreeBSD
         public ushort unused;
     }
 
-    [StructLayout(LayoutKind.Sequential)]
-    [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
-    struct PeriphMatchPattern
+    [StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
+    internal struct PeriphMatchPattern
     {
         const int DEV_IDLEN = 16;
 
@@ -514,18 +420,16 @@ namespace Aaru.Devices.FreeBSD
         public PeriphPatternFlags flags;
     }
 
-    [StructLayout(LayoutKind.Sequential)]
-    [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
-    struct DeviceIdMatchPattern
+    [StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
+    internal struct DeviceIdMatchPattern
     {
         public byte id_len;
         [MarshalAs(UnmanagedType.ByValArray, SizeConst = 256)]
         public byte[] id;
     }
 
-    [StructLayout(LayoutKind.Sequential)]
-    [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
-    struct ScsiStaticInquiryPattern
+    [StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
+    internal struct ScsiStaticInquiryPattern
     {
         const  int  SID_VENDOR_SIZE   = 8;
         const  int  SID_PRODUCT_SIZE  = 16;
@@ -540,9 +444,8 @@ namespace Aaru.Devices.FreeBSD
         public byte[] revision;
     }
 
-    [StructLayout(LayoutKind.Explicit)]
-    [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
-    struct DeviceMatchPatternData
+    [StructLayout(LayoutKind.Explicit), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
+    internal struct DeviceMatchPatternData
     {
         [FieldOffset(0)]
         public ScsiStaticInquiryPattern inq_pat;
@@ -550,9 +453,8 @@ namespace Aaru.Devices.FreeBSD
         public DeviceIdMatchPattern devid_pat;
     }
 
-    [StructLayout(LayoutKind.Sequential)]
-    [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
-    struct DeviceMatchPattern
+    [StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
+    internal struct DeviceMatchPattern
     {
         public uint                   path_id;
         public uint                   target_id;
@@ -561,23 +463,21 @@ namespace Aaru.Devices.FreeBSD
         public DeviceMatchPatternData data;
     }
 
-    [StructLayout(LayoutKind.Sequential)]
-    [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
-    struct BusMatchPattern
+    [StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
+    internal struct BusMatchPattern
     {
         const int DEV_IDLEN = 16;
 
         public path_id_t path_id;
         [MarshalAs(UnmanagedType.ByValArray, SizeConst = DEV_IDLEN)]
         public byte[] dev_name;
-        public uint     unit_number;
-        public uint     bus_id;
-        BusPatternFlags flags;
+        public   uint            unit_number;
+        public   uint            bus_id;
+        readonly BusPatternFlags flags;
     }
 
-    [StructLayout(LayoutKind.Explicit)]
-    [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
-    struct MatchPattern
+    [StructLayout(LayoutKind.Explicit), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
+    internal struct MatchPattern
     {
         [FieldOffset(0)]
         public PeriphMatchPattern periph_pattern;
@@ -587,17 +487,15 @@ namespace Aaru.Devices.FreeBSD
         public BusMatchPattern bus_pattern;
     }
 
-    [StructLayout(LayoutKind.Sequential)]
-    [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
-    struct DevMatchPattern
+    [StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
+    internal struct DevMatchPattern
     {
         public DevMatchType type;
         public MatchPattern pattern;
     }
 
-    [StructLayout(LayoutKind.Sequential)]
-    [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
-    struct PeriphMatchResult
+    [StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
+    internal struct PeriphMatchResult
     {
         [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
         public byte[] periph_name;
@@ -607,9 +505,8 @@ namespace Aaru.Devices.FreeBSD
         public lun_id_t    target_lun;
     }
 
-    [StructLayout(LayoutKind.Sequential)]
-    [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
-    struct MmcCid
+    [StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
+    internal struct MmcCid
     {
         public uint mid;
         [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
@@ -622,59 +519,41 @@ namespace Aaru.Devices.FreeBSD
         public byte   fwrev;
     }
 
-    [StructLayout(LayoutKind.Sequential)]
-    [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
-    struct MmcParams
+    [StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
+    internal struct MmcParams
     {
-        /// <summary>
-        ///     Card model
-        /// </summary>
+        /// <summary>Card model</summary>
         [MarshalAs(UnmanagedType.ByValArray, SizeConst = 40)]
         public byte[] model;
 
-        /// <summary>
-        ///     Card OCR
-        /// </summary>
+        /// <summary>Card OCR</summary>
         public uint card_ocr;
 
-        /// <summary>
-        ///     OCR of the IO portion of the card
-        /// </summary>
+        /// <summary>OCR of the IO portion of the card</summary>
         public uint io_ocr;
 
-        /// <summary>
-        ///     Card CID -- raw
-        /// </summary>
+        /// <summary>Card CID -- raw</summary>
         [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
         public uint[] card_cid;
 
-        /// <summary>
-        ///     Card CID -- parsed
-        /// </summary>
+        /// <summary>Card CID -- parsed</summary>
         public MmcCid cid;
 
-        /// <summary>
-        ///     Card CSD -- raw
-        /// </summary>
+        /// <summary>Card CSD -- raw</summary>
         [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
         public uint[] card_csd;
 
-        /// <summary>
-        ///     Card RCA
-        /// </summary>
+        /// <summary>Card RCA</summary>
         public ushort card_rca;
 
-        /// <summary>
-        ///     What kind of card is it
-        /// </summary>
+        /// <summary>What kind of card is it</summary>
         public MmcCardFeatures card_features;
 
         public byte sdio_func_count;
     }
 
-    [StructLayout(LayoutKind.Sequential)]
-    [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
-    struct DeviceMatchResult
+    [StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
+    internal struct DeviceMatchResult
     {
         public path_id_t   path_id;
         public target_id_t target_id;
@@ -688,9 +567,8 @@ namespace Aaru.Devices.FreeBSD
         public MmcParams      mmc_ident_data;
     }
 
-    [StructLayout(LayoutKind.Sequential)]
-    [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
-    struct BusMatchResult
+    [StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
+    internal struct BusMatchResult
     {
         public path_id_t path_id;
         const  int       DEV_IDLEN = 16;
@@ -700,9 +578,8 @@ namespace Aaru.Devices.FreeBSD
         public uint bus_id;
     }
 
-    [StructLayout(LayoutKind.Explicit)]
-    [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
-    struct MatchResult
+    [StructLayout(LayoutKind.Explicit), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
+    internal struct MatchResult
     {
         [FieldOffset(0)]
         public PeriphMatchResult periph_result;
@@ -712,17 +589,15 @@ namespace Aaru.Devices.FreeBSD
         public BusMatchResult bus_result;
     }
 
-    [StructLayout(LayoutKind.Sequential)]
-    [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
-    struct DevMatchResult
+    [StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
+    internal struct DevMatchResult
     {
         public DevMatchType type;
         public MatchResult  result;
     }
 
-    [StructLayout(LayoutKind.Sequential)]
-    [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
-    struct CcbDmCookie
+    [StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
+    internal struct CcbDmCookie
     {
         public IntPtr bus;
         public IntPtr target;
@@ -731,43 +606,37 @@ namespace Aaru.Devices.FreeBSD
         public IntPtr pdrv;
     }
 
-    [StructLayout(LayoutKind.Sequential)]
-    [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
-    struct CcbDevPosition
+    [StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
+    internal struct CcbDevPosition
     {
         [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
         public CamGenerations[] generations;
-        DevPosType         position_type;
-        public CcbDmCookie cookie;
+        readonly DevPosType  position_type;
+        public   CcbDmCookie cookie;
     }
 
-    [StructLayout(LayoutKind.Sequential)]
-    [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
-    struct CcbDevMatch
+    [StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
+    internal struct CcbDevMatch
     {
-        public CcbHdr     ccb_h;
-        CcbDevMatchStatus status;
-        public uint       num_patterns;
-        public uint       pattern_buf_len;
+        public   CcbHdr            ccb_h;
+        readonly CcbDevMatchStatus status;
+        public   uint              num_patterns;
+        public   uint              pattern_buf_len;
 
-        /// <summary>
-        ///     dev_match_pattern*
-        /// </summary>
+        /// <summary>dev_match_pattern*</summary>
         public IntPtr patterns;
 
         public uint num_matches;
         public uint match_buf_len;
 
-        /// <summary>
-        ///     dev_match_result*
-        /// </summary>
+        /// <summary>dev_match_result*</summary>
         public IntPtr matches;
 
         public CcbDevPosition pos;
     }
 
     [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
-    struct CamDevice
+    internal struct CamDevice
     {
         const int MAXPATHLEN = 1024;
         const int DEV_IDLEN  = 16;
@@ -778,88 +647,51 @@ namespace Aaru.Devices.FreeBSD
         /// </summary>
         [MarshalAs(UnmanagedType.ByValArray, SizeConst = MAXPATHLEN)]
         public byte[] DevicePath;
-        /// <summary>
-        ///     Device name given by the user.
-        /// </summary>
+        /// <summary>Device name given by the user.</summary>
         [MarshalAs(UnmanagedType.ByValArray, SizeConst = DEV_IDLEN + 1)]
         public byte[] GivenDevName;
-        /// <summary>
-        ///     Unit number given by the user.
-        /// </summary>
+        /// <summary>Unit number given by the user.</summary>
         public uint GivenUnitNumber;
-        /// <summary>
-        ///     Name of the device, e.g. 'pass'
-        /// </summary>
+        /// <summary>Name of the device, e.g. 'pass'</summary>
         [MarshalAs(UnmanagedType.ByValArray, SizeConst = DEV_IDLEN + 1)]
         public byte[] DeviceName;
-        /// <summary>
-        ///     Unit number of the passthrough device associated with this particular device.
-        /// </summary>
+        /// <summary>Unit number of the passthrough device associated with this particular device.</summary>
         public uint DevUnitNum;
-        /// <summary>
-        ///     Controller name, e.g. 'ahc'
-        /// </summary>
+        /// <summary>Controller name, e.g. 'ahc'</summary>
         [MarshalAs(UnmanagedType.ByValArray, SizeConst = SIM_IDLEN + 1)]
         public byte[] SimName;
-        /// <summary>
-        ///     Controller unit number
-        /// </summary>
+        /// <summary>Controller unit number</summary>
         public uint SimUnitNumber;
-        /// <summary>
-        ///     Controller bus number
-        /// </summary>
+        /// <summary>Controller bus number</summary>
         public uint BusId;
-        /// <summary>
-        ///     Logical Unit Number
-        /// </summary>
+        /// <summary>Logical Unit Number</summary>
         public lun_id_t TargetLun;
-        /// <summary>
-        ///     Target ID
-        /// </summary>
+        /// <summary>Target ID</summary>
         public target_id_t TargetId;
-        /// <summary>
-        ///     System SCSI bus number
-        /// </summary>
+        /// <summary>System SCSI bus number</summary>
         public path_id_t PathId;
-        /// <summary>
-        ///     type of peripheral device
-        /// </summary>
+        /// <summary>type of peripheral device</summary>
         public ushort PdType;
-        /// <summary>
-        ///     SCSI Inquiry data
-        /// </summary>
+        /// <summary>SCSI Inquiry data</summary>
         [MarshalAs(UnmanagedType.ByValArray, SizeConst = 256)]
         public byte[] InqData;
-        /// <summary>
-        ///     device serial number
-        /// </summary>
+        /// <summary>device serial number</summary>
         [MarshalAs(UnmanagedType.ByValArray, SizeConst = 252)]
         public byte[] SerialNum;
-        /// <summary>
-        ///     length of the serial number
-        /// </summary>
+        /// <summary>length of the serial number</summary>
         public byte SerialNumLen;
-        /// <summary>
-        ///     Negotiated sync period
-        /// </summary>
+        /// <summary>Negotiated sync period</summary>
         public byte SyncPeriod;
-        /// <summary>
-        ///     Negotiated sync offset
-        /// </summary>
+        /// <summary>Negotiated sync offset</summary>
         public byte SyncOffset;
-        /// <summary>
-        ///     Negotiated bus width
-        /// </summary>
+        /// <summary>Negotiated bus width</summary>
         public byte BusWidth;
-        /// <summary>
-        ///     file descriptor for device
-        /// </summary>
+        /// <summary>file descriptor for device</summary>
         public int Fd;
     }
 
-    [StructLayout(LayoutKind.Sequential)]
-    [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
-    struct CcbGetdev
+    [StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
+    internal struct CcbGetdev
     {
         public CcbHdr   ccb_h;
         public CamProto protocol;
@@ -867,15 +699,11 @@ namespace Aaru.Devices.FreeBSD
         public byte[] inq_data;
         [MarshalAs(UnmanagedType.ByValArray, SizeConst = 512)]
         public byte[] ident_data;
-        /// <summary>
-        ///     device serial number
-        /// </summary>
+        /// <summary>device serial number</summary>
         [MarshalAs(UnmanagedType.ByValArray, SizeConst = 252)]
         public byte[] serial_num;
         public byte inq_flags;
-        /// <summary>
-        ///     length of the serial number
-        /// </summary>
+        /// <summary>length of the serial number</summary>
         public byte serial_num_len;
         [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
         public IntPtr[] padding;
diff --git a/Aaru.Devices/Linux/Command.cs b/Aaru.Devices/Linux/Command.cs
index 4d2361831..f5e9e82a7 100644
--- a/Aaru.Devices/Linux/Command.cs
+++ b/Aaru.Devices/Linux/Command.cs
@@ -39,11 +39,9 @@ using Aaru.Decoders.ATA;
 
 namespace Aaru.Devices.Linux
 {
-    static class Command
+    internal static class Command
     {
-        /// <summary>
-        ///     Sends a SCSI command
-        /// </summary>
+        /// <summary>Sends a SCSI command</summary>
         /// <returns>0 if no error occurred, otherwise, errno</returns>
         /// <param name="fd">File handle</param>
         /// <param name="cdb">SCSI CDB</param>
@@ -56,17 +54,17 @@ namespace Aaru.Devices.Linux
         ///     <c>True</c> if SCSI error returned non-OK status and <paramref name="senseBuffer" /> contains SCSI
         ///     sense
         /// </param>
-        internal static int SendScsiCommand(int                fd,          byte[]     cdb, ref byte[] buffer,
-                                            out byte[]         senseBuffer, uint       timeout,
-                                            ScsiIoctlDirection direction,   out double duration, out bool sense)
+        internal static int SendScsiCommand(int fd, byte[] cdb, ref byte[] buffer, out byte[] senseBuffer, uint timeout,
+                                            ScsiIoctlDirection direction, out double duration, out bool sense)
         {
             senseBuffer = null;
             duration    = 0;
             sense       = false;
 
-            if(buffer == null) return -1;
+            if(buffer == null)
+                return -1;
 
-            SgIoHdrT ioHdr = new SgIoHdrT();
+            var ioHdr = new SgIoHdrT();
 
             senseBuffer = new byte[32];
 
@@ -81,19 +79,20 @@ namespace Aaru.Devices.Linux
             ioHdr.timeout         = timeout * 1000;
             ioHdr.flags           = (uint)SgFlags.DirectIo;
 
-            Marshal.Copy(buffer,      0, ioHdr.dxferp, buffer.Length);
-            Marshal.Copy(cdb,         0, ioHdr.cmdp,   cdb.Length);
-            Marshal.Copy(senseBuffer, 0, ioHdr.sbp,    senseBuffer.Length);
+            Marshal.Copy(buffer, 0, ioHdr.dxferp, buffer.Length);
+            Marshal.Copy(cdb, 0, ioHdr.cmdp, cdb.Length);
+            Marshal.Copy(senseBuffer, 0, ioHdr.sbp, senseBuffer.Length);
 
             DateTime start = DateTime.UtcNow;
             int      error = Extern.ioctlSg(fd, LinuxIoctl.SgIo, ref ioHdr);
             DateTime end   = DateTime.UtcNow;
 
-            if(error < 0) error = Marshal.GetLastWin32Error();
+            if(error < 0)
+                error = Marshal.GetLastWin32Error();
 
-            Marshal.Copy(ioHdr.dxferp, buffer,      0, buffer.Length);
-            Marshal.Copy(ioHdr.cmdp,   cdb,         0, cdb.Length);
-            Marshal.Copy(ioHdr.sbp,    senseBuffer, 0, senseBuffer.Length);
+            Marshal.Copy(ioHdr.dxferp, buffer, 0, buffer.Length);
+            Marshal.Copy(ioHdr.cmdp, cdb, 0, cdb.Length);
+            Marshal.Copy(ioHdr.sbp, senseBuffer, 0, senseBuffer.Length);
 
             sense |= (ioHdr.info & SgInfo.OkMask) != SgInfo.Ok;
 
@@ -106,9 +105,7 @@ namespace Aaru.Devices.Linux
             return error;
         }
 
-        /// <summary>
-        ///     Converts ATA protocol to SG_IO direction
-        /// </summary>
+        /// <summary>Converts ATA protocol to SG_IO direction</summary>
         /// <param name="protocol">ATA protocol</param>
         /// <returns>SG_IO direction</returns>
         static ScsiIoctlDirection AtaProtocolToScsiDirection(AtaProtocol protocol)
@@ -129,9 +126,7 @@ namespace Aaru.Devices.Linux
             }
         }
 
-        /// <summary>
-        ///     Sends an ATA command in CHS mode
-        /// </summary>
+        /// <summary>Sends an ATA command in CHS mode</summary>
         /// <returns>0 if no error occurred, otherwise, errno</returns>
         /// <param name="fd">File handle</param>
         /// <param name="buffer">Buffer for SCSI command response</param>
@@ -143,36 +138,40 @@ namespace Aaru.Devices.Linux
         /// <param name="protocol">ATA protocol to use</param>
         /// <param name="transferRegister">Which register contains the transfer count</param>
         /// <param name="transferBlocks">Set to <c>true</c> if the transfer count is in blocks, otherwise it is in bytes</param>
-        internal static int SendAtaCommand(int                      fd, AtaRegistersChs registers,
-                                           out AtaErrorRegistersChs errorRegisters,
-                                           AtaProtocol              protocol, AtaTransferRegister transferRegister,
-                                           ref byte[]               buffer,   uint                timeout, bool transferBlocks,
-                                           out double               duration,
-                                           out bool                 sense)
+        internal static int SendAtaCommand(int fd, AtaRegistersChs registers, out AtaErrorRegistersChs errorRegisters,
+                                           AtaProtocol protocol, AtaTransferRegister transferRegister,
+                                           ref byte[] buffer, uint timeout, bool transferBlocks, out double duration,
+                                           out bool sense)
         {
             duration       = 0;
             sense          = false;
             errorRegisters = new AtaErrorRegistersChs();
 
-            if(buffer == null) return -1;
+            if(buffer == null)
+                return -1;
 
             byte[] cdb = new byte[16];
             cdb[0] = (byte)ScsiCommands.AtaPassThrough16;
             cdb[1] = (byte)(((byte)protocol << 1) & 0x1E);
-            if(transferRegister != AtaTransferRegister.NoTransfer && protocol != AtaProtocol.NonData)
+
+            if(transferRegister != AtaTransferRegister.NoTransfer &&
+               protocol         != AtaProtocol.NonData)
             {
                 switch(protocol)
                 {
                     case AtaProtocol.PioIn:
                     case AtaProtocol.UDmaIn:
                         cdb[2] = 0x08;
+
                         break;
                     default:
                         cdb[2] = 0x00;
+
                         break;
                 }
 
-                if(transferBlocks) cdb[2] |= 0x04;
+                if(transferBlocks)
+                    cdb[2] |= 0x04;
 
                 cdb[2] |= (byte)((int)transferRegister & 0x03);
             }
@@ -187,11 +186,12 @@ namespace Aaru.Devices.Linux
             cdb[13] = registers.DeviceHead;
             cdb[14] = registers.Command;
 
-            int error = SendScsiCommand(fd,                                   cdb, ref buffer,
-                                        out byte[] senseBuffer,               timeout,
+            int error = SendScsiCommand(fd, cdb, ref buffer, out byte[] senseBuffer, timeout,
                                         AtaProtocolToScsiDirection(protocol), out duration, out sense);
 
-            if(senseBuffer.Length < 22 || senseBuffer[8] != 0x09 && senseBuffer[9] != 0x0C) return error;
+            if(senseBuffer.Length < 22 ||
+               (senseBuffer[8] != 0x09 && senseBuffer[9] != 0x0C))
+                return error;
 
             errorRegisters.Error = senseBuffer[11];
 
@@ -207,9 +207,7 @@ namespace Aaru.Devices.Linux
             return error;
         }
 
-        /// <summary>
-        ///     Sends an ATA command in 28-bit LBA mode
-        /// </summary>
+        /// <summary>Sends an ATA command in 28-bit LBA mode</summary>
         /// <returns>0 if no error occurred, otherwise, errno</returns>
         /// <param name="fd">File handle</param>
         /// <param name="buffer">Buffer for SCSI command response</param>
@@ -221,36 +219,40 @@ namespace Aaru.Devices.Linux
         /// <param name="protocol">ATA protocol to use</param>
         /// <param name="transferRegister">Which register contains the transfer count</param>
         /// <param name="transferBlocks">Set to <c>true</c> if the transfer count is in blocks, otherwise it is in bytes</param>
-        internal static int SendAtaCommand(int                        fd,               AtaRegistersLba28 registers,
-                                           out AtaErrorRegistersLba28 errorRegisters,   AtaProtocol       protocol,
-                                           AtaTransferRegister        transferRegister, ref byte[]        buffer,
-                                           uint                       timeout,
-                                           bool                       transferBlocks, out double duration,
-                                           out bool                   sense)
+        internal static int SendAtaCommand(int fd, AtaRegistersLba28 registers,
+                                           out AtaErrorRegistersLba28 errorRegisters, AtaProtocol protocol,
+                                           AtaTransferRegister transferRegister, ref byte[] buffer, uint timeout,
+                                           bool transferBlocks, out double duration, out bool sense)
         {
             duration       = 0;
             sense          = false;
             errorRegisters = new AtaErrorRegistersLba28();
 
-            if(buffer == null) return -1;
+            if(buffer == null)
+                return -1;
 
             byte[] cdb = new byte[16];
             cdb[0] = (byte)ScsiCommands.AtaPassThrough16;
             cdb[1] = (byte)(((byte)protocol << 1) & 0x1E);
-            if(transferRegister != AtaTransferRegister.NoTransfer && protocol != AtaProtocol.NonData)
+
+            if(transferRegister != AtaTransferRegister.NoTransfer &&
+               protocol         != AtaProtocol.NonData)
             {
                 switch(protocol)
                 {
                     case AtaProtocol.PioIn:
                     case AtaProtocol.UDmaIn:
                         cdb[2] = 0x08;
+
                         break;
                     default:
                         cdb[2] = 0x00;
+
                         break;
                 }
 
-                if(transferBlocks) cdb[2] |= 0x04;
+                if(transferBlocks)
+                    cdb[2] |= 0x04;
 
                 cdb[2] |= (byte)((int)transferRegister & 0x03);
             }
@@ -265,11 +267,12 @@ namespace Aaru.Devices.Linux
             cdb[13] = registers.DeviceHead;
             cdb[14] = registers.Command;
 
-            int error = SendScsiCommand(fd,                                   cdb, ref buffer,
-                                        out byte[] senseBuffer,               timeout,
+            int error = SendScsiCommand(fd, cdb, ref buffer, out byte[] senseBuffer, timeout,
                                         AtaProtocolToScsiDirection(protocol), out duration, out sense);
 
-            if(senseBuffer.Length < 22 || senseBuffer[8] != 0x09 && senseBuffer[9] != 0x0C) return error;
+            if(senseBuffer.Length < 22 ||
+               (senseBuffer[8] != 0x09 && senseBuffer[9] != 0x0C))
+                return error;
 
             errorRegisters.Error = senseBuffer[11];
 
@@ -285,9 +288,7 @@ namespace Aaru.Devices.Linux
             return error;
         }
 
-        /// <summary>
-        ///     Sends an ATA command in 48-bit LBA mode
-        /// </summary>
+        /// <summary>Sends an ATA command in 48-bit LBA mode</summary>
         /// <returns>0 if no error occurred, otherwise, errno</returns>
         /// <param name="fd">File handle</param>
         /// <param name="buffer">Buffer for SCSI command response</param>
@@ -299,37 +300,41 @@ namespace Aaru.Devices.Linux
         /// <param name="protocol">ATA protocol to use</param>
         /// <param name="transferRegister">Which register contains the transfer count</param>
         /// <param name="transferBlocks">Set to <c>true</c> if the transfer count is in blocks, otherwise it is in bytes</param>
-        internal static int SendAtaCommand(int                        fd,               AtaRegistersLba48 registers,
-                                           out AtaErrorRegistersLba48 errorRegisters,   AtaProtocol       protocol,
-                                           AtaTransferRegister        transferRegister, ref byte[]        buffer,
-                                           uint                       timeout,
-                                           bool                       transferBlocks, out double duration,
-                                           out bool                   sense)
+        internal static int SendAtaCommand(int fd, AtaRegistersLba48 registers,
+                                           out AtaErrorRegistersLba48 errorRegisters, AtaProtocol protocol,
+                                           AtaTransferRegister transferRegister, ref byte[] buffer, uint timeout,
+                                           bool transferBlocks, out double duration, out bool sense)
         {
             duration       = 0;
             sense          = false;
             errorRegisters = new AtaErrorRegistersLba48();
 
-            if(buffer == null) return -1;
+            if(buffer == null)
+                return -1;
 
             byte[] cdb = new byte[16];
             cdb[0] =  (byte)ScsiCommands.AtaPassThrough16;
             cdb[1] =  (byte)(((byte)protocol << 1) & 0x1E);
             cdb[1] |= 0x01;
-            if(transferRegister != AtaTransferRegister.NoTransfer && protocol != AtaProtocol.NonData)
+
+            if(transferRegister != AtaTransferRegister.NoTransfer &&
+               protocol         != AtaProtocol.NonData)
             {
                 switch(protocol)
                 {
                     case AtaProtocol.PioIn:
                     case AtaProtocol.UDmaIn:
                         cdb[2] = 0x08;
+
                         break;
                     default:
                         cdb[2] = 0x00;
+
                         break;
                 }
 
-                if(transferBlocks) cdb[2] |= 0x04;
+                if(transferBlocks)
+                    cdb[2] |= 0x04;
 
                 cdb[2] |= (byte)((int)transferRegister & 0x03);
             }
@@ -349,11 +354,12 @@ namespace Aaru.Devices.Linux
             cdb[13] = registers.DeviceHead;
             cdb[14] = registers.Command;
 
-            int error = SendScsiCommand(fd,                                   cdb, ref buffer,
-                                        out byte[] senseBuffer,               timeout,
+            int error = SendScsiCommand(fd, cdb, ref buffer, out byte[] senseBuffer, timeout,
                                         AtaProtocolToScsiDirection(protocol), out duration, out sense);
 
-            if(senseBuffer.Length < 22 || senseBuffer[8] != 0x09 && senseBuffer[9] != 0x0C) return error;
+            if(senseBuffer.Length < 22 ||
+               (senseBuffer[8] != 0x09 && senseBuffer[9] != 0x0C))
+                return error;
 
             errorRegisters.Error = senseBuffer[11];
 
@@ -371,9 +377,7 @@ namespace Aaru.Devices.Linux
             return error;
         }
 
-        /// <summary>
-        ///     Sends a MMC/SD command
-        /// </summary>
+        /// <summary>Sends a MMC/SD command</summary>
         /// <returns>The result of the command.</returns>
         /// <param name="fd">File handle</param>
         /// <param name="command">MMC/SD opcode</param>
@@ -388,20 +392,18 @@ namespace Aaru.Devices.Linux
         /// <param name="argument">Command argument</param>
         /// <param name="response">Response registers</param>
         /// <param name="blockSize">Size of block in bytes</param>
-        internal static int SendMmcCommand(int        fd,            MmcCommands command, bool write,
-                                           bool       isApplication, MmcFlags    flags,
-                                           uint       argument,      uint        blockSize, uint blocks,
-                                           ref byte[] buffer,
-                                           out uint[] response, out double duration, out bool sense,
-                                           uint       timeout = 0)
+        internal static int SendMmcCommand(int fd, MmcCommands command, bool write, bool isApplication, MmcFlags flags,
+                                           uint argument, uint blockSize, uint blocks, ref byte[] buffer,
+                                           out uint[] response, out double duration, out bool sense, uint timeout = 0)
         {
             response = null;
             duration = 0;
             sense    = false;
 
-            if(buffer == null) return -1;
+            if(buffer == null)
+                return -1;
 
-            MmcIocCmd ioCmd = new MmcIocCmd();
+            var ioCmd = new MmcIocCmd();
 
             IntPtr bufPtr = Marshal.AllocHGlobal(buffer.Length);
 
@@ -412,6 +414,7 @@ namespace Aaru.Devices.Linux
             ioCmd.flags      = flags;
             ioCmd.blksz      = blockSize;
             ioCmd.blocks     = blocks;
+
             if(timeout > 0)
             {
                 ioCmd.data_timeout_ns = timeout * 1000000000;
@@ -428,7 +431,8 @@ namespace Aaru.Devices.Linux
 
             sense |= error < 0;
 
-            if(error < 0) error = Marshal.GetLastWin32Error();
+            if(error < 0)
+                error = Marshal.GetLastWin32Error();
 
             Marshal.Copy(bufPtr, buffer, 0, buffer.Length);
 
@@ -440,9 +444,7 @@ namespace Aaru.Devices.Linux
             return error;
         }
 
-        /// <summary>
-        ///     Reads the contents of a symbolic link
-        /// </summary>
+        /// <summary>Reads the contents of a symbolic link</summary>
         /// <param name="path">Path to the symbolic link</param>
         /// <returns>Contents of the symbolic link</returns>
         internal static string ReadLink(string path)
@@ -453,14 +455,18 @@ namespace Aaru.Devices.Linux
             if(DetectOS.Is64Bit)
             {
                 long result64 = Extern.readlink64(path, buf, 4096);
-                if(result64 <= 0) return null;
+
+                if(result64 <= 0)
+                    return null;
 
                 resultSize = (int)result64;
             }
             else
             {
                 int result = Extern.readlink(path, buf, 4096);
-                if(result <= 0) return null;
+
+                if(result <= 0)
+                    return null;
 
                 resultSize = result;
             }
@@ -468,6 +474,7 @@ namespace Aaru.Devices.Linux
             byte[] resultString = new byte[resultSize];
             Marshal.Copy(buf, resultString, 0, resultSize);
             Marshal.FreeHGlobal(buf);
+
             return Encoding.ASCII.GetString(resultString);
         }
     }
diff --git a/Aaru.Devices/Linux/Enums.cs b/Aaru.Devices/Linux/Enums.cs
index cfcf55426..bd4968b4d 100644
--- a/Aaru.Devices/Linux/Enums.cs
+++ b/Aaru.Devices/Linux/Enums.cs
@@ -36,161 +36,92 @@ using System;
 namespace Aaru.Devices.Linux
 {
     [Flags]
-    enum FileFlags
+    internal enum FileFlags
     {
-        /// <summary>
-        ///     O_RDONLY
-        /// </summary>
+        /// <summary>O_RDONLY</summary>
         Readonly = 0x0,
-        /// <summary>
-        ///     O_WRONLY
-        /// </summary>
+        /// <summary>O_WRONLY</summary>
         Writeonly = 0x1,
-        /// <summary>
-        ///     O_RDWR
-        /// </summary>
+        /// <summary>O_RDWR</summary>
         ReadWrite = 0x2,
-        /// <summary>
-        ///     O_CREAT
-        /// </summary>
+        /// <summary>O_CREAT</summary>
         OpenOrCreate = 0x40,
-        /// <summary>
-        ///     O_EXCL
-        /// </summary>
+        /// <summary>O_EXCL</summary>
         CreateNew = 0x80,
-        /// <summary>
-        ///     O_NOCTTY
-        /// </summary>
+        /// <summary>O_NOCTTY</summary>
         NoControlTty = 0x100,
-        /// <summary>
-        ///     O_TRUNC
-        /// </summary>
+        /// <summary>O_TRUNC</summary>
         Truncate = 0x200,
-        /// <summary>
-        ///     O_APPEND
-        /// </summary>
+        /// <summary>O_APPEND</summary>
         Append = 0x400,
-        /// <summary>
-        ///     O_NONBLOCK
-        /// </summary>
+        /// <summary>O_NONBLOCK</summary>
         NonBlocking = 0x800,
-        /// <summary>
-        ///     O_DSYNC
-        /// </summary>
+        /// <summary>O_DSYNC</summary>
         Synchronous = 0x1000,
-        /// <summary>
-        ///     O_ASYNC
-        /// </summary>
+        /// <summary>O_ASYNC</summary>
         Async = 0x2000,
-        /// <summary>
-        ///     O_DIRECT
-        /// </summary>
+        /// <summary>O_DIRECT</summary>
         Direct = 0x4000,
-        /// <summary>
-        ///     O_LARGEFILE
-        /// </summary>
+        /// <summary>O_LARGEFILE</summary>
         LargeFile = 0x8000,
-        /// <summary>
-        ///     O_DIRECTORY
-        /// </summary>
+        /// <summary>O_DIRECTORY</summary>
         Directory = 0x10000,
-        /// <summary>
-        ///     O_NOFOLLOW
-        /// </summary>
+        /// <summary>O_NOFOLLOW</summary>
         NoFollowSymlink = 0x20000,
-        /// <summary>
-        ///     O_NOATIME
-        /// </summary>
+        /// <summary>O_NOATIME</summary>
         NoAccessTime = 0x40000,
-        /// <summary>
-        ///     O_CLOEXEC
-        /// </summary>
+        /// <summary>O_CLOEXEC</summary>
         CloseOnExec = 0x80000
     }
 
-    /// <summary>
-    ///     Direction of SCSI transfer
-    /// </summary>
-    enum ScsiIoctlDirection
+    /// <summary>Direction of SCSI transfer</summary>
+    internal enum ScsiIoctlDirection
     {
-        /// <summary>
-        ///     No data transfer happens
-        ///     SG_DXFER_NONE
-        /// </summary>
+        /// <summary>No data transfer happens SG_DXFER_NONE</summary>
         None = -1,
-        /// <summary>
-        ///     From host to device
-        ///     SG_DXFER_TO_DEV
-        /// </summary>
+        /// <summary>From host to device SG_DXFER_TO_DEV</summary>
         Out = -2,
-        /// <summary>
-        ///     From device to host
-        ///     SG_DXFER_FROM_DEV
-        /// </summary>
+        /// <summary>From device to host SG_DXFER_FROM_DEV</summary>
         In = -3,
-        /// <summary>
-        ///     Bidirectional device/host
-        ///     SG_DXFER_TO_FROM_DEV
-        /// </summary>
+        /// <summary>Bidirectional device/host SG_DXFER_TO_FROM_DEV</summary>
         Unspecified = -4,
-        /// <summary>
-        ///     Unspecified
-        ///     SG_DXFER_UNKNOWN
-        /// </summary>
+        /// <summary>Unspecified SG_DXFER_UNKNOWN</summary>
         Unknown = -5
     }
 
-    enum LinuxIoctl : uint
+    internal enum LinuxIoctl : uint
     {
         // SCSI IOCtls
-        SgGetVersionNum = 0x2282,
-        SgIo            = 0x2285,
+        SgGetVersionNum = 0x2282, SgIo = 0x2285,
+
         // MMC IOCtl
         MmcIocCmd = 0xC048B300
     }
 
     [Flags]
-    enum SgInfo : uint
+    internal enum SgInfo : uint
     {
-        /// <summary>
-        ///     Mask to check OK
-        /// </summary>
+        /// <summary>Mask to check OK</summary>
         OkMask = 0x01,
-        /// <summary>
-        ///     No sense or driver noise
-        /// </summary>
+        /// <summary>No sense or driver noise</summary>
         Ok = 0x00,
-        /// <summary>
-        ///     Check Condition
-        /// </summary>
+        /// <summary>Check Condition</summary>
         CheckCondition = 0x01,
 
-        /// <summary>
-        ///     Direct I/O mask
-        /// </summary>
+        /// <summary>Direct I/O mask</summary>
         DirectIoMask = 0x06,
-        /// <summary>
-        ///     Transfer via kernel buffers (or no transfer)
-        /// </summary>
+        /// <summary>Transfer via kernel buffers (or no transfer)</summary>
         IndirectIo = 0x00,
-        /// <summary>
-        ///     Direct I/O performed
-        /// </summary>
+        /// <summary>Direct I/O performed</summary>
         DirectIo = 0x02,
-        /// <summary>
-        ///     Partial direct and partial indirect I/O
-        /// </summary>
+        /// <summary>Partial direct and partial indirect I/O</summary>
         MixedIo = 0x04
     }
 
     [Flags]
-    enum SgFlags : uint
+    internal enum SgFlags : uint
     {
-        DirectIo         = 1,
-        UnusedLunInhibit = 2,
-        MmapIo           = 4,
-        NoDxfer          = 0x10000,
-        QAtTail          = 0x10,
-        QAtHead          = 0x20
+        DirectIo = 1, UnusedLunInhibit = 2, MmapIo     = 4,
+        NoDxfer  = 0x10000, QAtTail    = 0x10, QAtHead = 0x20
     }
 }
\ No newline at end of file
diff --git a/Aaru.Devices/Linux/Extern.cs b/Aaru.Devices/Linux/Extern.cs
index e25e2dad8..ae89c46c5 100644
--- a/Aaru.Devices/Linux/Extern.cs
+++ b/Aaru.Devices/Linux/Extern.cs
@@ -36,7 +36,7 @@ using System.Runtime.InteropServices;
 
 namespace Aaru.Devices.Linux
 {
-    static class Extern
+    internal static class Extern
     {
         [DllImport("libc", CharSet = CharSet.Ansi, SetLastError = true)]
         internal static extern int open(string pathname, [MarshalAs(UnmanagedType.U4)] FileFlags flags);
diff --git a/Aaru.Devices/Linux/ListDevices.cs b/Aaru.Devices/Linux/ListDevices.cs
index 81507ff5a..867c5122d 100644
--- a/Aaru.Devices/Linux/ListDevices.cs
+++ b/Aaru.Devices/Linux/ListDevices.cs
@@ -36,18 +36,16 @@ using System.Text;
 
 namespace Aaru.Devices.Linux
 {
-    static class ListDevices
+    internal static class ListDevices
     {
         const string PATH_SYS_DEVBLOCK = "/sys/block/";
 
-        /// <summary>
-        ///     Gets a list of all known storage devices on Linux
-        /// </summary>
+        /// <summary>Gets a list of all known storage devices on Linux</summary>
         /// <returns>List of devices</returns>
         internal static DeviceInfo[] GetList()
         {
-            string[] sysdevs =
-                Directory.GetFileSystemEntries(PATH_SYS_DEVBLOCK, "*", SearchOption.TopDirectoryOnly);
+            string[] sysdevs = Directory.GetFileSystemEntries(PATH_SYS_DEVBLOCK, "*", SearchOption.TopDirectoryOnly);
+
             DeviceInfo[] devices = new DeviceInfo[sysdevs.Length];
             bool         hasUdev;
 
@@ -58,27 +56,41 @@ namespace Aaru.Devices.Linux
                 udev    = Extern.udev_new();
                 hasUdev = udev != IntPtr.Zero;
             }
-            catch { hasUdev = false; }
+            catch
+            {
+                hasUdev = false;
+            }
 
             for(int i = 0; i < sysdevs.Length; i++)
             {
-                devices[i] = new DeviceInfo {Path = "/dev/" + Path.GetFileName(sysdevs[i])};
+                devices[i] = new DeviceInfo
+                {
+                    Path = "/dev/" + Path.GetFileName(sysdevs[i])
+                };
 
                 if(hasUdev)
                 {
                     IntPtr udevDev =
                         Extern.udev_device_new_from_subsystem_sysname(udev, "block", Path.GetFileName(sysdevs[i]));
+
                     devices[i].Vendor = Extern.udev_device_get_property_value(udevDev, "ID_VENDOR");
                     devices[i].Model  = Extern.udev_device_get_property_value(udevDev, "ID_MODEL");
-                    if(!string.IsNullOrEmpty(devices[i].Model)) devices[i].Model = devices[i].Model.Replace('_', ' ');
+
+                    if(!string.IsNullOrEmpty(devices[i].Model))
+                        devices[i].Model = devices[i].Model.Replace('_', ' ');
+
                     devices[i].Serial = Extern.udev_device_get_property_value(udevDev, "ID_SCSI_SERIAL");
+
                     if(string.IsNullOrEmpty(devices[i].Serial))
                         devices[i].Serial = Extern.udev_device_get_property_value(udevDev, "ID_SERIAL_SHORT");
+
                     devices[i].Bus = Extern.udev_device_get_property_value(udevDev, "ID_BUS");
                 }
 
                 StreamReader sr;
-                if(File.Exists(Path.Combine(sysdevs[i], "device/vendor")) && string.IsNullOrEmpty(devices[i].Vendor))
+
+                if(File.Exists(Path.Combine(sysdevs[i], "device/vendor")) &&
+                   string.IsNullOrEmpty(devices[i].Vendor))
                 {
                     sr                = new StreamReader(Path.Combine(sysdevs[i], "device/vendor"), Encoding.ASCII);
                     devices[i].Vendor = sr.ReadLine()?.Trim();
@@ -95,16 +107,19 @@ namespace Aaru.Devices.Linux
                 else if(devices[i].Path.StartsWith("/dev/loop", StringComparison.CurrentCulture))
                     devices[i].Model = "Linux";
 
-                if(File.Exists(Path.Combine(sysdevs[i], "device/serial")) && string.IsNullOrEmpty(devices[i].Serial))
+                if(File.Exists(Path.Combine(sysdevs[i], "device/serial")) &&
+                   string.IsNullOrEmpty(devices[i].Serial))
                 {
                     sr                = new StreamReader(Path.Combine(sysdevs[i], "device/serial"), Encoding.ASCII);
                     devices[i].Serial = sr.ReadLine()?.Trim();
                 }
 
-                if(string.IsNullOrEmpty(devices[i].Vendor) || devices[i].Vendor == "ATA")
+                if(string.IsNullOrEmpty(devices[i].Vendor) ||
+                   devices[i].Vendor == "ATA")
                     if(devices[i].Model != null)
                     {
                         string[] pieces = devices[i].Model.Split(' ');
+
                         if(pieces.Length > 1)
                         {
                             devices[i].Vendor = pieces[0];
@@ -122,7 +137,8 @@ namespace Aaru.Devices.Linux
                     else if(devices[i].Path.StartsWith("/dev/mmc", StringComparison.CurrentCulture))
                         devices[i].Bus = "MMC/SD";
                 }
-                else devices[i].Bus = devices[i].Bus.ToUpper();
+                else
+                    devices[i].Bus = devices[i].Bus.ToUpper();
 
                 switch(devices[i].Bus)
                 {
@@ -134,6 +150,7 @@ namespace Aaru.Devices.Linux
                     case "FireWire":
                     case "MMC/SD":
                         devices[i].Supported = true;
+
                         break;
                 }
             }
diff --git a/Aaru.Devices/Linux/Structs.cs b/Aaru.Devices/Linux/Structs.cs
index 27cb9eede..fac08b581 100644
--- a/Aaru.Devices/Linux/Structs.cs
+++ b/Aaru.Devices/Linux/Structs.cs
@@ -37,13 +37,10 @@ using System.Runtime.InteropServices;
 
 namespace Aaru.Devices.Linux
 {
-    [StructLayout(LayoutKind.Sequential)]
-    [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
-    struct SgIoHdrT
+    [StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
+    internal struct SgIoHdrT
     {
-        /// <summary>
-        ///     Always 'S' for SG v3
-        /// </summary>
+        /// <summary>Always 'S' for SG v3</summary>
         public int interface_id;                   /* [i] 'S' (required) */
         public ScsiIoctlDirection dxfer_direction; /* [i] */
         public byte               cmd_len;         /* [i] */
@@ -68,61 +65,43 @@ namespace Aaru.Devices.Linux
         public SgInfo             info;            /* [o] */
     }
 
-    [StructLayout(LayoutKind.Sequential)]
-    [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
-    struct MmcIocCmd
+    [StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
+    internal struct MmcIocCmd
     {
-        /// <summary>
-        ///     Implies direction of data. true = write, false = read
-        /// </summary>
+        /// <summary>Implies direction of data. true = write, false = read</summary>
         public bool write_flag;
-        /// <summary>
-        ///     Application-specific command. true = precede with CMD55
-        /// </summary>
+        /// <summary>Application-specific command. true = precede with CMD55</summary>
         public bool is_ascmd;
         public uint opcode;
         public uint arg;
-        /// <summary>
-        ///     CMD response
-        /// </summary>
+        /// <summary>CMD response</summary>
         [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
         public uint[] response;
         public MmcFlags flags;
         public uint     blksz;
         public uint     blocks;
         /// <summary>
-        ///     Sleep at least <see cref="postsleep_min_us" /> useconds, and at most
-        ///     <see cref="postsleep_max_us" /> useconds *after* issuing command.Needed for
-        ///     some read commands for which cards have no other way of indicating
-        ///     they're ready for the next command (i.e. there is no equivalent of
-        ///     a "busy" indicator for read operations).
+        ///     Sleep at least <see cref="postsleep_min_us" /> useconds, and at most <see cref="postsleep_max_us" /> useconds
+        ///     *after* issuing command.Needed for some read commands for which cards have no other way of indicating they're ready
+        ///     for the next command (i.e. there is no equivalent of a "busy" indicator for read operations).
         /// </summary>
         public uint postsleep_min_us;
         /// <summary>
-        ///     Sleep at least <see cref="postsleep_min_us" /> useconds, and at most
-        ///     <see cref="postsleep_max_us" /> useconds *after* issuing command.Needed for
-        ///     some read commands for which cards have no other way of indicating
-        ///     they're ready for the next command (i.e. there is no equivalent of
-        ///     a "busy" indicator for read operations).
+        ///     Sleep at least <see cref="postsleep_min_us" /> useconds, and at most <see cref="postsleep_max_us" /> useconds
+        ///     *after* issuing command.Needed for some read commands for which cards have no other way of indicating they're ready
+        ///     for the next command (i.e. there is no equivalent of a "busy" indicator for read operations).
         /// </summary>
         public uint postsleep_max_us;
-        /// <summary>
-        ///     Override driver-computed timeouts.
-        /// </summary>
+        /// <summary>Override driver-computed timeouts.</summary>
         public uint data_timeout_ns;
-        /// <summary>
-        ///     Override driver-computed timeouts.
-        /// </summary>
+        /// <summary>Override driver-computed timeouts.</summary>
         public uint cmd_timeout_ms;
         /// <summary>
-        ///     For 64-bit machines <see cref="data_ptr" /> , wants to
-        ///     be 8-byte aligned.Make sure this struct is the same size when
-        ///     built for 32-bit.
+        ///     For 64-bit machines <see cref="data_ptr" /> , wants to be 8-byte aligned.Make sure this struct is the same
+        ///     size when built for 32-bit.
         /// </summary>
         public uint __pad;
-        /// <summary>
-        ///     DAT buffer
-        /// </summary>
+        /// <summary>DAT buffer</summary>
         public ulong data_ptr;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Devices/Remote/Consts.cs b/Aaru.Devices/Remote/Consts.cs
index 8d1fd1de9..ecbe67dbb 100644
--- a/Aaru.Devices/Remote/Consts.cs
+++ b/Aaru.Devices/Remote/Consts.cs
@@ -2,9 +2,9 @@ namespace Aaru.Devices.Remote
 {
     public class Consts
     {
-        public const uint RemoteId = 0x52434944; // "DICR"
-        public const uint PacketId = 0x544B4350; // "PCKT"
-        public const int PacketVersion = 1;
-        public const int MaxProtocol = 1;
+        public const uint RemoteId      = 0x52434944; // "DICR"
+        public const uint PacketId      = 0x544B4350; // "PCKT"
+        public const int  PacketVersion = 1;
+        public const int  MaxProtocol   = 1;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Devices/Remote/Enums.cs b/Aaru.Devices/Remote/Enums.cs
index e89cc28ed..f08676eaf 100644
--- a/Aaru.Devices/Remote/Enums.cs
+++ b/Aaru.Devices/Remote/Enums.cs
@@ -2,43 +2,21 @@ namespace Aaru.Devices.Remote
 {
     public enum AaruPacketType : sbyte
     {
-        Nop = -1,
-        Hello = 1,
-        CommandListDevices = 2,
-        ResponseListDevices = 3,
-        CommandOpen = 4,
-        CommandScsi = 5,
-        ResponseScsi = 6,
-        CommandAtaChs = 7,
-        ResponseAtaChs = 8,
-        CommandAtaLba28 = 9,
-        ResponseAtaLba28 = 10,
-        CommandAtaLba48 = 11,
-        ResponseAtaLba48 = 12,
-        CommandSdhci = 13,
-        ResponseSdhci = 14,
-        CommandGetType = 15,
-        ResponseGetType = 16,
-        CommandGetSdhciRegisters = 17,
-        ResponseGetSdhciRegisters = 18,
-        CommandGetUsbData = 19,
-        ResponseGetUsbData = 20,
-        CommandGetFireWireData = 21,
-        ResponseGetFireWireData = 22,
-        CommandGetPcmciaData = 23,
-        ResponseGetPcmciaData = 24,
-        CommandCloseDevice = 25,
-        CommandAmIRoot = 26,
-        ResponseAmIRoot = 27
+        Nop                       = -1, Hello                   = 1, CommandListDevices        = 2,
+        ResponseListDevices       = 3, CommandOpen              = 4, CommandScsi               = 5,
+        ResponseScsi              = 6, CommandAtaChs            = 7, ResponseAtaChs            = 8,
+        CommandAtaLba28           = 9, ResponseAtaLba28         = 10, CommandAtaLba48          = 11,
+        ResponseAtaLba48          = 12, CommandSdhci            = 13, ResponseSdhci            = 14,
+        CommandGetType            = 15, ResponseGetType         = 16, CommandGetSdhciRegisters = 17,
+        ResponseGetSdhciRegisters = 18, CommandGetUsbData       = 19, ResponseGetUsbData       = 20,
+        CommandGetFireWireData    = 21, ResponseGetFireWireData = 22, CommandGetPcmciaData     = 23,
+        ResponseGetPcmciaData     = 24, CommandCloseDevice      = 25, CommandAmIRoot           = 26,
+        ResponseAmIRoot           = 27
     }
 
     public enum AaruNopReason : byte
     {
-        OutOfOrder = 0,
-        NotImplemented = 1,
-        NotRecognized = 2,
-        ErrorListDevices = 3,
-        OpenOk = 4,
-        OpenError = 5
+        OutOfOrder       = 0, NotImplemented = 1, NotRecognized = 2,
+        ErrorListDevices = 3, OpenOk         = 4, OpenError     = 5
     }
 }
\ No newline at end of file
diff --git a/Aaru.Devices/Remote/Remote.cs b/Aaru.Devices/Remote/Remote.cs
index 67b0acd78..4a894f8d4 100644
--- a/Aaru.Devices/Remote/Remote.cs
+++ b/Aaru.Devices/Remote/Remote.cs
@@ -16,18 +16,21 @@ namespace Aaru.Devices.Remote
 {
     public class Remote : IDisposable
     {
-        private readonly string _host;
-        private readonly Socket _socket;
+        readonly string _host;
+        readonly Socket _socket;
 
         public Remote(string host)
         {
             _host = host;
-            var ipHostEntry = Dns.GetHostEntry(host);
-            var ipAddress = ipHostEntry.AddressList.FirstOrDefault(a => a.AddressFamily == AddressFamily.InterNetwork);
+            IPHostEntry ipHostEntry = Dns.GetHostEntry(host);
 
-            if (ipAddress is null)
+            IPAddress ipAddress =
+                ipHostEntry.AddressList.FirstOrDefault(a => a.AddressFamily == AddressFamily.InterNetwork);
+
+            if(ipAddress is null)
             {
                 AaruConsole.ErrorWriteLine("Host not found");
+
                 throw new SocketException(11001);
             }
 
@@ -38,107 +41,112 @@ namespace Aaru.Devices.Remote
 
             AaruConsole.WriteLine("Connected to {0}", host);
 
-            var hdrBuf = new byte[Marshal.SizeOf<AaruPacketHeader>()];
+            byte[] hdrBuf = new byte[Marshal.SizeOf<AaruPacketHeader>()];
 
-            var len = Receive(_socket, hdrBuf, hdrBuf.Length, SocketFlags.Peek);
+            int len = Receive(_socket, hdrBuf, hdrBuf.Length, SocketFlags.Peek);
 
-            if (len < hdrBuf.Length)
+            if(len < hdrBuf.Length)
             {
                 AaruConsole.ErrorWriteLine("Could not read from the network...");
+
                 throw new IOException();
             }
 
-            var hdr = Marshal.ByteArrayToStructureLittleEndian<AaruPacketHeader>(hdrBuf);
+            AaruPacketHeader hdr = Marshal.ByteArrayToStructureLittleEndian<AaruPacketHeader>(hdrBuf);
 
-            if (hdr.remote_id != Consts.RemoteId || hdr.packet_id != Consts.PacketId)
+            if(hdr.remote_id != Consts.RemoteId ||
+               hdr.packet_id != Consts.PacketId)
             {
                 AaruConsole.ErrorWriteLine("Received data is not an Aaru Remote Packet...");
+
                 throw new ArgumentException();
             }
 
             byte[] buf;
 
-            if (hdr.packetType != AaruPacketType.Hello)
+            if(hdr.packetType != AaruPacketType.Hello)
             {
-                if (hdr.packetType != AaruPacketType.Nop)
+                if(hdr.packetType != AaruPacketType.Nop)
                 {
                     AaruConsole.ErrorWriteLine("Expected Hello Packet, got packet type {0}...", hdr.packetType);
+
                     throw new ArgumentException();
                 }
 
                 buf = new byte[hdr.len];
                 len = Receive(_socket, buf, buf.Length, SocketFlags.None);
 
-                if (len < buf.Length)
+                if(len < buf.Length)
                 {
                     AaruConsole.ErrorWriteLine("Could not read from the network...");
+
                     throw new IOException();
                 }
 
-                var nop = Marshal.ByteArrayToStructureLittleEndian<AaruPacketNop>(buf);
+                AaruPacketNop nop = Marshal.ByteArrayToStructureLittleEndian<AaruPacketNop>(buf);
 
                 AaruConsole.ErrorWriteLine($"{nop.reason}");
+
                 throw new ArgumentException();
             }
 
-            if (hdr.version != Consts.PacketVersion)
+            if(hdr.version != Consts.PacketVersion)
             {
                 AaruConsole.ErrorWriteLine("Unrecognized packet version...");
+
                 throw new ArgumentException();
             }
 
             buf = new byte[hdr.len];
             len = Receive(_socket, buf, buf.Length, SocketFlags.None);
 
-            if (len < buf.Length)
+            if(len < buf.Length)
             {
                 AaruConsole.ErrorWriteLine("Could not read from the network...");
+
                 throw new IOException();
             }
 
-            var serverHello = Marshal.ByteArrayToStructureLittleEndian<AaruPacketHello>(buf);
+            AaruPacketHello serverHello = Marshal.ByteArrayToStructureLittleEndian<AaruPacketHello>(buf);
 
-            ServerApplication = serverHello.application;
-            ServerVersion = serverHello.version;
-            ServerOperatingSystem = serverHello.sysname;
+            ServerApplication            = serverHello.application;
+            ServerVersion                = serverHello.version;
+            ServerOperatingSystem        = serverHello.sysname;
             ServerOperatingSystemVersion = serverHello.release;
-            ServerArchitecture = serverHello.machine;
-            ServerProtocolVersion = serverHello.maxProtocol;
+            ServerArchitecture           = serverHello.machine;
+            ServerProtocolVersion        = serverHello.maxProtocol;
 
             var clientHello = new AaruPacketHello
             {
-                application = "Aaru",
-                version = Version.GetVersion(),
-                maxProtocol = Consts.MaxProtocol,
-                sysname = DetectOS.GetPlatformName(
-                    DetectOS.GetRealPlatformID(), DetectOS.GetVersion()),
-                release = DetectOS.GetVersion(),
-                machine = RuntimeInformation.ProcessArchitecture.ToString(),
-                hdr = new AaruPacketHeader
-                {
-                    remote_id = Consts.RemoteId, packet_id = Consts.PacketId,
-                    len = (uint) Marshal.SizeOf<AaruPacketHello>(),
-                    version = Consts.PacketVersion,
-                    packetType = AaruPacketType.Hello
-                }
+                application = "Aaru", version = Version.GetVersion(), maxProtocol = Consts.MaxProtocol,
+                sysname     = DetectOS.GetPlatformName(DetectOS.GetRealPlatformID(), DetectOS.GetVersion()),
+                release     = DetectOS.GetVersion(), machine = RuntimeInformation.ProcessArchitecture.ToString(), hdr =
+                    new AaruPacketHeader
+                    {
+                        remote_id  = Consts.RemoteId, packet_id                       = Consts.PacketId,
+                        len        = (uint)Marshal.SizeOf<AaruPacketHello>(), version = Consts.PacketVersion,
+                        packetType = AaruPacketType.Hello
+                    }
             };
 
             buf = Marshal.StructureToByteArrayLittleEndian(clientHello);
 
             len = _socket.Send(buf, SocketFlags.None);
 
-            if (len >= buf.Length) return;
+            if(len >= buf.Length)
+                return;
 
             AaruConsole.ErrorWriteLine("Could not write to the network...");
+
             throw new IOException();
         }
 
-        public string ServerApplication { get; }
-        public string ServerVersion { get; }
-        public string ServerOperatingSystem { get; }
+        public string ServerApplication            { get; }
+        public string ServerVersion                { get; }
+        public string ServerOperatingSystem        { get; }
         public string ServerOperatingSystemVersion { get; }
-        public string ServerArchitecture { get; }
-        public int ServerProtocolVersion { get; }
+        public string ServerArchitecture           { get; }
+        public int    ServerProtocolVersion        { get; }
 
         public bool IsRoot
         {
@@ -148,67 +156,69 @@ namespace Aaru.Devices.Remote
                 {
                     hdr = new AaruPacketHeader
                     {
-                        remote_id = Consts.RemoteId, packet_id = Consts.PacketId,
-                        len = (uint) Marshal.SizeOf<AaruPacketCmdAmIRoot>(),
-                        version = Consts.PacketVersion,
+                        remote_id  = Consts.RemoteId, packet_id                            = Consts.PacketId,
+                        len        = (uint)Marshal.SizeOf<AaruPacketCmdAmIRoot>(), version = Consts.PacketVersion,
                         packetType = AaruPacketType.CommandAmIRoot
                     }
                 };
 
-                var buf = Marshal.StructureToByteArrayLittleEndian(cmdPkt);
+                byte[] buf = Marshal.StructureToByteArrayLittleEndian(cmdPkt);
 
-                var len = _socket.Send(buf, SocketFlags.None);
+                int len = _socket.Send(buf, SocketFlags.None);
 
-                if (len != buf.Length)
+                if(len != buf.Length)
                 {
                     AaruConsole.ErrorWriteLine("Could not write to the network...");
+
                     return false;
                 }
 
-                var hdrBuf = new byte[Marshal.SizeOf<AaruPacketHeader>()];
+                byte[] hdrBuf = new byte[Marshal.SizeOf<AaruPacketHeader>()];
 
                 len = Receive(_socket, hdrBuf, hdrBuf.Length, SocketFlags.Peek);
 
-                if (len < hdrBuf.Length)
+                if(len < hdrBuf.Length)
                 {
                     AaruConsole.ErrorWriteLine("Could not read from the network...");
+
                     return false;
                 }
 
-                var hdr = Marshal.ByteArrayToStructureLittleEndian<AaruPacketHeader>(hdrBuf);
+                AaruPacketHeader hdr = Marshal.ByteArrayToStructureLittleEndian<AaruPacketHeader>(hdrBuf);
 
-                if (hdr.remote_id != Consts.RemoteId || hdr.packet_id != Consts.PacketId)
+                if(hdr.remote_id != Consts.RemoteId ||
+                   hdr.packet_id != Consts.PacketId)
                 {
                     AaruConsole.ErrorWriteLine("Received data is not an Aaru Remote Packet...");
+
                     return false;
                 }
 
-                if (hdr.packetType != AaruPacketType.ResponseAmIRoot)
+                if(hdr.packetType != AaruPacketType.ResponseAmIRoot)
                 {
                     AaruConsole.ErrorWriteLine("Expected Am I Root? Response Packet, got packet type {0}...",
-                        hdr.packetType);
+                                               hdr.packetType);
+
                     return false;
                 }
 
                 buf = new byte[hdr.len];
                 len = Receive(_socket, buf, buf.Length, SocketFlags.None);
 
-                if (len < buf.Length)
+                if(len < buf.Length)
                 {
                     AaruConsole.ErrorWriteLine("Could not read from the network...");
+
                     return false;
                 }
 
-                var res = Marshal.ByteArrayToStructureLittleEndian<AaruPacketResAmIRoot>(buf);
+                AaruPacketResAmIRoot res = Marshal.ByteArrayToStructureLittleEndian<AaruPacketResAmIRoot>(buf);
 
                 return res.am_i_root != 0;
             }
         }
 
-        public void Dispose()
-        {
-            Disconnect();
-        }
+        public void Dispose() => Disconnect();
 
         public void Disconnect()
         {
@@ -222,89 +232,98 @@ namespace Aaru.Devices.Remote
             {
                 hdr = new AaruPacketHeader
                 {
-                    remote_id = Consts.RemoteId, packet_id = Consts.PacketId,
-                    len = (uint) Marshal.SizeOf<AaruPacketCommandListDevices>(),
-                    version = Consts.PacketVersion,
+                    remote_id  = Consts.RemoteId, packet_id                                    = Consts.PacketId,
+                    len        = (uint)Marshal.SizeOf<AaruPacketCommandListDevices>(), version = Consts.PacketVersion,
                     packetType = AaruPacketType.CommandListDevices
                 }
             };
 
-            var buf = Marshal.StructureToByteArrayLittleEndian(cmdPkt);
+            byte[] buf = Marshal.StructureToByteArrayLittleEndian(cmdPkt);
 
-            var len = _socket.Send(buf, SocketFlags.None);
+            int len = _socket.Send(buf, SocketFlags.None);
 
-            if (len != buf.Length)
+            if(len != buf.Length)
             {
                 AaruConsole.ErrorWriteLine("Could not write to the network...");
 
                 return new DeviceInfo[0];
             }
 
-            var hdrBuf = new byte[Marshal.SizeOf<AaruPacketHeader>()];
+            byte[] hdrBuf = new byte[Marshal.SizeOf<AaruPacketHeader>()];
 
             len = Receive(_socket, hdrBuf, hdrBuf.Length, SocketFlags.Peek);
 
-            if (len < hdrBuf.Length)
+            if(len < hdrBuf.Length)
             {
                 AaruConsole.ErrorWriteLine("Could not read from the network...");
+
                 return new DeviceInfo[0];
             }
 
-            var hdr = Marshal.ByteArrayToStructureLittleEndian<AaruPacketHeader>(hdrBuf);
+            AaruPacketHeader hdr = Marshal.ByteArrayToStructureLittleEndian<AaruPacketHeader>(hdrBuf);
 
-            if (hdr.remote_id != Consts.RemoteId || hdr.packet_id != Consts.PacketId)
+            if(hdr.remote_id != Consts.RemoteId ||
+               hdr.packet_id != Consts.PacketId)
             {
                 AaruConsole.ErrorWriteLine("Received data is not an Aaru Remote Packet...");
+
                 return new DeviceInfo[0];
             }
 
-            if (hdr.packetType != AaruPacketType.ResponseListDevices)
+            if(hdr.packetType != AaruPacketType.ResponseListDevices)
             {
-                if (hdr.packetType != AaruPacketType.Nop)
+                if(hdr.packetType != AaruPacketType.Nop)
                 {
                     AaruConsole.ErrorWriteLine("Expected List Devices Response Packet, got packet type {0}...",
-                        hdr.packetType);
+                                               hdr.packetType);
+
                     return new DeviceInfo[0];
                 }
 
                 buf = new byte[hdr.len];
                 len = Receive(_socket, buf, buf.Length, SocketFlags.None);
 
-                if (len < buf.Length)
+                if(len < buf.Length)
                 {
                     AaruConsole.ErrorWriteLine("Could not read from the network...");
+
                     return new DeviceInfo[0];
                 }
 
-                var nop = Marshal.ByteArrayToStructureLittleEndian<AaruPacketNop>(buf);
+                AaruPacketNop nop = Marshal.ByteArrayToStructureLittleEndian<AaruPacketNop>(buf);
 
                 AaruConsole.ErrorWriteLine($"{nop.reason}");
+
                 return new DeviceInfo[0];
             }
 
-            if (hdr.version != Consts.PacketVersion)
+            if(hdr.version != Consts.PacketVersion)
             {
                 AaruConsole.ErrorWriteLine("Unrecognized packet version...");
+
                 return new DeviceInfo[0];
             }
 
             buf = new byte[hdr.len];
             len = Receive(_socket, buf, buf.Length, SocketFlags.None);
 
-            if (len < buf.Length)
+            if(len < buf.Length)
             {
                 AaruConsole.ErrorWriteLine("Could not read from the network...");
+
                 return new DeviceInfo[0];
             }
 
-            var response = Marshal.ByteArrayToStructureLittleEndian<AaruPacketResponseListDevices>(buf);
-            var devices = new List<DeviceInfo>();
-            var offset = Marshal.SizeOf<AaruPacketResponseListDevices>();
-            var devInfoLen = Marshal.SizeOf<DeviceInfo>();
+            AaruPacketResponseListDevices response =
+                Marshal.ByteArrayToStructureLittleEndian<AaruPacketResponseListDevices>(buf);
 
-            for (ushort i = 0; i < response.devices; i++)
+            List<DeviceInfo> devices    = new List<DeviceInfo>();
+            int              offset     = Marshal.SizeOf<AaruPacketResponseListDevices>();
+            int              devInfoLen = Marshal.SizeOf<DeviceInfo>();
+
+            for(ushort i = 0; i < response.devices; i++)
             {
-                var dev = Marshal.ByteArrayToStructureLittleEndian<DeviceInfo>(buf, offset, devInfoLen);
+                DeviceInfo dev = Marshal.ByteArrayToStructureLittleEndian<DeviceInfo>(buf, offset, devInfoLen);
                 dev.Path = dev.Path[0] == '/' ? $"dic://{_host}{dev.Path}" : $"dic://{_host}/{dev.Path}";
                 devices.Add(dev);
                 offset += devInfoLen;
@@ -321,536 +340,542 @@ namespace Aaru.Devices.Remote
             {
                 hdr = new AaruPacketHeader
                 {
-                    remote_id = Consts.RemoteId, packet_id = Consts.PacketId,
-                    len = (uint) Marshal.SizeOf<AaruPacketCommandOpenDevice>(),
-                    version = Consts.PacketVersion,
+                    remote_id  = Consts.RemoteId, packet_id                                   = Consts.PacketId,
+                    len        = (uint)Marshal.SizeOf<AaruPacketCommandOpenDevice>(), version = Consts.PacketVersion,
                     packetType = AaruPacketType.CommandOpen
                 },
                 device_path = devicePath
             };
 
-            var buf = Marshal.StructureToByteArrayLittleEndian(cmdPkt);
+            byte[] buf = Marshal.StructureToByteArrayLittleEndian(cmdPkt);
 
-            var len = _socket.Send(buf, SocketFlags.None);
+            int len = _socket.Send(buf, SocketFlags.None);
 
-            if (len != buf.Length)
+            if(len != buf.Length)
             {
                 AaruConsole.ErrorWriteLine("Could not write to the network...");
                 lastError = -1;
+
                 return false;
             }
 
-            var hdrBuf = new byte[Marshal.SizeOf<AaruPacketHeader>()];
+            byte[] hdrBuf = new byte[Marshal.SizeOf<AaruPacketHeader>()];
 
             len = Receive(_socket, hdrBuf, hdrBuf.Length, SocketFlags.Peek);
 
-            if (len < hdrBuf.Length)
+            if(len < hdrBuf.Length)
             {
                 AaruConsole.ErrorWriteLine("Could not read from the network...");
                 lastError = -1;
+
                 return false;
             }
 
-            var hdr = Marshal.ByteArrayToStructureLittleEndian<AaruPacketHeader>(hdrBuf);
+            AaruPacketHeader hdr = Marshal.ByteArrayToStructureLittleEndian<AaruPacketHeader>(hdrBuf);
 
-            if (hdr.remote_id != Consts.RemoteId || hdr.packet_id != Consts.PacketId)
+            if(hdr.remote_id != Consts.RemoteId ||
+               hdr.packet_id != Consts.PacketId)
             {
                 AaruConsole.ErrorWriteLine("Received data is not an Aaru Remote Packet...");
                 lastError = -1;
+
                 return false;
             }
 
-            if (hdr.packetType != AaruPacketType.Nop)
+            if(hdr.packetType != AaruPacketType.Nop)
             {
                 AaruConsole.ErrorWriteLine("Expected List Devices Response Packet, got packet type {0}...",
-                    hdr.packetType);
+                                           hdr.packetType);
+
                 lastError = -1;
+
                 return false;
             }
 
             buf = new byte[hdr.len];
             len = Receive(_socket, buf, buf.Length, SocketFlags.None);
 
-            if (len < buf.Length)
+            if(len < buf.Length)
             {
                 AaruConsole.ErrorWriteLine("Could not read from the network...");
                 lastError = -1;
+
                 return false;
             }
 
-            var nop = Marshal.ByteArrayToStructureLittleEndian<AaruPacketNop>(buf);
+            AaruPacketNop nop = Marshal.ByteArrayToStructureLittleEndian<AaruPacketNop>(buf);
 
-            switch (nop.reasonCode)
+            switch(nop.reasonCode)
             {
-                case AaruNopReason.OpenOk:
-                    return true;
-                case AaruNopReason.NotImplemented:
-                    throw new NotImplementedException($"{nop.reason}");
+                case AaruNopReason.OpenOk:         return true;
+                case AaruNopReason.NotImplemented: throw new NotImplementedException($"{nop.reason}");
             }
 
             AaruConsole.ErrorWriteLine($"{nop.reason}");
             lastError = nop.errno;
+
             return false;
         }
 
         public int SendScsiCommand(byte[] cdb, ref byte[] buffer, out byte[] senseBuffer, uint timeout,
-            ScsiDirection direction, out double duration, out bool sense)
+                                   ScsiDirection direction, out double duration, out bool sense)
         {
             senseBuffer = null;
-            duration = 0;
-            sense = true;
+            duration    = 0;
+            sense       = true;
 
             var cmdPkt = new AaruPacketCmdScsi
             {
                 hdr = new AaruPacketHeader
                 {
-                    remote_id = Consts.RemoteId, packet_id = Consts.PacketId,
-                    version = Consts.PacketVersion,
+                    remote_id  = Consts.RemoteId, packet_id = Consts.PacketId, version = Consts.PacketVersion,
                     packetType = AaruPacketType.CommandScsi
                 },
-                direction = (int) direction,
-                timeout = timeout * 1000
+                direction = (int)direction, timeout = timeout * 1000
             };
 
-            if (cdb != null)
-                cmdPkt.cdb_len = (uint) cdb.Length;
-            if (buffer != null)
-                cmdPkt.buf_len = (uint) buffer.Length;
+            if(cdb != null)
+                cmdPkt.cdb_len = (uint)cdb.Length;
 
-            cmdPkt.hdr.len = (uint) (Marshal.SizeOf<AaruPacketCmdScsi>() + cmdPkt.cdb_len + cmdPkt.buf_len);
+            if(buffer != null)
+                cmdPkt.buf_len = (uint)buffer.Length;
 
-            var pktBuf = Marshal.StructureToByteArrayLittleEndian(cmdPkt);
-            var buf = new byte[cmdPkt.hdr.len];
+            cmdPkt.hdr.len = (uint)(Marshal.SizeOf<AaruPacketCmdScsi>() + cmdPkt.cdb_len + cmdPkt.buf_len);
+
+            byte[] pktBuf = Marshal.StructureToByteArrayLittleEndian(cmdPkt);
+            byte[] buf    = new byte[cmdPkt.hdr.len];
 
             Array.Copy(pktBuf, 0, buf, 0, Marshal.SizeOf<AaruPacketCmdScsi>());
 
-            if (cdb != null)
+            if(cdb != null)
                 Array.Copy(cdb, 0, buf, Marshal.SizeOf<AaruPacketCmdScsi>(), cmdPkt.cdb_len);
-            if (buffer != null)
+
+            if(buffer != null)
                 Array.Copy(buffer, 0, buf, Marshal.SizeOf<AaruPacketCmdScsi>() + cmdPkt.cdb_len, cmdPkt.buf_len);
 
-            var len = _socket.Send(buf, SocketFlags.None);
+            int len = _socket.Send(buf, SocketFlags.None);
 
-            if (len != buf.Length)
+            if(len != buf.Length)
             {
                 AaruConsole.ErrorWriteLine("Could not write to the network...");
+
                 return -1;
             }
 
-            var hdrBuf = new byte[Marshal.SizeOf<AaruPacketHeader>()];
+            byte[] hdrBuf = new byte[Marshal.SizeOf<AaruPacketHeader>()];
 
             len = Receive(_socket, hdrBuf, hdrBuf.Length, SocketFlags.Peek);
 
-            if (len < hdrBuf.Length)
+            if(len < hdrBuf.Length)
             {
                 AaruConsole.ErrorWriteLine("Could not read from the network...");
+
                 return -1;
             }
 
-            var hdr = Marshal.ByteArrayToStructureLittleEndian<AaruPacketHeader>(hdrBuf);
+            AaruPacketHeader hdr = Marshal.ByteArrayToStructureLittleEndian<AaruPacketHeader>(hdrBuf);
 
-            if (hdr.remote_id != Consts.RemoteId || hdr.packet_id != Consts.PacketId)
+            if(hdr.remote_id != Consts.RemoteId ||
+               hdr.packet_id != Consts.PacketId)
             {
                 AaruConsole.ErrorWriteLine("Received data is not an Aaru Remote Packet...");
+
                 return -1;
             }
 
-            if (hdr.packetType != AaruPacketType.ResponseScsi)
+            if(hdr.packetType != AaruPacketType.ResponseScsi)
             {
-                AaruConsole.ErrorWriteLine("Expected SCSI Response Packet, got packet type {0}...",
-                    hdr.packetType);
+                AaruConsole.ErrorWriteLine("Expected SCSI Response Packet, got packet type {0}...", hdr.packetType);
+
                 return -1;
             }
 
             buf = new byte[hdr.len];
             len = Receive(_socket, buf, buf.Length, SocketFlags.None);
 
-            if (len < buf.Length)
+            if(len < buf.Length)
             {
                 AaruConsole.ErrorWriteLine("Could not read from the network...");
+
                 return -1;
             }
 
-            var res = Marshal.ByteArrayToStructureLittleEndian<AaruPacketResScsi>(buf);
+            AaruPacketResScsi res = Marshal.ByteArrayToStructureLittleEndian<AaruPacketResScsi>(buf);
 
             senseBuffer = new byte[res.sense_len];
             Array.Copy(buf, Marshal.SizeOf<AaruPacketResScsi>(), senseBuffer, 0, res.sense_len);
             buffer = new byte[res.buf_len];
             Array.Copy(buf, Marshal.SizeOf<AaruPacketResScsi>() + res.sense_len, buffer, 0, res.buf_len);
             duration = res.duration;
-            sense = res.sense != 0;
+            sense    = res.sense != 0;
 
-            return (int) res.error_no;
+            return (int)res.error_no;
         }
 
         public int SendAtaCommand(AtaRegistersChs registers, out AtaErrorRegistersChs errorRegisters,
-            AtaProtocol protocol, AtaTransferRegister transferRegister,
-            ref byte[] buffer,
-            uint timeout, bool transferBlocks,
-            out double duration, out bool sense)
+                                  AtaProtocol protocol, AtaTransferRegister transferRegister, ref byte[] buffer,
+                                  uint timeout, bool transferBlocks, out double duration, out bool sense)
         {
-            duration = 0;
-            sense = true;
+            duration       = 0;
+            sense          = true;
             errorRegisters = new AtaErrorRegistersChs();
 
             var cmdPkt = new AaruPacketCmdAtaChs
             {
                 hdr = new AaruPacketHeader
                 {
-                    remote_id = Consts.RemoteId, packet_id = Consts.PacketId,
-                    version = Consts.PacketVersion,
+                    remote_id  = Consts.RemoteId, packet_id = Consts.PacketId, version = Consts.PacketVersion,
                     packetType = AaruPacketType.CommandAtaChs
                 },
-                registers = registers,
-                protocol = (byte) protocol,
-                transferRegister = (byte) transferRegister,
-                transferBlocks = transferBlocks,
-                timeout = timeout * 1000
+                registers      = registers, protocol     = (byte)protocol, transferRegister = (byte)transferRegister,
+                transferBlocks = transferBlocks, timeout = timeout * 1000
             };
 
-            if (buffer != null)
-                cmdPkt.buf_len = (uint) buffer.Length;
+            if(buffer != null)
+                cmdPkt.buf_len = (uint)buffer.Length;
 
-            cmdPkt.hdr.len = (uint) (Marshal.SizeOf<AaruPacketCmdAtaChs>() + cmdPkt.buf_len);
+            cmdPkt.hdr.len = (uint)(Marshal.SizeOf<AaruPacketCmdAtaChs>() + cmdPkt.buf_len);
 
-            var pktBuf = Marshal.StructureToByteArrayLittleEndian(cmdPkt);
-            var buf = new byte[cmdPkt.hdr.len];
+            byte[] pktBuf = Marshal.StructureToByteArrayLittleEndian(cmdPkt);
+            byte[] buf    = new byte[cmdPkt.hdr.len];
 
             Array.Copy(pktBuf, 0, buf, 0, Marshal.SizeOf<AaruPacketCmdAtaChs>());
 
-            if (buffer != null)
+            if(buffer != null)
                 Array.Copy(buffer, 0, buf, Marshal.SizeOf<AaruPacketCmdAtaChs>(), cmdPkt.buf_len);
 
-            var len = _socket.Send(buf, SocketFlags.None);
+            int len = _socket.Send(buf, SocketFlags.None);
 
-            if (len != buf.Length)
+            if(len != buf.Length)
             {
                 AaruConsole.ErrorWriteLine("Could not write to the network...");
+
                 return -1;
             }
 
-            var hdrBuf = new byte[Marshal.SizeOf<AaruPacketHeader>()];
+            byte[] hdrBuf = new byte[Marshal.SizeOf<AaruPacketHeader>()];
 
             len = Receive(_socket, hdrBuf, hdrBuf.Length, SocketFlags.Peek);
 
-            if (len < hdrBuf.Length)
+            if(len < hdrBuf.Length)
             {
                 AaruConsole.ErrorWriteLine("Could not read from the network...");
+
                 return -1;
             }
 
-            var hdr = Marshal.ByteArrayToStructureLittleEndian<AaruPacketHeader>(hdrBuf);
+            AaruPacketHeader hdr = Marshal.ByteArrayToStructureLittleEndian<AaruPacketHeader>(hdrBuf);
 
-            if (hdr.remote_id != Consts.RemoteId || hdr.packet_id != Consts.PacketId)
+            if(hdr.remote_id != Consts.RemoteId ||
+               hdr.packet_id != Consts.PacketId)
             {
                 AaruConsole.ErrorWriteLine("Received data is not an Aaru Remote Packet...");
+
                 return -1;
             }
 
-            if (hdr.packetType != AaruPacketType.ResponseAtaChs)
+            if(hdr.packetType != AaruPacketType.ResponseAtaChs)
             {
-                AaruConsole.ErrorWriteLine("Expected ATA CHS Response Packet, got packet type {0}...",
-                    hdr.packetType);
+                AaruConsole.ErrorWriteLine("Expected ATA CHS Response Packet, got packet type {0}...", hdr.packetType);
+
                 return -1;
             }
 
             buf = new byte[hdr.len];
             len = Receive(_socket, buf, buf.Length, SocketFlags.None);
 
-            if (len < buf.Length)
+            if(len < buf.Length)
             {
                 AaruConsole.ErrorWriteLine("Could not read from the network...");
+
                 return -1;
             }
 
-            var res = Marshal.ByteArrayToStructureLittleEndian<AaruPacketResAtaChs>(buf);
+            AaruPacketResAtaChs res = Marshal.ByteArrayToStructureLittleEndian<AaruPacketResAtaChs>(buf);
 
             buffer = new byte[res.buf_len];
             Array.Copy(buf, Marshal.SizeOf<AaruPacketResAtaChs>(), buffer, 0, res.buf_len);
-            duration = res.duration;
-            sense = res.sense != 0;
+            duration       = res.duration;
+            sense          = res.sense != 0;
             errorRegisters = res.registers;
 
-            return (int) res.error_no;
+            return (int)res.error_no;
         }
 
         public int SendAtaCommand(AtaRegistersLba28 registers, out AtaErrorRegistersLba28 errorRegisters,
-            AtaProtocol protocol, AtaTransferRegister transferRegister,
-            ref byte[] buffer,
-            uint timeout, bool transferBlocks,
-            out double duration, out bool sense)
+                                  AtaProtocol protocol, AtaTransferRegister transferRegister, ref byte[] buffer,
+                                  uint timeout, bool transferBlocks, out double duration, out bool sense)
         {
-            duration = 0;
-            sense = true;
+            duration       = 0;
+            sense          = true;
             errorRegisters = new AtaErrorRegistersLba28();
 
             var cmdPkt = new AaruPacketCmdAtaLba28
             {
                 hdr = new AaruPacketHeader
                 {
-                    remote_id = Consts.RemoteId, packet_id = Consts.PacketId,
-                    version = Consts.PacketVersion,
+                    remote_id  = Consts.RemoteId, packet_id = Consts.PacketId, version = Consts.PacketVersion,
                     packetType = AaruPacketType.CommandAtaLba28
                 },
-                registers = registers,
-                protocol = (byte) protocol,
-                transferRegister = (byte) transferRegister,
-                transferBlocks = transferBlocks,
-                timeout = timeout * 1000
+                registers      = registers, protocol     = (byte)protocol, transferRegister = (byte)transferRegister,
+                transferBlocks = transferBlocks, timeout = timeout * 1000
             };
 
-            if (buffer != null)
-                cmdPkt.buf_len = (uint) buffer.Length;
+            if(buffer != null)
+                cmdPkt.buf_len = (uint)buffer.Length;
 
-            cmdPkt.hdr.len = (uint) (Marshal.SizeOf<AaruPacketCmdAtaLba28>() + cmdPkt.buf_len);
+            cmdPkt.hdr.len = (uint)(Marshal.SizeOf<AaruPacketCmdAtaLba28>() + cmdPkt.buf_len);
 
-            var pktBuf = Marshal.StructureToByteArrayLittleEndian(cmdPkt);
-            var buf = new byte[cmdPkt.hdr.len];
+            byte[] pktBuf = Marshal.StructureToByteArrayLittleEndian(cmdPkt);
+            byte[] buf    = new byte[cmdPkt.hdr.len];
 
             Array.Copy(pktBuf, 0, buf, 0, Marshal.SizeOf<AaruPacketCmdAtaLba28>());
 
-            if (buffer != null)
+            if(buffer != null)
                 Array.Copy(buffer, 0, buf, Marshal.SizeOf<AaruPacketCmdAtaLba28>(), cmdPkt.buf_len);
 
-            var len = _socket.Send(buf, SocketFlags.None);
+            int len = _socket.Send(buf, SocketFlags.None);
 
-            if (len != buf.Length)
+            if(len != buf.Length)
             {
                 AaruConsole.ErrorWriteLine("Could not write to the network...");
+
                 return -1;
             }
 
-            var hdrBuf = new byte[Marshal.SizeOf<AaruPacketHeader>()];
+            byte[] hdrBuf = new byte[Marshal.SizeOf<AaruPacketHeader>()];
 
             len = Receive(_socket, hdrBuf, hdrBuf.Length, SocketFlags.Peek);
 
-            if (len < hdrBuf.Length)
+            if(len < hdrBuf.Length)
             {
                 AaruConsole.ErrorWriteLine("Could not read from the network...");
+
                 return -1;
             }
 
-            var hdr = Marshal.ByteArrayToStructureLittleEndian<AaruPacketHeader>(hdrBuf);
+            AaruPacketHeader hdr = Marshal.ByteArrayToStructureLittleEndian<AaruPacketHeader>(hdrBuf);
 
-            if (hdr.remote_id != Consts.RemoteId || hdr.packet_id != Consts.PacketId)
+            if(hdr.remote_id != Consts.RemoteId ||
+               hdr.packet_id != Consts.PacketId)
             {
                 AaruConsole.ErrorWriteLine("Received data is not an Aaru Remote Packet...");
+
                 return -1;
             }
 
-            if (hdr.packetType != AaruPacketType.ResponseAtaLba28)
+            if(hdr.packetType != AaruPacketType.ResponseAtaLba28)
             {
                 AaruConsole.ErrorWriteLine("Expected ATA LBA28 Response Packet, got packet type {0}...",
-                    hdr.packetType);
+                                           hdr.packetType);
+
                 return -1;
             }
 
             buf = new byte[hdr.len];
             len = Receive(_socket, buf, buf.Length, SocketFlags.None);
 
-            if (len < buf.Length)
+            if(len < buf.Length)
             {
                 AaruConsole.ErrorWriteLine("Could not read from the network...");
+
                 return -1;
             }
 
-            var res = Marshal.ByteArrayToStructureLittleEndian<AaruPacketResAtaLba28>(buf);
+            AaruPacketResAtaLba28 res = Marshal.ByteArrayToStructureLittleEndian<AaruPacketResAtaLba28>(buf);
 
             buffer = new byte[res.buf_len];
             Array.Copy(buf, Marshal.SizeOf<AaruPacketResAtaLba28>(), buffer, 0, res.buf_len);
-            duration = res.duration;
-            sense = res.sense != 0;
+            duration       = res.duration;
+            sense          = res.sense != 0;
             errorRegisters = res.registers;
 
-            return (int) res.error_no;
+            return (int)res.error_no;
         }
 
         public int SendAtaCommand(AtaRegistersLba48 registers, out AtaErrorRegistersLba48 errorRegisters,
-            AtaProtocol protocol, AtaTransferRegister transferRegister,
-            ref byte[] buffer,
-            uint timeout, bool transferBlocks,
-            out double duration, out bool sense)
+                                  AtaProtocol protocol, AtaTransferRegister transferRegister, ref byte[] buffer,
+                                  uint timeout, bool transferBlocks, out double duration, out bool sense)
         {
-            duration = 0;
-            sense = true;
+            duration       = 0;
+            sense          = true;
             errorRegisters = new AtaErrorRegistersLba48();
 
             var cmdPkt = new AaruPacketCmdAtaLba48
             {
                 hdr = new AaruPacketHeader
                 {
-                    remote_id = Consts.RemoteId, packet_id = Consts.PacketId,
-                    version = Consts.PacketVersion,
+                    remote_id  = Consts.RemoteId, packet_id = Consts.PacketId, version = Consts.PacketVersion,
                     packetType = AaruPacketType.CommandAtaLba48
                 },
-                registers = registers,
-                protocol = (byte) protocol,
-                transferRegister = (byte) transferRegister,
-                transferBlocks = transferBlocks,
-                timeout = timeout * 1000
+                registers      = registers, protocol     = (byte)protocol, transferRegister = (byte)transferRegister,
+                transferBlocks = transferBlocks, timeout = timeout * 1000
             };
 
-            if (buffer != null)
-                cmdPkt.buf_len = (uint) buffer.Length;
+            if(buffer != null)
+                cmdPkt.buf_len = (uint)buffer.Length;
 
-            cmdPkt.hdr.len = (uint) (Marshal.SizeOf<AaruPacketCmdAtaLba48>() + cmdPkt.buf_len);
+            cmdPkt.hdr.len = (uint)(Marshal.SizeOf<AaruPacketCmdAtaLba48>() + cmdPkt.buf_len);
 
-            var pktBuf = Marshal.StructureToByteArrayLittleEndian(cmdPkt);
-            var buf = new byte[cmdPkt.hdr.len];
+            byte[] pktBuf = Marshal.StructureToByteArrayLittleEndian(cmdPkt);
+            byte[] buf    = new byte[cmdPkt.hdr.len];
 
             Array.Copy(pktBuf, 0, buf, 0, Marshal.SizeOf<AaruPacketCmdAtaLba48>());
 
-            if (buffer != null)
+            if(buffer != null)
                 Array.Copy(buffer, 0, buf, Marshal.SizeOf<AaruPacketCmdAtaLba48>(), cmdPkt.buf_len);
 
-            var len = _socket.Send(buf, SocketFlags.None);
+            int len = _socket.Send(buf, SocketFlags.None);
 
-            if (len != buf.Length)
+            if(len != buf.Length)
             {
                 AaruConsole.ErrorWriteLine("Could not write to the network...");
+
                 return -1;
             }
 
-            var hdrBuf = new byte[Marshal.SizeOf<AaruPacketHeader>()];
+            byte[] hdrBuf = new byte[Marshal.SizeOf<AaruPacketHeader>()];
 
             len = Receive(_socket, hdrBuf, hdrBuf.Length, SocketFlags.Peek);
 
-            if (len < hdrBuf.Length)
+            if(len < hdrBuf.Length)
             {
                 AaruConsole.ErrorWriteLine("Could not read from the network...");
+
                 return -1;
             }
 
-            var hdr = Marshal.ByteArrayToStructureLittleEndian<AaruPacketHeader>(hdrBuf);
+            AaruPacketHeader hdr = Marshal.ByteArrayToStructureLittleEndian<AaruPacketHeader>(hdrBuf);
 
-            if (hdr.remote_id != Consts.RemoteId || hdr.packet_id != Consts.PacketId)
+            if(hdr.remote_id != Consts.RemoteId ||
+               hdr.packet_id != Consts.PacketId)
             {
                 AaruConsole.ErrorWriteLine("Received data is not an Aaru Remote Packet...");
+
                 return -1;
             }
 
-            if (hdr.packetType != AaruPacketType.ResponseAtaLba48)
+            if(hdr.packetType != AaruPacketType.ResponseAtaLba48)
             {
                 AaruConsole.ErrorWriteLine("Expected ATA LBA48 Response Packet, got packet type {0}...",
-                    hdr.packetType);
+                                           hdr.packetType);
+
                 return -1;
             }
 
             buf = new byte[hdr.len];
             len = Receive(_socket, buf, buf.Length, SocketFlags.None);
 
-            if (len < buf.Length)
+            if(len < buf.Length)
             {
                 AaruConsole.ErrorWriteLine("Could not read from the network...");
+
                 return -1;
             }
 
-            var res = Marshal.ByteArrayToStructureLittleEndian<AaruPacketResAtaLba48>(buf);
+            AaruPacketResAtaLba48 res = Marshal.ByteArrayToStructureLittleEndian<AaruPacketResAtaLba48>(buf);
 
             buffer = new byte[res.buf_len];
             Array.Copy(buf, Marshal.SizeOf<AaruPacketResAtaLba48>(), buffer, 0, res.buf_len);
-            duration = res.duration;
-            sense = res.sense != 0;
+            duration       = res.duration;
+            sense          = res.sense != 0;
             errorRegisters = res.registers;
 
-            return (int) res.error_no;
+            return (int)res.error_no;
         }
 
-        public int SendMmcCommand(MmcCommands command, bool write, bool isApplication, MmcFlags flags,
-            uint argument,
-            uint blockSize, uint blocks, ref byte[] buffer, out uint[] response,
-            out double duration, out bool sense, uint timeout = 0)
+        public int SendMmcCommand(MmcCommands command, bool write, bool isApplication, MmcFlags flags, uint argument,
+                                  uint blockSize, uint blocks, ref byte[] buffer, out uint[] response,
+                                  out double duration, out bool sense, uint timeout = 0)
         {
             duration = 0;
-            sense = true;
+            sense    = true;
             response = null;
 
             var cmdPkt = new AaruPacketCmdSdhci
             {
                 hdr = new AaruPacketHeader
                 {
-                    remote_id = Consts.RemoteId, packet_id = Consts.PacketId,
-                    version = Consts.PacketVersion,
+                    remote_id  = Consts.RemoteId, packet_id = Consts.PacketId, version = Consts.PacketVersion,
                     packetType = AaruPacketType.CommandAtaLba48
                 },
-                command = command,
-                write = write,
-                application = isApplication,
-                flags = flags,
-                argument = argument,
-                block_size = blockSize,
-                blocks = blocks,
-                timeout = timeout * 1000
+                command  = command, write       = write, application = isApplication, flags = flags,
+                argument = argument, block_size = blockSize, blocks  = blocks, timeout      = timeout * 1000
             };
 
-            if (buffer != null)
-                cmdPkt.buf_len = (uint) buffer.Length;
+            if(buffer != null)
+                cmdPkt.buf_len = (uint)buffer.Length;
 
-            cmdPkt.hdr.len = (uint) (Marshal.SizeOf<AaruPacketCmdSdhci>() + cmdPkt.buf_len);
+            cmdPkt.hdr.len = (uint)(Marshal.SizeOf<AaruPacketCmdSdhci>() + cmdPkt.buf_len);
 
-            var pktBuf = Marshal.StructureToByteArrayLittleEndian(cmdPkt);
-            var buf = new byte[cmdPkt.hdr.len];
+            byte[] pktBuf = Marshal.StructureToByteArrayLittleEndian(cmdPkt);
+            byte[] buf    = new byte[cmdPkt.hdr.len];
 
             Array.Copy(pktBuf, 0, buf, 0, Marshal.SizeOf<AaruPacketCmdSdhci>());
 
-            if (buffer != null)
+            if(buffer != null)
                 Array.Copy(buffer, 0, buf, Marshal.SizeOf<AaruPacketCmdSdhci>(), cmdPkt.buf_len);
 
-            var len = _socket.Send(buf, SocketFlags.None);
+            int len = _socket.Send(buf, SocketFlags.None);
 
-            if (len != buf.Length)
+            if(len != buf.Length)
             {
                 AaruConsole.ErrorWriteLine("Could not write to the network...");
+
                 return -1;
             }
 
-            var hdrBuf = new byte[Marshal.SizeOf<AaruPacketHeader>()];
+            byte[] hdrBuf = new byte[Marshal.SizeOf<AaruPacketHeader>()];
 
             len = Receive(_socket, hdrBuf, hdrBuf.Length, SocketFlags.Peek);
 
-            if (len < hdrBuf.Length)
+            if(len < hdrBuf.Length)
             {
                 AaruConsole.ErrorWriteLine("Could not read from the network...");
+
                 return -1;
             }
 
-            var hdr = Marshal.ByteArrayToStructureLittleEndian<AaruPacketHeader>(hdrBuf);
+            AaruPacketHeader hdr = Marshal.ByteArrayToStructureLittleEndian<AaruPacketHeader>(hdrBuf);
 
-            if (hdr.remote_id != Consts.RemoteId || hdr.packet_id != Consts.PacketId)
+            if(hdr.remote_id != Consts.RemoteId ||
+               hdr.packet_id != Consts.PacketId)
             {
                 AaruConsole.ErrorWriteLine("Received data is not an Aaru Remote Packet...");
+
                 return -1;
             }
 
-            if (hdr.packetType != AaruPacketType.ResponseSdhci)
+            if(hdr.packetType != AaruPacketType.ResponseSdhci)
             {
-                AaruConsole.ErrorWriteLine("Expected SDHCI Response Packet, got packet type {0}...",
-                    hdr.packetType);
+                AaruConsole.ErrorWriteLine("Expected SDHCI Response Packet, got packet type {0}...", hdr.packetType);
+
                 return -1;
             }
 
             buf = new byte[hdr.len];
             len = Receive(_socket, buf, buf.Length, SocketFlags.None);
 
-            if (len < buf.Length)
+            if(len < buf.Length)
             {
                 AaruConsole.ErrorWriteLine("Could not read from the network...");
+
                 return -1;
             }
 
-            var res = Marshal.ByteArrayToStructureLittleEndian<AaruPacketResSdhci>(buf);
+            AaruPacketResSdhci res = Marshal.ByteArrayToStructureLittleEndian<AaruPacketResSdhci>(buf);
 
             buffer = new byte[res.buf_len];
             Array.Copy(buf, Marshal.SizeOf<AaruPacketResSdhci>(), buffer, 0, res.buf_len);
-            duration = res.duration;
-            sense = res.sense != 0;
-            response = new uint[4];
+            duration    = res.duration;
+            sense       = res.sense != 0;
+            response    = new uint[4];
             response[0] = res.response[0];
             response[1] = res.response[1];
             response[2] = res.response[2];
             response[3] = res.response[3];
 
-            return (int) res.error_no;
+            return (int)res.error_no;
         }
 
         public DeviceType GetDeviceType()
@@ -859,58 +884,63 @@ namespace Aaru.Devices.Remote
             {
                 hdr = new AaruPacketHeader
                 {
-                    remote_id = Consts.RemoteId, packet_id = Consts.PacketId,
-                    len = (uint) Marshal.SizeOf<AaruPacketCmdGetDeviceType>(),
-                    version = Consts.PacketVersion,
+                    remote_id  = Consts.RemoteId, packet_id                                  = Consts.PacketId,
+                    len        = (uint)Marshal.SizeOf<AaruPacketCmdGetDeviceType>(), version = Consts.PacketVersion,
                     packetType = AaruPacketType.CommandGetType
                 }
             };
 
-            var buf = Marshal.StructureToByteArrayLittleEndian(cmdPkt);
+            byte[] buf = Marshal.StructureToByteArrayLittleEndian(cmdPkt);
 
-            var len = _socket.Send(buf, SocketFlags.None);
+            int len = _socket.Send(buf, SocketFlags.None);
 
-            if (len != buf.Length)
+            if(len != buf.Length)
             {
                 AaruConsole.ErrorWriteLine("Could not write to the network...");
+
                 return DeviceType.Unknown;
             }
 
-            var hdrBuf = new byte[Marshal.SizeOf<AaruPacketHeader>()];
+            byte[] hdrBuf = new byte[Marshal.SizeOf<AaruPacketHeader>()];
 
             len = Receive(_socket, hdrBuf, hdrBuf.Length, SocketFlags.Peek);
 
-            if (len < hdrBuf.Length)
+            if(len < hdrBuf.Length)
             {
                 AaruConsole.ErrorWriteLine("Could not read from the network...");
+
                 return DeviceType.Unknown;
             }
 
-            var hdr = Marshal.ByteArrayToStructureLittleEndian<AaruPacketHeader>(hdrBuf);
+            AaruPacketHeader hdr = Marshal.ByteArrayToStructureLittleEndian<AaruPacketHeader>(hdrBuf);
 
-            if (hdr.remote_id != Consts.RemoteId || hdr.packet_id != Consts.PacketId)
+            if(hdr.remote_id != Consts.RemoteId ||
+               hdr.packet_id != Consts.PacketId)
             {
                 AaruConsole.ErrorWriteLine("Received data is not an Aaru Remote Packet...");
+
                 return DeviceType.Unknown;
             }
 
-            if (hdr.packetType != AaruPacketType.ResponseGetType)
+            if(hdr.packetType != AaruPacketType.ResponseGetType)
             {
                 AaruConsole.ErrorWriteLine("Expected Device Type Response Packet, got packet type {0}...",
-                    hdr.packetType);
+                                           hdr.packetType);
+
                 return DeviceType.Unknown;
             }
 
             buf = new byte[hdr.len];
             len = Receive(_socket, buf, buf.Length, SocketFlags.None);
 
-            if (len < buf.Length)
+            if(len < buf.Length)
             {
                 AaruConsole.ErrorWriteLine("Could not read from the network...");
+
                 return DeviceType.Unknown;
             }
 
-            var res = Marshal.ByteArrayToStructureLittleEndian<AaruPacketResGetDeviceType>(buf);
+            AaruPacketResGetDeviceType res = Marshal.ByteArrayToStructureLittleEndian<AaruPacketResGetDeviceType>(buf);
 
             return res.device_type;
         }
@@ -926,62 +956,68 @@ namespace Aaru.Devices.Remote
             {
                 hdr = new AaruPacketHeader
                 {
-                    remote_id = Consts.RemoteId, packet_id = Consts.PacketId,
-                    len = (uint) Marshal.SizeOf<AaruPacketCmdGetSdhciRegisters>(),
-                    version = Consts.PacketVersion,
+                    remote_id  = Consts.RemoteId, packet_id                                      = Consts.PacketId,
+                    len        = (uint)Marshal.SizeOf<AaruPacketCmdGetSdhciRegisters>(), version = Consts.PacketVersion,
                     packetType = AaruPacketType.CommandGetSdhciRegisters
                 }
             };
 
-            var buf = Marshal.StructureToByteArrayLittleEndian(cmdPkt);
+            byte[] buf = Marshal.StructureToByteArrayLittleEndian(cmdPkt);
 
-            var len = _socket.Send(buf, SocketFlags.None);
+            int len = _socket.Send(buf, SocketFlags.None);
 
-            if (len != buf.Length)
+            if(len != buf.Length)
             {
                 AaruConsole.ErrorWriteLine("Could not write to the network...");
+
                 return false;
             }
 
-            var hdrBuf = new byte[Marshal.SizeOf<AaruPacketHeader>()];
+            byte[] hdrBuf = new byte[Marshal.SizeOf<AaruPacketHeader>()];
 
             len = Receive(_socket, hdrBuf, hdrBuf.Length, SocketFlags.Peek);
 
-            if (len < hdrBuf.Length)
+            if(len < hdrBuf.Length)
             {
                 AaruConsole.ErrorWriteLine("Could not read from the network...");
+
                 return false;
             }
 
-            var hdr = Marshal.ByteArrayToStructureLittleEndian<AaruPacketHeader>(hdrBuf);
+            AaruPacketHeader hdr = Marshal.ByteArrayToStructureLittleEndian<AaruPacketHeader>(hdrBuf);
 
-            if (hdr.remote_id != Consts.RemoteId || hdr.packet_id != Consts.PacketId)
+            if(hdr.remote_id != Consts.RemoteId ||
+               hdr.packet_id != Consts.PacketId)
             {
                 AaruConsole.ErrorWriteLine("Received data is not an Aaru Remote Packet...");
+
                 return false;
             }
 
-            if (hdr.packetType != AaruPacketType.ResponseGetSdhciRegisters)
+            if(hdr.packetType != AaruPacketType.ResponseGetSdhciRegisters)
             {
                 AaruConsole.ErrorWriteLine("Expected Device Type Response Packet, got packet type {0}...",
-                    hdr.packetType);
+                                           hdr.packetType);
+
                 return false;
             }
 
             buf = new byte[hdr.len];
             len = Receive(_socket, buf, buf.Length, SocketFlags.None);
 
-            if (len < buf.Length)
+            if(len < buf.Length)
             {
                 AaruConsole.ErrorWriteLine("Could not read from the network...");
+
                 return false;
             }
 
-            var res = Marshal.ByteArrayToStructureLittleEndian<AaruPacketResGetSdhciRegisters>(buf);
+            AaruPacketResGetSdhciRegisters res =
+                Marshal.ByteArrayToStructureLittleEndian<AaruPacketResGetSdhciRegisters>(buf);
 
-            if (res.csd_len > 0)
+            if(res.csd_len > 0)
             {
-                if (res.csd_len > 16)
+                if(res.csd_len > 16)
                     res.csd_len = 16;
 
                 csd = new byte[res.csd_len];
@@ -989,9 +1025,9 @@ namespace Aaru.Devices.Remote
                 Array.Copy(res.csd, 0, csd, 0, res.csd_len);
             }
 
-            if (res.cid_len > 0)
+            if(res.cid_len > 0)
             {
-                if (res.cid_len > 16)
+                if(res.cid_len > 16)
                     res.cid_len = 16;
 
                 cid = new byte[res.cid_len];
@@ -999,9 +1035,9 @@ namespace Aaru.Devices.Remote
                 Array.Copy(res.cid, 0, cid, 0, res.cid_len);
             }
 
-            if (res.ocr_len > 0)
+            if(res.ocr_len > 0)
             {
-                if (res.ocr_len > 16)
+                if(res.ocr_len > 16)
                     res.ocr_len = 16;
 
                 ocr = new byte[res.ocr_len];
@@ -1009,9 +1045,9 @@ namespace Aaru.Devices.Remote
                 Array.Copy(res.ocr, 0, ocr, 0, res.ocr_len);
             }
 
-            if (res.scr_len > 0)
+            if(res.scr_len > 0)
             {
-                if (res.scr_len > 16)
+                if(res.scr_len > 16)
                     res.scr_len = 16;
 
                 scr = new byte[res.scr_len];
@@ -1023,160 +1059,170 @@ namespace Aaru.Devices.Remote
         }
 
         public bool GetUsbData(out byte[] descriptors, out ushort idVendor, out ushort idProduct,
-            out string manufacturer, out string product, out string serial)
+                               out string manufacturer, out string product, out string serial)
         {
-            descriptors = null;
-            idVendor = 0;
-            idProduct = 0;
+            descriptors  = null;
+            idVendor     = 0;
+            idProduct    = 0;
             manufacturer = null;
-            product = null;
-            serial = null;
+            product      = null;
+            serial       = null;
 
             var cmdPkt = new AaruPacketCmdGetUsbData
             {
                 hdr = new AaruPacketHeader
                 {
-                    remote_id = Consts.RemoteId, packet_id = Consts.PacketId,
-                    len = (uint) Marshal.SizeOf<AaruPacketCmdGetUsbData>(),
-                    version = Consts.PacketVersion,
+                    remote_id  = Consts.RemoteId, packet_id                               = Consts.PacketId,
+                    len        = (uint)Marshal.SizeOf<AaruPacketCmdGetUsbData>(), version = Consts.PacketVersion,
                     packetType = AaruPacketType.CommandGetUsbData
                 }
             };
 
-            var buf = Marshal.StructureToByteArrayLittleEndian(cmdPkt);
+            byte[] buf = Marshal.StructureToByteArrayLittleEndian(cmdPkt);
 
-            var len = _socket.Send(buf, SocketFlags.None);
+            int len = _socket.Send(buf, SocketFlags.None);
 
-            if (len != buf.Length)
+            if(len != buf.Length)
             {
                 AaruConsole.ErrorWriteLine("Could not write to the network...");
+
                 return false;
             }
 
-            var hdrBuf = new byte[Marshal.SizeOf<AaruPacketHeader>()];
+            byte[] hdrBuf = new byte[Marshal.SizeOf<AaruPacketHeader>()];
 
             len = Receive(_socket, hdrBuf, hdrBuf.Length, SocketFlags.Peek);
 
-            if (len < hdrBuf.Length)
+            if(len < hdrBuf.Length)
             {
                 AaruConsole.ErrorWriteLine("Could not read from the network...");
+
                 return false;
             }
 
-            var hdr = Marshal.ByteArrayToStructureLittleEndian<AaruPacketHeader>(hdrBuf);
+            AaruPacketHeader hdr = Marshal.ByteArrayToStructureLittleEndian<AaruPacketHeader>(hdrBuf);
 
-            if (hdr.remote_id != Consts.RemoteId || hdr.packet_id != Consts.PacketId)
+            if(hdr.remote_id != Consts.RemoteId ||
+               hdr.packet_id != Consts.PacketId)
             {
                 AaruConsole.ErrorWriteLine("Received data is not an Aaru Remote Packet...");
+
                 return false;
             }
 
-            if (hdr.packetType != AaruPacketType.ResponseGetUsbData)
+            if(hdr.packetType != AaruPacketType.ResponseGetUsbData)
             {
-                AaruConsole.ErrorWriteLine("Expected USB Data Response Packet, got packet type {0}...",
-                    hdr.packetType);
+                AaruConsole.ErrorWriteLine("Expected USB Data Response Packet, got packet type {0}...", hdr.packetType);
+
                 return false;
             }
 
             buf = new byte[hdr.len];
             len = Receive(_socket, buf, buf.Length, SocketFlags.None);
 
-            if (len < buf.Length)
+            if(len < buf.Length)
             {
                 AaruConsole.ErrorWriteLine("Could not read from the network...");
+
                 return false;
             }
 
-            var res = Marshal.ByteArrayToStructureLittleEndian<AaruPacketResGetUsbData>(buf);
+            AaruPacketResGetUsbData res = Marshal.ByteArrayToStructureLittleEndian<AaruPacketResGetUsbData>(buf);
 
-            if (!res.isUsb)
+            if(!res.isUsb)
                 return false;
 
             descriptors = new byte[res.descLen];
             Array.Copy(res.descriptors, 0, descriptors, 0, res.descLen);
-            idVendor = res.idVendor;
-            idProduct = res.idProduct;
+            idVendor     = res.idVendor;
+            idProduct    = res.idProduct;
             manufacturer = res.manufacturer;
-            product = res.product;
-            serial = res.serial;
+            product      = res.product;
+            serial       = res.serial;
 
             return true;
         }
 
-        public bool GetFireWireData(out uint idVendor, out uint idProduct,
-            out ulong guid, out string vendor, out string model)
+        public bool GetFireWireData(out uint idVendor, out uint idProduct, out ulong guid, out string vendor,
+                                    out string model)
         {
-            idVendor = 0;
+            idVendor  = 0;
             idProduct = 0;
-            guid = 0;
-            vendor = null;
-            model = null;
+            guid      = 0;
+            vendor    = null;
+            model     = null;
 
             var cmdPkt = new AaruPacketCmdGetFireWireData
             {
                 hdr = new AaruPacketHeader
                 {
-                    remote_id = Consts.RemoteId, packet_id = Consts.PacketId,
-                    len = (uint) Marshal.SizeOf<AaruPacketCmdGetFireWireData>(),
-                    version = Consts.PacketVersion,
+                    remote_id  = Consts.RemoteId, packet_id                                    = Consts.PacketId,
+                    len        = (uint)Marshal.SizeOf<AaruPacketCmdGetFireWireData>(), version = Consts.PacketVersion,
                     packetType = AaruPacketType.CommandGetFireWireData
                 }
             };
 
-            var buf = Marshal.StructureToByteArrayLittleEndian(cmdPkt);
+            byte[] buf = Marshal.StructureToByteArrayLittleEndian(cmdPkt);
 
-            var len = _socket.Send(buf, SocketFlags.None);
+            int len = _socket.Send(buf, SocketFlags.None);
 
-            if (len != buf.Length)
+            if(len != buf.Length)
             {
                 AaruConsole.ErrorWriteLine("Could not write to the network...");
+
                 return false;
             }
 
-            var hdrBuf = new byte[Marshal.SizeOf<AaruPacketHeader>()];
+            byte[] hdrBuf = new byte[Marshal.SizeOf<AaruPacketHeader>()];
 
             len = Receive(_socket, hdrBuf, hdrBuf.Length, SocketFlags.Peek);
 
-            if (len < hdrBuf.Length)
+            if(len < hdrBuf.Length)
             {
                 AaruConsole.ErrorWriteLine("Could not read from the network...");
+
                 return false;
             }
 
-            var hdr = Marshal.ByteArrayToStructureLittleEndian<AaruPacketHeader>(hdrBuf);
+            AaruPacketHeader hdr = Marshal.ByteArrayToStructureLittleEndian<AaruPacketHeader>(hdrBuf);
 
-            if (hdr.remote_id != Consts.RemoteId || hdr.packet_id != Consts.PacketId)
+            if(hdr.remote_id != Consts.RemoteId ||
+               hdr.packet_id != Consts.PacketId)
             {
                 AaruConsole.ErrorWriteLine("Received data is not an Aaru Remote Packet...");
+
                 return false;
             }
 
-            if (hdr.packetType != AaruPacketType.ResponseGetFireWireData)
+            if(hdr.packetType != AaruPacketType.ResponseGetFireWireData)
             {
                 AaruConsole.ErrorWriteLine("Expected FireWire Data Response Packet, got packet type {0}...",
-                    hdr.packetType);
+                                           hdr.packetType);
+
                 return false;
             }
 
             buf = new byte[hdr.len];
             len = Receive(_socket, buf, buf.Length, SocketFlags.None);
 
-            if (len < buf.Length)
+            if(len < buf.Length)
             {
                 AaruConsole.ErrorWriteLine("Could not read from the network...");
+
                 return false;
             }
 
-            var res = Marshal.ByteArrayToStructureLittleEndian<AaruPacketResGetFireWireData>(buf);
+            AaruPacketResGetFireWireData res =
+                Marshal.ByteArrayToStructureLittleEndian<AaruPacketResGetFireWireData>(buf);
 
-            if (!res.isFireWire)
+            if(!res.isFireWire)
                 return false;
 
-            idVendor = res.idVendor;
+            idVendor  = res.idVendor;
             idProduct = res.idModel;
-            guid = res.guid;
-            vendor = res.vendor;
-            model = res.model;
+            guid      = res.guid;
+            vendor    = res.vendor;
+            model     = res.model;
 
             return true;
         }
@@ -1189,60 +1235,65 @@ namespace Aaru.Devices.Remote
             {
                 hdr = new AaruPacketHeader
                 {
-                    remote_id = Consts.RemoteId, packet_id = Consts.PacketId,
-                    len = (uint) Marshal.SizeOf<AaruPacketCmdGetPcmciaData>(),
-                    version = Consts.PacketVersion,
+                    remote_id  = Consts.RemoteId, packet_id                                  = Consts.PacketId,
+                    len        = (uint)Marshal.SizeOf<AaruPacketCmdGetPcmciaData>(), version = Consts.PacketVersion,
                     packetType = AaruPacketType.CommandGetPcmciaData
                 }
             };
 
-            var buf = Marshal.StructureToByteArrayLittleEndian(cmdPkt);
+            byte[] buf = Marshal.StructureToByteArrayLittleEndian(cmdPkt);
 
-            var len = _socket.Send(buf, SocketFlags.None);
+            int len = _socket.Send(buf, SocketFlags.None);
 
-            if (len != buf.Length)
+            if(len != buf.Length)
             {
                 AaruConsole.ErrorWriteLine("Could not write to the network...");
+
                 return false;
             }
 
-            var hdrBuf = new byte[Marshal.SizeOf<AaruPacketHeader>()];
+            byte[] hdrBuf = new byte[Marshal.SizeOf<AaruPacketHeader>()];
 
             len = Receive(_socket, hdrBuf, hdrBuf.Length, SocketFlags.Peek);
 
-            if (len < hdrBuf.Length)
+            if(len < hdrBuf.Length)
             {
                 AaruConsole.ErrorWriteLine("Could not read from the network...");
+
                 return false;
             }
 
-            var hdr = Marshal.ByteArrayToStructureLittleEndian<AaruPacketHeader>(hdrBuf);
+            AaruPacketHeader hdr = Marshal.ByteArrayToStructureLittleEndian<AaruPacketHeader>(hdrBuf);
 
-            if (hdr.remote_id != Consts.RemoteId || hdr.packet_id != Consts.PacketId)
+            if(hdr.remote_id != Consts.RemoteId ||
+               hdr.packet_id != Consts.PacketId)
             {
                 AaruConsole.ErrorWriteLine("Received data is not an Aaru Remote Packet...");
+
                 return false;
             }
 
-            if (hdr.packetType != AaruPacketType.ResponseGetPcmciaData)
+            if(hdr.packetType != AaruPacketType.ResponseGetPcmciaData)
             {
                 AaruConsole.ErrorWriteLine("Expected PCMCIA Data Response Packet, got packet type {0}...",
-                    hdr.packetType);
+                                           hdr.packetType);
+
                 return false;
             }
 
             buf = new byte[hdr.len];
             len = Receive(_socket, buf, buf.Length, SocketFlags.None);
 
-            if (len < buf.Length)
+            if(len < buf.Length)
             {
                 AaruConsole.ErrorWriteLine("Could not read from the network...");
+
                 return false;
             }
 
-            var res = Marshal.ByteArrayToStructureLittleEndian<AaruPacketResGetPcmciaData>(buf);
+            AaruPacketResGetPcmciaData res = Marshal.ByteArrayToStructureLittleEndian<AaruPacketResGetPcmciaData>(buf);
 
-            if (!res.isPcmcia)
+            if(!res.isPcmcia)
                 return false;
 
             cis = res.cis;
@@ -1250,19 +1301,20 @@ namespace Aaru.Devices.Remote
             return true;
         }
 
-        private static int Receive(Socket socket, byte[] buffer, int size, SocketFlags socketFlags)
+        static int Receive(Socket socket, byte[] buffer, int size, SocketFlags socketFlags)
         {
             int gotten;
-            var offset = 0;
+            int offset = 0;
 
-            while (size > 0)
+            while(size > 0)
             {
                 gotten = socket.Receive(buffer, offset, size, socketFlags);
 
-                if (gotten <= 0) break;
+                if(gotten <= 0)
+                    break;
 
                 offset += gotten;
-                size -= gotten;
+                size   -= gotten;
             }
 
             return offset;
@@ -1274,14 +1326,13 @@ namespace Aaru.Devices.Remote
             {
                 hdr = new AaruPacketHeader
                 {
-                    remote_id = Consts.RemoteId, packet_id = Consts.PacketId,
-                    len = (uint) Marshal.SizeOf<AaruPacketCmdClose>(),
-                    version = Consts.PacketVersion,
+                    remote_id  = Consts.RemoteId, packet_id                          = Consts.PacketId,
+                    len        = (uint)Marshal.SizeOf<AaruPacketCmdClose>(), version = Consts.PacketVersion,
                     packetType = AaruPacketType.CommandCloseDevice
                 }
             };
 
-            var buf = Marshal.StructureToByteArrayLittleEndian(cmdPkt);
+            byte[] buf = Marshal.StructureToByteArrayLittleEndian(cmdPkt);
 
             _socket.Send(buf, SocketFlags.None);
         }
diff --git a/Aaru.Devices/Remote/Structs.cs b/Aaru.Devices/Remote/Structs.cs
index 61d9ba17c..9acdd02a4 100644
--- a/Aaru.Devices/Remote/Structs.cs
+++ b/Aaru.Devices/Remote/Structs.cs
@@ -10,8 +10,8 @@ namespace Aaru.Devices.Remote
         public uint remote_id;
         public uint packet_id;
 
-        public uint len;
-        public byte version;
+        public uint           len;
+        public byte           version;
         public AaruPacketType packetType;
 
         [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
@@ -54,14 +54,14 @@ namespace Aaru.Devices.Remote
     public struct AaruPacketResponseListDevices
     {
         public readonly AaruPacketHeader hdr;
-        public readonly ushort devices;
+        public readonly ushort           devices;
     }
 
     [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
     public struct AaruPacketNop
     {
         public AaruPacketHeader hdr;
-        public AaruNopReason reasonCode;
+        public AaruNopReason    reasonCode;
 
         [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
         public readonly byte[] spare;
@@ -85,32 +85,33 @@ namespace Aaru.Devices.Remote
     public struct AaruPacketCmdScsi
     {
         public AaruPacketHeader hdr;
-        public uint cdb_len;
-        public uint buf_len;
-        public int direction;
-        public uint timeout;
+        public uint             cdb_len;
+        public uint             buf_len;
+        public int              direction;
+        public uint             timeout;
     }
 
     [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
     public struct AaruPacketResScsi
     {
         public AaruPacketHeader hdr;
-        public uint sense_len;
-        public uint buf_len;
-        public uint duration;
-        public uint sense;
-        public uint error_no;
+        public uint             sense_len;
+        public uint             buf_len;
+        public uint             duration;
+        public uint             sense;
+        public uint             error_no;
     }
 
     [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
     public struct AaruPacketCmdAtaChs
     {
         public AaruPacketHeader hdr;
-        public uint buf_len;
-        public AtaRegistersChs registers;
-        public byte protocol;
-        public byte transferRegister;
-        [MarshalAs(UnmanagedType.U1)] public bool transferBlocks;
+        public uint             buf_len;
+        public AtaRegistersChs  registers;
+        public byte             protocol;
+        public byte             transferRegister;
+        [MarshalAs(UnmanagedType.U1)]
+        public bool transferBlocks;
         public byte spare;
         public uint timeout;
     }
@@ -118,24 +119,24 @@ namespace Aaru.Devices.Remote
     [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
     public struct AaruPacketResAtaChs
     {
-        public AaruPacketHeader hdr;
-        public uint buf_len;
+        public AaruPacketHeader     hdr;
+        public uint                 buf_len;
         public AtaErrorRegistersChs registers;
-        public uint duration;
-        public uint sense;
-        public uint error_no;
+        public uint                 duration;
+        public uint                 sense;
+        public uint                 error_no;
     }
 
-
     [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
     public struct AaruPacketCmdAtaLba28
     {
-        public AaruPacketHeader hdr;
-        public uint buf_len;
+        public AaruPacketHeader  hdr;
+        public uint              buf_len;
         public AtaRegistersLba28 registers;
-        public byte protocol;
-        public byte transferRegister;
-        [MarshalAs(UnmanagedType.U1)] public bool transferBlocks;
+        public byte              protocol;
+        public byte              transferRegister;
+        [MarshalAs(UnmanagedType.U1)]
+        public bool transferBlocks;
         public byte spare;
         public uint timeout;
     }
@@ -143,23 +144,24 @@ namespace Aaru.Devices.Remote
     [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
     public struct AaruPacketResAtaLba28
     {
-        public AaruPacketHeader hdr;
-        public uint buf_len;
+        public AaruPacketHeader       hdr;
+        public uint                   buf_len;
         public AtaErrorRegistersLba28 registers;
-        public uint duration;
-        public uint sense;
-        public uint error_no;
+        public uint                   duration;
+        public uint                   sense;
+        public uint                   error_no;
     }
 
     [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
     public struct AaruPacketCmdAtaLba48
     {
-        public AaruPacketHeader hdr;
-        public uint buf_len;
+        public AaruPacketHeader  hdr;
+        public uint              buf_len;
         public AtaRegistersLba48 registers;
-        public byte protocol;
-        public byte transferRegister;
-        [MarshalAs(UnmanagedType.U1)] public bool transferBlocks;
+        public byte              protocol;
+        public byte              transferRegister;
+        [MarshalAs(UnmanagedType.U1)]
+        public bool transferBlocks;
         public byte spare;
         public uint timeout;
     }
@@ -167,34 +169,36 @@ namespace Aaru.Devices.Remote
     [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
     public struct AaruPacketResAtaLba48
     {
-        public AaruPacketHeader hdr;
-        public uint buf_len;
+        public AaruPacketHeader       hdr;
+        public uint                   buf_len;
         public AtaErrorRegistersLba48 registers;
-        public uint duration;
-        public uint sense;
-        public uint error_no;
+        public uint                   duration;
+        public uint                   sense;
+        public uint                   error_no;
     }
 
     [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
     public struct AaruPacketCmdSdhci
     {
         public AaruPacketHeader hdr;
-        public MmcCommands command;
-        [MarshalAs(UnmanagedType.U1)] public bool write;
-        [MarshalAs(UnmanagedType.U1)] public bool application;
+        public MmcCommands      command;
+        [MarshalAs(UnmanagedType.U1)]
+        public bool write;
+        [MarshalAs(UnmanagedType.U1)]
+        public bool application;
         public MmcFlags flags;
-        public uint argument;
-        public uint block_size;
-        public uint blocks;
-        public uint buf_len;
-        public uint timeout;
+        public uint     argument;
+        public uint     block_size;
+        public uint     blocks;
+        public uint     buf_len;
+        public uint     timeout;
     }
 
     [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
     public struct AaruPacketResSdhci
     {
         public AaruPacketHeader hdr;
-        public uint buf_len;
+        public uint             buf_len;
 
         [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
         public uint[] response;
@@ -214,7 +218,7 @@ namespace Aaru.Devices.Remote
     public struct AaruPacketResGetDeviceType
     {
         public AaruPacketHeader hdr;
-        public DeviceType device_type;
+        public DeviceType       device_type;
     }
 
     [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
@@ -227,7 +231,8 @@ namespace Aaru.Devices.Remote
     public struct AaruPacketResGetSdhciRegisters
     {
         public AaruPacketHeader hdr;
-        [MarshalAs(UnmanagedType.U1)] public bool isSdhci;
+        [MarshalAs(UnmanagedType.U1)]
+        public bool isSdhci;
 
         [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
         public byte[] csd;
@@ -257,7 +262,8 @@ namespace Aaru.Devices.Remote
     public struct AaruPacketResGetUsbData
     {
         public AaruPacketHeader hdr;
-        [MarshalAs(UnmanagedType.U1)] public bool isUsb;
+        [MarshalAs(UnmanagedType.U1)]
+        public bool isUsb;
         public ushort descLen;
 
         [MarshalAs(UnmanagedType.ByValArray, SizeConst = 65536)]
@@ -286,9 +292,10 @@ namespace Aaru.Devices.Remote
     public struct AaruPacketResGetFireWireData
     {
         public AaruPacketHeader hdr;
-        [MarshalAs(UnmanagedType.U1)] public bool isFireWire;
-        public uint idModel;
-        public uint idVendor;
+        [MarshalAs(UnmanagedType.U1)]
+        public bool isFireWire;
+        public uint  idModel;
+        public uint  idVendor;
         public ulong guid;
 
         [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 256)]
@@ -308,7 +315,8 @@ namespace Aaru.Devices.Remote
     public struct AaruPacketResGetPcmciaData
     {
         public AaruPacketHeader hdr;
-        [MarshalAs(UnmanagedType.U1)] public bool isPcmcia;
+        [MarshalAs(UnmanagedType.U1)]
+        public bool isPcmcia;
         public ushort cis_len;
 
         [MarshalAs(UnmanagedType.ByValArray, SizeConst = 65536)]
@@ -331,6 +339,6 @@ namespace Aaru.Devices.Remote
     public struct AaruPacketResAmIRoot
     {
         public AaruPacketHeader hdr;
-        public uint am_i_root;
+        public uint             am_i_root;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Devices/Windows/Command.cs b/Aaru.Devices/Windows/Command.cs
index d11ce2a14..4ad94600a 100644
--- a/Aaru.Devices/Windows/Command.cs
+++ b/Aaru.Devices/Windows/Command.cs
@@ -42,9 +42,7 @@ namespace Aaru.Devices.Windows
     [SuppressMessage("ReSharper", "UnusedParameter.Global")]
     internal static class Command
     {
-        /// <summary>
-        ///     Sends a SCSI command
-        /// </summary>
+        /// <summary>Sends a SCSI command</summary>
         /// <returns>0 if no error occurred, otherwise, errno</returns>
         /// <param name="fd">File handle</param>
         /// <param name="cdb">SCSI CDB</param>
@@ -57,47 +55,47 @@ namespace Aaru.Devices.Windows
         ///     <c>True</c> if SCSI error returned non-OK status and <paramref name="senseBuffer" /> contains SCSI
         ///     sense
         /// </param>
-        internal static int SendScsiCommand(SafeFileHandle fd, byte[] cdb, ref byte[] buffer,
-            out byte[] senseBuffer,
-            uint timeout, ScsiIoctlDirection direction, out double duration,
-            out bool sense)
+        internal static int SendScsiCommand(SafeFileHandle fd, byte[] cdb, ref byte[] buffer, out byte[] senseBuffer,
+                                            uint timeout, ScsiIoctlDirection direction, out double duration,
+                                            out bool sense)
         {
             senseBuffer = null;
-            duration = 0;
-            sense = false;
+            duration    = 0;
+            sense       = false;
 
-            if (buffer == null) return -1;
+            if(buffer == null)
+                return -1;
 
             var sptdSb = new ScsiPassThroughDirectAndSenseBuffer
             {
-                SenseBuf = new byte[32],
-                sptd = new ScsiPassThroughDirect
+                SenseBuf = new byte[32], sptd = new ScsiPassThroughDirect
                 {
-                    Cdb = new byte[16],
-                    CdbLength = (byte) cdb.Length,
-                    SenseInfoLength = 32,
-                    DataIn = direction,
-                    DataTransferLength = (uint) buffer.Length,
-                    TimeOutValue = timeout,
-                    DataBuffer = Marshal.AllocHGlobal(buffer.Length)
+                    Cdb                = new byte[16], CdbLength = (byte)cdb.Length, SenseInfoLength = 32,
+                    DataIn             = direction,
+                    DataTransferLength = (uint)buffer.Length, TimeOutValue = timeout,
+                    DataBuffer         = Marshal.AllocHGlobal(buffer.Length)
                 }
             };
-            sptdSb.sptd.Length = (ushort) Marshal.SizeOf(sptdSb.sptd);
-            sptdSb.sptd.SenseInfoOffset = (uint) Marshal.SizeOf(sptdSb.sptd);
+
+            sptdSb.sptd.Length          = (ushort)Marshal.SizeOf(sptdSb.sptd);
+            sptdSb.sptd.SenseInfoOffset = (uint)Marshal.SizeOf(sptdSb.sptd);
             Array.Copy(cdb, sptdSb.sptd.Cdb, cdb.Length);
 
-            uint k = 0;
-            var error = 0;
+            uint k     = 0;
+            int  error = 0;
 
             Marshal.Copy(buffer, 0, sptdSb.sptd.DataBuffer, buffer.Length);
 
-            var start = DateTime.Now;
-            var hasError = !Extern.DeviceIoControlScsi(fd, WindowsIoctl.IoctlScsiPassThroughDirect, ref sptdSb,
-                (uint) Marshal.SizeOf(sptdSb), ref sptdSb,
-                (uint) Marshal.SizeOf(sptdSb), ref k, IntPtr.Zero);
-            var end = DateTime.Now;
+            DateTime start = DateTime.Now;
 
-            if (hasError) error = Marshal.GetLastWin32Error();
+            bool hasError = !Extern.DeviceIoControlScsi(fd, WindowsIoctl.IoctlScsiPassThroughDirect, ref sptdSb,
+                                                        (uint)Marshal.SizeOf(sptdSb), ref sptdSb,
+                                                        (uint)Marshal.SizeOf(sptdSb), ref k, IntPtr.Zero);
+
+            DateTime end = DateTime.Now;
+
+            if(hasError)
+                error = Marshal.GetLastWin32Error();
 
             Marshal.Copy(sptdSb.sptd.DataBuffer, buffer, 0, buffer.Length);
 
@@ -113,9 +111,7 @@ namespace Aaru.Devices.Windows
             return error;
         }
 
-        /// <summary>
-        ///     Sends an ATA command in CHS mode
-        /// </summary>
+        /// <summary>Sends an ATA command in CHS mode</summary>
         /// <returns>0 if no error occurred, otherwise, errno</returns>
         /// <param name="fd">File handle</param>
         /// <param name="buffer">Buffer for SCSI command response</param>
@@ -126,55 +122,53 @@ namespace Aaru.Devices.Windows
         /// <param name="errorRegisters">Registers returned by drive</param>
         /// <param name="protocol">ATA protocol to use</param>
         internal static int SendAtaCommand(SafeFileHandle fd, AtaRegistersChs registers,
-            out AtaErrorRegistersChs errorRegisters, AtaProtocol protocol,
-            ref byte[] buffer, uint timeout,
-            out double duration, out bool sense)
+                                           out AtaErrorRegistersChs errorRegisters, AtaProtocol protocol,
+                                           ref byte[] buffer, uint timeout, out double duration, out bool sense)
         {
-            duration = 0;
-            sense = false;
+            duration       = 0;
+            sense          = false;
             errorRegisters = new AtaErrorRegistersChs();
 
-            if (buffer == null) return -1;
+            if(buffer == null)
+                return -1;
 
-            var offsetForBuffer = (uint) (Marshal.SizeOf(typeof(AtaPassThroughEx)) + Marshal.SizeOf(typeof(uint)));
+            uint offsetForBuffer = (uint)(Marshal.SizeOf(typeof(AtaPassThroughEx)) + Marshal.SizeOf(typeof(uint)));
 
             var aptdBuf = new AtaPassThroughExBuffer
             {
                 aptd = new AtaPassThroughEx
                 {
-                    TimeOutValue = timeout,
-                    DataBufferOffset = (IntPtr) offsetForBuffer,
-                    Length = (ushort) Marshal.SizeOf(typeof(AtaPassThroughEx)),
-                    DataTransferLength = (uint) buffer.Length,
-                    PreviousTaskFile = new AtaTaskFile(),
-                    CurrentTaskFile = new AtaTaskFile
+                    TimeOutValue       = timeout,
+                    DataBufferOffset   = (IntPtr)offsetForBuffer,
+                    Length             = (ushort)Marshal.SizeOf(typeof(AtaPassThroughEx)),
+                    DataTransferLength = (uint)buffer.Length,
+                    PreviousTaskFile   = new AtaTaskFile(), CurrentTaskFile = new AtaTaskFile
                     {
-                        Command = registers.Command,
-                        CylinderHigh = registers.CylinderHigh,
-                        CylinderLow = registers.CylinderLow,
-                        DeviceHead = registers.DeviceHead,
-                        Features = registers.Feature,
-                        SectorCount = registers.SectorCount,
+                        Command      = registers.Command, CylinderHigh   = registers.CylinderHigh,
+                        CylinderLow  = registers.CylinderLow, DeviceHead = registers.DeviceHead,
+                        Features     = registers.Feature, SectorCount    = registers.SectorCount,
                         SectorNumber = registers.Sector
                     }
                 },
                 dataBuffer = new byte[64 * 512]
             };
 
-            switch (protocol)
+            switch(protocol)
             {
                 case AtaProtocol.PioIn:
                 case AtaProtocol.UDmaIn:
                 case AtaProtocol.Dma:
                     aptdBuf.aptd.AtaFlags = AtaFlags.DataIn;
+
                     break;
                 case AtaProtocol.PioOut:
                 case AtaProtocol.UDmaOut:
                     aptdBuf.aptd.AtaFlags = AtaFlags.DataOut;
+
                     break;
             }
 
-            switch (protocol)
+            switch(protocol)
             {
                 case AtaProtocol.Dma:
                 case AtaProtocol.DmaQueued:
@@ -182,45 +176,47 @@ namespace Aaru.Devices.Windows
                 case AtaProtocol.UDmaIn:
                 case AtaProtocol.UDmaOut:
                     aptdBuf.aptd.AtaFlags |= AtaFlags.Dma;
+
                     break;
             }
 
             // Unknown if needed
             aptdBuf.aptd.AtaFlags |= AtaFlags.DrdyRequired;
 
-            uint k = 0;
-            var error = 0;
+            uint k     = 0;
+            int  error = 0;
 
             Array.Copy(buffer, 0, aptdBuf.dataBuffer, 0, buffer.Length);
 
-            var start = DateTime.Now;
-            sense = !Extern.DeviceIoControlAta(fd, WindowsIoctl.IoctlAtaPassThrough, ref aptdBuf,
-                (uint) Marshal.SizeOf(aptdBuf), ref aptdBuf,
-                (uint) Marshal.SizeOf(aptdBuf), ref k, IntPtr.Zero);
-            var end = DateTime.Now;
+            DateTime start = DateTime.Now;
 
-            if (sense) error = Marshal.GetLastWin32Error();
+            sense = !Extern.DeviceIoControlAta(fd, WindowsIoctl.IoctlAtaPassThrough, ref aptdBuf,
+                                               (uint)Marshal.SizeOf(aptdBuf), ref aptdBuf,
+                                               (uint)Marshal.SizeOf(aptdBuf), ref k, IntPtr.Zero);
+
+            DateTime end = DateTime.Now;
+
+            if(sense)
+                error = Marshal.GetLastWin32Error();
 
             Array.Copy(aptdBuf.dataBuffer, 0, buffer, 0, buffer.Length);
 
             duration = (end - start).TotalMilliseconds;
 
             errorRegisters.CylinderHigh = aptdBuf.aptd.CurrentTaskFile.CylinderHigh;
-            errorRegisters.CylinderLow = aptdBuf.aptd.CurrentTaskFile.CylinderLow;
-            errorRegisters.DeviceHead = aptdBuf.aptd.CurrentTaskFile.DeviceHead;
-            errorRegisters.Error = aptdBuf.aptd.CurrentTaskFile.Error;
-            errorRegisters.Sector = aptdBuf.aptd.CurrentTaskFile.SectorNumber;
-            errorRegisters.SectorCount = aptdBuf.aptd.CurrentTaskFile.SectorCount;
-            errorRegisters.Status = aptdBuf.aptd.CurrentTaskFile.Status;
+            errorRegisters.CylinderLow  = aptdBuf.aptd.CurrentTaskFile.CylinderLow;
+            errorRegisters.DeviceHead   = aptdBuf.aptd.CurrentTaskFile.DeviceHead;
+            errorRegisters.Error        = aptdBuf.aptd.CurrentTaskFile.Error;
+            errorRegisters.Sector       = aptdBuf.aptd.CurrentTaskFile.SectorNumber;
+            errorRegisters.SectorCount  = aptdBuf.aptd.CurrentTaskFile.SectorCount;
+            errorRegisters.Status       = aptdBuf.aptd.CurrentTaskFile.Status;
 
             sense = errorRegisters.Error != 0 || (errorRegisters.Status & 0xA5) != 0;
 
             return error;
         }
 
-        /// <summary>
-        ///     Sends an ATA command in 28-bit LBA mode
-        /// </summary>
+        /// <summary>Sends an ATA command in 28-bit LBA mode</summary>
         /// <returns>0 if no error occurred, otherwise, errno</returns>
         /// <param name="fd">File handle</param>
         /// <param name="buffer">Buffer for SCSI command response</param>
@@ -231,55 +227,53 @@ namespace Aaru.Devices.Windows
         /// <param name="errorRegisters">Registers returned by drive</param>
         /// <param name="protocol">ATA protocol to use</param>
         internal static int SendAtaCommand(SafeFileHandle fd, AtaRegistersLba28 registers,
-            out AtaErrorRegistersLba28 errorRegisters, AtaProtocol protocol,
-            ref byte[] buffer, uint timeout,
-            out double duration, out bool sense)
+                                           out AtaErrorRegistersLba28 errorRegisters, AtaProtocol protocol,
+                                           ref byte[] buffer, uint timeout, out double duration, out bool sense)
         {
-            duration = 0;
-            sense = false;
+            duration       = 0;
+            sense          = false;
             errorRegisters = new AtaErrorRegistersLba28();
 
-            if (buffer == null) return -1;
+            if(buffer == null)
+                return -1;
 
-            var offsetForBuffer = (uint) (Marshal.SizeOf(typeof(AtaPassThroughEx)) + Marshal.SizeOf(typeof(uint)));
+            uint offsetForBuffer = (uint)(Marshal.SizeOf(typeof(AtaPassThroughEx)) + Marshal.SizeOf(typeof(uint)));
 
             var aptdBuf = new AtaPassThroughExBuffer
             {
                 aptd = new AtaPassThroughEx
                 {
-                    TimeOutValue = timeout,
-                    DataBufferOffset = (IntPtr) offsetForBuffer,
-                    Length = (ushort) Marshal.SizeOf(typeof(AtaPassThroughEx)),
-                    DataTransferLength = (uint) buffer.Length,
-                    PreviousTaskFile = new AtaTaskFile(),
-                    CurrentTaskFile = new AtaTaskFile
+                    TimeOutValue       = timeout,
+                    DataBufferOffset   = (IntPtr)offsetForBuffer,
+                    Length             = (ushort)Marshal.SizeOf(typeof(AtaPassThroughEx)),
+                    DataTransferLength = (uint)buffer.Length,
+                    PreviousTaskFile   = new AtaTaskFile(), CurrentTaskFile = new AtaTaskFile
                     {
-                        Command = registers.Command,
-                        CylinderHigh = registers.LbaHigh,
+                        Command     = registers.Command, CylinderHigh = registers.LbaHigh,
                         CylinderLow = registers.LbaMid,
-                        DeviceHead = registers.DeviceHead,
-                        Features = registers.Feature,
-                        SectorCount = registers.SectorCount,
-                        SectorNumber = registers.LbaLow
+                        DeviceHead  = registers.DeviceHead, Features      = registers.Feature,
+                        SectorCount = registers.SectorCount, SectorNumber = registers.LbaLow
                     }
                 },
                 dataBuffer = new byte[64 * 512]
             };
 
-            switch (protocol)
+            switch(protocol)
             {
                 case AtaProtocol.PioIn:
                 case AtaProtocol.UDmaIn:
                 case AtaProtocol.Dma:
                     aptdBuf.aptd.AtaFlags = AtaFlags.DataIn;
+
                     break;
                 case AtaProtocol.PioOut:
                 case AtaProtocol.UDmaOut:
                     aptdBuf.aptd.AtaFlags = AtaFlags.DataOut;
+
                     break;
             }
 
-            switch (protocol)
+            switch(protocol)
             {
                 case AtaProtocol.Dma:
                 case AtaProtocol.DmaQueued:
@@ -287,45 +281,47 @@ namespace Aaru.Devices.Windows
                 case AtaProtocol.UDmaIn:
                 case AtaProtocol.UDmaOut:
                     aptdBuf.aptd.AtaFlags |= AtaFlags.Dma;
+
                     break;
             }
 
             // Unknown if needed
             aptdBuf.aptd.AtaFlags |= AtaFlags.DrdyRequired;
 
-            uint k = 0;
-            var error = 0;
+            uint k     = 0;
+            int  error = 0;
 
             Array.Copy(buffer, 0, aptdBuf.dataBuffer, 0, buffer.Length);
 
-            var start = DateTime.Now;
-            sense = !Extern.DeviceIoControlAta(fd, WindowsIoctl.IoctlAtaPassThrough, ref aptdBuf,
-                (uint) Marshal.SizeOf(aptdBuf), ref aptdBuf,
-                (uint) Marshal.SizeOf(aptdBuf), ref k, IntPtr.Zero);
-            var end = DateTime.Now;
+            DateTime start = DateTime.Now;
 
-            if (sense) error = Marshal.GetLastWin32Error();
+            sense = !Extern.DeviceIoControlAta(fd, WindowsIoctl.IoctlAtaPassThrough, ref aptdBuf,
+                                               (uint)Marshal.SizeOf(aptdBuf), ref aptdBuf,
+                                               (uint)Marshal.SizeOf(aptdBuf), ref k, IntPtr.Zero);
+
+            DateTime end = DateTime.Now;
+
+            if(sense)
+                error = Marshal.GetLastWin32Error();
 
             Array.Copy(aptdBuf.dataBuffer, 0, buffer, 0, buffer.Length);
 
             duration = (end - start).TotalMilliseconds;
 
-            errorRegisters.LbaHigh = aptdBuf.aptd.CurrentTaskFile.CylinderHigh;
-            errorRegisters.LbaMid = aptdBuf.aptd.CurrentTaskFile.CylinderLow;
-            errorRegisters.DeviceHead = aptdBuf.aptd.CurrentTaskFile.DeviceHead;
-            errorRegisters.Error = aptdBuf.aptd.CurrentTaskFile.Error;
-            errorRegisters.LbaLow = aptdBuf.aptd.CurrentTaskFile.SectorNumber;
+            errorRegisters.LbaHigh     = aptdBuf.aptd.CurrentTaskFile.CylinderHigh;
+            errorRegisters.LbaMid      = aptdBuf.aptd.CurrentTaskFile.CylinderLow;
+            errorRegisters.DeviceHead  = aptdBuf.aptd.CurrentTaskFile.DeviceHead;
+            errorRegisters.Error       = aptdBuf.aptd.CurrentTaskFile.Error;
+            errorRegisters.LbaLow      = aptdBuf.aptd.CurrentTaskFile.SectorNumber;
             errorRegisters.SectorCount = aptdBuf.aptd.CurrentTaskFile.SectorCount;
-            errorRegisters.Status = aptdBuf.aptd.CurrentTaskFile.Status;
+            errorRegisters.Status      = aptdBuf.aptd.CurrentTaskFile.Status;
 
             sense = errorRegisters.Error != 0 || (errorRegisters.Status & 0xA5) != 0;
 
             return error;
         }
 
-        /// <summary>
-        ///     Sends an ATA command in 48-bit LBA mode
-        /// </summary>
+        /// <summary>Sends an ATA command in 48-bit LBA mode</summary>
         /// <returns>0 if no error occurred, otherwise, errno</returns>
         /// <param name="fd">File handle</param>
         /// <param name="buffer">Buffer for SCSI command response</param>
@@ -336,63 +332,63 @@ namespace Aaru.Devices.Windows
         /// <param name="errorRegisters">Registers returned by drive</param>
         /// <param name="protocol">ATA protocol to use</param>
         internal static int SendAtaCommand(SafeFileHandle fd, AtaRegistersLba48 registers,
-            out AtaErrorRegistersLba48 errorRegisters, AtaProtocol protocol,
-            ref byte[] buffer, uint timeout,
-            out double duration, out bool sense)
+                                           out AtaErrorRegistersLba48 errorRegisters, AtaProtocol protocol,
+                                           ref byte[] buffer, uint timeout, out double duration, out bool sense)
         {
-            duration = 0;
-            sense = false;
+            duration       = 0;
+            sense          = false;
             errorRegisters = new AtaErrorRegistersLba48();
 
-            if (buffer == null) return -1;
+            if(buffer == null)
+                return -1;
 
-            var offsetForBuffer = (uint) (Marshal.SizeOf(typeof(AtaPassThroughEx)) + Marshal.SizeOf(typeof(uint)));
+            uint offsetForBuffer = (uint)(Marshal.SizeOf(typeof(AtaPassThroughEx)) + Marshal.SizeOf(typeof(uint)));
 
             var aptdBuf = new AtaPassThroughExBuffer
             {
                 aptd = new AtaPassThroughEx
                 {
-                    TimeOutValue = timeout,
-                    DataBufferOffset = (IntPtr) offsetForBuffer,
-                    Length = (ushort) Marshal.SizeOf(typeof(AtaPassThroughEx)),
-                    DataTransferLength = (uint) buffer.Length,
-                    PreviousTaskFile =
-                        new AtaTaskFile
-                        {
-                            CylinderHigh = (byte) ((registers.LbaHigh & 0xFF00) >> 8),
-                            CylinderLow = (byte) ((registers.LbaMid & 0xFF00) >> 8),
-                            Features = (byte) ((registers.Feature & 0xFF00) >> 8),
-                            SectorCount = (byte) ((registers.SectorCount & 0xFF00) >> 8),
-                            SectorNumber = (byte) ((registers.LbaLow & 0xFF00) >> 8)
-                        },
+                    TimeOutValue       = timeout,
+                    DataBufferOffset   = (IntPtr)offsetForBuffer,
+                    Length             = (ushort)Marshal.SizeOf(typeof(AtaPassThroughEx)),
+                    DataTransferLength = (uint)buffer.Length,
+                    PreviousTaskFile = new AtaTaskFile
+                    {
+                        CylinderHigh = (byte)((registers.LbaHigh     & 0xFF00) >> 8),
+                        CylinderLow  = (byte)((registers.LbaMid      & 0xFF00) >> 8),
+                        Features     = (byte)((registers.Feature     & 0xFF00) >> 8),
+                        SectorCount  = (byte)((registers.SectorCount & 0xFF00) >> 8),
+                        SectorNumber = (byte)((registers.LbaLow      & 0xFF00) >> 8)
+                    },
                     CurrentTaskFile = new AtaTaskFile
                     {
-                        Command = registers.Command,
-                        CylinderHigh = (byte) (registers.LbaHigh & 0xFF),
-                        CylinderLow = (byte) (registers.LbaMid & 0xFF),
-                        DeviceHead = registers.DeviceHead,
-                        Features = (byte) (registers.Feature & 0xFF),
-                        SectorCount = (byte) (registers.SectorCount & 0xFF),
-                        SectorNumber = (byte) (registers.LbaLow & 0xFF)
+                        Command      = registers.Command, CylinderHigh = (byte)(registers.LbaHigh & 0xFF),
+                        CylinderLow  = (byte)(registers.LbaMid                                    & 0xFF),
+                        DeviceHead   = registers.DeviceHead,
+                        Features     = (byte)(registers.Feature     & 0xFF),
+                        SectorCount  = (byte)(registers.SectorCount & 0xFF),
+                        SectorNumber = (byte)(registers.LbaLow      & 0xFF)
                     }
                 },
                 dataBuffer = new byte[64 * 512]
             };
 
-            switch (protocol)
+            switch(protocol)
             {
                 case AtaProtocol.PioIn:
                 case AtaProtocol.UDmaIn:
                 case AtaProtocol.Dma:
                     aptdBuf.aptd.AtaFlags = AtaFlags.DataIn;
+
                     break;
                 case AtaProtocol.PioOut:
                 case AtaProtocol.UDmaOut:
                     aptdBuf.aptd.AtaFlags = AtaFlags.DataOut;
+
                     break;
             }
 
-            switch (protocol)
+            switch(protocol)
             {
                 case AtaProtocol.Dma:
                 case AtaProtocol.DmaQueued:
@@ -400,6 +396,7 @@ namespace Aaru.Devices.Windows
                 case AtaProtocol.UDmaIn:
                 case AtaProtocol.UDmaOut:
                     aptdBuf.aptd.AtaFlags |= AtaFlags.Dma;
+
                     break;
             }
 
@@ -408,74 +405,83 @@ namespace Aaru.Devices.Windows
             // Unknown if needed
             aptdBuf.aptd.AtaFlags |= AtaFlags.DrdyRequired;
 
-            uint k = 0;
-            var error = 0;
+            uint k     = 0;
+            int  error = 0;
 
             Array.Copy(buffer, 0, aptdBuf.dataBuffer, 0, buffer.Length);
 
-            var start = DateTime.Now;
-            sense = !Extern.DeviceIoControlAta(fd, WindowsIoctl.IoctlAtaPassThrough, ref aptdBuf,
-                (uint) Marshal.SizeOf(aptdBuf), ref aptdBuf,
-                (uint) Marshal.SizeOf(aptdBuf), ref k, IntPtr.Zero);
-            var end = DateTime.Now;
+            DateTime start = DateTime.Now;
 
-            if (sense) error = Marshal.GetLastWin32Error();
+            sense = !Extern.DeviceIoControlAta(fd, WindowsIoctl.IoctlAtaPassThrough, ref aptdBuf,
+                                               (uint)Marshal.SizeOf(aptdBuf), ref aptdBuf,
+                                               (uint)Marshal.SizeOf(aptdBuf), ref k, IntPtr.Zero);
+
+            DateTime end = DateTime.Now;
+
+            if(sense)
+                error = Marshal.GetLastWin32Error();
 
             Array.Copy(aptdBuf.dataBuffer, 0, buffer, 0, buffer.Length);
 
             duration = (end - start).TotalMilliseconds;
 
-            errorRegisters.SectorCount = (ushort) ((aptdBuf.aptd.PreviousTaskFile.SectorCount << 8) +
-                                                   aptdBuf.aptd.CurrentTaskFile.SectorCount);
-            errorRegisters.LbaLow = (ushort) ((aptdBuf.aptd.PreviousTaskFile.SectorNumber << 8) +
-                                              aptdBuf.aptd.CurrentTaskFile.SectorNumber);
-            errorRegisters.LbaMid = (ushort) ((aptdBuf.aptd.PreviousTaskFile.CylinderLow << 8) +
-                                              aptdBuf.aptd.CurrentTaskFile.CylinderLow);
-            errorRegisters.LbaHigh = (ushort) ((aptdBuf.aptd.PreviousTaskFile.CylinderHigh << 8) +
-                                               aptdBuf.aptd.CurrentTaskFile.CylinderHigh);
+            errorRegisters.SectorCount = (ushort)((aptdBuf.aptd.PreviousTaskFile.SectorCount << 8) +
+                                                  aptdBuf.aptd.CurrentTaskFile.SectorCount);
+
+            errorRegisters.LbaLow = (ushort)((aptdBuf.aptd.PreviousTaskFile.SectorNumber << 8) +
+                                             aptdBuf.aptd.CurrentTaskFile.SectorNumber);
+
+            errorRegisters.LbaMid = (ushort)((aptdBuf.aptd.PreviousTaskFile.CylinderLow << 8) +
+                                             aptdBuf.aptd.CurrentTaskFile.CylinderLow);
+
+            errorRegisters.LbaHigh = (ushort)((aptdBuf.aptd.PreviousTaskFile.CylinderHigh << 8) +
+                                              aptdBuf.aptd.CurrentTaskFile.CylinderHigh);
+
             errorRegisters.DeviceHead = aptdBuf.aptd.CurrentTaskFile.DeviceHead;
-            errorRegisters.Error = aptdBuf.aptd.CurrentTaskFile.Error;
-            errorRegisters.Status = aptdBuf.aptd.CurrentTaskFile.Status;
+            errorRegisters.Error      = aptdBuf.aptd.CurrentTaskFile.Error;
+            errorRegisters.Status     = aptdBuf.aptd.CurrentTaskFile.Status;
 
             sense = errorRegisters.Error != 0 || (errorRegisters.Status & 0xA5) != 0;
 
             return error;
         }
 
-        /// <summary>
-        ///     Gets the device number for a specified handle
-        /// </summary>
+        /// <summary>Gets the device number for a specified handle</summary>
         /// <param name="deviceHandle">Device handle</param>
         /// <returns>Device number</returns>
-        private static uint GetDeviceNumber(SafeFileHandle deviceHandle)
+        static uint GetDeviceNumber(SafeFileHandle deviceHandle)
         {
-            var sdn = new StorageDeviceNumber {deviceNumber = -1};
-            uint k = 0;
-            if (!Extern.DeviceIoControlGetDeviceNumber(deviceHandle, WindowsIoctl.IoctlStorageGetDeviceNumber,
-                IntPtr.Zero, 0, ref sdn, (uint) Marshal.SizeOf(sdn), ref k,
-                IntPtr.Zero)) return uint.MaxValue;
+            var sdn = new StorageDeviceNumber
+            {
+                deviceNumber = -1
+            };
 
-            return (uint) sdn.deviceNumber;
+            uint k = 0;
+
+            if(!Extern.DeviceIoControlGetDeviceNumber(deviceHandle, WindowsIoctl.IoctlStorageGetDeviceNumber,
+                                                      IntPtr.Zero, 0, ref sdn, (uint)Marshal.SizeOf(sdn), ref k,
+                                                      IntPtr.Zero))
+                return uint.MaxValue;
+
+            return (uint)sdn.deviceNumber;
         }
 
-        /// <summary>
-        ///     Returns true if the specified handle is controlled by a SFFDISK (aka SDHCI) driver
-        /// </summary>
+        /// <summary>Returns true if the specified handle is controlled by a SFFDISK (aka SDHCI) driver</summary>
         /// <param name="fd">Device handle</param>
         /// <returns><c>true</c> if SDHCI, false otherwise</returns>
         internal static bool IsSdhci(SafeFileHandle fd)
         {
             var queryData1 = new SffdiskQueryDeviceProtocolData();
-            queryData1.size = (ushort) Marshal.SizeOf(queryData1);
+            queryData1.size = (ushort)Marshal.SizeOf(queryData1);
+
             Extern.DeviceIoControl(fd, WindowsIoctl.IoctlSffdiskQueryDeviceProtocol, IntPtr.Zero, 0, ref queryData1,
-                queryData1.size, out _, IntPtr.Zero);
+                                   queryData1.size, out _, IntPtr.Zero);
+
             return queryData1.protocolGuid.Equals(Consts.GuidSffProtocolSd) ||
                    queryData1.protocolGuid.Equals(Consts.GuidSffProtocolMmc);
         }
 
-        /// <summary>
-        ///     Sends a MMC/SD command
-        /// </summary>
+        /// <summary>Sends a MMC/SD command</summary>
         /// <returns>The result of the command.</returns>
         /// <param name="fd">File handle</param>
         /// <param name="command">MMC/SD opcode</param>
@@ -490,61 +496,74 @@ namespace Aaru.Devices.Windows
         /// <param name="argument">Command argument</param>
         /// <param name="response">Response registers</param>
         /// <param name="blockSize">Size of block in bytes</param>
-        internal static int SendMmcCommand(SafeFileHandle fd, MmcCommands command, bool write,
-            bool isApplication,
-            MmcFlags flags, uint argument, uint blockSize,
-            uint blocks,
-            ref byte[] buffer, out uint[] response, out double duration,
-            out bool sense,
-            uint timeout = 0)
+        internal static int SendMmcCommand(SafeFileHandle fd, MmcCommands command, bool write, bool isApplication,
+                                           MmcFlags flags, uint argument, uint blockSize, uint blocks,
+                                           ref byte[] buffer, out uint[] response, out double duration, out bool sense,
+                                           uint timeout = 0)
         {
-            var commandData = new SffdiskDeviceCommandData();
+            var commandData       = new SffdiskDeviceCommandData();
             var commandDescriptor = new SdCmdDescriptor();
-            commandData.size = (ushort) Marshal.SizeOf(commandData);
-            commandData.command = SffdiskDcmd.DeviceCommand;
-            commandData.protocolArgumentSize = (ushort) Marshal.SizeOf(commandDescriptor);
-            commandData.deviceDataBufferSize = blockSize * blocks;
-            commandDescriptor.commandCode = (byte) command;
-            commandDescriptor.cmdClass = isApplication ? SdCommandClass.AppCmd : SdCommandClass.Standard;
+            commandData.size                    = (ushort)Marshal.SizeOf(commandData);
+            commandData.command                 = SffdiskDcmd.DeviceCommand;
+            commandData.protocolArgumentSize    = (ushort)Marshal.SizeOf(commandDescriptor);
+            commandData.deviceDataBufferSize    = blockSize * blocks;
+            commandDescriptor.commandCode       = (byte)command;
+            commandDescriptor.cmdClass          = isApplication ? SdCommandClass.AppCmd : SdCommandClass.Standard;
             commandDescriptor.transferDirection = write ? SdTransferDirection.Write : SdTransferDirection.Read;
-            commandDescriptor.transferType = flags.HasFlag(MmcFlags.CommandAdtc)
-                ? SdTransferType.SingleBlock
-                : SdTransferType.CmdOnly;
+
+            commandDescriptor.transferType = flags.HasFlag(MmcFlags.CommandAdtc) ? SdTransferType.SingleBlock
+                                                 : SdTransferType.CmdOnly;
+
             commandDescriptor.responseType = 0;
 
-            if (flags.HasFlag(MmcFlags.ResponseR1) || flags.HasFlag(MmcFlags.ResponseSpiR1))
+            if(flags.HasFlag(MmcFlags.ResponseR1) ||
+               flags.HasFlag(MmcFlags.ResponseSpiR1))
                 commandDescriptor.responseType = SdResponseType.R1;
-            if (flags.HasFlag(MmcFlags.ResponseR1B) || flags.HasFlag(MmcFlags.ResponseSpiR1B))
-                commandDescriptor.responseType = SdResponseType.R1b;
-            if (flags.HasFlag(MmcFlags.ResponseR2) || flags.HasFlag(MmcFlags.ResponseSpiR2))
-                commandDescriptor.responseType = SdResponseType.R2;
-            if (flags.HasFlag(MmcFlags.ResponseR3) || flags.HasFlag(MmcFlags.ResponseSpiR3))
-                commandDescriptor.responseType = SdResponseType.R3;
-            if (flags.HasFlag(MmcFlags.ResponseR4) || flags.HasFlag(MmcFlags.ResponseSpiR4))
-                commandDescriptor.responseType = SdResponseType.R4;
-            if (flags.HasFlag(MmcFlags.ResponseR5) || flags.HasFlag(MmcFlags.ResponseSpiR5))
-                commandDescriptor.responseType = SdResponseType.R5;
-            if (flags.HasFlag(MmcFlags.ResponseR6)) commandDescriptor.responseType = SdResponseType.R6;
 
-            var commandB = new byte[commandData.size + commandData.protocolArgumentSize +
-                                    commandData.deviceDataBufferSize];
+            if(flags.HasFlag(MmcFlags.ResponseR1B) ||
+               flags.HasFlag(MmcFlags.ResponseSpiR1B))
+                commandDescriptor.responseType = SdResponseType.R1b;
+
+            if(flags.HasFlag(MmcFlags.ResponseR2) ||
+               flags.HasFlag(MmcFlags.ResponseSpiR2))
+                commandDescriptor.responseType = SdResponseType.R2;
+
+            if(flags.HasFlag(MmcFlags.ResponseR3) ||
+               flags.HasFlag(MmcFlags.ResponseSpiR3))
+                commandDescriptor.responseType = SdResponseType.R3;
+
+            if(flags.HasFlag(MmcFlags.ResponseR4) ||
+               flags.HasFlag(MmcFlags.ResponseSpiR4))
+                commandDescriptor.responseType = SdResponseType.R4;
+
+            if(flags.HasFlag(MmcFlags.ResponseR5) ||
+               flags.HasFlag(MmcFlags.ResponseSpiR5))
+                commandDescriptor.responseType = SdResponseType.R5;
+
+            if(flags.HasFlag(MmcFlags.ResponseR6))
+                commandDescriptor.responseType = SdResponseType.R6;
+
+            byte[] commandB = new byte[commandData.size + commandData.protocolArgumentSize +
+                                       commandData.deviceDataBufferSize];
 
             Array.Copy(buffer, 0, commandB, commandData.size + commandData.protocolArgumentSize, buffer.Length);
-            var hBuf = Marshal.AllocHGlobal(commandB.Length);
+            IntPtr hBuf = Marshal.AllocHGlobal(commandB.Length);
             Marshal.StructureToPtr(commandData, hBuf, true);
             var descriptorOffset = IntPtr.Add(hBuf, commandData.size);
             Marshal.StructureToPtr(commandDescriptor, descriptorOffset, true);
             Marshal.Copy(hBuf, commandB, 0, commandB.Length);
             Marshal.FreeHGlobal(hBuf);
 
-            var error = 0;
-            var start = DateTime.Now;
-            sense = !Extern.DeviceIoControl(fd, WindowsIoctl.IoctlSffdiskDeviceCommand, commandB,
-                (uint) commandB.Length,
-                commandB, (uint) commandB.Length, out _, IntPtr.Zero);
-            var end = DateTime.Now;
+            int      error = 0;
+            DateTime start = DateTime.Now;
 
-            if (sense) error = Marshal.GetLastWin32Error();
+            sense = !Extern.DeviceIoControl(fd, WindowsIoctl.IoctlSffdiskDeviceCommand, commandB, (uint)commandB.Length,
+                                            commandB, (uint)commandB.Length, out _, IntPtr.Zero);
+
+            DateTime end = DateTime.Now;
+
+            if(sense)
+                error = Marshal.GetLastWin32Error();
 
             buffer = new byte[blockSize * blocks];
             Buffer.BlockCopy(commandB, commandB.Length - buffer.Length, buffer, 0, buffer.Length);
diff --git a/Aaru.Devices/Windows/Enums.cs b/Aaru.Devices/Windows/Enums.cs
index 36d7e5946..cbd30877f 100644
--- a/Aaru.Devices/Windows/Enums.cs
+++ b/Aaru.Devices/Windows/Enums.cs
@@ -39,509 +39,316 @@ namespace Aaru.Devices.Windows
     [Flags]
     internal enum FileAttributes : uint
     {
-        /// <summary>
-        ///     FILE_ATTRIBUTE_ARCHIVE
-        /// </summary>
+        /// <summary>FILE_ATTRIBUTE_ARCHIVE</summary>
         Archive = 0x20,
 
-        /// <summary>
-        ///     FILE_ATTRIBUTE_COMPRESSED
-        /// </summary>
+        /// <summary>FILE_ATTRIBUTE_COMPRESSED</summary>
         Compressed = 0x800,
 
-        /// <summary>
-        ///     FILE_ATTRIBUTE_DEVICE
-        /// </summary>
+        /// <summary>FILE_ATTRIBUTE_DEVICE</summary>
         Device = 0x40,
 
-        /// <summary>
-        ///     FILE_ATTRIBUTE_DIRECTORY
-        /// </summary>
+        /// <summary>FILE_ATTRIBUTE_DIRECTORY</summary>
         Directory = 0x10,
 
-        /// <summary>
-        ///     FILE_ATTRIBUTE_ENCRYPTED
-        /// </summary>
+        /// <summary>FILE_ATTRIBUTE_ENCRYPTED</summary>
         Encrypted = 0x4000,
 
-        /// <summary>
-        ///     FILE_ATTRIBUTE_HIDDEN
-        /// </summary>
+        /// <summary>FILE_ATTRIBUTE_HIDDEN</summary>
         Hidden = 0x02,
 
-        /// <summary>
-        ///     FILE_ATTRIBUTE_INTEGRITY_STREAM
-        /// </summary>
+        /// <summary>FILE_ATTRIBUTE_INTEGRITY_STREAM</summary>
         IntegrityStream = 0x8000,
 
-        /// <summary>
-        ///     FILE_ATTRIBUTE_NORMAL
-        /// </summary>
+        /// <summary>FILE_ATTRIBUTE_NORMAL</summary>
         Normal = 0x80,
 
-        /// <summary>
-        ///     FILE_ATTRIBUTE_NOT_CONTENT_INDEXED
-        /// </summary>
+        /// <summary>FILE_ATTRIBUTE_NOT_CONTENT_INDEXED</summary>
         NotContentIndexed = 0x2000,
 
-        /// <summary>
-        ///     FILE_ATTRIBUTE_NO_SCRUB_DATA
-        /// </summary>
+        /// <summary>FILE_ATTRIBUTE_NO_SCRUB_DATA</summary>
         NoScrubData = 0x20000,
 
-        /// <summary>
-        ///     FILE_ATTRIBUTE_OFFLINE
-        /// </summary>
+        /// <summary>FILE_ATTRIBUTE_OFFLINE</summary>
         Offline = 0x1000,
 
-        /// <summary>
-        ///     FILE_ATTRIBUTE_READONLY
-        /// </summary>
+        /// <summary>FILE_ATTRIBUTE_READONLY</summary>
         Readonly = 0x01,
 
-        /// <summary>
-        ///     FILE_ATTRIBUTE_REPARSE_POINT
-        /// </summary>
+        /// <summary>FILE_ATTRIBUTE_REPARSE_POINT</summary>
         ReparsePoint = 0x400,
 
-        /// <summary>
-        ///     FILE_ATTRIBUTE_SPARSE_FILE
-        /// </summary>
+        /// <summary>FILE_ATTRIBUTE_SPARSE_FILE</summary>
         SparseFile = 0x200,
 
-        /// <summary>
-        ///     FILE_ATTRIBUTE_SYSTEM
-        /// </summary>
+        /// <summary>FILE_ATTRIBUTE_SYSTEM</summary>
         System = 0x04,
 
-        /// <summary>
-        ///     FILE_ATTRIBUTE_TEMPORARY
-        /// </summary>
+        /// <summary>FILE_ATTRIBUTE_TEMPORARY</summary>
         Temporary = 0x100,
 
-        /// <summary>
-        ///     FILE_ATTRIBUTE_VIRTUAL
-        /// </summary>
+        /// <summary>FILE_ATTRIBUTE_VIRTUAL</summary>
         Virtual = 0x10000,
 
-        /// <summary>
-        ///     FILE_FLAG_BACKUP_SEMANTICS
-        /// </summary>
+        /// <summary>FILE_FLAG_BACKUP_SEMANTICS</summary>
         BackupSemantics = 0x02000000,
 
-        /// <summary>
-        ///     FILE_FLAG_DELETE_ON_CLOSE
-        /// </summary>
+        /// <summary>FILE_FLAG_DELETE_ON_CLOSE</summary>
         DeleteOnClose = 0x04000000,
 
-        /// <summary>
-        ///     FILE_FLAG_NO_BUFFERING
-        /// </summary>
+        /// <summary>FILE_FLAG_NO_BUFFERING</summary>
         NoBuffering = 0x20000000,
 
-        /// <summary>
-        ///     FILE_FLAG_OPEN_NO_RECALL
-        /// </summary>
+        /// <summary>FILE_FLAG_OPEN_NO_RECALL</summary>
         OpenNoRecall = 0x00100000,
 
-        /// <summary>
-        ///     FILE_FLAG_OPEN_REPARSE_POINT
-        /// </summary>
+        /// <summary>FILE_FLAG_OPEN_REPARSE_POINT</summary>
         OpenReparsePoint = 0x00200000,
 
-        /// <summary>
-        ///     FILE_FLAG_OVERLAPPED
-        /// </summary>
+        /// <summary>FILE_FLAG_OVERLAPPED</summary>
         Overlapped = 0x40000000,
 
-        /// <summary>
-        ///     FILE_FLAG_POSIX_SEMANTICS
-        /// </summary>
+        /// <summary>FILE_FLAG_POSIX_SEMANTICS</summary>
         PosixSemantics = 0x0100000,
 
-        /// <summary>
-        ///     FILE_FLAG_RANDOM_ACCESS
-        /// </summary>
+        /// <summary>FILE_FLAG_RANDOM_ACCESS</summary>
         RandomAccess = 0x10000000,
 
-        /// <summary>
-        ///     FILE_FLAG_SESSION_AWARE
-        /// </summary>
+        /// <summary>FILE_FLAG_SESSION_AWARE</summary>
         SessionAware = 0x00800000,
 
-        /// <summary>
-        ///     FILE_FLAG_SEQUENTIAL_SCAN
-        /// </summary>
+        /// <summary>FILE_FLAG_SEQUENTIAL_SCAN</summary>
         SequentialScan = 0x08000000,
 
-        /// <summary>
-        ///     FILE_FLAG_WRITE_THROUGH
-        /// </summary>
+        /// <summary>FILE_FLAG_WRITE_THROUGH</summary>
         WriteThrough = 0x80000000
     }
 
     [Flags]
     internal enum FileAccess : uint
     {
-        /// <summary>
-        ///     FILE_READ_DATA
-        /// </summary>
+        /// <summary>FILE_READ_DATA</summary>
         ReadData = 0x0001,
 
-        /// <summary>
-        ///     FILE_LIST_DIRECTORY
-        /// </summary>
+        /// <summary>FILE_LIST_DIRECTORY</summary>
         ListDirectory = ReadData,
 
-        /// <summary>
-        ///     FILE_WRITE_DATA
-        /// </summary>
+        /// <summary>FILE_WRITE_DATA</summary>
         WriteData = 0x0002,
 
-        /// <summary>
-        ///     FILE_ADD_FILE
-        /// </summary>
+        /// <summary>FILE_ADD_FILE</summary>
         AddFile = WriteData,
 
-        /// <summary>
-        ///     FILE_APPEND_DATA
-        /// </summary>
+        /// <summary>FILE_APPEND_DATA</summary>
         AppendData = 0x0004,
 
-        /// <summary>
-        ///     FILE_ADD_SUBDIRECTORY
-        /// </summary>
+        /// <summary>FILE_ADD_SUBDIRECTORY</summary>
         AddSubdirectory = AppendData,
 
-        /// <summary>
-        ///     FILE_CREATE_PIPE_INSTANCE
-        /// </summary>
+        /// <summary>FILE_CREATE_PIPE_INSTANCE</summary>
         CreatePipeInstance = AppendData,
 
-        /// <summary>
-        ///     FILE_READ_EA
-        /// </summary>
+        /// <summary>FILE_READ_EA</summary>
         ReadEa = 0x0008,
 
-        /// <summary>
-        ///     FILE_WRITE_EA
-        /// </summary>
+        /// <summary>FILE_WRITE_EA</summary>
         WriteEa = 0x0010,
 
-        /// <summary>
-        ///     FILE_EXECUTE
-        /// </summary>
+        /// <summary>FILE_EXECUTE</summary>
         Execute = 0x0020,
 
-        /// <summary>
-        ///     FILE_TRAVERSE
-        /// </summary>
+        /// <summary>FILE_TRAVERSE</summary>
         Traverse = Execute,
 
-        /// <summary>
-        ///     FILE_DELETE_CHILD
-        /// </summary>
+        /// <summary>FILE_DELETE_CHILD</summary>
         DeleteChild = 0x0040,
 
-        /// <summary>
-        ///     FILE_READ_ATTRIBUTES
-        /// </summary>
+        /// <summary>FILE_READ_ATTRIBUTES</summary>
         ReadAttributes = 0x0080,
 
-        /// <summary>
-        ///     FILE_WRITE_ATTRIBUTES
-        /// </summary>
+        /// <summary>FILE_WRITE_ATTRIBUTES</summary>
         WriteAttributes = 0x0100,
 
-        /// <summary>
-        ///     GENERIC_READ
-        /// </summary>
+        /// <summary>GENERIC_READ</summary>
         GenericRead = 0x80000000,
 
-        /// <summary>
-        ///     GENERIC_WRITE
-        /// </summary>
+        /// <summary>GENERIC_WRITE</summary>
         GenericWrite = 0x40000000,
 
-        /// <summary>
-        ///     GENERIC_EXECUTE
-        /// </summary>
+        /// <summary>GENERIC_EXECUTE</summary>
         GenericExecute = 0x20000000,
 
-        /// <summary>
-        ///     GENERIC_ALL
-        /// </summary>
+        /// <summary>GENERIC_ALL</summary>
         GenericAll = 0x10000000
     }
 
     [Flags]
     internal enum FileShare : uint
     {
-        /// <summary>
-        ///     FILE_SHARE_NONE
-        /// </summary>
+        /// <summary>FILE_SHARE_NONE</summary>
         None = 0x00,
 
-        /// <summary>
-        ///     FILE_SHARE_READ
-        /// </summary>
+        /// <summary>FILE_SHARE_READ</summary>
         Read = 0x01,
 
-        /// <summary>
-        ///     FILE_SHARE_WRITE
-        /// </summary>
+        /// <summary>FILE_SHARE_WRITE</summary>
         Write = 0x02,
 
-        /// <summary>
-        ///     FILE_SHARE_DELETE
-        /// </summary>
+        /// <summary>FILE_SHARE_DELETE</summary>
         Delete = 0x03
     }
 
     [Flags]
     internal enum FileMode : uint
     {
-        /// <summary>
-        ///     NEW
-        /// </summary>
+        /// <summary>NEW</summary>
         New = 0x01,
 
-        /// <summary>
-        ///     CREATE_ALWAYS
-        /// </summary>
+        /// <summary>CREATE_ALWAYS</summary>
         CreateAlways = 0x02,
 
-        /// <summary>
-        ///     OPEN_EXISTING
-        /// </summary>
+        /// <summary>OPEN_EXISTING</summary>
         OpenExisting = 0x03,
 
-        /// <summary>
-        ///     OPEN_ALWAYS
-        /// </summary>
+        /// <summary>OPEN_ALWAYS</summary>
         OpenAlways = 0x04,
 
-        /// <summary>
-        ///     TRUNCATE_EXISTING
-        /// </summary>
+        /// <summary>TRUNCATE_EXISTING</summary>
         TruncateExisting = 0x05
     }
 
-    /// <summary>
-    ///     Direction of SCSI transfer
-    /// </summary>
+    /// <summary>Direction of SCSI transfer</summary>
     internal enum ScsiIoctlDirection : byte
     {
-        /// <summary>
-        ///     From host to device
-        ///     SCSI_IOCTL_DATA_OUT
-        /// </summary>
+        /// <summary>From host to device SCSI_IOCTL_DATA_OUT</summary>
         Out = 0,
 
-        /// <summary>
-        ///     From device to host
-        ///     SCSI_IOCTL_DATA_IN
-        /// </summary>
+        /// <summary>From device to host SCSI_IOCTL_DATA_IN</summary>
         In = 1,
 
-        /// <summary>
-        ///     Unspecified direction, or bidirectional, or no data
-        ///     SCSI_IOCTL_DATA_UNSPECIFIED
-        /// </summary>
+        /// <summary>Unspecified direction, or bidirectional, or no data SCSI_IOCTL_DATA_UNSPECIFIED</summary>
         Unspecified = 2
     }
 
     internal enum WindowsIoctl : uint
     {
-        IoctlAtaPassThrough = 0x4D02C,
-        IoctlAtaPassThroughDirect = 0x4D030,
+        IoctlAtaPassThrough = 0x4D02C, IoctlAtaPassThroughDirect = 0x4D030,
 
-        /// <summary>
-        ///     ScsiPassThrough
-        /// </summary>
+        /// <summary>ScsiPassThrough</summary>
         IoctlScsiPassThrough = 0x4D004,
 
-        /// <summary>
-        ///     ScsiPassThroughDirect
-        /// </summary>
+        /// <summary>ScsiPassThroughDirect</summary>
         IoctlScsiPassThroughDirect = 0x4D014,
 
-        /// <summary>
-        ///     ScsiGetAddress
-        /// </summary>
-        IoctlScsiGetAddress = 0x41018,
-        IoctlStorageQueryProperty = 0x2D1400,
-        IoctlIdePassThrough = 0x4D028,
-        IoctlStorageGetDeviceNumber = 0x2D1080,
-        IoctlSffdiskQueryDeviceProtocol = 0x71E80,
-        IoctlSffdiskDeviceCommand = 0x79E84
+        /// <summary>ScsiGetAddress</summary>
+        IoctlScsiGetAddress = 0x41018, IoctlStorageQueryProperty = 0x2D1400, IoctlIdePassThrough             = 0x4D028,
+        IoctlStorageGetDeviceNumber                              = 0x2D1080, IoctlSffdiskQueryDeviceProtocol = 0x71E80,
+        IoctlSffdiskDeviceCommand                                = 0x79E84
     }
 
     [Flags]
     internal enum AtaFlags : ushort
     {
-        /// <summary>
-        ///     ATA_FLAGS_DRDY_REQUIRED
-        /// </summary>
+        /// <summary>ATA_FLAGS_DRDY_REQUIRED</summary>
         DrdyRequired = 0x01,
 
-        /// <summary>
-        ///     ATA_FLAGS_DATA_IN
-        /// </summary>
+        /// <summary>ATA_FLAGS_DATA_IN</summary>
         DataIn = 0x02,
 
-        /// <summary>
-        ///     ATA_FLAGS_DATA_OUT
-        /// </summary>
+        /// <summary>ATA_FLAGS_DATA_OUT</summary>
         DataOut = 0x04,
 
-        /// <summary>
-        ///     ATA_FLAGS_48BIT_COMMAND
-        /// </summary>
+        /// <summary>ATA_FLAGS_48BIT_COMMAND</summary>
         ExtendedCommand = 0x08,
 
-        /// <summary>
-        ///     ATA_FLAGS_USE_DMA
-        /// </summary>
+        /// <summary>ATA_FLAGS_USE_DMA</summary>
         Dma = 0x10,
 
-        /// <summary>
-        ///     ATA_FLAGS_NO_MULTIPLE
-        /// </summary>
+        /// <summary>ATA_FLAGS_NO_MULTIPLE</summary>
         NoMultiple = 0x20
     }
 
     internal enum StoragePropertyId
     {
-        Device = 0,
-        Adapter = 1,
-        Id = 2,
-        UniqueId = 3,
-        WriteCache = 4,
-        Miniport = 5,
-        AccessAlignment = 6,
-        SeekPenalty = 7,
-        Trim = 8,
-        WriteAggregation = 9,
-        Telemetry = 10,
-        LbProvisioning = 11,
-        Power = 12,
-        Copyoffload = 13,
-        Resiliency = 14
+        Device           = 0, Adapter      = 1, Id              = 2,
+        UniqueId         = 3, WriteCache   = 4, Miniport        = 5,
+        AccessAlignment  = 6, SeekPenalty  = 7, Trim            = 8,
+        WriteAggregation = 9, Telemetry    = 10, LbProvisioning = 11,
+        Power            = 12, Copyoffload = 13, Resiliency     = 14
     }
 
     internal enum StorageQueryType
     {
-        Standard = 0,
-        Exists = 1,
-        Mask = 2,
-        Max = 3
+        Standard = 0, Exists = 1, Mask = 2,
+        Max      = 3
     }
 
     [SuppressMessage("ReSharper", "InconsistentNaming")]
     internal enum StorageBusType
     {
-        Unknown = 0,
-        SCSI = 1,
-        ATAPI = 2,
-        ATA = 3,
-        FireWire = 4,
-        SSA = 5,
-        Fibre = 6,
-        USB = 7,
-        RAID = 8,
-        iSCSI = 9,
-        SAS = 0xA,
-        SATA = 0xB,
-        SecureDigital = 0xC,
-        MultiMediaCard = 0xD,
-        Virtual = 0xE,
-        FileBackedVirtual = 0xF,
-        Spaces = 16,
-        SCM = 18,
-        UFS = 19,
-        Max = 20,
-        MaxReserved = 127,
-        NVMe = 0x11
+        Unknown           = 0, SCSI             = 1, ATAPI        = 2,
+        ATA               = 3, FireWire         = 4, SSA          = 5,
+        Fibre             = 6, USB              = 7, RAID         = 8,
+        iSCSI             = 9, SAS              = 0xA, SATA       = 0xB,
+        SecureDigital     = 0xC, MultiMediaCard = 0xD, Virtual    = 0xE,
+        FileBackedVirtual = 0xF, Spaces         = 16, SCM         = 18,
+        UFS               = 19, Max             = 20, MaxReserved = 127,
+        NVMe              = 0x11
     }
 
     [Flags]
     internal enum DeviceGetClassFlags : uint
     {
-        /// <summary>
-        ///     DIGCF_DEFAULT
-        /// </summary>
+        /// <summary>DIGCF_DEFAULT</summary>
         Default = 0x01,
 
-        /// <summary>
-        ///     DIGCF_PRESENT
-        /// </summary>
+        /// <summary>DIGCF_PRESENT</summary>
         Present = 0x02,
 
-        /// <summary>
-        ///     DIGCF_ALLCLASSES
-        /// </summary>
+        /// <summary>DIGCF_ALLCLASSES</summary>
         AllClasses = 0x04,
 
-        /// <summary>
-        ///     DIGCF_PROFILE
-        /// </summary>
+        /// <summary>DIGCF_PROFILE</summary>
         Profile = 0x08,
 
-        /// <summary>
-        ///     DIGCF_DEVICEINTERFACE
-        /// </summary>
+        /// <summary>DIGCF_DEVICEINTERFACE</summary>
         DeviceInterface = 0x10
     }
 
     internal enum SdCommandClass : uint
     {
-        Standard,
-        AppCmd
+        Standard, AppCmd
     }
 
     internal enum SdTransferDirection : uint
     {
-        Unspecified,
-        Read,
-        Write
+        Unspecified, Read, Write
     }
 
     internal enum SdTransferType : uint
     {
-        Unspecified,
-        CmdOnly,
-        SingleBlock,
-        MultiBlock,
-        MultiBlockNoCmd12
+        Unspecified, CmdOnly, SingleBlock,
+        MultiBlock, MultiBlockNoCmd12
     }
 
     [SuppressMessage("ReSharper", "InconsistentNaming")]
     internal enum SdResponseType : uint
     {
-        Unspecified,
-        None,
-        R1,
-        R1b,
-        R2,
-        R3,
-        R4,
-        R5,
-        R5b,
+        Unspecified, None, R1,
+        R1b, R2, R3,
+        R4, R5, R5b,
         R6
     }
 
     internal enum SffdiskDcmd : uint
     {
-        GetVersion,
-        LockChannel,
-        UnlockChannel,
+        GetVersion, LockChannel, UnlockChannel,
         DeviceCommand
     }
 
     internal static class Consts
     {
-        public static Guid GuidSffProtocolSd = new Guid("AD7536A8-D055-4C40-AA4D-96312DDB6B38");
+        public static Guid GuidSffProtocolSd  = new Guid("AD7536A8-D055-4C40-AA4D-96312DDB6B38");
         public static Guid GuidSffProtocolMmc = new Guid("77274D3F-2365-4491-A030-8BB44AE60097");
 
         public static Guid GuidDevinterfaceDisk =
diff --git a/Aaru.Devices/Windows/Extern.cs b/Aaru.Devices/Windows/Extern.cs
index 0c7ec5f35..6da24cf3e 100644
--- a/Aaru.Devices/Windows/Extern.cs
+++ b/Aaru.Devices/Windows/Extern.cs
@@ -41,96 +41,71 @@ namespace Aaru.Devices.Windows
     {
         [DllImport("kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)]
         internal static extern SafeFileHandle CreateFile([MarshalAs(UnmanagedType.LPTStr)] string filename,
-            [MarshalAs(UnmanagedType.U4)] FileAccess access,
-            [MarshalAs(UnmanagedType.U4)] FileShare share,
-            IntPtr
-                securityAttributes, // optional SECURITY_ATTRIBUTES struct or IntPtr.Zero
-            [MarshalAs(UnmanagedType.U4)] FileMode creationDisposition,
-            [MarshalAs(UnmanagedType.U4)] FileAttributes flagsAndAttributes, IntPtr templateFile);
+                                                         [MarshalAs(UnmanagedType.U4)] FileAccess access,
+                                                         [MarshalAs(UnmanagedType.U4)] FileShare share,
+                                                         IntPtr securityAttributes, // optional SECURITY_ATTRIBUTES struct or IntPtr.Zero
+                                                         [MarshalAs(UnmanagedType.U4)] FileMode creationDisposition,
+                                                         [MarshalAs(UnmanagedType.U4)]
+                                                         FileAttributes flagsAndAttributes, IntPtr templateFile);
 
         [DllImport("Kernel32.dll", SetLastError = true, EntryPoint = "DeviceIoControl", CharSet = CharSet.Auto)]
-        internal static extern bool DeviceIoControlScsi(SafeFileHandle hDevice,
-            WindowsIoctl ioControlCode,
-            ref ScsiPassThroughDirectAndSenseBuffer inBuffer,
-            uint nInBufferSize,
-            ref ScsiPassThroughDirectAndSenseBuffer outBuffer,
-            uint nOutBufferSize,
-            ref uint pBytesReturned,
-            IntPtr overlapped);
+        internal static extern bool DeviceIoControlScsi(SafeFileHandle hDevice, WindowsIoctl ioControlCode,
+                                                        ref ScsiPassThroughDirectAndSenseBuffer inBuffer,
+                                                        uint nInBufferSize,
+                                                        ref ScsiPassThroughDirectAndSenseBuffer outBuffer,
+                                                        uint nOutBufferSize, ref uint pBytesReturned,
+                                                        IntPtr overlapped);
 
         [DllImport("Kernel32.dll", SetLastError = true, EntryPoint = "DeviceIoControl", CharSet = CharSet.Auto)]
-        internal static extern bool DeviceIoControlAta(SafeFileHandle hDevice,
-            WindowsIoctl ioControlCode,
-            ref AtaPassThroughExBuffer inBuffer,
-            uint nInBufferSize,
-            ref AtaPassThroughExBuffer outBuffer,
-            uint nOutBufferSize,
-            ref uint pBytesReturned, IntPtr overlapped);
+        internal static extern bool DeviceIoControlAta(SafeFileHandle hDevice, WindowsIoctl ioControlCode,
+                                                       ref AtaPassThroughExBuffer inBuffer, uint nInBufferSize,
+                                                       ref AtaPassThroughExBuffer outBuffer, uint nOutBufferSize,
+                                                       ref uint pBytesReturned, IntPtr overlapped);
 
         [DllImport("Kernel32.dll", SetLastError = true, EntryPoint = "DeviceIoControl", CharSet = CharSet.Auto)]
-        internal static extern bool DeviceIoControlStorageQuery(SafeFileHandle hDevice,
-            WindowsIoctl ioControlCode,
-            ref StoragePropertyQuery inBuffer,
-            uint nInBufferSize,
-            IntPtr outBuffer,
-            uint nOutBufferSize,
-            ref uint pBytesReturned,
-            IntPtr overlapped);
+        internal static extern bool DeviceIoControlStorageQuery(SafeFileHandle hDevice, WindowsIoctl ioControlCode,
+                                                                ref StoragePropertyQuery inBuffer, uint nInBufferSize,
+                                                                IntPtr outBuffer, uint nOutBufferSize,
+                                                                ref uint pBytesReturned, IntPtr overlapped);
 
         [DllImport("Kernel32.dll", SetLastError = true, EntryPoint = "DeviceIoControl", CharSet = CharSet.Auto)]
-        internal static extern bool DeviceIoControlIde(SafeFileHandle hDevice,
-            WindowsIoctl ioControlCode,
-            ref IdePassThroughDirect inBuffer,
-            uint nInBufferSize,
-            ref IdePassThroughDirect outBuffer,
-            uint nOutBufferSize,
-            ref uint pBytesReturned,
-            IntPtr overlapped);
+        internal static extern bool DeviceIoControlIde(SafeFileHandle hDevice, WindowsIoctl ioControlCode,
+                                                       ref IdePassThroughDirect inBuffer, uint nInBufferSize,
+                                                       ref IdePassThroughDirect outBuffer, uint nOutBufferSize,
+                                                       ref uint pBytesReturned, IntPtr overlapped);
 
         [DllImport("Kernel32.dll", SetLastError = true, EntryPoint = "DeviceIoControl", CharSet = CharSet.Auto)]
-        internal static extern bool DeviceIoControlGetDeviceNumber(SafeFileHandle hDevice,
-            WindowsIoctl ioControlCode,
-            IntPtr inBuffer,
-            uint nInBufferSize,
-            ref StorageDeviceNumber outBuffer,
-            uint nOutBufferSize,
-            ref uint pBytesReturned,
-            IntPtr overlapped);
+        internal static extern bool DeviceIoControlGetDeviceNumber(SafeFileHandle hDevice, WindowsIoctl ioControlCode,
+                                                                   IntPtr inBuffer, uint nInBufferSize,
+                                                                   ref StorageDeviceNumber outBuffer,
+                                                                   uint nOutBufferSize, ref uint pBytesReturned,
+                                                                   IntPtr overlapped);
 
         [DllImport("Kernel32.dll", SetLastError = true, EntryPoint = "DeviceIoControl", CharSet = CharSet.Auto)]
-        internal static extern bool DeviceIoControl(SafeFileHandle hDevice,
-            WindowsIoctl ioControlCode, IntPtr inBuffer,
-            uint nInBufferSize,
-            ref SffdiskQueryDeviceProtocolData outBuffer,
-            uint nOutBufferSize,
-            out uint pBytesReturned,
-            IntPtr overlapped);
+        internal static extern bool DeviceIoControl(SafeFileHandle hDevice, WindowsIoctl ioControlCode, IntPtr inBuffer,
+                                                    uint nInBufferSize, ref SffdiskQueryDeviceProtocolData outBuffer,
+                                                    uint nOutBufferSize, out uint pBytesReturned, IntPtr overlapped);
 
         [DllImport("Kernel32.dll", SetLastError = true, EntryPoint = "DeviceIoControl", CharSet = CharSet.Auto)]
-        internal static extern bool DeviceIoControl(SafeFileHandle hDevice, WindowsIoctl ioControlCode,
-            byte[] inBuffer,
-            uint nInBufferSize, byte[] outBuffer,
-            uint nOutBufferSize,
-            out uint pBytesReturned, IntPtr overlapped);
+        internal static extern bool DeviceIoControl(SafeFileHandle hDevice, WindowsIoctl ioControlCode, byte[] inBuffer,
+                                                    uint nInBufferSize, byte[] outBuffer, uint nOutBufferSize,
+                                                    out uint pBytesReturned, IntPtr overlapped);
 
         [DllImport("setupapi.dll", CharSet = CharSet.Auto)]
         internal static extern SafeFileHandle SetupDiGetClassDevs(ref Guid classGuid, IntPtr enumerator,
-            IntPtr hwndParent, DeviceGetClassFlags flags);
+                                                                  IntPtr hwndParent, DeviceGetClassFlags flags);
 
         [DllImport("setupapi.dll", CharSet = CharSet.Auto, SetLastError = true)]
-        public static extern bool SetupDiEnumDeviceInterfaces(SafeFileHandle hDevInfo,
-            IntPtr devInfo,
-            ref Guid interfaceClassGuid,
-            uint memberIndex,
-            ref DeviceInterfaceData deviceInterfaceData);
+        public static extern bool SetupDiEnumDeviceInterfaces(SafeFileHandle hDevInfo, IntPtr devInfo,
+                                                              ref Guid interfaceClassGuid, uint memberIndex,
+                                                              ref DeviceInterfaceData deviceInterfaceData);
 
         [DllImport("setupapi.dll", CharSet = CharSet.Auto, SetLastError = true)]
         public static extern bool SetupDiGetDeviceInterfaceDetail(SafeFileHandle hDevInfo,
-            ref DeviceInterfaceData deviceInterfaceData,
-            IntPtr deviceInterfaceDetailData,
-            uint deviceInterfaceDetailDataSize,
-            ref uint requiredSize,
-            IntPtr deviceInfoData);
+                                                                  ref DeviceInterfaceData deviceInterfaceData,
+                                                                  IntPtr deviceInterfaceDetailData,
+                                                                  uint deviceInterfaceDetailDataSize,
+                                                                  ref uint requiredSize, IntPtr deviceInfoData);
 
         [DllImport("setupapi.dll", CharSet = CharSet.Auto, SetLastError = true)]
         public static extern bool SetupDiDestroyDeviceInfoList(SafeFileHandle hDevInfo);
diff --git a/Aaru.Devices/Windows/ListDevices.cs b/Aaru.Devices/Windows/ListDevices.cs
index 36b46bb7e..28d5ec763 100644
--- a/Aaru.Devices/Windows/ListDevices.cs
+++ b/Aaru.Devices/Windows/ListDevices.cs
@@ -37,148 +37,160 @@ using System.Linq;
 using System.Management;
 using System.Runtime.InteropServices;
 using System.Text;
+using Microsoft.Win32.SafeHandles;
 
 namespace Aaru.Devices.Windows
 {
     internal static class ListDevices
     {
-        /// <summary>
-        ///     Converts a hex dump string to the ASCII string it represents
-        /// </summary>
+        /// <summary>Converts a hex dump string to the ASCII string it represents</summary>
         /// <param name="hex">Hex dump</param>
         /// <returns>Decoded string</returns>
-        private static string HexStringToString(string hex)
+        static string HexStringToString(string hex)
         {
-            var result = new StringBuilder();
+            var          result   = new StringBuilder();
             const string HEXTABLE = "0123456789abcdef";
 
-            for (var i = 0; i < hex.Length / 2; i++)
-                result.Append((char) (16 * HEXTABLE.IndexOf(hex[2 * i]) + HEXTABLE.IndexOf(hex[2 * i + 1])));
+            for(int i = 0; i < hex.Length / 2; i++)
+                result.Append((char)((16 * HEXTABLE.IndexOf(hex[2 * i])) + HEXTABLE.IndexOf(hex[(2 * i) + 1])));
 
             return result.ToString();
         }
 
-        /// <summary>
-        ///     Gets a list of all known storage devices on Windows
-        /// </summary>
+        /// <summary>Gets a list of all known storage devices on Windows</summary>
         /// <returns>List of devices</returns>
         [SuppressMessage("ReSharper", "RedundantCatchClause")]
         internal static DeviceInfo[] GetList()
         {
-            var deviceIDs = new List<string>();
+            List<string> deviceIDs = new List<string>();
 
             try
             {
-                var mgmtObjSearcher =
-                    new ManagementObjectSearcher("SELECT * FROM Win32_DiskDrive");
-                var objCol = mgmtObjSearcher.Get();
+                var mgmtObjSearcher = new ManagementObjectSearcher("SELECT * FROM Win32_DiskDrive");
 
-                deviceIDs.AddRange(from ManagementObject drive in objCol select (string) drive["DeviceID"]);
+                ManagementObjectCollection objCol = mgmtObjSearcher.Get();
+
+                deviceIDs.AddRange(from ManagementObject drive in objCol select (string)drive["DeviceID"]);
 
                 mgmtObjSearcher = new ManagementObjectSearcher("SELECT * FROM Win32_TapeDrive");
-                objCol = mgmtObjSearcher.Get();
+                objCol          = mgmtObjSearcher.Get();
 
-                deviceIDs.AddRange(from ManagementObject drive in objCol select (string) drive["DeviceID"]);
+                deviceIDs.AddRange(from ManagementObject drive in objCol select (string)drive["DeviceID"]);
 
                 mgmtObjSearcher = new ManagementObjectSearcher("SELECT * FROM Win32_CDROMDrive");
-                objCol = mgmtObjSearcher.Get();
+                objCol          = mgmtObjSearcher.Get();
 
-                deviceIDs.AddRange(from ManagementObject drive in objCol select (string) drive["Drive"]);
+                deviceIDs.AddRange(from ManagementObject drive in objCol select (string)drive["Drive"]);
             }
-            catch (Exception)
+            catch(Exception)
             {
-#if DEBUG
+            #if DEBUG
                 throw;
-#else
+            #else
                 return null;
-#endif
+            #endif
             }
 
-            var devList = new List<DeviceInfo>();
+            List<DeviceInfo> devList = new List<DeviceInfo>();
 
-            foreach (var devId in deviceIDs)
+            foreach(string devId in deviceIDs)
             {
-                if (devId is null) continue;
+                if(devId is null)
+                    continue;
+
+                string physId = devId;
 
-                var physId = devId;
                 // TODO: This can be done better
-                if (devId.Length == 2 && devId[1] == ':') physId = "\\\\?\\" + devId;
-                var fd = Extern.CreateFile(physId, 0, FileShare.Read | FileShare.Write, IntPtr.Zero,
-                    FileMode.OpenExisting, 0, IntPtr.Zero);
-                if (fd.IsInvalid) continue;
+                if(devId.Length == 2 &&
+                   devId[1]     == ':')
+                    physId = "\\\\?\\" + devId;
+
+                SafeFileHandle fd = Extern.CreateFile(physId, 0, FileShare.Read | FileShare.Write, IntPtr.Zero,
+                                                      FileMode.OpenExisting, 0, IntPtr.Zero);
+
+                if(fd.IsInvalid)
+                    continue;
 
                 var query = new StoragePropertyQuery
                 {
-                    PropertyId = StoragePropertyId.Device,
-                    QueryType = StorageQueryType.Standard,
+                    PropertyId           = StoragePropertyId.Device, QueryType = StorageQueryType.Standard,
                     AdditionalParameters = new byte[1]
                 };
 
                 //StorageDeviceDescriptor descriptor = new StorageDeviceDescriptor();
                 //descriptor.RawDeviceProperties = new byte[16384];
 
-                var descriptorPtr = Marshal.AllocHGlobal(1000);
-                var descriptorB = new byte[1000];
+                IntPtr descriptorPtr = Marshal.AllocHGlobal(1000);
+                byte[] descriptorB   = new byte[1000];
 
                 uint returned = 0;
-                var error = 0;
+                int  error    = 0;
 
-                var hasError = !Extern.DeviceIoControlStorageQuery(fd, WindowsIoctl.IoctlStorageQueryProperty,
-                    ref query, (uint) Marshal.SizeOf(query),
-                    descriptorPtr, 1000, ref returned, IntPtr.Zero);
+                bool hasError = !Extern.DeviceIoControlStorageQuery(fd, WindowsIoctl.IoctlStorageQueryProperty,
+                                                                    ref query, (uint)Marshal.SizeOf(query),
+                                                                    descriptorPtr, 1000, ref returned, IntPtr.Zero);
 
-                if (hasError) error = Marshal.GetLastWin32Error();
+                if(hasError)
+                    error = Marshal.GetLastWin32Error();
 
                 Marshal.Copy(descriptorPtr, descriptorB, 0, 1000);
 
-                if (hasError && error != 0) continue;
+                if(hasError && error != 0)
+                    continue;
 
                 var descriptor = new StorageDeviceDescriptor
                 {
-                    Version = BitConverter.ToUInt32(descriptorB, 0),
-                    Size = BitConverter.ToUInt32(descriptorB, 4),
-                    DeviceType = descriptorB[8],
-                    DeviceTypeModifier = descriptorB[9],
-                    RemovableMedia = BitConverter.ToBoolean(descriptorB, 10),
-                    CommandQueueing = BitConverter.ToBoolean(descriptorB, 11),
-                    VendorIdOffset = BitConverter.ToInt32(descriptorB, 12),
-                    ProductIdOffset = BitConverter.ToInt32(descriptorB, 16),
+                    Version               = BitConverter.ToUInt32(descriptorB, 0),
+                    Size                  = BitConverter.ToUInt32(descriptorB, 4),
+                    DeviceType            = descriptorB[8], DeviceTypeModifier = descriptorB[9],
+                    RemovableMedia        = BitConverter.ToBoolean(descriptorB, 10),
+                    CommandQueueing       = BitConverter.ToBoolean(descriptorB, 11),
+                    VendorIdOffset        = BitConverter.ToInt32(descriptorB, 12),
+                    ProductIdOffset       = BitConverter.ToInt32(descriptorB, 16),
                     ProductRevisionOffset = BitConverter.ToInt32(descriptorB, 20),
-                    SerialNumberOffset = BitConverter.ToInt32(descriptorB, 24),
-                    BusType = (StorageBusType) BitConverter.ToUInt32(descriptorB, 28),
-                    RawPropertiesLength = BitConverter.ToUInt32(descriptorB, 32)
+                    SerialNumberOffset    = BitConverter.ToInt32(descriptorB, 24),
+                    BusType               = (StorageBusType)BitConverter.ToUInt32(descriptorB, 28),
+                    RawPropertiesLength   = BitConverter.ToUInt32(descriptorB, 32)
                 };
 
-                var info = new DeviceInfo {Path = physId, Bus = descriptor.BusType.ToString()};
+                var info = new DeviceInfo
+                {
+                    Path = physId, Bus = descriptor.BusType.ToString()
+                };
 
-                if (descriptor.VendorIdOffset > 0)
+                if(descriptor.VendorIdOffset > 0)
                     info.Vendor =
                         StringHandlers.CToString(descriptorB, Encoding.ASCII, start: descriptor.VendorIdOffset);
-                if (descriptor.ProductIdOffset > 0)
+
+                if(descriptor.ProductIdOffset > 0)
                     info.Model =
                         StringHandlers.CToString(descriptorB, Encoding.ASCII, start: descriptor.ProductIdOffset);
+
                 // TODO: Get serial number of SCSI and USB devices, probably also FireWire (untested)
-                if (descriptor.SerialNumberOffset > 0)
+                if(descriptor.SerialNumberOffset > 0)
                 {
                     info.Serial =
                         StringHandlers.CToString(descriptorB, Encoding.ASCII, start: descriptor.SerialNumberOffset);
 
                     // fix any serial numbers that are returned as hex-strings
-                    if (Array.TrueForAll(info.Serial.ToCharArray(), c => "0123456789abcdef".IndexOf(c) >= 0) &&
-                        info.Serial.Length == 40) info.Serial = HexStringToString(info.Serial).Trim();
+                    if(Array.TrueForAll(info.Serial.ToCharArray(), c => "0123456789abcdef".IndexOf(c) >= 0) &&
+                       info.Serial.Length == 40)
+                        info.Serial = HexStringToString(info.Serial).Trim();
                 }
 
-                if ((string.IsNullOrEmpty(info.Vendor) || info.Vendor == "ATA") && info.Model != null)
+                if((string.IsNullOrEmpty(info.Vendor) || info.Vendor == "ATA") &&
+                   info.Model != null)
                 {
-                    var pieces = info.Model.Split(' ');
-                    if (pieces.Length > 1)
+                    string[] pieces = info.Model.Split(' ');
+
+                    if(pieces.Length > 1)
                     {
                         info.Vendor = pieces[0];
-                        info.Model = info.Model.Substring(pieces[0].Length + 1);
+                        info.Model  = info.Model.Substring(pieces[0].Length + 1);
                     }
                 }
 
-                switch (descriptor.BusType)
+                switch(descriptor.BusType)
                 {
                     case StorageBusType.SCSI:
                     case StorageBusType.ATAPI:
@@ -193,6 +205,7 @@ namespace Aaru.Devices.Windows
                     case StorageBusType.SecureDigital:
                     case StorageBusType.MultiMediaCard:
                         info.Supported = true;
+
                         break;
                 }
 
@@ -200,7 +213,7 @@ namespace Aaru.Devices.Windows
                 devList.Add(info);
             }
 
-            var devices = devList.ToArray();
+            DeviceInfo[] devices = devList.ToArray();
 
             return devices;
         }
diff --git a/Aaru.Devices/Windows/Structs.cs b/Aaru.Devices/Windows/Structs.cs
index b67cc76c5..f547f807e 100644
--- a/Aaru.Devices/Windows/Structs.cs
+++ b/Aaru.Devices/Windows/Structs.cs
@@ -37,22 +37,22 @@ using System.Runtime.InteropServices;
 
 namespace Aaru.Devices.Windows
 {
-    [StructLayout(LayoutKind.Sequential)]
-    [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
+    [StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
     internal struct ScsiPassThroughDirect
     {
         public ushort Length;
-        public byte ScsiStatus;
-        public byte PathId;
-        public byte TargetId;
-        public byte Lun;
-        public byte CdbLength;
-        public byte SenseInfoLength;
-        [MarshalAs(UnmanagedType.U1)] public ScsiIoctlDirection DataIn;
-        public uint DataTransferLength;
-        public uint TimeOutValue;
+        public byte   ScsiStatus;
+        public byte   PathId;
+        public byte   TargetId;
+        public byte   Lun;
+        public byte   CdbLength;
+        public byte   SenseInfoLength;
+        [MarshalAs(UnmanagedType.U1)]
+        public ScsiIoctlDirection DataIn;
+        public uint   DataTransferLength;
+        public uint   TimeOutValue;
         public IntPtr DataBuffer;
-        public uint SenseInfoOffset;
+        public uint   SenseInfoOffset;
 
         [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
         public byte[] Cdb;
@@ -67,115 +67,100 @@ namespace Aaru.Devices.Windows
         public byte[] SenseBuf;
     }
 
-    [StructLayout(LayoutKind.Sequential)]
-    [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
+    [StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
     internal struct AtaPassThroughEx
     {
-        /// <summary>
-        ///     Length in bytes of this structure
-        /// </summary>
+        /// <summary>Length in bytes of this structure</summary>
         public ushort Length;
 
-        /// <summary>
-        ///     Indicates transfer direction and kind of operation
-        /// </summary>
-        [MarshalAs(UnmanagedType.U2)] public AtaFlags AtaFlags;
+        /// <summary>Indicates transfer direction and kind of operation</summary>
+        [MarshalAs(UnmanagedType.U2)]
+        public AtaFlags AtaFlags;
 
-        /// <summary>
-        ///     Indicates IDE port or bus, set by driver
-        /// </summary>
+        /// <summary>Indicates IDE port or bus, set by driver</summary>
         public byte PathId;
 
-        /// <summary>
-        ///     Indicates target device on bus, set by driver
-        /// </summary>
+        /// <summary>Indicates target device on bus, set by driver</summary>
         public byte TargetId;
 
-        /// <summary>
-        ///     Indicates logical unit number of device, set by driver
-        /// </summary>
+        /// <summary>Indicates logical unit number of device, set by driver</summary>
         public byte Lun;
 
-        /// <summary>
-        ///     Reserved
-        /// </summary>
+        /// <summary>Reserved</summary>
         public byte ReservedAsUchar;
 
-        /// <summary>
-        ///     Data transfer length in bytes
-        /// </summary>
+        /// <summary>Data transfer length in bytes</summary>
         public uint DataTransferLength;
 
-        /// <summary>
-        ///     Timeout value in seconds
-        /// </summary>
+        /// <summary>Timeout value in seconds</summary>
         public uint TimeOutValue;
 
-        /// <summary>
-        ///     Reserved
-        /// </summary>
+        /// <summary>Reserved</summary>
         public uint ReservedAsUlong;
 
-        /// <summary>
-        ///     Pointer to data buffer relative to start of this structure
-        /// </summary>
+        /// <summary>Pointer to data buffer relative to start of this structure</summary>
         public IntPtr DataBufferOffset;
 
-        /// <summary>
-        ///     Previous ATA registers, for LBA48
-        /// </summary>
+        /// <summary>Previous ATA registers, for LBA48</summary>
         public AtaTaskFile PreviousTaskFile;
 
-        /// <summary>
-        ///     ATA registers
-        /// </summary>
+        /// <summary>ATA registers</summary>
         public AtaTaskFile CurrentTaskFile;
     }
 
-    [StructLayout(LayoutKind.Sequential)]
-    [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
+    [StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
     internal struct AtaPassThroughExBuffer
     {
         public AtaPassThroughEx aptd;
-        public uint filler;
+        public uint             filler;
 
         [MarshalAs(UnmanagedType.ByValArray, SizeConst = 64 * 512)]
         public byte[] dataBuffer;
     }
 
-    [StructLayout(LayoutKind.Explicit)]
-    [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
+    [StructLayout(LayoutKind.Explicit), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
     internal struct AtaTaskFile
     {
         // Fields for commands sent
-        [FieldOffset(0)] public byte Features;
-        [FieldOffset(6)] public byte Command;
+        [FieldOffset(0)]
+        public byte Features;
+        [FieldOffset(6)]
+        public byte Command;
 
         // Fields on command return
-        [FieldOffset(0)] public byte Error;
-        [FieldOffset(6)] public byte Status;
+        [FieldOffset(0)]
+        public byte Error;
+        [FieldOffset(6)]
+        public byte Status;
 
         // Common fields
-        [FieldOffset(1)] public byte SectorCount;
-        [FieldOffset(2)] public byte SectorNumber;
-        [FieldOffset(3)] public byte CylinderLow;
-        [FieldOffset(4)] public byte CylinderHigh;
-        [FieldOffset(5)] public byte DeviceHead;
-        [FieldOffset(7)] public byte Reserved;
+        [FieldOffset(1)]
+        public byte SectorCount;
+        [FieldOffset(2)]
+        public byte SectorNumber;
+        [FieldOffset(3)]
+        public byte CylinderLow;
+        [FieldOffset(4)]
+        public byte CylinderHigh;
+        [FieldOffset(5)]
+        public byte DeviceHead;
+        [FieldOffset(7)]
+        public byte Reserved;
     }
 
     [StructLayout(LayoutKind.Sequential)]
     internal struct StoragePropertyQuery
     {
-        [MarshalAs(UnmanagedType.U4)] public StoragePropertyId PropertyId;
-        [MarshalAs(UnmanagedType.U4)] public StorageQueryType QueryType;
+        [MarshalAs(UnmanagedType.U4)]
+        public StoragePropertyId PropertyId;
+        [MarshalAs(UnmanagedType.U4)]
+        public StorageQueryType QueryType;
 
         [MarshalAs(UnmanagedType.ByValArray, SizeConst = 1)]
         public byte[] AdditionalParameters;
     }
 
-    [StructLayout(LayoutKind.Sequential)]
-    [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
+    [StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
     internal struct StorageDescriptorHeader
     {
         public uint Version;
@@ -189,39 +174,34 @@ namespace Aaru.Devices.Windows
         public uint Size;
         public byte DeviceType;
         public byte DeviceTypeModifier;
-        [MarshalAs(UnmanagedType.U1)] public bool RemovableMedia;
-        [MarshalAs(UnmanagedType.U1)] public bool CommandQueueing;
-        public int VendorIdOffset;
-        public int ProductIdOffset;
-        public int ProductRevisionOffset;
-        public int SerialNumberOffset;
+        [MarshalAs(UnmanagedType.U1)]
+        public bool RemovableMedia;
+        [MarshalAs(UnmanagedType.U1)]
+        public bool CommandQueueing;
+        public int            VendorIdOffset;
+        public int            ProductIdOffset;
+        public int            ProductRevisionOffset;
+        public int            SerialNumberOffset;
         public StorageBusType BusType;
-        public uint RawPropertiesLength;
-        public byte[] RawDeviceProperties;
+        public uint           RawPropertiesLength;
+        public byte[]         RawDeviceProperties;
     }
 
     [StructLayout(LayoutKind.Sequential)]
     internal struct IdePassThroughDirect
     {
-        /// <summary>
-        ///     ATA registers
-        /// </summary>
+        /// <summary>ATA registers</summary>
         public AtaTaskFile CurrentTaskFile;
 
-        /// <summary>
-        ///     Size of data buffer
-        /// </summary>
+        /// <summary>Size of data buffer</summary>
         public uint DataBufferSize;
 
-        /// <summary>
-        ///     Data buffer
-        /// </summary>
+        /// <summary>Data buffer</summary>
         [MarshalAs(UnmanagedType.ByValArray, SizeConst = 512)]
         public byte[] DataBuffer;
     }
 
-    [StructLayout(LayoutKind.Sequential)]
-    [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
+    [StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
     internal struct StorageDeviceNumber
     {
         public int deviceType;
@@ -229,75 +209,70 @@ namespace Aaru.Devices.Windows
         public int partitionNumber;
     }
 
-    [StructLayout(LayoutKind.Sequential)]
-    [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
+    [StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
     internal struct DeviceInfoData
     {
-        public int cbSize;
-        public Guid classGuid;
-        public uint devInst;
+        public int    cbSize;
+        public Guid   classGuid;
+        public uint   devInst;
         public IntPtr reserved;
     }
 
-    [StructLayout(LayoutKind.Sequential)]
-    [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
+    [StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
     internal struct DeviceInterfaceData
     {
-        public int cbSize;
-        public Guid interfaceClassGuid;
-        public uint flags;
-        private readonly IntPtr reserved;
+        public   int    cbSize;
+        public   Guid   interfaceClassGuid;
+        public   uint   flags;
+        readonly IntPtr reserved;
     }
 
-    [StructLayout(LayoutKind.Sequential)]
-    [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
+    [StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
     internal struct UsbSetupPacket
     {
-        public byte bmRequest;
-        public byte bRequest;
+        public byte  bmRequest;
+        public byte  bRequest;
         public short wValue;
         public short wIndex;
         public short wLength;
     }
 
-    [StructLayout(LayoutKind.Sequential)]
-    [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
+    [StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
     internal struct UsbDescriptorRequest
     {
         public int ConnectionIndex;
 
         public UsbSetupPacket SetupPacket;
+
         //public byte[] Data;
     }
 
-    [StructLayout(LayoutKind.Sequential)]
-    [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
+    [StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
     internal struct SffdiskQueryDeviceProtocolData
     {
         public ushort size;
         public ushort reserved;
-        public Guid protocolGuid;
+        public Guid   protocolGuid;
     }
 
-    [StructLayout(LayoutKind.Sequential)]
-    [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
+    [StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
     internal struct SffdiskDeviceCommandData
     {
-        public ushort size;
-        public ushort reserved;
+        public ushort      size;
+        public ushort      reserved;
         public SffdiskDcmd command;
-        public ushort protocolArgumentSize;
-        public uint deviceDataBufferSize;
-        public uint information;
+        public ushort      protocolArgumentSize;
+        public uint        deviceDataBufferSize;
+        public uint        information;
     }
 
     [StructLayout(LayoutKind.Sequential)]
     internal struct SdCmdDescriptor
     {
-        public byte commandCode;
-        public SdCommandClass cmdClass;
+        public byte                commandCode;
+        public SdCommandClass      cmdClass;
         public SdTransferDirection transferDirection;
-        public SdTransferType transferType;
-        public SdResponseType responseType;
+        public SdTransferType      transferType;
+        public SdResponseType      responseType;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Devices/Windows/Usb.cs b/Aaru.Devices/Windows/Usb.cs
index 1961217f2..46f395eba 100644
--- a/Aaru.Devices/Windows/Usb.cs
+++ b/Aaru.Devices/Windows/Usb.cs
@@ -41,52 +41,59 @@ using System.Text;
 namespace Aaru.Devices.Windows
 {
     // TODO: Even after cleaning, refactoring and xml-documenting, this code needs some love
-    /// <summary>
-    ///     Implements functions for getting and accesing information from the USB bus
-    /// </summary>
-    static partial class Usb
+    /// <summary>Implements functions for getting and accesing information from the USB bus</summary>
+    internal static partial class Usb
     {
-        /// <summary>
-        ///     Return a list of USB Host Controllers
-        /// </summary>
+        /// <summary>Return a list of USB Host Controllers</summary>
         /// <returns>List of USB Host Controllers</returns>
         static IEnumerable<UsbController> GetHostControllers()
         {
             List<UsbController> hostList = new List<UsbController>();
-            Guid                hostGuid = new Guid(GUID_DEVINTERFACE_HUBCONTROLLER);
+            var                 hostGuid = new Guid(GUID_DEVINTERFACE_HUBCONTROLLER);
 
             // We start at the "root" of the device tree and look for all
             // devices that match the interface GUID of a Hub Controller
             IntPtr h = SetupDiGetClassDevs(ref hostGuid, 0, IntPtr.Zero, DIGCF_PRESENT | DIGCF_DEVICEINTERFACE);
-            if(h == INVALID_HANDLE_VALUE) return new ReadOnlyCollection<UsbController>(hostList);
+
+            if(h == INVALID_HANDLE_VALUE)
+                return new ReadOnlyCollection<UsbController>(hostList);
 
             IntPtr ptrBuf = Marshal.AllocHGlobal(BUFFER_SIZE);
             bool   success;
             int    i = 0;
+
             do
             {
-                UsbController host = new UsbController {ControllerIndex = i};
+                var host = new UsbController
+                {
+                    ControllerIndex = i
+                };
 
                 // create a Device Interface Data structure
-                SpDeviceInterfaceData dia = new SpDeviceInterfaceData();
+                var dia = new SpDeviceInterfaceData();
                 dia.cbSize = Marshal.SizeOf(dia);
 
                 // start the enumeration
                 success = SetupDiEnumDeviceInterfaces(h, IntPtr.Zero, ref hostGuid, i, ref dia);
+
                 if(success)
                 {
                     // build a DevInfo Data structure
-                    SpDevinfoData da = new SpDevinfoData();
+                    var da = new SpDevinfoData();
                     da.cbSize = Marshal.SizeOf(da);
 
                     // build a Device Interface Detail Data structure
-                    SpDeviceInterfaceDetailData didd =
-                        new SpDeviceInterfaceDetailData {cbSize = 4 + Marshal.SystemDefaultCharSize};
+                    var didd = new SpDeviceInterfaceDetailData
+                    {
+                        cbSize = 4 + Marshal.SystemDefaultCharSize
+                    };
+
                     // trust me :)
 
                     // now we can get some more detailed information
                     int       nRequiredSize = 0;
                     const int N_BYTES       = BUFFER_SIZE;
+
                     if(SetupDiGetDeviceInterfaceDetail(h, ref dia, ref didd, N_BYTES, ref nRequiredSize, ref da))
                     {
                         host.ControllerDevicePath = didd.DevicePath;
@@ -95,9 +102,10 @@ namespace Aaru.Devices.Windows
                         int requiredSize = 0;
                         int regType      = REG_SZ;
 
-                        if(SetupDiGetDeviceRegistryProperty(h,           ref da, SPDRP_DEVICEDESC, ref regType, ptrBuf,
+                        if(SetupDiGetDeviceRegistryProperty(h, ref da, SPDRP_DEVICEDESC, ref regType, ptrBuf,
                                                             BUFFER_SIZE, ref requiredSize))
                             host.ControllerDeviceDesc = Marshal.PtrToStringAuto(ptrBuf);
+
                         if(SetupDiGetDeviceRegistryProperty(h, ref da, SPDRP_DRIVER, ref regType, ptrBuf, BUFFER_SIZE,
                                                             ref requiredSize))
                             host.ControllerDriverKeyName = Marshal.PtrToStringAuto(ptrBuf);
@@ -107,8 +115,7 @@ namespace Aaru.Devices.Windows
                 }
 
                 i++;
-            }
-            while(success);
+            } while(success);
 
             Marshal.FreeHGlobal(ptrBuf);
             SetupDiDestroyDeviceInfoList(h);
@@ -117,9 +124,7 @@ namespace Aaru.Devices.Windows
             return new ReadOnlyCollection<UsbController>(hostList);
         }
 
-        /// <summary>
-        ///     private function for finding a USB device's Description
-        /// </summary>
+        /// <summary>private function for finding a USB device's Description</summary>
         /// <param name="driverKeyName">Device driver key name</param>
         /// <returns>USB device description</returns>
         static string GetDescriptionByKeyName(string driverKeyName)
@@ -130,20 +135,24 @@ namespace Aaru.Devices.Windows
             // Use the "enumerator form" of the SetupDiGetClassDevs API
             // to generate a list of all USB devices
             IntPtr h = SetupDiGetClassDevs(0, DEV_ENUM, IntPtr.Zero, DIGCF_PRESENT | DIGCF_ALLCLASSES);
-            if(h == INVALID_HANDLE_VALUE) return ans;
+
+            if(h == INVALID_HANDLE_VALUE)
+                return ans;
 
             IntPtr ptrBuf = Marshal.AllocHGlobal(BUFFER_SIZE);
 
             bool success;
             int  i = 0;
+
             do
             {
                 // create a Device Interface Data structure
-                SpDevinfoData da = new SpDevinfoData();
+                var da = new SpDevinfoData();
                 da.cbSize = Marshal.SizeOf(da);
 
                 // start the enumeration
                 success = SetupDiEnumDeviceInfo(h, i, ref da);
+
                 if(success)
                 {
                     int    requiredSize = 0;
@@ -151,21 +160,22 @@ namespace Aaru.Devices.Windows
                     string keyName      = "";
 
                     if(SetupDiGetDeviceRegistryProperty(h, ref da, SPDRP_DRIVER, ref regType, ptrBuf, BUFFER_SIZE,
-                                                        ref requiredSize)) keyName = Marshal.PtrToStringAuto(ptrBuf);
+                                                        ref requiredSize))
+                        keyName = Marshal.PtrToStringAuto(ptrBuf);
 
                     // is it a match?
                     if(keyName == driverKeyName)
                     {
-                        if(SetupDiGetDeviceRegistryProperty(h,           ref da, SPDRP_DEVICEDESC, ref regType, ptrBuf,
+                        if(SetupDiGetDeviceRegistryProperty(h, ref da, SPDRP_DEVICEDESC, ref regType, ptrBuf,
                                                             BUFFER_SIZE, ref requiredSize))
                             ans = Marshal.PtrToStringAuto(ptrBuf);
+
                         break;
                     }
                 }
 
                 i++;
-            }
-            while(success);
+            } while(success);
 
             Marshal.FreeHGlobal(ptrBuf);
             SetupDiDestroyDeviceInfoList(h);
@@ -173,9 +183,7 @@ namespace Aaru.Devices.Windows
             return ans;
         }
 
-        /// <summary>
-        ///     private function for finding a USB device's Instance ID
-        /// </summary>
+        /// <summary>private function for finding a USB device's Instance ID</summary>
         /// <param name="driverKeyName">Device driver key name</param>
         /// <returns>Device instance ID</returns>
         static string GetInstanceIdByKeyName(string driverKeyName)
@@ -186,43 +194,49 @@ namespace Aaru.Devices.Windows
             // Use the "enumerator form" of the SetupDiGetClassDevs API
             // to generate a list of all USB devices
             IntPtr h = SetupDiGetClassDevs(0, DEV_ENUM, IntPtr.Zero, DIGCF_PRESENT | DIGCF_ALLCLASSES);
-            if(h == INVALID_HANDLE_VALUE) return ans;
+
+            if(h == INVALID_HANDLE_VALUE)
+                return ans;
 
             IntPtr ptrBuf = Marshal.AllocHGlobal(BUFFER_SIZE);
 
             bool success;
             int  i = 0;
+
             do
             {
                 // create a Device Interface Data structure
-                SpDevinfoData da = new SpDevinfoData();
+                var da = new SpDevinfoData();
                 da.cbSize = Marshal.SizeOf(da);
 
                 // start the enumeration
                 success = SetupDiEnumDeviceInfo(h, i, ref da);
+
                 if(success)
                 {
                     int requiredSize = 0;
                     int regType      = REG_SZ;
 
                     string keyName = "";
+
                     if(SetupDiGetDeviceRegistryProperty(h, ref da, SPDRP_DRIVER, ref regType, ptrBuf, BUFFER_SIZE,
-                                                        ref requiredSize)) keyName = Marshal.PtrToStringAuto(ptrBuf);
+                                                        ref requiredSize))
+                        keyName = Marshal.PtrToStringAuto(ptrBuf);
 
                     // is it a match?
                     if(keyName == driverKeyName)
                     {
-                        const int     N_BYTES = BUFFER_SIZE;
-                        StringBuilder sb      = new StringBuilder(N_BYTES);
+                        const int N_BYTES = BUFFER_SIZE;
+                        var       sb      = new StringBuilder(N_BYTES);
                         SetupDiGetDeviceInstanceId(h, ref da, sb, N_BYTES, out requiredSize);
                         ans = sb.ToString();
+
                         break;
                     }
                 }
 
                 i++;
-            }
-            while(success);
+            } while(success);
 
             Marshal.FreeHGlobal(ptrBuf);
             SetupDiDestroyDeviceInfoList(h);
@@ -230,17 +244,13 @@ namespace Aaru.Devices.Windows
             return ans;
         }
 
-        /// <summary>
-        ///     Represents a USB Host Controller
-        /// </summary>
+        /// <summary>Represents a USB Host Controller</summary>
         class UsbController
         {
             internal string ControllerDriverKeyName, ControllerDevicePath, ControllerDeviceDesc;
             internal int    ControllerIndex;
 
-            /// <summary>
-            ///     A simple default constructor
-            /// </summary>
+            /// <summary>A simple default constructor</summary>
             internal UsbController()
             {
                 ControllerIndex         = 0;
@@ -268,16 +278,22 @@ namespace Aaru.Devices.Windows
             internal UsbHub GetRootHub()
             {
                 IntPtr h, h2;
-                UsbHub root = new UsbHub {HubIsRootHub = true, HubDeviceDesc = "Root Hub"};
+
+                var root = new UsbHub
+                {
+                    HubIsRootHub = true, HubDeviceDesc = "Root Hub"
+                };
 
                 // Open a handle to the Host Controller
                 h = CreateFile(ControllerDevicePath, GENERIC_WRITE, FILE_SHARE_WRITE, IntPtr.Zero, OPEN_EXISTING, 0,
                                IntPtr.Zero);
-                if(h == INVALID_HANDLE_VALUE) return root;
 
-                UsbRootHubName hubName    = new UsbRootHubName();
-                int            nBytes     = Marshal.SizeOf(hubName);
-                IntPtr         ptrHubName = Marshal.AllocHGlobal(nBytes);
+                if(h == INVALID_HANDLE_VALUE)
+                    return root;
+
+                var    hubName    = new UsbRootHubName();
+                int    nBytes     = Marshal.SizeOf(hubName);
+                IntPtr ptrHubName = Marshal.AllocHGlobal(nBytes);
 
                 // get the Hub Name
                 if(DeviceIoControl(h, IOCTL_USB_GET_ROOT_HUB_NAME, ptrHubName, nBytes, ptrHubName, nBytes, out _,
@@ -292,19 +308,24 @@ namespace Aaru.Devices.Windows
                 // Now let's open the Hub (based upon the HubName we got above)
                 h2 = CreateFile(root.HubDevicePath, GENERIC_WRITE, FILE_SHARE_WRITE, IntPtr.Zero, OPEN_EXISTING, 0,
                                 IntPtr.Zero);
+
                 if(h2 != INVALID_HANDLE_VALUE)
                 {
-                    UsbNodeInformation nodeInfo = new UsbNodeInformation {NodeType = (int)UsbHubNode.UsbHub};
+                    var nodeInfo = new UsbNodeInformation
+                    {
+                        NodeType = (int)UsbHubNode.UsbHub
+                    };
+
                     nBytes = Marshal.SizeOf(nodeInfo);
                     IntPtr ptrNodeInfo = Marshal.AllocHGlobal(nBytes);
                     Marshal.StructureToPtr(nodeInfo, ptrNodeInfo, true);
 
                     // get the Hub Information
-                    if(DeviceIoControl(h2,    IOCTL_USB_GET_NODE_INFORMATION, ptrNodeInfo, nBytes, ptrNodeInfo, nBytes,
+                    if(DeviceIoControl(h2, IOCTL_USB_GET_NODE_INFORMATION, ptrNodeInfo, nBytes, ptrNodeInfo, nBytes,
                                        out _, IntPtr.Zero))
                     {
-                        nodeInfo =
-                            (UsbNodeInformation)Marshal.PtrToStructure(ptrNodeInfo, typeof(UsbNodeInformation));
+                        nodeInfo = (UsbNodeInformation)Marshal.PtrToStructure(ptrNodeInfo, typeof(UsbNodeInformation));
+
                         root.HubIsBusPowered = Convert.ToBoolean(nodeInfo.HubInformation.HubIsBusPowered);
                         root.HubPortCount    = nodeInfo.HubInformation.HubDescriptor.bNumberOfPorts;
                     }
@@ -315,6 +336,7 @@ namespace Aaru.Devices.Windows
 
                 Marshal.FreeHGlobal(ptrHubName);
                 CloseHandle(h);
+
                 return root;
             }
         }
@@ -372,9 +394,7 @@ namespace Aaru.Devices.Windows
 
             internal string SerialNumber => HubSerialNumber;
 
-            /// <summary>
-            ///     return a list of the down stream ports
-            /// </summary>
+            /// <summary>return a list of the down stream ports</summary>
             /// <returns>List of downstream ports</returns>
             internal IEnumerable<UsbPort> GetPorts()
             {
@@ -383,7 +403,9 @@ namespace Aaru.Devices.Windows
                 // Open a handle to the Hub device
                 IntPtr h = CreateFile(HubDevicePath, GENERIC_WRITE, FILE_SHARE_WRITE, IntPtr.Zero, OPEN_EXISTING, 0,
                                       IntPtr.Zero);
-                if(h == INVALID_HANDLE_VALUE) return new ReadOnlyCollection<UsbPort>(portList);
+
+                if(h == INVALID_HANDLE_VALUE)
+                    return new ReadOnlyCollection<UsbPort>(portList);
 
                 int    nBytes            = Marshal.SizeOf(typeof(UsbNodeConnectionInformationEx));
                 IntPtr ptrNodeConnection = Marshal.AllocHGlobal(nBytes);
@@ -392,26 +414,27 @@ namespace Aaru.Devices.Windows
                 // BTW: Ports are numbered starting at 1
                 for(int i = 1; i <= HubPortCount; i++)
                 {
-                    UsbNodeConnectionInformationEx nodeConnection =
-                        new UsbNodeConnectionInformationEx {ConnectionIndex = i};
+                    var nodeConnection = new UsbNodeConnectionInformationEx
+                    {
+                        ConnectionIndex = i
+                    };
+
                     Marshal.StructureToPtr(nodeConnection, ptrNodeConnection, true);
 
-                    if(!DeviceIoControl(h,                 IOCTL_USB_GET_NODE_CONNECTION_INFORMATION_EX,
-                                        ptrNodeConnection, nBytes,
-                                        ptrNodeConnection, nBytes, out _,
-                                        IntPtr.Zero)) continue;
+                    if(!DeviceIoControl(h, IOCTL_USB_GET_NODE_CONNECTION_INFORMATION_EX, ptrNodeConnection, nBytes,
+                                        ptrNodeConnection, nBytes, out _, IntPtr.Zero))
+                        continue;
 
                     nodeConnection =
                         (UsbNodeConnectionInformationEx)Marshal.PtrToStructure(ptrNodeConnection,
                                                                                typeof(UsbNodeConnectionInformationEx));
 
                     // load up the USBPort class
-                    UsbPort port = new UsbPort
+                    var port = new UsbPort
                     {
-                        PortPortNumber    = i,
-                        PortHubDevicePath = HubDevicePath,
-                        PortStatus        = ((UsbConnectionStatus)nodeConnection.ConnectionStatus).ToString(),
-                        PortSpeed         = ((UsbDeviceSpeed)nodeConnection.Speed).ToString(),
+                        PortPortNumber = i, PortHubDevicePath = HubDevicePath,
+                        PortStatus     = ((UsbConnectionStatus)nodeConnection.ConnectionStatus).ToString(),
+                        PortSpeed      = ((UsbDeviceSpeed)nodeConnection.Speed).ToString(),
                         PortIsDeviceConnected =
                             nodeConnection.ConnectionStatus == (int)UsbConnectionStatus.DeviceConnected,
                         PortIsHub            = Convert.ToBoolean(nodeConnection.DeviceIsHub),
@@ -424,14 +447,13 @@ namespace Aaru.Devices.Windows
 
                 Marshal.FreeHGlobal(ptrNodeConnection);
                 CloseHandle(h);
+
                 // convert it into a Collection
                 return new ReadOnlyCollection<UsbPort>(portList);
             }
         }
 
-        /// <summary>
-        ///     Represents an USB port
-        /// </summary>
+        /// <summary>Represents an USB port</summary>
         internal class UsbPort
         {
             internal UsbDeviceDescriptor PortDeviceDescriptor;
@@ -468,30 +490,31 @@ namespace Aaru.Devices.Windows
             /// <summary>is anybody home?</summary>
             internal bool IsDeviceConnected => PortIsDeviceConnected;
 
-            /// <summary>
-            ///     return a down stream external hub
-            /// </summary>
+            /// <summary>return a down stream external hub</summary>
             /// <returns>Downstream external hub</returns>
             internal UsbDevice GetDevice()
             {
-                if(!PortIsDeviceConnected) return null;
+                if(!PortIsDeviceConnected)
+                    return null;
 
                 // Copy over some values from the Port class
                 // Ya know, I've given some thought about making Device a derived class...
-                UsbDevice device = new UsbDevice
+                var device = new UsbDevice
                 {
-                    DevicePortNumber    = PortPortNumber,
-                    DeviceHubDevicePath = PortHubDevicePath,
-                    DeviceDescriptor    = PortDeviceDescriptor
+                    DevicePortNumber = PortPortNumber, DeviceHubDevicePath = PortHubDevicePath,
+                    DeviceDescriptor = PortDeviceDescriptor
                 };
 
                 // Open a handle to the Hub device
                 IntPtr h = CreateFile(PortHubDevicePath, GENERIC_WRITE, FILE_SHARE_WRITE, IntPtr.Zero, OPEN_EXISTING, 0,
                                       IntPtr.Zero);
-                if(h == INVALID_HANDLE_VALUE) return device;
+
+                if(h == INVALID_HANDLE_VALUE)
+                    return device;
 
                 int nBytesReturned;
                 int nBytes = BUFFER_SIZE;
+
                 // We use this to zero fill a buffer
                 string nullString = new string((char)0, BUFFER_SIZE / Marshal.SystemDefaultCharSize);
 
@@ -502,33 +525,35 @@ namespace Aaru.Devices.Windows
                 if(PortDeviceDescriptor.iManufacturer > 0)
                 {
                     // build a request for string descriptor
-                    UsbDescriptorRequest request = new UsbDescriptorRequest
+                    var request = new UsbDescriptorRequest
                     {
-                        ConnectionIndex = PortPortNumber,
-                        SetupPacket =
+                        ConnectionIndex = PortPortNumber, SetupPacket =
                         {
                             // Language Code
                             wIndex = 0x409,
                             wValue = (short)((USB_STRING_DESCRIPTOR_TYPE << 8) + PortDeviceDescriptor.iManufacturer)
                         }
                     };
+
                     request.SetupPacket.wLength = (short)(nBytes - Marshal.SizeOf(request));
+
                     // Geez, I wish C# had a Marshal.MemSet() method
                     IntPtr ptrRequest = Marshal.StringToHGlobalAuto(nullString);
                     Marshal.StructureToPtr(request, ptrRequest, true);
 
                     // Use an IOCTL call to request the String Descriptor
-                    if(DeviceIoControl(h, IOCTL_USB_GET_DESCRIPTOR_FROM_NODE_CONNECTION, ptrRequest, nBytes,
-                                       ptrRequest,
+                    if(DeviceIoControl(h, IOCTL_USB_GET_DESCRIPTOR_FROM_NODE_CONNECTION, ptrRequest, nBytes, ptrRequest,
                                        nBytes, out nBytesReturned, IntPtr.Zero))
                     {
                         // The location of the string descriptor is immediately after
                         // the Request structure.  Because this location is not "covered"
                         // by the structure allocation, we're forced to zero out this
                         // chunk of memory by using the StringToHGlobalAuto() hack above
-                        IntPtr ptrStringDesc = IntPtr.Add(ptrRequest, Marshal.SizeOf(request));
-                        UsbStringDescriptor stringDesc =
+                        var ptrStringDesc = IntPtr.Add(ptrRequest, Marshal.SizeOf(request));
+
+                        var stringDesc =
                             (UsbStringDescriptor)Marshal.PtrToStructure(ptrStringDesc, typeof(UsbStringDescriptor));
+
                         device.DeviceManufacturer = stringDesc.bString;
                     }
 
@@ -538,30 +563,32 @@ namespace Aaru.Devices.Windows
                 if(PortDeviceDescriptor.iProduct > 0)
                 {
                     // build a request for string descriptor
-                    UsbDescriptorRequest request = new UsbDescriptorRequest
+                    var request = new UsbDescriptorRequest
                     {
-                        ConnectionIndex = PortPortNumber,
-                        SetupPacket =
+                        ConnectionIndex = PortPortNumber, SetupPacket =
                         {
                             // Language Code
                             wIndex = 0x409,
                             wValue = (short)((USB_STRING_DESCRIPTOR_TYPE << 8) + PortDeviceDescriptor.iProduct)
                         }
                     };
+
                     request.SetupPacket.wLength = (short)(nBytes - Marshal.SizeOf(request));
+
                     // Geez, I wish C# had a Marshal.MemSet() method
                     IntPtr ptrRequest = Marshal.StringToHGlobalAuto(nullString);
                     Marshal.StructureToPtr(request, ptrRequest, true);
 
                     // Use an IOCTL call to request the String Descriptor
-                    if(DeviceIoControl(h, IOCTL_USB_GET_DESCRIPTOR_FROM_NODE_CONNECTION, ptrRequest, nBytes,
-                                       ptrRequest,
+                    if(DeviceIoControl(h, IOCTL_USB_GET_DESCRIPTOR_FROM_NODE_CONNECTION, ptrRequest, nBytes, ptrRequest,
                                        nBytes, out nBytesReturned, IntPtr.Zero))
                     {
                         // the location of the string descriptor is immediately after the Request structure
-                        IntPtr ptrStringDesc = IntPtr.Add(ptrRequest, Marshal.SizeOf(request));
-                        UsbStringDescriptor stringDesc =
+                        var ptrStringDesc = IntPtr.Add(ptrRequest, Marshal.SizeOf(request));
+
+                        var stringDesc =
                             (UsbStringDescriptor)Marshal.PtrToStructure(ptrStringDesc, typeof(UsbStringDescriptor));
+
                         device.DeviceProduct = stringDesc.bString;
                     }
 
@@ -571,30 +598,32 @@ namespace Aaru.Devices.Windows
                 if(PortDeviceDescriptor.iSerialNumber > 0)
                 {
                     // build a request for string descriptor
-                    UsbDescriptorRequest request = new UsbDescriptorRequest
+                    var request = new UsbDescriptorRequest
                     {
-                        ConnectionIndex = PortPortNumber,
-                        SetupPacket =
+                        ConnectionIndex = PortPortNumber, SetupPacket =
                         {
                             // Language Code
                             wIndex = 0x409,
                             wValue = (short)((USB_STRING_DESCRIPTOR_TYPE << 8) + PortDeviceDescriptor.iSerialNumber)
                         }
                     };
+
                     request.SetupPacket.wLength = (short)(nBytes - Marshal.SizeOf(request));
+
                     // Geez, I wish C# had a Marshal.MemSet() method
                     IntPtr ptrRequest = Marshal.StringToHGlobalAuto(nullString);
                     Marshal.StructureToPtr(request, ptrRequest, true);
 
                     // Use an IOCTL call to request the String Descriptor
-                    if(DeviceIoControl(h, IOCTL_USB_GET_DESCRIPTOR_FROM_NODE_CONNECTION, ptrRequest, nBytes,
-                                       ptrRequest,
+                    if(DeviceIoControl(h, IOCTL_USB_GET_DESCRIPTOR_FROM_NODE_CONNECTION, ptrRequest, nBytes, ptrRequest,
                                        nBytes, out nBytesReturned, IntPtr.Zero))
                     {
                         // the location of the string descriptor is immediately after the Request structure
-                        IntPtr ptrStringDesc = IntPtr.Add(ptrRequest, Marshal.SizeOf(request));
-                        UsbStringDescriptor stringDesc =
+                        var ptrStringDesc = IntPtr.Add(ptrRequest, Marshal.SizeOf(request));
+
+                        var stringDesc =
                             (UsbStringDescriptor)Marshal.PtrToStructure(ptrStringDesc, typeof(UsbStringDescriptor));
+
                         device.DeviceSerialNumber = stringDesc.bString;
                     }
 
@@ -602,23 +631,25 @@ namespace Aaru.Devices.Windows
                 }
 
                 // build a request for configuration descriptor
-                UsbDescriptorRequest dcrRequest = new UsbDescriptorRequest
+                var dcrRequest = new UsbDescriptorRequest
                 {
-                    ConnectionIndex = PortPortNumber,
-                    SetupPacket     = {wIndex = 0, wValue = USB_CONFIGURATION_DESCRIPTOR_TYPE << 8}
+                    ConnectionIndex = PortPortNumber, SetupPacket =
+                    {
+                        wIndex = 0, wValue = USB_CONFIGURATION_DESCRIPTOR_TYPE << 8
+                    }
                 };
+
                 dcrRequest.SetupPacket.wLength = (short)(nBytes - Marshal.SizeOf(dcrRequest));
+
                 // Geez, I wish C# had a Marshal.MemSet() method
                 IntPtr dcrPtrRequest = Marshal.StringToHGlobalAuto(nullString);
                 Marshal.StructureToPtr(dcrRequest, dcrPtrRequest, true);
 
                 // Use an IOCTL call to request the String Descriptor
-                if(DeviceIoControl(h, IOCTL_USB_GET_DESCRIPTOR_FROM_NODE_CONNECTION, dcrPtrRequest,
-                                   nBytes,
-                                   dcrPtrRequest, nBytes, out nBytesReturned,
-                                   IntPtr.Zero))
+                if(DeviceIoControl(h, IOCTL_USB_GET_DESCRIPTOR_FROM_NODE_CONNECTION, dcrPtrRequest, nBytes,
+                                   dcrPtrRequest, nBytes, out nBytesReturned, IntPtr.Zero))
                 {
-                    IntPtr ptrStringDesc = IntPtr.Add(dcrPtrRequest, Marshal.SizeOf(dcrRequest));
+                    var ptrStringDesc = IntPtr.Add(dcrPtrRequest, Marshal.SizeOf(dcrRequest));
                     device.BinaryDeviceDescriptors = new byte[nBytesReturned];
                     Marshal.Copy(ptrStringDesc, device.BinaryDeviceDescriptors, 0, nBytesReturned);
                 }
@@ -626,21 +657,24 @@ namespace Aaru.Devices.Windows
                 Marshal.FreeHGlobal(dcrPtrRequest);
 
                 // Get the Driver Key Name (usefull in locating a device)
-                UsbNodeConnectionDriverkeyName driverKey =
-                    new UsbNodeConnectionDriverkeyName {ConnectionIndex = PortPortNumber};
+                var driverKey = new UsbNodeConnectionDriverkeyName
+                {
+                    ConnectionIndex = PortPortNumber
+                };
+
                 nBytes = Marshal.SizeOf(driverKey);
                 IntPtr ptrDriverKey = Marshal.AllocHGlobal(nBytes);
                 Marshal.StructureToPtr(driverKey, ptrDriverKey, true);
 
                 // Use an IOCTL call to request the Driver Key Name
-                if(DeviceIoControl(h, IOCTL_USB_GET_NODE_CONNECTION_DRIVERKEY_NAME, ptrDriverKey, nBytes,
-                                   ptrDriverKey,
+                if(DeviceIoControl(h, IOCTL_USB_GET_NODE_CONNECTION_DRIVERKEY_NAME, ptrDriverKey, nBytes, ptrDriverKey,
                                    nBytes, out nBytesReturned, IntPtr.Zero))
                 {
                     driverKey = (UsbNodeConnectionDriverkeyName)Marshal.PtrToStructure(ptrDriverKey,
                                                                                        typeof(
                                                                                            UsbNodeConnectionDriverkeyName
                                                                                        ));
+
                     device.DeviceDriverKey = driverKey.DriverKeyName;
 
                     // use the DriverKeyName to get the Device Description and Instance ID
@@ -650,18 +684,18 @@ namespace Aaru.Devices.Windows
 
                 Marshal.FreeHGlobal(ptrDriverKey);
                 CloseHandle(h);
+
                 return device;
             }
 
-            /// <summary>
-            ///     return a down stream external hub
-            /// </summary>
+            /// <summary>return a down stream external hub</summary>
             /// <returns>Downstream external hub</returns>
             internal UsbHub GetHub()
             {
-                if(!PortIsHub) return null;
+                if(!PortIsHub)
+                    return null;
 
-                UsbHub hub = new UsbHub();
+                var    hub = new UsbHub();
                 IntPtr h, h2;
                 hub.HubIsRootHub  = false;
                 hub.HubDeviceDesc = "External Hub";
@@ -669,39 +703,51 @@ namespace Aaru.Devices.Windows
                 // Open a handle to the Host Controller
                 h = CreateFile(PortHubDevicePath, GENERIC_WRITE, FILE_SHARE_WRITE, IntPtr.Zero, OPEN_EXISTING, 0,
                                IntPtr.Zero);
-                if(h == INVALID_HANDLE_VALUE) return hub;
+
+                if(h == INVALID_HANDLE_VALUE)
+                    return hub;
 
                 // Get the DevicePath for downstream hub
-                UsbNodeConnectionName nodeName    = new UsbNodeConnectionName {ConnectionIndex = PortPortNumber};
-                int                   nBytes      = Marshal.SizeOf(nodeName);
-                IntPtr                ptrNodeName = Marshal.AllocHGlobal(nBytes);
+                var nodeName = new UsbNodeConnectionName
+                {
+                    ConnectionIndex = PortPortNumber
+                };
+
+                int    nBytes      = Marshal.SizeOf(nodeName);
+                IntPtr ptrNodeName = Marshal.AllocHGlobal(nBytes);
                 Marshal.StructureToPtr(nodeName, ptrNodeName, true);
 
                 // Use an IOCTL call to request the Node Name
-                if(DeviceIoControl(h,     IOCTL_USB_GET_NODE_CONNECTION_NAME, ptrNodeName, nBytes, ptrNodeName, nBytes,
+                if(DeviceIoControl(h, IOCTL_USB_GET_NODE_CONNECTION_NAME, ptrNodeName, nBytes, ptrNodeName, nBytes,
                                    out _, IntPtr.Zero))
                 {
                     nodeName = (UsbNodeConnectionName)Marshal.PtrToStructure(ptrNodeName,
                                                                              typeof(UsbNodeConnectionName));
+
                     hub.HubDevicePath = @"\\.\" + nodeName.NodeName;
                 }
 
                 // Now let's open the Hub (based upon the HubName we got above)
                 h2 = CreateFile(hub.HubDevicePath, GENERIC_WRITE, FILE_SHARE_WRITE, IntPtr.Zero, OPEN_EXISTING, 0,
                                 IntPtr.Zero);
+
                 if(h2 != INVALID_HANDLE_VALUE)
                 {
-                    UsbNodeInformation nodeInfo = new UsbNodeInformation {NodeType = (int)UsbHubNode.UsbHub};
+                    var nodeInfo = new UsbNodeInformation
+                    {
+                        NodeType = (int)UsbHubNode.UsbHub
+                    };
+
                     nBytes = Marshal.SizeOf(nodeInfo);
                     IntPtr ptrNodeInfo = Marshal.AllocHGlobal(nBytes);
                     Marshal.StructureToPtr(nodeInfo, ptrNodeInfo, true);
 
                     // get the Hub Information
-                    if(DeviceIoControl(h2,    IOCTL_USB_GET_NODE_INFORMATION, ptrNodeInfo, nBytes, ptrNodeInfo, nBytes,
+                    if(DeviceIoControl(h2, IOCTL_USB_GET_NODE_INFORMATION, ptrNodeInfo, nBytes, ptrNodeInfo, nBytes,
                                        out _, IntPtr.Zero))
                     {
-                        nodeInfo =
-                            (UsbNodeInformation)Marshal.PtrToStructure(ptrNodeInfo, typeof(UsbNodeInformation));
+                        nodeInfo = (UsbNodeInformation)Marshal.PtrToStructure(ptrNodeInfo, typeof(UsbNodeInformation));
+
                         hub.HubIsBusPowered = Convert.ToBoolean(nodeInfo.HubInformation.HubIsBusPowered);
                         hub.HubPortCount    = nodeInfo.HubInformation.HubDescriptor.bNumberOfPorts;
                     }
@@ -721,13 +767,12 @@ namespace Aaru.Devices.Windows
 
                 Marshal.FreeHGlobal(ptrNodeName);
                 CloseHandle(h);
+
                 return hub;
             }
         }
 
-        /// <summary>
-        ///     Represents an USB device
-        /// </summary>
+        /// <summary>Represents an USB device</summary>
         internal class UsbDevice
         {
             internal byte[]              BinaryDeviceDescriptors;
@@ -811,28 +856,19 @@ namespace Aaru.Devices.Windows
 
         enum UsbHubNode
         {
-            UsbHub,
-            UsbMiParent
+            UsbHub, UsbMiParent
         }
 
         enum UsbConnectionStatus
         {
-            NoDeviceConnected,
-            DeviceConnected,
-            DeviceFailedEnumeration,
-            DeviceGeneralFailure,
-            DeviceCausedOvercurrent,
-            DeviceNotEnoughPower,
-            DeviceNotEnoughBandwidth,
-            DeviceHubNestedTooDeeply,
-            DeviceInLegacyHub
+            NoDeviceConnected, DeviceConnected, DeviceFailedEnumeration,
+            DeviceGeneralFailure, DeviceCausedOvercurrent, DeviceNotEnoughPower,
+            DeviceNotEnoughBandwidth, DeviceHubNestedTooDeeply, DeviceInLegacyHub
         }
 
         enum UsbDeviceSpeed : byte
         {
-            UsbLowSpeed,
-            UsbFullSpeed,
-            UsbHighSpeed
+            UsbLowSpeed, UsbFullSpeed, UsbHighSpeed
         }
 
         // ********************** Stuctures ************************
@@ -840,19 +876,19 @@ namespace Aaru.Devices.Windows
         [StructLayout(LayoutKind.Sequential)]
         struct SpDevinfoData
         {
-            internal int    cbSize;
-            internal Guid   ClassGuid;
-            internal IntPtr DevInst;
-            internal IntPtr Reserved;
+            internal          int    cbSize;
+            internal readonly Guid   ClassGuid;
+            internal readonly IntPtr DevInst;
+            internal readonly IntPtr Reserved;
         }
 
         [StructLayout(LayoutKind.Sequential)]
         struct SpDeviceInterfaceData
         {
-            internal int    cbSize;
-            internal Guid   InterfaceClassGuid;
-            internal int    Flags;
-            internal IntPtr Reserved;
+            internal          int    cbSize;
+            internal readonly Guid   InterfaceClassGuid;
+            internal readonly int    Flags;
+            internal readonly IntPtr Reserved;
         }
 
         [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
@@ -860,69 +896,69 @@ namespace Aaru.Devices.Windows
         {
             internal int cbSize;
             [MarshalAs(UnmanagedType.ByValTStr, SizeConst = BUFFER_SIZE)]
-            internal string DevicePath;
+            internal readonly string DevicePath;
         }
 
         [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
         struct UsbHcdDriverkeyName
         {
-            internal int ActualLength;
+            internal readonly int ActualLength;
             [MarshalAs(UnmanagedType.ByValTStr, SizeConst = BUFFER_SIZE)]
-            internal string DriverKeyName;
+            internal readonly string DriverKeyName;
         }
 
         [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
         struct UsbRootHubName
         {
-            internal int ActualLength;
+            internal readonly int ActualLength;
             [MarshalAs(UnmanagedType.ByValTStr, SizeConst = BUFFER_SIZE)]
-            internal string RootHubName;
+            internal readonly string RootHubName;
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct UsbHubDescriptor
         {
-            internal byte  bDescriptorLength;
-            internal byte  bDescriptorType;
-            internal byte  bNumberOfPorts;
-            internal short wHubCharacteristics;
-            internal byte  bPowerOnToPowerGood;
-            internal byte  bHubControlCurrent;
+            internal readonly byte  bDescriptorLength;
+            internal readonly byte  bDescriptorType;
+            internal readonly byte  bNumberOfPorts;
+            internal readonly short wHubCharacteristics;
+            internal readonly byte  bPowerOnToPowerGood;
+            internal readonly byte  bHubControlCurrent;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 64)]
-            internal byte[] bRemoveAndPowerMask;
+            internal readonly byte[] bRemoveAndPowerMask;
         }
 
         [StructLayout(LayoutKind.Sequential)]
         struct UsbHubInformation
         {
-            internal UsbHubDescriptor HubDescriptor;
-            internal byte             HubIsBusPowered;
+            internal readonly UsbHubDescriptor HubDescriptor;
+            internal readonly byte             HubIsBusPowered;
         }
 
         [StructLayout(LayoutKind.Sequential)]
         struct UsbNodeInformation
         {
-            internal int               NodeType;
-            internal UsbHubInformation HubInformation; // Yeah, I'm assuming we'll just use the first form
+            internal          int               NodeType;
+            internal readonly UsbHubInformation HubInformation; // Yeah, I'm assuming we'll just use the first form
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct UsbNodeConnectionInformationEx
         {
-            internal int                 ConnectionIndex;
-            internal UsbDeviceDescriptor DeviceDescriptor;
-            internal byte                CurrentConfigurationValue;
-            internal byte                Speed;
-            internal byte                DeviceIsHub;
-            internal short               DeviceAddress;
-            internal int                 NumberOfOpenPipes;
+            internal          int                 ConnectionIndex;
+            internal readonly UsbDeviceDescriptor DeviceDescriptor;
+            internal readonly byte                CurrentConfigurationValue;
+            internal readonly byte                Speed;
+            internal readonly byte                DeviceIsHub;
+            internal readonly short               DeviceAddress;
+            internal readonly int                 NumberOfOpenPipes;
+
+            internal readonly int ConnectionStatus;
 
-            internal int ConnectionStatus;
             //internal IntPtr PipeList;
         }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
+        [StructLayout(LayoutKind.Sequential, Pack = 1), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
         internal struct UsbDeviceDescriptor
         {
             internal byte  bLength;
@@ -944,20 +980,20 @@ namespace Aaru.Devices.Windows
         [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
         struct UsbStringDescriptor
         {
-            internal byte bLength;
-            internal byte bDescriptorType;
+            internal readonly byte bLength;
+            internal readonly byte bDescriptorType;
             [MarshalAs(UnmanagedType.ByValTStr, SizeConst = MAXIMUM_USB_STRING_LENGTH)]
-            internal string bString;
+            internal readonly string bString;
         }
 
         [StructLayout(LayoutKind.Sequential)]
         struct UsbSetupPacket
         {
-            internal byte  bmRequest;
-            internal byte  bRequest;
-            internal short wValue;
-            internal short wIndex;
-            internal short wLength;
+            internal readonly byte  bmRequest;
+            internal readonly byte  bRequest;
+            internal          short wValue;
+            internal          short wIndex;
+            internal          short wLength;
         }
 
         [StructLayout(LayoutKind.Sequential)]
@@ -966,25 +1002,26 @@ namespace Aaru.Devices.Windows
             internal int ConnectionIndex;
 
             internal UsbSetupPacket SetupPacket;
+
             //internal byte[] Data;
         }
 
         [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
         struct UsbNodeConnectionName
         {
-            internal int ConnectionIndex;
-            internal int ActualLength;
+            internal          int ConnectionIndex;
+            internal readonly int ActualLength;
             [MarshalAs(UnmanagedType.ByValTStr, SizeConst = BUFFER_SIZE)]
-            internal string NodeName;
+            internal readonly string NodeName;
         }
 
         [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
         struct UsbNodeConnectionDriverkeyName // Yes, this is the same as the structure above...
         {
-            internal int ConnectionIndex;
-            internal int ActualLength;
+            internal          int ConnectionIndex;
+            internal readonly int ActualLength;
             [MarshalAs(UnmanagedType.ByValTStr, SizeConst = BUFFER_SIZE)]
-            internal string DriverKeyName;
+            internal readonly string DriverKeyName;
         }
 
         // ********************** API Definitions ************************
@@ -997,50 +1034,44 @@ namespace Aaru.Devices.Windows
         static extern IntPtr SetupDiGetClassDevs(int classGuid, string enumerator, IntPtr hwndParent, int flags);
 
         [DllImport("setupapi.dll", SetLastError = true, CharSet = CharSet.Auto)]
-        static extern bool SetupDiEnumDeviceInterfaces(IntPtr                    deviceInfoSet,
-                                                       IntPtr                    deviceInfoData,
-                                                       ref Guid                  interfaceClassGuid, int memberIndex,
+        static extern bool SetupDiEnumDeviceInterfaces(IntPtr deviceInfoSet, IntPtr deviceInfoData,
+                                                       ref Guid interfaceClassGuid, int memberIndex,
                                                        ref SpDeviceInterfaceData deviceInterfaceData);
 
         [DllImport("setupapi.dll", SetLastError = true, CharSet = CharSet.Auto)]
-        static extern bool SetupDiGetDeviceInterfaceDetail(IntPtr                          deviceInfoSet,
-                                                           ref SpDeviceInterfaceData       deviceInterfaceData,
+        static extern bool SetupDiGetDeviceInterfaceDetail(IntPtr deviceInfoSet,
+                                                           ref SpDeviceInterfaceData deviceInterfaceData,
                                                            ref SpDeviceInterfaceDetailData deviceInterfaceDetailData,
-                                                           int
-                                                               deviceInterfaceDetailDataSize, ref int requiredSize,
+                                                           int deviceInterfaceDetailDataSize, ref int requiredSize,
                                                            ref SpDevinfoData deviceInfoData);
 
         [DllImport("setupapi.dll", SetLastError = true, CharSet = CharSet.Auto)]
-        static extern bool SetupDiGetDeviceRegistryProperty(IntPtr  deviceInfoSet, ref SpDevinfoData deviceInfoData,
-                                                            int     iProperty,
-                                                            ref int propertyRegDataType,
-                                                            IntPtr  propertyBuffer,
-                                                            int     propertyBufferSize,
+        static extern bool SetupDiGetDeviceRegistryProperty(IntPtr deviceInfoSet, ref SpDevinfoData deviceInfoData,
+                                                            int iProperty, ref int propertyRegDataType,
+                                                            IntPtr propertyBuffer, int propertyBufferSize,
                                                             ref int requiredSize);
 
         [DllImport("setupapi.dll", SetLastError = true, CharSet = CharSet.Auto)]
-        static extern bool SetupDiEnumDeviceInfo(IntPtr            deviceInfoSet, int memberIndex,
+        static extern bool SetupDiEnumDeviceInfo(IntPtr deviceInfoSet, int memberIndex,
                                                  ref SpDevinfoData deviceInfoData);
 
         [DllImport("setupapi.dll", SetLastError = true)]
         static extern bool SetupDiDestroyDeviceInfoList(IntPtr deviceInfoSet);
 
         [DllImport("setupapi.dll", SetLastError = true, CharSet = CharSet.Auto)]
-        static extern bool SetupDiGetDeviceInstanceId(IntPtr        deviceInfoSet, ref SpDevinfoData deviceInfoData,
-                                                      StringBuilder deviceInstanceId,
-                                                      int           deviceInstanceIdSize,
-                                                      out int       requiredSize);
+        static extern bool SetupDiGetDeviceInstanceId(IntPtr deviceInfoSet, ref SpDevinfoData deviceInfoData,
+                                                      StringBuilder deviceInstanceId, int deviceInstanceIdSize,
+                                                      out int requiredSize);
 
         [DllImport("kernel32.dll", SetLastError = true, CharSet = CharSet.Auto)]
-        static extern bool DeviceIoControl(IntPtr hDevice, int dwIoControlCode, IntPtr lpInBuffer,
-                                           int    nInBufferSize,
+        static extern bool DeviceIoControl(IntPtr hDevice, int dwIoControlCode, IntPtr lpInBuffer, int nInBufferSize,
                                            IntPtr lpOutBuffer, int nOutBufferSize, out int lpBytesReturned,
                                            IntPtr lpOverlapped);
 
         [DllImport("kernel32.dll", SetLastError = true, CharSet = CharSet.Auto)]
-        static extern IntPtr CreateFile(string lpFileName,           int    dwDesiredAccess, int dwShareMode,
-                                        IntPtr lpSecurityAttributes, int    dwCreationDisposition,
-                                        int    dwFlagsAndAttributes, IntPtr hTemplateFile);
+        static extern IntPtr CreateFile(string lpFileName, int dwDesiredAccess, int dwShareMode,
+                                        IntPtr lpSecurityAttributes, int dwCreationDisposition,
+                                        int dwFlagsAndAttributes, IntPtr hTemplateFile);
 
         [DllImport("kernel32.dll", SetLastError = true, CharSet = CharSet.Auto)]
         static extern bool CloseHandle(IntPtr hObject);
diff --git a/Aaru.Devices/Windows/UsbFunctions.cs b/Aaru.Devices/Windows/UsbFunctions.cs
index b9c663839..3cc8d9842 100644
--- a/Aaru.Devices/Windows/UsbFunctions.cs
+++ b/Aaru.Devices/Windows/UsbFunctions.cs
@@ -42,143 +42,141 @@ namespace Aaru.Devices.Windows
     // You might not want to keep these in the USB class... your choice
     //
     // TODO: Even after cleaning, refactoring and xml-documenting, this code needs some love
-    /// <summary>
-    ///     Implements functions for getting and accesing information from the USB bus
-    /// </summary>
+    /// <summary>Implements functions for getting and accesing information from the USB bus</summary>
     internal static partial class Usb
     {
-        private const int IOCTL_STORAGE_GET_DEVICE_NUMBER = 0x2D1080;
-        internal const string GuidDevinterfaceDisk = "53f56307-b6bf-11d0-94f2-00a0c91efb8b";
-        internal const string GuidDevinterfaceCdrom = "53f56308-b6bf-11d0-94f2-00a0c91efb8b";
-        internal const string GuidDevinterfaceFloppy = "53f56311-b6bf-11d0-94f2-00a0c91efb8b";
-        internal const string GuidDevinterfaceTape = "53f5630b-b6bf-11d0-94f2-00a0c91efb8b";
+        const          int    IOCTL_STORAGE_GET_DEVICE_NUMBER = 0x2D1080;
+        internal const string GuidDevinterfaceDisk            = "53f56307-b6bf-11d0-94f2-00a0c91efb8b";
+        internal const string GuidDevinterfaceCdrom           = "53f56308-b6bf-11d0-94f2-00a0c91efb8b";
+        internal const string GuidDevinterfaceFloppy          = "53f56311-b6bf-11d0-94f2-00a0c91efb8b";
+        internal const string GuidDevinterfaceTape            = "53f5630b-b6bf-11d0-94f2-00a0c91efb8b";
 
-        /// <summary>
-        ///     Get a list of all connected devices
-        /// </summary>
+        /// <summary>Get a list of all connected devices</summary>
         /// <returns>List of usb devices</returns>
         internal static List<UsbDevice> GetConnectedDevices()
         {
-            var devList = new List<UsbDevice>();
+            List<UsbDevice> devList = new List<UsbDevice>();
 
-            foreach (var controller in GetHostControllers()) ListHub(controller.GetRootHub(), devList);
+            foreach(UsbController controller in GetHostControllers())
+                ListHub(controller.GetRootHub(), devList);
 
             return devList;
         }
 
-        /// <summary>
-        ///     private routine for enumerating a hub
-        /// </summary>
+        /// <summary>private routine for enumerating a hub</summary>
         /// <param name="hub">Hub</param>
         /// <param name="devList">Device list</param>
-        private static void ListHub(UsbHub hub, ICollection<UsbDevice> devList)
+        static void ListHub(UsbHub hub, ICollection<UsbDevice> devList)
         {
-            foreach (var port in hub.GetPorts())
-                if (port.IsHub)
+            foreach(UsbPort port in hub.GetPorts())
+                if(port.IsHub)
                 {
                     ListHub(port.GetHub(), devList);
                 }
                 else
                 {
-                    if (port.IsDeviceConnected) devList.Add(port.GetDevice());
+                    if(port.IsDeviceConnected)
+                        devList.Add(port.GetDevice());
                 }
         }
 
-        /// <summary>
-        ///     Find a device based upon it's DriverKeyName
-        /// </summary>
+        /// <summary>Find a device based upon it's DriverKeyName</summary>
         /// <param name="driverKeyName">DriverKeyName</param>
         /// <returns>USB device</returns>
         internal static UsbDevice FindDeviceByDriverKeyName(string driverKeyName)
         {
             UsbDevice foundDevice = null;
 
-            foreach (var controller in GetHostControllers())
+            foreach(UsbController controller in GetHostControllers())
             {
                 SearchHubDriverKeyName(controller.GetRootHub(), ref foundDevice, driverKeyName);
-                if (foundDevice != null) break;
+
+                if(foundDevice != null)
+                    break;
             }
 
             return foundDevice;
         }
 
-        /// <summary>
-        ///     Finds a device connected to a specified hub by it's DriverKeyName
-        /// </summary>
+        /// <summary>Finds a device connected to a specified hub by it's DriverKeyName</summary>
         /// <param name="hub">Hub</param>
         /// <param name="foundDevice">UsbDevice</param>
         /// <param name="driverKeyName">DriverKeyName</param>
-        private static void SearchHubDriverKeyName(UsbHub hub, ref UsbDevice foundDevice, string driverKeyName)
+        static void SearchHubDriverKeyName(UsbHub hub, ref UsbDevice foundDevice, string driverKeyName)
         {
-            foreach (var port in hub.GetPorts())
-                if (port.IsHub)
+            foreach(UsbPort port in hub.GetPorts())
+                if(port.IsHub)
                 {
                     SearchHubDriverKeyName(port.GetHub(), ref foundDevice, driverKeyName);
                 }
                 else
                 {
-                    if (!port.IsDeviceConnected) continue;
+                    if(!port.IsDeviceConnected)
+                        continue;
 
-                    var device = port.GetDevice();
-                    if (device.DeviceDriverKey != driverKeyName) continue;
+                    UsbDevice device = port.GetDevice();
+
+                    if(device.DeviceDriverKey != driverKeyName)
+                        continue;
 
                     foundDevice = device;
+
                     break;
                 }
         }
 
-        /// <summary>
-        ///     Find a device based upon it's Instance ID
-        /// </summary>
+        /// <summary>Find a device based upon it's Instance ID</summary>
         /// <param name="instanceId">Device instance ID</param>
         /// <returns>USB device</returns>
-        private static UsbDevice FindDeviceByInstanceId(string instanceId)
+        static UsbDevice FindDeviceByInstanceId(string instanceId)
         {
             UsbDevice foundDevice = null;
 
-            foreach (var controller in GetHostControllers())
+            foreach(UsbController controller in GetHostControllers())
             {
                 SearchHubInstanceId(controller.GetRootHub(), ref foundDevice, instanceId);
-                if (foundDevice != null) break;
+
+                if(foundDevice != null)
+                    break;
             }
 
             return foundDevice;
         }
 
-        /// <summary>
-        ///     private routine for enumerating a hub
-        /// </summary>
+        /// <summary>private routine for enumerating a hub</summary>
         /// <param name="hub">Hub</param>
         /// <param name="foundDevice">USB device</param>
         /// <param name="instanceId">Device instance ID</param>
-        private static void SearchHubInstanceId(UsbHub hub, ref UsbDevice foundDevice, string instanceId)
+        static void SearchHubInstanceId(UsbHub hub, ref UsbDevice foundDevice, string instanceId)
         {
-            foreach (var port in hub.GetPorts())
-                if (port.IsHub)
+            foreach(UsbPort port in hub.GetPorts())
+                if(port.IsHub)
                 {
                     SearchHubInstanceId(port.GetHub(), ref foundDevice, instanceId);
                 }
                 else
                 {
-                    if (!port.IsDeviceConnected) continue;
+                    if(!port.IsDeviceConnected)
+                        continue;
 
-                    var device = port.GetDevice();
-                    if (device.InstanceId != instanceId) continue;
+                    UsbDevice device = port.GetDevice();
+
+                    if(device.InstanceId != instanceId)
+                        continue;
 
                     foundDevice = device;
+
                     break;
                 }
         }
 
         [DllImport("setupapi.dll")]
-        private static extern int CM_Get_Parent(out IntPtr pdnDevInst, IntPtr dnDevInst, int ulFlags);
+        static extern int CM_Get_Parent(out IntPtr pdnDevInst, IntPtr dnDevInst, int ulFlags);
 
         [DllImport("setupapi.dll", CharSet = CharSet.Auto)]
-        private static extern int CM_Get_Device_ID(IntPtr dnDevInst, IntPtr buffer, int bufferLen, int ulFlags);
+        static extern int CM_Get_Device_ID(IntPtr dnDevInst, IntPtr buffer, int bufferLen, int ulFlags);
 
-        /// <summary>
-        ///     Find a device based upon a Drive Letter
-        /// </summary>
+        /// <summary>Find a device based upon a Drive Letter</summary>
         /// <param name="driveLetter">Drive letter</param>
         /// <param name="deviceGuid">Device GUID</param>
         /// <returns>USB device</returns>
@@ -187,13 +185,12 @@ namespace Aaru.Devices.Windows
             // We start by getting the unique DeviceNumber of the given
             // DriveLetter.  We'll use this later to find a matching
             // DevicePath "symbolic name"
-            var devNum = GetDeviceNumber(@"\\.\" + driveLetter.TrimEnd('\\'));
+            int devNum = GetDeviceNumber(@"\\.\" + driveLetter.TrimEnd('\\'));
+
             return devNum < 0 ? null : FindDeviceNumber(devNum, deviceGuid);
         }
 
-        /// <summary>
-        ///     Find a device based upon a Drive Path
-        /// </summary>
+        /// <summary>Find a device based upon a Drive Path</summary>
         /// <param name="drivePath">Drive path</param>
         /// <param name="deviceGuid">Device GUID</param>
         /// <returns>USB device</returns>
@@ -202,30 +199,31 @@ namespace Aaru.Devices.Windows
             // We start by getting the unique DeviceNumber of the given
             // DriveLetter.  We'll use this later to find a matching
             // DevicePath "symbolic name"
-            var devNum = GetDeviceNumber(drivePath);
+            int devNum = GetDeviceNumber(drivePath);
+
             return devNum < 0 ? null : FindDeviceNumber(devNum, deviceGuid);
         }
 
-        /// <summary>
-        ///     Find a device based upon a Device Number
-        /// </summary>
+        /// <summary>Find a device based upon a Device Number</summary>
         /// <param name="devNum">Device Number</param>
         /// <param name="deviceGuid">Device GUID</param>
         /// <returns>USB device</returns>
-        private static UsbDevice FindDeviceNumber(int devNum, string deviceGuid)
+        static UsbDevice FindDeviceNumber(int devNum, string deviceGuid)
         {
             UsbDevice foundDevice = null;
-            var instanceId = "";
+            string    instanceId  = "";
 
             var diskGuid = new Guid(deviceGuid);
 
             // We start at the "root" of the device tree and look for all
             // devices that match the interface GUID of a disk
-            var h = SetupDiGetClassDevs(ref diskGuid, 0, IntPtr.Zero, DIGCF_PRESENT | DIGCF_DEVICEINTERFACE);
-            if (h != INVALID_HANDLE_VALUE)
+            IntPtr h = SetupDiGetClassDevs(ref diskGuid, 0, IntPtr.Zero, DIGCF_PRESENT | DIGCF_DEVICEINTERFACE);
+
+            if(h != INVALID_HANDLE_VALUE)
             {
                 bool success;
-                var i = 0;
+                int  i = 0;
+
                 do
                 {
                     // create a Device Interface Data structure
@@ -234,68 +232,75 @@ namespace Aaru.Devices.Windows
 
                     // start the enumeration
                     success = SetupDiEnumDeviceInterfaces(h, IntPtr.Zero, ref diskGuid, i, ref dia);
-                    if (success)
+
+                    if(success)
                     {
                         // build a DevInfo Data structure
                         var da = new SpDevinfoData();
                         da.cbSize = Marshal.SizeOf(da);
 
                         // build a Device Interface Detail Data structure
-                        var didd =
-                            new SpDeviceInterfaceDetailData {cbSize = 4 + Marshal.SystemDefaultCharSize}; // trust me :)
+                        var didd = new SpDeviceInterfaceDetailData
+                        {
+                            cbSize = 4 + Marshal.SystemDefaultCharSize
+                        }; // trust me :)
 
                         // now we can get some more detailed information
-                        var nRequiredSize = 0;
-                        const int N_BYTES = BUFFER_SIZE;
-                        if (SetupDiGetDeviceInterfaceDetail(h, ref dia, ref didd, N_BYTES, ref nRequiredSize, ref da))
-                            if (GetDeviceNumber(didd.DevicePath) == devNum)
+                        int       nRequiredSize = 0;
+                        const int N_BYTES       = BUFFER_SIZE;
+
+                        if(SetupDiGetDeviceInterfaceDetail(h, ref dia, ref didd, N_BYTES, ref nRequiredSize, ref da))
+                            if(GetDeviceNumber(didd.DevicePath) == devNum)
                             {
                                 // current InstanceID is at the "USBSTOR" level, so we
                                 // need up "move up" one level to get to the "USB" level
-                                CM_Get_Parent(out var ptrPrevious, da.DevInst, 0);
+                                CM_Get_Parent(out IntPtr ptrPrevious, da.DevInst, 0);
 
                                 // Now we get the InstanceID of the USB level device
-                                var ptrInstanceBuf = Marshal.AllocHGlobal(N_BYTES);
+                                IntPtr ptrInstanceBuf = Marshal.AllocHGlobal(N_BYTES);
                                 CM_Get_Device_ID(ptrPrevious, ptrInstanceBuf, N_BYTES, 0);
                                 instanceId = Marshal.PtrToStringAuto(ptrInstanceBuf);
 
                                 Marshal.FreeHGlobal(ptrInstanceBuf);
+
                                 //System.Console.WriteLine("InstanceId: {0}", instanceId);
                                 //break;
                             }
                     }
 
                     i++;
-                } while (success);
+                } while(success);
 
                 SetupDiDestroyDeviceInfoList(h);
             }
 
             // Did we find an InterfaceID of a USB device?
-            if (instanceId?.StartsWith("USB\\", StringComparison.Ordinal) == true)
+            if(instanceId?.StartsWith("USB\\", StringComparison.Ordinal) == true)
                 foundDevice = FindDeviceByInstanceId(instanceId);
+
             return foundDevice;
         }
 
-        /// <summary>
-        ///     return a unique device number for the given device path
-        /// </summary>
+        /// <summary>return a unique device number for the given device path</summary>
         /// <param name="devicePath">Device path</param>
         /// <returns>Device number</returns>
-        private static int GetDeviceNumber(string devicePath)
+        static int GetDeviceNumber(string devicePath)
         {
-            var ans = -1;
+            int ans = -1;
 
-            var h = CreateFile(devicePath.TrimEnd('\\'), 0, 0, IntPtr.Zero, OPEN_EXISTING, 0, IntPtr.Zero);
-            if (h == INVALID_HANDLE_VALUE) return ans;
+            IntPtr h = CreateFile(devicePath.TrimEnd('\\'), 0, 0, IntPtr.Zero, OPEN_EXISTING, 0, IntPtr.Zero);
 
-            var sdn = new StorageDeviceNumber();
-            var nBytes = Marshal.SizeOf(sdn);
-            var ptrSdn = Marshal.AllocHGlobal(nBytes);
+            if(h == INVALID_HANDLE_VALUE)
+                return ans;
 
-            if (DeviceIoControl(h, IOCTL_STORAGE_GET_DEVICE_NUMBER, IntPtr.Zero, 0, ptrSdn, nBytes, out _, IntPtr.Zero))
+            var    sdn    = new StorageDeviceNumber();
+            int    nBytes = Marshal.SizeOf(sdn);
+            IntPtr ptrSdn = Marshal.AllocHGlobal(nBytes);
+
+            if(DeviceIoControl(h, IOCTL_STORAGE_GET_DEVICE_NUMBER, IntPtr.Zero, 0, ptrSdn, nBytes, out _, IntPtr.Zero))
             {
-                sdn = (StorageDeviceNumber) Marshal.PtrToStructure(ptrSdn, typeof(StorageDeviceNumber));
+                sdn = (StorageDeviceNumber)Marshal.PtrToStructure(ptrSdn, typeof(StorageDeviceNumber));
+
                 // just my way of combining the relevant parts of the
                 // STORAGE_DEVICE_NUMBER into a single number
                 ans = (sdn.DeviceType << 8) + sdn.DeviceNumber;
@@ -303,11 +308,12 @@ namespace Aaru.Devices.Windows
 
             Marshal.FreeHGlobal(ptrSdn);
             CloseHandle(h);
+
             return ans;
         }
 
         [StructLayout(LayoutKind.Sequential)]
-        private struct StorageDeviceNumber
+        struct StorageDeviceNumber
         {
             internal readonly int DeviceType;
             internal readonly int DeviceNumber;
diff --git a/Aaru.Dto b/Aaru.Dto
index b4dbbd436..61fa4c765 160000
--- a/Aaru.Dto
+++ b/Aaru.Dto
@@ -1 +1 @@
-Subproject commit b4dbbd4364687274aa142be4b17345f96777df18
+Subproject commit 61fa4c7658eabb7d691fcd4e972f6213e00800a0
diff --git a/Aaru.EntityFramework/Program.cs b/Aaru.EntityFramework/Program.cs
index ebd403f0f..3fce489da 100644
--- a/Aaru.EntityFramework/Program.cs
+++ b/Aaru.EntityFramework/Program.cs
@@ -32,8 +32,8 @@
 
 namespace Aaru.EntityFramework
 {
-    class Program
+    internal class Program
     {
-        static void Main(string[] args) { }
+        static void Main(string[] args) {}
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/AODOS.cs b/Aaru.Filesystems/AODOS.cs
index cb07b1275..3dd13c93f 100644
--- a/Aaru.Filesystems/AODOS.cs
+++ b/Aaru.Filesystems/AODOS.cs
@@ -45,23 +45,30 @@ namespace Aaru.Filesystems
     // This may be missing fields, or not, I don't know russian so any help is appreciated
     public class AODOS : IFilesystem
     {
-        readonly byte[]         AODOSIdentifier = {0x20, 0x41, 0x4F, 0x2D, 0x44, 0x4F, 0x53, 0x20};
-        public   FileSystemType XmlFsType { get; private set; }
-        public   string         Name      => "Alexander Osipov DOS file system";
-        public   Guid           Id        => new Guid("668E5039-9DDD-442A-BE1B-A315D6E38E26");
-        public   Encoding       Encoding  { get; private set; }
-        public   string         Author    => "Natalia Portillo";
+        readonly byte[] AODOSIdentifier =
+        {
+            0x20, 0x41, 0x4F, 0x2D, 0x44, 0x4F, 0x53, 0x20
+        };
+        public FileSystemType XmlFsType { get; private set; }
+        public string         Name      => "Alexander Osipov DOS file system";
+        public Guid           Id        => new Guid("668E5039-9DDD-442A-BE1B-A315D6E38E26");
+        public Encoding       Encoding  { get; private set; }
+        public string         Author    => "Natalia Portillo";
 
         public bool Identify(IMediaImage imagePlugin, Partition partition)
         {
             // Does AO-DOS support hard disks?
-            if(partition.Start > 0) return false;
+            if(partition.Start > 0)
+                return false;
 
             // How is it really?
-            if(imagePlugin.Info.SectorSize != 512) return false;
+            if(imagePlugin.Info.SectorSize != 512)
+                return false;
 
             // Does AO-DOS support any other kind of disk?
-            if(imagePlugin.Info.Sectors != 800 && imagePlugin.Info.Sectors != 1600) return false;
+            if(imagePlugin.Info.Sectors != 800 &&
+               imagePlugin.Info.Sectors != 1600)
+                return false;
 
             byte[]          sector = imagePlugin.ReadSector(0);
             AODOS_BootBlock bb     = Marshal.ByteArrayToStructureLittleEndian<AODOS_BootBlock>(sector);
@@ -70,33 +77,31 @@ namespace Aaru.Filesystems
         }
 
         public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding    encoding)
+                                   Encoding encoding)
         {
             Encoding = Encoding.GetEncoding("koi8-r");
             byte[]          sector = imagePlugin.ReadSector(0);
             AODOS_BootBlock bb     = Marshal.ByteArrayToStructureLittleEndian<AODOS_BootBlock>(sector);
 
-            StringBuilder sbInformation = new StringBuilder();
+            var sbInformation = new StringBuilder();
 
             sbInformation.AppendLine("Alexander Osipov DOS file system");
 
             XmlFsType = new FileSystemType
             {
-                Type                  = "Alexander Osipov DOS file system",
-                Clusters              = imagePlugin.Info.Sectors,
-                ClusterSize           = imagePlugin.Info.SectorSize,
-                Files                 = bb.files,
-                FilesSpecified        = true,
-                FreeClusters          = imagePlugin.Info.Sectors - bb.usedSectors,
-                FreeClustersSpecified = true,
-                VolumeName            = StringHandlers.SpacePaddedToString(bb.volumeLabel, Encoding),
-                Bootable              = true
+                Type           = "Alexander Osipov DOS file system",
+                Clusters       = imagePlugin.Info.Sectors,
+                ClusterSize    = imagePlugin.Info.SectorSize, Files = bb.files,
+                FilesSpecified = true,
+                FreeClusters   = imagePlugin.Info.Sectors - bb.usedSectors, FreeClustersSpecified       = true,
+                VolumeName     = StringHandlers.SpacePaddedToString(bb.volumeLabel, Encoding), Bootable = true
             };
 
             sbInformation.AppendFormat("{0} files on volume", bb.files).AppendLine();
             sbInformation.AppendFormat("{0} used sectors on volume", bb.usedSectors).AppendLine();
-            sbInformation.AppendFormat("Disk name: {0}", StringHandlers.CToString(bb.volumeLabel, Encoding))
-                         .AppendLine();
+
+            sbInformation.AppendFormat("Disk name: {0}", StringHandlers.CToString(bb.volumeLabel, Encoding)).
+                          AppendLine();
 
             information = sbInformation.ToString();
         }
@@ -104,35 +109,21 @@ namespace Aaru.Filesystems
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct AODOS_BootBlock
         {
-            /// <summary>
-            ///     A NOP opcode
-            /// </summary>
+            /// <summary>A NOP opcode</summary>
             public readonly byte nop;
-            /// <summary>
-            ///     A branch to real bootloader
-            /// </summary>
+            /// <summary>A branch to real bootloader</summary>
             public readonly ushort branch;
-            /// <summary>
-            ///     Unused
-            /// </summary>
+            /// <summary>Unused</summary>
             public readonly byte unused;
-            /// <summary>
-            ///     " AO-DOS "
-            /// </summary>
+            /// <summary>" AO-DOS "</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
             public readonly byte[] identifier;
-            /// <summary>
-            ///     Volume label
-            /// </summary>
+            /// <summary>Volume label</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 12)]
             public readonly byte[] volumeLabel;
-            /// <summary>
-            ///     How many files are present in disk
-            /// </summary>
+            /// <summary>How many files are present in disk</summary>
             public readonly ushort files;
-            /// <summary>
-            ///     How many sectors are used
-            /// </summary>
+            /// <summary>How many sectors are used</summary>
             public readonly ushort usedSectors;
         }
     }
diff --git a/Aaru.Filesystems/APFS.cs b/Aaru.Filesystems/APFS.cs
index 6e751c64b..ad5114055 100644
--- a/Aaru.Filesystems/APFS.cs
+++ b/Aaru.Filesystems/APFS.cs
@@ -53,38 +53,54 @@ namespace Aaru.Filesystems
 
         public bool Identify(IMediaImage imagePlugin, Partition partition)
         {
-            if(partition.Start >= partition.End) return false;
+            if(partition.Start >= partition.End)
+                return false;
 
             byte[]                  sector = imagePlugin.ReadSector(partition.Start);
             ApfsContainerSuperBlock nxSb;
 
-            try { nxSb = Marshal.ByteArrayToStructureLittleEndian<ApfsContainerSuperBlock>(sector); }
-            catch { return false; }
+            try
+            {
+                nxSb = Marshal.ByteArrayToStructureLittleEndian<ApfsContainerSuperBlock>(sector);
+            }
+            catch
+            {
+                return false;
+            }
 
             return nxSb.magic == APFS_CONTAINER_MAGIC;
         }
 
         public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding    encoding)
+                                   Encoding encoding)
         {
             Encoding = Encoding.UTF8;
-            StringBuilder sbInformation = new StringBuilder();
+            var sbInformation = new StringBuilder();
             XmlFsType   = new FileSystemType();
             information = "";
 
-            if(partition.Start >= partition.End) return;
+            if(partition.Start >= partition.End)
+                return;
 
             byte[]                  sector = imagePlugin.ReadSector(partition.Start);
             ApfsContainerSuperBlock nxSb;
 
-            try { nxSb = Marshal.ByteArrayToStructureLittleEndian<ApfsContainerSuperBlock>(sector); }
-            catch { return; }
+            try
+            {
+                nxSb = Marshal.ByteArrayToStructureLittleEndian<ApfsContainerSuperBlock>(sector);
+            }
+            catch
+            {
+                return;
+            }
 
-            if(nxSb.magic != APFS_CONTAINER_MAGIC) return;
+            if(nxSb.magic != APFS_CONTAINER_MAGIC)
+                return;
 
             sbInformation.AppendLine("Apple File System");
             sbInformation.AppendLine();
             sbInformation.AppendFormat("{0} bytes per block", nxSb.blockSize).AppendLine();
+
             sbInformation.AppendFormat("Container has {0} bytes in {1} blocks", nxSb.containerBlocks * nxSb.blockSize,
                                        nxSb.containerBlocks).AppendLine();
 
@@ -92,10 +108,8 @@ namespace Aaru.Filesystems
 
             XmlFsType = new FileSystemType
             {
-                Bootable    = false,
-                Clusters    = nxSb.containerBlocks,
-                ClusterSize = nxSb.blockSize,
-                Type        = "Apple File System"
+                Bootable = false, Clusters = nxSb.containerBlocks, ClusterSize = nxSb.blockSize,
+                Type     = "Apple File System"
             };
         }
 
diff --git a/Aaru.Filesystems/Acorn.cs b/Aaru.Filesystems/Acorn.cs
index 30870aa86..3dc94298e 100644
--- a/Aaru.Filesystems/Acorn.cs
+++ b/Aaru.Filesystems/Acorn.cs
@@ -44,38 +44,22 @@ namespace Aaru.Filesystems
 {
     public class AcornADFS : IFilesystem
     {
-        /// <summary>
-        ///     Location for boot block, in bytes
-        /// </summary>
+        /// <summary>Location for boot block, in bytes</summary>
         const ulong BOOT_BLOCK_LOCATION = 0xC00;
-        /// <summary>
-        ///     Size of boot block, in bytes
-        /// </summary>
+        /// <summary>Size of boot block, in bytes</summary>
         const uint BOOT_BLOCK_SIZE = 0x200;
-        /// <summary>
-        ///     Location of new directory, in bytes
-        /// </summary>
+        /// <summary>Location of new directory, in bytes</summary>
         const ulong NEW_DIRECTORY_LOCATION = 0x400;
-        /// <summary>
-        ///     Location of old directory, in bytes
-        /// </summary>
+        /// <summary>Location of old directory, in bytes</summary>
         const ulong OLD_DIRECTORY_LOCATION = 0x200;
-        /// <summary>
-        ///     Size of old directory
-        /// </summary>
+        /// <summary>Size of old directory</summary>
         const uint OLD_DIRECTORY_SIZE = 1280;
-        /// <summary>
-        ///     Size of new directory
-        /// </summary>
+        /// <summary>Size of new directory</summary>
         const uint NEW_DIRECTORY_SIZE = 2048;
 
-        /// <summary>
-        ///     New directory format magic number, "Nick"
-        /// </summary>
+        /// <summary>New directory format magic number, "Nick"</summary>
         const uint NEW_DIR_MAGIC = 0x6B63694E;
-        /// <summary>
-        ///     Old directory format magic number, "Hugo"
-        /// </summary>
+        /// <summary>Old directory format magic number, "Hugo"</summary>
         const uint OLD_DIR_MAGIC = 0x6F677548;
 
         public FileSystemType XmlFsType { get; private set; }
@@ -87,12 +71,14 @@ namespace Aaru.Filesystems
         // TODO: BBC Master hard disks are untested...
         public bool Identify(IMediaImage imagePlugin, Partition partition)
         {
-            if(partition.Start >= partition.End) return false;
+            if(partition.Start >= partition.End)
+                return false;
 
             ulong sbSector;
             uint  sectorsToRead;
 
-            if(imagePlugin.Info.SectorSize < 256) return false;
+            if(imagePlugin.Info.SectorSize < 256)
+                return false;
 
             byte[] sector;
 
@@ -108,10 +94,12 @@ namespace Aaru.Filesystems
                 OldMapSector1 oldMap1 = Marshal.ByteArrayToStructureLittleEndian<OldMapSector1>(sector);
 
                 AaruConsole.DebugWriteLine("ADFS Plugin", "oldMap0.checksum = {0}", oldMap0.checksum);
-                AaruConsole.DebugWriteLine("ADFS Plugin", "oldChk0 = {0}",          oldChk0);
+                AaruConsole.DebugWriteLine("ADFS Plugin", "oldChk0 = {0}", oldChk0);
 
                 // According to documentation map1 MUST start on sector 1. On ADFS-D it starts at 0x100, not on sector 1 (0x400)
-                if(oldMap0.checksum == oldChk0 && oldMap1.checksum != oldChk1 && sector.Length >= 512)
+                if(oldMap0.checksum == oldChk0 &&
+                   oldMap1.checksum != oldChk1 &&
+                   sector.Length    >= 512)
                 {
                     sector = imagePlugin.ReadSector(0);
                     byte[] tmp = new byte[256];
@@ -121,16 +109,21 @@ namespace Aaru.Filesystems
                 }
 
                 AaruConsole.DebugWriteLine("ADFS Plugin", "oldMap1.checksum = {0}", oldMap1.checksum);
-                AaruConsole.DebugWriteLine("ADFS Plugin", "oldChk1 = {0}",          oldChk1);
+                AaruConsole.DebugWriteLine("ADFS Plugin", "oldChk1 = {0}", oldChk1);
 
-                if(oldMap0.checksum == oldChk0 && oldMap1.checksum == oldChk1 && oldMap0.checksum != 0 &&
+                if(oldMap0.checksum == oldChk0 &&
+                   oldMap1.checksum == oldChk1 &&
+                   oldMap0.checksum != 0       &&
                    oldMap1.checksum != 0)
                 {
                     sbSector      = OLD_DIRECTORY_LOCATION / imagePlugin.Info.SectorSize;
                     sectorsToRead = OLD_DIRECTORY_SIZE     / imagePlugin.Info.SectorSize;
-                    if(OLD_DIRECTORY_SIZE                  % imagePlugin.Info.SectorSize > 0) sectorsToRead++;
+
+                    if(OLD_DIRECTORY_SIZE % imagePlugin.Info.SectorSize > 0)
+                        sectorsToRead++;
 
                     sector = imagePlugin.ReadSectors(sbSector, sectorsToRead);
+
                     if(sector.Length > OLD_DIRECTORY_SIZE)
                     {
                         byte[] tmp = new byte[OLD_DIRECTORY_SIZE];
@@ -143,21 +136,28 @@ namespace Aaru.Filesystems
                     byte         dirChk  = AcornDirectoryChecksum(sector, (int)OLD_DIRECTORY_SIZE - 1);
 
                     AaruConsole.DebugWriteLine("ADFS Plugin", "oldRoot.header.magic at 0x200 = {0}",
-                                              oldRoot.header.magic);
+                                               oldRoot.header.magic);
+
                     AaruConsole.DebugWriteLine("ADFS Plugin", "oldRoot.tail.magic at 0x200 = {0}", oldRoot.tail.magic);
+
                     AaruConsole.DebugWriteLine("ADFS Plugin", "oldRoot.tail.checkByte at 0x200 = {0}",
-                                              oldRoot.tail.checkByte);
+                                               oldRoot.tail.checkByte);
+
                     AaruConsole.DebugWriteLine("ADFS Plugin", "dirChk at 0x200 = {0}", dirChk);
 
-                    if(oldRoot.header.magic == OLD_DIR_MAGIC && oldRoot.tail.magic == OLD_DIR_MAGIC ||
-                       oldRoot.header.magic == NEW_DIR_MAGIC && oldRoot.tail.magic == NEW_DIR_MAGIC) return true;
+                    if((oldRoot.header.magic == OLD_DIR_MAGIC && oldRoot.tail.magic == OLD_DIR_MAGIC) ||
+                       (oldRoot.header.magic == NEW_DIR_MAGIC && oldRoot.tail.magic == NEW_DIR_MAGIC))
+                        return true;
 
                     // RISC OS says the old directory can't be in the new location, hard disks created by RISC OS 3.10 do that...
                     sbSector      = NEW_DIRECTORY_LOCATION / imagePlugin.Info.SectorSize;
                     sectorsToRead = NEW_DIRECTORY_SIZE     / imagePlugin.Info.SectorSize;
-                    if(NEW_DIRECTORY_SIZE                  % imagePlugin.Info.SectorSize > 0) sectorsToRead++;
+
+                    if(NEW_DIRECTORY_SIZE % imagePlugin.Info.SectorSize > 0)
+                        sectorsToRead++;
 
                     sector = imagePlugin.ReadSectors(sbSector, sectorsToRead);
+
                     if(sector.Length > OLD_DIRECTORY_SIZE)
                     {
                         byte[] tmp = new byte[OLD_DIRECTORY_SIZE];
@@ -170,14 +170,18 @@ namespace Aaru.Filesystems
                     dirChk  = AcornDirectoryChecksum(sector, (int)OLD_DIRECTORY_SIZE - 1);
 
                     AaruConsole.DebugWriteLine("ADFS Plugin", "oldRoot.header.magic at 0x400 = {0}",
-                                              oldRoot.header.magic);
+                                               oldRoot.header.magic);
+
                     AaruConsole.DebugWriteLine("ADFS Plugin", "oldRoot.tail.magic at 0x400 = {0}", oldRoot.tail.magic);
+
                     AaruConsole.DebugWriteLine("ADFS Plugin", "oldRoot.tail.checkByte at 0x400 = {0}",
-                                              oldRoot.tail.checkByte);
+                                               oldRoot.tail.checkByte);
+
                     AaruConsole.DebugWriteLine("ADFS Plugin", "dirChk at 0x400 = {0}", dirChk);
 
-                    if(oldRoot.header.magic == OLD_DIR_MAGIC && oldRoot.tail.magic == OLD_DIR_MAGIC ||
-                       oldRoot.header.magic == NEW_DIR_MAGIC && oldRoot.tail.magic == NEW_DIR_MAGIC) return true;
+                    if((oldRoot.header.magic == OLD_DIR_MAGIC && oldRoot.tail.magic == OLD_DIR_MAGIC) ||
+                       (oldRoot.header.magic == NEW_DIR_MAGIC && oldRoot.tail.magic == NEW_DIR_MAGIC))
+                        return true;
                 }
             }
 
@@ -186,25 +190,32 @@ namespace Aaru.Filesystems
 
             sector = imagePlugin.ReadSector(partition.Start);
             byte newChk = NewMapChecksum(sector);
-            AaruConsole.DebugWriteLine("ADFS Plugin", "newChk = {0}",           newChk);
+            AaruConsole.DebugWriteLine("ADFS Plugin", "newChk = {0}", newChk);
             AaruConsole.DebugWriteLine("ADFS Plugin", "map.zoneChecksum = {0}", sector[0]);
 
             sbSector      = BOOT_BLOCK_LOCATION / imagePlugin.Info.SectorSize;
             sectorsToRead = BOOT_BLOCK_SIZE     / imagePlugin.Info.SectorSize;
-            if(BOOT_BLOCK_SIZE                  % imagePlugin.Info.SectorSize > 0) sectorsToRead++;
 
-            if(sbSector + partition.Start + sectorsToRead >= partition.End) return false;
+            if(BOOT_BLOCK_SIZE % imagePlugin.Info.SectorSize > 0)
+                sectorsToRead++;
+
+            if(sbSector + partition.Start + sectorsToRead >= partition.End)
+                return false;
 
             byte[] bootSector = imagePlugin.ReadSectors(sbSector + partition.Start, sectorsToRead);
             int    bootChk    = 0;
-            if(bootSector.Length < 512) return false;
 
-            for(int i = 0; i < 0x1FF; i++) bootChk = (bootChk & 0xFF) + (bootChk >> 8) + bootSector[i];
+            if(bootSector.Length < 512)
+                return false;
 
-            AaruConsole.DebugWriteLine("ADFS Plugin", "bootChk = {0}",         bootChk);
+            for(int i = 0; i < 0x1FF; i++)
+                bootChk = (bootChk & 0xFF) + (bootChk >> 8) + bootSector[i];
+
+            AaruConsole.DebugWriteLine("ADFS Plugin", "bootChk = {0}", bootChk);
             AaruConsole.DebugWriteLine("ADFS Plugin", "bBlock.checksum = {0}", bootSector[0x1FF]);
 
-            if(newChk == sector[0] && newChk != 0)
+            if(newChk == sector[0] &&
+               newChk != 0)
             {
                 NewMap nmap = Marshal.ByteArrayToStructureLittleEndian<NewMap>(sector);
                 drSb = nmap.discRecord;
@@ -214,22 +225,30 @@ namespace Aaru.Filesystems
                 BootBlock bBlock = Marshal.ByteArrayToStructureLittleEndian<BootBlock>(bootSector);
                 drSb = bBlock.discRecord;
             }
-            else return false;
+            else
+                return false;
 
-            AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.log2secsize = {0}",    drSb.log2secsize);
-            AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.idlen = {0}",          drSb.idlen);
+            AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.log2secsize = {0}", drSb.log2secsize);
+            AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.idlen = {0}", drSb.idlen);
             AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.disc_size_high = {0}", drSb.disc_size_high);
-            AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.disc_size = {0}",      drSb.disc_size);
+            AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.disc_size = {0}", drSb.disc_size);
+
             AaruConsole.DebugWriteLine("ADFS Plugin", "IsNullOrEmpty(drSb.reserved) = {0}",
-                                      ArrayHelpers.ArrayIsNullOrEmpty(drSb.reserved));
+                                       ArrayHelpers.ArrayIsNullOrEmpty(drSb.reserved));
 
-            if(drSb.log2secsize < 8 || drSb.log2secsize > 10) return false;
+            if(drSb.log2secsize < 8 ||
+               drSb.log2secsize > 10)
+                return false;
 
-            if(drSb.idlen < drSb.log2secsize + 3 || drSb.idlen > 19) return false;
+            if(drSb.idlen < drSb.log2secsize + 3 ||
+               drSb.idlen > 19)
+                return false;
 
-            if(drSb.disc_size_high >> drSb.log2secsize != 0) return false;
+            if(drSb.disc_size_high >> drSb.log2secsize != 0)
+                return false;
 
-            if(!ArrayHelpers.ArrayIsNullOrEmpty(drSb.reserved)) return false;
+            if(!ArrayHelpers.ArrayIsNullOrEmpty(drSb.reserved))
+                return false;
 
             ulong bytes = drSb.disc_size_high;
             bytes *= 0x100000000;
@@ -242,10 +261,10 @@ namespace Aaru.Filesystems
         // TODO: Support big directories (ADFS-G?)
         // TODO: Find the real freemap on volumes with DiscRecord, as DiscRecord's discid may be empty but this one isn't
         public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding    encoding)
+                                   Encoding encoding)
         {
             Encoding = encoding ?? Encoding.GetEncoding("iso-8859-1");
-            StringBuilder sbInformation = new StringBuilder();
+            var sbInformation = new StringBuilder();
             XmlFsType   = new FileSystemType();
             information = "";
 
@@ -266,7 +285,9 @@ namespace Aaru.Filesystems
                 OldMapSector1 oldMap1 = Marshal.ByteArrayToStructureLittleEndian<OldMapSector1>(sector);
 
                 // According to documentation map1 MUST start on sector 1. On ADFS-D it starts at 0x100, not on sector 1 (0x400)
-                if(oldMap0.checksum == oldChk0 && oldMap1.checksum != oldChk1 && sector.Length >= 512)
+                if(oldMap0.checksum == oldChk0 &&
+                   oldMap1.checksum != oldChk1 &&
+                   sector.Length    >= 512)
                 {
                     sector = imagePlugin.ReadSector(0);
                     byte[] tmp = new byte[256];
@@ -275,32 +296,37 @@ namespace Aaru.Filesystems
                     oldMap1 = Marshal.ByteArrayToStructureLittleEndian<OldMapSector1>(tmp);
                 }
 
-                if(oldMap0.checksum == oldChk0 && oldMap1.checksum == oldChk1 && oldMap0.checksum != 0 &&
+                if(oldMap0.checksum == oldChk0 &&
+                   oldMap1.checksum == oldChk1 &&
+                   oldMap0.checksum != 0       &&
                    oldMap1.checksum != 0)
                 {
                     bytes = (ulong)((oldMap0.size[2] << 16) + (oldMap0.size[1] << 8) + oldMap0.size[0]) * 256;
                     byte[] namebytes = new byte[10];
+
                     for(int i = 0; i < 5; i++)
                     {
-                        namebytes[i * 2]     = oldMap0.name[i];
-                        namebytes[i * 2 + 1] = oldMap1.name[i];
+                        namebytes[i * 2]       = oldMap0.name[i];
+                        namebytes[(i * 2) + 1] = oldMap1.name[i];
                     }
 
                     XmlFsType = new FileSystemType
                     {
-                        Bootable    = oldMap1.boot != 0, // Or not?
-                        Clusters    = bytes / imagePlugin.Info.SectorSize,
-                        ClusterSize = imagePlugin.Info.SectorSize,
-                        Type        = "Acorn Advanced Disc Filing System"
+                        Bootable = oldMap1.boot != 0, // Or not?
+                        Clusters = bytes / imagePlugin.Info.SectorSize, ClusterSize = imagePlugin.Info.SectorSize,
+                        Type     = "Acorn Advanced Disc Filing System"
                     };
 
                     if(ArrayHelpers.ArrayIsNullOrEmpty(namebytes))
                     {
                         sbSector      = OLD_DIRECTORY_LOCATION / imagePlugin.Info.SectorSize;
                         sectorsToRead = OLD_DIRECTORY_SIZE     / imagePlugin.Info.SectorSize;
-                        if(OLD_DIRECTORY_SIZE                  % imagePlugin.Info.SectorSize > 0) sectorsToRead++;
+
+                        if(OLD_DIRECTORY_SIZE % imagePlugin.Info.SectorSize > 0)
+                            sectorsToRead++;
 
                         sector = imagePlugin.ReadSectors(sbSector, sectorsToRead);
+
                         if(sector.Length > OLD_DIRECTORY_SIZE)
                         {
                             byte[] tmp = new byte[OLD_DIRECTORY_SIZE];
@@ -311,43 +337,53 @@ namespace Aaru.Filesystems
 
                         OldDirectory oldRoot = Marshal.ByteArrayToStructureLittleEndian<OldDirectory>(sector);
 
-                        if(oldRoot.header.magic == OLD_DIR_MAGIC && oldRoot.tail.magic == OLD_DIR_MAGIC)
+                        if(oldRoot.header.magic == OLD_DIR_MAGIC &&
+                           oldRoot.tail.magic   == OLD_DIR_MAGIC)
                             namebytes = oldRoot.tail.name;
                         else
                         {
                             // RISC OS says the old directory can't be in the new location, hard disks created by RISC OS 3.10 do that...
                             sbSector      = NEW_DIRECTORY_LOCATION / imagePlugin.Info.SectorSize;
                             sectorsToRead = NEW_DIRECTORY_SIZE     / imagePlugin.Info.SectorSize;
-                            if(NEW_DIRECTORY_SIZE                  % imagePlugin.Info.SectorSize > 0) sectorsToRead++;
+
+                            if(NEW_DIRECTORY_SIZE % imagePlugin.Info.SectorSize > 0)
+                                sectorsToRead++;
 
                             sector = imagePlugin.ReadSectors(sbSector, sectorsToRead);
+
                             if(sector.Length > OLD_DIRECTORY_SIZE)
                             {
                                 byte[] tmp = new byte[OLD_DIRECTORY_SIZE];
                                 Array.Copy(sector, 0, tmp, 0, OLD_DIRECTORY_SIZE - 53);
-                                Array.Copy(sector, sector.Length - 54, tmp, OLD_DIRECTORY_SIZE - 54,
-                                           53);
+
+                                Array.Copy(sector, sector.Length - 54, tmp, OLD_DIRECTORY_SIZE - 54, 53);
+
                                 sector = tmp;
                             }
 
                             oldRoot = Marshal.ByteArrayToStructureLittleEndian<OldDirectory>(sector);
 
-                            if(oldRoot.header.magic == OLD_DIR_MAGIC && oldRoot.tail.magic == OLD_DIR_MAGIC)
+                            if(oldRoot.header.magic == OLD_DIR_MAGIC &&
+                               oldRoot.tail.magic   == OLD_DIR_MAGIC)
                                 namebytes = oldRoot.tail.name;
                             else
                             {
                                 sector = imagePlugin.ReadSectors(sbSector, sectorsToRead);
+
                                 if(sector.Length > NEW_DIRECTORY_SIZE)
                                 {
                                     byte[] tmp = new byte[NEW_DIRECTORY_SIZE];
                                     Array.Copy(sector, 0, tmp, 0, NEW_DIRECTORY_SIZE - 41);
-                                    Array.Copy(sector, sector.Length - 42, tmp, NEW_DIRECTORY_SIZE - 42,
-                                               41);
+
+                                    Array.Copy(sector, sector.Length - 42, tmp, NEW_DIRECTORY_SIZE - 42, 41);
+
                                     sector = tmp;
                                 }
 
                                 NewDirectory newRoot = Marshal.ByteArrayToStructureLittleEndian<NewDirectory>(sector);
-                                if(newRoot.header.magic == NEW_DIR_MAGIC && newRoot.tail.magic == NEW_DIR_MAGIC)
+
+                                if(newRoot.header.magic == NEW_DIR_MAGIC &&
+                                   newRoot.tail.magic   == NEW_DIR_MAGIC)
                                     namebytes = newRoot.tail.title;
                             }
                         }
@@ -357,8 +393,10 @@ namespace Aaru.Filesystems
                     sbInformation.AppendLine();
                     sbInformation.AppendFormat("{0} bytes per sector", imagePlugin.Info.SectorSize).AppendLine();
                     sbInformation.AppendFormat("Volume has {0} bytes", bytes).AppendLine();
-                    sbInformation.AppendFormat("Volume name: {0}", StringHandlers.CToString(namebytes, Encoding))
-                                 .AppendLine();
+
+                    sbInformation.AppendFormat("Volume name: {0}", StringHandlers.CToString(namebytes, Encoding)).
+                                  AppendLine();
+
                     if(oldMap1.discId > 0)
                     {
                         XmlFsType.VolumeSerial = $"{oldMap1.discId:X4}";
@@ -379,21 +417,26 @@ namespace Aaru.Filesystems
 
             sector = imagePlugin.ReadSector(partition.Start);
             byte newChk = NewMapChecksum(sector);
-            AaruConsole.DebugWriteLine("ADFS Plugin", "newChk = {0}",           newChk);
+            AaruConsole.DebugWriteLine("ADFS Plugin", "newChk = {0}", newChk);
             AaruConsole.DebugWriteLine("ADFS Plugin", "map.zoneChecksum = {0}", sector[0]);
 
             sbSector      = BOOT_BLOCK_LOCATION / imagePlugin.Info.SectorSize;
             sectorsToRead = BOOT_BLOCK_SIZE     / imagePlugin.Info.SectorSize;
-            if(BOOT_BLOCK_SIZE                  % imagePlugin.Info.SectorSize > 0) sectorsToRead++;
 
-            byte[] bootSector                      = imagePlugin.ReadSectors(sbSector + partition.Start, sectorsToRead);
-            int    bootChk                         = 0;
-            for(int i = 0; i < 0x1FF; i++) bootChk = (bootChk & 0xFF) + (bootChk >> 8) + bootSector[i];
+            if(BOOT_BLOCK_SIZE % imagePlugin.Info.SectorSize > 0)
+                sectorsToRead++;
 
-            AaruConsole.DebugWriteLine("ADFS Plugin", "bootChk = {0}",         bootChk);
+            byte[] bootSector = imagePlugin.ReadSectors(sbSector + partition.Start, sectorsToRead);
+            int    bootChk    = 0;
+
+            for(int i = 0; i < 0x1FF; i++)
+                bootChk = (bootChk & 0xFF) + (bootChk >> 8) + bootSector[i];
+
+            AaruConsole.DebugWriteLine("ADFS Plugin", "bootChk = {0}", bootChk);
             AaruConsole.DebugWriteLine("ADFS Plugin", "bBlock.checksum = {0}", bootSector[0x1FF]);
 
-            if(newChk == sector[0] && newChk != 0)
+            if(newChk == sector[0] &&
+               newChk != 0)
             {
                 NewMap nmap = Marshal.ByteArrayToStructureLittleEndian<NewMap>(sector);
                 drSb = nmap.discRecord;
@@ -403,38 +446,47 @@ namespace Aaru.Filesystems
                 BootBlock bBlock = Marshal.ByteArrayToStructureLittleEndian<BootBlock>(sector);
                 drSb = bBlock.discRecord;
             }
-            else return;
+            else
+                return;
 
             AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.log2secsize = {0}", drSb.log2secsize);
-            AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.spt = {0}",         drSb.spt);
-            AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.heads = {0}",       drSb.heads);
-            AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.density = {0}",     drSb.density);
-            AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.idlen = {0}",       drSb.idlen);
-            AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.log2bpmb = {0}",    drSb.log2bpmb);
-            AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.skew = {0}",        drSb.skew);
-            AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.bootoption = {0}",  drSb.bootoption);
-            AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.lowsector = {0}",   drSb.lowsector);
-            AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.nzones = {0}",      drSb.nzones);
-            AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.zone_spare = {0}",  drSb.zone_spare);
-            AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.root = {0}",        drSb.root);
-            AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.disc_size = {0}",   drSb.disc_size);
-            AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.disc_id = {0}",     drSb.disc_id);
+            AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.spt = {0}", drSb.spt);
+            AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.heads = {0}", drSb.heads);
+            AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.density = {0}", drSb.density);
+            AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.idlen = {0}", drSb.idlen);
+            AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.log2bpmb = {0}", drSb.log2bpmb);
+            AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.skew = {0}", drSb.skew);
+            AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.bootoption = {0}", drSb.bootoption);
+            AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.lowsector = {0}", drSb.lowsector);
+            AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.nzones = {0}", drSb.nzones);
+            AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.zone_spare = {0}", drSb.zone_spare);
+            AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.root = {0}", drSb.root);
+            AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.disc_size = {0}", drSb.disc_size);
+            AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.disc_id = {0}", drSb.disc_id);
+
             AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.disc_name = {0}",
-                                      StringHandlers.CToString(drSb.disc_name, Encoding));
-            AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.disc_type = {0}",      drSb.disc_type);
+                                       StringHandlers.CToString(drSb.disc_name, Encoding));
+
+            AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.disc_type = {0}", drSb.disc_type);
             AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.disc_size_high = {0}", drSb.disc_size_high);
-            AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.flags = {0}",          drSb.flags);
-            AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.nzones_high = {0}",    drSb.nzones_high);
+            AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.flags = {0}", drSb.flags);
+            AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.nzones_high = {0}", drSb.nzones_high);
             AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.format_version = {0}", drSb.format_version);
-            AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.root_size = {0}",      drSb.root_size);
+            AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.root_size = {0}", drSb.root_size);
 
-            if(drSb.log2secsize < 8 || drSb.log2secsize > 10) return;
+            if(drSb.log2secsize < 8 ||
+               drSb.log2secsize > 10)
+                return;
 
-            if(drSb.idlen < drSb.log2secsize + 3 || drSb.idlen > 19) return;
+            if(drSb.idlen < drSb.log2secsize + 3 ||
+               drSb.idlen > 19)
+                return;
 
-            if(drSb.disc_size_high >> drSb.log2secsize != 0) return;
+            if(drSb.disc_size_high >> drSb.log2secsize != 0)
+                return;
 
-            if(!ArrayHelpers.ArrayIsNullOrEmpty(drSb.reserved)) return;
+            if(!ArrayHelpers.ArrayIsNullOrEmpty(drSb.reserved))
+                return;
 
             bytes =  drSb.disc_size_high;
             bytes *= 0x100000000;
@@ -444,7 +496,8 @@ namespace Aaru.Filesystems
             zones *= 0x100000000;
             zones += drSb.nzones;
 
-            if(bytes > imagePlugin.Info.Sectors * imagePlugin.Info.SectorSize) return;
+            if(bytes > imagePlugin.Info.Sectors * imagePlugin.Info.SectorSize)
+                return;
 
             XmlFsType = new FileSystemType();
 
@@ -457,11 +510,14 @@ namespace Aaru.Filesystems
             sbInformation.AppendFormat("Density code: {0}", drSb.density).AppendLine();
             sbInformation.AppendFormat("Skew: {0}", drSb.skew).AppendLine();
             sbInformation.AppendFormat("Boot option: {0}", drSb.bootoption).AppendLine();
+
             // TODO: What the hell is this field refering to?
             sbInformation.AppendFormat("Root starts at frag {0}", drSb.root).AppendLine();
+
             //sbInformation.AppendFormat("Root is {0} bytes long", drSb.root_size).AppendLine();
             sbInformation.AppendFormat("Volume has {0} bytes in {1} zones", bytes, zones).AppendLine();
             sbInformation.AppendFormat("Volume flags: 0x{0:X4}", drSb.flags).AppendLine();
+
             if(drSb.disc_id > 0)
             {
                 XmlFsType.VolumeSerial = $"{drSb.disc_id:X4}";
@@ -488,7 +544,8 @@ namespace Aaru.Filesystems
             int sum   = 0;
             int carry = 0;
 
-            if(length > data.Length) length = data.Length;
+            if(length > data.Length)
+                length = data.Length;
 
             // ADC r0, r0, r1
             // MOVS r0, r0, LSL #24
@@ -496,12 +553,14 @@ namespace Aaru.Filesystems
             for(int i = length - 1; i >= 0; i--)
             {
                 sum += data[i] + carry;
+
                 if(sum > 0xFF)
                 {
                     carry =  1;
                     sum   &= 0xFF;
                 }
-                else carry = 0;
+                else
+                    carry = 0;
             }
 
             return (byte)(sum & 0xFF);
@@ -543,7 +602,8 @@ namespace Aaru.Filesystems
         {
             uint sum = 0;
 
-            if(length > data.Count) length = data.Count;
+            if(length > data.Count)
+                length = data.Count;
 
             // EOR r0, r1, r0, ROR #13
             for(int i = 0; i < length; i++)
@@ -557,9 +617,7 @@ namespace Aaru.Filesystems
             return (byte)(((sum & 0xFF000000) >> 24) ^ ((sum & 0xFF0000) >> 16) ^ ((sum & 0xFF00) >> 8) ^ (sum & 0xFF));
         }
 
-        /// <summary>
-        ///     Boot block, used in hard disks and ADFS-F and higher.
-        /// </summary>
+        /// <summary>Boot block, used in hard disks and ADFS-F and higher.</summary>
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct BootBlock
         {
@@ -571,9 +629,7 @@ namespace Aaru.Filesystems
             public readonly byte       checksum;
         }
 
-        /// <summary>
-        ///     Disc record, used in hard disks and ADFS-E and higher.
-        /// </summary>
+        /// <summary>Disc record, used in hard disks and ADFS-E and higher.</summary>
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct DiscRecord
         {
@@ -603,9 +659,7 @@ namespace Aaru.Filesystems
             public readonly byte[] reserved;
         }
 
-        /// <summary>
-        ///     Free block map, sector 0, used in ADFS-S, ADFS-L, ADFS-M and ADFS-D
-        /// </summary>
+        /// <summary>Free block map, sector 0, used in ADFS-S, ADFS-L, ADFS-M and ADFS-D</summary>
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct OldMapSector0
         {
@@ -619,9 +673,7 @@ namespace Aaru.Filesystems
             public readonly byte checksum;
         }
 
-        /// <summary>
-        ///     Free block map, sector 1, used in ADFS-S, ADFS-L, ADFS-M and ADFS-D
-        /// </summary>
+        /// <summary>Free block map, sector 1, used in ADFS-S, ADFS-L, ADFS-M and ADFS-D</summary>
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct OldMapSector1
         {
@@ -635,9 +687,7 @@ namespace Aaru.Filesystems
             public readonly byte   checksum;
         }
 
-        /// <summary>
-        ///     Free block map, sector 0, used in ADFS-E
-        /// </summary>
+        /// <summary>Free block map, sector 0, used in ADFS-E</summary>
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct NewMap
         {
@@ -647,9 +697,7 @@ namespace Aaru.Filesystems
             public readonly DiscRecord discRecord;
         }
 
-        /// <summary>
-        ///     Directory header, common to "old" and "new" directories
-        /// </summary>
+        /// <summary>Directory header, common to "old" and "new" directories</summary>
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct DirectoryHeader
         {
@@ -657,9 +705,7 @@ namespace Aaru.Filesystems
             public readonly uint magic;
         }
 
-        /// <summary>
-        ///     Directory header, common to "old" and "new" directories
-        /// </summary>
+        /// <summary>Directory header, common to "old" and "new" directories</summary>
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct DirectoryEntry
         {
@@ -673,9 +719,7 @@ namespace Aaru.Filesystems
             public readonly byte atts;
         }
 
-        /// <summary>
-        ///     Directory tail, new format
-        /// </summary>
+        /// <summary>Directory tail, new format</summary>
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct NewDirectoryTail
         {
@@ -692,9 +736,7 @@ namespace Aaru.Filesystems
             public readonly byte checkByte;
         }
 
-        /// <summary>
-        ///     Directory tail, old format
-        /// </summary>
+        /// <summary>Directory tail, old format</summary>
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct OldDirectoryTail
         {
@@ -712,9 +754,7 @@ namespace Aaru.Filesystems
             public readonly byte checkByte;
         }
 
-        /// <summary>
-        ///     Directory, old format
-        /// </summary>
+        /// <summary>Directory, old format</summary>
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct OldDirectory
         {
@@ -724,9 +764,7 @@ namespace Aaru.Filesystems
             public readonly OldDirectoryTail tail;
         }
 
-        /// <summary>
-        ///     Directory, new format
-        /// </summary>
+        /// <summary>Directory, new format</summary>
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct NewDirectory
         {
diff --git a/Aaru.Filesystems/AmigaDOS.cs b/Aaru.Filesystems/AmigaDOS.cs
index 379424640..1c16c7536 100644
--- a/Aaru.Filesystems/AmigaDOS.cs
+++ b/Aaru.Filesystems/AmigaDOS.cs
@@ -59,7 +59,8 @@ namespace Aaru.Filesystems
 
         public bool Identify(IMediaImage imagePlugin, Partition partition)
         {
-            if(partition.Start >= partition.End) return false;
+            if(partition.Start >= partition.End)
+                return false;
 
             // Boot block is unless defined otherwise, 2 blocks
             // Funny, you may need boot block to find root block if it's not in standard place just to know size of
@@ -71,22 +72,27 @@ namespace Aaru.Filesystems
             BootBlock bblk   = Marshal.ByteArrayToStructureBigEndian<BootBlock>(sector);
 
             // AROS boot floppies...
-            if(sector.Length              >= 512      && sector[510]                 == 0x55 && sector[511] == 0xAA &&
-               (bblk.diskType & FFS_MASK) != FFS_MASK && (bblk.diskType & MUFS_MASK) != MUFS_MASK)
+            if(sector.Length               >= 512      &&
+               sector[510]                 == 0x55     &&
+               sector[511]                 == 0xAA     &&
+               (bblk.diskType & FFS_MASK)  != FFS_MASK &&
+               (bblk.diskType & MUFS_MASK) != MUFS_MASK)
             {
                 sector = imagePlugin.ReadSectors(1 + partition.Start, 2);
                 bblk   = Marshal.ByteArrayToStructureBigEndian<BootBlock>(sector);
             }
 
             // Not FFS or MuFS?
-            if((bblk.diskType & FFS_MASK) != FFS_MASK && (bblk.diskType & MUFS_MASK) != MUFS_MASK) return false;
+            if((bblk.diskType & FFS_MASK)  != FFS_MASK &&
+               (bblk.diskType & MUFS_MASK) != MUFS_MASK)
+                return false;
 
             // Clear checksum on sector
             sector[4] = sector[5] = sector[6] = sector[7] = 0;
             uint bsum             = AmigaBootChecksum(sector);
 
             AaruConsole.DebugWriteLine("AmigaDOS plugin", "bblk.checksum = 0x{0:X8}", bblk.checksum);
-            AaruConsole.DebugWriteLine("AmigaDOS plugin", "bsum = 0x{0:X8}",          bsum);
+            AaruConsole.DebugWriteLine("AmigaDOS plugin", "bsum = 0x{0:X8}", bsum);
 
             ulong bRootPtr = 0;
 
@@ -99,14 +105,14 @@ namespace Aaru.Filesystems
 
             ulong[] rootPtrs =
             {
-                bRootPtr + partition.Start, (partition.End - partition.Start + 1) / 2 + partition.Start - 2,
-                (partition.End                             - partition.Start + 1) / 2 + partition.Start - 1,
-                (partition.End - partition.Start + 1) / 2 +
+                bRootPtr + partition.Start, ((((partition.End - partition.Start) + 1) / 2) + partition.Start) - 2,
+                ((((partition.End                             - partition.Start) + 1) / 2) + partition.Start) - 1,
+                (((partition.End - partition.Start) + 1) / 2) +
                 partition.Start,
-                (partition.End - partition.Start + 1) / 2 + partition.Start + 4
+                (((partition.End - partition.Start) + 1) / 2) + partition.Start + 4
             };
 
-            RootBlock rblk = new RootBlock();
+            var rblk = new RootBlock();
 
             // So to handle even number of sectors
             foreach(ulong rootPtr in rootPtrs.Where(rootPtr => rootPtr < partition.End && rootPtr >= partition.Start))
@@ -117,7 +123,9 @@ namespace Aaru.Filesystems
 
                 rblk.type = BigEndianBitConverter.ToUInt32(sector, 0x00);
                 AaruConsole.DebugWriteLine("AmigaDOS plugin", "rblk.type = {0}", rblk.type);
-                if(rblk.type != TYPE_HEADER) continue;
+
+                if(rblk.type != TYPE_HEADER)
+                    continue;
 
                 rblk.hashTableSize = BigEndianBitConverter.ToUInt32(sector, 0x0C);
 
@@ -126,12 +134,14 @@ namespace Aaru.Filesystems
                 uint blockSize       = (rblk.hashTableSize + 56) * 4;
                 uint sectorsPerBlock = (uint)(blockSize / sector.Length);
 
-                AaruConsole.DebugWriteLine("AmigaDOS plugin", "blockSize = {0}",       blockSize);
+                AaruConsole.DebugWriteLine("AmigaDOS plugin", "blockSize = {0}", blockSize);
                 AaruConsole.DebugWriteLine("AmigaDOS plugin", "sectorsPerBlock = {0}", sectorsPerBlock);
 
-                if(blockSize % sector.Length > 0) sectorsPerBlock++;
+                if(blockSize % sector.Length > 0)
+                    sectorsPerBlock++;
 
-                if(rootPtr + sectorsPerBlock >= partition.End) continue;
+                if(rootPtr + sectorsPerBlock >= partition.End)
+                    continue;
 
                 sector = imagePlugin.ReadSectors(rootPtr, sectorsPerBlock);
 
@@ -141,22 +151,24 @@ namespace Aaru.Filesystems
                 uint rsum                  = AmigaChecksum(sector);
 
                 AaruConsole.DebugWriteLine("AmigaDOS plugin", "rblk.checksum = 0x{0:X8}", rblk.checksum);
-                AaruConsole.DebugWriteLine("AmigaDOS plugin", "rsum = 0x{0:X8}",          rsum);
+                AaruConsole.DebugWriteLine("AmigaDOS plugin", "rsum = 0x{0:X8}", rsum);
 
                 rblk.sec_type = BigEndianBitConverter.ToUInt32(sector, sector.Length - 4);
                 AaruConsole.DebugWriteLine("AmigaDOS plugin", "rblk.sec_type = {0}", rblk.sec_type);
 
-                if(rblk.sec_type == SUBTYPE_ROOT && rblk.checksum == rsum) return true;
+                if(rblk.sec_type == SUBTYPE_ROOT &&
+                   rblk.checksum == rsum)
+                    return true;
             }
 
             return false;
         }
 
         public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding    encoding)
+                                   Encoding encoding)
         {
             Encoding = encoding ?? Encoding.GetEncoding("iso-8859-1");
-            StringBuilder sbInformation = new StringBuilder();
+            var sbInformation = new StringBuilder();
             XmlFsType   = new FileSystemType();
             information = null;
             byte[] bootBlockSectors = imagePlugin.ReadSectors(0 + partition.Start, 2);
@@ -178,15 +190,15 @@ namespace Aaru.Filesystems
 
             ulong[] rootPtrs =
             {
-                bRootPtr + partition.Start, (partition.End - partition.Start + 1) / 2 + partition.Start - 2,
-                (partition.End                             - partition.Start + 1) / 2 + partition.Start - 1,
-                (partition.End - partition.Start + 1) / 2 +
+                bRootPtr + partition.Start, ((((partition.End - partition.Start) + 1) / 2) + partition.Start) - 2,
+                ((((partition.End                             - partition.Start) + 1) / 2) + partition.Start) - 1,
+                (((partition.End - partition.Start) + 1) / 2) +
                 partition.Start,
-                (partition.End - partition.Start + 1) / 2 + partition.Start + 4
+                (((partition.End - partition.Start) + 1) / 2) + partition.Start + 4
             };
 
-            RootBlock rootBlk         = new RootBlock();
-            byte[]    rootBlockSector = null;
+            var    rootBlk         = new RootBlock();
+            byte[] rootBlockSector = null;
 
             bool rootFound = false;
             uint blockSize = 0;
@@ -200,7 +212,9 @@ namespace Aaru.Filesystems
 
                 rootBlk.type = BigEndianBitConverter.ToUInt32(rootBlockSector, 0x00);
                 AaruConsole.DebugWriteLine("AmigaDOS plugin", "rootBlk.type = {0}", rootBlk.type);
-                if(rootBlk.type != TYPE_HEADER) continue;
+
+                if(rootBlk.type != TYPE_HEADER)
+                    continue;
 
                 rootBlk.hashTableSize = BigEndianBitConverter.ToUInt32(rootBlockSector, 0x0C);
 
@@ -209,12 +223,14 @@ namespace Aaru.Filesystems
                 blockSize = (rootBlk.hashTableSize + 56) * 4;
                 uint sectorsPerBlock = (uint)(blockSize / rootBlockSector.Length);
 
-                AaruConsole.DebugWriteLine("AmigaDOS plugin", "blockSize = {0}",       blockSize);
+                AaruConsole.DebugWriteLine("AmigaDOS plugin", "blockSize = {0}", blockSize);
                 AaruConsole.DebugWriteLine("AmigaDOS plugin", "sectorsPerBlock = {0}", sectorsPerBlock);
 
-                if(blockSize % rootBlockSector.Length > 0) sectorsPerBlock++;
+                if(blockSize % rootBlockSector.Length > 0)
+                    sectorsPerBlock++;
 
-                if(rootPtr + sectorsPerBlock >= partition.End) continue;
+                if(rootPtr + sectorsPerBlock >= partition.End)
+                    continue;
 
                 rootBlockSector = imagePlugin.ReadSectors(rootPtr, sectorsPerBlock);
 
@@ -224,19 +240,23 @@ namespace Aaru.Filesystems
                 uint rsum                                 = AmigaChecksum(rootBlockSector);
 
                 AaruConsole.DebugWriteLine("AmigaDOS plugin", "rootBlk.checksum = 0x{0:X8}", rootBlk.checksum);
-                AaruConsole.DebugWriteLine("AmigaDOS plugin", "rsum = 0x{0:X8}",             rsum);
+                AaruConsole.DebugWriteLine("AmigaDOS plugin", "rsum = 0x{0:X8}", rsum);
 
                 rootBlk.sec_type = BigEndianBitConverter.ToUInt32(rootBlockSector, rootBlockSector.Length - 4);
                 AaruConsole.DebugWriteLine("AmigaDOS plugin", "rootBlk.sec_type = {0}", rootBlk.sec_type);
 
-                if(rootBlk.sec_type != SUBTYPE_ROOT || rootBlk.checksum != rsum) continue;
+                if(rootBlk.sec_type != SUBTYPE_ROOT ||
+                   rootBlk.checksum != rsum)
+                    continue;
 
                 rootBlockSector = imagePlugin.ReadSectors(rootPtr, sectorsPerBlock);
                 rootFound       = true;
+
                 break;
             }
 
-            if(!rootFound) return;
+            if(!rootFound)
+                return;
 
             rootBlk = MarshalRootBlock(rootBlockSector);
 
@@ -247,38 +267,47 @@ namespace Aaru.Filesystems
                 case 0:
                     sbInformation.Append("Amiga Original File System");
                     XmlFsType.Type = "Amiga OFS";
+
                     break;
                 case 1:
                     sbInformation.Append("Amiga Fast File System");
                     XmlFsType.Type = "Amiga FFS";
+
                     break;
                 case 2:
                     sbInformation.Append("Amiga Original File System with international characters");
                     XmlFsType.Type = "Amiga OFS";
+
                     break;
                 case 3:
                     sbInformation.Append("Amiga Fast File System with international characters");
                     XmlFsType.Type = "Amiga FFS";
+
                     break;
                 case 4:
                     sbInformation.Append("Amiga Original File System with directory cache");
                     XmlFsType.Type = "Amiga OFS";
+
                     break;
                 case 5:
                     sbInformation.Append("Amiga Fast File System with directory cache");
                     XmlFsType.Type = "Amiga FFS";
+
                     break;
                 case 6:
                     sbInformation.Append("Amiga Original File System with long filenames");
                     XmlFsType.Type = "Amiga OFS2";
+
                     break;
                 case 7:
                     sbInformation.Append("Amiga Fast File System with long filenames");
                     XmlFsType.Type = "Amiga FFS2";
+
                     break;
             }
 
-            if((bootBlk.diskType & 0x6D754600) == 0x6D754600) sbInformation.Append(", with multi-user patches");
+            if((bootBlk.diskType & 0x6D754600) == 0x6D754600)
+                sbInformation.Append(", with multi-user patches");
 
             sbInformation.AppendLine();
 
@@ -286,47 +315,56 @@ namespace Aaru.Filesystems
 
             if(bootBlk.checksum == bsum)
             {
-                Sha1Context sha1Ctx = new Sha1Context();
+                var sha1Ctx = new Sha1Context();
                 sha1Ctx.Update(bootBlk.bootCode);
                 sbInformation.AppendLine("Volume is bootable");
                 sbInformation.AppendFormat("Boot code SHA1 is {0}", sha1Ctx.End()).AppendLine();
             }
 
-            if(rootBlk.bitmapFlag == 0xFFFFFFFF) sbInformation.AppendLine("Volume bitmap is valid");
+            if(rootBlk.bitmapFlag == 0xFFFFFFFF)
+                sbInformation.AppendLine("Volume bitmap is valid");
 
-            if(rootBlk.bitmapExtensionBlock != 0x00000000 && rootBlk.bitmapExtensionBlock != 0xFFFFFFFF)
+            if(rootBlk.bitmapExtensionBlock != 0x00000000 &&
+               rootBlk.bitmapExtensionBlock != 0xFFFFFFFF)
                 sbInformation.AppendFormat("Bitmap extension at block {0}", rootBlk.bitmapExtensionBlock).AppendLine();
 
-            if((bootBlk.diskType & 0xFF) == 4 || (bootBlk.diskType & 0xFF) == 5)
+            if((bootBlk.diskType & 0xFF) == 4 ||
+               (bootBlk.diskType & 0xFF) == 5)
                 sbInformation.AppendFormat("Directory cache starts at block {0}", rootBlk.extension).AppendLine();
 
-            ulong blocks = (partition.End - partition.Start + 1) * imagePlugin.Info.SectorSize / blockSize;
+            ulong blocks = (((partition.End - partition.Start) + 1) * imagePlugin.Info.SectorSize) / blockSize;
 
             sbInformation.AppendFormat("Volume block size is {0} bytes", blockSize).AppendLine();
             sbInformation.AppendFormat("Volume has {0} blocks", blocks).AppendLine();
+
             sbInformation.AppendFormat("Volume created on {0}",
-                                       DateHandlers.AmigaToDateTime(rootBlk.cDays, rootBlk.cMins, rootBlk.cTicks))
-                         .AppendLine();
+                                       DateHandlers.AmigaToDateTime(rootBlk.cDays, rootBlk.cMins, rootBlk.cTicks)).
+                          AppendLine();
+
             sbInformation.AppendFormat("Volume last modified on {0}",
-                                       DateHandlers.AmigaToDateTime(rootBlk.vDays, rootBlk.vMins, rootBlk.vTicks))
-                         .AppendLine();
+                                       DateHandlers.AmigaToDateTime(rootBlk.vDays, rootBlk.vMins, rootBlk.vTicks)).
+                          AppendLine();
+
             sbInformation.AppendFormat("Volume root directory last modified on on {0}",
-                                       DateHandlers.AmigaToDateTime(rootBlk.rDays, rootBlk.rMins, rootBlk.rTicks))
-                         .AppendLine();
+                                       DateHandlers.AmigaToDateTime(rootBlk.rDays, rootBlk.rMins, rootBlk.rTicks)).
+                          AppendLine();
+
             sbInformation.AppendFormat("Root block checksum is 0x{0:X8}", rootBlk.checksum).AppendLine();
             information = sbInformation.ToString();
 
-            XmlFsType.CreationDate =
-                DateHandlers.AmigaToDateTime(rootBlk.cDays, rootBlk.cMins, rootBlk.cTicks);
+            XmlFsType.CreationDate = DateHandlers.AmigaToDateTime(rootBlk.cDays, rootBlk.cMins, rootBlk.cTicks);
+
             XmlFsType.CreationDateSpecified = true;
-            XmlFsType.ModificationDate =
-                DateHandlers.AmigaToDateTime(rootBlk.vDays, rootBlk.vMins, rootBlk.vTicks);
+
+            XmlFsType.ModificationDate = DateHandlers.AmigaToDateTime(rootBlk.vDays, rootBlk.vMins, rootBlk.vTicks);
+
             XmlFsType.ModificationDateSpecified = true;
             XmlFsType.Dirty                     = rootBlk.bitmapFlag != 0xFFFFFFFF;
             XmlFsType.Clusters                  = blocks;
             XmlFsType.ClusterSize               = blockSize;
             XmlFsType.VolumeName                = diskName;
             XmlFsType.Bootable                  = bsum == bootBlk.checksum;
+
             // Useful as a serial
             XmlFsType.VolumeSerial = $"{rootBlk.checksum:X8}";
         }
@@ -334,12 +372,13 @@ namespace Aaru.Filesystems
         static RootBlock MarshalRootBlock(byte[] block)
         {
             byte[] tmp = new byte[228];
-            Array.Copy(block, 0,                  tmp, 0,  24);
+            Array.Copy(block, 0, tmp, 0, 24);
             Array.Copy(block, block.Length - 200, tmp, 28, 200);
             RootBlock root = Marshal.ByteArrayToStructureBigEndian<RootBlock>(tmp);
             root.hashTable = new uint[(block.Length - 224) / 4];
+
             for(int i = 0; i < root.hashTable.Length; i++)
-                root.hashTable[i] = BigEndianBitConverter.ToUInt32(block, 24 + i * 4);
+                root.hashTable[i] = BigEndianBitConverter.ToUInt32(block, 24 + (i * 4));
 
             return root;
         }
@@ -357,37 +396,29 @@ namespace Aaru.Filesystems
         static uint AmigaBootChecksum(byte[] data)
         {
             uint sum = 0;
+
             for(int i = 0; i < data.Length; i += 4)
             {
                 uint psum = sum;
-                if((sum += (uint)((data[i] << 24) + (data[i + 1] << 16) + (data[i + 2] << 8) + data[i + 3])) <
-                   psum) sum++;
+
+                if((sum += (uint)((data[i] << 24) + (data[i + 1] << 16) + (data[i + 2] << 8) + data[i + 3])) < psum)
+                    sum++;
             }
 
             return ~sum;
         }
 
-        /// <summary>
-        ///     Boot block, first 2 sectors
-        /// </summary>
+        /// <summary>Boot block, first 2 sectors</summary>
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct BootBlock
         {
-            /// <summary>
-            ///     Offset 0x00, "DOSx" disk type
-            /// </summary>
+            /// <summary>Offset 0x00, "DOSx" disk type</summary>
             public readonly uint diskType;
-            /// <summary>
-            ///     Offset 0x04, Checksum
-            /// </summary>
+            /// <summary>Offset 0x04, Checksum</summary>
             public readonly uint checksum;
-            /// <summary>
-            ///     Offset 0x08, Pointer to root block, mostly invalid
-            /// </summary>
+            /// <summary>Offset 0x08, Pointer to root block, mostly invalid</summary>
             public readonly uint root_ptr;
-            /// <summary>
-            ///     Offset 0x0C, Boot code, til completion. Size is intentionally incorrect to allow marshaling to work.
-            /// </summary>
+            /// <summary>Offset 0x0C, Boot code, til completion. Size is intentionally incorrect to allow marshaling to work.</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 1)]
             public byte[] bootCode;
         }
@@ -395,117 +426,65 @@ namespace Aaru.Filesystems
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct RootBlock
         {
-            /// <summary>
-            ///     Offset 0x00, block type, value = T_HEADER (2)
-            /// </summary>
+            /// <summary>Offset 0x00, block type, value = T_HEADER (2)</summary>
             public uint type;
-            /// <summary>
-            ///     Offset 0x04, unused
-            /// </summary>
+            /// <summary>Offset 0x04, unused</summary>
             public readonly uint headerKey;
-            /// <summary>
-            ///     Offset 0x08, unused
-            /// </summary>
+            /// <summary>Offset 0x08, unused</summary>
             public readonly uint highSeq;
-            /// <summary>
-            ///     Offset 0x0C, longs used by hash table
-            /// </summary>
+            /// <summary>Offset 0x0C, longs used by hash table</summary>
             public uint hashTableSize;
-            /// <summary>
-            ///     Offset 0x10, unused
-            /// </summary>
+            /// <summary>Offset 0x10, unused</summary>
             public readonly uint firstData;
-            /// <summary>
-            ///     Offset 0x14, Rootblock checksum
-            /// </summary>
+            /// <summary>Offset 0x14, Rootblock checksum</summary>
             public uint checksum;
             /// <summary>
-            ///     Offset 0x18, Hashtable, size = (block size / 4) - 56 or size = hashTableSize.
-            ///     Size intentionally bad to allow marshalling to work.
+            ///     Offset 0x18, Hashtable, size = (block size / 4) - 56 or size = hashTableSize. Size intentionally bad to allow
+            ///     marshalling to work.
             /// </summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 1)]
             public uint[] hashTable;
-            /// <summary>
-            ///     Offset 0x18+hashTableSize*4+0, bitmap flag, 0xFFFFFFFF if valid
-            /// </summary>
+            /// <summary>Offset 0x18+hashTableSize*4+0, bitmap flag, 0xFFFFFFFF if valid</summary>
             public readonly uint bitmapFlag;
-            /// <summary>
-            ///     Offset 0x18+hashTableSize*4+4, bitmap pages, 25 entries
-            /// </summary>
+            /// <summary>Offset 0x18+hashTableSize*4+4, bitmap pages, 25 entries</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 25)]
             public readonly uint[] bitmapPages;
-            /// <summary>
-            ///     Offset 0x18+hashTableSize*4+104, pointer to bitmap extension block
-            /// </summary>
+            /// <summary>Offset 0x18+hashTableSize*4+104, pointer to bitmap extension block</summary>
             public readonly uint bitmapExtensionBlock;
-            /// <summary>
-            ///     Offset 0x18+hashTableSize*4+108, last root alteration days since 1978/01/01
-            /// </summary>
+            /// <summary>Offset 0x18+hashTableSize*4+108, last root alteration days since 1978/01/01</summary>
             public readonly uint rDays;
-            /// <summary>
-            ///     Offset 0x18+hashTableSize*4+112, last root alteration minutes past midnight
-            /// </summary>
+            /// <summary>Offset 0x18+hashTableSize*4+112, last root alteration minutes past midnight</summary>
             public readonly uint rMins;
-            /// <summary>
-            ///     Offset 0x18+hashTableSize*4+116, last root alteration ticks (1/50 secs)
-            /// </summary>
+            /// <summary>Offset 0x18+hashTableSize*4+116, last root alteration ticks (1/50 secs)</summary>
             public readonly uint rTicks;
-            /// <summary>
-            ///     Offset 0x18+hashTableSize*4+120, disk name, pascal string, 31 bytes
-            /// </summary>
+            /// <summary>Offset 0x18+hashTableSize*4+120, disk name, pascal string, 31 bytes</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 31)]
             public readonly byte[] diskName;
-            /// <summary>
-            ///     Offset 0x18+hashTableSize*4+151, unused
-            /// </summary>
+            /// <summary>Offset 0x18+hashTableSize*4+151, unused</summary>
             public readonly byte padding;
-            /// <summary>
-            ///     Offset 0x18+hashTableSize*4+152, unused
-            /// </summary>
+            /// <summary>Offset 0x18+hashTableSize*4+152, unused</summary>
             public readonly uint reserved1;
-            /// <summary>
-            ///     Offset 0x18+hashTableSize*4+156, unused
-            /// </summary>
+            /// <summary>Offset 0x18+hashTableSize*4+156, unused</summary>
             public readonly uint reserved2;
-            /// <summary>
-            ///     Offset 0x18+hashTableSize*4+160, last disk alteration days since 1978/01/01
-            /// </summary>
+            /// <summary>Offset 0x18+hashTableSize*4+160, last disk alteration days since 1978/01/01</summary>
             public readonly uint vDays;
-            /// <summary>
-            ///     Offset 0x18+hashTableSize*4+164, last disk alteration minutes past midnight
-            /// </summary>
+            /// <summary>Offset 0x18+hashTableSize*4+164, last disk alteration minutes past midnight</summary>
             public readonly uint vMins;
-            /// <summary>
-            ///     Offset 0x18+hashTableSize*4+168, last disk alteration ticks (1/50 secs)
-            /// </summary>
+            /// <summary>Offset 0x18+hashTableSize*4+168, last disk alteration ticks (1/50 secs)</summary>
             public readonly uint vTicks;
-            /// <summary>
-            ///     Offset 0x18+hashTableSize*4+172, filesystem creation days since 1978/01/01
-            /// </summary>
+            /// <summary>Offset 0x18+hashTableSize*4+172, filesystem creation days since 1978/01/01</summary>
             public readonly uint cDays;
-            /// <summary>
-            ///     Offset 0x18+hashTableSize*4+176, filesystem creation minutes since 1978/01/01
-            /// </summary>
+            /// <summary>Offset 0x18+hashTableSize*4+176, filesystem creation minutes since 1978/01/01</summary>
             public readonly uint cMins;
-            /// <summary>
-            ///     Offset 0x18+hashTableSize*4+180, filesystem creation ticks since 1978/01/01
-            /// </summary>
+            /// <summary>Offset 0x18+hashTableSize*4+180, filesystem creation ticks since 1978/01/01</summary>
             public readonly uint cTicks;
-            /// <summary>
-            ///     Offset 0x18+hashTableSize*4+184, unused
-            /// </summary>
+            /// <summary>Offset 0x18+hashTableSize*4+184, unused</summary>
             public readonly uint nextHash;
-            /// <summary>
-            ///     Offset 0x18+hashTableSize*4+188, unused
-            /// </summary>
+            /// <summary>Offset 0x18+hashTableSize*4+188, unused</summary>
             public readonly uint parentDir;
-            /// <summary>
-            ///     Offset 0x18+hashTableSize*4+192, first directory cache block
-            /// </summary>
+            /// <summary>Offset 0x18+hashTableSize*4+192, first directory cache block</summary>
             public readonly uint extension;
-            /// <summary>
-            ///     Offset 0x18+hashTableSize*4+196, block secondary type = ST_ROOT (1)
-            /// </summary>
+            /// <summary>Offset 0x18+hashTableSize*4+196, block secondary type = ST_ROOT (1)</summary>
             public uint sec_type;
         }
     }
diff --git a/Aaru.Filesystems/AppleDOS/AppleDOS.cs b/Aaru.Filesystems/AppleDOS/AppleDOS.cs
index d76d20e63..04d52438c 100644
--- a/Aaru.Filesystems/AppleDOS/AppleDOS.cs
+++ b/Aaru.Filesystems/AppleDOS/AppleDOS.cs
@@ -59,12 +59,17 @@ namespace Aaru.Filesystems.AppleDOS
         public string         Author    => "Natalia Portillo";
 
         public IEnumerable<(string name, Type type, string description)> SupportedOptions =>
-            new (string name, Type type, string description)[] { };
+            new (string name, Type type, string description)[]
+                {};
 
         public Dictionary<string, string> Namespaces => null;
 
-        static Dictionary<string, string> GetDefaultOptions() =>
-            new Dictionary<string, string> {{"debug", false.ToString()}};
+        static Dictionary<string, string> GetDefaultOptions() => new Dictionary<string, string>
+        {
+            {
+                "debug", false.ToString()
+            }
+        };
 
         #region Caches
         /// <summary>Caches track/sector lists</summary>
diff --git a/Aaru.Filesystems/AppleDOS/Dir.cs b/Aaru.Filesystems/AppleDOS/Dir.cs
index 9aa732158..09df8a9f0 100644
--- a/Aaru.Filesystems/AppleDOS/Dir.cs
+++ b/Aaru.Filesystems/AppleDOS/Dir.cs
@@ -41,28 +41,28 @@ namespace Aaru.Filesystems.AppleDOS
 {
     public partial class AppleDOS
     {
-        /// <summary>
-        ///     Solves a symbolic link.
-        /// </summary>
+        /// <summary>Solves a symbolic link.</summary>
         /// <param name="path">Link path.</param>
         /// <param name="dest">Link destination.</param>
         public Errno ReadLink(string path, out string dest)
         {
             dest = null;
+
             return !mounted ? Errno.AccessDenied : Errno.NotSupported;
         }
 
-        /// <summary>
-        ///     Lists contents from a directory.
-        /// </summary>
+        /// <summary>Lists contents from a directory.</summary>
         /// <param name="path">Directory path.</param>
         /// <param name="contents">Directory contents.</param>
         public Errno ReadDir(string path, out List<string> contents)
         {
             contents = null;
-            if(!mounted) return Errno.AccessDenied;
 
-            if(!string.IsNullOrEmpty(path) && string.Compare(path, "/", StringComparison.OrdinalIgnoreCase) != 0)
+            if(!mounted)
+                return Errno.AccessDenied;
+
+            if(!string.IsNullOrEmpty(path) &&
+               string.Compare(path, "/", StringComparison.OrdinalIgnoreCase) != 0)
                 return Errno.NotSupported;
 
             contents = catalogCache.Keys.ToList();
@@ -75,27 +75,32 @@ namespace Aaru.Filesystems.AppleDOS
             }
 
             contents.Sort();
+
             return Errno.NoError;
         }
 
         Errno ReadCatalog()
         {
-            MemoryStream catalogMs = new MemoryStream();
-            ulong        lba       = (ulong)(vtoc.catalogTrack * sectorsPerTrack + vtoc.catalogSector);
+            var   catalogMs = new MemoryStream();
+            ulong lba       = (ulong)((vtoc.catalogTrack * sectorsPerTrack) + vtoc.catalogSector);
             totalFileEntries = 0;
             catalogCache     = new Dictionary<string, ushort>();
             fileTypeCache    = new Dictionary<string, byte>();
             fileSizeCache    = new Dictionary<string, int>();
             lockedFiles      = new List<string>();
 
-            if(lba == 0 || lba > device.Info.Sectors) return Errno.InvalidArgument;
+            if(lba == 0 ||
+               lba > device.Info.Sectors)
+                return Errno.InvalidArgument;
 
             while(lba != 0)
             {
                 usedSectors++;
                 byte[] catSectorB = device.ReadSector(lba);
                 totalFileEntries += 7;
-                if(debug) catalogMs.Write(catSectorB, 0, catSectorB.Length);
+
+                if(debug)
+                    catalogMs.Write(catSectorB, 0, catSectorB.Length);
 
                 // Read the catalog sector
                 CatalogSector catSector = Marshal.ByteArrayToStructureLittleEndian<CatalogSector>(catSectorB);
@@ -109,11 +114,13 @@ namespace Aaru.Filesystems.AppleDOS
                     ushort ts        = (ushort)((entry.extentTrack << 8) | entry.extentSector);
 
                     // Apple DOS has high byte set over ASCII.
-                    for(int i = 0; i < 30; i++) filenameB[i] = (byte)(entry.filename[i] & 0x7F);
+                    for(int i = 0; i < 30; i++)
+                        filenameB[i] = (byte)(entry.filename[i] & 0x7F);
 
                     string filename = StringHandlers.SpacePaddedToString(filenameB, Encoding);
 
-                    if(!catalogCache.ContainsKey(filename)) catalogCache.Add(filename, ts);
+                    if(!catalogCache.ContainsKey(filename))
+                        catalogCache.Add(filename, ts);
 
                     if(!fileTypeCache.ContainsKey(filename))
                         fileTypeCache.Add(filename, (byte)(entry.typeAndFlags & 0x7F));
@@ -121,16 +128,19 @@ namespace Aaru.Filesystems.AppleDOS
                     if(!fileSizeCache.ContainsKey(filename))
                         fileSizeCache.Add(filename, entry.length * vtoc.bytesPerSector);
 
-                    if((entry.typeAndFlags & 0x80) == 0x80 && !lockedFiles.Contains(filename))
+                    if((entry.typeAndFlags & 0x80) == 0x80 &&
+                       !lockedFiles.Contains(filename))
                         lockedFiles.Add(filename);
                 }
 
-                lba = (ulong)(catSector.trackOfNext * sectorsPerTrack + catSector.sectorOfNext);
+                lba = (ulong)((catSector.trackOfNext * sectorsPerTrack) + catSector.sectorOfNext);
 
-                if(lba > device.Info.Sectors) break;
+                if(lba > device.Info.Sectors)
+                    break;
             }
 
-            if(debug) catalogBlocks = catalogMs.ToArray();
+            if(debug)
+                catalogBlocks = catalogMs.ToArray();
 
             return Errno.NoError;
         }
diff --git a/Aaru.Filesystems/AppleDOS/File.cs b/Aaru.Filesystems/AppleDOS/File.cs
index bfb6bd844..b275a37f8 100644
--- a/Aaru.Filesystems/AppleDOS/File.cs
+++ b/Aaru.Filesystems/AppleDOS/File.cs
@@ -45,20 +45,30 @@ namespace Aaru.Filesystems.AppleDOS
         public Errno GetAttributes(string path, out FileAttributes attributes)
         {
             attributes = new FileAttributes();
-            if(!mounted) return Errno.AccessDenied;
 
-            string[] pathElements = path.Split(new[] {'/'}, StringSplitOptions.RemoveEmptyEntries);
-            if(pathElements.Length != 1) return Errno.NotSupported;
+            if(!mounted)
+                return Errno.AccessDenied;
+
+            string[] pathElements = path.Split(new[]
+            {
+                '/'
+            }, StringSplitOptions.RemoveEmptyEntries);
+
+            if(pathElements.Length != 1)
+                return Errno.NotSupported;
 
             string filename = pathElements[0].ToUpperInvariant();
 
-            if(!fileCache.ContainsKey(filename)) return Errno.NoSuchFile;
+            if(!fileCache.ContainsKey(filename))
+                return Errno.NoSuchFile;
 
             attributes =  FileAttributes.Extents;
             attributes |= FileAttributes.File;
-            if(lockedFiles.Contains(filename)) attributes |= FileAttributes.ReadOnly;
 
-            if(debug && (string.Compare(path, "$",     StringComparison.InvariantCulture) == 0 ||
+            if(lockedFiles.Contains(filename))
+                attributes |= FileAttributes.ReadOnly;
+
+            if(debug && (string.Compare(path, "$", StringComparison.InvariantCulture)     == 0 ||
                          string.Compare(path, "$Boot", StringComparison.InvariantCulture) == 0 ||
                          string.Compare(path, "$Vtoc", StringComparison.InvariantCulture) == 0))
                 attributes |= FileAttributes.System;
@@ -68,35 +78,51 @@ namespace Aaru.Filesystems.AppleDOS
 
         public Errno Read(string path, long offset, long size, ref byte[] buf)
         {
-            if(!mounted) return Errno.AccessDenied;
+            if(!mounted)
+                return Errno.AccessDenied;
 
-            string[] pathElements = path.Split(new[] {'/'}, StringSplitOptions.RemoveEmptyEntries);
-            if(pathElements.Length != 1) return Errno.NotSupported;
+            string[] pathElements = path.Split(new[]
+            {
+                '/'
+            }, StringSplitOptions.RemoveEmptyEntries);
+
+            if(pathElements.Length != 1)
+                return Errno.NotSupported;
 
             byte[] file;
             string filename = pathElements[0].ToUpperInvariant();
-            if(filename.Length > 30) return Errno.NameTooLong;
 
-            if(debug && (string.Compare(path, "$",     StringComparison.InvariantCulture) == 0 ||
+            if(filename.Length > 30)
+                return Errno.NameTooLong;
+
+            if(debug && (string.Compare(path, "$", StringComparison.InvariantCulture)     == 0 ||
                          string.Compare(path, "$Boot", StringComparison.InvariantCulture) == 0 ||
                          string.Compare(path, "$Vtoc", StringComparison.InvariantCulture) == 0))
-                if(string.Compare(path,      "$",     StringComparison.InvariantCulture) == 0) file = catalogBlocks;
-                else if(string.Compare(path, "$Vtoc", StringComparison.InvariantCulture) == 0) file = vtocBlocks;
-                else file                                                                           = bootBlocks;
+                if(string.Compare(path, "$", StringComparison.InvariantCulture) == 0)
+                    file = catalogBlocks;
+                else if(string.Compare(path, "$Vtoc", StringComparison.InvariantCulture) == 0)
+                    file = vtocBlocks;
+                else
+                    file = bootBlocks;
             else
             {
                 if(!fileCache.TryGetValue(filename, out file))
                 {
                     Errno error = CacheFile(filename);
-                    if(error != Errno.NoError) return error;
 
-                    if(!fileCache.TryGetValue(filename, out file)) return Errno.InvalidArgument;
+                    if(error != Errno.NoError)
+                        return error;
+
+                    if(!fileCache.TryGetValue(filename, out file))
+                        return Errno.InvalidArgument;
                 }
             }
 
-            if(offset >= file.Length) return Errno.InvalidArgument;
+            if(offset >= file.Length)
+                return Errno.InvalidArgument;
 
-            if(size + offset >= file.Length) size = file.Length - offset;
+            if(size + offset >= file.Length)
+                size = file.Length - offset;
 
             buf = new byte[size];
 
@@ -108,22 +134,32 @@ namespace Aaru.Filesystems.AppleDOS
         public Errno Stat(string path, out FileEntryInfo stat)
         {
             stat = null;
-            if(!mounted) return Errno.AccessDenied;
 
-            string[] pathElements = path.Split(new[] {'/'}, StringSplitOptions.RemoveEmptyEntries);
-            if(pathElements.Length != 1) return Errno.NotSupported;
+            if(!mounted)
+                return Errno.AccessDenied;
+
+            string[] pathElements = path.Split(new[]
+            {
+                '/'
+            }, StringSplitOptions.RemoveEmptyEntries);
+
+            if(pathElements.Length != 1)
+                return Errno.NotSupported;
 
             string filename = pathElements[0].ToUpperInvariant();
-            if(filename.Length > 30) return Errno.NameTooLong;
 
-            if(!fileCache.ContainsKey(filename)) return Errno.NoSuchFile;
+            if(filename.Length > 30)
+                return Errno.NameTooLong;
+
+            if(!fileCache.ContainsKey(filename))
+                return Errno.NoSuchFile;
 
             stat = new FileEntryInfo();
 
             fileSizeCache.TryGetValue(filename, out int filesize);
             GetAttributes(path, out FileAttributes attrs);
 
-            if(debug && (string.Compare(path, "$",     StringComparison.InvariantCulture) == 0 ||
+            if(debug && (string.Compare(path, "$", StringComparison.InvariantCulture)     == 0 ||
                          string.Compare(path, "$Boot", StringComparison.InvariantCulture) == 0 ||
                          string.Compare(path, "$Vtoc", StringComparison.InvariantCulture) == 0))
             {
@@ -152,30 +188,41 @@ namespace Aaru.Filesystems.AppleDOS
         public Errno MapBlock(string path, long fileBlock, out long deviceBlock)
         {
             deviceBlock = 0;
+
             // TODO: Not really important.
             return !mounted ? Errno.AccessDenied : Errno.NotImplemented;
         }
 
         Errno CacheFile(string path)
         {
-            string[] pathElements = path.Split(new[] {'/'}, StringSplitOptions.RemoveEmptyEntries);
-            if(pathElements.Length != 1) return Errno.NotSupported;
+            string[] pathElements = path.Split(new[]
+            {
+                '/'
+            }, StringSplitOptions.RemoveEmptyEntries);
+
+            if(pathElements.Length != 1)
+                return Errno.NotSupported;
 
             string filename = pathElements[0].ToUpperInvariant();
-            if(filename.Length > 30) return Errno.NameTooLong;
 
-            if(!catalogCache.TryGetValue(filename, out ushort ts)) return Errno.NoSuchFile;
+            if(filename.Length > 30)
+                return Errno.NameTooLong;
 
-            ulong        lba           = (ulong)(((ts & 0xFF00) >> 8) * sectorsPerTrack + (ts & 0xFF));
-            MemoryStream fileMs        = new MemoryStream();
-            MemoryStream tsListMs      = new MemoryStream();
-            ushort       expectedBlock = 0;
+            if(!catalogCache.TryGetValue(filename, out ushort ts))
+                return Errno.NoSuchFile;
+
+            ulong  lba           = (ulong)((((ts & 0xFF00) >> 8) * sectorsPerTrack) + (ts & 0xFF));
+            var    fileMs        = new MemoryStream();
+            var    tsListMs      = new MemoryStream();
+            ushort expectedBlock = 0;
 
             while(lba != 0)
             {
                 usedSectors++;
                 byte[] tsSectorB = device.ReadSector(lba);
-                if(debug) tsListMs.Write(tsSectorB, 0, tsSectorB.Length);
+
+                if(debug)
+                    tsListMs.Write(tsSectorB, 0, tsSectorB.Length);
 
                 // Read the track/sector list sector
                 TrackSectorList tsSector = Marshal.ByteArrayToStructureLittleEndian<TrackSectorList>(tsSectorB);
@@ -193,19 +240,24 @@ namespace Aaru.Filesystems.AppleDOS
                     track2UsedByFiles |= entry.track == 2;
                     usedSectors++;
 
-                    ulong blockLba = (ulong)(entry.track * sectorsPerTrack + entry.sector);
-                    if(blockLba == 0) break;
+                    ulong blockLba = (ulong)((entry.track * sectorsPerTrack) + entry.sector);
+
+                    if(blockLba == 0)
+                        break;
 
                     byte[] fileBlock = device.ReadSector(blockLba);
                     fileMs.Write(fileBlock, 0, fileBlock.Length);
                     expectedBlock++;
                 }
 
-                lba = (ulong)(tsSector.nextListTrack * sectorsPerTrack + tsSector.nextListSector);
+                lba = (ulong)((tsSector.nextListTrack * sectorsPerTrack) + tsSector.nextListSector);
             }
 
-            if(fileCache.ContainsKey(filename)) fileCache.Remove(filename);
-            if(extentCache.ContainsKey(filename)) extentCache.Remove(filename);
+            if(fileCache.ContainsKey(filename))
+                fileCache.Remove(filename);
+
+            if(extentCache.ContainsKey(filename))
+                extentCache.Remove(filename);
 
             fileCache.Add(filename, fileMs.ToArray());
             extentCache.Add(filename, tsListMs.ToArray());
@@ -222,8 +274,12 @@ namespace Aaru.Filesystems.AppleDOS
                 return error;
 
             uint tracksOnBoot = 1;
-            if(!track1UsedByFiles) tracksOnBoot++;
-            if(!track2UsedByFiles) tracksOnBoot++;
+
+            if(!track1UsedByFiles)
+                tracksOnBoot++;
+
+            if(!track2UsedByFiles)
+                tracksOnBoot++;
 
             bootBlocks  =  device.ReadSectors(0, (uint)(tracksOnBoot * sectorsPerTrack));
             usedSectors += (uint)(bootBlocks.Length / vtoc.bytesPerSector);
diff --git a/Aaru.Filesystems/AppleDOS/Info.cs b/Aaru.Filesystems/AppleDOS/Info.cs
index 6a21681a2..efca198fc 100644
--- a/Aaru.Filesystems/AppleDOS/Info.cs
+++ b/Aaru.Filesystems/AppleDOS/Info.cs
@@ -31,10 +31,10 @@
 // ****************************************************************************/
 
 using System.Text;
-using Claunia.Encoding;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Helpers;
+using Claunia.Encoding;
 using Schemas;
 using Encoding = System.Text.Encoding;
 
@@ -44,9 +44,13 @@ namespace Aaru.Filesystems.AppleDOS
     {
         public bool Identify(IMediaImage imagePlugin, Partition partition)
         {
-            if(imagePlugin.Info.Sectors != 455 && imagePlugin.Info.Sectors != 560) return false;
+            if(imagePlugin.Info.Sectors != 455 &&
+               imagePlugin.Info.Sectors != 560)
+                return false;
 
-            if(partition.Start > 0 || imagePlugin.Info.SectorSize != 256) return false;
+            if(partition.Start             > 0 ||
+               imagePlugin.Info.SectorSize != 256)
+                return false;
 
             int spt = imagePlugin.Info.Sectors == 455 ? 13 : 16;
 
@@ -58,11 +62,11 @@ namespace Aaru.Filesystems.AppleDOS
         }
 
         public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding    encoding)
+                                   Encoding encoding)
         {
             Encoding    = encoding ?? new Apple2();
             information = "";
-            StringBuilder sb = new StringBuilder();
+            var sb = new StringBuilder();
 
             int spt;
             spt = imagePlugin.Info.Sectors == 455 ? 13 : 16;
@@ -72,25 +76,26 @@ namespace Aaru.Filesystems.AppleDOS
 
             sb.AppendLine("Apple DOS File System");
             sb.AppendLine();
-            sb.AppendFormat("Catalog starts at sector {0} of track {1}", vtoc.catalogSector, vtoc.catalogTrack)
-              .AppendLine();
+
+            sb.AppendFormat("Catalog starts at sector {0} of track {1}", vtoc.catalogSector, vtoc.catalogTrack).
+               AppendLine();
+
             sb.AppendFormat("File system initialized by DOS release {0}", vtoc.dosRelease).AppendLine();
             sb.AppendFormat("Disk volume number {0}", vtoc.volumeNumber).AppendLine();
             sb.AppendFormat("Sectors allocated at most in track {0}", vtoc.lastAllocatedSector).AppendLine();
             sb.AppendFormat("{0} tracks in volume", vtoc.tracks).AppendLine();
             sb.AppendFormat("{0} sectors per track", vtoc.sectorsPerTrack).AppendLine();
             sb.AppendFormat("{0} bytes per sector", vtoc.bytesPerSector).AppendLine();
-            sb.AppendFormat("Track allocation is {0}", vtoc.allocationDirection > 0 ? "forward" : "reverse")
-              .AppendLine();
+
+            sb.AppendFormat("Track allocation is {0}", vtoc.allocationDirection > 0 ? "forward" : "reverse").
+               AppendLine();
 
             information = sb.ToString();
 
             XmlFsType = new FileSystemType
             {
-                Bootable    = true,
-                Clusters    = imagePlugin.Info.Sectors,
-                ClusterSize = imagePlugin.Info.SectorSize,
-                Type        = "Apple DOS"
+                Bootable = true, Clusters = imagePlugin.Info.Sectors, ClusterSize = imagePlugin.Info.SectorSize,
+                Type     = "Apple DOS"
             };
         }
     }
diff --git a/Aaru.Filesystems/AppleDOS/Structs.cs b/Aaru.Filesystems/AppleDOS/Structs.cs
index 987c44abd..a5aaf1f73 100644
--- a/Aaru.Filesystems/AppleDOS/Structs.cs
+++ b/Aaru.Filesystems/AppleDOS/Structs.cs
@@ -39,72 +39,72 @@ namespace Aaru.Filesystems.AppleDOS
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct Vtoc
         {
-            public byte unused1;
-            public byte catalogTrack;
-            public byte catalogSector;
-            public byte dosRelease;
+            public readonly byte unused1;
+            public readonly byte catalogTrack;
+            public readonly byte catalogSector;
+            public readonly byte dosRelease;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
-            public byte[] unused2;
-            public byte volumeNumber;
+            public readonly byte[] unused2;
+            public readonly byte volumeNumber;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
-            public byte[] unused3;
-            public byte maxTrackSectorPairsPerSector;
+            public readonly byte[] unused3;
+            public readonly byte maxTrackSectorPairsPerSector;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public byte[] unused4;
-            public byte  lastAllocatedSector;
-            public sbyte allocationDirection;
+            public readonly byte[] unused4;
+            public readonly byte  lastAllocatedSector;
+            public readonly sbyte allocationDirection;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
-            public byte[] unused5;
-            public byte   tracks;
-            public byte   sectorsPerTrack;
-            public ushort bytesPerSector;
+            public readonly byte[] unused5;
+            public readonly byte   tracks;
+            public readonly byte   sectorsPerTrack;
+            public readonly ushort bytesPerSector;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 200)]
-            public byte[] bitmap;
+            public readonly byte[] bitmap;
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct CatalogSector
         {
-            public byte unused1;
-            public byte trackOfNext;
-            public byte sectorOfNext;
+            public readonly byte unused1;
+            public readonly byte trackOfNext;
+            public readonly byte sectorOfNext;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public byte[] unused2;
+            public readonly byte[] unused2;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 7)]
-            public FileEntry[] entries;
+            public readonly FileEntry[] entries;
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct FileEntry
         {
-            public byte extentTrack;
-            public byte extentSector;
-            public byte typeAndFlags;
+            public readonly byte extentTrack;
+            public readonly byte extentSector;
+            public readonly byte typeAndFlags;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 30)]
-            public byte[] filename;
-            public ushort length;
+            public readonly byte[] filename;
+            public readonly ushort length;
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct TrackSectorList
         {
-            public byte unused1;
-            public byte nextListTrack;
-            public byte nextListSector;
+            public readonly byte unused1;
+            public readonly byte nextListTrack;
+            public readonly byte nextListSector;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
-            public byte[] unused2;
-            public ushort sectorOffset;
+            public readonly byte[] unused2;
+            public readonly ushort sectorOffset;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 5)]
-            public byte[] unused3;
+            public readonly byte[] unused3;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 122)]
-            public TrackSectorListEntry[] entries;
+            public readonly TrackSectorListEntry[] entries;
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct TrackSectorListEntry
         {
-            public byte track;
-            public byte sector;
+            public readonly byte track;
+            public readonly byte sector;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/AppleDOS/Super.cs b/Aaru.Filesystems/AppleDOS/Super.cs
index 32593ed62..b827a78d2 100644
--- a/Aaru.Filesystems/AppleDOS/Super.cs
+++ b/Aaru.Filesystems/AppleDOS/Super.cs
@@ -31,12 +31,12 @@
 // ****************************************************************************/
 
 using System.Collections.Generic;
-using Claunia.Encoding;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 using Aaru.Console;
 using Aaru.Helpers;
+using Claunia.Encoding;
 using Schemas;
 using Encoding = System.Text.Encoding;
 
@@ -44,31 +44,33 @@ namespace Aaru.Filesystems.AppleDOS
 {
     public partial class AppleDOS
     {
-        /// <summary>
-        ///     Mounts an Apple DOS filesystem
-        /// </summary>
-        public Errno Mount(IMediaImage                imagePlugin, Partition partition, Encoding encoding,
-                           Dictionary<string, string> options,     string    @namespace)
+        /// <summary>Mounts an Apple DOS filesystem</summary>
+        public Errno Mount(IMediaImage imagePlugin, Partition partition, Encoding encoding,
+                           Dictionary<string, string> options, string @namespace)
         {
             device   = imagePlugin;
             start    = partition.Start;
             Encoding = encoding ?? new Apple2();
 
-            if(device.Info.Sectors != 455 && device.Info.Sectors != 560)
+            if(device.Info.Sectors != 455 &&
+               device.Info.Sectors != 560)
             {
                 AaruConsole.DebugWriteLine("Apple DOS plugin", "Incorrect device size.");
+
                 return Errno.InOutError;
             }
 
             if(start > 0)
             {
                 AaruConsole.DebugWriteLine("Apple DOS plugin", "Partitions are not supported.");
+
                 return Errno.InOutError;
             }
 
             if(device.Info.SectorSize != 256)
             {
                 AaruConsole.DebugWriteLine("Apple DOS plugin", "Incorrect sector size.");
+
                 return Errno.InOutError;
             }
 
@@ -83,41 +85,46 @@ namespace Aaru.Filesystems.AppleDOS
             usedSectors       = 1;
 
             Errno error = ReadCatalog();
+
             if(error != Errno.NoError)
             {
                 AaruConsole.DebugWriteLine("Apple DOS plugin", "Unable to read catalog.");
+
                 return error;
             }
 
             error = CacheAllFiles();
+
             if(error != Errno.NoError)
             {
                 AaruConsole.DebugWriteLine("Apple DOS plugin", "Unable cache all files.");
+
                 return error;
             }
 
             // Create XML metadata for mounted filesystem
             XmlFsType = new FileSystemType
             {
-                Bootable              = true,
-                Clusters              = device.Info.Sectors,
-                ClusterSize           = vtoc.bytesPerSector,
-                Files                 = (ulong)catalogCache.Count,
-                FilesSpecified        = true,
-                FreeClustersSpecified = true,
-                Type                  = "Apple DOS"
+                Bootable    = true, Clusters = device.Info.Sectors,
+                ClusterSize = vtoc.bytesPerSector,
+                Files       = (ulong)catalogCache.Count, FilesSpecified = true, FreeClustersSpecified = true,
+                Type        = "Apple DOS"
             };
+
             XmlFsType.FreeClusters = XmlFsType.Clusters - usedSectors;
 
-            if(options == null) options = GetDefaultOptions();
-            if(options.TryGetValue("debug", out string debugString)) bool.TryParse(debugString, out debug);
+            if(options == null)
+                options = GetDefaultOptions();
+
+            if(options.TryGetValue("debug", out string debugString))
+                bool.TryParse(debugString, out debug);
+
             mounted = true;
+
             return Errno.NoError;
         }
 
-        /// <summary>
-        ///     Umounts this DOS filesystem
-        /// </summary>
+        /// <summary>Umounts this DOS filesystem</summary>
         public Errno Unmount()
         {
             mounted       = false;
@@ -129,20 +136,16 @@ namespace Aaru.Filesystems.AppleDOS
             return Errno.NoError;
         }
 
-        /// <summary>
-        ///     Gets information about the mounted volume.
-        /// </summary>
+        /// <summary>Gets information about the mounted volume.</summary>
         /// <param name="stat">Information about the mounted volume.</param>
         public Errno StatFs(out FileSystemInfo stat)
         {
             stat = new FileSystemInfo
             {
-                Blocks         = device.Info.Sectors,
-                FilenameLength = 30,
-                Files          = (ulong)catalogCache.Count,
-                PluginId       = Id,
-                Type           = "Apple DOS"
+                Blocks = device.Info.Sectors, FilenameLength = 30, Files = (ulong)catalogCache.Count, PluginId = Id,
+                Type   = "Apple DOS"
             };
+
             stat.FreeFiles  = totalFileEntries - stat.Files;
             stat.FreeBlocks = stat.Blocks      - usedSectors;
 
diff --git a/Aaru.Filesystems/AppleDOS/Xattr.cs b/Aaru.Filesystems/AppleDOS/Xattr.cs
index 145a14d4f..414d36b72 100644
--- a/Aaru.Filesystems/AppleDOS/Xattr.cs
+++ b/Aaru.Filesystems/AppleDOS/Xattr.cs
@@ -38,80 +38,101 @@ namespace Aaru.Filesystems.AppleDOS
 {
     public partial class AppleDOS
     {
-        /// <summary>
-        ///     Lists all extended attributes, alternate data streams and forks of the given file.
-        /// </summary>
+        /// <summary>Lists all extended attributes, alternate data streams and forks of the given file.</summary>
         /// <returns>Error number.</returns>
         /// <param name="path">Path.</param>
         /// <param name="xattrs">List of extended attributes, alternate data streams and forks.</param>
         public Errno ListXAttr(string path, out List<string> xattrs)
         {
             xattrs = null;
-            if(!mounted) return Errno.AccessDenied;
 
-            string[] pathElements = path.Split(new[] {'/'}, StringSplitOptions.RemoveEmptyEntries);
-            if(pathElements.Length != 1) return Errno.NotSupported;
+            if(!mounted)
+                return Errno.AccessDenied;
+
+            string[] pathElements = path.Split(new[]
+            {
+                '/'
+            }, StringSplitOptions.RemoveEmptyEntries);
+
+            if(pathElements.Length != 1)
+                return Errno.NotSupported;
 
             string filename = pathElements[0].ToUpperInvariant();
-            if(filename.Length > 30) return Errno.NameTooLong;
+
+            if(filename.Length > 30)
+                return Errno.NameTooLong;
 
             xattrs = new List<string>();
 
-            if(debug && (string.Compare(path, "$",     StringComparison.InvariantCulture) == 0 ||
+            if(debug && (string.Compare(path, "$", StringComparison.InvariantCulture)     == 0 ||
                          string.Compare(path, "$Boot", StringComparison.InvariantCulture) == 0 ||
-                         string.Compare(path, "$Vtoc", StringComparison.InvariantCulture) == 0)) { }
+                         string.Compare(path, "$Vtoc", StringComparison.InvariantCulture) == 0)) {}
             else
             {
-                if(!catalogCache.ContainsKey(filename)) return Errno.NoSuchFile;
+                if(!catalogCache.ContainsKey(filename))
+                    return Errno.NoSuchFile;
 
                 xattrs.Add("com.apple.dos.type");
 
-                if(debug) xattrs.Add("com.apple.dos.tracksectorlist");
+                if(debug)
+                    xattrs.Add("com.apple.dos.tracksectorlist");
             }
 
             return Errno.NoError;
         }
 
-        /// <summary>
-        ///     Reads an extended attribute, alternate data stream or fork from the given file.
-        /// </summary>
+        /// <summary>Reads an extended attribute, alternate data stream or fork from the given file.</summary>
         /// <returns>Error number.</returns>
         /// <param name="path">File path.</param>
         /// <param name="xattr">Extended attribute, alternate data stream or fork name.</param>
         /// <param name="buf">Buffer.</param>
         public Errno GetXattr(string path, string xattr, ref byte[] buf)
         {
-            if(!mounted) return Errno.AccessDenied;
+            if(!mounted)
+                return Errno.AccessDenied;
 
-            string[] pathElements = path.Split(new[] {'/'}, StringSplitOptions.RemoveEmptyEntries);
-            if(pathElements.Length != 1) return Errno.NotSupported;
+            string[] pathElements = path.Split(new[]
+            {
+                '/'
+            }, StringSplitOptions.RemoveEmptyEntries);
+
+            if(pathElements.Length != 1)
+                return Errno.NotSupported;
 
             string filename = pathElements[0].ToUpperInvariant();
-            if(filename.Length > 30) return Errno.NameTooLong;
 
-            if(debug && (string.Compare(path, "$",     StringComparison.InvariantCulture) == 0 ||
+            if(filename.Length > 30)
+                return Errno.NameTooLong;
+
+            if(debug && (string.Compare(path, "$", StringComparison.InvariantCulture)     == 0 ||
                          string.Compare(path, "$Boot", StringComparison.InvariantCulture) == 0 ||
                          string.Compare(path, "$Vtoc", StringComparison.InvariantCulture) == 0))
                 return Errno.NoSuchExtendedAttribute;
 
-            if(!catalogCache.ContainsKey(filename)) return Errno.NoSuchFile;
+            if(!catalogCache.ContainsKey(filename))
+                return Errno.NoSuchFile;
 
             if(string.Compare(xattr, "com.apple.dos.type", StringComparison.InvariantCulture) == 0)
             {
-                if(!fileTypeCache.TryGetValue(filename, out byte type)) return Errno.InvalidArgument;
+                if(!fileTypeCache.TryGetValue(filename, out byte type))
+                    return Errno.InvalidArgument;
 
                 buf    = new byte[1];
                 buf[0] = type;
+
                 return Errno.NoError;
             }
 
-            if(string.Compare(xattr, "com.apple.dos.tracksectorlist", StringComparison.InvariantCulture) != 0 || !debug)
+            if(string.Compare(xattr, "com.apple.dos.tracksectorlist", StringComparison.InvariantCulture) != 0 ||
+               !debug)
                 return Errno.NoSuchExtendedAttribute;
 
-            if(!extentCache.TryGetValue(filename, out byte[] ts)) return Errno.InvalidArgument;
+            if(!extentCache.TryGetValue(filename, out byte[] ts))
+                return Errno.InvalidArgument;
 
             buf = new byte[ts.Length];
             Array.Copy(ts, 0, buf, 0, buf.Length);
+
             return Errno.NoError;
         }
     }
diff --git a/Aaru.Filesystems/AppleMFS/AppleMFS.cs b/Aaru.Filesystems/AppleMFS/AppleMFS.cs
index 1440da04d..817e904bb 100644
--- a/Aaru.Filesystems/AppleMFS/AppleMFS.cs
+++ b/Aaru.Filesystems/AppleMFS/AppleMFS.cs
@@ -69,7 +69,7 @@ namespace Aaru.Filesystems.AppleMFS
         // TODO: Implement Finder namespace (requires decoding Desktop database)
         public IEnumerable<(string name, Type type, string description)> SupportedOptions =>
             new (string name, Type type, string description)[]
-                { };
+                {};
 
         public Dictionary<string, string> Namespaces => null;
 
diff --git a/Aaru.Filesystems/AppleMFS/Dir.cs b/Aaru.Filesystems/AppleMFS/Dir.cs
index 713ec4aad..ee69cf00c 100644
--- a/Aaru.Filesystems/AppleMFS/Dir.cs
+++ b/Aaru.Filesystems/AppleMFS/Dir.cs
@@ -132,13 +132,13 @@ namespace Aaru.Filesystems.AppleMFS
                     AaruConsole.DebugWriteLine("DEBUG (AppleMFS plugin)", "entry.flRPyLen = {0}", entry.flRPyLen);
 
                     AaruConsole.DebugWriteLine("DEBUG (AppleMFS plugin)", "entry.flCrDat = {0}",
-                                              DateHandlers.MacToDateTime(entry.flCrDat));
+                                               DateHandlers.MacToDateTime(entry.flCrDat));
 
                     AaruConsole.DebugWriteLine("DEBUG (AppleMFS plugin)", "entry.flMdDat = {0}",
-                                              DateHandlers.MacToDateTime(entry.flMdDat));
+                                               DateHandlers.MacToDateTime(entry.flMdDat));
 
                     AaruConsole.DebugWriteLine("DEBUG (AppleMFS plugin)", "entry.flNam0 = {0}",
-                                              StringHandlers.PascalToString(entry.flNam, Encoding));
+                                               StringHandlers.PascalToString(entry.flNam, Encoding));
                 }
 
                 offset += 50 + entry.flNam.Length;
diff --git a/Aaru.Filesystems/AppleMFS/Info.cs b/Aaru.Filesystems/AppleMFS/Info.cs
index f7839b15e..21677bc15 100644
--- a/Aaru.Filesystems/AppleMFS/Info.cs
+++ b/Aaru.Filesystems/AppleMFS/Info.cs
@@ -32,9 +32,9 @@
 
 using System;
 using System.Text;
-using Claunia.Encoding;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
+using Claunia.Encoding;
 using Schemas;
 using Encoding = System.Text.Encoding;
 
diff --git a/Aaru.Filesystems/AtheOS.cs b/Aaru.Filesystems/AtheOS.cs
index 76a701cc7..ac63ea1f5 100644
--- a/Aaru.Filesystems/AtheOS.cs
+++ b/Aaru.Filesystems/AtheOS.cs
@@ -46,6 +46,7 @@ namespace Aaru.Filesystems
         const uint AFS_MAGIC1 = 0x41465331;
         const uint AFS_MAGIC2 = 0xDD121031;
         const uint AFS_MAGIC3 = 0x15B6830E;
+
         // Common constants
         const uint AFS_SUPERBLOCK_SIZE = 1024;
         const uint AFS_BOOTBLOCK_SIZE  = AFS_SUPERBLOCK_SIZE;
@@ -65,12 +66,14 @@ namespace Aaru.Filesystems
             if(imagePlugin.Info.SectorSize < AFS_SUPERBLOCK_SIZE)
                 run = AFS_SUPERBLOCK_SIZE / imagePlugin.Info.SectorSize;
 
-            if(sector + partition.Start >= partition.End) return false;
+            if(sector + partition.Start >= partition.End)
+                return false;
 
             byte[] tmp      = imagePlugin.ReadSectors(sector + partition.Start, run);
             byte[] sbSector = new byte[AFS_SUPERBLOCK_SIZE];
 
-            if(offset + AFS_SUPERBLOCK_SIZE > tmp.Length) return false;
+            if(offset + AFS_SUPERBLOCK_SIZE > tmp.Length)
+                return false;
 
             Array.Copy(tmp, offset, sbSector, 0, AFS_SUPERBLOCK_SIZE);
 
@@ -80,12 +83,12 @@ namespace Aaru.Filesystems
         }
 
         public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding    encoding)
+                                   Encoding encoding)
         {
             Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-15");
             information = "";
 
-            StringBuilder sb = new StringBuilder();
+            var sb = new StringBuilder();
 
             ulong sector = AFS_BOOTBLOCK_SIZE / imagePlugin.Info.SectorSize;
             uint  offset = AFS_BOOTBLOCK_SIZE % imagePlugin.Info.SectorSize;
@@ -102,35 +105,47 @@ namespace Aaru.Filesystems
 
             sb.AppendLine("Atheos filesystem");
 
-            if(afsSb.flags == 1) sb.AppendLine("Filesystem is read-only");
+            if(afsSb.flags == 1)
+                sb.AppendLine("Filesystem is read-only");
 
             sb.AppendFormat("Volume name: {0}", StringHandlers.CToString(afsSb.name, Encoding)).AppendLine();
             sb.AppendFormat("{0} bytes per block", afsSb.block_size).AppendLine();
-            sb.AppendFormat("{0} blocks in volume ({1} bytes)", afsSb.num_blocks, afsSb.num_blocks * afsSb.block_size)
-              .AppendLine();
-            sb.AppendFormat("{0} used blocks ({1} bytes)", afsSb.used_blocks, afsSb.used_blocks * afsSb.block_size)
-              .AppendLine();
+
+            sb.AppendFormat("{0} blocks in volume ({1} bytes)", afsSb.num_blocks, afsSb.num_blocks * afsSb.block_size).
+               AppendLine();
+
+            sb.AppendFormat("{0} used blocks ({1} bytes)", afsSb.used_blocks, afsSb.used_blocks * afsSb.block_size).
+               AppendLine();
+
             sb.AppendFormat("{0} bytes per i-node", afsSb.inode_size).AppendLine();
+
             sb.AppendFormat("{0} blocks per allocation group ({1} bytes)", afsSb.blocks_per_ag,
                             afsSb.blocks_per_ag * afsSb.block_size).AppendLine();
+
             sb.AppendFormat("{0} allocation groups in volume", afsSb.num_ags).AppendLine();
+
             sb.AppendFormat("Journal resides in block {0} of allocation group {1} and runs for {2} blocks ({3} bytes)",
                             afsSb.log_blocks_start, afsSb.log_blocks_ag, afsSb.log_blocks_len,
                             afsSb.log_blocks_len * afsSb.block_size).AppendLine();
+
             sb.AppendFormat("Journal starts in byte {0} and has {1} bytes in {2} blocks", afsSb.log_start,
                             afsSb.log_size, afsSb.log_valid_blocks).AppendLine();
-            sb
-               .AppendFormat("Root folder's i-node resides in block {0} of allocation group {1} and runs for {2} blocks ({3} bytes)",
+
+            sb.
+                AppendFormat("Root folder's i-node resides in block {0} of allocation group {1} and runs for {2} blocks ({3} bytes)",
                              afsSb.root_dir_start, afsSb.root_dir_ag, afsSb.root_dir_len,
                              afsSb.root_dir_len * afsSb.block_size).AppendLine();
-            sb
-               .AppendFormat("Directory containing files scheduled for deletion's i-node resides in block {0} of allocation group {1} and runs for {2} blocks ({3} bytes)",
+
+            sb.
+                AppendFormat("Directory containing files scheduled for deletion's i-node resides in block {0} of allocation group {1} and runs for {2} blocks ({3} bytes)",
                              afsSb.deleted_start, afsSb.deleted_ag, afsSb.deleted_len,
                              afsSb.deleted_len * afsSb.block_size).AppendLine();
-            sb
-               .AppendFormat("Indices' i-node resides in block {0} of allocation group {1} and runs for {2} blocks ({3} bytes)",
+
+            sb.
+                AppendFormat("Indices' i-node resides in block {0} of allocation group {1} and runs for {2} blocks ({3} bytes)",
                              afsSb.indices_start, afsSb.indices_ag, afsSb.indices_len,
                              afsSb.indices_len * afsSb.block_size).AppendLine();
+
             sb.AppendFormat("{0} blocks for bootloader ({1} bytes)", afsSb.boot_size,
                             afsSb.boot_size * afsSb.block_size).AppendLine();
 
@@ -138,19 +153,15 @@ namespace Aaru.Filesystems
 
             XmlFsType = new FileSystemType
             {
-                Clusters              = (ulong)afsSb.num_blocks,
-                ClusterSize           = afsSb.block_size,
-                Dirty                 = false,
-                FreeClusters          = (ulong)(afsSb.num_blocks - afsSb.used_blocks),
-                FreeClustersSpecified = true,
-                Type                  = "AtheOS filesystem",
-                VolumeName            = StringHandlers.CToString(afsSb.name, Encoding)
+                Clusters     = (ulong)afsSb.num_blocks, ClusterSize = afsSb.block_size,
+                Dirty        = false,
+                FreeClusters = (ulong)(afsSb.num_blocks - afsSb.used_blocks), FreeClustersSpecified = true,
+                Type         = "AtheOS filesystem",
+                VolumeName   = StringHandlers.CToString(afsSb.name, Encoding)
             };
         }
 
-        /// <summary>
-        ///     Be superblock
-        /// </summary>
+        /// <summary>Be superblock</summary>
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct AtheosSuperBlock
         {
diff --git a/Aaru.Filesystems/BFS.cs b/Aaru.Filesystems/BFS.cs
index d6f177184..f0ff86f90 100644
--- a/Aaru.Filesystems/BFS.cs
+++ b/Aaru.Filesystems/BFS.cs
@@ -48,9 +48,11 @@ namespace Aaru.Filesystems
         const uint BEFS_MAGIC2 = 0xDD121031;
         const uint BEFS_MAGIC3 = 0x15B6830E;
         const uint BEFS_ENDIAN = 0x42494745;
+
         // Big endian constants
         const uint BEFS_CIGAM1 = 0x31534642;
         const uint BEFS_NAIDNE = 0x45474942;
+
         // Common constants
         const uint BEFS_CLEAN = 0x434C454E;
         const uint BEFS_DIRTY = 0x44495254;
@@ -63,14 +65,17 @@ namespace Aaru.Filesystems
 
         public bool Identify(IMediaImage imagePlugin, Partition partition)
         {
-            if(2 + partition.Start >= partition.End) return false;
+            if(2 + partition.Start >= partition.End)
+                return false;
 
             byte[] sbSector = imagePlugin.ReadSector(0 + partition.Start);
 
             uint magic   = BitConverter.ToUInt32(sbSector, 0x20);
             uint magicBe = BigEndianBitConverter.ToUInt32(sbSector, 0x20);
 
-            if(magic == BEFS_MAGIC1 || magicBe == BEFS_MAGIC1) return true;
+            if(magic   == BEFS_MAGIC1 ||
+               magicBe == BEFS_MAGIC1)
+                return true;
 
             if(sbSector.Length >= 0x400)
             {
@@ -78,7 +83,9 @@ namespace Aaru.Filesystems
                 magicBe = BigEndianBitConverter.ToUInt32(sbSector, 0x220);
             }
 
-            if(magic == BEFS_MAGIC1 || magicBe == BEFS_MAGIC1) return true;
+            if(magic   == BEFS_MAGIC1 ||
+               magicBe == BEFS_MAGIC1)
+                return true;
 
             sbSector = imagePlugin.ReadSector(1 + partition.Start);
 
@@ -89,53 +96,63 @@ namespace Aaru.Filesystems
         }
 
         public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding    encoding)
+                                   Encoding encoding)
         {
             Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-15");
             information = "";
 
-            StringBuilder sb = new StringBuilder();
+            var sb = new StringBuilder();
 
-            BeSuperBlock besb = new BeSuperBlock();
+            var besb = new BeSuperBlock();
 
             byte[] sbSector = imagePlugin.ReadSector(0 + partition.Start);
 
             bool littleEndian;
 
             besb.magic1 = BigEndianBitConverter.ToUInt32(sbSector, 0x20);
-            if(besb.magic1 == BEFS_MAGIC1 || besb.magic1 == BEFS_CIGAM1) // Magic is at offset
+
+            if(besb.magic1 == BEFS_MAGIC1 ||
+               besb.magic1 == BEFS_CIGAM1) // Magic is at offset
                 littleEndian = besb.magic1 == BEFS_CIGAM1;
             else
             {
                 sbSector    = imagePlugin.ReadSector(1 + partition.Start);
                 besb.magic1 = BigEndianBitConverter.ToUInt32(sbSector, 0x20);
 
-                if(besb.magic1 == BEFS_MAGIC1 || besb.magic1 == BEFS_CIGAM1) // There is a boot sector
+                if(besb.magic1 == BEFS_MAGIC1 ||
+                   besb.magic1 == BEFS_CIGAM1) // There is a boot sector
                     littleEndian = besb.magic1 == BEFS_CIGAM1;
                 else if(sbSector.Length >= 0x400)
                 {
                     byte[] temp = imagePlugin.ReadSector(0 + partition.Start);
                     besb.magic1 = BigEndianBitConverter.ToUInt32(temp, 0x220);
 
-                    if(besb.magic1 == BEFS_MAGIC1 || besb.magic1 == BEFS_CIGAM1) // There is a boot sector
+                    if(besb.magic1 == BEFS_MAGIC1 ||
+                       besb.magic1 == BEFS_CIGAM1) // There is a boot sector
                     {
                         littleEndian = besb.magic1 == BEFS_CIGAM1;
                         sbSector     = new byte[0x200];
                         Array.Copy(temp, 0x200, sbSector, 0, 0x200);
                     }
-                    else return;
+                    else
+                        return;
                 }
-                else return;
+                else
+                    return;
             }
 
-            if(littleEndian) besb = Marshal.ByteArrayToStructureLittleEndian<BeSuperBlock>(sbSector);
-            else besb             = Marshal.ByteArrayToStructureBigEndian<BeSuperBlock>(sbSector);
+            if(littleEndian)
+                besb = Marshal.ByteArrayToStructureLittleEndian<BeSuperBlock>(sbSector);
+            else
+                besb = Marshal.ByteArrayToStructureBigEndian<BeSuperBlock>(sbSector);
 
             sb.AppendLine(littleEndian ? "Little-endian BeFS" : "Big-endian BeFS");
 
-            if(besb.magic1                != BEFS_MAGIC1 || besb.fs_byte_order != BEFS_ENDIAN ||
+            if(besb.magic1                != BEFS_MAGIC1 ||
+               besb.fs_byte_order         != BEFS_ENDIAN ||
                besb.magic2                != BEFS_MAGIC2 ||
-               besb.magic3                != BEFS_MAGIC3 || besb.root_dir_len != 1 ||
+               besb.magic3                != BEFS_MAGIC3 ||
+               besb.root_dir_len          != 1           ||
                besb.indices_len           != 1           ||
                1 << (int)besb.block_shift != besb.block_size)
             {
@@ -143,10 +160,13 @@ namespace Aaru.Filesystems
                 sb.AppendFormat("Magic 1: 0x{0:X8} (Should be 0x42465331)", besb.magic1).AppendLine();
                 sb.AppendFormat("Magic 2: 0x{0:X8} (Should be 0xDD121031)", besb.magic2).AppendLine();
                 sb.AppendFormat("Magic 3: 0x{0:X8} (Should be 0x15B6830E)", besb.magic3).AppendLine();
-                sb.AppendFormat("Filesystem endianness: 0x{0:X8} (Should be 0x42494745)", besb.fs_byte_order)
-                  .AppendLine();
+
+                sb.AppendFormat("Filesystem endianness: 0x{0:X8} (Should be 0x42494745)", besb.fs_byte_order).
+                   AppendLine();
+
                 sb.AppendFormat("Root folder's i-node size: {0} blocks (Should be 1)", besb.root_dir_len).AppendLine();
                 sb.AppendFormat("Indices' i-node size: {0} blocks (Should be 1)", besb.indices_len).AppendLine();
+
                 sb.AppendFormat("1 << block_shift == block_size => 1 << {0} == {1} (Should be {2})", besb.block_shift,
                                 1 << (int)besb.block_shift, besb.block_size).AppendLine();
             }
@@ -155,56 +175,64 @@ namespace Aaru.Filesystems
             {
                 case BEFS_CLEAN:
                     sb.AppendLine(besb.log_start == besb.log_end ? "Filesystem is clean" : "Filesystem is dirty");
+
                     break;
                 case BEFS_DIRTY:
                     sb.AppendLine("Filesystem is dirty");
+
                     break;
                 default:
                     sb.AppendFormat("Unknown flags: {0:X8}", besb.flags).AppendLine();
+
                     break;
             }
 
             sb.AppendFormat("Volume name: {0}", StringHandlers.CToString(besb.name, Encoding)).AppendLine();
             sb.AppendFormat("{0} bytes per block", besb.block_size).AppendLine();
-            sb.AppendFormat("{0} blocks in volume ({1} bytes)", besb.num_blocks, besb.num_blocks * besb.block_size)
-              .AppendLine();
-            sb.AppendFormat("{0} used blocks ({1} bytes)", besb.used_blocks, besb.used_blocks * besb.block_size)
-              .AppendLine();
+
+            sb.AppendFormat("{0} blocks in volume ({1} bytes)", besb.num_blocks, besb.num_blocks * besb.block_size).
+               AppendLine();
+
+            sb.AppendFormat("{0} used blocks ({1} bytes)", besb.used_blocks, besb.used_blocks * besb.block_size).
+               AppendLine();
+
             sb.AppendFormat("{0} bytes per i-node", besb.inode_size).AppendLine();
+
             sb.AppendFormat("{0} blocks per allocation group ({1} bytes)", besb.blocks_per_ag,
                             besb.blocks_per_ag * besb.block_size).AppendLine();
+
             sb.AppendFormat("{0} allocation groups in volume", besb.num_ags).AppendLine();
+
             sb.AppendFormat("Journal resides in block {0} of allocation group {1} and runs for {2} blocks ({3} bytes)",
                             besb.log_blocks_start, besb.log_blocks_ag, besb.log_blocks_len,
                             besb.log_blocks_len * besb.block_size).AppendLine();
-            sb.AppendFormat("Journal starts in byte {0} and ends in byte {1}", besb.log_start, besb.log_end)
-              .AppendLine();
-            sb
-               .AppendFormat("Root folder's i-node resides in block {0} of allocation group {1} and runs for {2} blocks ({3} bytes)",
+
+            sb.AppendFormat("Journal starts in byte {0} and ends in byte {1}", besb.log_start, besb.log_end).
+               AppendLine();
+
+            sb.
+                AppendFormat("Root folder's i-node resides in block {0} of allocation group {1} and runs for {2} blocks ({3} bytes)",
                              besb.root_dir_start, besb.root_dir_ag, besb.root_dir_len,
                              besb.root_dir_len * besb.block_size).AppendLine();
-            sb
-               .AppendFormat("Indices' i-node resides in block {0} of allocation group {1} and runs for {2} blocks ({3} bytes)",
-                             besb.indices_start, besb.indices_ag, besb.indices_len, besb.indices_len * besb.block_size)
-               .AppendLine();
+
+            sb.
+                AppendFormat("Indices' i-node resides in block {0} of allocation group {1} and runs for {2} blocks ({3} bytes)",
+                             besb.indices_start, besb.indices_ag, besb.indices_len, besb.indices_len * besb.block_size).
+                AppendLine();
 
             information = sb.ToString();
 
             XmlFsType = new FileSystemType
             {
-                Clusters              = (ulong)besb.num_blocks,
-                ClusterSize           = besb.block_size,
-                Dirty                 = besb.flags == BEFS_DIRTY,
-                FreeClusters          = (ulong)(besb.num_blocks - besb.used_blocks),
-                FreeClustersSpecified = true,
-                Type                  = "BeFS",
-                VolumeName            = StringHandlers.CToString(besb.name, Encoding)
+                Clusters     = (ulong)besb.num_blocks, ClusterSize = besb.block_size,
+                Dirty        = besb.flags == BEFS_DIRTY,
+                FreeClusters = (ulong)(besb.num_blocks - besb.used_blocks), FreeClustersSpecified = true,
+                Type         = "BeFS",
+                VolumeName   = StringHandlers.CToString(besb.name, Encoding)
             };
         }
 
-        /// <summary>
-        ///     Be superblock
-        /// </summary>
+        /// <summary>Be superblock</summary>
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct BeSuperBlock
         {
diff --git a/Aaru.Filesystems/BTRFS.cs b/Aaru.Filesystems/BTRFS.cs
index a019bb4aa..4c9ed8aba 100644
--- a/Aaru.Filesystems/BTRFS.cs
+++ b/Aaru.Filesystems/BTRFS.cs
@@ -43,9 +43,7 @@ namespace Aaru.Filesystems
 {
     public class BTRFS : IFilesystem
     {
-        /// <summary>
-        ///     BTRFS magic "_BHRfS_M"
-        /// </summary>
+        /// <summary>BTRFS magic "_BHRfS_M"</summary>
         const ulong BTRFS_MAGIC = 0x4D5F53665248425F;
 
         public FileSystemType XmlFsType { get; private set; }
@@ -56,32 +54,40 @@ namespace Aaru.Filesystems
 
         public bool Identify(IMediaImage imagePlugin, Partition partition)
         {
-            if(partition.Start >= partition.End) return false;
+            if(partition.Start >= partition.End)
+                return false;
 
             ulong sbSectorOff  = 0x10000 / imagePlugin.Info.SectorSize;
             uint  sbSectorSize = 0x1000  / imagePlugin.Info.SectorSize;
 
-            if(sbSectorOff + partition.Start >= partition.End) return false;
+            if(sbSectorOff + partition.Start >= partition.End)
+                return false;
 
             byte[]     sector = imagePlugin.ReadSectors(sbSectorOff + partition.Start, sbSectorSize);
             SuperBlock btrfsSb;
 
-            try { btrfsSb = Marshal.ByteArrayToStructureLittleEndian<SuperBlock>(sector); }
-            catch { return false; }
+            try
+            {
+                btrfsSb = Marshal.ByteArrayToStructureLittleEndian<SuperBlock>(sector);
+            }
+            catch
+            {
+                return false;
+            }
 
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "sbSectorOff = {0}",                    sbSectorOff);
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "sbSectorSize = {0}",                   sbSectorSize);
+            AaruConsole.DebugWriteLine("BTRFS Plugin", "sbSectorOff = {0}", sbSectorOff);
+            AaruConsole.DebugWriteLine("BTRFS Plugin", "sbSectorSize = {0}", sbSectorSize);
             AaruConsole.DebugWriteLine("BTRFS Plugin", "partition.PartitionStartSector = {0}", partition.Start);
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.magic = 0x{0:X16}",            btrfsSb.magic);
+            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.magic = 0x{0:X16}", btrfsSb.magic);
 
             return btrfsSb.magic == BTRFS_MAGIC;
         }
 
         public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding    encoding)
+                                   Encoding encoding)
         {
             Encoding = encoding ?? Encoding.GetEncoding("iso-8859-15");
-            StringBuilder sbInformation = new StringBuilder();
+            var sbInformation = new StringBuilder();
             XmlFsType   = new FileSystemType();
             information = "";
 
@@ -92,54 +98,69 @@ namespace Aaru.Filesystems
 
             SuperBlock btrfsSb = Marshal.ByteArrayToStructureLittleEndian<SuperBlock>(sector);
 
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.checksum = {0}",          btrfsSb.checksum);
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.uuid = {0}",              btrfsSb.uuid);
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.pba = {0}",               btrfsSb.pba);
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.flags = {0}",             btrfsSb.flags);
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.magic = {0}",             btrfsSb.magic);
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.generation = {0}",        btrfsSb.generation);
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.root_lba = {0}",          btrfsSb.root_lba);
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.chunk_lba = {0}",         btrfsSb.chunk_lba);
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.log_lba = {0}",           btrfsSb.log_lba);
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.log_root_transid = {0}",  btrfsSb.log_root_transid);
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.total_bytes = {0}",       btrfsSb.total_bytes);
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.bytes_used = {0}",        btrfsSb.bytes_used);
+            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.checksum = {0}", btrfsSb.checksum);
+            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.uuid = {0}", btrfsSb.uuid);
+            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.pba = {0}", btrfsSb.pba);
+            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.flags = {0}", btrfsSb.flags);
+            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.magic = {0}", btrfsSb.magic);
+            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.generation = {0}", btrfsSb.generation);
+            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.root_lba = {0}", btrfsSb.root_lba);
+            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.chunk_lba = {0}", btrfsSb.chunk_lba);
+            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.log_lba = {0}", btrfsSb.log_lba);
+            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.log_root_transid = {0}", btrfsSb.log_root_transid);
+            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.total_bytes = {0}", btrfsSb.total_bytes);
+            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.bytes_used = {0}", btrfsSb.bytes_used);
             AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.root_dir_objectid = {0}", btrfsSb.root_dir_objectid);
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.num_devices = {0}",       btrfsSb.num_devices);
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.sectorsize = {0}",        btrfsSb.sectorsize);
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.nodesize = {0}",          btrfsSb.nodesize);
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.leafsize = {0}",          btrfsSb.leafsize);
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.stripesize = {0}",        btrfsSb.stripesize);
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.n = {0}",                 btrfsSb.n);
+            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.num_devices = {0}", btrfsSb.num_devices);
+            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.sectorsize = {0}", btrfsSb.sectorsize);
+            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.nodesize = {0}", btrfsSb.nodesize);
+            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.leafsize = {0}", btrfsSb.leafsize);
+            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.stripesize = {0}", btrfsSb.stripesize);
+            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.n = {0}", btrfsSb.n);
+
             AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.chunk_root_generation = {0}",
-                                      btrfsSb.chunk_root_generation);
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.compat_flags = 0x{0:X16}",    btrfsSb.compat_flags);
+                                       btrfsSb.chunk_root_generation);
+
+            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.compat_flags = 0x{0:X16}", btrfsSb.compat_flags);
             AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.compat_ro_flags = 0x{0:X16}", btrfsSb.compat_ro_flags);
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.incompat_flags = 0x{0:X16}",  btrfsSb.incompat_flags);
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.csum_type = {0}",             btrfsSb.csum_type);
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.root_level = {0}",            btrfsSb.root_level);
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.chunk_root_level = {0}",      btrfsSb.chunk_root_level);
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.log_root_level = {0}",        btrfsSb.log_root_level);
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.dev_item.id = 0x{0:X16}",     btrfsSb.dev_item.id);
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.dev_item.bytes = {0}",        btrfsSb.dev_item.bytes);
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.dev_item.used = {0}",         btrfsSb.dev_item.used);
+            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.incompat_flags = 0x{0:X16}", btrfsSb.incompat_flags);
+            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.csum_type = {0}", btrfsSb.csum_type);
+            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.root_level = {0}", btrfsSb.root_level);
+            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.chunk_root_level = {0}", btrfsSb.chunk_root_level);
+            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.log_root_level = {0}", btrfsSb.log_root_level);
+            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.dev_item.id = 0x{0:X16}", btrfsSb.dev_item.id);
+            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.dev_item.bytes = {0}", btrfsSb.dev_item.bytes);
+            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.dev_item.used = {0}", btrfsSb.dev_item.used);
+
             AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.dev_item.optimal_align = {0}",
-                                      btrfsSb.dev_item.optimal_align);
+                                       btrfsSb.dev_item.optimal_align);
+
             AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.dev_item.optimal_width = {0}",
-                                      btrfsSb.dev_item.optimal_width);
+                                       btrfsSb.dev_item.optimal_width);
+
             AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.dev_item.minimal_size = {0}",
-                                      btrfsSb.dev_item.minimal_size);
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.dev_item.type = {0}",       btrfsSb.dev_item.type);
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.dev_item.generation = {0}", btrfsSb.dev_item.generation);
+                                       btrfsSb.dev_item.minimal_size);
+
+            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.dev_item.type = {0}", btrfsSb.dev_item.type);
+
+            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.dev_item.generation = {0}",
+                                       btrfsSb.dev_item.generation);
+
             AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.dev_item.start_offset = {0}",
-                                      btrfsSb.dev_item.start_offset);
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.dev_item.dev_group = {0}",  btrfsSb.dev_item.dev_group);
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.dev_item.seek_speed = {0}", btrfsSb.dev_item.seek_speed);
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.dev_item.bandwitdh = {0}",  btrfsSb.dev_item.bandwitdh);
+                                       btrfsSb.dev_item.start_offset);
+
+            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.dev_item.dev_group = {0}", btrfsSb.dev_item.dev_group);
+
+            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.dev_item.seek_speed = {0}",
+                                       btrfsSb.dev_item.seek_speed);
+
+            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.dev_item.bandwitdh = {0}", btrfsSb.dev_item.bandwitdh);
+
             AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.dev_item.device_uuid = {0}",
-                                      btrfsSb.dev_item.device_uuid);
+                                       btrfsSb.dev_item.device_uuid);
+
             AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.dev_item.uuid = {0}", btrfsSb.dev_item.uuid);
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.label = {0}",         btrfsSb.label);
+            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.label = {0}", btrfsSb.label);
 
             sbInformation.AppendLine("B-tree filesystem");
             sbInformation.AppendFormat("UUID: {0}", btrfsSb.uuid).AppendLine();
@@ -147,8 +168,10 @@ namespace Aaru.Filesystems
             sbInformation.AppendFormat("Root tree starts at LBA {0}", btrfsSb.root_lba).AppendLine();
             sbInformation.AppendFormat("Chunk tree starts at LBA {0}", btrfsSb.chunk_lba).AppendLine();
             sbInformation.AppendFormat("Log tree starts at LBA {0}", btrfsSb.log_lba).AppendLine();
+
             sbInformation.AppendFormat("Volume has {0} bytes spanned in {1} devices", btrfsSb.total_bytes,
                                        btrfsSb.num_devices).AppendLine();
+
             sbInformation.AppendFormat("Volume has {0} bytes used", btrfsSb.bytes_used).AppendLine();
             sbInformation.AppendFormat("{0} bytes/sector", btrfsSb.sectorsize).AppendLine();
             sbInformation.AppendFormat("{0} bytes/node", btrfsSb.nodesize).AppendLine();
@@ -165,15 +188,13 @@ namespace Aaru.Filesystems
 
             XmlFsType = new FileSystemType
             {
-                Clusters              = btrfsSb.total_bytes / btrfsSb.sectorsize,
-                ClusterSize           = btrfsSb.sectorsize,
-                FreeClustersSpecified = true,
-                VolumeName            = btrfsSb.label,
+                Clusters              = btrfsSb.total_bytes / btrfsSb.sectorsize, ClusterSize = btrfsSb.sectorsize,
+                FreeClustersSpecified = true, VolumeName                                      = btrfsSb.label,
                 VolumeSerial          = $"{btrfsSb.uuid}",
-                VolumeSetIdentifier   = $"{btrfsSb.dev_item.device_uuid}",
-                Type                  = Name
+                VolumeSetIdentifier   = $"{btrfsSb.dev_item.device_uuid}", Type = Name
             };
-            XmlFsType.FreeClusters = XmlFsType.Clusters - btrfsSb.bytes_used / btrfsSb.sectorsize;
+
+            XmlFsType.FreeClusters = XmlFsType.Clusters - (btrfsSb.bytes_used / btrfsSb.sectorsize);
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
diff --git a/Aaru.Filesystems/CBM.cs b/Aaru.Filesystems/CBM.cs
index b017f346a..74f4688eb 100644
--- a/Aaru.Filesystems/CBM.cs
+++ b/Aaru.Filesystems/CBM.cs
@@ -33,9 +33,9 @@
 using System;
 using System.Runtime.InteropServices;
 using System.Text;
-using Claunia.Encoding;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
+using Claunia.Encoding;
 using Schemas;
 using Encoding = System.Text.Encoding;
 using Marshal = Aaru.Helpers.Marshal;
@@ -52,12 +52,17 @@ namespace Aaru.Filesystems
 
         public bool Identify(IMediaImage imagePlugin, Partition partition)
         {
-            if(partition.Start > 0) return false;
+            if(partition.Start > 0)
+                return false;
 
-            if(imagePlugin.Info.SectorSize != 256) return false;
+            if(imagePlugin.Info.SectorSize != 256)
+                return false;
 
-            if(imagePlugin.Info.Sectors != 683 && imagePlugin.Info.Sectors != 768 && imagePlugin.Info.Sectors != 1366 &&
-               imagePlugin.Info.Sectors != 3200) return false;
+            if(imagePlugin.Info.Sectors != 683  &&
+               imagePlugin.Info.Sectors != 768  &&
+               imagePlugin.Info.Sectors != 1366 &&
+               imagePlugin.Info.Sectors != 3200)
+                return false;
 
             byte[] sector;
 
@@ -66,7 +71,9 @@ namespace Aaru.Filesystems
                 sector = imagePlugin.ReadSector(1560);
                 CommodoreHeader cbmHdr = Marshal.ByteArrayToStructureLittleEndian<CommodoreHeader>(sector);
 
-                if(cbmHdr.diskDosVersion == 0x44 && cbmHdr.dosVersion == 0x33 && cbmHdr.diskVersion == 0x44)
+                if(cbmHdr.diskDosVersion == 0x44 &&
+                   cbmHdr.dosVersion     == 0x33 &&
+                   cbmHdr.diskVersion    == 0x44)
                     return true;
             }
             else
@@ -74,20 +81,23 @@ namespace Aaru.Filesystems
                 sector = imagePlugin.ReadSector(357);
                 CommodoreBam cbmBam = Marshal.ByteArrayToStructureLittleEndian<CommodoreBam>(sector);
 
-                if(cbmBam.dosVersion == 0x41 && (cbmBam.doubleSided == 0x00 || cbmBam.doubleSided == 0x80) &&
-                   cbmBam.unused1    == 0x00 && cbmBam.directoryTrack == 0x12) return true;
+                if(cbmBam.dosVersion == 0x41                                  &&
+                   (cbmBam.doubleSided == 0x00 || cbmBam.doubleSided == 0x80) &&
+                   cbmBam.unused1        == 0x00                              &&
+                   cbmBam.directoryTrack == 0x12)
+                    return true;
             }
 
             return false;
         }
 
         public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding    encoding)
+                                   Encoding encoding)
         {
             Encoding = new PETSCII();
             byte[] sector;
 
-            StringBuilder sbInformation = new StringBuilder();
+            var sbInformation = new StringBuilder();
 
             sbInformation.AppendLine("Commodore file system");
 
@@ -103,16 +113,26 @@ namespace Aaru.Filesystems
 
                 sbInformation.AppendFormat("Directory starts at track {0} sector {1}", cbmHdr.directoryTrack,
                                            cbmHdr.directorySector).AppendLine();
-                sbInformation
-                   .AppendFormat("Disk DOS Version: {0}", Encoding.ASCII.GetString(new[] {cbmHdr.diskDosVersion}))
-                   .AppendLine();
-                sbInformation.AppendFormat("DOS Version: {0}", Encoding.ASCII.GetString(new[] {cbmHdr.dosVersion}))
-                             .AppendLine();
-                sbInformation.AppendFormat("Disk Version: {0}", Encoding.ASCII.GetString(new[] {cbmHdr.diskVersion}))
-                             .AppendLine();
+
+                sbInformation.AppendFormat("Disk DOS Version: {0}", Encoding.ASCII.GetString(new[]
+                {
+                    cbmHdr.diskDosVersion
+                })).AppendLine();
+
+                sbInformation.AppendFormat("DOS Version: {0}", Encoding.ASCII.GetString(new[]
+                {
+                    cbmHdr.dosVersion
+                })).AppendLine();
+
+                sbInformation.AppendFormat("Disk Version: {0}", Encoding.ASCII.GetString(new[]
+                {
+                    cbmHdr.diskVersion
+                })).AppendLine();
+
                 sbInformation.AppendFormat("Disk ID: {0}", cbmHdr.diskId).AppendLine();
-                sbInformation.AppendFormat("Disk name: {0}", StringHandlers.CToString(cbmHdr.name, Encoding))
-                             .AppendLine();
+
+                sbInformation.AppendFormat("Disk name: {0}", StringHandlers.CToString(cbmHdr.name, Encoding)).
+                              AppendLine();
 
                 XmlFsType.VolumeName   = StringHandlers.CToString(cbmHdr.name, Encoding);
                 XmlFsType.VolumeSerial = $"{cbmHdr.diskId}";
@@ -124,14 +144,20 @@ namespace Aaru.Filesystems
 
                 sbInformation.AppendFormat("Directory starts at track {0} sector {1}", cbmBam.directoryTrack,
                                            cbmBam.directorySector).AppendLine();
+
                 sbInformation.AppendFormat("Disk DOS type: {0}",
-                                           Encoding.ASCII.GetString(BitConverter.GetBytes(cbmBam.dosType)))
-                             .AppendLine();
-                sbInformation.AppendFormat("DOS Version: {0}", Encoding.ASCII.GetString(new[] {cbmBam.dosVersion}))
-                             .AppendLine();
+                                           Encoding.ASCII.GetString(BitConverter.GetBytes(cbmBam.dosType))).
+                              AppendLine();
+
+                sbInformation.AppendFormat("DOS Version: {0}", Encoding.ASCII.GetString(new[]
+                {
+                    cbmBam.dosVersion
+                })).AppendLine();
+
                 sbInformation.AppendFormat("Disk ID: {0}", cbmBam.diskId).AppendLine();
-                sbInformation.AppendFormat("Disk name: {0}", StringHandlers.CToString(cbmBam.name, Encoding))
-                             .AppendLine();
+
+                sbInformation.AppendFormat("Disk name: {0}", StringHandlers.CToString(cbmBam.name, Encoding)).
+                              AppendLine();
 
                 XmlFsType.VolumeName   = StringHandlers.CToString(cbmBam.name, Encoding);
                 XmlFsType.VolumeSerial = $"{cbmBam.diskId}";
@@ -143,74 +169,42 @@ namespace Aaru.Filesystems
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct CommodoreBam
         {
-            /// <summary>
-            ///     Track where directory starts
-            /// </summary>
+            /// <summary>Track where directory starts</summary>
             public readonly byte directoryTrack;
-            /// <summary>
-            ///     Sector where directory starts
-            /// </summary>
+            /// <summary>Sector where directory starts</summary>
             public readonly byte directorySector;
-            /// <summary>
-            ///     Disk DOS version, 0x41
-            /// </summary>
+            /// <summary>Disk DOS version, 0x41</summary>
             public readonly byte dosVersion;
-            /// <summary>
-            ///     Set to 0x80 if 1571, 0x00 if not
-            /// </summary>
+            /// <summary>Set to 0x80 if 1571, 0x00 if not</summary>
             public readonly byte doubleSided;
-            /// <summary>
-            ///     Block allocation map
-            /// </summary>
+            /// <summary>Block allocation map</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 140)]
             public readonly byte[] bam;
-            /// <summary>
-            ///     Disk name
-            /// </summary>
+            /// <summary>Disk name</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
             public readonly byte[] name;
-            /// <summary>
-            ///     Filled with 0xA0
-            /// </summary>
+            /// <summary>Filled with 0xA0</summary>
             public readonly ushort fill1;
-            /// <summary>
-            ///     Disk ID
-            /// </summary>
+            /// <summary>Disk ID</summary>
             public readonly ushort diskId;
-            /// <summary>
-            ///     Filled with 0xA0
-            /// </summary>
+            /// <summary>Filled with 0xA0</summary>
             public readonly byte fill2;
-            /// <summary>
-            ///     DOS type
-            /// </summary>
+            /// <summary>DOS type</summary>
             public readonly ushort dosType;
-            /// <summary>
-            ///     Filled with 0xA0
-            /// </summary>
+            /// <summary>Filled with 0xA0</summary>
             public readonly uint fill3;
-            /// <summary>
-            ///     Unused
-            /// </summary>
+            /// <summary>Unused</summary>
             public readonly byte unused1;
-            /// <summary>
-            ///     Block allocation map for Dolphin DOS extended tracks
-            /// </summary>
+            /// <summary>Block allocation map for Dolphin DOS extended tracks</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 20)]
             public readonly byte[] dolphinBam;
-            /// <summary>
-            ///     Block allocation map for Speed DOS extended tracks
-            /// </summary>
+            /// <summary>Block allocation map for Speed DOS extended tracks</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 20)]
             public readonly byte[] speedBam;
-            /// <summary>
-            ///     Unused
-            /// </summary>
+            /// <summary>Unused</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 9)]
             public readonly byte[] unused2;
-            /// <summary>
-            ///     Free sector count for second side in 1571
-            /// </summary>
+            /// <summary>Free sector count for second side in 1571</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 9)]
             public readonly byte[] freeCount;
         }
@@ -218,50 +212,28 @@ namespace Aaru.Filesystems
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct CommodoreHeader
         {
-            /// <summary>
-            ///     Track where directory starts
-            /// </summary>
+            /// <summary>Track where directory starts</summary>
             public readonly byte directoryTrack;
-            /// <summary>
-            ///     Sector where directory starts
-            /// </summary>
+            /// <summary>Sector where directory starts</summary>
             public readonly byte directorySector;
-            /// <summary>
-            ///     Disk DOS version, 0x44
-            /// </summary>
+            /// <summary>Disk DOS version, 0x44</summary>
             public readonly byte diskDosVersion;
-            /// <summary>
-            ///     Unusued
-            /// </summary>
+            /// <summary>Unusued</summary>
             public readonly byte unused1;
-            /// <summary>
-            ///     Disk name
-            /// </summary>
+            /// <summary>Disk name</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
             public readonly byte[] name;
-            /// <summary>
-            ///     Filled with 0xA0
-            /// </summary>
+            /// <summary>Filled with 0xA0</summary>
             public readonly ushort fill1;
-            /// <summary>
-            ///     Disk ID
-            /// </summary>
+            /// <summary>Disk ID</summary>
             public readonly ushort diskId;
-            /// <summary>
-            ///     Filled with 0xA0
-            /// </summary>
+            /// <summary>Filled with 0xA0</summary>
             public readonly byte fill2;
-            /// <summary>
-            ///     DOS version ('3')
-            /// </summary>
+            /// <summary>DOS version ('3')</summary>
             public readonly byte dosVersion;
-            /// <summary>
-            ///     Disk version ('D')
-            /// </summary>
+            /// <summary>Disk version ('D')</summary>
             public readonly byte diskVersion;
-            /// <summary>
-            ///     Filled with 0xA0
-            /// </summary>
+            /// <summary>Filled with 0xA0</summary>
             public readonly short fill3;
         }
     }
diff --git a/Aaru.Filesystems/CPM/CPM.cs b/Aaru.Filesystems/CPM/CPM.cs
index 25e904b86..ab0903bfa 100644
--- a/Aaru.Filesystems/CPM/CPM.cs
+++ b/Aaru.Filesystems/CPM/CPM.cs
@@ -40,77 +40,45 @@ using Schemas;
 
 namespace Aaru.Filesystems.CPM
 {
-    partial class CPM : IReadOnlyFilesystem
+    internal partial class CPM : IReadOnlyFilesystem
     {
-        /// <summary>
-        ///     True if <see cref="Identify" /> thinks this is a CP/M filesystem
-        /// </summary>
+        /// <summary>True if <see cref="Identify" /> thinks this is a CP/M filesystem</summary>
         bool cpmFound;
 
-        /// <summary>
-        ///     Cached <see cref="FileSystemInfo" />
-        /// </summary>
+        /// <summary>Cached <see cref="FileSystemInfo" /></summary>
         FileSystemInfo cpmStat;
 
-        /// <summary>
-        ///     Cached file passwords, decoded
-        /// </summary>
+        /// <summary>Cached file passwords, decoded</summary>
         Dictionary<string, byte[]> decodedPasswordCache;
 
-        /// <summary>
-        ///     Stores all known CP/M disk definitions
-        /// </summary>
+        /// <summary>Stores all known CP/M disk definitions</summary>
         CpmDefinitions definitions;
         IMediaImage device;
-        /// <summary>
-        ///     Cached directory listing
-        /// </summary>
+        /// <summary>Cached directory listing</summary>
         List<string> dirList;
-        /// <summary>
-        ///     CP/M disc parameter block (on-memory)
-        /// </summary>
+        /// <summary>CP/M disc parameter block (on-memory)</summary>
         DiscParameterBlock dpb;
-        /// <summary>
-        ///     Cached file data
-        /// </summary>
+        /// <summary>Cached file data</summary>
         Dictionary<string, byte[]> fileCache;
-        /// <summary>
-        ///     The volume label, if the CP/M filesystem contains one
-        /// </summary>
+        /// <summary>The volume label, if the CP/M filesystem contains one</summary>
         string label;
-        /// <summary>
-        ///     Timestamp in volume label for creation
-        /// </summary>
+        /// <summary>Timestamp in volume label for creation</summary>
         byte[] labelCreationDate;
-        /// <summary>
-        ///     Timestamp in volume label for update
-        /// </summary>
+        /// <summary>Timestamp in volume label for update</summary>
         byte[] labelUpdateDate;
         bool      mounted;
         Partition partition;
-        /// <summary>
-        ///     Cached file passwords
-        /// </summary>
+        /// <summary>Cached file passwords</summary>
         Dictionary<string, byte[]> passwordCache;
-        /// <summary>
-        ///     Sector deinterleaving mask
-        /// </summary>
+        /// <summary>Sector deinterleaving mask</summary>
         int[] sectorMask;
-        /// <summary>
-        ///     True if there are CP/M 3 timestamps
-        /// </summary>
+        /// <summary>True if there are CP/M 3 timestamps</summary>
         bool standardTimestamps;
-        /// <summary>
-        ///     Cached file <see cref="FileEntryInfo" />
-        /// </summary>
+        /// <summary>Cached file <see cref="FileEntryInfo" /></summary>
         Dictionary<string, FileEntryInfo> statCache;
-        /// <summary>
-        ///     True if there are timestamps in Z80DOS or DOS+ format
-        /// </summary>
+        /// <summary>True if there are timestamps in Z80DOS or DOS+ format</summary>
         bool thirdPartyTimestamps;
-        /// <summary>
-        ///     If <see cref="Identify" /> thinks this is a CP/M filesystem, this is the definition for it
-        /// </summary>
+        /// <summary>If <see cref="Identify" /> thinks this is a CP/M filesystem, this is the definition for it</summary>
         CpmDefinition workingDefinition;
 
         public FileSystemType XmlFsType { get; private set; }
@@ -120,11 +88,16 @@ namespace Aaru.Filesystems.CPM
         public string         Author    => "Natalia Portillo";
 
         public IEnumerable<(string name, Type type, string description)> SupportedOptions =>
-            new (string name, Type type, string description)[] { };
+            new (string name, Type type, string description)[]
+                {};
 
         public Dictionary<string, string> Namespaces => null;
 
-        static Dictionary<string, string> GetDefaultOptions() =>
-            new Dictionary<string, string> {{"debug", false.ToString()}};
+        static Dictionary<string, string> GetDefaultOptions() => new Dictionary<string, string>
+        {
+            {
+                "debug", false.ToString()
+            }
+        };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/CPM/Consts.cs b/Aaru.Filesystems/CPM/Consts.cs
index b5c687d1d..f94398bc3 100644
--- a/Aaru.Filesystems/CPM/Consts.cs
+++ b/Aaru.Filesystems/CPM/Consts.cs
@@ -32,52 +32,30 @@
 
 namespace Aaru.Filesystems.CPM
 {
-    partial class CPM
+    internal partial class CPM
     {
-        /// <summary>
-        ///     Enumerates the format identification byte used by CP/M-86
-        /// </summary>
+        /// <summary>Enumerates the format identification byte used by CP/M-86</summary>
         enum FormatByte : byte
         {
-            /// <summary>
-            ///     5.25" double-density single-side 8 sectors/track
-            /// </summary>
+            /// <summary>5.25" double-density single-side 8 sectors/track</summary>
             k160 = 0,
-            /// <summary>
-            ///     5.25" double-density double-side 8 sectors/track
-            /// </summary>
+            /// <summary>5.25" double-density double-side 8 sectors/track</summary>
             k320 = 1,
-            /// <summary>
-            ///     5.25" double-density double-side 9 sectors/track
-            /// </summary>
+            /// <summary>5.25" double-density double-side 9 sectors/track</summary>
             k360 = 0x10,
-            /// <summary>
-            ///     5.25" double-density double-side 9 sectors/track
-            /// </summary>
+            /// <summary>5.25" double-density double-side 9 sectors/track</summary>
             k360Alt = 0x40,
-            /// <summary>
-            ///     3.5" double-density double-side 9 sectors/track
-            /// </summary>
+            /// <summary>3.5" double-density double-side 9 sectors/track</summary>
             k720 = 0x11,
-            /// <summary>
-            ///     3.5" double-density double-side 9 sectors/track using FEAT144
-            /// </summary>
+            /// <summary>3.5" double-density double-side 9 sectors/track using FEAT144</summary>
             f720 = 0x48,
-            /// <summary>
-            ///     5.25" high-density double-side 15 sectors/track using FEAT144
-            /// </summary>
+            /// <summary>5.25" high-density double-side 15 sectors/track using FEAT144</summary>
             f1200 = 0x0C,
-            /// <summary>
-            ///     3.5" high-density double-side 18 sectors/track using FEAT144
-            /// </summary>
+            /// <summary>3.5" high-density double-side 18 sectors/track using FEAT144</summary>
             f1440 = 0x90,
-            /// <summary>
-            ///     5.25" double-density double-side 9 sectors/track
-            /// </summary>
+            /// <summary>5.25" double-density double-side 9 sectors/track</summary>
             k360Alt2 = 0x26,
-            /// <summary>
-            ///     3.5" double-density double-side 9 sectors/track
-            /// </summary>
+            /// <summary>3.5" double-density double-side 9 sectors/track</summary>
             k720Alt = 0x94
         }
     }
diff --git a/Aaru.Filesystems/CPM/Definitions.cs b/Aaru.Filesystems/CPM/Definitions.cs
index 4942b17b8..138a0def9 100644
--- a/Aaru.Filesystems/CPM/Definitions.cs
+++ b/Aaru.Filesystems/CPM/Definitions.cs
@@ -38,21 +38,20 @@ using System.Xml.Serialization;
 
 namespace Aaru.Filesystems.CPM
 {
-    partial class CPM
+    internal partial class CPM
     {
-        /// <summary>
-        ///     Loads all the known CP/M disk definitions from an XML stored as an embedded resource.
-        /// </summary>
+        /// <summary>Loads all the known CP/M disk definitions from an XML stored as an embedded resource.</summary>
         /// <returns>The definitions.</returns>
         bool LoadDefinitions()
         {
             try
             {
-                XmlReader defsReader =
-                    XmlReader.Create(Assembly.GetExecutingAssembly()
-                                             .GetManifestResourceStream("Aaru.Filesystems.CPM.cpmdefs.xml") ??
+                var defsReader =
+                    XmlReader.Create(Assembly.GetExecutingAssembly().
+                                              GetManifestResourceStream("Aaru.Filesystems.CPM.cpmdefs.xml") ??
                                      throw new InvalidOperationException());
-                XmlSerializer defsSerializer = new XmlSerializer(typeof(CpmDefinitions));
+
+                var defsSerializer = new XmlSerializer(typeof(CpmDefinitions));
                 definitions = (CpmDefinitions)defsSerializer.Deserialize(defsReader);
 
                 // Patch definitions
@@ -60,151 +59,108 @@ namespace Aaru.Filesystems.CPM
                 {
                     if(def.side1 == null)
                     {
-                        def.side1 = new Side {sideId = 0, sectorIds = new int[def.sectorsPerTrack]};
-                        for(int i = 0; i < def.sectorsPerTrack; i++) def.side1.sectorIds[i] = i + 1;
+                        def.side1 = new Side
+                        {
+                            sideId = 0, sectorIds = new int[def.sectorsPerTrack]
+                        };
+
+                        for(int i = 0; i < def.sectorsPerTrack; i++)
+                            def.side1.sectorIds[i] = i + 1;
                     }
 
-                    if(def.sides != 2 || def.side2 != null) continue;
+                    if(def.sides != 2 ||
+                       def.side2 != null)
+                        continue;
 
                     {
-                        def.side2 = new Side {sideId = 1, sectorIds = new int[def.sectorsPerTrack]};
-                        for(int i = 0; i < def.sectorsPerTrack; i++) def.side2.sectorIds[i] = i + 1;
+                        def.side2 = new Side
+                        {
+                            sideId = 1, sectorIds = new int[def.sectorsPerTrack]
+                        };
+
+                        for(int i = 0; i < def.sectorsPerTrack; i++)
+                            def.side2.sectorIds[i] = i + 1;
                     }
                 }
 
                 return true;
             }
-            catch { return false; }
+            catch
+            {
+                return false;
+            }
         }
     }
 
-    /// <summary>
-    ///     CP/M disk definitions
-    /// </summary>
+    /// <summary>CP/M disk definitions</summary>
     public class CpmDefinitions
     {
-        /// <summary>
-        ///     Timestamp of creation of the CP/M disk definitions list
-        /// </summary>
+        /// <summary>Timestamp of creation of the CP/M disk definitions list</summary>
         public DateTime creation;
-        /// <summary>
-        ///     List of all CP/M disk definitions
-        /// </summary>
+        /// <summary>List of all CP/M disk definitions</summary>
         public List<CpmDefinition> definitions;
     }
 
-    /// <summary>
-    ///     CP/M disk definition
-    /// </summary>
+    /// <summary>CP/M disk definition</summary>
     public class CpmDefinition
     {
-        /// <summary>
-        ///     Maps the first 16 allocation blocks for reservation, high byte
-        /// </summary>
+        /// <summary>Maps the first 16 allocation blocks for reservation, high byte</summary>
         public int al0;
-        /// <summary>
-        ///     Maps the first 16 allocation blocks for reservation, low byte
-        /// </summary>
+        /// <summary>Maps the first 16 allocation blocks for reservation, low byte</summary>
         public int al1;
-        /// <summary>
-        ///     Controller bitrate
-        /// </summary>
+        /// <summary>Controller bitrate</summary>
         public string bitrate;
-        /// <summary>
-        ///     Block mask for <see cref="bsh" />
-        /// </summary>
+        /// <summary>Block mask for <see cref="bsh" /></summary>
         public int blm;
-        /// <summary>
-        ///     Left shifts needed to translate allocation block number to lba
-        /// </summary>
+        /// <summary>Left shifts needed to translate allocation block number to lba</summary>
         public int bsh;
-        /// <summary>
-        ///     Physical bytes per sector
-        /// </summary>
+        /// <summary>Physical bytes per sector</summary>
         public int bytesPerSector;
-        /// <summary>
-        ///     Comment and description
-        /// </summary>
+        /// <summary>Comment and description</summary>
         public string comment;
-        /// <summary>
-        ///     If true, all bytes written on disk are negated
-        /// </summary>
+        /// <summary>If true, all bytes written on disk are negated</summary>
         public bool complement;
-        /// <summary>
-        ///     Total cylinders
-        /// </summary>
+        /// <summary>Total cylinders</summary>
         public int cylinders;
-        /// <summary>
-        ///     Total number of available directory entries
-        /// </summary>
+        /// <summary>Total number of available directory entries</summary>
         public int drm;
-        /// <summary>
-        ///     Total number of 128 byte records on disk
-        /// </summary>
+        /// <summary>Total number of 128 byte records on disk</summary>
         public int dsm;
-        /// <summary>
-        ///     Encoding, "FM", "MFM", "GCR"
-        /// </summary>
+        /// <summary>Encoding, "FM", "MFM", "GCR"</summary>
         public string encoding;
-        /// <summary>
-        ///     Absolutely unknown?
-        /// </summary>
+        /// <summary>Absolutely unknown?</summary>
         public bool evenOdd;
-        /// <summary>
-        ///     Extent mask
-        /// </summary>
+        /// <summary>Extent mask</summary>
         public int exm;
-        /// <summary>
-        ///     Disk definition label
-        /// </summary>
+        /// <summary>Disk definition label</summary>
         public string label;
-        /// <summary>
-        ///     Tracks at the beginning of disk reserved for BIOS/BDOS
-        /// </summary>
+        /// <summary>Tracks at the beginning of disk reserved for BIOS/BDOS</summary>
         public int ofs;
         /// <summary>
-        ///     Cylinder/side ordering. SIDES = change side after each track, CYLINDERS = change side after whole side, EAGLE and
-        ///     COLUMBIA unknown
+        ///     Cylinder/side ordering. SIDES = change side after each track, CYLINDERS = change side after whole side, EAGLE
+        ///     and COLUMBIA unknown
         /// </summary>
         public string order;
-        /// <summary>
-        ///     Physical sectors per side
-        /// </summary>
+        /// <summary>Physical sectors per side</summary>
         public int sectorsPerTrack;
-        /// <summary>
-        ///     Description of controller's side 0 (usually, upper side)
-        /// </summary>
+        /// <summary>Description of controller's side 0 (usually, upper side)</summary>
         public Side side1;
-        /// <summary>
-        ///     Description of controller's side 1 (usually, lower side)
-        /// </summary>
+        /// <summary>Description of controller's side 1 (usually, lower side)</summary>
         public Side side2;
-        /// <summary>
-        ///     Total sides
-        /// </summary>
+        /// <summary>Total sides</summary>
         public int sides;
-        /// <summary>
-        ///     Physical sector interleaving
-        /// </summary>
+        /// <summary>Physical sector interleaving</summary>
         public int skew;
-        /// <summary>
-        ///     Sectors at the beginning of disk reserved for BIOS/BDOS
-        /// </summary>
+        /// <summary>Sectors at the beginning of disk reserved for BIOS/BDOS</summary>
         public int sofs;
     }
 
-    /// <summary>
-    ///     Side descriptions
-    /// </summary>
+    /// <summary>Side descriptions</summary>
     public class Side
     {
-        /// <summary>
-        ///     Software interleaving mask, [1,3,0,2] means CP/M LBA 0 is physical sector 1, LBA 1 = 3, so on
-        /// </summary>
+        /// <summary>Software interleaving mask, [1,3,0,2] means CP/M LBA 0 is physical sector 1, LBA 1 = 3, so on</summary>
         public int[] sectorIds;
-        /// <summary>
-        ///     Side ID as found in each sector address mark
-        /// </summary>
+        /// <summary>Side ID as found in each sector address mark</summary>
         public int sideId;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/CPM/Dir.cs b/Aaru.Filesystems/CPM/Dir.cs
index 779f34ae0..c3bebd470 100644
--- a/Aaru.Filesystems/CPM/Dir.cs
+++ b/Aaru.Filesystems/CPM/Dir.cs
@@ -38,14 +38,17 @@ using Aaru.Helpers;
 
 namespace Aaru.Filesystems.CPM
 {
-    partial class CPM
+    internal partial class CPM
     {
         public Errno ReadDir(string path, out List<string> contents)
         {
             contents = null;
-            if(!mounted) return Errno.AccessDenied;
 
-            if(!string.IsNullOrEmpty(path) && string.Compare(path, "/", StringComparison.OrdinalIgnoreCase) != 0)
+            if(!mounted)
+                return Errno.AccessDenied;
+
+            if(!string.IsNullOrEmpty(path) &&
+               string.Compare(path, "/", StringComparison.OrdinalIgnoreCase) != 0)
                 return Errno.NotSupported;
 
             contents = new List<string>(dirList);
@@ -54,10 +57,9 @@ namespace Aaru.Filesystems.CPM
         }
 
         /// <summary>
-        ///     Checks that the given directory blocks follow the CP/M filesystem directory specification
-        ///     Corrupted directories will fail.
-        ///     FAT firectories will false positive if all files start with 0x05, and do not use full extentions, for example:
-        ///     "σAFILE.GZ" (using code page 437)
+        ///     Checks that the given directory blocks follow the CP/M filesystem directory specification Corrupted
+        ///     directories will fail. FAT firectories will false positive if all files start with 0x05, and do not use full
+        ///     extentions, for example: "σAFILE.GZ" (using code page 437)
         /// </summary>
         /// <returns>False if the directory does not follow the directory specification</returns>
         /// <param name="directory">Directory blocks.</param>
@@ -65,7 +67,8 @@ namespace Aaru.Filesystems.CPM
         {
             try
             {
-                if(directory == null) return false;
+                if(directory == null)
+                    return false;
 
                 int fileCount = 0;
 
@@ -76,30 +79,35 @@ namespace Aaru.Filesystems.CPM
                     if((entry.statusUser & 0x7F) < 0x20)
                     {
                         for(int f = 0; f < 8; f++)
-                            if(entry.filename[f] < 0x20 && entry.filename[f] != 0x00)
+                            if(entry.filename[f] < 0x20 &&
+                               entry.filename[f] != 0x00)
                                 return false;
 
                         for(int e = 0; e < 3; e++)
-                            if(entry.extension[e] < 0x20 && entry.extension[e] != 0x00)
+                            if(entry.extension[e] < 0x20 &&
+                               entry.extension[e] != 0x00)
                                 return false;
 
-                        if(!ArrayHelpers.ArrayIsNullOrWhiteSpace(entry.filename)) fileCount++;
+                        if(!ArrayHelpers.ArrayIsNullOrWhiteSpace(entry.filename))
+                            fileCount++;
                     }
                     else if(entry.statusUser == 0x20)
                     {
                         for(int f = 0; f < 8; f++)
-                            if(entry.filename[f] < 0x20 && entry.filename[f] != 0x00)
+                            if(entry.filename[f] < 0x20 &&
+                               entry.filename[f] != 0x00)
                                 return false;
 
                         for(int e = 0; e < 3; e++)
-                            if(entry.extension[e] < 0x20 && entry.extension[e] != 0x00)
+                            if(entry.extension[e] < 0x20 &&
+                               entry.extension[e] != 0x00)
                                 return false;
 
                         label             = Encoding.ASCII.GetString(directory, off + 1, 11).Trim();
                         labelCreationDate = new byte[4];
                         labelUpdateDate   = new byte[4];
                         Array.Copy(directory, off + 24, labelCreationDate, 0, 4);
-                        Array.Copy(directory, off + 28, labelUpdateDate,   0, 4);
+                        Array.Copy(directory, off + 28, labelUpdateDate, 0, 4);
                     }
                     else if(entry.statusUser == 0x21)
                         if(directory[off + 1] == 0x00)
@@ -110,7 +118,10 @@ namespace Aaru.Filesystems.CPM
 
                 return fileCount > 0;
             }
-            catch { return false; }
+            catch
+            {
+                return false;
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/CPM/File.cs b/Aaru.Filesystems/CPM/File.cs
index 4f2e8c5a2..ea9b0b3c0 100644
--- a/Aaru.Filesystems/CPM/File.cs
+++ b/Aaru.Filesystems/CPM/File.cs
@@ -35,21 +35,29 @@ using Aaru.CommonTypes.Structs;
 
 namespace Aaru.Filesystems.CPM
 {
-    partial class CPM
+    internal partial class CPM
     {
         public Errno GetAttributes(string path, out FileAttributes attributes)
         {
             attributes = new FileAttributes();
-            if(!mounted) return Errno.AccessDenied;
 
-            string[] pathElements = path.Split(new[] {'/'}, StringSplitOptions.RemoveEmptyEntries);
-            if(pathElements.Length != 1) return Errno.NotSupported;
+            if(!mounted)
+                return Errno.AccessDenied;
+
+            string[] pathElements = path.Split(new[]
+            {
+                '/'
+            }, StringSplitOptions.RemoveEmptyEntries);
+
+            if(pathElements.Length != 1)
+                return Errno.NotSupported;
 
             if(string.IsNullOrEmpty(pathElements[0]) ||
                string.Compare(pathElements[0], "/", StringComparison.OrdinalIgnoreCase) == 0)
             {
                 attributes = new FileAttributes();
                 attributes = FileAttributes.Directory;
+
                 return Errno.NoError;
             }
 
@@ -57,6 +65,7 @@ namespace Aaru.Filesystems.CPM
                 return Errno.NoSuchFile;
 
             attributes = fInfo.Attributes;
+
             return Errno.NoError;
         }
 
@@ -64,57 +73,86 @@ namespace Aaru.Filesystems.CPM
         public Errno MapBlock(string path, long fileBlock, out long deviceBlock)
         {
             deviceBlock = 0;
+
             return !mounted ? Errno.AccessDenied : Errno.NotImplemented;
         }
 
         public Errno Read(string path, long offset, long size, ref byte[] buf)
         {
-            if(!mounted) return Errno.AccessDenied;
+            if(!mounted)
+                return Errno.AccessDenied;
 
             if(size == 0)
             {
                 buf = new byte[0];
+
                 return Errno.NoError;
             }
 
-            if(offset < 0) return Errno.InvalidArgument;
+            if(offset < 0)
+                return Errno.InvalidArgument;
 
-            string[] pathElements = path.Split(new[] {'/'}, StringSplitOptions.RemoveEmptyEntries);
-            if(pathElements.Length != 1) return Errno.NotSupported;
+            string[] pathElements = path.Split(new[]
+            {
+                '/'
+            }, StringSplitOptions.RemoveEmptyEntries);
 
-            if(!fileCache.TryGetValue(pathElements[0].ToUpperInvariant(), out byte[] file)) return Errno.NoSuchFile;
+            if(pathElements.Length != 1)
+                return Errno.NotSupported;
 
-            if(offset >= file.Length) return Errno.EINVAL;
+            if(!fileCache.TryGetValue(pathElements[0].ToUpperInvariant(), out byte[] file))
+                return Errno.NoSuchFile;
 
-            if(size + offset >= file.Length) size = file.Length - offset;
+            if(offset >= file.Length)
+                return Errno.EINVAL;
+
+            if(size + offset >= file.Length)
+                size = file.Length - offset;
 
             buf = new byte[size];
             Array.Copy(file, offset, buf, 0, size);
+
             return Errno.NoError;
         }
 
         public Errno ReadLink(string path, out string dest)
         {
             dest = null;
+
             return !mounted ? Errno.AccessDenied : Errno.NotSupported;
         }
 
         public Errno Stat(string path, out FileEntryInfo stat)
         {
             stat = null;
-            if(!mounted) return Errno.AccessDenied;
 
-            string[] pathElements = path.Split(new[] {'/'}, StringSplitOptions.RemoveEmptyEntries);
-            if(pathElements.Length != 1) return Errno.NotSupported;
+            if(!mounted)
+                return Errno.AccessDenied;
 
-            if(!string.IsNullOrEmpty(path) && string.Compare(path, "/", StringComparison.OrdinalIgnoreCase) != 0)
-                return statCache.TryGetValue(pathElements[0].ToUpperInvariant(), out stat)
-                           ? Errno.NoError
+            string[] pathElements = path.Split(new[]
+            {
+                '/'
+            }, StringSplitOptions.RemoveEmptyEntries);
+
+            if(pathElements.Length != 1)
+                return Errno.NotSupported;
+
+            if(!string.IsNullOrEmpty(path) &&
+               string.Compare(path, "/", StringComparison.OrdinalIgnoreCase) != 0)
+                return statCache.TryGetValue(pathElements[0].ToUpperInvariant(), out stat) ? Errno.NoError
                            : Errno.NoSuchFile;
 
-            stat = new FileEntryInfo {Attributes = FileAttributes.Directory, BlockSize = XmlFsType.ClusterSize};
-            if(labelCreationDate != null) stat.CreationTime     = DateHandlers.CpmToDateTime(labelCreationDate);
-            if(labelUpdateDate   != null) stat.StatusChangeTime = DateHandlers.CpmToDateTime(labelUpdateDate);
+            stat = new FileEntryInfo
+            {
+                Attributes = FileAttributes.Directory, BlockSize = XmlFsType.ClusterSize
+            };
+
+            if(labelCreationDate != null)
+                stat.CreationTime = DateHandlers.CpmToDateTime(labelCreationDate);
+
+            if(labelUpdateDate != null)
+                stat.StatusChangeTime = DateHandlers.CpmToDateTime(labelUpdateDate);
+
             return Errno.NoError;
         }
     }
diff --git a/Aaru.Filesystems/CPM/Info.cs b/Aaru.Filesystems/CPM/Info.cs
index 745c57f65..d07fb94d8 100644
--- a/Aaru.Filesystems/CPM/Info.cs
+++ b/Aaru.Filesystems/CPM/Info.cs
@@ -42,7 +42,7 @@ using Schemas;
 
 namespace Aaru.Filesystems.CPM
 {
-    partial class CPM
+    internal partial class CPM
     {
         public bool Identify(IMediaImage imagePlugin, Partition partition)
         {
@@ -177,16 +177,19 @@ namespace Aaru.Filesystems.CPM
                     uint sig3 = BitConverter.ToUInt32(sector, 0x7C);
 
                     // PCW16 extended boot record
-                    if(sig1 == 0x4D2F5043 && sig2 == 0x004B5344 && sig3 == sig1) amsSbOffset = 0x80;
+                    if(sig1 == 0x4D2F5043 &&
+                       sig2 == 0x004B5344 &&
+                       sig3 == sig1)
+                        amsSbOffset = 0x80;
 
                     // Read the superblock
                     AmstradSuperBlock amsSb =
                         Marshal.ByteArrayToStructureLittleEndian<AmstradSuperBlock>(sector, amsSbOffset, 16);
 
                     // Check that format byte and sidedness indicate the same number of sizes
-                    if(amsSb.format == 0 && (amsSb.sidedness & 0x02) == 0 ||
-                       amsSb.format == 2 && (amsSb.sidedness & 0x02) == 1 ||
-                       amsSb.format == 2 && (amsSb.sidedness & 0x02) == 2)
+                    if((amsSb.format == 0 && (amsSb.sidedness & 0x02) == 0) ||
+                       (amsSb.format == 2 && (amsSb.sidedness & 0x02) == 1) ||
+                       (amsSb.format == 2 && (amsSb.sidedness & 0x02) == 2))
                     {
                         // Calculate device limits
                         ulong sides       = (ulong)(amsSb.format == 0 ? 1 : 2);
@@ -194,7 +197,8 @@ namespace Aaru.Filesystems.CPM
                         sectorSize = (ulong)(128 << amsSb.psh);
 
                         // Compare device limits from superblock to real limits
-                        if(sectorSize == imagePlugin.Info.SectorSize && sectorCount == imagePlugin.Info.Sectors)
+                        if(sectorSize  == imagePlugin.Info.SectorSize &&
+                           sectorCount == imagePlugin.Info.Sectors)
                         {
                             cpmFound             = true;
                             firstDirectorySector = (ulong)(amsSb.off * amsSb.spt);
@@ -202,11 +206,11 @@ namespace Aaru.Filesystems.CPM
                             // Build a DiscParameterBlock
                             dpb = new DiscParameterBlock
                             {
-                                al0 = sectorCount == 1440 ? (byte)0xF0 : (byte)0xC0,
-                                spt = amsSb.spt,
-                                bsh = amsSb.bsh
+                                al0 = sectorCount == 1440 ? (byte)0xF0 : (byte)0xC0, spt = amsSb.spt, bsh = amsSb.bsh
                             };
-                            for(int i = 0; i < dpb.bsh; i++) dpb.blm += (byte)Math.Pow(2, i);
+
+                            for(int i = 0; i < dpb.bsh; i++)
+                                dpb.blm += (byte)Math.Pow(2, i);
 
                             if(sectorCount >= 1440)
                             {
@@ -223,36 +227,34 @@ namespace Aaru.Filesystems.CPM
                             dpb.exm = sectorCount == 2880 ? (byte)1 : (byte)0;
                             dpb.off = amsSb.off;
                             dpb.psh = amsSb.psh;
-                            for(int i = 0; i < dpb.psh; i++) dpb.phm += (byte)Math.Pow(2, i);
 
-                            dpb.spt = (ushort)(amsSb.spt * (sectorSize              / 128));
-                            uint directoryLength = (uint)(((ulong)dpb.drm + 1) * 32 / sectorSize);
+                            for(int i = 0; i < dpb.psh; i++)
+                                dpb.phm += (byte)Math.Pow(2, i);
+
+                            dpb.spt = (ushort)(amsSb.spt * (sectorSize                / 128));
+                            uint directoryLength = (uint)((((ulong)dpb.drm + 1) * 32) / sectorSize);
+
                             directory = imagePlugin.ReadSectors(firstDirectorySector + partition.Start,
                                                                 directoryLength);
 
                             // Build a CP/M disk definition
                             workingDefinition = new CpmDefinition
                             {
-                                al0             = dpb.al0,
-                                al1             = dpb.al1,
-                                bitrate         = "LOW",
+                                al0             = dpb.al0, al1 = dpb.al1, bitrate = "LOW",
                                 blm             = dpb.blm,
-                                bsh             = dpb.bsh,
-                                bytesPerSector  = 512,
-                                cylinders       = amsSb.tps,
+                                bsh             = dpb.bsh, bytesPerSector = 512, cylinders = amsSb.tps,
                                 drm             = dpb.drm,
-                                dsm             = dpb.dsm,
-                                encoding        = "MFM",
-                                evenOdd         = false,
+                                dsm             = dpb.dsm, encoding = "MFM", evenOdd = false,
                                 exm             = dpb.exm,
-                                label           = null,
-                                comment         = "Amstrad PCW superblock",
-                                ofs             = dpb.off,
-                                sectorsPerTrack = amsSb.spt,
-                                side1           = new Side {sideId = 0, sectorIds = new int[amsSb.spt]}
+                                label           = null, comment = "Amstrad PCW superblock", ofs = dpb.off,
+                                sectorsPerTrack = amsSb.spt, side1 = new Side
+                                {
+                                    sideId = 0, sectorIds = new int[amsSb.spt]
+                                }
                             };
 
-                            for(int si = 0; si < amsSb.spt; si++) workingDefinition.side1.sectorIds[si] = si + 1;
+                            for(int si = 0; si < amsSb.spt; si++)
+                                workingDefinition.side1.sectorIds[si] = si + 1;
 
                             if(amsSb.format == 2)
                             {
@@ -260,19 +262,28 @@ namespace Aaru.Filesystems.CPM
                                 {
                                     case 1:
                                         workingDefinition.order = "SIDES";
+
                                         break;
                                     case 2:
                                         workingDefinition.order = "CYLINDERS";
+
                                         break;
                                     default:
                                         workingDefinition.order = null;
+
                                         break;
                                 }
 
-                                workingDefinition.side2 = new Side {sideId = 1, sectorIds = new int[amsSb.spt]};
-                                for(int si = 0; si < amsSb.spt; si++) workingDefinition.side2.sectorIds[si] = si + 1;
+                                workingDefinition.side2 = new Side
+                                {
+                                    sideId = 1, sectorIds = new int[amsSb.spt]
+                                };
+
+                                for(int si = 0; si < amsSb.spt; si++)
+                                    workingDefinition.side2.sectorIds[si] = si + 1;
                             }
-                            else workingDefinition.order = null;
+                            else
+                                workingDefinition.order = null;
 
                             workingDefinition.skew = 2;
                             workingDefinition.sofs = 0;
@@ -290,7 +301,8 @@ namespace Aaru.Filesystems.CPM
                     ushort sum = 0;
 
                     // Sum of all 16-bit words that make this sector must be 0
-                    for(int i = 0; i < sector.Length; i += 2) sum += BitConverter.ToUInt16(sector, i);
+                    for(int i = 0; i < sector.Length; i += 2)
+                        sum += BitConverter.ToUInt16(sector, i);
 
                     // It may happen that there is a corrupted superblock
                     // Better to ignore corrupted than to false positive the rest
@@ -302,8 +314,9 @@ namespace Aaru.Filesystems.CPM
                         // Calculate volume size
                         sectorSize = (ulong)(hddSb.recordsPerSector * 128);
                         ulong sectorsInPartition = (ulong)(hddSb.cylinders * hddSb.heads * hddSb.sectorsPerTrack);
+
                         ulong startingSector =
-                            (ulong)((hddSb.firstCylinder * hddSb.heads + hddSb.heads) * hddSb.sectorsPerTrack);
+                            (ulong)(((hddSb.firstCylinder * hddSb.heads) + hddSb.heads) * hddSb.sectorsPerTrack);
 
                         // If volume size corresponds with working partition (this variant will be inside MBR partitioning)
                         if(sectorSize                           == imagePlugin.Info.SectorSize &&
@@ -316,56 +329,51 @@ namespace Aaru.Filesystems.CPM
                             // Build a DiscParameterBlock
                             dpb = new DiscParameterBlock
                             {
-                                al0 = (byte)hddSb.al0,
-                                al1 = (byte)hddSb.al1,
-                                blm = hddSb.blm,
-                                bsh = hddSb.bsh,
-                                cks = hddSb.cks,
-                                drm = hddSb.drm,
-                                dsm = hddSb.dsm,
-                                exm = hddSb.exm,
+                                al0 = (byte)hddSb.al0, al1 = (byte)hddSb.al1, blm = hddSb.blm, bsh = hddSb.bsh,
+                                cks = hddSb.cks, drm       = hddSb.drm, dsm       = hddSb.dsm, exm = hddSb.exm,
                                 off = hddSb.off,
+
                                 // Needed?
                                 phm = 0,
+
                                 // Needed?
-                                psh = 0,
-                                spt = hddSb.spt
+                                psh = 0, spt = hddSb.spt
                             };
 
-                            uint directoryLength = (uint)(((ulong)dpb.drm + 1) * 32 / sectorSize);
+                            uint directoryLength = (uint)((((ulong)dpb.drm + 1) * 32) / sectorSize);
+
                             directory = imagePlugin.ReadSectors(firstDirectorySector + partition.Start,
                                                                 directoryLength);
+
                             AaruConsole.DebugWriteLine("CP/M Plugin", "Found CP/M-86 hard disk superblock.");
 
                             // Build a CP/M disk definition
                             workingDefinition = new CpmDefinition
                             {
-                                al0             = dpb.al0,
-                                al1             = dpb.al1,
-                                bitrate         = "HIGH",
-                                blm             = dpb.blm,
-                                bsh             = dpb.bsh,
-                                bytesPerSector  = 512,
-                                cylinders       = hddSb.cylinders,
-                                drm             = dpb.drm,
-                                dsm             = dpb.dsm,
-                                encoding        = "MFM",
-                                evenOdd         = false,
+                                al0             = dpb.al0, al1            = dpb.al1,
+                                bitrate         = "HIGH", blm             = dpb.blm,
+                                bsh             = dpb.bsh, bytesPerSector = 512,
+                                cylinders       = hddSb.cylinders, drm    = dpb.drm,
+                                dsm             = dpb.dsm, encoding       = "MFM", evenOdd = false,
                                 exm             = dpb.exm,
-                                label           = null,
-                                comment         = "CP/M-86 hard disk superblock",
+                                label           = null, comment = "CP/M-86 hard disk superblock",
                                 ofs             = dpb.off,
-                                sectorsPerTrack = hddSb.sectorsPerTrack,
-                                side1           = new Side {sideId = 0, sectorIds = new int[hddSb.sectorsPerTrack]},
-                                order           = "SIDES",
-                                side2           = new Side {sideId = 1, sectorIds = new int[hddSb.sectorsPerTrack]},
-                                skew            = 0,
-                                sofs            = 0
+                                sectorsPerTrack = hddSb.sectorsPerTrack, side1 = new Side
+                                {
+                                    sideId = 0, sectorIds = new int[hddSb.sectorsPerTrack]
+                                },
+                                order = "SIDES", side2 = new Side
+                                {
+                                    sideId = 1, sectorIds = new int[hddSb.sectorsPerTrack]
+                                },
+                                skew = 0, sofs = 0
                             };
 
                             for(int si = 0; si < hddSb.sectorsPerTrack; si++)
                                 workingDefinition.side1.sectorIds[si] = si + 1;
-                            for(int si = 0; si < hddSb.spt; si++) workingDefinition.side2.sectorIds[si] = si + 1;
+
+                            for(int si = 0; si < hddSb.spt; si++)
+                                workingDefinition.side2.sectorIds[si] = si + 1;
                         }
                     }
                 }
@@ -378,10 +386,15 @@ namespace Aaru.Filesystems.CPM
                     byte formatByte;
 
                     // Check for alternate location of format ID
-                    if(sector.Last() == 0x00 || sector.Last() == 0xFF)
-                        if(sector[0x40] == 0x94 || sector[0x40] == 0x26) formatByte = sector[0x40];
-                        else formatByte                                             = sector.Last();
-                    else formatByte = sector.Last();
+                    if(sector.Last() == 0x00 ||
+                       sector.Last() == 0xFF)
+                        if(sector[0x40] == 0x94 ||
+                           sector[0x40] == 0x26)
+                            formatByte = sector[0x40];
+                        else
+                            formatByte = sector.Last();
+                    else
+                        formatByte = sector.Last();
 
                     uint firstDirectorySector86 = 0;
 
@@ -393,359 +406,300 @@ namespace Aaru.Filesystems.CPM
                     switch((FormatByte)formatByte)
                     {
                         case FormatByte.k160:
-                            if(imagePlugin.Info.SectorSize == 512 && imagePlugin.Info.Sectors == 320)
+                            if(imagePlugin.Info.SectorSize == 512 &&
+                               imagePlugin.Info.Sectors    == 320)
                             {
                                 cpmFound               = true;
                                 firstDirectorySector86 = 8;
+
                                 dpb = new DiscParameterBlock
                                 {
-                                    al0 = 0xC0,
-                                    al1 = 0,
-                                    blm = 7,
-                                    bsh = 3,
-                                    cks = 0x10,
-                                    drm = 0x3F,
-                                    dsm = 0x9B,
-                                    exm = 0,
-                                    off = 1,
-                                    phm = 3,
-                                    psh = 2,
-                                    spt = 8 * 4
+                                    al0 = 0xC0, al1 = 0, blm    = 7, bsh    = 3,
+                                    cks = 0x10, drm = 0x3F, dsm = 0x9B, exm = 0,
+                                    off = 1, phm    = 3, psh    = 2, spt    = 8 * 4
                                 };
 
                                 workingDefinition = new CpmDefinition
                                 {
-                                    al0             = dpb.al0,
-                                    al1             = dpb.al1,
-                                    bitrate         = "LOW",
-                                    blm             = dpb.blm,
-                                    bsh             = dpb.bsh,
-                                    bytesPerSector  = 512,
-                                    cylinders       = 40,
+                                    al0             = dpb.al0, al1            = dpb.al1,
+                                    bitrate         = "LOW", blm              = dpb.blm,
+                                    bsh             = dpb.bsh, bytesPerSector = 512, cylinders = 40,
                                     drm             = dpb.drm,
-                                    dsm             = dpb.dsm,
-                                    encoding        = "MFM",
-                                    evenOdd         = false,
-                                    exm             = dpb.exm,
-                                    label           = null,
-                                    comment         = "CP/M-86 floppy identifier",
+                                    dsm             = dpb.dsm, encoding = "MFM",
+                                    evenOdd         = false, exm        = dpb.exm,
+                                    label           = null, comment     = "CP/M-86 floppy identifier",
                                     ofs             = dpb.off,
-                                    sectorsPerTrack = 8,
-                                    side1           = new Side {sideId = 0, sectorIds = new int[8]},
-                                    skew            = 0,
-                                    sofs            = 0
+                                    sectorsPerTrack = 8, side1 = new Side
+                                    {
+                                        sideId = 0, sectorIds = new int[8]
+                                    },
+                                    skew = 0, sofs = 0
                                 };
 
-                                for(int si = 0; si < 8; si++) workingDefinition.side1.sectorIds[si] = si + 1;
+                                for(int si = 0; si < 8; si++)
+                                    workingDefinition.side1.sectorIds[si] = si + 1;
                             }
 
                             break;
                         case FormatByte.k320:
-                            if(imagePlugin.Info.SectorSize == 512 && imagePlugin.Info.Sectors == 640)
+                            if(imagePlugin.Info.SectorSize == 512 &&
+                               imagePlugin.Info.Sectors    == 640)
                             {
                                 cpmFound               = true;
                                 firstDirectorySector86 = 16;
+
                                 dpb = new DiscParameterBlock
                                 {
-                                    al0 = 0x80,
-                                    al1 = 0,
-                                    blm = 0x0F,
-                                    bsh = 4,
-                                    cks = 0x10,
-                                    drm = 0x3F,
-                                    dsm = 0x9D,
-                                    exm = 1,
-                                    off = 2,
-                                    phm = 3,
-                                    psh = 2,
-                                    spt = 8 * 4
+                                    al0 = 0x80, al1 = 0, blm    = 0x0F, bsh = 4,
+                                    cks = 0x10, drm = 0x3F, dsm = 0x9D, exm = 1,
+                                    off = 2, phm    = 3, psh    = 2, spt    = 8 * 4
                                 };
 
                                 workingDefinition = new CpmDefinition
                                 {
-                                    al0             = dpb.al0,
-                                    al1             = dpb.al1,
-                                    bitrate         = "LOW",
-                                    blm             = dpb.blm,
-                                    bsh             = dpb.bsh,
-                                    bytesPerSector  = 512,
-                                    cylinders       = 40,
+                                    al0             = dpb.al0, al1            = dpb.al1,
+                                    bitrate         = "LOW", blm              = dpb.blm,
+                                    bsh             = dpb.bsh, bytesPerSector = 512, cylinders = 40,
                                     drm             = dpb.drm,
-                                    dsm             = dpb.dsm,
-                                    encoding        = "MFM",
-                                    evenOdd         = false,
-                                    exm             = dpb.exm,
-                                    label           = null,
-                                    comment         = "CP/M-86 floppy identifier",
+                                    dsm             = dpb.dsm, encoding = "MFM",
+                                    evenOdd         = false, exm        = dpb.exm,
+                                    label           = null, comment     = "CP/M-86 floppy identifier",
                                     ofs             = dpb.off,
-                                    sectorsPerTrack = 8,
-                                    side1           = new Side {sideId = 0, sectorIds = new int[8]},
-                                    order           = "SIDES",
-                                    side2           = new Side {sideId = 1, sectorIds = new int[8]},
-                                    skew            = 0,
-                                    sofs            = 0
+                                    sectorsPerTrack = 8, side1 = new Side
+                                    {
+                                        sideId = 0, sectorIds = new int[8]
+                                    },
+                                    order = "SIDES", side2 = new Side
+                                    {
+                                        sideId = 1, sectorIds = new int[8]
+                                    },
+                                    skew = 0, sofs = 0
                                 };
 
-                                for(int si = 0; si < 8; si++) workingDefinition.side1.sectorIds[si] = si + 1;
-                                for(int si = 0; si < 8; si++) workingDefinition.side2.sectorIds[si] = si + 1;
+                                for(int si = 0; si < 8; si++)
+                                    workingDefinition.side1.sectorIds[si] = si + 1;
+
+                                for(int si = 0; si < 8; si++)
+                                    workingDefinition.side2.sectorIds[si] = si + 1;
                             }
 
                             break;
                         case FormatByte.k360:
                         case FormatByte.k360Alt:
                         case FormatByte.k360Alt2:
-                            if(imagePlugin.Info.SectorSize == 512 && imagePlugin.Info.Sectors == 720)
+                            if(imagePlugin.Info.SectorSize == 512 &&
+                               imagePlugin.Info.Sectors    == 720)
                             {
                                 cpmFound               = true;
                                 firstDirectorySector86 = 36;
+
                                 dpb = new DiscParameterBlock
                                 {
-                                    al0 = 0x80,
-                                    al1 = 0,
-                                    blm = 0x0F,
-                                    bsh = 4,
-                                    cks = 0x10,
-                                    drm = 0x3F,
-                                    dsm = 0, // Unknown. Needed?
-                                    exm = 1,
-                                    off = 4,
-                                    phm = 3,
-                                    psh = 2,
+                                    al0 = 0x80, al1 = 0, blm    = 0x0F, bsh = 4,
+                                    cks = 0x10, drm = 0x3F, dsm = 0, // Unknown. Needed?
+                                    exm = 1, off    = 4, phm    = 3, psh = 2,
                                     spt = 9 * 4
                                 };
 
                                 workingDefinition = new CpmDefinition
                                 {
-                                    al0             = dpb.al0,
-                                    al1             = dpb.al1,
-                                    bitrate         = "LOW",
-                                    blm             = dpb.blm,
-                                    bsh             = dpb.bsh,
-                                    bytesPerSector  = 512,
-                                    cylinders       = 40,
+                                    al0             = dpb.al0, al1            = dpb.al1,
+                                    bitrate         = "LOW", blm              = dpb.blm,
+                                    bsh             = dpb.bsh, bytesPerSector = 512, cylinders = 40,
                                     drm             = dpb.drm,
-                                    dsm             = dpb.dsm,
-                                    encoding        = "MFM",
-                                    evenOdd         = false,
-                                    exm             = dpb.exm,
-                                    label           = null,
-                                    comment         = "CP/M-86 floppy identifier",
+                                    dsm             = dpb.dsm, encoding = "MFM",
+                                    evenOdd         = false, exm        = dpb.exm,
+                                    label           = null, comment     = "CP/M-86 floppy identifier",
                                     ofs             = dpb.off,
-                                    sectorsPerTrack = 9,
-                                    side1           = new Side {sideId = 0, sectorIds = new int[9]},
-                                    order           = "SIDES",
-                                    side2           = new Side {sideId = 1, sectorIds = new int[9]},
-                                    skew            = 0,
-                                    sofs            = 0
+                                    sectorsPerTrack = 9, side1 = new Side
+                                    {
+                                        sideId = 0, sectorIds = new int[9]
+                                    },
+                                    order = "SIDES", side2 = new Side
+                                    {
+                                        sideId = 1, sectorIds = new int[9]
+                                    },
+                                    skew = 0, sofs = 0
                                 };
 
-                                for(int si = 0; si < 9; si++) workingDefinition.side1.sectorIds[si] = si + 1;
-                                for(int si = 0; si < 9; si++) workingDefinition.side2.sectorIds[si] = si + 1;
+                                for(int si = 0; si < 9; si++)
+                                    workingDefinition.side1.sectorIds[si] = si + 1;
+
+                                for(int si = 0; si < 9; si++)
+                                    workingDefinition.side2.sectorIds[si] = si + 1;
                             }
 
                             break;
                         case FormatByte.k720:
                         case FormatByte.k720Alt:
-                            if(imagePlugin.Info.SectorSize == 512 && imagePlugin.Info.Sectors == 1440)
+                            if(imagePlugin.Info.SectorSize == 512 &&
+                               imagePlugin.Info.Sectors    == 1440)
                             {
                                 cpmFound               = true;
                                 firstDirectorySector86 = 36;
+
                                 dpb = new DiscParameterBlock
                                 {
-                                    al0 = 0xF0,
-                                    al1 = 0,
-                                    blm = 0x0F,
-                                    bsh = 4,
-                                    cks = 0x40,
-                                    drm = 0xFF,
-                                    dsm = 0x15E,
-                                    exm = 0,
-                                    off = 4,
-                                    phm = 3,
-                                    psh = 2,
-                                    spt = 9 * 4
+                                    al0 = 0xF0, al1 = 0, blm    = 0x0F, bsh  = 4,
+                                    cks = 0x40, drm = 0xFF, dsm = 0x15E, exm = 0,
+                                    off = 4, phm    = 3, psh    = 2, spt     = 9 * 4
                                 };
 
                                 workingDefinition = new CpmDefinition
                                 {
-                                    al0             = dpb.al0,
-                                    al1             = dpb.al1,
-                                    bitrate         = "LOW",
-                                    blm             = dpb.blm,
-                                    bsh             = dpb.bsh,
-                                    bytesPerSector  = 512,
-                                    cylinders       = 80,
+                                    al0             = dpb.al0, al1            = dpb.al1,
+                                    bitrate         = "LOW", blm              = dpb.blm,
+                                    bsh             = dpb.bsh, bytesPerSector = 512, cylinders = 80,
                                     drm             = dpb.drm,
-                                    dsm             = dpb.dsm,
-                                    encoding        = "MFM",
-                                    evenOdd         = false,
-                                    exm             = dpb.exm,
-                                    label           = null,
-                                    comment         = "CP/M-86 floppy identifier",
+                                    dsm             = dpb.dsm, encoding = "MFM",
+                                    evenOdd         = false, exm        = dpb.exm,
+                                    label           = null, comment     = "CP/M-86 floppy identifier",
                                     ofs             = dpb.off,
-                                    sectorsPerTrack = 9,
-                                    side1           = new Side {sideId = 0, sectorIds = new int[9]},
-                                    order           = "SIDES",
-                                    side2           = new Side {sideId = 1, sectorIds = new int[9]},
-                                    skew            = 0,
-                                    sofs            = 0
+                                    sectorsPerTrack = 9, side1 = new Side
+                                    {
+                                        sideId = 0, sectorIds = new int[9]
+                                    },
+                                    order = "SIDES", side2 = new Side
+                                    {
+                                        sideId = 1, sectorIds = new int[9]
+                                    },
+                                    skew = 0, sofs = 0
                                 };
 
-                                for(int si = 0; si < 9; si++) workingDefinition.side1.sectorIds[si] = si + 1;
-                                for(int si = 0; si < 9; si++) workingDefinition.side2.sectorIds[si] = si + 1;
+                                for(int si = 0; si < 9; si++)
+                                    workingDefinition.side1.sectorIds[si] = si + 1;
+
+                                for(int si = 0; si < 9; si++)
+                                    workingDefinition.side2.sectorIds[si] = si + 1;
                             }
 
                             break;
                         case FormatByte.f720:
-                            if(imagePlugin.Info.SectorSize == 512 && imagePlugin.Info.Sectors == 1440)
+                            if(imagePlugin.Info.SectorSize == 512 &&
+                               imagePlugin.Info.Sectors    == 1440)
                             {
                                 cpmFound               = true;
                                 firstDirectorySector86 = 18;
+
                                 dpb = new DiscParameterBlock
                                 {
-                                    al0 = 0xF0,
-                                    al1 = 0,
-                                    blm = 0x0F,
-                                    bsh = 4,
-                                    cks = 0x40,
-                                    drm = 0xFF,
-                                    dsm = 0x162,
-                                    exm = 0,
-                                    off = 2,
-                                    phm = 3,
-                                    psh = 2,
-                                    spt = 9 * 4
+                                    al0 = 0xF0, al1 = 0, blm    = 0x0F, bsh  = 4,
+                                    cks = 0x40, drm = 0xFF, dsm = 0x162, exm = 0,
+                                    off = 2, phm    = 3, psh    = 2, spt     = 9 * 4
                                 };
 
                                 workingDefinition = new CpmDefinition
                                 {
-                                    al0             = dpb.al0,
-                                    al1             = dpb.al1,
-                                    bitrate         = "LOW",
-                                    blm             = dpb.blm,
-                                    bsh             = dpb.bsh,
-                                    bytesPerSector  = 512,
-                                    cylinders       = 80,
+                                    al0             = dpb.al0, al1            = dpb.al1,
+                                    bitrate         = "LOW", blm              = dpb.blm,
+                                    bsh             = dpb.bsh, bytesPerSector = 512, cylinders = 80,
                                     drm             = dpb.drm,
-                                    dsm             = dpb.dsm,
-                                    encoding        = "MFM",
-                                    evenOdd         = false,
-                                    exm             = dpb.exm,
-                                    label           = null,
-                                    comment         = "CP/M-86 floppy identifier",
+                                    dsm             = dpb.dsm, encoding = "MFM",
+                                    evenOdd         = false, exm        = dpb.exm,
+                                    label           = null, comment     = "CP/M-86 floppy identifier",
                                     ofs             = dpb.off,
-                                    sectorsPerTrack = 9,
-                                    side1           = new Side {sideId = 0, sectorIds = new int[9]},
-                                    order           = "CYLINDERS",
-                                    side2           = new Side {sideId = 1, sectorIds = new int[9]},
-                                    skew            = 0,
-                                    sofs            = 0
+                                    sectorsPerTrack = 9, side1 = new Side
+                                    {
+                                        sideId = 0, sectorIds = new int[9]
+                                    },
+                                    order = "CYLINDERS", side2 = new Side
+                                    {
+                                        sideId = 1, sectorIds = new int[9]
+                                    },
+                                    skew = 0, sofs = 0
                                 };
 
-                                for(int si = 0; si < 9; si++) workingDefinition.side1.sectorIds[si] = si + 1;
-                                for(int si = 0; si < 9; si++) workingDefinition.side2.sectorIds[si] = si + 1;
+                                for(int si = 0; si < 9; si++)
+                                    workingDefinition.side1.sectorIds[si] = si + 1;
+
+                                for(int si = 0; si < 9; si++)
+                                    workingDefinition.side2.sectorIds[si] = si + 1;
                             }
 
                             break;
                         case FormatByte.f1200:
-                            if(imagePlugin.Info.SectorSize == 512 && imagePlugin.Info.Sectors == 2400)
+                            if(imagePlugin.Info.SectorSize == 512 &&
+                               imagePlugin.Info.Sectors    == 2400)
                             {
                                 cpmFound               = true;
                                 firstDirectorySector86 = 30;
+
                                 dpb = new DiscParameterBlock
                                 {
-                                    al0 = 0xC0,
-                                    al1 = 0,
-                                    blm = 0x1F,
-                                    bsh = 5,
-                                    cks = 0x40,
-                                    drm = 0xFF,
-                                    dsm = 0x127,
-                                    exm = 1,
-                                    off = 2,
-                                    phm = 3,
-                                    psh = 2,
-                                    spt = 15 * 4
+                                    al0 = 0xC0, al1 = 0, blm    = 0x1F, bsh  = 5,
+                                    cks = 0x40, drm = 0xFF, dsm = 0x127, exm = 1,
+                                    off = 2, phm    = 3, psh    = 2, spt     = 15 * 4
                                 };
 
                                 workingDefinition = new CpmDefinition
                                 {
-                                    al0             = dpb.al0,
-                                    al1             = dpb.al1,
-                                    bitrate         = "HIGH",
-                                    blm             = dpb.blm,
-                                    bsh             = dpb.bsh,
-                                    bytesPerSector  = 512,
-                                    cylinders       = 80,
+                                    al0             = dpb.al0, al1            = dpb.al1,
+                                    bitrate         = "HIGH", blm             = dpb.blm,
+                                    bsh             = dpb.bsh, bytesPerSector = 512, cylinders = 80,
                                     drm             = dpb.drm,
-                                    dsm             = dpb.dsm,
-                                    encoding        = "MFM",
-                                    evenOdd         = false,
-                                    exm             = dpb.exm,
-                                    label           = null,
-                                    comment         = "CP/M-86 floppy identifier",
+                                    dsm             = dpb.dsm, encoding = "MFM",
+                                    evenOdd         = false, exm        = dpb.exm,
+                                    label           = null, comment     = "CP/M-86 floppy identifier",
                                     ofs             = dpb.off,
-                                    sectorsPerTrack = 15,
-                                    side1           = new Side {sideId = 0, sectorIds = new int[15]},
-                                    order           = "CYLINDERS",
-                                    side2           = new Side {sideId = 1, sectorIds = new int[15]},
-                                    skew            = 0,
-                                    sofs            = 0
+                                    sectorsPerTrack = 15, side1 = new Side
+                                    {
+                                        sideId = 0, sectorIds = new int[15]
+                                    },
+                                    order = "CYLINDERS", side2 = new Side
+                                    {
+                                        sideId = 1, sectorIds = new int[15]
+                                    },
+                                    skew = 0, sofs = 0
                                 };
 
-                                for(int si = 0; si < 15; si++) workingDefinition.side1.sectorIds[si] = si + 1;
-                                for(int si = 0; si < 15; si++) workingDefinition.side2.sectorIds[si] = si + 1;
+                                for(int si = 0; si < 15; si++)
+                                    workingDefinition.side1.sectorIds[si] = si + 1;
+
+                                for(int si = 0; si < 15; si++)
+                                    workingDefinition.side2.sectorIds[si] = si + 1;
                             }
 
                             break;
                         case FormatByte.f1440:
-                            if(imagePlugin.Info.SectorSize == 512 && imagePlugin.Info.Sectors == 2880)
+                            if(imagePlugin.Info.SectorSize == 512 &&
+                               imagePlugin.Info.Sectors    == 2880)
                             {
                                 cpmFound               = true;
                                 firstDirectorySector86 = 36;
+
                                 dpb = new DiscParameterBlock
                                 {
-                                    al0 = 0xC0,
-                                    al1 = 0,
-                                    blm = 0x1F,
-                                    bsh = 5,
-                                    cks = 0x40,
-                                    drm = 0xFF,
-                                    dsm = 0x162,
-                                    exm = 1,
-                                    off = 2,
-                                    phm = 3,
-                                    psh = 2,
-                                    spt = 18 * 4
+                                    al0 = 0xC0, al1 = 0, blm    = 0x1F, bsh  = 5,
+                                    cks = 0x40, drm = 0xFF, dsm = 0x162, exm = 1,
+                                    off = 2, phm    = 3, psh    = 2, spt     = 18 * 4
                                 };
 
                                 workingDefinition = new CpmDefinition
                                 {
-                                    al0             = dpb.al0,
-                                    al1             = dpb.al1,
-                                    bitrate         = "LOW",
-                                    blm             = dpb.blm,
-                                    bsh             = dpb.bsh,
-                                    bytesPerSector  = 512,
-                                    cylinders       = 80,
+                                    al0             = dpb.al0, al1            = dpb.al1,
+                                    bitrate         = "LOW", blm              = dpb.blm,
+                                    bsh             = dpb.bsh, bytesPerSector = 512, cylinders = 80,
                                     drm             = dpb.drm,
-                                    dsm             = dpb.dsm,
-                                    encoding        = "MFM",
-                                    evenOdd         = false,
-                                    exm             = dpb.exm,
-                                    label           = null,
-                                    comment         = "CP/M-86 floppy identifier",
+                                    dsm             = dpb.dsm, encoding = "MFM",
+                                    evenOdd         = false, exm        = dpb.exm,
+                                    label           = null, comment     = "CP/M-86 floppy identifier",
                                     ofs             = dpb.off,
-                                    sectorsPerTrack = 18,
-                                    side1           = new Side {sideId = 0, sectorIds = new int[18]},
-                                    order           = "CYLINDERS",
-                                    side2           = new Side {sideId = 1, sectorIds = new int[18]},
-                                    skew            = 0,
-                                    sofs            = 0
+                                    sectorsPerTrack = 18, side1 = new Side
+                                    {
+                                        sideId = 0, sectorIds = new int[18]
+                                    },
+                                    order = "CYLINDERS", side2 = new Side
+                                    {
+                                        sideId = 1, sectorIds = new int[18]
+                                    },
+                                    skew = 0, sofs = 0
                                 };
 
-                                for(int si = 0; si < 18; si++) workingDefinition.side1.sectorIds[si] = si + 1;
-                                for(int si = 0; si < 18; si++) workingDefinition.side2.sectorIds[si] = si + 1;
+                                for(int si = 0; si < 18; si++)
+                                    workingDefinition.side1.sectorIds[si] = si + 1;
+
+                                for(int si = 0; si < 18; si++)
+                                    workingDefinition.side2.sectorIds[si] = si + 1;
                             }
 
                             break;
@@ -753,7 +707,7 @@ namespace Aaru.Filesystems.CPM
 
                     if(cpmFound)
                     {
-                        uint directoryLength = (uint)(((ulong)dpb.drm + 1) * 32 / imagePlugin.Info.SectorSize);
+                        uint directoryLength = (uint)((((ulong)dpb.drm + 1) * 32) / imagePlugin.Info.SectorSize);
                         directory = imagePlugin.ReadSectors(firstDirectorySector86 + partition.Start, directoryLength);
                         AaruConsole.DebugWriteLine("CP/M Plugin", "Found CP/M-86 floppy identifier.");
                     }
@@ -765,6 +719,7 @@ namespace Aaru.Filesystems.CPM
                     if(CheckDir(directory))
                     {
                         AaruConsole.DebugWriteLine("CP/M Plugin", "First directory block seems correct.");
+
                         return true;
                     }
 
@@ -776,27 +731,33 @@ namespace Aaru.Filesystems.CPM
                 {
                     // Load all definitions
                     AaruConsole.DebugWriteLine("CP/M Plugin", "Trying to load definitions.");
-                    if(LoadDefinitions() && definitions?.definitions != null && definitions.definitions.Count > 0)
+
+                    if(LoadDefinitions()                     &&
+                       definitions?.definitions      != null &&
+                       definitions.definitions.Count > 0)
                     {
                         AaruConsole.DebugWriteLine("CP/M Plugin", "Trying all known definitions.");
-                        foreach(CpmDefinition def in from def in definitions.definitions
-                                                     let sectors =
+
+                        foreach(CpmDefinition def in from def in definitions.definitions let sectors =
                                                          (ulong)(def.cylinders * def.sides * def.sectorsPerTrack)
                                                      where sectors            == imagePlugin.Info.Sectors &&
-                                                           def.bytesPerSector == imagePlugin.Info.SectorSize
-                                                     select def)
+                                                           def.bytesPerSector == imagePlugin.Info.SectorSize select def)
                         {
                             // Definition seems to describe current disk, at least, same number of volume sectors and bytes per sector
                             AaruConsole.DebugWriteLine("CP/M Plugin", "Trying definition \"{0}\"", def.comment);
                             ulong offset;
-                            if(def.sofs != 0) offset = (ulong)def.sofs;
-                            else offset              = (ulong)(def.ofs * def.sectorsPerTrack);
 
-                            int dirLen = (def.drm + 1) * 32 / def.bytesPerSector;
+                            if(def.sofs != 0)
+                                offset = (ulong)def.sofs;
+                            else
+                                offset = (ulong)(def.ofs * def.sectorsPerTrack);
+
+                            int dirLen = ((def.drm + 1) * 32) / def.bytesPerSector;
 
                             if(def.sides == 1)
                             {
                                 sectorMask = new int[def.side1.sectorIds.Length];
+
                                 for(int m = 0; m < sectorMask.Length; m++)
                                     sectorMask[m] = def.side1.sectorIds[m] - def.side1.sectorIds[0];
                             }
@@ -806,61 +767,73 @@ namespace Aaru.Filesystems.CPM
                                 if(string.Compare(def.order, "SIDES", StringComparison.InvariantCultureIgnoreCase) == 0)
                                 {
                                     sectorMask = new int[def.side1.sectorIds.Length + def.side2.sectorIds.Length];
+
                                     for(int m = 0; m < def.side1.sectorIds.Length; m++)
                                         sectorMask[m] = def.side1.sectorIds[m] - def.side1.sectorIds[0];
+
                                     // Skip first track (first side)
                                     for(int m = 0; m < def.side2.sectorIds.Length; m++)
                                         sectorMask[m + def.side1.sectorIds.Length] =
-                                            def.side2.sectorIds[m] - def.side2.sectorIds[0] +
+                                            (def.side2.sectorIds[m] - def.side2.sectorIds[0]) +
                                             def.side1.sectorIds.Length;
                                 }
+
                                 // Head changes after whole side
                                 else if(string.Compare(def.order, "CYLINDERS",
                                                        StringComparison.InvariantCultureIgnoreCase) == 0)
                                 {
                                     for(int m = 0; m < def.side1.sectorIds.Length; m++)
                                         sectorMask[m] = def.side1.sectorIds[m] - def.side1.sectorIds[0];
+
                                     // Skip first track (first side) and first track (second side)
                                     for(int m = 0; m < def.side1.sectorIds.Length; m++)
                                         sectorMask[m + def.side1.sectorIds.Length] =
-                                            def.side1.sectorIds[m] - def.side1.sectorIds[0] +
-                                            def.side1.sectorIds.Length                      +
+                                            (def.side1.sectorIds[m] - def.side1.sectorIds[0]) +
+                                            def.side1.sectorIds.Length                        +
                                             def.side2.sectorIds.Length;
                                 }
+
                                 // TODO: Implement COLUMBIA ordering
                                 else if(string.Compare(def.order, "COLUMBIA",
                                                        StringComparison.InvariantCultureIgnoreCase) == 0)
                                 {
                                     AaruConsole.DebugWriteLine("CP/M Plugin",
-                                                              "Don't know how to handle COLUMBIA ordering, not proceeding with this definition.");
+                                                               "Don't know how to handle COLUMBIA ordering, not proceeding with this definition.");
+
                                     continue;
                                 }
+
                                 // TODO: Implement EAGLE ordering
                                 else if(string.Compare(def.order, "EAGLE",
                                                        StringComparison.InvariantCultureIgnoreCase) == 0)
                                 {
                                     AaruConsole.DebugWriteLine("CP/M Plugin",
-                                                              "Don't know how to handle EAGLE ordering, not proceeding with this definition.");
+                                                               "Don't know how to handle EAGLE ordering, not proceeding with this definition.");
+
                                     continue;
                                 }
                                 else
                                 {
                                     AaruConsole.DebugWriteLine("CP/M Plugin",
-                                                              "Unknown order type \"{0}\", not proceeding with this definition.",
-                                                              def.order);
+                                                               "Unknown order type \"{0}\", not proceeding with this definition.",
+                                                               def.order);
+
                                     continue;
                                 }
                             }
 
                             // Read the directory marked by this definition
-                            MemoryStream ms = new MemoryStream();
+                            var ms = new MemoryStream();
+
                             for(int p = 0; p < dirLen; p++)
                             {
                                 byte[] dirSector =
-                                    imagePlugin.ReadSector((ulong)((int)offset                               +
-                                                                   (int)partition.Start                      +
-                                                                   p / sectorMask.Length * sectorMask.Length +
-                                                                   sectorMask[p % sectorMask.Length]));
+                                    imagePlugin.ReadSector((ulong)
+                                                           ((int)offset                                            +
+                                                            (int)partition.Start                                   +
+                                                            ((p          / sectorMask.Length) * sectorMask.Length) +
+                                                            sectorMask[p % sectorMask.Length]));
+
                                 ms.Write(dirSector, 0, dirSector.Length);
                             }
 
@@ -868,7 +841,7 @@ namespace Aaru.Filesystems.CPM
 
                             if(def.evenOdd)
                                 AaruConsole.DebugWriteLine("CP/M Plugin",
-                                                          "Definition contains EVEN-ODD field, with unknown meaning, detection may be wrong.");
+                                                           "Definition contains EVEN-ODD field, with unknown meaning, detection may be wrong.");
 
                             // Complement of the directory bytes if needed
                             if(def.complement)
@@ -879,61 +852,67 @@ namespace Aaru.Filesystems.CPM
                             if(CheckDir(directory))
                             {
                                 AaruConsole.DebugWriteLine("CP/M Plugin", "Definition \"{0}\" has a correct directory",
-                                                          def.comment);
+                                                           def.comment);
 
                                 // Build a Disc Parameter Block
                                 workingDefinition = def;
+
                                 dpb = new DiscParameterBlock
                                 {
-                                    al0 = (byte)def.al0,
-                                    al1 = (byte)def.al1,
-                                    blm = (byte)def.blm,
-                                    bsh = (byte)def.bsh,
+                                    al0 = (byte)def.al0, al1 = (byte)def.al1, blm = (byte)def.blm, bsh = (byte)def.bsh,
+
                                     // Needed?
-                                    cks = 0,
-                                    drm = (ushort)def.drm,
-                                    dsm = (ushort)def.dsm,
-                                    exm = (byte)def.exm,
+                                    cks = 0, drm = (ushort)def.drm, dsm = (ushort)def.dsm, exm = (byte)def.exm,
                                     off = (ushort)def.ofs,
-                                    spt = (ushort)(def.sectorsPerTrack * def.bytesPerSector / 128)
+                                    spt = (ushort)((def.sectorsPerTrack * def.bytesPerSector) / 128)
                                 };
+
                                 switch(def.bytesPerSector)
                                 {
                                     case 128:
                                         dpb.psh = 0;
                                         dpb.phm = 0;
+
                                         break;
                                     case 256:
                                         dpb.psh = 1;
                                         dpb.phm = 1;
+
                                         break;
                                     case 512:
                                         dpb.psh = 2;
                                         dpb.phm = 3;
+
                                         break;
                                     case 1024:
                                         dpb.psh = 3;
                                         dpb.phm = 7;
+
                                         break;
                                     case 2048:
                                         dpb.psh = 4;
                                         dpb.phm = 15;
+
                                         break;
                                     case 4096:
                                         dpb.psh = 5;
                                         dpb.phm = 31;
+
                                         break;
                                     case 8192:
                                         dpb.psh = 6;
                                         dpb.phm = 63;
+
                                         break;
                                     case 16384:
                                         dpb.psh = 7;
                                         dpb.phm = 127;
+
                                         break;
                                     case 32768:
                                         dpb.psh = 8;
                                         dpb.phm = 255;
+
                                         break;
                                 }
 
@@ -957,6 +936,7 @@ namespace Aaru.Filesystems.CPM
                 label                = null;
                 standardTimestamps   = false;
                 thirdPartyTimestamps = false;
+
                 return false;
             }
             catch
@@ -967,32 +947,43 @@ namespace Aaru.Filesystems.CPM
         }
 
         public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding    encoding)
+                                   Encoding encoding)
         {
             Encoding    = encoding ?? Encoding.GetEncoding("IBM437");
             information = "";
-            // As the identification is so complex, just call Identify() and relay on its findings
-            if(!Identify(imagePlugin, partition) || !cpmFound || workingDefinition == null || dpb == null) return;
 
-            StringBuilder sb = new StringBuilder();
+            // As the identification is so complex, just call Identify() and relay on its findings
+            if(!Identify(imagePlugin, partition) ||
+               !cpmFound                         ||
+               workingDefinition == null         ||
+               dpb               == null)
+                return;
+
+            var sb = new StringBuilder();
             sb.AppendLine("CP/M filesystem");
+
             if(!string.IsNullOrEmpty(workingDefinition.comment))
                 sb.AppendFormat("Identified as {0}", workingDefinition.comment).AppendLine();
+
             sb.AppendFormat("Volume block is {0} bytes", 128 << dpb.bsh).AppendLine();
+
             if(dpb.dsm > 0)
-                sb.AppendFormat("Volume contains {0} blocks ({1} bytes)", dpb.dsm, dpb.dsm * (128 << dpb.bsh))
-                  .AppendLine();
+                sb.AppendFormat("Volume contains {0} blocks ({1} bytes)", dpb.dsm, dpb.dsm * (128 << dpb.bsh)).
+                   AppendLine();
+
             sb.AppendFormat("Volume contains {0} directory entries", dpb.drm + 1).AppendLine();
+
             if(workingDefinition.sofs > 0)
                 sb.AppendFormat("Volume reserves {0} sectors for system", workingDefinition.sofs).AppendLine();
             else
                 sb.AppendFormat("Volume reserves {1} tracks ({0} sectors) for system",
-                                workingDefinition.ofs * workingDefinition.sectorsPerTrack, workingDefinition.ofs)
-                  .AppendLine();
+                                workingDefinition.ofs * workingDefinition.sectorsPerTrack, workingDefinition.ofs).
+                   AppendLine();
 
             if(workingDefinition.side1.sectorIds.Length >= 2)
             {
                 int interleaveSide1 = workingDefinition.side1.sectorIds[1] - workingDefinition.side1.sectorIds[0];
+
                 if(interleaveSide1 > 1)
                     sb.AppendFormat("Side 0 uses {0}:1 software interleaving", interleaveSide1).AppendLine();
             }
@@ -1002,6 +993,7 @@ namespace Aaru.Filesystems.CPM
                 if(workingDefinition.side2.sectorIds.Length >= 2)
                 {
                     int interleaveSide2 = workingDefinition.side2.sectorIds[1] - workingDefinition.side2.sectorIds[0];
+
                     if(interleaveSide2 > 1)
                         sb.AppendFormat("Side 1 uses {0}:1 software interleaving", interleaveSide2).AppendLine();
                 }
@@ -1010,12 +1002,15 @@ namespace Aaru.Filesystems.CPM
                 {
                     case "SIDES":
                         sb.AppendLine("Head changes after each whole track");
+
                         break;
                     case "CYLINDERS":
                         sb.AppendLine("Head changes after whole side");
+
                         break;
                     default:
                         sb.AppendFormat("Unknown how {0} side ordering works", workingDefinition.order).AppendLine();
+
                         break;
                 }
             }
@@ -1025,29 +1020,37 @@ namespace Aaru.Filesystems.CPM
 
             if(workingDefinition.sofs > 0)
                 sb.AppendFormat("BSH {0} BLM {1} EXM {2} DSM {3} DRM {4} AL0 {5:X2}H AL1 {6:X2}H SOFS {7}", dpb.bsh,
-                                dpb.blm, dpb.exm, dpb.dsm, dpb.drm, dpb.al0, dpb.al1, workingDefinition.sofs)
-                  .AppendLine();
+                                dpb.blm, dpb.exm, dpb.dsm, dpb.drm, dpb.al0, dpb.al1, workingDefinition.sofs).
+                   AppendLine();
             else
                 sb.AppendFormat("BSH {0} BLM {1} EXM {2} DSM {3} DRM {4} AL0 {5:X2}H AL1 {6:X2}H OFS {7}", dpb.bsh,
-                                dpb.blm, dpb.exm, dpb.dsm, dpb.drm, dpb.al0, dpb.al1, workingDefinition.ofs)
-                  .AppendLine();
+                                dpb.blm, dpb.exm, dpb.dsm, dpb.drm, dpb.al0, dpb.al1, workingDefinition.ofs).
+                   AppendLine();
 
-            if(label != null) sb.AppendFormat("Volume label {0}", label).AppendLine();
+            if(label != null)
+                sb.AppendFormat("Volume label {0}", label).AppendLine();
 
-            if(standardTimestamps) sb.AppendLine("Volume uses standard CP/M timestamps");
+            if(standardTimestamps)
+                sb.AppendLine("Volume uses standard CP/M timestamps");
 
-            if(thirdPartyTimestamps) sb.AppendLine("Volume uses third party timestamps");
+            if(thirdPartyTimestamps)
+                sb.AppendLine("Volume uses third party timestamps");
 
             if(labelCreationDate != null)
                 sb.AppendFormat("Volume created on {0}", DateHandlers.CpmToDateTime(labelCreationDate)).AppendLine();
+
             if(labelUpdateDate != null)
                 sb.AppendFormat("Volume updated on {0}", DateHandlers.CpmToDateTime(labelUpdateDate)).AppendLine();
 
             XmlFsType             =  new FileSystemType();
             XmlFsType.Bootable    |= workingDefinition.sofs > 0 || workingDefinition.ofs > 0;
             XmlFsType.ClusterSize =  (uint)(128 << dpb.bsh);
-            if(dpb.dsm > 0) XmlFsType.Clusters = dpb.dsm;
-            else XmlFsType.Clusters            = partition.End - partition.Start;
+
+            if(dpb.dsm > 0)
+                XmlFsType.Clusters = dpb.dsm;
+            else
+                XmlFsType.Clusters = partition.End - partition.Start;
+
             if(labelCreationDate != null)
             {
                 XmlFsType.CreationDate          = DateHandlers.CpmToDateTime(labelCreationDate);
diff --git a/Aaru.Filesystems/CPM/Structs.cs b/Aaru.Filesystems/CPM/Structs.cs
index 2c9015d55..ba64612fd 100644
--- a/Aaru.Filesystems/CPM/Structs.cs
+++ b/Aaru.Filesystems/CPM/Structs.cs
@@ -34,535 +34,333 @@ using System.Runtime.InteropServices;
 
 namespace Aaru.Filesystems.CPM
 {
-    partial class CPM
+    internal partial class CPM
     {
-        /// <summary>
-        ///     Most of the times this structure is hard wired or generated by CP/M, not stored on disk
-        /// </summary>
+        /// <summary>Most of the times this structure is hard wired or generated by CP/M, not stored on disk</summary>
         class DiscParameterBlock
         {
-            /// <summary>
-            ///     First byte of allocation bitmap
-            /// </summary>
+            /// <summary>First byte of allocation bitmap</summary>
             public byte al0;
-            /// <summary>
-            ///     Second byte of allocation bitmap
-            /// </summary>
+            /// <summary>Second byte of allocation bitmap</summary>
             public byte al1;
-            /// <summary>
-            ///     Block mask
-            /// </summary>
+            /// <summary>Block mask</summary>
             public byte blm;
-            /// <summary>
-            ///     Block shift
-            /// </summary>
+            /// <summary>Block shift</summary>
             public byte bsh;
-            /// <summary>
-            ///     Checksum vector size
-            /// </summary>
+            /// <summary>Checksum vector size</summary>
             public ushort cks;
-            /// <summary>
-            ///     Directory entries - 1
-            /// </summary>
+            /// <summary>Directory entries - 1</summary>
             public ushort drm;
-            /// <summary>
-            ///     Blocks on disk - 1
-            /// </summary>
+            /// <summary>Blocks on disk - 1</summary>
             public ushort dsm;
-            /// <summary>
-            ///     Extent mask
-            /// </summary>
+            /// <summary>Extent mask</summary>
             public byte exm;
-            /// <summary>
-            ///     Reserved tracks
-            /// </summary>
+            /// <summary>Reserved tracks</summary>
             public ushort off;
-            /// <summary>
-            ///     Physical sector mask
-            /// </summary>
+            /// <summary>Physical sector mask</summary>
             public byte phm;
-            /// <summary>
-            ///     Physical sector shift
-            /// </summary>
+            /// <summary>Physical sector shift</summary>
             public byte psh;
-            /// <summary>
-            ///     Sectors per track
-            /// </summary>
+            /// <summary>Sectors per track</summary>
             public ushort spt;
         }
 
-        /// <summary>
-        ///     Amstrad superblock, for PCW
-        /// </summary>
+        /// <summary>Amstrad superblock, for PCW</summary>
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct AmstradSuperBlock
         {
-            /// <summary>
-            ///     Format ID. 0 single-side, 3 double-side. 1 and 2 are for CPC but they don't use the superblock
-            /// </summary>
-            public byte format;
-            /// <summary>
-            ///     Gives information about side ordering
-            /// </summary>
-            public byte sidedness;
-            /// <summary>
-            ///     Tracks per side, aka, cylinders
-            /// </summary>
-            public byte tps;
-            /// <summary>
-            ///     Sectors per track
-            /// </summary>
-            public byte spt;
-            /// <summary>
-            ///     Physical sector shift
-            /// </summary>
-            public byte psh;
-            /// <summary>
-            ///     Reserved tracks
-            /// </summary>
-            public byte off;
-            /// <summary>
-            ///     Block size shift
-            /// </summary>
-            public byte bsh;
-            /// <summary>
-            ///     How many blocks does the directory take
-            /// </summary>
-            public byte dirBlocks;
-            /// <summary>
-            ///     GAP#3 length (intersector)
-            /// </summary>
-            public byte gapLen;
-            /// <summary>
-            ///     GAP#4 length (end-of-track)
-            /// </summary>
-            public byte formatGap;
-            /// <summary>
-            ///     Must be 0
-            /// </summary>
-            public byte zero1;
-            /// <summary>
-            ///     Must be 0
-            /// </summary>
-            public byte zero2;
-            /// <summary>
-            ///     Must be 0
-            /// </summary>
-            public byte zero3;
-            /// <summary>
-            ///     Must be 0
-            /// </summary>
-            public byte zero4;
-            /// <summary>
-            ///     Must be 0
-            /// </summary>
-            public byte zero5;
-            /// <summary>
-            ///     Indicates machine the boot code following the superblock is designed to boot
-            /// </summary>
-            public byte fiddle;
+            /// <summary>Format ID. 0 single-side, 3 double-side. 1 and 2 are for CPC but they don't use the superblock</summary>
+            public readonly byte format;
+            /// <summary>Gives information about side ordering</summary>
+            public readonly byte sidedness;
+            /// <summary>Tracks per side, aka, cylinders</summary>
+            public readonly byte tps;
+            /// <summary>Sectors per track</summary>
+            public readonly byte spt;
+            /// <summary>Physical sector shift</summary>
+            public readonly byte psh;
+            /// <summary>Reserved tracks</summary>
+            public readonly byte off;
+            /// <summary>Block size shift</summary>
+            public readonly byte bsh;
+            /// <summary>How many blocks does the directory take</summary>
+            public readonly byte dirBlocks;
+            /// <summary>GAP#3 length (intersector)</summary>
+            public readonly byte gapLen;
+            /// <summary>GAP#4 length (end-of-track)</summary>
+            public readonly byte formatGap;
+            /// <summary>Must be 0</summary>
+            public readonly byte zero1;
+            /// <summary>Must be 0</summary>
+            public readonly byte zero2;
+            /// <summary>Must be 0</summary>
+            public readonly byte zero3;
+            /// <summary>Must be 0</summary>
+            public readonly byte zero4;
+            /// <summary>Must be 0</summary>
+            public readonly byte zero5;
+            /// <summary>Indicates machine the boot code following the superblock is designed to boot</summary>
+            public readonly byte fiddle;
         }
 
-        /// <summary>
-        ///     Superblock found on CP/M-86 hard disk volumes
-        /// </summary>
+        /// <summary>Superblock found on CP/M-86 hard disk volumes</summary>
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct HardDiskSuperBlock
         {
-            /// <summary>
-            ///     Value so the sum of all the superblock's sector bytes taken as 16-bit values gives 0
-            /// </summary>
-            public ushort checksum;
-            /// <summary>
-            ///     Copyright string
-            /// </summary>
+            /// <summary>Value so the sum of all the superblock's sector bytes taken as 16-bit values gives 0</summary>
+            public readonly ushort checksum;
+            /// <summary>Copyright string</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 0x1F)]
-            public byte[] copyright;
-            /// <summary>
-            ///     First cylinder of disk where this volume resides
-            /// </summary>
-            public ushort firstCylinder;
-            /// <summary>
-            ///     How many cylinders does this volume span
-            /// </summary>
-            public ushort cylinders;
-            /// <summary>
-            ///     Heads on hard disk
-            /// </summary>
-            public byte heads;
-            /// <summary>
-            ///     Sectors per track
-            /// </summary>
-            public byte sectorsPerTrack;
-            /// <summary>
-            ///     Flags, only use by CCP/M where bit 0 equals verify on write
-            /// </summary>
-            public byte flags;
-            /// <summary>
-            ///     Sector size / 128
-            /// </summary>
-            public byte recordsPerSector;
+            public readonly byte[] copyright;
+            /// <summary>First cylinder of disk where this volume resides</summary>
+            public readonly ushort firstCylinder;
+            /// <summary>How many cylinders does this volume span</summary>
+            public readonly ushort cylinders;
+            /// <summary>Heads on hard disk</summary>
+            public readonly byte heads;
+            /// <summary>Sectors per track</summary>
+            public readonly byte sectorsPerTrack;
+            /// <summary>Flags, only use by CCP/M where bit 0 equals verify on write</summary>
+            public readonly byte flags;
+            /// <summary>Sector size / 128</summary>
+            public readonly byte recordsPerSector;
             /// <summary>
             ///     <see cref="DiscParameterBlock.spt" />
             /// </summary>
-            public ushort spt;
+            public readonly ushort spt;
             /// <summary>
             ///     <see cref="DiscParameterBlock.bsh" />
             /// </summary>
-            public byte bsh;
+            public readonly byte bsh;
             /// <summary>
             ///     <see cref="DiscParameterBlock.blm" />
             /// </summary>
-            public byte blm;
+            public readonly byte blm;
             /// <summary>
             ///     <see cref="DiscParameterBlock.exm" />
             /// </summary>
-            public byte exm;
+            public readonly byte exm;
             /// <summary>
             ///     <see cref="DiscParameterBlock.dsm" />
             /// </summary>
-            public ushort dsm;
+            public readonly ushort dsm;
             /// <summary>
             ///     <see cref="DiscParameterBlock.drm" />
             /// </summary>
-            public ushort drm;
+            public readonly ushort drm;
             /// <summary>
             ///     <see cref="DiscParameterBlock.al0" />
             /// </summary>
-            public ushort al0;
+            public readonly ushort al0;
             /// <summary>
             ///     <see cref="DiscParameterBlock.al1" />
             /// </summary>
-            public ushort al1;
+            public readonly ushort al1;
             /// <summary>
             ///     <see cref="DiscParameterBlock.cks" />
             /// </summary>
-            public ushort cks;
+            public readonly ushort cks;
             /// <summary>
             ///     <see cref="DiscParameterBlock.off" />
             /// </summary>
-            public ushort off;
-            /// <summary>
-            ///     Must be zero
-            /// </summary>
-            public ushort zero1;
-            /// <summary>
-            ///     Must be zero
-            /// </summary>
-            public ushort zero2;
-            /// <summary>
-            ///     Must be zero
-            /// </summary>
-            public ushort zero3;
-            /// <summary>
-            ///     Must be zero
-            /// </summary>
-            public ushort zero4;
-            /// <summary>
-            ///     How many 128 bytes are in a block
-            /// </summary>
-            public ushort recordsPerBlock;
-            /// <summary>
-            ///     Maximum number of bad blocks in the bad block list
-            /// </summary>
-            public ushort badBlockWordsMax;
-            /// <summary>
-            ///     Used number of bad blocks in the bad block list
-            /// </summary>
-            public ushort badBlockWords;
-            /// <summary>
-            ///     First block after the blocks reserved for bad block substitution
-            /// </summary>
-            public ushort firstSub;
+            public readonly ushort off;
+            /// <summary>Must be zero</summary>
+            public readonly ushort zero1;
+            /// <summary>Must be zero</summary>
+            public readonly ushort zero2;
+            /// <summary>Must be zero</summary>
+            public readonly ushort zero3;
+            /// <summary>Must be zero</summary>
+            public readonly ushort zero4;
+            /// <summary>How many 128 bytes are in a block</summary>
+            public readonly ushort recordsPerBlock;
+            /// <summary>Maximum number of bad blocks in the bad block list</summary>
+            public readonly ushort badBlockWordsMax;
+            /// <summary>Used number of bad blocks in the bad block list</summary>
+            public readonly ushort badBlockWords;
+            /// <summary>First block after the blocks reserved for bad block substitution</summary>
+            public readonly ushort firstSub;
         }
 
-        /// <summary>
-        ///     Volume label entry
-        /// </summary>
+        /// <summary>Volume label entry</summary>
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct LabelEntry
         {
-            /// <summary>
-            ///     Must be 0x20
-            /// </summary>
-            public byte signature;
-            /// <summary>
-            ///     Label in ASCII
-            /// </summary>
+            /// <summary>Must be 0x20</summary>
+            public readonly byte signature;
+            /// <summary>Label in ASCII</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 11)]
-            public byte[] label;
+            public readonly byte[] label;
             /// <summary>
             ///     Label flags. Bit 0 = label exists, bit 4 = creation timestamp, bit 5 = modification timestamp, bit 6 = access
             ///     timestamp, bit 7 = password enabled
             /// </summary>
-            public byte flags;
-            /// <summary>
-            ///     Password decoder byte
-            /// </summary>
-            public byte passwordDecoder;
-            /// <summary>
-            ///     Must be 0
-            /// </summary>
-            public ushort reserved;
-            /// <summary>
-            ///     Password XOR'ed with <see cref="passwordDecoder" />
-            /// </summary>
+            public readonly byte flags;
+            /// <summary>Password decoder byte</summary>
+            public readonly byte passwordDecoder;
+            /// <summary>Must be 0</summary>
+            public readonly ushort reserved;
+            /// <summary>Password XOR'ed with <see cref="passwordDecoder" /></summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public byte[] password;
-            /// <summary>
-            ///     Label creation time
-            /// </summary>
+            public readonly byte[] password;
+            /// <summary>Label creation time</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
-            public byte[] ctime;
-            /// <summary>
-            ///     Label modification time
-            /// </summary>
+            public readonly byte[] ctime;
+            /// <summary>Label modification time</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
-            public byte[] mtime;
+            public readonly byte[] mtime;
         }
 
-        /// <summary>
-        ///     CP/M 3 timestamp entry
-        /// </summary>
+        /// <summary>CP/M 3 timestamp entry</summary>
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct DateEntry
         {
-            /// <summary>
-            ///     Must be 0x21
-            /// </summary>
-            public byte signature;
-            /// <summary>
-            ///     File 1 create/access timestamp
-            /// </summary>
+            /// <summary>Must be 0x21</summary>
+            public readonly byte signature;
+            /// <summary>File 1 create/access timestamp</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
-            public byte[] date1;
-            /// <summary>
-            ///     File 1 modification timestamp
-            /// </summary>
+            public readonly byte[] date1;
+            /// <summary>File 1 modification timestamp</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
-            public byte[] date2;
-            /// <summary>
-            ///     File 1 password mode
-            /// </summary>
-            public byte mode1;
-            public byte zero1;
-            /// <summary>
-            ///     File 2 create/access timestamp
-            /// </summary>
+            public readonly byte[] date2;
+            /// <summary>File 1 password mode</summary>
+            public readonly byte mode1;
+            public readonly byte zero1;
+            /// <summary>File 2 create/access timestamp</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
-            public byte[] date3;
-            /// <summary>
-            ///     File 2 modification timestamp
-            /// </summary>
+            public readonly byte[] date3;
+            /// <summary>File 2 modification timestamp</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
-            public byte[] date4;
-            /// <summary>
-            ///     File 2 password mode
-            /// </summary>
-            public byte mode2;
-            public byte zero2;
-            /// <summary>
-            ///     File 3 create/access timestamp
-            /// </summary>
+            public readonly byte[] date4;
+            /// <summary>File 2 password mode</summary>
+            public readonly byte mode2;
+            public readonly byte zero2;
+            /// <summary>File 3 create/access timestamp</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
-            public byte[] date5;
-            /// <summary>
-            ///     File 3 modification timestamp
-            /// </summary>
+            public readonly byte[] date5;
+            /// <summary>File 3 modification timestamp</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
-            public byte[] date6;
-            /// <summary>
-            ///     File 3 password mode
-            /// </summary>
-            public byte mode3;
-            public ushort zero3;
+            public readonly byte[] date6;
+            /// <summary>File 3 password mode</summary>
+            public readonly byte mode3;
+            public readonly ushort zero3;
         }
 
-        /// <summary>
-        ///     Password entry
-        /// </summary>
+        /// <summary>Password entry</summary>
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct PasswordEntry
         {
-            /// <summary>
-            ///     16 + user number
-            /// </summary>
-            public byte userNumber;
-            /// <summary>
-            ///     Filename
-            /// </summary>
+            /// <summary>16 + user number</summary>
+            public readonly byte userNumber;
+            /// <summary>Filename</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public byte[] filename;
-            /// <summary>
-            ///     Extension
-            /// </summary>
+            public readonly byte[] filename;
+            /// <summary>Extension</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
-            public byte[] extension;
-            /// <summary>
-            ///     Password mode. Bit 7 = required for read, bit 6 = required for write, bit 5 = required for delete
-            /// </summary>
-            public byte mode;
-            /// <summary>
-            ///     Password decoder byte
-            /// </summary>
-            public byte passwordDecoder;
+            public readonly byte[] extension;
+            /// <summary>Password mode. Bit 7 = required for read, bit 6 = required for write, bit 5 = required for delete</summary>
+            public readonly byte mode;
+            /// <summary>Password decoder byte</summary>
+            public readonly byte passwordDecoder;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
-            public byte[] reserved;
-            /// <summary>
-            ///     Password XOR'ed with <see cref="passwordDecoder" />
-            /// </summary>
+            public readonly byte[] reserved;
+            /// <summary>Password XOR'ed with <see cref="passwordDecoder" /></summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public byte[] password;
+            public readonly byte[] password;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public byte[] reserved2;
+            public readonly byte[] reserved2;
         }
 
-        /// <summary>
-        ///     Timestamp for Z80DOS or DOS+
-        /// </summary>
+        /// <summary>Timestamp for Z80DOS or DOS+</summary>
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct TrdPartyDateEntry
         {
-            /// <summary>
-            ///     Must be 0x21
-            /// </summary>
-            public byte signature;
-            public byte zero;
-            /// <summary>
-            ///     Creation year for file 1
-            /// </summary>
+            /// <summary>Must be 0x21</summary>
+            public readonly byte signature;
+            public readonly byte zero;
+            /// <summary>Creation year for file 1</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
-            public byte[] create1;
-            /// <summary>
-            ///     Modification time for file 1
-            /// </summary>
+            public readonly byte[] create1;
+            /// <summary>Modification time for file 1</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
-            public byte[] modify1;
-            /// <summary>
-            ///     Access time for file 1
-            /// </summary>
+            public readonly byte[] modify1;
+            /// <summary>Access time for file 1</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
-            public byte[] access1;
-            /// <summary>
-            ///     Creation year for file 2
-            /// </summary>
+            public readonly byte[] access1;
+            /// <summary>Creation year for file 2</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
-            public byte[] create2;
-            /// <summary>
-            ///     Modification time for file 2
-            /// </summary>
+            public readonly byte[] create2;
+            /// <summary>Modification time for file 2</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
-            public byte[] modify2;
-            /// <summary>
-            ///     Access time for file 2
-            /// </summary>
+            public readonly byte[] modify2;
+            /// <summary>Access time for file 2</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
-            public byte[] access2;
-            /// <summary>
-            ///     Creation year for file 3
-            /// </summary>
+            public readonly byte[] access2;
+            /// <summary>Creation year for file 3</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
-            public byte[] create3;
-            /// <summary>
-            ///     Modification time for file 3
-            /// </summary>
+            public readonly byte[] create3;
+            /// <summary>Modification time for file 3</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
-            public byte[] modify3;
-            /// <summary>
-            ///     Access time for file 3
-            /// </summary>
+            public readonly byte[] modify3;
+            /// <summary>Access time for file 3</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
-            public byte[] access3;
+            public readonly byte[] access3;
         }
 
-        /// <summary>
-        ///     Directory entry for &lt;256 allocation blocks
-        /// </summary>
+        /// <summary>Directory entry for &lt;256 allocation blocks</summary>
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct DirectoryEntry
         {
-            /// <summary>
-            ///     User number. Bit 7 set in CP/M 1 means hidden
-            /// </summary>
-            public byte statusUser;
-            /// <summary>
-            ///     Filename and bit 7 as flags
-            /// </summary>
+            /// <summary>User number. Bit 7 set in CP/M 1 means hidden</summary>
+            public readonly byte statusUser;
+            /// <summary>Filename and bit 7 as flags</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public byte[] filename;
-            /// <summary>
-            ///     Extension and bit 7 as flags
-            /// </summary>
+            public readonly byte[] filename;
+            /// <summary>Extension and bit 7 as flags</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
-            public byte[] extension;
+            public readonly byte[] extension;
+            /// <summary>Low byte of extent number</summary>
+            public readonly byte extentCounter;
             /// <summary>
-            ///     Low byte of extent number
-            /// </summary>
-            public byte extentCounter;
-            /// <summary>
-            ///     Last record bytes. In some implementations it means how many bytes are used in the last record, in others how many
-            ///     bytes are free.
-            ///     It always refer to 128 byte records even if blocks are way bigger, so it's mostly useless.
-            /// </summary>
-            public byte lastRecordBytes;
-            /// <summary>
-            ///     High byte of extent number
-            /// </summary>
-            public byte extentCounterHigh;
-            /// <summary>
-            ///     How many records are used in this entry. 0x80 if all are used.
-            /// </summary>
-            public byte records;
-            /// <summary>
-            ///     Allocation blocks
+            ///     Last record bytes. In some implementations it means how many bytes are used in the last record, in others how
+            ///     many bytes are free. It always refer to 128 byte records even if blocks are way bigger, so it's mostly useless.
             /// </summary>
+            public readonly byte lastRecordBytes;
+            /// <summary>High byte of extent number</summary>
+            public readonly byte extentCounterHigh;
+            /// <summary>How many records are used in this entry. 0x80 if all are used.</summary>
+            public readonly byte records;
+            /// <summary>Allocation blocks</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public byte[] allocations;
+            public readonly byte[] allocations;
         }
 
-        /// <summary>
-        ///     Directory entry for &gt;256 allocation blocks
-        /// </summary>
+        /// <summary>Directory entry for &gt;256 allocation blocks</summary>
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct DirectoryEntry16
         {
-            /// <summary>
-            ///     User number. Bit 7 set in CP/M 1 means hidden
-            /// </summary>
-            public byte statusUser;
-            /// <summary>
-            ///     Filename and bit 7 as flags
-            /// </summary>
+            /// <summary>User number. Bit 7 set in CP/M 1 means hidden</summary>
+            public readonly byte statusUser;
+            /// <summary>Filename and bit 7 as flags</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public byte[] filename;
-            /// <summary>
-            ///     Extension and bit 7 as flags
-            /// </summary>
+            public readonly byte[] filename;
+            /// <summary>Extension and bit 7 as flags</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
-            public byte[] extension;
+            public readonly byte[] extension;
+            /// <summary>Low byte of extent number</summary>
+            public readonly byte extentCounter;
             /// <summary>
-            ///     Low byte of extent number
-            /// </summary>
-            public byte extentCounter;
-            /// <summary>
-            ///     Last record bytes. In some implementations it means how many bytes are used in the last record, in others how many
-            ///     bytes are free.
-            ///     It always refer to 128 byte records even if blocks are way bigger, so it's mostly useless.
-            /// </summary>
-            public byte lastRecordBytes;
-            /// <summary>
-            ///     High byte of extent number
-            /// </summary>
-            public byte extentCounterHigh;
-            /// <summary>
-            ///     How many records are used in this entry. 0x80 if all are used.
-            /// </summary>
-            public byte records;
-            /// <summary>
-            ///     Allocation blocks
+            ///     Last record bytes. In some implementations it means how many bytes are used in the last record, in others how
+            ///     many bytes are free. It always refer to 128 byte records even if blocks are way bigger, so it's mostly useless.
             /// </summary>
+            public readonly byte lastRecordBytes;
+            /// <summary>High byte of extent number</summary>
+            public readonly byte extentCounterHigh;
+            /// <summary>How many records are used in this entry. 0x80 if all are used.</summary>
+            public readonly byte records;
+            /// <summary>Allocation blocks</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public ushort[] allocations;
+            public readonly ushort[] allocations;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/CPM/Super.cs b/Aaru.Filesystems/CPM/Super.cs
index a92ed8430..d2cd963f1 100644
--- a/Aaru.Filesystems/CPM/Super.cs
+++ b/Aaru.Filesystems/CPM/Super.cs
@@ -48,23 +48,27 @@ using FileSystemInfo = Aaru.CommonTypes.Structs.FileSystemInfo;
 
 namespace Aaru.Filesystems.CPM
 {
-    partial class CPM
+    internal partial class CPM
     {
-        public Errno Mount(IMediaImage                imagePlugin, Partition partition, Encoding encoding,
-                           Dictionary<string, string> options,     string    @namespace)
+        public Errno Mount(IMediaImage imagePlugin, Partition partition, Encoding encoding,
+                           Dictionary<string, string> options, string @namespace)
         {
             device         = imagePlugin;
             this.partition = partition;
             Encoding       = encoding ?? Encoding.GetEncoding("IBM437");
 
             // As the identification is so complex, just call Identify() and relay on its findings
-            if(!Identify(device, partition) || !cpmFound || workingDefinition == null || dpb == null)
+            if(!Identify(device, partition) ||
+               !cpmFound                    ||
+               workingDefinition == null    ||
+               dpb               == null)
                 return Errno.InvalidArgument;
 
             // Build the software interleaving sector mask
             if(workingDefinition.sides == 1)
             {
                 sectorMask = new int[workingDefinition.side1.sectorIds.Length];
+
                 for(int m = 0; m < sectorMask.Length; m++)
                     sectorMask[m] = workingDefinition.side1.sectorIds[m] - workingDefinition.side1.sectorIds[0];
             }
@@ -75,58 +79,69 @@ namespace Aaru.Filesystems.CPM
                 {
                     sectorMask = new int[workingDefinition.side1.sectorIds.Length +
                                          workingDefinition.side2.sectorIds.Length];
+
                     for(int m = 0; m < workingDefinition.side1.sectorIds.Length; m++)
                         sectorMask[m] = workingDefinition.side1.sectorIds[m] - workingDefinition.side1.sectorIds[0];
+
                     // Skip first track (first side)
                     for(int m = 0; m < workingDefinition.side2.sectorIds.Length; m++)
                         sectorMask[m + workingDefinition.side1.sectorIds.Length] =
-                            workingDefinition.side2.sectorIds[m] - workingDefinition.side2.sectorIds[0] +
+                            (workingDefinition.side2.sectorIds[m] - workingDefinition.side2.sectorIds[0]) +
                             workingDefinition.side1.sectorIds.Length;
                 }
+
                 // Head changes after whole side
                 else if(string.Compare(workingDefinition.order, "CYLINDERS",
                                        StringComparison.InvariantCultureIgnoreCase) == 0)
                 {
                     for(int m = 0; m < workingDefinition.side1.sectorIds.Length; m++)
                         sectorMask[m] = workingDefinition.side1.sectorIds[m] - workingDefinition.side1.sectorIds[0];
+
                     // Skip first track (first side) and first track (second side)
                     for(int m = 0; m < workingDefinition.side1.sectorIds.Length; m++)
                         sectorMask[m + workingDefinition.side1.sectorIds.Length] =
-                            workingDefinition.side1.sectorIds[m] - workingDefinition.side1.sectorIds[0] +
-                            workingDefinition.side1.sectorIds.Length                                    +
+                            (workingDefinition.side1.sectorIds[m] - workingDefinition.side1.sectorIds[0]) +
+                            workingDefinition.side1.sectorIds.Length                                      +
                             workingDefinition.side2.sectorIds.Length;
 
                     // TODO: Implement CYLINDERS ordering
                     AaruConsole.DebugWriteLine("CP/M Plugin", "CYLINDERS ordering not yet implemented.");
+
                     return Errno.NotImplemented;
                 }
+
                 // TODO: Implement COLUMBIA ordering
                 else if(string.Compare(workingDefinition.order, "COLUMBIA",
                                        StringComparison.InvariantCultureIgnoreCase) == 0)
                 {
                     AaruConsole.DebugWriteLine("CP/M Plugin",
-                                              "Don't know how to handle COLUMBIA ordering, not proceeding with this definition.");
+                                               "Don't know how to handle COLUMBIA ordering, not proceeding with this definition.");
+
                     return Errno.NotImplemented;
                 }
+
                 // TODO: Implement EAGLE ordering
                 else if(string.Compare(workingDefinition.order, "EAGLE", StringComparison.InvariantCultureIgnoreCase) ==
                         0)
                 {
                     AaruConsole.DebugWriteLine("CP/M Plugin",
-                                              "Don't know how to handle EAGLE ordering, not proceeding with this definition.");
+                                               "Don't know how to handle EAGLE ordering, not proceeding with this definition.");
+
                     return Errno.NotImplemented;
                 }
                 else
                 {
                     AaruConsole.DebugWriteLine("CP/M Plugin",
-                                              "Unknown order type \"{0}\", not proceeding with this definition.",
-                                              workingDefinition.order);
+                                               "Unknown order type \"{0}\", not proceeding with this definition.",
+                                               workingDefinition.order);
+
                     return Errno.NotSupported;
                 }
             }
 
             // Deinterleave whole volume
             Dictionary<ulong, byte[]> deinterleavedSectors = new Dictionary<ulong, byte[]>();
+
             if(workingDefinition.sides                                                                       == 1 ||
                string.Compare(workingDefinition.order, "SIDES", StringComparison.InvariantCultureIgnoreCase) == 0)
             {
@@ -135,8 +150,9 @@ namespace Aaru.Filesystems.CPM
                 for(int p = 0; p <= (int)(partition.End - partition.Start); p++)
                 {
                     byte[] readSector =
-                        device.ReadSector((ulong)((int)partition.Start + p / sectorMask.Length * sectorMask.Length +
-                                                  sectorMask[p % sectorMask.Length]));
+                        device.ReadSector((ulong)((int)partition.Start + ((p / sectorMask.Length) * sectorMask.Length) +
+                                                  sectorMask[p               % sectorMask.Length]));
+
                     if(workingDefinition.complement)
                         for(int b = 0; b < readSector.Length; b++)
                             readSector[b] = (byte)(~readSector[b] & 0xFF);
@@ -146,7 +162,7 @@ namespace Aaru.Filesystems.CPM
             }
 
             int                       blockSize        = 128 << dpb.bsh;
-            MemoryStream              blockMs          = new MemoryStream();
+            var                       blockMs          = new MemoryStream();
             ulong                     blockNo          = 0;
             int                       sectorsPerBlock  = 0;
             Dictionary<ulong, byte[]> allocationBlocks = new Dictionary<ulong, byte[]>();
@@ -166,31 +182,39 @@ namespace Aaru.Filesystems.CPM
                         Array.Copy(sector, blockSize * i, tmp, 0, blockSize);
                         allocationBlocks.Add(blockNo++, tmp);
                     }
+
                 // CP/M blocks are larger than physical sectors
                 else if(sector.Length < blockSize)
                 {
                     blockMs.Write(sector, 0, sector.Length);
                     sectorsPerBlock++;
 
-                    if(sectorsPerBlock != blockSize / sector.Length) continue;
+                    if(sectorsPerBlock != blockSize / sector.Length)
+                        continue;
 
                     allocationBlocks.Add(blockNo++, blockMs.ToArray());
                     sectorsPerBlock = 0;
                     blockMs         = new MemoryStream();
                 }
+
                 // CP/M blocks are same size than physical sectors
-                else allocationBlocks.Add(blockNo++, sector);
+                else
+                    allocationBlocks.Add(blockNo++, sector);
             }
 
             AaruConsole.DebugWriteLine("CP/M Plugin", "Reading directory.");
 
             int dirOff;
-            int dirSectors = (dpb.drm + 1) * 32 / workingDefinition.bytesPerSector;
-            if(workingDefinition.sofs > 0) dirOff = workingDefinition.sofs;
-            else dirOff                           = workingDefinition.ofs * workingDefinition.sectorsPerTrack;
+            int dirSectors = ((dpb.drm + 1) * 32) / workingDefinition.bytesPerSector;
+
+            if(workingDefinition.sofs > 0)
+                dirOff = workingDefinition.sofs;
+            else
+                dirOff = workingDefinition.ofs * workingDefinition.sectorsPerTrack;
 
             // Read the whole directory blocks
-            MemoryStream dirMs = new MemoryStream();
+            var dirMs = new MemoryStream();
+
             for(int d = 0; d < dirSectors; d++)
             {
                 deinterleavedSectors.TryGetValue((ulong)(d + dirOff), out byte[] sector);
@@ -199,14 +223,17 @@ namespace Aaru.Filesystems.CPM
 
             byte[] directory = dirMs.ToArray();
 
-            if(directory == null) return Errno.InvalidArgument;
+            if(directory == null)
+                return Errno.InvalidArgument;
 
             int    dirCnt = 0;
             string file1  = null;
             string file2  = null;
             string file3  = null;
+
             Dictionary<string, Dictionary<int, List<ushort>>> fileExtents =
                 new Dictionary<string, Dictionary<int, List<ushort>>>();
+
             statCache = new Dictionary<string, FileEntryInfo>();
             cpmStat   = new FileSystemInfo();
             bool atime = false;
@@ -219,6 +246,7 @@ namespace Aaru.Filesystems.CPM
 
             // For each directory entry
             for(int dOff = 0; dOff < directory.Length; dOff += 32)
+
                 // Describes a file (does not support PDOS entries with user >= 16, because they're identical to password entries
                 if((directory[dOff] & 0x7F) < 0x10)
                     if(allocationBlocks.Count > 256)
@@ -229,6 +257,7 @@ namespace Aaru.Filesystems.CPM
                         bool hidden = (entry.statusUser & 0x80) == 0x80;
                         bool rdOnly = (entry.filename[0] & 0x80) == 0x80 || (entry.extension[0] & 0x80) == 0x80;
                         bool system = (entry.filename[1] & 0x80) == 0x80 || (entry.extension[2] & 0x80) == 0x80;
+
                         //bool backed = (entry.filename[3] & 0x80) == 0x80 || (entry.extension[3] & 0x80) == 0x80;
                         int user = entry.statusUser & 0x0F;
 
@@ -246,34 +275,51 @@ namespace Aaru.Filesystems.CPM
                             validEntry         &= entry.extension[i] >= 0x20;
                         }
 
-                        if(!validEntry) continue;
+                        if(!validEntry)
+                            continue;
 
                         string filename  = Encoding.ASCII.GetString(entry.filename).Trim();
                         string extension = Encoding.ASCII.GetString(entry.extension).Trim();
 
                         // If user is != 0, append user to name to have identical filenames
-                        if(user > 0) filename                         = $"{user:X1}:{filename}";
-                        if(!string.IsNullOrEmpty(extension)) filename = filename + "." + extension;
+                        if(user > 0)
+                            filename = $"{user:X1}:{filename}";
 
-                        int entryNo = (32 * entry.extentCounter + entry.extentCounterHigh) / (dpb.exm + 1);
+                        if(!string.IsNullOrEmpty(extension))
+                            filename = filename + "." + extension;
+
+                        int entryNo = ((32 * entry.extentCounter) + entry.extentCounterHigh) / (dpb.exm + 1);
 
                         // Do we have a stat for the file already?
-                        if(statCache.TryGetValue(filename, out FileEntryInfo fInfo)) statCache.Remove(filename);
-                        else fInfo = new FileEntryInfo {Attributes = new FileAttributes()};
+                        if(statCache.TryGetValue(filename, out FileEntryInfo fInfo))
+                            statCache.Remove(filename);
+                        else
+                            fInfo = new FileEntryInfo
+                            {
+                                Attributes = new FileAttributes()
+                            };
 
                         // And any extent?
                         if(fileExtents.TryGetValue(filename, out Dictionary<int, List<ushort>> extentBlocks))
                             fileExtents.Remove(filename);
-                        else extentBlocks = new Dictionary<int, List<ushort>>();
+                        else
+                            extentBlocks = new Dictionary<int, List<ushort>>();
 
                         // Do we already have this extent? Should never happen
-                        if(extentBlocks.TryGetValue(entryNo, out List<ushort> blocks)) extentBlocks.Remove(entryNo);
-                        else blocks = new List<ushort>();
+                        if(extentBlocks.TryGetValue(entryNo, out List<ushort> blocks))
+                            extentBlocks.Remove(entryNo);
+                        else
+                            blocks = new List<ushort>();
 
                         // Attributes
-                        if(hidden) fInfo.Attributes |= FileAttributes.Hidden;
-                        if(rdOnly) fInfo.Attributes |= FileAttributes.ReadOnly;
-                        if(system) fInfo.Attributes |= FileAttributes.System;
+                        if(hidden)
+                            fInfo.Attributes |= FileAttributes.Hidden;
+
+                        if(rdOnly)
+                            fInfo.Attributes |= FileAttributes.ReadOnly;
+
+                        if(system)
+                            fInfo.Attributes |= FileAttributes.System;
 
                         // Supposedly there is a value in the directory entry telling how many blocks are designated in
                         // this entry. However some implementations tend to do whatever they wish, but none will ever
@@ -290,19 +336,23 @@ namespace Aaru.Filesystems.CPM
                         statCache.Add(filename, fInfo);
 
                         // Add the file to the directory listing
-                        if(!dirList.Contains(filename)) dirList.Add(filename);
+                        if(!dirList.Contains(filename))
+                            dirList.Add(filename);
 
                         // Count entries 3 by 3 for timestamps
                         switch(dirCnt % 3)
                         {
                             case 0:
                                 file1 = filename;
+
                                 break;
                             case 1:
                                 file2 = filename;
+
                                 break;
                             case 2:
                                 file3 = filename;
+
                                 break;
                         }
 
@@ -316,6 +366,7 @@ namespace Aaru.Filesystems.CPM
                         bool hidden = (entry.statusUser & 0x80) == 0x80;
                         bool rdOnly = (entry.filename[0] & 0x80) == 0x80 || (entry.extension[0] & 0x80) == 0x80;
                         bool system = (entry.filename[1] & 0x80) == 0x80 || (entry.extension[2] & 0x80) == 0x80;
+
                         //bool backed = (entry.filename[3] & 0x80) == 0x80 || (entry.extension[3] & 0x80) == 0x80;
                         int user = entry.statusUser & 0x0F;
 
@@ -333,42 +384,59 @@ namespace Aaru.Filesystems.CPM
                             validEntry         &= entry.extension[i] >= 0x20;
                         }
 
-                        if(!validEntry) continue;
+                        if(!validEntry)
+                            continue;
 
                         string filename  = Encoding.ASCII.GetString(entry.filename).Trim();
                         string extension = Encoding.ASCII.GetString(entry.extension).Trim();
 
                         // If user is != 0, append user to name to have identical filenames
-                        if(user > 0) filename                         = $"{user:X1}:{filename}";
-                        if(!string.IsNullOrEmpty(extension)) filename = filename + "." + extension;
+                        if(user > 0)
+                            filename = $"{user:X1}:{filename}";
 
-                        int entryNo = (32 * entry.extentCounterHigh + entry.extentCounter) / (dpb.exm + 1);
+                        if(!string.IsNullOrEmpty(extension))
+                            filename = filename + "." + extension;
+
+                        int entryNo = ((32 * entry.extentCounterHigh) + entry.extentCounter) / (dpb.exm + 1);
 
                         // Do we have a stat for the file already?
-                        if(statCache.TryGetValue(filename, out FileEntryInfo fInfo)) statCache.Remove(filename);
-                        else fInfo = new FileEntryInfo {Attributes = new FileAttributes()};
+                        if(statCache.TryGetValue(filename, out FileEntryInfo fInfo))
+                            statCache.Remove(filename);
+                        else
+                            fInfo = new FileEntryInfo
+                            {
+                                Attributes = new FileAttributes()
+                            };
 
                         // And any extent?
                         if(fileExtents.TryGetValue(filename, out Dictionary<int, List<ushort>> extentBlocks))
                             fileExtents.Remove(filename);
-                        else extentBlocks = new Dictionary<int, List<ushort>>();
+                        else
+                            extentBlocks = new Dictionary<int, List<ushort>>();
 
                         // Do we already have this extent? Should never happen
-                        if(extentBlocks.TryGetValue(entryNo, out List<ushort> blocks)) extentBlocks.Remove(entryNo);
-                        else blocks = new List<ushort>();
+                        if(extentBlocks.TryGetValue(entryNo, out List<ushort> blocks))
+                            extentBlocks.Remove(entryNo);
+                        else
+                            blocks = new List<ushort>();
 
                         // Attributes
-                        if(hidden) fInfo.Attributes |= FileAttributes.Hidden;
-                        if(rdOnly) fInfo.Attributes |= FileAttributes.ReadOnly;
-                        if(system) fInfo.Attributes |= FileAttributes.System;
+                        if(hidden)
+                            fInfo.Attributes |= FileAttributes.Hidden;
+
+                        if(rdOnly)
+                            fInfo.Attributes |= FileAttributes.ReadOnly;
+
+                        if(system)
+                            fInfo.Attributes |= FileAttributes.System;
 
                         // Supposedly there is a value in the directory entry telling how many blocks are designated in
                         // this entry. However some implementations tend to do whatever they wish, but none will ever
                         // allocate block 0 for a file because that's where the directory resides.
                         // There is also a field telling how many bytes are used in the last block, but its meaning is
                         // non-standard so we must ignore it.
-                        foreach(ushort blk in entry.allocations
-                                                   .Where(blk => !blocks.Contains(blk) && blk != 0)) blocks.Add(blk);
+                        foreach(ushort blk in entry.allocations.Where(blk => !blocks.Contains(blk) && blk != 0))
+                            blocks.Add(blk);
 
                         // Save the file
                         fInfo.UID = (ulong)user;
@@ -377,43 +445,56 @@ namespace Aaru.Filesystems.CPM
                         statCache.Add(filename, fInfo);
 
                         // Add the file to the directory listing
-                        if(!dirList.Contains(filename)) dirList.Add(filename);
+                        if(!dirList.Contains(filename))
+                            dirList.Add(filename);
 
                         // Count entries 3 by 3 for timestamps
                         switch(dirCnt % 3)
                         {
                             case 0:
                                 file1 = filename;
+
                                 break;
                             case 1:
                                 file2 = filename;
+
                                 break;
                             case 2:
                                 file3 = filename;
+
                                 break;
                         }
 
                         dirCnt++;
                     }
+
                 // A password entry (or a file entry in PDOS, but this does not handle that case)
-                else if((directory[dOff] & 0x7F) >= 0x10 && (directory[dOff] & 0x7F) < 0x20)
+                else if((directory[dOff] & 0x7F) >= 0x10 &&
+                        (directory[dOff] & 0x7F) < 0x20)
                 {
                     PasswordEntry entry = Marshal.ByteArrayToStructureLittleEndian<PasswordEntry>(directory, dOff, 32);
 
                     int user = entry.userNumber & 0x0F;
 
-                    for(int i = 0; i < 8; i++) entry.filename[i]  &= 0x7F;
-                    for(int i = 0; i < 3; i++) entry.extension[i] &= 0x7F;
+                    for(int i = 0; i < 8; i++)
+                        entry.filename[i] &= 0x7F;
+
+                    for(int i = 0; i < 3; i++)
+                        entry.extension[i] &= 0x7F;
 
                     string filename  = Encoding.ASCII.GetString(entry.filename).Trim();
                     string extension = Encoding.ASCII.GetString(entry.extension).Trim();
 
                     // If user is != 0, append user to name to have identical filenames
-                    if(user > 0) filename                         = $"{user:X1}:{filename}";
-                    if(!string.IsNullOrEmpty(extension)) filename = filename + "." + extension;
+                    if(user > 0)
+                        filename = $"{user:X1}:{filename}";
+
+                    if(!string.IsNullOrEmpty(extension))
+                        filename = filename + "." + extension;
 
                     // Do not repeat passwords
-                    if(passwordCache.ContainsKey(filename)) passwordCache.Remove(filename);
+                    if(passwordCache.ContainsKey(filename))
+                        passwordCache.Remove(filename);
 
                     // Copy whole password entry
                     byte[] tmp = new byte[32];
@@ -425,17 +506,21 @@ namespace Aaru.Filesystems.CPM
                     {
                         case 0:
                             file1 = filename;
+
                             break;
                         case 1:
                             file2 = filename;
+
                             break;
                         case 2:
                             file3 = filename;
+
                             break;
                     }
 
                     dirCnt++;
                 }
+
                 // Volume label and password entry. Volume password is ignored.
                 else
                     switch(directory[dOff] & 0x7F)
@@ -452,27 +537,33 @@ namespace Aaru.Filesystems.CPM
                             labelCreationDate = new byte[4];
                             labelUpdateDate   = new byte[4];
                             Array.Copy(directory, dOff + 24, labelCreationDate, 0, 4);
-                            Array.Copy(directory, dOff + 28, labelUpdateDate,   0, 4);
+                            Array.Copy(directory, dOff + 28, labelUpdateDate, 0, 4);
 
                             // Count entries 3 by 3 for timestamps
                             switch(dirCnt % 3)
                             {
                                 case 0:
                                     file1 = null;
+
                                     break;
                                 case 1:
                                     file2 = null;
+
                                     break;
                                 case 2:
                                     file3 = null;
+
                                     break;
                             }
 
                             dirCnt++;
+
                             break;
                         case 0x21:
-                            if(directory[dOff + 10] == 0x00 && directory[dOff + 20] == 0x00 &&
-                               directory[dOff + 30] == 0x00 && directory[dOff + 31] == 0x00)
+                            if(directory[dOff + 10] == 0x00 &&
+                               directory[dOff + 20] == 0x00 &&
+                               directory[dOff + 30] == 0x00 &&
+                               directory[dOff + 31] == 0x00)
                             {
                                 DateEntry dateEntry =
                                     Marshal.ByteArrayToStructureLittleEndian<DateEntry>(directory, dOff, 32);
@@ -482,11 +573,15 @@ namespace Aaru.Filesystems.CPM
                                 // Entry contains timestamps for last 3 entries, whatever the kind they are.
                                 if(!string.IsNullOrEmpty(file1))
                                 {
-                                    if(statCache.TryGetValue(file1, out fInfo)) statCache.Remove(file1);
-                                    else fInfo = new FileEntryInfo();
+                                    if(statCache.TryGetValue(file1, out fInfo))
+                                        statCache.Remove(file1);
+                                    else
+                                        fInfo = new FileEntryInfo();
 
-                                    if(atime) fInfo.AccessTime = DateHandlers.CpmToDateTime(dateEntry.date1);
-                                    else fInfo.CreationTime    = DateHandlers.CpmToDateTime(dateEntry.date1);
+                                    if(atime)
+                                        fInfo.AccessTime = DateHandlers.CpmToDateTime(dateEntry.date1);
+                                    else
+                                        fInfo.CreationTime = DateHandlers.CpmToDateTime(dateEntry.date1);
 
                                     fInfo.LastWriteTime = DateHandlers.CpmToDateTime(dateEntry.date2);
 
@@ -495,11 +590,15 @@ namespace Aaru.Filesystems.CPM
 
                                 if(!string.IsNullOrEmpty(file2))
                                 {
-                                    if(statCache.TryGetValue(file2, out fInfo)) statCache.Remove(file2);
-                                    else fInfo = new FileEntryInfo();
+                                    if(statCache.TryGetValue(file2, out fInfo))
+                                        statCache.Remove(file2);
+                                    else
+                                        fInfo = new FileEntryInfo();
 
-                                    if(atime) fInfo.AccessTime = DateHandlers.CpmToDateTime(dateEntry.date3);
-                                    else fInfo.CreationTime    = DateHandlers.CpmToDateTime(dateEntry.date3);
+                                    if(atime)
+                                        fInfo.AccessTime = DateHandlers.CpmToDateTime(dateEntry.date3);
+                                    else
+                                        fInfo.CreationTime = DateHandlers.CpmToDateTime(dateEntry.date3);
 
                                     fInfo.LastWriteTime = DateHandlers.CpmToDateTime(dateEntry.date4);
 
@@ -508,11 +607,15 @@ namespace Aaru.Filesystems.CPM
 
                                 if(!string.IsNullOrEmpty(file3))
                                 {
-                                    if(statCache.TryGetValue(file3, out fInfo)) statCache.Remove(file3);
-                                    else fInfo = new FileEntryInfo();
+                                    if(statCache.TryGetValue(file3, out fInfo))
+                                        statCache.Remove(file3);
+                                    else
+                                        fInfo = new FileEntryInfo();
 
-                                    if(atime) fInfo.AccessTime = DateHandlers.CpmToDateTime(dateEntry.date5);
-                                    else fInfo.CreationTime    = DateHandlers.CpmToDateTime(dateEntry.date5);
+                                    if(atime)
+                                        fInfo.AccessTime = DateHandlers.CpmToDateTime(dateEntry.date5);
+                                    else
+                                        fInfo.CreationTime = DateHandlers.CpmToDateTime(dateEntry.date5);
 
                                     fInfo.LastWriteTime = DateHandlers.CpmToDateTime(dateEntry.date6);
 
@@ -524,6 +627,7 @@ namespace Aaru.Filesystems.CPM
                                 file3  = null;
                                 dirCnt = 0;
                             }
+
                             // However, if this byte is 0, timestamp is in Z80DOS or DOS+ format
                             else if(directory[dOff + 1] == 0x00)
                             {
@@ -535,8 +639,10 @@ namespace Aaru.Filesystems.CPM
                                 // Entry contains timestamps for last 3 entries, whatever the kind they are.
                                 if(!string.IsNullOrEmpty(file1))
                                 {
-                                    if(statCache.TryGetValue(file1, out fInfo)) statCache.Remove(file1);
-                                    else fInfo = new FileEntryInfo();
+                                    if(statCache.TryGetValue(file1, out fInfo))
+                                        statCache.Remove(file1);
+                                    else
+                                        fInfo = new FileEntryInfo();
 
                                     byte[] ctime = new byte[4];
                                     ctime[0] = trdPartyDateEntry.create1[0];
@@ -551,8 +657,10 @@ namespace Aaru.Filesystems.CPM
 
                                 if(!string.IsNullOrEmpty(file2))
                                 {
-                                    if(statCache.TryGetValue(file2, out fInfo)) statCache.Remove(file2);
-                                    else fInfo = new FileEntryInfo();
+                                    if(statCache.TryGetValue(file2, out fInfo))
+                                        statCache.Remove(file2);
+                                    else
+                                        fInfo = new FileEntryInfo();
 
                                     byte[] ctime = new byte[4];
                                     ctime[0] = trdPartyDateEntry.create2[0];
@@ -567,8 +675,10 @@ namespace Aaru.Filesystems.CPM
 
                                 if(!string.IsNullOrEmpty(file3))
                                 {
-                                    if(statCache.TryGetValue(file1, out fInfo)) statCache.Remove(file3);
-                                    else fInfo = new FileEntryInfo();
+                                    if(statCache.TryGetValue(file1, out fInfo))
+                                        statCache.Remove(file3);
+                                    else
+                                        fInfo = new FileEntryInfo();
 
                                     byte[] ctime = new byte[4];
                                     ctime[0] = trdPartyDateEntry.create3[0];
@@ -595,18 +705,21 @@ namespace Aaru.Filesystems.CPM
             AaruConsole.DebugWriteLine("CP/M Plugin", "Reading files.");
             long usedBlocks = 0;
             fileCache = new Dictionary<string, byte[]>();
+
             foreach(string filename in dirList)
             {
-                MemoryStream fileMs = new MemoryStream();
+                var fileMs = new MemoryStream();
 
-                if(statCache.TryGetValue(filename, out FileEntryInfo fInfo)) statCache.Remove(filename);
+                if(statCache.TryGetValue(filename, out FileEntryInfo fInfo))
+                    statCache.Remove(filename);
 
                 fInfo.Blocks = 0;
 
                 if(fileExtents.TryGetValue(filename, out Dictionary<int, List<ushort>> extents))
                     for(int ex = 0; ex < extents.Count; ex++)
                     {
-                        if(!extents.TryGetValue(ex, out List<ushort> alBlks)) continue;
+                        if(!extents.TryGetValue(ex, out List<ushort> alBlks))
+                            continue;
 
                         foreach(ushort alBlk in alBlks)
                         {
@@ -628,13 +741,16 @@ namespace Aaru.Filesystems.CPM
             }
 
             decodedPasswordCache = new Dictionary<string, byte[]>();
+
             // For each stored password, store a decoded version of it
             if(passwordCache.Count > 0)
                 foreach(KeyValuePair<string, byte[]> kvp in passwordCache)
                 {
                     byte[] tmp = new byte[8];
                     Array.Copy(kvp.Value, 16, tmp, 0, 8);
-                    for(int t = 0; t < 8; t++) tmp[t] ^= kvp.Value[13];
+
+                    for(int t = 0; t < 8; t++)
+                        tmp[t] ^= kvp.Value[13];
 
                     decodedPasswordCache.Add(kvp.Key, tmp);
                 }
@@ -650,14 +766,12 @@ namespace Aaru.Filesystems.CPM
             // Generate XML info
             XmlFsType = new FileSystemType
             {
-                Clusters              = cpmStat.Blocks,
-                ClusterSize           = (uint)blockSize,
-                Files                 = (ulong)fileCache.Count,
-                FilesSpecified        = true,
-                FreeClusters          = cpmStat.FreeBlocks,
-                FreeClustersSpecified = true,
-                Type                  = "CP/M filesystem"
+                Clusters       = cpmStat.Blocks, ClusterSize = (uint)blockSize,
+                Files          = (ulong)fileCache.Count,
+                FilesSpecified = true, FreeClusters = cpmStat.FreeBlocks, FreeClustersSpecified = true,
+                Type           = "CP/M filesystem"
             };
+
             if(labelCreationDate != null)
             {
                 XmlFsType.CreationDate          = DateHandlers.CpmToDateTime(labelCreationDate);
@@ -670,20 +784,22 @@ namespace Aaru.Filesystems.CPM
                 XmlFsType.ModificationDateSpecified = true;
             }
 
-            if(!string.IsNullOrEmpty(label)) XmlFsType.VolumeName = label;
+            if(!string.IsNullOrEmpty(label))
+                XmlFsType.VolumeName = label;
 
             mounted = true;
+
             return Errno.NoError;
         }
 
-        /// <summary>
-        ///     Gets information about the mounted volume.
-        /// </summary>
+        /// <summary>Gets information about the mounted volume.</summary>
         /// <param name="stat">Information about the mounted volume.</param>
         public Errno StatFs(out FileSystemInfo stat)
         {
             stat = null;
-            if(!mounted) return Errno.AccessDenied;
+
+            if(!mounted)
+                return Errno.AccessDenied;
 
             stat = cpmStat;
 
@@ -703,6 +819,7 @@ namespace Aaru.Filesystems.CPM
             standardTimestamps   = false;
             labelCreationDate    = null;
             labelUpdateDate      = null;
+
             return Errno.NoError;
         }
     }
diff --git a/Aaru.Filesystems/CPM/Xattr.cs b/Aaru.Filesystems/CPM/Xattr.cs
index f516fae17..74927a6b9 100644
--- a/Aaru.Filesystems/CPM/Xattr.cs
+++ b/Aaru.Filesystems/CPM/Xattr.cs
@@ -36,23 +36,28 @@ using Aaru.CommonTypes.Structs;
 
 namespace Aaru.Filesystems.CPM
 {
-    partial class CPM
+    internal partial class CPM
     {
-        /// <summary>
-        ///     Reads an extended attribute, alternate data stream or fork from the given file.
-        /// </summary>
+        /// <summary>Reads an extended attribute, alternate data stream or fork from the given file.</summary>
         /// <returns>Error number.</returns>
         /// <param name="path">File path.</param>
         /// <param name="xattr">Extendad attribute, alternate data stream or fork name.</param>
         /// <param name="buf">Buffer.</param>
         public Errno GetXattr(string path, string xattr, ref byte[] buf)
         {
-            if(!mounted) return Errno.AccessDenied;
+            if(!mounted)
+                return Errno.AccessDenied;
 
-            string[] pathElements = path.Split(new[] {'/'}, StringSplitOptions.RemoveEmptyEntries);
-            if(pathElements.Length != 1) return Errno.NotSupported;
+            string[] pathElements = path.Split(new[]
+            {
+                '/'
+            }, StringSplitOptions.RemoveEmptyEntries);
 
-            if(!fileCache.ContainsKey(pathElements[0].ToUpperInvariant())) return Errno.NoSuchFile;
+            if(pathElements.Length != 1)
+                return Errno.NotSupported;
+
+            if(!fileCache.ContainsKey(pathElements[0].ToUpperInvariant()))
+                return Errno.NoSuchFile;
 
             if(string.Compare(xattr, "com.caldera.cpm.password", StringComparison.InvariantCulture) == 0)
                 if(!passwordCache.TryGetValue(pathElements[0].ToUpperInvariant(), out buf))
@@ -61,29 +66,36 @@ namespace Aaru.Filesystems.CPM
             if(string.Compare(xattr, "com.caldera.cpm.password.text", StringComparison.InvariantCulture) != 0)
                 return Errno.NoSuchExtendedAttribute;
 
-            return !passwordCache.TryGetValue(pathElements[0].ToUpperInvariant(), out buf)
-                       ? Errno.NoError
+            return !passwordCache.TryGetValue(pathElements[0].ToUpperInvariant(), out buf) ? Errno.NoError
                        : Errno.NoSuchExtendedAttribute;
         }
 
-        /// <summary>
-        ///     Lists all extended attributes, alternate data streams and forks of the given file.
-        /// </summary>
+        /// <summary>Lists all extended attributes, alternate data streams and forks of the given file.</summary>
         /// <returns>Error number.</returns>
         /// <param name="path">Path.</param>
         /// <param name="xattrs">List of extended attributes, alternate data streams and forks.</param>
         public Errno ListXAttr(string path, out List<string> xattrs)
         {
             xattrs = null;
-            if(!mounted) return Errno.AccessDenied;
 
-            string[] pathElements = path.Split(new[] {'/'}, StringSplitOptions.RemoveEmptyEntries);
-            if(pathElements.Length != 1) return Errno.NotSupported;
+            if(!mounted)
+                return Errno.AccessDenied;
 
-            if(!fileCache.ContainsKey(pathElements[0].ToUpperInvariant())) return Errno.NoSuchFile;
+            string[] pathElements = path.Split(new[]
+            {
+                '/'
+            }, StringSplitOptions.RemoveEmptyEntries);
+
+            if(pathElements.Length != 1)
+                return Errno.NotSupported;
+
+            if(!fileCache.ContainsKey(pathElements[0].ToUpperInvariant()))
+                return Errno.NoSuchFile;
 
             xattrs = new List<string>();
-            if(passwordCache.ContainsKey(pathElements[0].ToUpperInvariant())) xattrs.Add("com.caldera.cpm.password");
+
+            if(passwordCache.ContainsKey(pathElements[0].ToUpperInvariant()))
+                xattrs.Add("com.caldera.cpm.password");
 
             if(decodedPasswordCache.ContainsKey(pathElements[0].ToUpperInvariant()))
                 xattrs.Add("com.caldera.cpm.password.text");
diff --git a/Aaru.Filesystems/Cram.cs b/Aaru.Filesystems/Cram.cs
index 6b171a84f..6b74b6a40 100644
--- a/Aaru.Filesystems/Cram.cs
+++ b/Aaru.Filesystems/Cram.cs
@@ -42,9 +42,7 @@ namespace Aaru.Filesystems
 {
     public class Cram : IFilesystem
     {
-        /// <summary>
-        ///     Identifier for Cram
-        /// </summary>
+        /// <summary>Identifier for Cram</summary>
         const uint CRAM_MAGIC = 0x28CD3D45;
         const uint CRAM_CIGAM = 0x453DCD28;
 
@@ -56,7 +54,8 @@ namespace Aaru.Filesystems
 
         public bool Identify(IMediaImage imagePlugin, Partition partition)
         {
-            if(partition.Start >= partition.End) return false;
+            if(partition.Start >= partition.End)
+                return false;
 
             byte[] sector = imagePlugin.ReadSector(partition.Start);
 
@@ -66,27 +65,29 @@ namespace Aaru.Filesystems
         }
 
         public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding    encoding)
+                                   Encoding encoding)
         {
             Encoding = encoding ?? Encoding.GetEncoding("iso-8859-15");
             byte[] sector = imagePlugin.ReadSector(partition.Start);
             uint   magic  = BitConverter.ToUInt32(sector, 0x00);
 
-            CramSuperBlock crSb         = new CramSuperBlock();
-            bool           littleEndian = true;
+            var  crSb         = new CramSuperBlock();
+            bool littleEndian = true;
 
             switch(magic)
             {
                 case CRAM_MAGIC:
                     crSb = Marshal.ByteArrayToStructureLittleEndian<CramSuperBlock>(sector);
+
                     break;
                 case CRAM_CIGAM:
                     crSb         = Marshal.ByteArrayToStructureBigEndian<CramSuperBlock>(sector);
                     littleEndian = false;
+
                     break;
             }
 
-            StringBuilder sbInformation = new StringBuilder();
+            var sbInformation = new StringBuilder();
 
             sbInformation.AppendLine("Cram file system");
             sbInformation.AppendLine(littleEndian ? "Little-endian" : "Big-endian");
@@ -100,40 +101,34 @@ namespace Aaru.Filesystems
 
             XmlFsType = new FileSystemType
             {
-                VolumeName            = StringHandlers.CToString(crSb.name, Encoding),
-                Type                  = "Cram file system",
-                Clusters              = crSb.blocks,
-                Files                 = crSb.files,
-                FilesSpecified        = true,
-                FreeClusters          = 0,
+                VolumeName            = StringHandlers.CToString(crSb.name, Encoding), Type = "Cram file system",
+                Clusters              = crSb.blocks, Files                                  = crSb.files,
+                FilesSpecified        = true, FreeClusters                                  = 0,
                 FreeClustersSpecified = true
             };
         }
 
         enum CramCompression : ushort
         {
-            Zlib = 1,
-            Lzma = 2,
-            Lzo  = 3,
-            Xz   = 4,
-            Lz4  = 5
+            Zlib = 1, Lzma = 2, Lzo = 3,
+            Xz   = 4, Lz4  = 5
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct CramSuperBlock
         {
-            public uint magic;
-            public uint size;
-            public uint flags;
-            public uint future;
+            public readonly uint magic;
+            public readonly uint size;
+            public readonly uint flags;
+            public readonly uint future;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public byte[] signature;
-            public uint crc;
-            public uint edition;
-            public uint blocks;
-            public uint files;
+            public readonly byte[] signature;
+            public readonly uint crc;
+            public readonly uint edition;
+            public readonly uint blocks;
+            public readonly uint files;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public byte[] name;
+            public readonly byte[] name;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/ECMA67.cs b/Aaru.Filesystems/ECMA67.cs
index 8a78566a2..0311b5458 100644
--- a/Aaru.Filesystems/ECMA67.cs
+++ b/Aaru.Filesystems/ECMA67.cs
@@ -43,7 +43,10 @@ namespace Aaru.Filesystems
 {
     public class ECMA67 : IFilesystem
     {
-        readonly byte[] ecma67_magic = {0x56, 0x4F, 0x4C};
+        readonly byte[] ecma67_magic =
+        {
+            0x56, 0x4F, 0x4C
+        };
 
         public Encoding       Encoding  { get; private set; }
         public string         Name      => "ECMA-67";
@@ -53,13 +56,16 @@ namespace Aaru.Filesystems
 
         public bool Identify(IMediaImage imagePlugin, Partition partition)
         {
-            if(partition.Start > 0) return false;
+            if(partition.Start > 0)
+                return false;
 
-            if(partition.End < 8) return false;
+            if(partition.End < 8)
+                return false;
 
             byte[] sector = imagePlugin.ReadSector(6);
 
-            if(sector.Length != 128) return false;
+            if(sector.Length != 128)
+                return false;
 
             VolumeLabel vol = Marshal.ByteArrayToStructureLittleEndian<VolumeLabel>(sector);
 
@@ -67,12 +73,12 @@ namespace Aaru.Filesystems
         }
 
         public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding    encoding)
+                                   Encoding encoding)
         {
             Encoding = encoding ?? Encoding.GetEncoding("iso-8859-1");
             byte[] sector = imagePlugin.ReadSector(6);
 
-            StringBuilder sbInformation = new StringBuilder();
+            var sbInformation = new StringBuilder();
 
             VolumeLabel vol = Marshal.ByteArrayToStructureLittleEndian<VolumeLabel>(sector);
 
@@ -83,10 +89,8 @@ namespace Aaru.Filesystems
 
             XmlFsType = new FileSystemType
             {
-                Type        = "ECMA-67",
-                ClusterSize = 256,
-                Clusters    = partition.End - partition.Start + 1,
-                VolumeName  = Encoding.ASCII.GetString(vol.volumeIdentifier)
+                Type       = "ECMA-67", ClusterSize = 256, Clusters = (partition.End - partition.Start) + 1,
+                VolumeName = Encoding.ASCII.GetString(vol.volumeIdentifier)
             };
 
             information = sbInformation.ToString();
diff --git a/Aaru.Filesystems/EFS.cs b/Aaru.Filesystems/EFS.cs
index d1af06203..d2d47560f 100644
--- a/Aaru.Filesystems/EFS.cs
+++ b/Aaru.Filesystems/EFS.cs
@@ -56,16 +56,21 @@ namespace Aaru.Filesystems
 
         public bool Identify(IMediaImage imagePlugin, Partition partition)
         {
-            if(imagePlugin.Info.SectorSize < 512) return false;
+            if(imagePlugin.Info.SectorSize < 512)
+                return false;
 
             // Misaligned
             if(imagePlugin.Info.XmlMediaType == XmlMediaType.OpticalDisc)
             {
                 uint sbSize = (uint)((Marshal.SizeOf<EFS_Superblock>() + 0x200) / imagePlugin.Info.SectorSize);
-                if((Marshal.SizeOf<EFS_Superblock>() + 0x200) % imagePlugin.Info.SectorSize != 0) sbSize++;
+
+                if((Marshal.SizeOf<EFS_Superblock>() + 0x200) % imagePlugin.Info.SectorSize != 0)
+                    sbSize++;
 
                 byte[] sector = imagePlugin.ReadSectors(partition.Start, sbSize);
-                if(sector.Length < Marshal.SizeOf<EFS_Superblock>()) return false;
+
+                if(sector.Length < Marshal.SizeOf<EFS_Superblock>())
+                    return false;
 
                 byte[] sbpiece = new byte[Marshal.SizeOf<EFS_Superblock>()];
 
@@ -74,46 +79,60 @@ namespace Aaru.Filesystems
                 EFS_Superblock efsSb = Marshal.ByteArrayToStructureBigEndian<EFS_Superblock>(sbpiece);
 
                 AaruConsole.DebugWriteLine("EFS plugin", "magic at 0x{0:X3} = 0x{1:X8} (expected 0x{2:X8} or 0x{3:X8})",
-                                          0x200, efsSb.sb_magic, EFS_MAGIC, EFS_MAGIC_NEW);
+                                           0x200, efsSb.sb_magic, EFS_MAGIC, EFS_MAGIC_NEW);
 
-                if(efsSb.sb_magic == EFS_MAGIC || efsSb.sb_magic == EFS_MAGIC_NEW) return true;
+                if(efsSb.sb_magic == EFS_MAGIC ||
+                   efsSb.sb_magic == EFS_MAGIC_NEW)
+                    return true;
             }
             else
             {
                 uint sbSize = (uint)(Marshal.SizeOf<EFS_Superblock>() / imagePlugin.Info.SectorSize);
-                if(Marshal.SizeOf<EFS_Superblock>() % imagePlugin.Info.SectorSize != 0) sbSize++;
+
+                if(Marshal.SizeOf<EFS_Superblock>() % imagePlugin.Info.SectorSize != 0)
+                    sbSize++;
 
                 byte[] sector = imagePlugin.ReadSectors(partition.Start + 1, sbSize);
-                if(sector.Length < Marshal.SizeOf<EFS_Superblock>()) return false;
+
+                if(sector.Length < Marshal.SizeOf<EFS_Superblock>())
+                    return false;
 
                 EFS_Superblock efsSb = Marshal.ByteArrayToStructureBigEndian<EFS_Superblock>(sector);
 
                 AaruConsole.DebugWriteLine("EFS plugin", "magic at {0} = 0x{1:X8} (expected 0x{2:X8} or 0x{3:X8})", 1,
-                                          efsSb.sb_magic, EFS_MAGIC, EFS_MAGIC_NEW);
+                                           efsSb.sb_magic, EFS_MAGIC, EFS_MAGIC_NEW);
 
-                if(efsSb.sb_magic == EFS_MAGIC || efsSb.sb_magic == EFS_MAGIC_NEW) return true;
+                if(efsSb.sb_magic == EFS_MAGIC ||
+                   efsSb.sb_magic == EFS_MAGIC_NEW)
+                    return true;
             }
 
             return false;
         }
 
         public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding    encoding)
+                                   Encoding encoding)
         {
             Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-15");
             information = "";
-            if(imagePlugin.Info.SectorSize < 512) return;
 
-            EFS_Superblock efsSb = new EFS_Superblock();
+            if(imagePlugin.Info.SectorSize < 512)
+                return;
+
+            var efsSb = new EFS_Superblock();
 
             // Misaligned
             if(imagePlugin.Info.XmlMediaType == XmlMediaType.OpticalDisc)
             {
                 uint sbSize = (uint)((Marshal.SizeOf<EFS_Superblock>() + 0x400) / imagePlugin.Info.SectorSize);
-                if((Marshal.SizeOf<EFS_Superblock>() + 0x400) % imagePlugin.Info.SectorSize != 0) sbSize++;
+
+                if((Marshal.SizeOf<EFS_Superblock>() + 0x400) % imagePlugin.Info.SectorSize != 0)
+                    sbSize++;
 
                 byte[] sector = imagePlugin.ReadSectors(partition.Start, sbSize);
-                if(sector.Length < Marshal.SizeOf<EFS_Superblock>()) return;
+
+                if(sector.Length < Marshal.SizeOf<EFS_Superblock>())
+                    return;
 
                 byte[] sbpiece = new byte[Marshal.SizeOf<EFS_Superblock>()];
 
@@ -122,28 +141,37 @@ namespace Aaru.Filesystems
                 efsSb = Marshal.ByteArrayToStructureBigEndian<EFS_Superblock>(sbpiece);
 
                 AaruConsole.DebugWriteLine("EFS plugin", "magic at 0x{0:X3} = 0x{1:X8} (expected 0x{2:X8} or 0x{3:X8})",
-                                          0x200, efsSb.sb_magic, EFS_MAGIC, EFS_MAGIC_NEW);
+                                           0x200, efsSb.sb_magic, EFS_MAGIC, EFS_MAGIC_NEW);
             }
             else
             {
                 uint sbSize = (uint)(Marshal.SizeOf<EFS_Superblock>() / imagePlugin.Info.SectorSize);
-                if(Marshal.SizeOf<EFS_Superblock>() % imagePlugin.Info.SectorSize != 0) sbSize++;
+
+                if(Marshal.SizeOf<EFS_Superblock>() % imagePlugin.Info.SectorSize != 0)
+                    sbSize++;
 
                 byte[] sector = imagePlugin.ReadSectors(partition.Start + 1, sbSize);
-                if(sector.Length < Marshal.SizeOf<EFS_Superblock>()) return;
+
+                if(sector.Length < Marshal.SizeOf<EFS_Superblock>())
+                    return;
 
                 efsSb = Marshal.ByteArrayToStructureBigEndian<EFS_Superblock>(sector);
 
                 AaruConsole.DebugWriteLine("EFS plugin", "magic at {0} = 0x{1:X8} (expected 0x{2:X8} or 0x{3:X8})", 1,
-                                          efsSb.sb_magic, EFS_MAGIC, EFS_MAGIC_NEW);
+                                           efsSb.sb_magic, EFS_MAGIC, EFS_MAGIC_NEW);
             }
 
-            if(efsSb.sb_magic != EFS_MAGIC && efsSb.sb_magic != EFS_MAGIC_NEW) return;
+            if(efsSb.sb_magic != EFS_MAGIC &&
+               efsSb.sb_magic != EFS_MAGIC_NEW)
+                return;
 
-            StringBuilder sb = new StringBuilder();
+            var sb = new StringBuilder();
 
             sb.AppendLine("SGI extent filesystem");
-            if(efsSb.sb_magic == EFS_MAGIC_NEW) sb.AppendLine("New version");
+
+            if(efsSb.sb_magic == EFS_MAGIC_NEW)
+                sb.AppendLine("New version");
+
             sb.AppendFormat("Filesystem size: {0} basic blocks", efsSb.sb_size).AppendLine();
             sb.AppendFormat("First cylinder group starts at block {0}", efsSb.sb_firstcg).AppendLine();
             sb.AppendFormat("Cylinder group size: {0} basic blocks", efsSb.sb_cgfsize).AppendLine();
@@ -155,11 +183,19 @@ namespace Aaru.Filesystems
             sb.AppendFormat("{0} bytes on bitmap", efsSb.sb_bmsize).AppendLine();
             sb.AppendFormat("{0} free blocks", efsSb.sb_tfree).AppendLine();
             sb.AppendFormat("{0} free inodes", efsSb.sb_tinode).AppendLine();
-            if(efsSb.sb_bmblock > 0) sb.AppendFormat("Bitmap resides at block {0}", efsSb.sb_bmblock).AppendLine();
+
+            if(efsSb.sb_bmblock > 0)
+                sb.AppendFormat("Bitmap resides at block {0}", efsSb.sb_bmblock).AppendLine();
+
             if(efsSb.sb_replsb > 0)
                 sb.AppendFormat("Replacement superblock resides at block {0}", efsSb.sb_replsb).AppendLine();
-            if(efsSb.sb_lastinode > 0) sb.AppendFormat("Last inode allocated: {0}", efsSb.sb_lastinode).AppendLine();
-            if(efsSb.sb_dirty     > 0) sb.AppendLine("Volume is dirty");
+
+            if(efsSb.sb_lastinode > 0)
+                sb.AppendFormat("Last inode allocated: {0}", efsSb.sb_lastinode).AppendLine();
+
+            if(efsSb.sb_dirty > 0)
+                sb.AppendLine("Volume is dirty");
+
             sb.AppendFormat("Checksum: 0x{0:X8}", efsSb.sb_checksum).AppendLine();
             sb.AppendFormat("Volume name: {0}", StringHandlers.CToString(efsSb.sb_fname, Encoding)).AppendLine();
             sb.AppendFormat("Volume pack: {0}", StringHandlers.CToString(efsSb.sb_fpack, Encoding)).AppendLine();
@@ -168,11 +204,9 @@ namespace Aaru.Filesystems
 
             XmlFsType = new FileSystemType
             {
-                Type                  = "Extent File System",
-                ClusterSize           = 512,
+                Type                  = "Extent File System", ClusterSize = 512,
                 Clusters              = (ulong)efsSb.sb_size,
-                FreeClusters          = (ulong)efsSb.sb_tfree,
-                FreeClustersSpecified = true,
+                FreeClusters          = (ulong)efsSb.sb_tfree, FreeClustersSpecified = true,
                 Dirty                 = efsSb.sb_dirty > 0,
                 VolumeName            = StringHandlers.CToString(efsSb.sb_fname, Encoding),
                 VolumeSerial          = $"{efsSb.sb_checksum:X8}",
@@ -181,8 +215,7 @@ namespace Aaru.Filesystems
             };
         }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        [SuppressMessage("ReSharper", "InconsistentNaming")]
+        [StructLayout(LayoutKind.Sequential, Pack = 1), SuppressMessage("ReSharper", "InconsistentNaming")]
         struct EFS_Superblock
         {
             /* 0:   fs size incl. bb 0 (in bb) */
diff --git a/Aaru.Filesystems/F2FS.cs b/Aaru.Filesystems/F2FS.cs
index 33eb1e847..8c952ce76 100644
--- a/Aaru.Filesystems/F2FS.cs
+++ b/Aaru.Filesystems/F2FS.cs
@@ -57,19 +57,27 @@ namespace Aaru.Filesystems
 
         public bool Identify(IMediaImage imagePlugin, Partition partition)
         {
-            if(imagePlugin.Info.SectorSize < F2FS_MIN_SECTOR || imagePlugin.Info.SectorSize > F2FS_MAX_SECTOR)
+            if(imagePlugin.Info.SectorSize < F2FS_MIN_SECTOR ||
+               imagePlugin.Info.SectorSize > F2FS_MAX_SECTOR)
                 return false;
 
-            uint sbAddr            = F2FS_SUPER_OFFSET / imagePlugin.Info.SectorSize;
-            if(sbAddr == 0) sbAddr = 1;
+            uint sbAddr = F2FS_SUPER_OFFSET / imagePlugin.Info.SectorSize;
+
+            if(sbAddr == 0)
+                sbAddr = 1;
 
             uint sbSize = (uint)(Marshal.SizeOf<F2FS_Superblock>() / imagePlugin.Info.SectorSize);
-            if(Marshal.SizeOf<F2FS_Superblock>() % imagePlugin.Info.SectorSize != 0) sbSize++;
 
-            if(partition.Start + sbAddr >= partition.End) return false;
+            if(Marshal.SizeOf<F2FS_Superblock>() % imagePlugin.Info.SectorSize != 0)
+                sbSize++;
+
+            if(partition.Start + sbAddr >= partition.End)
+                return false;
 
             byte[] sector = imagePlugin.ReadSectors(partition.Start + sbAddr, sbSize);
-            if(sector.Length < Marshal.SizeOf<F2FS_Superblock>()) return false;
+
+            if(sector.Length < Marshal.SizeOf<F2FS_Superblock>())
+                return false;
 
             F2FS_Superblock f2fsSb = Marshal.ByteArrayToStructureLittleEndian<F2FS_Superblock>(sector);
 
@@ -77,32 +85,44 @@ namespace Aaru.Filesystems
         }
 
         public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding    encoding)
+                                   Encoding encoding)
         {
             Encoding    = Encoding.Unicode;
             information = "";
-            if(imagePlugin.Info.SectorSize < F2FS_MIN_SECTOR || imagePlugin.Info.SectorSize > F2FS_MAX_SECTOR) return;
 
-            uint sbAddr            = F2FS_SUPER_OFFSET / imagePlugin.Info.SectorSize;
-            if(sbAddr == 0) sbAddr = 1;
+            if(imagePlugin.Info.SectorSize < F2FS_MIN_SECTOR ||
+               imagePlugin.Info.SectorSize > F2FS_MAX_SECTOR)
+                return;
+
+            uint sbAddr = F2FS_SUPER_OFFSET / imagePlugin.Info.SectorSize;
+
+            if(sbAddr == 0)
+                sbAddr = 1;
 
             uint sbSize = (uint)(Marshal.SizeOf<F2FS_Superblock>() / imagePlugin.Info.SectorSize);
-            if(Marshal.SizeOf<F2FS_Superblock>() % imagePlugin.Info.SectorSize != 0) sbSize++;
+
+            if(Marshal.SizeOf<F2FS_Superblock>() % imagePlugin.Info.SectorSize != 0)
+                sbSize++;
 
             byte[] sector = imagePlugin.ReadSectors(partition.Start + sbAddr, sbSize);
-            if(sector.Length < Marshal.SizeOf<F2FS_Superblock>()) return;
+
+            if(sector.Length < Marshal.SizeOf<F2FS_Superblock>())
+                return;
 
             F2FS_Superblock f2fsSb = Marshal.ByteArrayToStructureLittleEndian<F2FS_Superblock>(sector);
 
-            if(f2fsSb.magic != F2FS_MAGIC) return;
+            if(f2fsSb.magic != F2FS_MAGIC)
+                return;
 
-            StringBuilder sb = new StringBuilder();
+            var sb = new StringBuilder();
 
             sb.AppendLine("F2FS filesystem");
             sb.AppendFormat("Version {0}.{1}", f2fsSb.major_ver, f2fsSb.minor_ver).AppendLine();
             sb.AppendFormat("{0} bytes per sector", 1 << (int)f2fsSb.log_sectorsize).AppendLine();
+
             sb.AppendFormat("{0} sectors ({1} bytes) per block", 1 << (int)f2fsSb.log_sectors_per_block,
                             1                                      << (int)f2fsSb.log_blocksize).AppendLine();
+
             sb.AppendFormat("{0} blocks per segment", f2fsSb.log_blocks_per_seg).AppendLine();
             sb.AppendFormat("{0} blocks in volume", f2fsSb.block_count).AppendLine();
             sb.AppendFormat("{0} segments per section", f2fsSb.segs_per_sec).AppendLine();
@@ -111,29 +131,29 @@ namespace Aaru.Filesystems
             sb.AppendFormat("{0} segments", f2fsSb.segment_count).AppendLine();
             sb.AppendFormat("Root directory resides on inode {0}", f2fsSb.root_ino).AppendLine();
             sb.AppendFormat("Volume UUID: {0}", f2fsSb.uuid).AppendLine();
-            sb.AppendFormat("Volume name: {0}", StringHandlers.CToString(f2fsSb.volume_name, Encoding.Unicode, true))
-              .AppendLine();
-            sb.AppendFormat("Volume last mounted on kernel version: {0}", StringHandlers.CToString(f2fsSb.version))
-              .AppendLine();
-            sb.AppendFormat("Volume created on kernel version: {0}", StringHandlers.CToString(f2fsSb.init_version))
-              .AppendLine();
+
+            sb.AppendFormat("Volume name: {0}", StringHandlers.CToString(f2fsSb.volume_name, Encoding.Unicode, true)).
+               AppendLine();
+
+            sb.AppendFormat("Volume last mounted on kernel version: {0}", StringHandlers.CToString(f2fsSb.version)).
+               AppendLine();
+
+            sb.AppendFormat("Volume created on kernel version: {0}", StringHandlers.CToString(f2fsSb.init_version)).
+               AppendLine();
 
             information = sb.ToString();
 
             XmlFsType = new FileSystemType
             {
-                Type                   = "F2FS filesystem",
-                SystemIdentifier       = Encoding.ASCII.GetString(f2fsSb.version),
-                Clusters               = f2fsSb.block_count,
-                ClusterSize            = (uint)(1 << (int)f2fsSb.log_blocksize),
+                Type                   = "F2FS filesystem", SystemIdentifier = Encoding.ASCII.GetString(f2fsSb.version),
+                Clusters               = f2fsSb.block_count, ClusterSize     = (uint)(1 << (int)f2fsSb.log_blocksize),
                 DataPreparerIdentifier = Encoding.ASCII.GetString(f2fsSb.init_version),
                 VolumeName             = StringHandlers.CToString(f2fsSb.volume_name, Encoding.Unicode, true),
                 VolumeSerial           = f2fsSb.uuid.ToString()
             };
         }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        [SuppressMessage("ReSharper", "InconsistentNaming")]
+        [StructLayout(LayoutKind.Sequential, Pack = 1), SuppressMessage("ReSharper", "InconsistentNaming")]
         struct F2FS_Superblock
         {
             public readonly uint   magic;
diff --git a/Aaru.Filesystems/FAT/BPB.cs b/Aaru.Filesystems/FAT/BPB.cs
index 41e451977..9d14ea020 100644
--- a/Aaru.Filesystems/FAT/BPB.cs
+++ b/Aaru.Filesystems/FAT/BPB.cs
@@ -44,12 +44,10 @@ namespace Aaru.Filesystems.FAT
 {
     public partial class FAT
     {
-        static BpbKind DetectBpbKind(byte[]                     bpbSector, IMediaImage imagePlugin,
-                                     Partition                  partition,
+        static BpbKind DetectBpbKind(byte[] bpbSector, IMediaImage imagePlugin, Partition partition,
                                      out BiosParameterBlockEbpb fakeBpb, out HumanParameterBlock humanBpb,
-                                     out AtariParameterBlock    atariBpb,
-                                     out byte                   minBootNearJump,
-                                     out bool                   andosOemCorrect, out bool bootable)
+                                     out AtariParameterBlock atariBpb, out byte minBootNearJump,
+                                     out bool andosOemCorrect, out bool bootable)
         {
             fakeBpb         = new BiosParameterBlockEbpb();
             minBootNearJump = 0;
@@ -62,9 +60,8 @@ namespace Aaru.Filesystems.FAT
             ulong expectedClusters = humanBpb.bpc > 0 ? partition.Size / humanBpb.bpc : 0;
 
             // Check clusters for Human68k are correct
-            bool humanClustersCorrect = humanBpb.clusters           == 0
-                                            ? humanBpb.big_clusters == expectedClusters
-                                            : humanBpb.clusters     == expectedClusters;
+            bool humanClustersCorrect = humanBpb.clusters       == 0 ? humanBpb.big_clusters == expectedClusters
+                                            : humanBpb.clusters == expectedClusters;
 
             // Check OEM for Human68k is correct
             bool humanOemCorrect = bpbSector[2]  >= 0x20 && bpbSector[3]  >= 0x20 && bpbSector[4]  >= 0x20 &&
@@ -78,11 +75,12 @@ namespace Aaru.Filesystems.FAT
             bool humanBranchCorrect = bpbSector[0] == 0x60 && bpbSector[1] >= 0x1C && bpbSector[1] < 0xFE;
 
             AaruConsole.DebugWriteLine("FAT plugin", "humanClustersCorrect = {0}", humanClustersCorrect);
-            AaruConsole.DebugWriteLine("FAT plugin", "humanOemCorrect = {0}",      humanOemCorrect);
-            AaruConsole.DebugWriteLine("FAT plugin", "humanBranchCorrect = {0}",   humanBranchCorrect);
+            AaruConsole.DebugWriteLine("FAT plugin", "humanOemCorrect = {0}", humanOemCorrect);
+            AaruConsole.DebugWriteLine("FAT plugin", "humanBranchCorrect = {0}", humanBranchCorrect);
 
             // If all Human68k checks are correct, it is a Human68k FAT16
             bool useHumanBpb = humanClustersCorrect && humanOemCorrect && humanBranchCorrect && expectedClusters > 0;
+
             if(useHumanBpb)
             {
                 AaruConsole.DebugWriteLine("FAT plugin", "Using Human68k BPB");
@@ -103,16 +101,16 @@ namespace Aaru.Filesystems.FAT
                 return BpbKind.Human;
             }
 
-            MsxParameterBlock           msxBpb        = new MsxParameterBlock();
-            BiosParameterBlock2         dos2Bpb       = new BiosParameterBlock2();
-            BiosParameterBlock30        dos30Bpb      = new BiosParameterBlock30();
-            BiosParameterBlock32        dos32Bpb      = new BiosParameterBlock32();
-            BiosParameterBlock33        dos33Bpb      = new BiosParameterBlock33();
-            BiosParameterBlockShortEbpb shortEbpb     = new BiosParameterBlockShortEbpb();
-            BiosParameterBlockEbpb      ebpb          = new BiosParameterBlockEbpb();
-            Fat32ParameterBlockShort    shortFat32Bpb = new Fat32ParameterBlockShort();
-            Fat32ParameterBlock         fat32Bpb      = new Fat32ParameterBlock();
-            ApricotLabel                apricotBpb    = new ApricotLabel();
+            var msxBpb        = new MsxParameterBlock();
+            var dos2Bpb       = new BiosParameterBlock2();
+            var dos30Bpb      = new BiosParameterBlock30();
+            var dos32Bpb      = new BiosParameterBlock32();
+            var dos33Bpb      = new BiosParameterBlock33();
+            var shortEbpb     = new BiosParameterBlockShortEbpb();
+            var ebpb          = new BiosParameterBlockEbpb();
+            var shortFat32Bpb = new Fat32ParameterBlockShort();
+            var fat32Bpb      = new Fat32ParameterBlock();
+            var apricotBpb    = new ApricotLabel();
 
             bool useAtariBpb          = false;
             bool useMsxBpb            = false;
@@ -127,7 +125,8 @@ namespace Aaru.Filesystems.FAT
             bool useApricotBpb        = false;
             bool useDecRainbowBpb     = false;
 
-            if(imagePlugin.Info.SectorSize >= 256 && !useHumanBpb)
+            if(imagePlugin.Info.SectorSize >= 256 &&
+               !useHumanBpb)
             {
                 msxBpb        = Marshal.ByteArrayToStructureLittleEndian<MsxParameterBlock>(bpbSector);
                 dos2Bpb       = Marshal.ByteArrayToStructureLittleEndian<BiosParameterBlock2>(bpbSector);
@@ -149,18 +148,23 @@ namespace Aaru.Filesystems.FAT
 
                 bool correctSpcMsx = msxBpb.spc == 1  || msxBpb.spc == 2  || msxBpb.spc == 4 || msxBpb.spc == 8 ||
                                      msxBpb.spc == 16 || msxBpb.spc == 32 || msxBpb.spc == 64;
+
                 bool correctSpcDos33 = dos33Bpb.spc == 1 || dos33Bpb.spc == 2  || dos33Bpb.spc == 4  ||
                                        dos33Bpb.spc == 8 || dos33Bpb.spc == 16 || dos33Bpb.spc == 32 ||
                                        dos33Bpb.spc == 64;
+
                 bool correctSpcDos40 = ebpb.spc == 1  || ebpb.spc == 2  || ebpb.spc == 4 || ebpb.spc == 8 ||
                                        ebpb.spc == 16 || ebpb.spc == 32 || ebpb.spc == 64;
+
                 bool correctSpcFat32Short = shortFat32Bpb.spc == 1  || shortFat32Bpb.spc == 2  ||
                                             shortFat32Bpb.spc == 4  || shortFat32Bpb.spc == 8  ||
                                             shortFat32Bpb.spc == 16 || shortFat32Bpb.spc == 32 ||
                                             shortFat32Bpb.spc == 64;
+
                 bool correctSpcFat32 = fat32Bpb.spc == 1 || fat32Bpb.spc == 2  || fat32Bpb.spc == 4  ||
                                        fat32Bpb.spc == 8 || fat32Bpb.spc == 16 || fat32Bpb.spc == 32 ||
                                        fat32Bpb.spc == 64;
+
                 bool correctSpcApricot = apricotBpb.mainBPB.spc == 1  || apricotBpb.mainBPB.spc == 2  ||
                                          apricotBpb.mainBPB.spc == 4  || apricotBpb.mainBPB.spc == 8  ||
                                          apricotBpb.mainBPB.spc == 16 || apricotBpb.mainBPB.spc == 32 ||
@@ -193,54 +197,71 @@ namespace Aaru.Filesystems.FAT
                                   dos33Bpb.oem_name[4] >= 0x20 && dos33Bpb.oem_name[5] >= 0x20 &&
                                   dos33Bpb.oem_name[6] >= 0x20 && dos33Bpb.oem_name[7] >= 0x20;
 
-                if(bitsInBpsFat32                             == 1 && correctSpcFat32 && fat32Bpb.fats_no <= 2 &&
-                   fat32Bpb.sectors                           == 0 &&
-                   fat32Bpb.spfat                             == 0 && fat32Bpb.signature == 0x29 &&
+                if(bitsInBpsFat32 == 1                                &&
+                   correctSpcFat32                                    &&
+                   fat32Bpb.fats_no                           <= 2    &&
+                   fat32Bpb.sectors                           == 0    &&
+                   fat32Bpb.spfat                             == 0    &&
+                   fat32Bpb.signature                         == 0x29 &&
                    Encoding.ASCII.GetString(fat32Bpb.fs_type) == "FAT32   ")
                 {
                     AaruConsole.DebugWriteLine("FAT plugin", "Using FAT32 BPB");
                     useLongFat32    = true;
                     minBootNearJump = 0x58;
+
                     return BpbKind.LongFat32;
                 }
 
-                if(bitsInBpsFat32Short     == 1 && correctSpcFat32Short && shortFat32Bpb.fats_no <= 2 &&
-                   shortFat32Bpb.sectors   == 0 && shortFat32Bpb.spfat                           == 0 &&
+                if(bitsInBpsFat32Short == 1     &&
+                   correctSpcFat32Short         &&
+                   shortFat32Bpb.fats_no   <= 2 &&
+                   shortFat32Bpb.sectors   == 0 &&
+                   shortFat32Bpb.spfat     == 0 &&
                    shortFat32Bpb.signature == 0x28)
                 {
                     AaruConsole.DebugWriteLine("FAT plugin", "Using short FAT32 BPB");
+
                     useShortFat32 = shortFat32Bpb.big_sectors        == 0
-                                        ? shortFat32Bpb.huge_sectors <= partition.End - partition.Start + 1
-                                        : shortFat32Bpb.big_sectors  <= partition.End - partition.Start + 1;
+                                        ? shortFat32Bpb.huge_sectors <= (partition.End - partition.Start) + 1
+                                        : shortFat32Bpb.big_sectors  <= (partition.End - partition.Start) + 1;
+
                     minBootNearJump = 0x57;
+
                     return BpbKind.ShortFat32;
                 }
 
-                if(bitsInBpsMsx                            == 1                                   && correctSpcMsx       &&
-                   msxBpb.fats_no                          <= 2                                   && msxBpb.root_ent > 0 &&
-                   msxBpb.sectors                          <= partition.End - partition.Start + 1 &&
-                   msxBpb.spfat                            > 0                                    &&
+                if(bitsInBpsMsx == 1                                                                &&
+                   correctSpcMsx                                                                    &&
+                   msxBpb.fats_no                          <= 2                                     &&
+                   msxBpb.root_ent                         > 0                                      &&
+                   msxBpb.sectors                          <= (partition.End - partition.Start) + 1 &&
+                   msxBpb.spfat                            > 0                                      &&
                    Encoding.ASCII.GetString(msxBpb.vol_id) == "VOL_ID")
                 {
                     AaruConsole.DebugWriteLine("FAT plugin", "Using MSX BPB");
                     useMsxBpb = true;
                 }
-                else if(bitsInBpsApricot            == 1                                   && correctSpcApricot &&
-                        apricotBpb.mainBPB.fats_no  <= 2                                   &&
-                        apricotBpb.mainBPB.root_ent > 0                                    &&
-                        apricotBpb.mainBPB.sectors  <= partition.End - partition.Start + 1 &&
-                        apricotBpb.mainBPB.spfat    > 0                                    &&
+                else if(bitsInBpsApricot == 1                                                &&
+                        correctSpcApricot                                                    &&
+                        apricotBpb.mainBPB.fats_no  <= 2                                     &&
+                        apricotBpb.mainBPB.root_ent > 0                                      &&
+                        apricotBpb.mainBPB.sectors  <= (partition.End - partition.Start) + 1 &&
+                        apricotBpb.mainBPB.spfat    > 0                                      &&
                         apricotBpb.partitionCount   == 0)
                 {
                     AaruConsole.DebugWriteLine("FAT plugin", "Using Apricot BPB");
                     useApricotBpb = true;
                 }
-                else if(bitsInBpsDos40 == 1 && correctSpcDos40 && ebpb.fats_no <= 2 && ebpb.root_ent > 0 &&
-                        ebpb.spfat     > 0  && (ebpb.signature == 0x28 || ebpb.signature == 0x29 || andosOemCorrect))
+                else if(bitsInBpsDos40 == 1 &&
+                        correctSpcDos40     &&
+                        ebpb.fats_no  <= 2  &&
+                        ebpb.root_ent > 0   &&
+                        ebpb.spfat    > 0   &&
+                        (ebpb.signature == 0x28 || ebpb.signature == 0x29 || andosOemCorrect))
                 {
                     if(ebpb.sectors == 0)
                     {
-                        if(ebpb.big_sectors <= partition.End - partition.Start + 1)
+                        if(ebpb.big_sectors <= (partition.End - partition.Start) + 1)
                             if(ebpb.signature == 0x29 || andosOemCorrect)
                             {
                                 AaruConsole.DebugWriteLine("FAT plugin", "Using DOS 4.0 BPB");
@@ -254,7 +275,7 @@ namespace Aaru.Filesystems.FAT
                                 minBootNearJump      = 0x29;
                             }
                     }
-                    else if(ebpb.sectors <= partition.End - partition.Start + 1)
+                    else if(ebpb.sectors <= (partition.End - partition.Start) + 1)
                         if(ebpb.signature == 0x29 || andosOemCorrect)
                         {
                             AaruConsole.DebugWriteLine("FAT plugin", "Using DOS 4.0 BPB");
@@ -268,21 +289,28 @@ namespace Aaru.Filesystems.FAT
                             minBootNearJump      = 0x29;
                         }
                 }
-                else if(bitsInBpsDos33    == 1                              && correctSpcDos33 &&
+                else if(bitsInBpsDos33 == 1                                 &&
+                        correctSpcDos33                                     &&
                         dos33Bpb.rsectors < partition.End - partition.Start &&
                         dos33Bpb.fats_no  <= 2                              &&
-                        dos33Bpb.root_ent > 0                               && dos33Bpb.spfat > 0)
-                    if(dos33Bpb.sectors     == 0 && dos33Bpb.hsectors <= partition.Start && dos33Bpb.big_sectors > 0 &&
-                       dos33Bpb.big_sectors <= partition.End - partition.Start + 1)
+                        dos33Bpb.root_ent > 0                               &&
+                        dos33Bpb.spfat    > 0)
+                    if(dos33Bpb.sectors     == 0               &&
+                       dos33Bpb.hsectors    <= partition.Start &&
+                       dos33Bpb.big_sectors > 0                &&
+                       dos33Bpb.big_sectors <= (partition.End - partition.Start) + 1)
                     {
                         AaruConsole.DebugWriteLine("FAT plugin", "Using DOS 3.3 BPB");
                         useDos33Bpb     = true;
                         minBootNearJump = 0x22;
                     }
-                    else if(dos33Bpb.big_sectors == 0 && dos33Bpb.hsectors <= partition.Start && dos33Bpb.sectors > 0 &&
-                            dos33Bpb.sectors     <= partition.End - partition.Start + 1)
-                        if(atariBpb.jump[0] == 0x60 || atariBpb.jump[0] == 0xE9 && atariBpb.jump[1] == 0x00 &&
-                           Encoding.ASCII.GetString(dos33Bpb.oem_name)  != "NEXT    ")
+                    else if(dos33Bpb.big_sectors == 0               &&
+                            dos33Bpb.hsectors    <= partition.Start &&
+                            dos33Bpb.sectors     > 0                &&
+                            dos33Bpb.sectors     <= (partition.End - partition.Start) + 1)
+                        if(atariBpb.jump[0] == 0x60 ||
+                           (atariBpb.jump[0]                            == 0xE9 && atariBpb.jump[1] == 0x00 &&
+                            Encoding.ASCII.GetString(dos33Bpb.oem_name) != "NEXT    "))
                         {
                             AaruConsole.DebugWriteLine("FAT plugin", "Using Atari BPB");
                             useAtariBpb = true;
@@ -302,9 +330,13 @@ namespace Aaru.Filesystems.FAT
                             useDos32Bpb     = true;
                             minBootNearJump = 0x1E;
                         }
-                        else if(dos30Bpb.sptrk > 0 && dos30Bpb.sptrk < 64 && dos30Bpb.heads > 0 && dos30Bpb.heads < 256)
-                            if(atariBpb.jump[0] == 0x60 || atariBpb.jump[0] == 0xE9 && atariBpb.jump[1] == 0x00 &&
-                               Encoding.ASCII.GetString(dos33Bpb.oem_name)  != "NEXT    ")
+                        else if(dos30Bpb.sptrk > 0  &&
+                                dos30Bpb.sptrk < 64 &&
+                                dos30Bpb.heads > 0  &&
+                                dos30Bpb.heads < 256)
+                            if(atariBpb.jump[0] == 0x60 ||
+                               (atariBpb.jump[0]                            == 0xE9 && atariBpb.jump[1] == 0x00 &&
+                                Encoding.ASCII.GetString(dos33Bpb.oem_name) != "NEXT    "))
                             {
                                 AaruConsole.DebugWriteLine("FAT plugin", "Using Atari BPB");
                                 useAtariBpb = true;
@@ -317,8 +349,9 @@ namespace Aaru.Filesystems.FAT
                             }
                         else
                         {
-                            if(atariBpb.jump[0] == 0x60 || atariBpb.jump[0] == 0xE9 && atariBpb.jump[1] == 0x00 &&
-                               Encoding.ASCII.GetString(dos33Bpb.oem_name)  != "NEXT    ")
+                            if(atariBpb.jump[0] == 0x60 ||
+                               (atariBpb.jump[0]                            == 0xE9 && atariBpb.jump[1] == 0x00 &&
+                                Encoding.ASCII.GetString(dos33Bpb.oem_name) != "NEXT    "))
                             {
                                 AaruConsole.DebugWriteLine("FAT plugin", "Using Atari BPB");
                                 useAtariBpb = true;
@@ -334,22 +367,39 @@ namespace Aaru.Filesystems.FAT
             }
 
             // DEC Rainbow, lacks a BPB but has a very concrete structure...
-            if(imagePlugin.Info.Sectors == 800 && imagePlugin.Info.SectorSize == 512 && !useAtariBpb && !useMsxBpb   &&
-               !useDos2Bpb                     && !useDos3Bpb                        && !useDos32Bpb && !useDos33Bpb &&
-               !userShortExtendedBpb           && !useExtendedBpb                    &&
-               !useHumanBpb                    && !useShortFat32                     && !useLongFat32 && !useApricotBpb)
+            if(imagePlugin.Info.Sectors    == 800 &&
+               imagePlugin.Info.SectorSize == 512 &&
+               !useAtariBpb                       &&
+               !useMsxBpb                         &&
+               !useDos2Bpb                        &&
+               !useDos3Bpb                        &&
+               !useDos32Bpb                       &&
+               !useDos33Bpb                       &&
+               !userShortExtendedBpb              &&
+               !useExtendedBpb                    &&
+               !useHumanBpb                       &&
+               !useShortFat32                     &&
+               !useLongFat32                      &&
+               !useApricotBpb)
             {
                 // DEC Rainbow boots up with a Z80, first byte should be DI (disable interrupts)
                 byte z80Di = bpbSector[0];
+
                 // First FAT1 sector resides at LBA 0x14
                 byte[] fat1Sector0 = imagePlugin.ReadSector(0x14);
+
                 // First FAT2 sector resides at LBA 0x1A
                 byte[] fat2Sector0 = imagePlugin.ReadSector(0x1A);
                 bool   equalFatIds = fat1Sector0[0] == fat2Sector0[0] && fat1Sector0[1] == fat2Sector0[1];
+
                 // Volume is software interleaved 2:1
-                MemoryStream rootMs = new MemoryStream();
-                foreach(byte[] tmp in from ulong rootSector in new[] {0x17, 0x19, 0x1B, 0x1D, 0x1E, 0x20}
-                                      select imagePlugin.ReadSector(rootSector)) rootMs.Write(tmp, 0, tmp.Length);
+                var rootMs = new MemoryStream();
+
+                foreach(byte[] tmp in from ulong rootSector in new[]
+                {
+                    0x17, 0x19, 0x1B, 0x1D, 0x1E, 0x20
+                } select imagePlugin.ReadSector(rootSector))
+                    rootMs.Write(tmp, 0, tmp.Length);
 
                 byte[] rootDir      = rootMs.ToArray();
                 bool   validRootDir = true;
@@ -358,18 +408,23 @@ namespace Aaru.Filesystems.FAT
                 for(int e = 0; e < 96 * 32; e += 32)
                 {
                     for(int c = 0; c < 11; c++)
-                        if(rootDir[c + e] < 0x20 && rootDir[c + e] != 0x00 && rootDir[c + e] != 0x05 ||
-                           rootDir[c + e] == 0xFF                                                    ||
+                        if((rootDir[c + e] < 0x20 && rootDir[c + e] != 0x00 && rootDir[c + e] != 0x05) ||
+                           rootDir[c + e] == 0xFF                                                      ||
                            rootDir[c + e] == 0x2E)
                         {
                             validRootDir = false;
+
                             break;
                         }
 
-                    if(!validRootDir) break;
+                    if(!validRootDir)
+                        break;
                 }
 
-                if(z80Di == 0xF3 && equalFatIds && (fat1Sector0[0] & 0xF0) == 0xF0 && fat1Sector0[1] == 0xFF &&
+                if(z80Di == 0xF3                   &&
+                   equalFatIds                     &&
+                   (fat1Sector0[0] & 0xF0) == 0xF0 &&
+                   fat1Sector0[1]          == 0xFF &&
                    validRootDir)
                 {
                     useDecRainbowBpb = true;
@@ -387,20 +442,32 @@ namespace Aaru.Filesystems.FAT
                     fakeBpb.spfat     = 3;
                     bootable          = true;
                     fakeBpb.boot_code = bpbSector;
+
                     return BpbKind.DecRainbow;
                 }
             }
 
-            if(!useAtariBpb   && !useMsxBpb && !useDos2Bpb && !useDos3Bpb && !useDos32Bpb &&
-               !useDos33Bpb   &&
-               !useHumanBpb   && !userShortExtendedBpb && !useExtendedBpb && !useShortFat32 && !useLongFat32 &&
-               !useApricotBpb && !useDecRainbowBpb)
+            if(!useAtariBpb          &&
+               !useMsxBpb            &&
+               !useDos2Bpb           &&
+               !useDos3Bpb           &&
+               !useDos32Bpb          &&
+               !useDos33Bpb          &&
+               !useHumanBpb          &&
+               !userShortExtendedBpb &&
+               !useExtendedBpb       &&
+               !useShortFat32        &&
+               !useLongFat32         &&
+               !useApricotBpb        &&
+               !useDecRainbowBpb)
             {
                 byte[] fatSector = imagePlugin.ReadSector(1 + partition.Start);
+
                 switch(fatSector[0])
                 {
                     case 0xE5:
-                        if(imagePlugin.Info.Sectors == 2002 && imagePlugin.Info.SectorSize == 128)
+                        if(imagePlugin.Info.Sectors    == 2002 &&
+                           imagePlugin.Info.SectorSize == 128)
                         {
                             AaruConsole.DebugWriteLine("FAT plugin", "Using hardcoded BPB.");
                             fakeBpb.bps      = 128;
@@ -418,7 +485,8 @@ namespace Aaru.Filesystems.FAT
 
                         break;
                     case 0xFD:
-                        if(imagePlugin.Info.Sectors == 4004 && imagePlugin.Info.SectorSize == 128)
+                        if(imagePlugin.Info.Sectors    == 4004 &&
+                           imagePlugin.Info.SectorSize == 128)
                         {
                             AaruConsole.DebugWriteLine("FAT plugin", "Using hardcoded BPB.");
                             fakeBpb.bps      = 128;
@@ -433,7 +501,8 @@ namespace Aaru.Filesystems.FAT
                             fakeBpb.hsectors = 0;
                             fakeBpb.spfat    = 6;
                         }
-                        else if(imagePlugin.Info.Sectors == 2002 && imagePlugin.Info.SectorSize == 128)
+                        else if(imagePlugin.Info.Sectors    == 2002 &&
+                                imagePlugin.Info.SectorSize == 128)
                         {
                             AaruConsole.DebugWriteLine("FAT plugin", "Using hardcoded BPB.");
                             fakeBpb.bps      = 128;
@@ -451,7 +520,8 @@ namespace Aaru.Filesystems.FAT
 
                         break;
                     case 0xFE:
-                        if(imagePlugin.Info.Sectors == 320 && imagePlugin.Info.SectorSize == 512)
+                        if(imagePlugin.Info.Sectors    == 320 &&
+                           imagePlugin.Info.SectorSize == 512)
                         {
                             AaruConsole.DebugWriteLine("FAT plugin", "Using hardcoded BPB for 5.25\" SSDD.");
                             fakeBpb.bps      = 512;
@@ -466,7 +536,8 @@ namespace Aaru.Filesystems.FAT
                             fakeBpb.hsectors = 0;
                             fakeBpb.spfat    = 1;
                         }
-                        else if(imagePlugin.Info.Sectors == 2002 && imagePlugin.Info.SectorSize == 128)
+                        else if(imagePlugin.Info.Sectors    == 2002 &&
+                                imagePlugin.Info.SectorSize == 128)
                         {
                             AaruConsole.DebugWriteLine("FAT plugin", "Using hardcoded BPB.");
                             fakeBpb.bps      = 128;
@@ -481,7 +552,8 @@ namespace Aaru.Filesystems.FAT
                             fakeBpb.hsectors = 0;
                             fakeBpb.spfat    = 6;
                         }
-                        else if(imagePlugin.Info.Sectors == 1232 && imagePlugin.Info.SectorSize == 1024)
+                        else if(imagePlugin.Info.Sectors    == 1232 &&
+                                imagePlugin.Info.SectorSize == 1024)
                         {
                             AaruConsole.DebugWriteLine("FAT plugin", "Using hardcoded BPB.");
                             fakeBpb.bps      = 1024;
@@ -496,7 +568,8 @@ namespace Aaru.Filesystems.FAT
                             fakeBpb.hsectors = 0;
                             fakeBpb.spfat    = 2;
                         }
-                        else if(imagePlugin.Info.Sectors == 616 && imagePlugin.Info.SectorSize == 1024)
+                        else if(imagePlugin.Info.Sectors    == 616 &&
+                                imagePlugin.Info.SectorSize == 1024)
                         {
                             AaruConsole.DebugWriteLine("FAT plugin", "Using hardcoded BPB.");
                             fakeBpb.bps      = 1024;
@@ -510,7 +583,8 @@ namespace Aaru.Filesystems.FAT
                             fakeBpb.heads    = 2;
                             fakeBpb.hsectors = 0;
                         }
-                        else if(imagePlugin.Info.Sectors == 720 && imagePlugin.Info.SectorSize == 128)
+                        else if(imagePlugin.Info.Sectors    == 720 &&
+                                imagePlugin.Info.SectorSize == 128)
                         {
                             AaruConsole.DebugWriteLine("FAT plugin", "Using hardcoded BPB.");
                             fakeBpb.bps      = 128;
@@ -525,7 +599,8 @@ namespace Aaru.Filesystems.FAT
                             fakeBpb.hsectors = 0;
                             fakeBpb.spfat    = 4;
                         }
-                        else if(imagePlugin.Info.Sectors == 640 && imagePlugin.Info.SectorSize == 512)
+                        else if(imagePlugin.Info.Sectors    == 640 &&
+                                imagePlugin.Info.SectorSize == 512)
                         {
                             AaruConsole.DebugWriteLine("FAT plugin", "Using hardcoded BPB for 5.25\" DSDD.");
                             fakeBpb.bps      = 512;
@@ -543,7 +618,8 @@ namespace Aaru.Filesystems.FAT
 
                         break;
                     case 0xFF:
-                        if(imagePlugin.Info.Sectors == 640 && imagePlugin.Info.SectorSize == 512)
+                        if(imagePlugin.Info.Sectors    == 640 &&
+                           imagePlugin.Info.SectorSize == 512)
                         {
                             AaruConsole.DebugWriteLine("FAT plugin", "Using hardcoded BPB for 5.25\" DSDD.");
                             fakeBpb.bps      = 512;
@@ -563,17 +639,20 @@ namespace Aaru.Filesystems.FAT
                 }
 
                 // This assumes a bootable sector will jump somewhere or disable interrupts in x86 code
-                bootable |= bpbSector[0] == 0xFA                         ||
-                            bpbSector[0] == 0xEB && bpbSector[1] <= 0x7F ||
-                            bpbSector[0]                        == 0xE9 &&
-                            BitConverter.ToUInt16(bpbSector, 1) <= 0x1FC;
+                bootable |= bpbSector[0] == 0xFA                           ||
+                            (bpbSector[0] == 0xEB && bpbSector[1] <= 0x7F) ||
+                            (bpbSector[0]                        == 0xE9 &&
+                             BitConverter.ToUInt16(bpbSector, 1) <= 0x1FC);
+
                 fakeBpb.boot_code = bpbSector;
+
                 return BpbKind.Hardcoded;
             }
 
             if(useExtendedBpb)
             {
                 fakeBpb = ebpb;
+
                 return BpbKind.Extended;
             }
 
@@ -599,6 +678,7 @@ namespace Aaru.Filesystems.FAT
                 fakeBpb.serial_no      = shortEbpb.serial_no;
                 fakeBpb.boot_code      = shortEbpb.boot_code;
                 fakeBpb.boot_signature = shortEbpb.boot_signature;
+
                 return BpbKind.ShortExtended;
             }
 
@@ -620,6 +700,7 @@ namespace Aaru.Filesystems.FAT
                 fakeBpb.big_sectors    = dos33Bpb.big_sectors;
                 fakeBpb.boot_code      = dos33Bpb.boot_code;
                 fakeBpb.boot_signature = dos33Bpb.boot_signature;
+
                 return BpbKind.Dos33;
             }
 
@@ -640,6 +721,7 @@ namespace Aaru.Filesystems.FAT
                 fakeBpb.hsectors       = dos32Bpb.hsectors;
                 fakeBpb.boot_code      = dos32Bpb.boot_code;
                 fakeBpb.boot_signature = dos32Bpb.boot_signature;
+
                 return BpbKind.Dos32;
             }
 
@@ -660,6 +742,7 @@ namespace Aaru.Filesystems.FAT
                 fakeBpb.hsectors       = dos30Bpb.hsectors;
                 fakeBpb.boot_code      = dos30Bpb.boot_code;
                 fakeBpb.boot_signature = dos30Bpb.boot_signature;
+
                 return BpbKind.Dos3;
             }
 
@@ -677,6 +760,7 @@ namespace Aaru.Filesystems.FAT
                 fakeBpb.spfat          = dos2Bpb.spfat;
                 fakeBpb.boot_code      = dos2Bpb.boot_code;
                 fakeBpb.boot_signature = dos2Bpb.boot_signature;
+
                 return BpbKind.Dos2;
             }
 
@@ -698,8 +782,10 @@ namespace Aaru.Filesystems.FAT
                 fakeBpb.boot_code      = msxBpb.boot_code;
                 fakeBpb.boot_signature = msxBpb.boot_signature;
                 fakeBpb.serial_no      = msxBpb.serial_no;
+
                 // TODO: Is there any way to check this?
                 bootable = true;
+
                 return BpbKind.Msx;
             }
 
@@ -718,6 +804,7 @@ namespace Aaru.Filesystems.FAT
                 fakeBpb.sptrk     = atariBpb.sptrk;
                 fakeBpb.heads     = atariBpb.heads;
                 fakeBpb.boot_code = atariBpb.boot_code;
+
                 return BpbKind.Atari;
             }
 
@@ -739,6 +826,7 @@ namespace Aaru.Filesystems.FAT
                     fakeBpb.boot_code = imagePlugin.ReadSectors(apricotBpb.bootLocation,
                                                                 (uint)(apricotBpb.sectorSize * apricotBpb.bootSize) /
                                                                 imagePlugin.Info.SectorSize);
+
                 return BpbKind.Apricot;
             }
 
diff --git a/Aaru.Filesystems/FAT/Consts.cs b/Aaru.Filesystems/FAT/Consts.cs
index de28a1d40..0097cf01b 100644
--- a/Aaru.Filesystems/FAT/Consts.cs
+++ b/Aaru.Filesystems/FAT/Consts.cs
@@ -39,25 +39,15 @@ namespace Aaru.Filesystems.FAT
         const uint FSINFO_SIGNATURE1 = 0x41615252;
         const uint FSINFO_SIGNATURE2 = 0x61417272;
         const uint FSINFO_SIGNATURE3 = 0xAA550000;
-        /// <summary>
-        ///     Directory finishes
-        /// </summary>
+        /// <summary>Directory finishes</summary>
         const byte DIRENT_FINISHED = 0x00;
-        /// <summary>
-        ///     Deleted directory entry
-        /// </summary>
+        /// <summary>Deleted directory entry</summary>
         const byte DIRENT_DELETED = 0xE5;
-        /// <summary>
-        ///     Minimum allowed value in name/extension
-        /// </summary>
+        /// <summary>Minimum allowed value in name/extension</summary>
         const byte DIRENT_MIN = 0x20;
-        /// <summary>
-        ///     Value used instead of <see cref="DIRENT_FINISHED" /> for first name character
-        /// </summary>
+        /// <summary>Value used instead of <see cref="DIRENT_FINISHED" /> for first name character</summary>
         const byte DIRENT_E5 = 0x05;
-        /// <summary>
-        ///     Entry points to self or parent directory
-        /// </summary>
+        /// <summary>Entry points to self or parent directory</summary>
         const byte DIRENT_SUBDIR = 0x2E;
         const uint   FAT32_MASK      = 0x0FFFFFFF;
         const uint   FAT32_END_MASK  = 0xFFFFFF8;
@@ -184,81 +174,47 @@ namespace Aaru.Filesystems.FAT
         [Flags]
         enum FatAttributes : byte
         {
-            ReadOnly     = 0x01,
-            Hidden       = 0x02,
-            System       = 0x04,
-            VolumeLabel  = 0x08,
-            Subdirectory = 0x10,
-            Archive      = 0x20,
-            Device       = 0x40,
-            Reserved     = 0x80,
-            LFN          = 0x0F
+            ReadOnly    = 0x01, Hidden       = 0x02, System  = 0x04,
+            VolumeLabel = 0x08, Subdirectory = 0x10, Archive = 0x20,
+            Device      = 0x40, Reserved     = 0x80, LFN     = 0x0F
         }
 
         enum BpbKind
         {
-            None,
-            Hardcoded,
-            Atari,
-            Msx,
-            Dos2,
-            Dos3,
-            Dos32,
-            Dos33,
-            ShortExtended,
-            Extended,
-            ShortFat32,
-            LongFat32,
-            Andos,
-            Apricot,
-            DecRainbow,
+            None, Hardcoded, Atari,
+            Msx, Dos2, Dos3,
+            Dos32, Dos33, ShortExtended,
+            Extended, ShortFat32, LongFat32,
+            Andos, Apricot, DecRainbow,
             Human
         }
 
         enum Namespace
         {
-            Dos,
-            Nt,
-            Lfn,
-            Os2,
-            Ecs,
-            Human
+            Dos, Nt, Lfn,
+            Os2, Ecs, Human
         }
 
         [Flags]
         enum EaFlags : uint
         {
-            Normal   = 0,
-            Critical = 1
+            Normal = 0, Critical = 1
         }
 
         [Flags]
         enum CaseInfo : byte
         {
-            /// <summary>
-            ///     FASTFAT.SYS indicator that basename is lowercase
-            /// </summary>
+            /// <summary>FASTFAT.SYS indicator that basename is lowercase</summary>
             LowerCaseBasename = 0x08,
-            /// <summary>
-            ///     FASTFAT.SYS indicator that extension is lowercase
-            /// </summary>
-            LowerCaseExtension = 0x10,
-            AllLowerCase = 0x18,
-            /// <summary>
-            ///     FAT32.IFS &lt; 0.97 indicator for normal EAs present
-            /// </summary>
+            /// <summary>FASTFAT.SYS indicator that extension is lowercase</summary>
+            LowerCaseExtension = 0x10, AllLowerCase = 0x18,
+            /// <summary>FAT32.IFS &lt; 0.97 indicator for normal EAs present</summary>
             NormalEaOld = 0xEA,
-            /// <summary>
-            ///     FAT32.IFS &lt; 0.97 indicator for critical EAs present
-            /// </summary>
+            /// <summary>FAT32.IFS &lt; 0.97 indicator for critical EAs present</summary>
             CriticalEaOld = 0xEC,
-            /// <summary>
-            ///     FAT32.IFS &gt;= 0.97 indicator for normal EAs present
-            /// </summary>
+            /// <summary>FAT32.IFS &gt;= 0.97 indicator for normal EAs present</summary>
             NormalEa = 0x40,
-            /// <summary>
-            ///     FAT32.IFS &gt;= 0.97 indicator for critical EAs present
-            /// </summary>
+            /// <summary>FAT32.IFS &gt;= 0.97 indicator for critical EAs present</summary>
             CriticalEa = 0x80
         }
     }
diff --git a/Aaru.Filesystems/FAT/Dir.cs b/Aaru.Filesystems/FAT/Dir.cs
index 67fb48c27..b5ffee110 100644
--- a/Aaru.Filesystems/FAT/Dir.cs
+++ b/Aaru.Filesystems/FAT/Dir.cs
@@ -42,51 +42,57 @@ namespace Aaru.Filesystems.FAT
 {
     public partial class FAT
     {
-        /// <summary>
-        ///     Solves a symbolic link.
-        /// </summary>
+        /// <summary>Solves a symbolic link.</summary>
         /// <param name="path">Link path.</param>
         /// <param name="dest">Link destination.</param>
         public Errno ReadLink(string path, out string dest)
         {
             dest = null;
+
             return Errno.NotSupported;
         }
 
-        /// <summary>
-        ///     Lists contents from a directory.
-        /// </summary>
+        /// <summary>Lists contents from a directory.</summary>
         /// <param name="path">Directory path.</param>
         /// <param name="contents">Directory contents.</param>
         public Errno ReadDir(string path, out List<string> contents)
         {
             contents = null;
-            if(!mounted) return Errno.AccessDenied;
 
-            if(string.IsNullOrWhiteSpace(path) || path == "/")
+            if(!mounted)
+                return Errno.AccessDenied;
+
+            if(string.IsNullOrWhiteSpace(path) ||
+               path == "/")
             {
                 contents = rootDirectoryCache.Keys.ToList();
+
                 return Errno.NoError;
             }
 
-            string cutPath = path.StartsWith("/", StringComparison.Ordinal)
-                                 ? path.Substring(1).ToLower(cultureInfo)
+            string cutPath = path.StartsWith("/", StringComparison.Ordinal) ? path.Substring(1).ToLower(cultureInfo)
                                  : path.ToLower(cultureInfo);
 
             if(directoryCache.TryGetValue(cutPath, out Dictionary<string, CompleteDirectoryEntry> currentDirectory))
             {
                 contents = currentDirectory.Keys.ToList();
+
                 return Errno.NoError;
             }
 
-            string[] pieces = cutPath.Split(new[] {'/'}, StringSplitOptions.RemoveEmptyEntries);
+            string[] pieces = cutPath.Split(new[]
+            {
+                '/'
+            }, StringSplitOptions.RemoveEmptyEntries);
 
             KeyValuePair<string, CompleteDirectoryEntry> entry =
                 rootDirectoryCache.FirstOrDefault(t => t.Key.ToLower(cultureInfo) == pieces[0]);
 
-            if(string.IsNullOrEmpty(entry.Key)) return Errno.NoSuchFile;
+            if(string.IsNullOrEmpty(entry.Key))
+                return Errno.NoSuchFile;
 
-            if(!entry.Value.Dirent.attributes.HasFlag(FatAttributes.Subdirectory)) return Errno.NotDirectory;
+            if(!entry.Value.Dirent.attributes.HasFlag(FatAttributes.Subdirectory))
+                return Errno.NotDirectory;
 
             string currentPath = pieces[0];
 
@@ -96,27 +102,33 @@ namespace Aaru.Filesystems.FAT
             {
                 entry = currentDirectory.FirstOrDefault(t => t.Key.ToLower(cultureInfo) == pieces[p]);
 
-                if(string.IsNullOrEmpty(entry.Key)) return Errno.NoSuchFile;
+                if(string.IsNullOrEmpty(entry.Key))
+                    return Errno.NoSuchFile;
 
-                if(!entry.Value.Dirent.attributes.HasFlag(FatAttributes.Subdirectory)) return Errno.NotDirectory;
+                if(!entry.Value.Dirent.attributes.HasFlag(FatAttributes.Subdirectory))
+                    return Errno.NotDirectory;
 
                 currentPath = p == 0 ? pieces[0] : $"{currentPath}/{pieces[p]}";
                 uint currentCluster = entry.Value.Dirent.start_cluster;
 
-                if(fat32) currentCluster += (uint)(entry.Value.Dirent.ea_handle << 16);
+                if(fat32)
+                    currentCluster += (uint)(entry.Value.Dirent.ea_handle << 16);
 
-                if(directoryCache.TryGetValue(currentPath, out currentDirectory)) continue;
+                if(directoryCache.TryGetValue(currentPath, out currentDirectory))
+                    continue;
 
                 uint[] clusters = GetClusters(currentCluster);
 
-                if(clusters is null) return Errno.InvalidArgument;
+                if(clusters is null)
+                    return Errno.InvalidArgument;
 
                 byte[] directoryBuffer = new byte[bytesPerCluster * clusters.Length];
 
                 for(int i = 0; i < clusters.Length; i++)
                 {
-                    byte[] buffer = image.ReadSectors(firstClusterSector + clusters[i] * sectorsPerCluster,
+                    byte[] buffer = image.ReadSectors(firstClusterSector + (clusters[i] * sectorsPerCluster),
                                                       sectorsPerCluster);
+
                     Array.Copy(buffer, 0, directoryBuffer, i * bytesPerCluster, bytesPerCluster);
                 }
 
@@ -130,11 +142,14 @@ namespace Aaru.Filesystems.FAT
                         Marshal.ByteArrayToStructureLittleEndian<DirectoryEntry>(directoryBuffer, pos,
                                                                                  Marshal.SizeOf<DirectoryEntry>());
 
-                    if(dirent.filename[0] == DIRENT_FINISHED) break;
+                    if(dirent.filename[0] == DIRENT_FINISHED)
+                        break;
 
                     if(dirent.attributes.HasFlag(FatAttributes.LFN))
                     {
-                        if(@namespace != Namespace.Lfn && @namespace != Namespace.Ecs) continue;
+                        if(@namespace != Namespace.Lfn &&
+                           @namespace != Namespace.Ecs)
+                            continue;
 
                         LfnEntry lfnEntry =
                             Marshal.ByteArrayToStructureLittleEndian<LfnEntry>(directoryBuffer, pos,
@@ -142,7 +157,8 @@ namespace Aaru.Filesystems.FAT
 
                         int lfnSequence = lfnEntry.sequence & LFN_MASK;
 
-                        if((lfnEntry.sequence & LFN_ERASED) > 0) continue;
+                        if((lfnEntry.sequence & LFN_ERASED) > 0)
+                            continue;
 
                         if((lfnEntry.sequence & LFN_LAST) > 0)
                         {
@@ -150,37 +166,50 @@ namespace Aaru.Filesystems.FAT
                             lastLfnChecksum = lfnEntry.checksum;
                         }
 
-                        if(lastLfnName is null) continue;
-                        if(lfnEntry.checksum != lastLfnChecksum) continue;
+                        if(lastLfnName is null)
+                            continue;
+
+                        if(lfnEntry.checksum != lastLfnChecksum)
+                            continue;
 
                         lfnSequence--;
 
-                        Array.Copy(lfnEntry.name1, 0, lastLfnName, lfnSequence * 26,      10);
-                        Array.Copy(lfnEntry.name2, 0, lastLfnName, lfnSequence * 26 + 10, 12);
-                        Array.Copy(lfnEntry.name3, 0, lastLfnName, lfnSequence * 26 + 22, 4);
+                        Array.Copy(lfnEntry.name1, 0, lastLfnName, lfnSequence * 26, 10);
+                        Array.Copy(lfnEntry.name2, 0, lastLfnName, (lfnSequence * 26) + 10, 12);
+                        Array.Copy(lfnEntry.name3, 0, lastLfnName, (lfnSequence * 26) + 22, 4);
 
                         continue;
                     }
 
                     // Not a correct entry
-                    if(dirent.filename[0] < DIRENT_MIN && dirent.filename[0] != DIRENT_E5) continue;
+                    if(dirent.filename[0] < DIRENT_MIN &&
+                       dirent.filename[0] != DIRENT_E5)
+                        continue;
 
                     // Self
-                    if(Encoding.GetString(dirent.filename).TrimEnd() == ".") continue;
+                    if(Encoding.GetString(dirent.filename).TrimEnd() == ".")
+                        continue;
 
                     // Parent
-                    if(Encoding.GetString(dirent.filename).TrimEnd() == "..") continue;
+                    if(Encoding.GetString(dirent.filename).TrimEnd() == "..")
+                        continue;
 
                     // Deleted
-                    if(dirent.filename[0] == DIRENT_DELETED) continue;
+                    if(dirent.filename[0] == DIRENT_DELETED)
+                        continue;
 
                     string filename;
 
-                    if(dirent.attributes.HasFlag(FatAttributes.VolumeLabel)) continue;
+                    if(dirent.attributes.HasFlag(FatAttributes.VolumeLabel))
+                        continue;
 
-                    CompleteDirectoryEntry completeEntry = new CompleteDirectoryEntry {Dirent = dirent};
+                    var completeEntry = new CompleteDirectoryEntry
+                    {
+                        Dirent = dirent
+                    };
 
-                    if((@namespace == Namespace.Lfn || @namespace == Namespace.Ecs) && lastLfnName != null)
+                    if((@namespace == Namespace.Lfn || @namespace == Namespace.Ecs) &&
+                       lastLfnName != null)
                     {
                         byte calculatedLfnChecksum = LfnChecksum(dirent.filename, dirent.extension);
 
@@ -194,7 +223,8 @@ namespace Aaru.Filesystems.FAT
                         }
                     }
 
-                    if(dirent.filename[0] == DIRENT_E5) dirent.filename[0] = DIRENT_DELETED;
+                    if(dirent.filename[0] == DIRENT_E5)
+                        dirent.filename[0] = DIRENT_DELETED;
 
                     string name      = Encoding.GetString(dirent.filename).TrimEnd();
                     string extension = Encoding.GetString(dirent.extension).TrimEnd();
@@ -208,15 +238,17 @@ namespace Aaru.Filesystems.FAT
                             name = name.ToLower(CultureInfo.CurrentCulture);
                     }
 
-                    if(extension != "") filename = name + "." + extension;
-                    else filename                = name;
+                    if(extension != "")
+                        filename = name + "." + extension;
+                    else
+                        filename = name;
 
                     if(@namespace == Namespace.Human)
                     {
                         HumanDirectoryEntry humanEntry =
                             Marshal.ByteArrayToStructureLittleEndian<HumanDirectoryEntry>(directoryBuffer, pos,
-                                                                                          Marshal
-                                                                                             .SizeOf<HumanDirectoryEntry
+                                                                                          Marshal.
+                                                                                              SizeOf<HumanDirectoryEntry
                                                                                               >());
 
                         completeEntry.HumanDirent = humanEntry;
@@ -225,8 +257,10 @@ namespace Aaru.Filesystems.FAT
                         extension = StringHandlers.CToString(humanEntry.extension, Encoding).TrimEnd();
                         string name2 = StringHandlers.CToString(humanEntry.name2, Encoding).TrimEnd();
 
-                        if(extension != "") filename = name + name2 + "." + extension;
-                        else filename                = name               + name2;
+                        if(extension != "")
+                            filename = name + name2 + "." + extension;
+                        else
+                            filename = name + name2;
 
                         completeEntry.HumanName = filename;
                     }
@@ -239,7 +273,8 @@ namespace Aaru.Filesystems.FAT
                 }
 
                 // Check OS/2 .LONGNAME
-                if(eaCache != null && (@namespace == Namespace.Os2 || @namespace == Namespace.Ecs))
+                if(eaCache != null &&
+                   (@namespace == Namespace.Os2 || @namespace == Namespace.Ecs))
                 {
                     List<KeyValuePair<string, CompleteDirectoryEntry>> filesWithEas =
                         currentDirectory.Where(t => t.Value.Dirent.ea_handle != 0).ToList();
@@ -248,15 +283,19 @@ namespace Aaru.Filesystems.FAT
                     {
                         Dictionary<string, byte[]> eas = GetEas(fileWithEa.Value.Dirent.ea_handle);
 
-                        if(eas is null) continue;
+                        if(eas is null)
+                            continue;
 
-                        if(!eas.TryGetValue("com.microsoft.os2.longname", out byte[] longnameEa)) continue;
+                        if(!eas.TryGetValue("com.microsoft.os2.longname", out byte[] longnameEa))
+                            continue;
 
-                        if(BitConverter.ToUInt16(longnameEa, 0) != EAT_ASCII) continue;
+                        if(BitConverter.ToUInt16(longnameEa, 0) != EAT_ASCII)
+                            continue;
 
                         ushort longnameSize = BitConverter.ToUInt16(longnameEa, 2);
 
-                        if(longnameSize + 4 > longnameEa.Length) continue;
+                        if(longnameSize + 4 > longnameEa.Length)
+                            continue;
 
                         byte[] longnameBytes = new byte[longnameSize];
 
@@ -264,7 +303,8 @@ namespace Aaru.Filesystems.FAT
 
                         string longname = StringHandlers.CToString(longnameBytes, Encoding);
 
-                        if(string.IsNullOrWhiteSpace(longname)) continue;
+                        if(string.IsNullOrWhiteSpace(longname))
+                            continue;
 
                         // Forward slash is allowed in .LONGNAME, so change it to visually similar division slash
                         longname = longname.Replace('/', '\u2215');
@@ -278,15 +318,21 @@ namespace Aaru.Filesystems.FAT
                 // Check FAT32.IFS EAs
                 if(fat32 || debug)
                 {
-                    List<KeyValuePair<string, CompleteDirectoryEntry>> fat32EaSidecars =
-                        currentDirectory.Where(t => t.Key.EndsWith(FAT32_EA_TAIL, true, cultureInfo)).ToList();
+                    List<KeyValuePair<string, CompleteDirectoryEntry>> fat32EaSidecars = currentDirectory.
+                                                                                         Where(t =>
+                                                                                                   t.Key.
+                                                                                                     EndsWith(FAT32_EA_TAIL,
+                                                                                                              true,
+                                                                                                              cultureInfo)).
+                                                                                         ToList();
 
                     foreach(KeyValuePair<string, CompleteDirectoryEntry> sidecar in fat32EaSidecars)
                     {
                         // No real file this sidecar accompanies
-                        if(!currentDirectory
-                              .TryGetValue(sidecar.Key.Substring(0, sidecar.Key.Length - FAT32_EA_TAIL.Length),
-                                           out CompleteDirectoryEntry fileWithEa)) continue;
+                        if(!currentDirectory.
+                               TryGetValue(sidecar.Key.Substring(0, sidecar.Key.Length - FAT32_EA_TAIL.Length),
+                                           out CompleteDirectoryEntry fileWithEa))
+                            continue;
 
                         // If not in debug mode we will consider the lack of EA bitflags to mean the EAs are corrupted or not real
                         if(!debug)
@@ -298,7 +344,8 @@ namespace Aaru.Filesystems.FAT
 
                         fileWithEa.Fat32Ea = sidecar.Value.Dirent;
 
-                        if(!debug) currentDirectory.Remove(sidecar.Key);
+                        if(!debug)
+                            currentDirectory.Remove(sidecar.Key);
                     }
                 }
 
@@ -306,6 +353,7 @@ namespace Aaru.Filesystems.FAT
             }
 
             contents = currentDirectory?.Keys.ToList();
+
             return Errno.NoError;
         }
     }
diff --git a/Aaru.Filesystems/FAT/FAT.cs b/Aaru.Filesystems/FAT/FAT.cs
index 4014071d7..1b4af97b2 100644
--- a/Aaru.Filesystems/FAT/FAT.cs
+++ b/Aaru.Filesystems/FAT/FAT.cs
@@ -73,19 +73,33 @@ namespace Aaru.Filesystems.FAT
         public string   Author   => "Natalia Portillo";
 
         public IEnumerable<(string name, Type type, string description)> SupportedOptions =>
-            new (string name, Type type, string description)[] { };
+            new (string name, Type type, string description)[]
+                {};
 
-        public Dictionary<string, string> Namespaces =>
-            new Dictionary<string, string>
+        public Dictionary<string, string> Namespaces => new Dictionary<string, string>
+        {
             {
-                {"dos", "DOS (8.3 all uppercase)"},
-                {"nt", "Windows NT (8.3 mixed case)"},
-                {"os2", "OS/2 .LONGNAME extended attribute"},
-                {"ecs", "Use LFN when available with fallback to .LONGNAME (default)"},
-                {"lfn", "Long file names"}
-            };
+                "dos", "DOS (8.3 all uppercase)"
+            },
+            {
+                "nt", "Windows NT (8.3 mixed case)"
+            },
+            {
+                "os2", "OS/2 .LONGNAME extended attribute"
+            },
+            {
+                "ecs", "Use LFN when available with fallback to .LONGNAME (default)"
+            },
+            {
+                "lfn", "Long file names"
+            }
+        };
 
-        static Dictionary<string, string> GetDefaultOptions() =>
-            new Dictionary<string, string> {{"debug", false.ToString()}};
+        static Dictionary<string, string> GetDefaultOptions() => new Dictionary<string, string>
+        {
+            {
+                "debug", false.ToString()
+            }
+        };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/FAT/File.cs b/Aaru.Filesystems/FAT/File.cs
index a6979566c..8ad8126a2 100644
--- a/Aaru.Filesystems/FAT/File.cs
+++ b/Aaru.Filesystems/FAT/File.cs
@@ -44,19 +44,25 @@ namespace Aaru.Filesystems.FAT
         public Errno MapBlock(string path, long fileBlock, out long deviceBlock)
         {
             deviceBlock = 0;
-            if(!mounted) return Errno.AccessDenied;
+
+            if(!mounted)
+                return Errno.AccessDenied;
 
             Errno err = Stat(path, out FileEntryInfo stat);
 
-            if(err != Errno.NoError) return err;
+            if(err != Errno.NoError)
+                return err;
 
-            if(stat.Attributes.HasFlag(FileAttributes.Directory) && !debug) return Errno.IsDirectory;
+            if(stat.Attributes.HasFlag(FileAttributes.Directory) &&
+               !debug)
+                return Errno.IsDirectory;
 
             uint[] clusters = GetClusters((uint)stat.Inode);
 
-            if(fileBlock >= clusters.Length) return Errno.InvalidArgument;
+            if(fileBlock >= clusters.Length)
+                return Errno.InvalidArgument;
 
-            deviceBlock = (long)(firstClusterSector + clusters[fileBlock] * sectorsPerCluster);
+            deviceBlock = (long)(firstClusterSector + (clusters[fileBlock] * sectorsPerCluster));
 
             return Errno.NoError;
         }
@@ -64,11 +70,14 @@ namespace Aaru.Filesystems.FAT
         public Errno GetAttributes(string path, out FileAttributes attributes)
         {
             attributes = new FileAttributes();
-            if(!mounted) return Errno.AccessDenied;
+
+            if(!mounted)
+                return Errno.AccessDenied;
 
             Errno err = Stat(path, out FileEntryInfo stat);
 
-            if(err != Errno.NoError) return err;
+            if(err != Errno.NoError)
+                return err;
 
             attributes = stat.Attributes;
 
@@ -77,32 +86,41 @@ namespace Aaru.Filesystems.FAT
 
         public Errno Read(string path, long offset, long size, ref byte[] buf)
         {
-            if(!mounted) return Errno.AccessDenied;
+            if(!mounted)
+                return Errno.AccessDenied;
 
             Errno err = Stat(path, out FileEntryInfo stat);
 
-            if(err != Errno.NoError) return err;
+            if(err != Errno.NoError)
+                return err;
 
-            if(stat.Attributes.HasFlag(FileAttributes.Directory) && !debug) return Errno.IsDirectory;
+            if(stat.Attributes.HasFlag(FileAttributes.Directory) &&
+               !debug)
+                return Errno.IsDirectory;
 
-            if(offset >= stat.Length) return Errno.InvalidArgument;
+            if(offset >= stat.Length)
+                return Errno.InvalidArgument;
 
-            if(size + offset >= stat.Length) size = stat.Length - offset;
+            if(size + offset >= stat.Length)
+                size = stat.Length - offset;
 
             uint[] clusters = GetClusters((uint)stat.Inode);
 
             long firstCluster    = offset                   / bytesPerCluster;
             long offsetInCluster = offset                   % bytesPerCluster;
             long sizeInClusters  = (size + offsetInCluster) / bytesPerCluster;
-            if((size + offsetInCluster) % bytesPerCluster > 0) sizeInClusters++;
 
-            MemoryStream ms = new MemoryStream();
+            if((size + offsetInCluster) % bytesPerCluster > 0)
+                sizeInClusters++;
+
+            var ms = new MemoryStream();
 
             for(int i = 0; i < sizeInClusters; i++)
             {
-                if(i + firstCluster >= clusters.Length) return Errno.InvalidArgument;
+                if(i + firstCluster >= clusters.Length)
+                    return Errno.InvalidArgument;
 
-                byte[] buffer = image.ReadSectors(firstClusterSector + clusters[i + firstCluster] * sectorsPerCluster,
+                byte[] buffer = image.ReadSectors(firstClusterSector + (clusters[i + firstCluster] * sectorsPerCluster),
                                                   sectorsPerCluster);
 
                 ms.Write(buffer, 0, buffer.Length);
@@ -118,18 +136,20 @@ namespace Aaru.Filesystems.FAT
         public Errno Stat(string path, out FileEntryInfo stat)
         {
             stat = null;
-            if(!mounted) return Errno.AccessDenied;
+
+            if(!mounted)
+                return Errno.AccessDenied;
 
             Errno err = GetFileEntry(path, out CompleteDirectoryEntry completeEntry);
-            if(err != Errno.NoError) return err;
+
+            if(err != Errno.NoError)
+                return err;
 
             DirectoryEntry entry = completeEntry.Dirent;
 
             stat = new FileEntryInfo
             {
-                Attributes   = new FileAttributes(),
-                Blocks       = entry.size / bytesPerCluster,
-                BlockSize    = bytesPerCluster,
+                Attributes   = new FileAttributes(), Blocks = entry.size / bytesPerCluster, BlockSize = bytesPerCluster,
                 Length       = entry.size,
                 Inode        = (ulong)(fat32 ? (entry.ea_handle << 16) + entry.start_cluster : entry.start_cluster),
                 Links        = 1,
@@ -142,44 +162,58 @@ namespace Aaru.Filesystems.FAT
                 stat.CreationTime  = stat.CreationTime?.AddMilliseconds(entry.ctime_ms * 10);
             }
 
-            if(entry.size % bytesPerCluster > 0) stat.Blocks++;
+            if(entry.size % bytesPerCluster > 0)
+                stat.Blocks++;
 
             if(entry.attributes.HasFlag(FatAttributes.Subdirectory))
             {
                 stat.Attributes |= FileAttributes.Directory;
-                stat.Blocks = fat32
-                                  ? GetClusters((uint)((entry.ea_handle << 16) + entry.start_cluster)).Length
+
+                stat.Blocks = fat32 ? GetClusters((uint)((entry.ea_handle << 16) + entry.start_cluster)).Length
                                   : GetClusters(entry.start_cluster).Length;
+
                 stat.Length = stat.Blocks * stat.BlockSize;
             }
 
-            if(entry.attributes.HasFlag(FatAttributes.ReadOnly)) stat.Attributes |= FileAttributes.ReadOnly;
-            if(entry.attributes.HasFlag(FatAttributes.Hidden)) stat.Attributes   |= FileAttributes.Hidden;
-            if(entry.attributes.HasFlag(FatAttributes.System)) stat.Attributes   |= FileAttributes.System;
-            if(entry.attributes.HasFlag(FatAttributes.Archive)) stat.Attributes  |= FileAttributes.Archive;
-            if(entry.attributes.HasFlag(FatAttributes.Device)) stat.Attributes   |= FileAttributes.Device;
+            if(entry.attributes.HasFlag(FatAttributes.ReadOnly))
+                stat.Attributes |= FileAttributes.ReadOnly;
+
+            if(entry.attributes.HasFlag(FatAttributes.Hidden))
+                stat.Attributes |= FileAttributes.Hidden;
+
+            if(entry.attributes.HasFlag(FatAttributes.System))
+                stat.Attributes |= FileAttributes.System;
+
+            if(entry.attributes.HasFlag(FatAttributes.Archive))
+                stat.Attributes |= FileAttributes.Archive;
+
+            if(entry.attributes.HasFlag(FatAttributes.Device))
+                stat.Attributes |= FileAttributes.Device;
 
             return Errno.NoError;
         }
 
         uint[] GetClusters(uint startCluster)
         {
-            if(startCluster == 0) return null;
+            if(startCluster == 0)
+                return null;
 
-            if(startCluster >= XmlFsType.Clusters) return null;
+            if(startCluster >= XmlFsType.Clusters)
+                return null;
 
             List<uint> clusters = new List<uint>();
 
             uint nextCluster = startCluster;
 
-            ulong nextSector = nextCluster / fatEntriesPerSector + fatFirstSector + (useFirstFat ? 0 : sectorsPerFat);
+            ulong nextSector = (nextCluster / fatEntriesPerSector) + fatFirstSector + (useFirstFat ? 0 : sectorsPerFat);
             int   nextEntry  = (int)(nextCluster % fatEntriesPerSector);
 
             ulong  currentSector = nextSector;
             byte[] fatData       = image.ReadSector(currentSector);
 
             if(fat32)
-                while((nextCluster & FAT32_MASK) > 0 && (nextCluster & FAT32_MASK) <= FAT32_FORMATTED)
+                while((nextCluster & FAT32_MASK) > 0 &&
+                      (nextCluster & FAT32_MASK) <= FAT32_FORMATTED)
                 {
                     clusters.Add(nextCluster);
 
@@ -190,18 +224,22 @@ namespace Aaru.Filesystems.FAT
                     }
 
                     nextCluster = BitConverter.ToUInt32(fatData, nextEntry * 4);
-                    nextSector = nextCluster / fatEntriesPerSector + fatFirstSector +
-                                  (useFirstFat ? 0 : sectorsPerFat);
+
+                    nextSector = (nextCluster / fatEntriesPerSector) + fatFirstSector +
+                                 (useFirstFat ? 0 : sectorsPerFat);
+
                     nextEntry = (int)(nextCluster % fatEntriesPerSector);
                 }
             else if(fat16)
-                while(nextCluster > 0 && nextCluster <= FAT16_FORMATTED)
+                while(nextCluster > 0 &&
+                      nextCluster <= FAT16_FORMATTED)
                 {
                     clusters.Add(nextCluster);
                     nextCluster = fatEntries[nextCluster];
                 }
             else
-                while(nextCluster > 0 && nextCluster <= FAT12_FORMATTED)
+                while(nextCluster > 0 &&
+                      nextCluster <= FAT12_FORMATTED)
                 {
                     clusters.Add(nextCluster);
                     nextCluster = fatEntries[nextCluster];
@@ -214,11 +252,15 @@ namespace Aaru.Filesystems.FAT
         {
             entry = null;
 
-            string cutPath =
-                path.StartsWith("/") ? path.Substring(1).ToLower(cultureInfo) : path.ToLower(cultureInfo);
-            string[] pieces = cutPath.Split(new[] {'/'}, StringSplitOptions.RemoveEmptyEntries);
+            string cutPath = path.StartsWith("/") ? path.Substring(1).ToLower(cultureInfo) : path.ToLower(cultureInfo);
 
-            if(pieces.Length == 0) return Errno.InvalidArgument;
+            string[] pieces = cutPath.Split(new[]
+            {
+                '/'
+            }, StringSplitOptions.RemoveEmptyEntries);
+
+            if(pieces.Length == 0)
+                return Errno.InvalidArgument;
 
             string parentPath = string.Join("/", pieces, 0, pieces.Length - 1);
 
@@ -226,20 +268,25 @@ namespace Aaru.Filesystems.FAT
             {
                 Errno err = ReadDir(parentPath, out _);
 
-                if(err != Errno.NoError) return err;
+                if(err != Errno.NoError)
+                    return err;
             }
 
             Dictionary<string, CompleteDirectoryEntry> parent;
 
-            if(pieces.Length == 1) parent = rootDirectoryCache;
-            else if(!directoryCache.TryGetValue(parentPath, out parent)) return Errno.InvalidArgument;
+            if(pieces.Length == 1)
+                parent = rootDirectoryCache;
+            else if(!directoryCache.TryGetValue(parentPath, out parent))
+                return Errno.InvalidArgument;
 
             KeyValuePair<string, CompleteDirectoryEntry> dirent =
                 parent.FirstOrDefault(t => t.Key.ToLower(cultureInfo) == pieces[pieces.Length - 1]);
 
-            if(string.IsNullOrEmpty(dirent.Key)) return Errno.NoSuchFile;
+            if(string.IsNullOrEmpty(dirent.Key))
+                return Errno.NoSuchFile;
 
             entry = dirent.Value;
+
             return Errno.NoError;
         }
 
@@ -247,8 +294,11 @@ namespace Aaru.Filesystems.FAT
         {
             byte sum = 0;
 
-            for(int i = 0; i < 8; i++) sum = (byte)(((sum & 1) << 7) + (sum >> 1) + name[i]);
-            for(int i = 0; i < 3; i++) sum = (byte)(((sum & 1) << 7) + (sum >> 1) + extension[i]);
+            for(int i = 0; i < 8; i++)
+                sum = (byte)(((sum & 1) << 7) + (sum >> 1) + name[i]);
+
+            for(int i = 0; i < 3; i++)
+                sum = (byte)(((sum & 1) << 7) + (sum >> 1) + extension[i]);
 
             return sum;
         }
diff --git a/Aaru.Filesystems/FAT/Info.cs b/Aaru.Filesystems/FAT/Info.cs
index 2a500c8d2..7ac484657 100644
--- a/Aaru.Filesystems/FAT/Info.cs
+++ b/Aaru.Filesystems/FAT/Info.cs
@@ -48,7 +48,8 @@ namespace Aaru.Filesystems.FAT
     {
         public bool Identify(IMediaImage imagePlugin, Partition partition)
         {
-            if(2 + partition.Start >= partition.End) return false;
+            if(2 + partition.Start >= partition.End)
+                return false;
 
             ushort bps;
             byte   spc;
@@ -78,15 +79,14 @@ namespace Aaru.Filesystems.FAT
 
             ulong expectedClusters = humanBpb.bpc > 0 ? partition.Size / humanBpb.bpc : 0;
 
-            AaruConsole.DebugWriteLine("FAT plugin", "Human bpc = {0}",               humanBpb.bpc);
-            AaruConsole.DebugWriteLine("FAT plugin", "Human clusters = {0}",          humanBpb.clusters);
-            AaruConsole.DebugWriteLine("FAT plugin", "Human big_clusters = {0}",      humanBpb.big_clusters);
+            AaruConsole.DebugWriteLine("FAT plugin", "Human bpc = {0}", humanBpb.bpc);
+            AaruConsole.DebugWriteLine("FAT plugin", "Human clusters = {0}", humanBpb.clusters);
+            AaruConsole.DebugWriteLine("FAT plugin", "Human big_clusters = {0}", humanBpb.big_clusters);
             AaruConsole.DebugWriteLine("FAT plugin", "Human expected clusters = {0}", expectedClusters);
 
             // Check clusters for Human68k are correct
-            bool humanClustersCorrect = humanBpb.clusters           == 0
-                                            ? humanBpb.big_clusters == expectedClusters
-                                            : humanBpb.clusters     == expectedClusters;
+            bool humanClustersCorrect = humanBpb.clusters       == 0 ? humanBpb.big_clusters == expectedClusters
+                                            : humanBpb.clusters == expectedClusters;
 
             // Check OEM for Human68k is correct
             bool humanOemCorrect = bpbSector[2]  >= 0x20 && bpbSector[3]  >= 0x20 && bpbSector[4]  >= 0x20 &&
@@ -100,14 +100,18 @@ namespace Aaru.Filesystems.FAT
             bool humanBranchCorrect = bpbSector[0] == 0x60 && bpbSector[1] >= 0x20 && bpbSector[1] < 0xFE;
 
             AaruConsole.DebugWriteLine("FAT plugin", "humanClustersCorrect = {0}", humanClustersCorrect);
-            AaruConsole.DebugWriteLine("FAT plugin", "humanOemCorrect = {0}",      humanOemCorrect);
-            AaruConsole.DebugWriteLine("FAT plugin", "humanBranchCorrect = {0}",   humanBranchCorrect);
+            AaruConsole.DebugWriteLine("FAT plugin", "humanOemCorrect = {0}", humanOemCorrect);
+            AaruConsole.DebugWriteLine("FAT plugin", "humanBranchCorrect = {0}", humanBranchCorrect);
 
             // If all Human68k checks are correct, it is a Human68k FAT16
-            if(humanClustersCorrect && humanOemCorrect && humanBranchCorrect && expectedClusters > 0) return true;
+            if(humanClustersCorrect &&
+               humanOemCorrect      &&
+               humanBranchCorrect   &&
+               expectedClusters > 0)
+                return true;
 
             Array.Copy(bpbSector, 0x02, atariOem, 0, 6);
-            Array.Copy(bpbSector, 0x03, dosOem,   0, 8);
+            Array.Copy(bpbSector, 0x03, dosOem, 0, 8);
             bps             = BitConverter.ToUInt16(bpbSector, 0x00B);
             spc             = bpbSector[0x00D];
             reservedSecs    = BitConverter.ToUInt16(bpbSector, 0x00E);
@@ -123,38 +127,43 @@ namespace Aaru.Filesystems.FAT
             Array.Copy(bpbSector, 0x052, fat32Id, 0, 8);
             hugeSectors = BitConverter.ToUInt64(bpbSector, 0x052);
             fatId       = fatSector[0];
-            int bitsInBps                                   = CountBits.Count(bps);
-            if(imagePlugin.Info.SectorSize >= 512) bootable = BitConverter.ToUInt16(bpbSector, 0x1FE);
+            int bitsInBps = CountBits.Count(bps);
+
+            if(imagePlugin.Info.SectorSize >= 512)
+                bootable = BitConverter.ToUInt16(bpbSector, 0x1FE);
 
             bool   correctSpc  = spc == 1 || spc == 2 || spc == 4 || spc == 8 || spc == 16 || spc == 32 || spc == 64;
             string msxString   = Encoding.ASCII.GetString(msxId);
             string fat32String = Encoding.ASCII.GetString(fat32Id);
+
             bool atariOemCorrect = atariOem[0] >= 0x20 && atariOem[1] >= 0x20 && atariOem[2] >= 0x20 &&
                                    atariOem[3] >= 0x20 && atariOem[4] >= 0x20 && atariOem[5] >= 0x20;
+
             bool dosOemCorrect = dosOem[0] >= 0x20 && dosOem[1] >= 0x20 && dosOem[2] >= 0x20 && dosOem[3] >= 0x20 &&
                                  dosOem[4] >= 0x20 && dosOem[5] >= 0x20 && dosOem[6] >= 0x20 && dosOem[7] >= 0x20;
+
             string atariString = Encoding.ASCII.GetString(atariOem);
             string oemString   = Encoding.ASCII.GetString(dosOem);
 
-            AaruConsole.DebugWriteLine("FAT plugin", "atari_oem_correct = {0}",     atariOemCorrect);
-            AaruConsole.DebugWriteLine("FAT plugin", "dos_oem_correct = {0}",       dosOemCorrect);
-            AaruConsole.DebugWriteLine("FAT plugin", "bps = {0}",                   bps);
-            AaruConsole.DebugWriteLine("FAT plugin", "bits in bps = {0}",           bitsInBps);
-            AaruConsole.DebugWriteLine("FAT plugin", "spc = {0}",                   spc);
-            AaruConsole.DebugWriteLine("FAT plugin", "correct_spc = {0}",           correctSpc);
-            AaruConsole.DebugWriteLine("FAT plugin", "reserved_secs = {0}",         reservedSecs);
-            AaruConsole.DebugWriteLine("FAT plugin", "fats_no = {0}",               numberOfFats);
-            AaruConsole.DebugWriteLine("FAT plugin", "root_entries = {0}",          rootEntries);
-            AaruConsole.DebugWriteLine("FAT plugin", "sectors = {0}",               sectors);
+            AaruConsole.DebugWriteLine("FAT plugin", "atari_oem_correct = {0}", atariOemCorrect);
+            AaruConsole.DebugWriteLine("FAT plugin", "dos_oem_correct = {0}", dosOemCorrect);
+            AaruConsole.DebugWriteLine("FAT plugin", "bps = {0}", bps);
+            AaruConsole.DebugWriteLine("FAT plugin", "bits in bps = {0}", bitsInBps);
+            AaruConsole.DebugWriteLine("FAT plugin", "spc = {0}", spc);
+            AaruConsole.DebugWriteLine("FAT plugin", "correct_spc = {0}", correctSpc);
+            AaruConsole.DebugWriteLine("FAT plugin", "reserved_secs = {0}", reservedSecs);
+            AaruConsole.DebugWriteLine("FAT plugin", "fats_no = {0}", numberOfFats);
+            AaruConsole.DebugWriteLine("FAT plugin", "root_entries = {0}", rootEntries);
+            AaruConsole.DebugWriteLine("FAT plugin", "sectors = {0}", sectors);
             AaruConsole.DebugWriteLine("FAT plugin", "media_descriptor = 0x{0:X2}", mediaDescriptor);
-            AaruConsole.DebugWriteLine("FAT plugin", "fat_sectors = {0}",           fatSectors);
-            AaruConsole.DebugWriteLine("FAT plugin", "msx_id = \"{0}\"",            msxString);
-            AaruConsole.DebugWriteLine("FAT plugin", "big_sectors = {0}",           bigSectors);
-            AaruConsole.DebugWriteLine("FAT plugin", "bpb_signature = 0x{0:X2}",    bpbSignature);
-            AaruConsole.DebugWriteLine("FAT plugin", "fat32_signature = 0x{0:X2}",  fat32Signature);
-            AaruConsole.DebugWriteLine("FAT plugin", "fat32_id = \"{0}\"",          fat32String);
-            AaruConsole.DebugWriteLine("FAT plugin", "huge_sectors = {0}",          hugeSectors);
-            AaruConsole.DebugWriteLine("FAT plugin", "fat_id = 0x{0:X2}",           fatId);
+            AaruConsole.DebugWriteLine("FAT plugin", "fat_sectors = {0}", fatSectors);
+            AaruConsole.DebugWriteLine("FAT plugin", "msx_id = \"{0}\"", msxString);
+            AaruConsole.DebugWriteLine("FAT plugin", "big_sectors = {0}", bigSectors);
+            AaruConsole.DebugWriteLine("FAT plugin", "bpb_signature = 0x{0:X2}", bpbSignature);
+            AaruConsole.DebugWriteLine("FAT plugin", "fat32_signature = 0x{0:X2}", fat32Signature);
+            AaruConsole.DebugWriteLine("FAT plugin", "fat32_id = \"{0}\"", fat32String);
+            AaruConsole.DebugWriteLine("FAT plugin", "huge_sectors = {0}", hugeSectors);
+            AaruConsole.DebugWriteLine("FAT plugin", "fat_id = 0x{0:X2}", fatId);
 
             ushort apricotBps             = BitConverter.ToUInt16(bpbSector, 0x50);
             byte   apricotSpc             = bpbSector[0x52];
@@ -164,20 +173,22 @@ namespace Aaru.Filesystems.FAT
             ushort apricotSectors         = BitConverter.ToUInt16(bpbSector, 0x58);
             byte   apricotMediaDescriptor = bpbSector[0x5A];
             ushort apricotFatSectors      = BitConverter.ToUInt16(bpbSector, 0x5B);
+
             bool apricotCorrectSpc = apricotSpc == 1  || apricotSpc == 2  || apricotSpc == 4 || apricotSpc == 8 ||
                                      apricotSpc == 16 || apricotSpc == 32 || apricotSpc == 64;
+
             int  bitsInApricotBps  = CountBits.Count(apricotBps);
             byte apricotPartitions = bpbSector[0x0C];
 
-            AaruConsole.DebugWriteLine("FAT plugin", "apricot_bps = {0}",                   apricotBps);
-            AaruConsole.DebugWriteLine("FAT plugin", "apricot_spc = {0}",                   apricotSpc);
-            AaruConsole.DebugWriteLine("FAT plugin", "apricot_correct_spc = {0}",           apricotCorrectSpc);
-            AaruConsole.DebugWriteLine("FAT plugin", "apricot_reserved_secs = {0}",         apricotReservedSecs);
-            AaruConsole.DebugWriteLine("FAT plugin", "apricot_fats_no = {0}",               apricotFatsNo);
-            AaruConsole.DebugWriteLine("FAT plugin", "apricot_root_entries = {0}",          apricotRootEntries);
-            AaruConsole.DebugWriteLine("FAT plugin", "apricot_sectors = {0}",               apricotSectors);
+            AaruConsole.DebugWriteLine("FAT plugin", "apricot_bps = {0}", apricotBps);
+            AaruConsole.DebugWriteLine("FAT plugin", "apricot_spc = {0}", apricotSpc);
+            AaruConsole.DebugWriteLine("FAT plugin", "apricot_correct_spc = {0}", apricotCorrectSpc);
+            AaruConsole.DebugWriteLine("FAT plugin", "apricot_reserved_secs = {0}", apricotReservedSecs);
+            AaruConsole.DebugWriteLine("FAT plugin", "apricot_fats_no = {0}", apricotFatsNo);
+            AaruConsole.DebugWriteLine("FAT plugin", "apricot_root_entries = {0}", apricotRootEntries);
+            AaruConsole.DebugWriteLine("FAT plugin", "apricot_sectors = {0}", apricotSectors);
             AaruConsole.DebugWriteLine("FAT plugin", "apricot_media_descriptor = 0x{0:X2}", apricotMediaDescriptor);
-            AaruConsole.DebugWriteLine("FAT plugin", "apricot_fat_sectors = {0}",           apricotFatSectors);
+            AaruConsole.DebugWriteLine("FAT plugin", "apricot_fat_sectors = {0}", apricotFatSectors);
 
             // This is to support FAT partitions on hybrid ISO/USB images
             if(imagePlugin.Info.XmlMediaType == XmlMediaType.OpticalDisc)
@@ -191,8 +202,10 @@ namespace Aaru.Filesystems.FAT
             {
                 // exFAT
                 case "EXFAT   ": return false;
+
                 // NTFS
                 case "NTFS    " when bootable == 0xAA55 && numberOfFats == 0 && fatSectors == 0: return false;
+
                 // QNX4
                 case "FQNX4FS ": return false;
             }
@@ -202,10 +215,13 @@ namespace Aaru.Filesystems.FAT
             {
                 byte[] hpfsSbSector =
                     imagePlugin.ReadSector(16 + partition.Start); // Seek to superblock, on logical sector 16
+
                 uint hpfsMagic1 = BitConverter.ToUInt32(hpfsSbSector, 0x000);
                 uint hpfsMagic2 = BitConverter.ToUInt32(hpfsSbSector, 0x004);
 
-                if(hpfsMagic1 == 0xF995E849 && hpfsMagic2 == 0xFA53E9C5) return false;
+                if(hpfsMagic1 == 0xF995E849 &&
+                   hpfsMagic2 == 0xFA53E9C5)
+                    return false;
             }
 
             switch(bitsInBps)
@@ -213,55 +229,68 @@ namespace Aaru.Filesystems.FAT
                 // FAT32 for sure
                 case 1 when correctSpc && numberOfFats <= 2    && sectors     == 0 && fatSectors == 0 &&
                             fat32Signature             == 0x29 && fat32String == "FAT32   ": return true;
+
                 // short FAT32
                 case 1
                     when correctSpc && numberOfFats <= 2 && sectors == 0 && fatSectors == 0 && fat32Signature == 0x28:
-                    return bigSectors        == 0
-                               ? hugeSectors <= partition.End - partition.Start + 1
-                               : bigSectors  <= partition.End - partition.Start + 1;
+                    return bigSectors       == 0 ? hugeSectors <= (partition.End - partition.Start) + 1
+                               : bigSectors <= (partition.End                    - partition.Start) + 1;
+
                 // MSX-DOS FAT12
-                case 1 when correctSpc && numberOfFats <= 2                                   && rootEntries > 0 &&
-                            sectors                    <= partition.End - partition.Start + 1 && fatSectors  > 0 &&
+                case 1 when correctSpc && numberOfFats <= 2                                     && rootEntries > 0 &&
+                            sectors                    <= (partition.End - partition.Start) + 1 && fatSectors  > 0 &&
                             msxString                  == "VOL_ID": return true;
+
                 // EBPB
                 case 1 when correctSpc && numberOfFats <= 2 && rootEntries > 0 && fatSectors > 0 &&
                             (bpbSignature == 0x28 || bpbSignature == 0x29):
-                    return sectors          == 0
-                               ? bigSectors <= partition.End - partition.Start + 1
-                               : sectors    <= partition.End - partition.Start + 1;
+                    return sectors       == 0 ? bigSectors <= (partition.End - partition.Start) + 1
+                               : sectors <= (partition.End                   - partition.Start) + 1;
+
                 // BPB
                 case 1 when correctSpc && reservedSecs < partition.End - partition.Start && numberOfFats <= 2 &&
                             rootEntries                > 0                               && fatSectors   > 0:
-                    return sectors          == 0
-                               ? bigSectors <= partition.End - partition.Start + 1
-                               : sectors    <= partition.End - partition.Start + 1;
+                    return sectors       == 0 ? bigSectors <= (partition.End - partition.Start) + 1
+                               : sectors <= (partition.End                   - partition.Start) + 1;
             }
 
             // Apricot BPB
-            if(bitsInApricotBps    == 1                                   && apricotCorrectSpc &&
-               apricotReservedSecs < partition.End - partition.Start      &&
-               apricotFatsNo       <= 2                                   &&
-               apricotRootEntries  > 0                                    && apricotFatSectors > 0 &&
-               apricotSectors      <= partition.End - partition.Start + 1 &&
-               apricotPartitions   == 0) return true;
+            if(bitsInApricotBps == 1                                        &&
+               apricotCorrectSpc                                            &&
+               apricotReservedSecs < partition.End - partition.Start        &&
+               apricotFatsNo       <= 2                                     &&
+               apricotRootEntries  > 0                                      &&
+               apricotFatSectors   > 0                                      &&
+               apricotSectors      <= (partition.End - partition.Start) + 1 &&
+               apricotPartitions   == 0)
+                return true;
 
             // All FAT12 without BPB can only be used on floppies, without partitions.
-            if(partition.Start != 0) return false;
+            if(partition.Start != 0)
+                return false;
 
             // DEC Rainbow, lacks a BPB but has a very concrete structure...
-            if(imagePlugin.Info.Sectors == 800 && imagePlugin.Info.SectorSize == 512)
+            if(imagePlugin.Info.Sectors    == 800 &&
+               imagePlugin.Info.SectorSize == 512)
             {
                 // DEC Rainbow boots up with a Z80, first byte should be DI (disable interrupts)
                 byte z80Di = bpbSector[0];
+
                 // First FAT1 sector resides at LBA 0x14
                 byte[] fat1Sector0 = imagePlugin.ReadSector(0x14);
+
                 // First FAT2 sector resides at LBA 0x1A
                 byte[] fat2Sector0 = imagePlugin.ReadSector(0x1A);
                 bool   equalFatIds = fat1Sector0[0] == fat2Sector0[0] && fat1Sector0[1] == fat2Sector0[1];
+
                 // Volume is software interleaved 2:1
-                MemoryStream rootMs = new MemoryStream();
-                foreach(byte[] tmp in from ulong rootSector in new ulong[] {0x17, 0x19, 0x1B, 0x1D, 0x1E, 0x20}
-                                      select imagePlugin.ReadSector(rootSector)) rootMs.Write(tmp, 0, tmp.Length);
+                var rootMs = new MemoryStream();
+
+                foreach(byte[] tmp in from ulong rootSector in new ulong[]
+                {
+                    0x17, 0x19, 0x1B, 0x1D, 0x1E, 0x20
+                } select imagePlugin.ReadSector(rootSector))
+                    rootMs.Write(tmp, 0, tmp.Length);
 
                 byte[] rootDir      = rootMs.ToArray();
                 bool   validRootDir = true;
@@ -270,19 +299,25 @@ namespace Aaru.Filesystems.FAT
                 for(int e = 0; e < 96 * 32; e += 32)
                 {
                     for(int c = 0; c < 11; c++)
-                        if(rootDir[c + e] < 0x20 && rootDir[c + e] != 0x00 && rootDir[c + e] != 0x05 ||
-                           rootDir[c + e] == 0xFF                                                    ||
+                        if((rootDir[c + e] < 0x20 && rootDir[c + e] != 0x00 && rootDir[c + e] != 0x05) ||
+                           rootDir[c + e] == 0xFF                                                      ||
                            rootDir[c + e] == 0x2E)
                         {
                             validRootDir = false;
+
                             break;
                         }
 
-                    if(!validRootDir) break;
+                    if(!validRootDir)
+                        break;
                 }
 
-                if(z80Di == 0xF3 && equalFatIds && (fat1Sector0[0] & 0xF0) == 0xF0 && fat1Sector0[1] == 0xFF &&
-                   validRootDir) return true;
+                if(z80Di == 0xF3                   &&
+                   equalFatIds                     &&
+                   (fat1Sector0[0] & 0xF0) == 0xF0 &&
+                   fat1Sector0[1]          == 0xFF &&
+                   validRootDir)
+                    return true;
             }
 
             byte   fat2          = fatSector[1];
@@ -290,38 +325,67 @@ namespace Aaru.Filesystems.FAT
             ushort fat2ndCluster = (ushort)(((fat2 << 8) + fat3) & 0xFFF);
 
             AaruConsole.DebugWriteLine("FAT plugin", "1st fat cluster 1 = {0:X3}", fat2ndCluster);
-            if(fat2ndCluster < 0xFF0) return false;
+
+            if(fat2ndCluster < 0xFF0)
+                return false;
 
             ulong fat2SectorNo = 0;
 
             switch(fatId)
             {
                 case 0xE5:
-                    if(imagePlugin.Info.Sectors == 2002 && imagePlugin.Info.SectorSize == 128) fat2SectorNo = 2;
+                    if(imagePlugin.Info.Sectors    == 2002 &&
+                       imagePlugin.Info.SectorSize == 128)
+                        fat2SectorNo = 2;
+
                     break;
                 case 0xFD:
-                    if(imagePlugin.Info.Sectors      == 4004 && imagePlugin.Info.SectorSize == 128) fat2SectorNo = 7;
-                    else if(imagePlugin.Info.Sectors == 2002 && imagePlugin.Info.SectorSize == 128) fat2SectorNo = 7;
+                    if(imagePlugin.Info.Sectors    == 4004 &&
+                       imagePlugin.Info.SectorSize == 128)
+                        fat2SectorNo = 7;
+                    else if(imagePlugin.Info.Sectors    == 2002 &&
+                            imagePlugin.Info.SectorSize == 128)
+                        fat2SectorNo = 7;
+
                     break;
                 case 0xFE:
-                    if(imagePlugin.Info.Sectors      == 320  && imagePlugin.Info.SectorSize == 512) fat2SectorNo  = 2;
-                    else if(imagePlugin.Info.Sectors == 2002 && imagePlugin.Info.SectorSize == 128) fat2SectorNo  = 7;
-                    else if(imagePlugin.Info.Sectors == 1232 && imagePlugin.Info.SectorSize == 1024) fat2SectorNo = 3;
-                    else if(imagePlugin.Info.Sectors == 616  && imagePlugin.Info.SectorSize == 1024) fat2SectorNo = 2;
-                    else if(imagePlugin.Info.Sectors == 720  && imagePlugin.Info.SectorSize == 128) fat2SectorNo  = 5;
-                    else if(imagePlugin.Info.Sectors == 640  && imagePlugin.Info.SectorSize == 512) fat2SectorNo  = 2;
+                    if(imagePlugin.Info.Sectors    == 320 &&
+                       imagePlugin.Info.SectorSize == 512)
+                        fat2SectorNo = 2;
+                    else if(imagePlugin.Info.Sectors    == 2002 &&
+                            imagePlugin.Info.SectorSize == 128)
+                        fat2SectorNo = 7;
+                    else if(imagePlugin.Info.Sectors    == 1232 &&
+                            imagePlugin.Info.SectorSize == 1024)
+                        fat2SectorNo = 3;
+                    else if(imagePlugin.Info.Sectors    == 616 &&
+                            imagePlugin.Info.SectorSize == 1024)
+                        fat2SectorNo = 2;
+                    else if(imagePlugin.Info.Sectors    == 720 &&
+                            imagePlugin.Info.SectorSize == 128)
+                        fat2SectorNo = 5;
+                    else if(imagePlugin.Info.Sectors    == 640 &&
+                            imagePlugin.Info.SectorSize == 512)
+                        fat2SectorNo = 2;
+
                     break;
                 case 0xFF:
-                    if(imagePlugin.Info.Sectors == 640 && imagePlugin.Info.SectorSize == 512) fat2SectorNo = 2;
+                    if(imagePlugin.Info.Sectors    == 640 &&
+                       imagePlugin.Info.SectorSize == 512)
+                        fat2SectorNo = 2;
+
                     break;
                 default:
-                    if(fatId < 0xE8) return false;
+                    if(fatId < 0xE8)
+                        return false;
 
                     fat2SectorNo = 2;
+
                     break;
             }
 
-            if(fat2SectorNo > partition.End) return false;
+            if(fat2SectorNo > partition.End)
+                return false;
 
             AaruConsole.DebugWriteLine("FAT plugin", "2nd fat starts at = {0}", fat2SectorNo);
 
@@ -330,29 +394,29 @@ namespace Aaru.Filesystems.FAT
             fat2          = fat2Sector[1];
             fat3          = fat2Sector[2];
             fat2ndCluster = (ushort)(((fat2 << 8) + fat3) & 0xFFF);
-            if(fat2ndCluster < 0xFF0) return false;
+
+            if(fat2ndCluster < 0xFF0)
+                return false;
 
             return fatId == fat2Sector[0];
         }
 
         public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding    encoding)
+                                   Encoding encoding)
         {
             Encoding    = encoding ?? Encoding.GetEncoding("IBM437");
             information = "";
 
-            StringBuilder sb = new StringBuilder();
+            var sb = new StringBuilder();
             XmlFsType = new FileSystemType();
 
             uint sectorsPerBpb = imagePlugin.Info.SectorSize < 512 ? 512 / imagePlugin.Info.SectorSize : 1;
 
             byte[] bpbSector = imagePlugin.ReadSectors(0 + partition.Start, sectorsPerBpb);
 
-            BpbKind bpbKind = DetectBpbKind(bpbSector, imagePlugin, partition,
-                                            out BiosParameterBlockEbpb fakeBpb,
+            BpbKind bpbKind = DetectBpbKind(bpbSector, imagePlugin, partition, out BiosParameterBlockEbpb fakeBpb,
                                             out HumanParameterBlock humanBpb, out AtariParameterBlock atariBpb,
-                                            out byte minBootNearJump,         out bool andosOemCorrect,
-                                            out bool bootable);
+                                            out byte minBootNearJump, out bool andosOemCorrect, out bool bootable);
 
             bool   isFat12             = false;
             bool   isFat16             = false;
@@ -364,6 +428,7 @@ namespace Aaru.Filesystems.FAT
 
             // This is needed because for FAT16, GEMDOS increases bytes per sector count instead of using big_sectors field.
             uint sectorsPerRealSector;
+
             // This is needed because some OSes don't put volume label as first entry in the root directory
             uint sectorsForRootDirectory = 0;
 
@@ -374,13 +439,16 @@ namespace Aaru.Filesystems.FAT
                 case BpbKind.Msx:
                 case BpbKind.Apricot:
                     isFat12 = true;
+
                     break;
                 case BpbKind.ShortFat32:
                 case BpbKind.LongFat32:
                 {
                     isFat32 = true;
+
                     Fat32ParameterBlock fat32Bpb =
                         Marshal.ByteArrayToStructureLittleEndian<Fat32ParameterBlock>(bpbSector);
+
                     Fat32ParameterBlockShort shortFat32Bpb =
                         Marshal.ByteArrayToStructureLittleEndian<Fat32ParameterBlockShort>(bpbSector);
 
@@ -406,26 +474,34 @@ namespace Aaru.Filesystems.FAT
                     }
 
                     if(fat32Bpb.oem_name != null)
-                        if(fat32Bpb.oem_name[5] == 0x49 && fat32Bpb.oem_name[6] == 0x48 && fat32Bpb.oem_name[7] == 0x43)
+                        if(fat32Bpb.oem_name[5] == 0x49 &&
+                           fat32Bpb.oem_name[6] == 0x48 &&
+                           fat32Bpb.oem_name[7] == 0x43)
                             sb.AppendLine("Volume has been modified by Windows 9x/Me Volume Tracker.");
-                        else XmlFsType.SystemIdentifier = StringHandlers.CToString(fat32Bpb.oem_name);
+                        else
+                            XmlFsType.SystemIdentifier = StringHandlers.CToString(fat32Bpb.oem_name);
 
                     if(!string.IsNullOrEmpty(XmlFsType.SystemIdentifier))
                         sb.AppendFormat("OEM Name: {0}", XmlFsType.SystemIdentifier.Trim()).AppendLine();
+
                     sb.AppendFormat("{0} bytes per sector.", fat32Bpb.bps).AppendLine();
                     sb.AppendFormat("{0} sectors per cluster.", fat32Bpb.spc).AppendLine();
                     XmlFsType.ClusterSize = (uint)(fat32Bpb.bps * fat32Bpb.spc);
                     sb.AppendFormat("{0} sectors reserved between BPB and FAT.", fat32Bpb.rsectors).AppendLine();
-                    if(fat32Bpb.big_sectors == 0 && fat32Bpb.signature == 0x28)
+
+                    if(fat32Bpb.big_sectors == 0 &&
+                       fat32Bpb.signature   == 0x28)
                     {
                         sb.AppendFormat("{0} sectors on volume ({1} bytes).", shortFat32Bpb.huge_sectors,
                                         shortFat32Bpb.huge_sectors * shortFat32Bpb.bps).AppendLine();
+
                         XmlFsType.Clusters = shortFat32Bpb.huge_sectors / shortFat32Bpb.spc;
                     }
                     else
                     {
                         sb.AppendFormat("{0} sectors on volume ({1} bytes).", fat32Bpb.big_sectors,
                                         fat32Bpb.big_sectors * fat32Bpb.bps).AppendLine();
+
                         XmlFsType.Clusters = fat32Bpb.big_sectors / fat32Bpb.spc;
                     }
 
@@ -450,13 +526,15 @@ namespace Aaru.Filesystems.FAT
                             XmlFsType.Dirty = true;
                         }
 
-                        if((fat32Bpb.flags & 0x02) == 0x02) sb.AppendLine("Disk surface should be on next mount.");
+                        if((fat32Bpb.flags & 0x02) == 0x02)
+                            sb.AppendLine("Disk surface should be on next mount.");
                     }
 
                     if((fat32Bpb.mirror_flags & 0x80) == 0x80)
-                        sb.AppendFormat("FATs are out of sync. FAT #{0} is in use.", fat32Bpb.mirror_flags & 0xF)
-                          .AppendLine();
-                    else sb.AppendLine("All copies of FAT are the same.");
+                        sb.AppendFormat("FATs are out of sync. FAT #{0} is in use.", fat32Bpb.mirror_flags & 0xF).
+                           AppendLine();
+                    else
+                        sb.AppendLine("All copies of FAT are the same.");
 
                     if((fat32Bpb.mirror_flags & 0x6F20) == 0x6F20)
                         sb.AppendLine("DR-DOS will boot this FAT32 using CHS.");
@@ -466,34 +544,40 @@ namespace Aaru.Filesystems.FAT
                     if(fat32Bpb.signature == 0x29)
                     {
                         XmlFsType.VolumeName = Encoding.ASCII.GetString(fat32Bpb.volume_label);
-                        sb.AppendFormat("Filesystem type: {0}", Encoding.ASCII.GetString(fat32Bpb.fs_type))
-                          .AppendLine();
+
+                        sb.AppendFormat("Filesystem type: {0}", Encoding.ASCII.GetString(fat32Bpb.fs_type)).
+                           AppendLine();
+
                         bootChk = Sha1Context.Data(fat32Bpb.boot_code, out _);
                     }
-                    else bootChk = Sha1Context.Data(shortFat32Bpb.boot_code, out _);
+                    else
+                        bootChk = Sha1Context.Data(shortFat32Bpb.boot_code, out _);
 
                     // Check that jumps to a correct boot code position and has boot signature set.
                     // This will mean that the volume will boot, even if just to say "this is not bootable change disk"......
                     XmlFsType.Bootable =
-                        fat32Bpb.jump[0] == 0xEB && fat32Bpb.jump[1] >= minBootNearJump && fat32Bpb.jump[1] < 0x80 ||
-                        fat32Bpb.jump[0]                        == 0xE9            && fat32Bpb.jump.Length >= 3 &&
-                        BitConverter.ToUInt16(fat32Bpb.jump, 1) >= minBootNearJump &&
-                        BitConverter.ToUInt16(fat32Bpb.jump, 1) <= 0x1FC;
+                        (fat32Bpb.jump[0] == 0xEB && fat32Bpb.jump[1] >= minBootNearJump && fat32Bpb.jump[1] < 0x80) ||
+                        (fat32Bpb.jump[0]                        == 0xE9            && fat32Bpb.jump.Length >= 3 &&
+                         BitConverter.ToUInt16(fat32Bpb.jump, 1) >= minBootNearJump &&
+                         BitConverter.ToUInt16(fat32Bpb.jump, 1) <= 0x1FC);
 
                     sectorsPerRealSector = fat32Bpb.bps / imagePlugin.Info.SectorSize;
+
                     // First root directory sector
                     rootDirectorySector =
-                        (ulong)((fat32Bpb.root_cluster - 2) * fat32Bpb.spc + fat32Bpb.big_spfat * fat32Bpb.fats_no +
+                        (ulong)(((fat32Bpb.root_cluster - 2) * fat32Bpb.spc) + (fat32Bpb.big_spfat * fat32Bpb.fats_no) +
                                 fat32Bpb.rsectors) * sectorsPerRealSector;
+
                     sectorsForRootDirectory = 1;
 
                     if(fat32Bpb.fsinfo_sector + partition.Start <= partition.End)
                     {
                         byte[] fsinfoSector = imagePlugin.ReadSector(fat32Bpb.fsinfo_sector + partition.Start);
-                        FsInfoSector fsInfo =
-                            Marshal.ByteArrayToStructureLittleEndian<FsInfoSector>(fsinfoSector);
 
-                        if(fsInfo.signature1 == FSINFO_SIGNATURE1 && fsInfo.signature2 == FSINFO_SIGNATURE2 &&
+                        FsInfoSector fsInfo = Marshal.ByteArrayToStructureLittleEndian<FsInfoSector>(fsinfoSector);
+
+                        if(fsInfo.signature1 == FSINFO_SIGNATURE1 &&
+                           fsInfo.signature2 == FSINFO_SIGNATURE2 &&
                            fsInfo.signature3 == FSINFO_SIGNATURE3)
                         {
                             if(fsInfo.free_clusters < 0xFFFFFFFF)
@@ -503,7 +587,8 @@ namespace Aaru.Filesystems.FAT
                                 XmlFsType.FreeClustersSpecified = true;
                             }
 
-                            if(fsInfo.last_cluster > 2 && fsInfo.last_cluster < 0xFFFFFFFF)
+                            if(fsInfo.last_cluster > 2 &&
+                               fsInfo.last_cluster < 0xFFFFFFFF)
                                 sb.AppendFormat("Last allocated cluster {0}", fsInfo.last_cluster).AppendLine();
                         }
                     }
@@ -514,20 +599,26 @@ namespace Aaru.Filesystems.FAT
                 // Some fields could overflow fake BPB, those will be handled below
                 case BpbKind.Atari:
                 {
-                    ushort sum                                       = 0;
-                    for(int i = 0; i < bpbSector.Length; i += 2) sum += BigEndianBitConverter.ToUInt16(bpbSector, i);
+                    ushort sum = 0;
+
+                    for(int i = 0; i < bpbSector.Length; i += 2)
+                        sum += BigEndianBitConverter.ToUInt16(bpbSector, i);
 
                     // TODO: Check this
                     if(sum == 0x1234)
                     {
                         XmlFsType.Bootable = true;
-                        StringBuilder atariSb = new StringBuilder();
+                        var atariSb = new StringBuilder();
+
                         atariSb.AppendFormat("cmdload will be loaded with value {0:X4}h",
                                              BigEndianBitConverter.ToUInt16(bpbSector, 0x01E)).AppendLine();
-                        atariSb.AppendFormat("Boot program will be loaded at address {0:X4}h", atariBpb.ldaaddr)
-                               .AppendLine();
-                        atariSb.AppendFormat("FAT and directory will be cached at address {0:X4}h", atariBpb.fatbuf)
-                               .AppendLine();
+
+                        atariSb.AppendFormat("Boot program will be loaded at address {0:X4}h", atariBpb.ldaaddr).
+                                AppendLine();
+
+                        atariSb.AppendFormat("FAT and directory will be cached at address {0:X4}h", atariBpb.fatbuf).
+                                AppendLine();
+
                         if(atariBpb.ldmode == 0)
                         {
                             byte[] tmp = new byte[8];
@@ -538,16 +629,18 @@ namespace Aaru.Filesystems.FAT
                             string extension = Encoding.ASCII.GetString(tmp).Trim();
                             string filename;
 
-                            if(string.IsNullOrEmpty(extension)) filename = fname;
-                            else filename                                = fname + "." + extension;
+                            if(string.IsNullOrEmpty(extension))
+                                filename = fname;
+                            else
+                                filename = fname + "." + extension;
 
                             atariSb.AppendFormat("Boot program resides in file \"{0}\"", filename).AppendLine();
                         }
                         else
-                            atariSb
-                               .AppendFormat("Boot program starts in sector {0} and is {1} sectors long ({2} bytes)",
-                                             atariBpb.ssect, atariBpb.sectcnt, atariBpb.sectcnt * atariBpb.bps)
-                               .AppendLine();
+                            atariSb.
+                                AppendFormat("Boot program starts in sector {0} and is {1} sectors long ({2} bytes)",
+                                             atariBpb.ssect, atariBpb.sectcnt, atariBpb.sectcnt * atariBpb.bps).
+                                AppendLine();
 
                         extraInfo = atariSb.ToString();
                     }
@@ -557,6 +650,7 @@ namespace Aaru.Filesystems.FAT
 
                 case BpbKind.Human:
                     XmlFsType.Bootable = true;
+
                     break;
             }
 
@@ -572,23 +666,28 @@ namespace Aaru.Filesystems.FAT
                     fakeBpb.sptrk    /= 4;
                     fakeBpb.rsectors /= 4;
 
-                    if(fakeBpb.spc == 0) fakeBpb.spc = 1;
+                    if(fakeBpb.spc == 0)
+                        fakeBpb.spc = 1;
                 }
 
                 // This assumes no sane implementation will violate cluster size rules
                 // However nothing prevents this to happen
                 // If first file on disk uses only one cluster there is absolutely no way to differentiate between FAT12 and FAT16,
                 // so let's hope implementations use common sense?
-                if(!isFat12 && !isFat16)
+                if(!isFat12 &&
+                   !isFat16)
                 {
                     ulong clusters;
 
                     if(fakeBpb.sectors == 0)
-                        clusters  = fakeBpb.spc == 0 ? fakeBpb.big_sectors : fakeBpb.big_sectors / fakeBpb.spc;
-                    else clusters = fakeBpb.spc == 0 ? fakeBpb.sectors : (ulong)fakeBpb.sectors  / fakeBpb.spc;
+                        clusters = fakeBpb.spc == 0 ? fakeBpb.big_sectors : fakeBpb.big_sectors / fakeBpb.spc;
+                    else
+                        clusters = fakeBpb.spc == 0 ? fakeBpb.sectors : (ulong)fakeBpb.sectors / fakeBpb.spc;
 
-                    if(clusters < 4089) isFat12 = true;
-                    else isFat16                = true;
+                    if(clusters < 4089)
+                        isFat12 = true;
+                    else
+                        isFat16 = true;
                 }
 
                 if(isFat12)
@@ -597,15 +696,19 @@ namespace Aaru.Filesystems.FAT
                     {
                         case BpbKind.Atari:
                             sb.AppendLine("Atari FAT12");
+
                             break;
                         case BpbKind.Apricot:
                             sb.AppendLine("Apricot FAT12");
+
                             break;
                         case BpbKind.Human:
                             sb.AppendLine("Human68k FAT12");
+
                             break;
                         default:
                             sb.AppendLine("Microsoft FAT12");
+
                             break;
                     }
 
@@ -618,47 +721,72 @@ namespace Aaru.Filesystems.FAT
                                       : bpbKind == BpbKind.Human
                                           ? "Human68k FAT16"
                                           : "Microsoft FAT16");
+
                     XmlFsType.Type = "FAT16";
                 }
 
                 if(bpbKind == BpbKind.Atari)
                 {
-                    if(atariBpb.serial_no[0] == 0x49 && atariBpb.serial_no[1] == 0x48 && atariBpb.serial_no[2] == 0x43)
+                    if(atariBpb.serial_no[0] == 0x49 &&
+                       atariBpb.serial_no[1] == 0x48 &&
+                       atariBpb.serial_no[2] == 0x43)
                         sb.AppendLine("Volume has been modified by Windows 9x/Me Volume Tracker.");
                     else
                         XmlFsType.VolumeSerial =
                             $"{atariBpb.serial_no[0]:X2}{atariBpb.serial_no[1]:X2}{atariBpb.serial_no[2]:X2}";
 
                     XmlFsType.SystemIdentifier = StringHandlers.CToString(atariBpb.oem_name);
-                    if(string.IsNullOrEmpty(XmlFsType.SystemIdentifier)) XmlFsType.SystemIdentifier = null;
+
+                    if(string.IsNullOrEmpty(XmlFsType.SystemIdentifier))
+                        XmlFsType.SystemIdentifier = null;
                 }
                 else if(fakeBpb.oem_name != null)
                 {
-                    if(fakeBpb.oem_name[5] == 0x49 && fakeBpb.oem_name[6] == 0x48 && fakeBpb.oem_name[7] == 0x43)
+                    if(fakeBpb.oem_name[5] == 0x49 &&
+                       fakeBpb.oem_name[6] == 0x48 &&
+                       fakeBpb.oem_name[7] == 0x43)
                         sb.AppendLine("Volume has been modified by Windows 9x/Me Volume Tracker.");
                     else
                     {
                         // Later versions of Windows create a DOS 3 BPB without OEM name on 8 sectors/track floppies
                         // OEM ID should be ASCII, otherwise ignore it
-                        if(fakeBpb.oem_name[0] >= 0x20 && fakeBpb.oem_name[0] <= 0x7F && fakeBpb.oem_name[1] >= 0x20 &&
-                           fakeBpb.oem_name[1] <= 0x7F && fakeBpb.oem_name[2] >= 0x20 && fakeBpb.oem_name[2] <= 0x7F &&
-                           fakeBpb.oem_name[3] >= 0x20 && fakeBpb.oem_name[3] <= 0x7F && fakeBpb.oem_name[4] >= 0x20 &&
-                           fakeBpb.oem_name[4] <= 0x7F && fakeBpb.oem_name[5] >= 0x20 && fakeBpb.oem_name[5] <= 0x7F &&
-                           fakeBpb.oem_name[6] >= 0x20 && fakeBpb.oem_name[6] <= 0x7F && fakeBpb.oem_name[7] >= 0x20 &&
+                        if(fakeBpb.oem_name[0] >= 0x20 &&
+                           fakeBpb.oem_name[0] <= 0x7F &&
+                           fakeBpb.oem_name[1] >= 0x20 &&
+                           fakeBpb.oem_name[1] <= 0x7F &&
+                           fakeBpb.oem_name[2] >= 0x20 &&
+                           fakeBpb.oem_name[2] <= 0x7F &&
+                           fakeBpb.oem_name[3] >= 0x20 &&
+                           fakeBpb.oem_name[3] <= 0x7F &&
+                           fakeBpb.oem_name[4] >= 0x20 &&
+                           fakeBpb.oem_name[4] <= 0x7F &&
+                           fakeBpb.oem_name[5] >= 0x20 &&
+                           fakeBpb.oem_name[5] <= 0x7F &&
+                           fakeBpb.oem_name[6] >= 0x20 &&
+                           fakeBpb.oem_name[6] <= 0x7F &&
+                           fakeBpb.oem_name[7] >= 0x20 &&
                            fakeBpb.oem_name[7] <= 0x7F)
                             XmlFsType.SystemIdentifier = StringHandlers.CToString(fakeBpb.oem_name);
-                        else if(fakeBpb.oem_name[0] < 0x20  && fakeBpb.oem_name[1] >= 0x20 &&
-                                fakeBpb.oem_name[1] <= 0x7F && fakeBpb.oem_name[2] >= 0x20 &&
-                                fakeBpb.oem_name[2] <= 0x7F && fakeBpb.oem_name[3] >= 0x20 &&
-                                fakeBpb.oem_name[3] <= 0x7F && fakeBpb.oem_name[4] >= 0x20 &&
-                                fakeBpb.oem_name[4] <= 0x7F && fakeBpb.oem_name[5] >= 0x20 &&
-                                fakeBpb.oem_name[5] <= 0x7F && fakeBpb.oem_name[6] >= 0x20 &&
-                                fakeBpb.oem_name[6] <= 0x7F && fakeBpb.oem_name[7] >= 0x20 &&
+                        else if(fakeBpb.oem_name[0] < 0x20  &&
+                                fakeBpb.oem_name[1] >= 0x20 &&
+                                fakeBpb.oem_name[1] <= 0x7F &&
+                                fakeBpb.oem_name[2] >= 0x20 &&
+                                fakeBpb.oem_name[2] <= 0x7F &&
+                                fakeBpb.oem_name[3] >= 0x20 &&
+                                fakeBpb.oem_name[3] <= 0x7F &&
+                                fakeBpb.oem_name[4] >= 0x20 &&
+                                fakeBpb.oem_name[4] <= 0x7F &&
+                                fakeBpb.oem_name[5] >= 0x20 &&
+                                fakeBpb.oem_name[5] <= 0x7F &&
+                                fakeBpb.oem_name[6] >= 0x20 &&
+                                fakeBpb.oem_name[6] <= 0x7F &&
+                                fakeBpb.oem_name[7] >= 0x20 &&
                                 fakeBpb.oem_name[7] <= 0x7F)
                             XmlFsType.SystemIdentifier = StringHandlers.CToString(fakeBpb.oem_name, Encoding, start: 1);
                     }
 
-                    if(fakeBpb.signature == 0x28 || fakeBpb.signature == 0x29)
+                    if(fakeBpb.signature == 0x28 ||
+                       fakeBpb.signature == 0x29)
                         XmlFsType.VolumeSerial = $"{fakeBpb.serial_no:X8}";
                 }
 
@@ -666,26 +794,30 @@ namespace Aaru.Filesystems.FAT
                     sb.AppendFormat("OEM Name: {0}", XmlFsType.SystemIdentifier.Trim()).AppendLine();
 
                 sb.AppendFormat("{0} bytes per sector.", fakeBpb.bps).AppendLine();
+
                 if(bpbKind != BpbKind.Human)
                     if(fakeBpb.sectors == 0)
                     {
                         sb.AppendFormat("{0} sectors on volume ({1} bytes).", fakeBpb.big_sectors,
                                         fakeBpb.big_sectors * fakeBpb.bps).AppendLine();
+
                         XmlFsType.Clusters = fakeBpb.spc == 0 ? fakeBpb.big_sectors : fakeBpb.big_sectors / fakeBpb.spc;
                     }
                     else
                     {
                         sb.AppendFormat("{0} sectors on volume ({1} bytes).", fakeBpb.sectors,
                                         fakeBpb.sectors * fakeBpb.bps).AppendLine();
+
                         XmlFsType.Clusters =
                             (ulong)(fakeBpb.spc == 0 ? fakeBpb.sectors : fakeBpb.sectors / fakeBpb.spc);
                     }
                 else
                 {
                     XmlFsType.Clusters = humanBpb.clusters == 0 ? humanBpb.big_clusters : humanBpb.clusters;
+
                     sb.AppendFormat("{0} sectors on volume ({1} bytes).",
-                                    XmlFsType.Clusters * humanBpb.bpc / imagePlugin.Info.SectorSize,
-                                    XmlFsType.Clusters                * humanBpb.bpc).AppendLine();
+                                    (XmlFsType.Clusters * humanBpb.bpc) / imagePlugin.Info.SectorSize,
+                                    XmlFsType.Clusters                  * humanBpb.bpc).AppendLine();
                 }
 
                 sb.AppendFormat("{0} sectors per cluster.", fakeBpb.spc).AppendLine();
@@ -695,11 +827,15 @@ namespace Aaru.Filesystems.FAT
                 sb.AppendFormat("{0} FATs.", fakeBpb.fats_no).AppendLine();
                 sb.AppendFormat("{0} entries on root directory.", fakeBpb.root_ent).AppendLine();
 
-                if(fakeBpb.media > 0) sb.AppendFormat("Media descriptor: 0x{0:X2}", fakeBpb.media).AppendLine();
+                if(fakeBpb.media > 0)
+                    sb.AppendFormat("Media descriptor: 0x{0:X2}", fakeBpb.media).AppendLine();
 
                 sb.AppendFormat("{0} sectors per FAT.", fakeBpb.spfat).AppendLine();
 
-                if(fakeBpb.sptrk > 0 && fakeBpb.sptrk < 64 && fakeBpb.heads > 0 && fakeBpb.heads < 256)
+                if(fakeBpb.sptrk > 0  &&
+                   fakeBpb.sptrk < 64 &&
+                   fakeBpb.heads > 0  &&
+                   fakeBpb.heads < 256)
                 {
                     sb.AppendFormat("{0} sectors per track.", fakeBpb.sptrk).AppendLine();
                     sb.AppendFormat("{0} heads.", fakeBpb.heads).AppendLine();
@@ -708,7 +844,9 @@ namespace Aaru.Filesystems.FAT
                 if(fakeBpb.hsectors <= partition.Start)
                     sb.AppendFormat("{0} hidden sectors before BPB.", fakeBpb.hsectors).AppendLine();
 
-                if(fakeBpb.signature == 0x28 || fakeBpb.signature == 0x29 || andosOemCorrect)
+                if(fakeBpb.signature == 0x28 ||
+                   fakeBpb.signature == 0x29 ||
+                   andosOemCorrect)
                 {
                     sb.AppendFormat("Drive number: 0x{0:X2}", fakeBpb.drive_no).AppendLine();
 
@@ -723,7 +861,8 @@ namespace Aaru.Filesystems.FAT
                             XmlFsType.Dirty = true;
                         }
 
-                        if((fakeBpb.flags & 0x02) == 0x02) sb.AppendLine("Disk surface should be on next mount.");
+                        if((fakeBpb.flags & 0x02) == 0x02)
+                            sb.AppendLine("Disk surface should be on next mount.");
                     }
 
                     if(fakeBpb.signature == 0x29 || andosOemCorrect)
@@ -732,31 +871,37 @@ namespace Aaru.Filesystems.FAT
                         sb.AppendFormat("Filesystem type: {0}", Encoding.ASCII.GetString(fakeBpb.fs_type)).AppendLine();
                     }
                 }
-                else if(bpbKind == BpbKind.Atari && XmlFsType.VolumeSerial != null)
+                else if(bpbKind                == BpbKind.Atari &&
+                        XmlFsType.VolumeSerial != null)
                     sb.AppendFormat("Volume Serial Number: {0}", XmlFsType.VolumeSerial).AppendLine();
 
                 bootChk = Sha1Context.Data(fakeBpb.boot_code, out _);
 
                 // Workaround that PCExchange jumps into "FAT16   "...
-                if(XmlFsType.SystemIdentifier == "PCX 2.0 ") fakeBpb.jump[1] += 8;
+                if(XmlFsType.SystemIdentifier == "PCX 2.0 ")
+                    fakeBpb.jump[1] += 8;
 
                 // Check that jumps to a correct boot code position and has boot signature set.
                 // This will mean that the volume will boot, even if just to say "this is not bootable change disk"......
-                if(XmlFsType.Bootable == false && fakeBpb.jump != null)
+                if(XmlFsType.Bootable == false &&
+                   fakeBpb.jump       != null)
                     XmlFsType.Bootable |=
-                        fakeBpb.jump[0] == 0xEB && fakeBpb.jump[1] >= minBootNearJump && fakeBpb.jump[1] < 0x80 ||
-                        fakeBpb.jump[0]                        == 0xE9            && fakeBpb.jump.Length >= 3 &&
-                        BitConverter.ToUInt16(fakeBpb.jump, 1) >= minBootNearJump &&
-                        BitConverter.ToUInt16(fakeBpb.jump, 1) <= 0x1FC;
+                        (fakeBpb.jump[0] == 0xEB && fakeBpb.jump[1] >= minBootNearJump && fakeBpb.jump[1] < 0x80) ||
+                        (fakeBpb.jump[0]                        == 0xE9            && fakeBpb.jump.Length >= 3 &&
+                         BitConverter.ToUInt16(fakeBpb.jump, 1) >= minBootNearJump &&
+                         BitConverter.ToUInt16(fakeBpb.jump, 1) <= 0x1FC);
 
                 sectorsPerRealSector = fakeBpb.bps / imagePlugin.Info.SectorSize;
+
                 // First root directory sector
                 rootDirectorySector =
-                    (ulong)(fakeBpb.spfat * fakeBpb.fats_no + fakeBpb.rsectors) * sectorsPerRealSector;
-                sectorsForRootDirectory = (uint)(fakeBpb.root_ent * 32 / imagePlugin.Info.SectorSize);
+                    (ulong)((fakeBpb.spfat * fakeBpb.fats_no) + fakeBpb.rsectors) * sectorsPerRealSector;
+
+                sectorsForRootDirectory = (uint)((fakeBpb.root_ent * 32) / imagePlugin.Info.SectorSize);
             }
 
-            if(extraInfo != null) sb.Append(extraInfo);
+            if(extraInfo != null)
+                sb.Append(extraInfo);
 
             if(rootDirectorySector + partition.Start < partition.End &&
                imagePlugin.Info.XmlMediaType         != XmlMediaType.OpticalDisc)
@@ -766,9 +911,13 @@ namespace Aaru.Filesystems.FAT
 
                 if(bpbKind == BpbKind.DecRainbow)
                 {
-                    MemoryStream rootMs = new MemoryStream();
-                    foreach(byte[] tmp in from ulong rootSector in new[] {0x17, 0x19, 0x1B, 0x1D, 0x1E, 0x20}
-                                          select imagePlugin.ReadSector(rootSector)) rootMs.Write(tmp, 0, tmp.Length);
+                    var rootMs = new MemoryStream();
+
+                    foreach(byte[] tmp in from ulong rootSector in new[]
+                    {
+                        0x17, 0x19, 0x1B, 0x1D, 0x1E, 0x20
+                    } select imagePlugin.ReadSector(rootSector))
+                        rootMs.Write(tmp, 0, tmp.Length);
 
                     rootDirectory = rootMs.ToArray();
                 }
@@ -776,35 +925,46 @@ namespace Aaru.Filesystems.FAT
                 for(int i = 0; i < rootDirectory.Length; i += 32)
                 {
                     // Not a correct entry
-                    if(rootDirectory[i] < DIRENT_MIN && rootDirectory[i] != DIRENT_E5) continue;
+                    if(rootDirectory[i] < DIRENT_MIN &&
+                       rootDirectory[i] != DIRENT_E5)
+                        continue;
 
                     // Deleted or subdirectory entry
-                    if(rootDirectory[i] == DIRENT_SUBDIR || rootDirectory[i] == DIRENT_DELETED) continue;
+                    if(rootDirectory[i] == DIRENT_SUBDIR ||
+                       rootDirectory[i] == DIRENT_DELETED)
+                        continue;
 
                     // Not a volume label
-                    if(rootDirectory[i + 0x0B] != 0x08 && rootDirectory[i + 0x0B] != 0x28) continue;
+                    if(rootDirectory[i + 0x0B] != 0x08 &&
+                       rootDirectory[i + 0x0B] != 0x28)
+                        continue;
 
                     DirectoryEntry entry =
                         Marshal.ByteArrayToStructureLittleEndian<DirectoryEntry>(rootDirectory, i, 32);
 
                     byte[] fullname = new byte[11];
-                    Array.Copy(entry.filename,  0, fullname, 0, 8);
+                    Array.Copy(entry.filename, 0, fullname, 0, 8);
                     Array.Copy(entry.extension, 0, fullname, 8, 3);
                     string volname = Encoding.GetString(fullname).Trim();
+
                     if(!string.IsNullOrEmpty(volname))
                         XmlFsType.VolumeName =
                             entry.caseinfo.HasFlag(CaseInfo.AllLowerCase) ? volname.ToLower() : volname;
 
-                    if(entry.ctime > 0 && entry.cdate > 0)
+                    if(entry.ctime > 0 &&
+                       entry.cdate > 0)
                     {
                         XmlFsType.CreationDate = DateHandlers.DosToDateTime(entry.cdate, entry.ctime);
+
                         if(entry.ctime_ms > 0)
                             XmlFsType.CreationDate = XmlFsType.CreationDate.AddMilliseconds(entry.ctime_ms * 10);
+
                         XmlFsType.CreationDateSpecified = true;
                         sb.AppendFormat("Volume created on {0}", XmlFsType.CreationDate).AppendLine();
                     }
 
-                    if(entry.mtime > 0 && entry.mdate > 0)
+                    if(entry.mtime > 0 &&
+                       entry.mdate > 0)
                     {
                         XmlFsType.ModificationDate          = DateHandlers.DosToDateTime(entry.mdate, entry.mtime);
                         XmlFsType.ModificationDateSpecified = true;
@@ -812,8 +972,8 @@ namespace Aaru.Filesystems.FAT
                     }
 
                     if(entry.adate > 0)
-                        sb.AppendFormat("Volume last accessed on {0:d}", DateHandlers.DosToDateTime(entry.adate, 0))
-                          .AppendLine();
+                        sb.AppendFormat("Volume last accessed on {0:d}", DateHandlers.DosToDateTime(entry.adate, 0)).
+                           AppendLine();
 
                     break;
                 }
@@ -821,18 +981,22 @@ namespace Aaru.Filesystems.FAT
 
             if(!string.IsNullOrEmpty(XmlFsType.VolumeName))
                 sb.AppendFormat("Volume label: {0}", XmlFsType.VolumeName).AppendLine();
+
             if(XmlFsType.Bootable)
             {
                 // Intel short jump
-                if(bpbSector[0] == 0xEB && bpbSector[1] < 0x80)
+                if(bpbSector[0] == 0xEB &&
+                   bpbSector[1] < 0x80)
                 {
                     int    sigSize  = bpbSector[510] == 0x55 && bpbSector[511] == 0xAA ? 2 : 0;
                     byte[] bootCode = new byte[512 - sigSize - bpbSector[1] - 2];
                     Array.Copy(bpbSector, bpbSector[1] + 2, bootCode, 0, bootCode.Length);
                     Sha1Context.Data(bootCode, out _);
                 }
+
                 // Intel big jump
-                else if(bpbSector[0] == 0xE9 && BitConverter.ToUInt16(bpbSector, 1) < 0x1FC)
+                else if(bpbSector[0]                        == 0xE9 &&
+                        BitConverter.ToUInt16(bpbSector, 1) < 0x1FC)
                 {
                     int    sigSize  = bpbSector[510] == 0x55 && bpbSector[511] == 0xAA ? 2 : 0;
                     byte[] bootCode = new byte[512 - sigSize - BitConverter.ToUInt16(bpbSector, 1) - 3];
@@ -843,8 +1007,11 @@ namespace Aaru.Filesystems.FAT
                 sb.AppendLine("Volume is bootable");
                 sb.AppendFormat("Boot code's SHA1: {0}", bootChk).AppendLine();
                 string bootName = knownBootHashes.FirstOrDefault(t => t.hash == bootChk).name;
-                if(string.IsNullOrWhiteSpace(bootName)) sb.AppendLine("Unknown boot code.");
-                else sb.AppendFormat("Boot code corresponds to {0}", bootName).AppendLine();
+
+                if(string.IsNullOrWhiteSpace(bootName))
+                    sb.AppendLine("Unknown boot code.");
+                else
+                    sb.AppendFormat("Boot code corresponds to {0}", bootName).AppendLine();
             }
 
             information = sb.ToString();
diff --git a/Aaru.Filesystems/FAT/Structs.cs b/Aaru.Filesystems/FAT/Structs.cs
index 273388ece..d535d7775 100644
--- a/Aaru.Filesystems/FAT/Structs.cs
+++ b/Aaru.Filesystems/FAT/Structs.cs
@@ -38,9 +38,7 @@ namespace Aaru.Filesystems.FAT
     {
         const int UMSDOS_MAXNAME = 220;
 
-        /// <summary>
-        ///     BIOS Parameter Block as used by Atari ST GEMDOS on FAT12 volumes.
-        /// </summary>
+        /// <summary>BIOS Parameter Block as used by Atari ST GEMDOS on FAT12 volumes.</summary>
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct AtariParameterBlock
         {
@@ -106,9 +104,7 @@ namespace Aaru.Filesystems.FAT
             public readonly ushort checksum;
         }
 
-        /// <summary>
-        ///     BIOS Parameter Block as used by MSX-DOS 2.
-        /// </summary>
+        /// <summary>BIOS Parameter Block as used by MSX-DOS 2.</summary>
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct MsxParameterBlock
         {
@@ -913,50 +909,30 @@ namespace Aaru.Filesystems.FAT
             public readonly ushort zero;
         }
 
-        /// <summary>
-        ///     This structure is 256 bytes large, depending on the name, only part of it is written to disk
-        /// </summary>
+        /// <summary>This structure is 256 bytes large, depending on the name, only part of it is written to disk</summary>
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct UmsdosDirectoryEntry
         {
             /// <summary>if == 0, then this entry is not used</summary>
             public readonly byte name_len;
-            /// <summary>
-            ///     UMSDOS_xxxx
-            /// </summary>
+            /// <summary>UMSDOS_xxxx</summary>
             public readonly UmsdosFlags flags;
-            /// <summary>
-            ///     How many hard links point to this entry
-            /// </summary>
+            /// <summary>How many hard links point to this entry</summary>
             public readonly ushort nlink;
-            /// <summary>
-            ///     Owner user id
-            /// </summary>
+            /// <summary>Owner user id</summary>
             public readonly int uid;
-            /// <summary>
-            ///     Group id
-            /// </summary>
+            /// <summary>Group id</summary>
             public readonly int gid;
-            /// <summary>
-            ///     Access time
-            /// </summary>
+            /// <summary>Access time</summary>
             public readonly int atime;
-            /// <summary>
-            ///     Last modification time
-            /// </summary>
+            /// <summary>Last modification time</summary>
             public readonly int mtime;
-            /// <summary>
-            ///     Creation time
-            /// </summary>
+            /// <summary>Creation time</summary>
             public readonly int ctime;
-            /// <summary>
-            ///     major and minor number of a device
-            /// </summary>
+            /// <summary>major and minor number of a device</summary>
             public readonly uint rdev;
             /*  */
-            /// <summary>
-            ///     Standard UNIX permissions bits + type of
-            /// </summary>
+            /// <summary>Standard UNIX permissions bits + type of</summary>
             public readonly ushort mode;
             /// <summary>unused bytes for future extensions</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 12)]
@@ -992,13 +968,16 @@ namespace Aaru.Filesystems.FAT
             public override string ToString()
             {
                 // This ensures UMSDOS takes preference when present
-                if(!string.IsNullOrEmpty(LinuxName)) return LinuxName;
+                if(!string.IsNullOrEmpty(LinuxName))
+                    return LinuxName;
 
                 // This ensures LFN takes preference when eCS is in use
-                if(!string.IsNullOrEmpty(Lfn)) return Lfn;
+                if(!string.IsNullOrEmpty(Lfn))
+                    return Lfn;
 
                 // This ensures Humans takes preference when present
-                if(!string.IsNullOrEmpty(HumanName)) return HumanName;
+                if(!string.IsNullOrEmpty(HumanName))
+                    return HumanName;
 
                 return !string.IsNullOrEmpty(Longname) ? Longname : Shortname;
             }
diff --git a/Aaru.Filesystems/FAT/Super.cs b/Aaru.Filesystems/FAT/Super.cs
index db23bd207..70b14de3e 100644
--- a/Aaru.Filesystems/FAT/Super.cs
+++ b/Aaru.Filesystems/FAT/Super.cs
@@ -54,38 +54,47 @@ namespace Aaru.Filesystems.FAT
 
         IMediaImage image;
 
-        /// <summary>
-        ///     Mounts an Apple Lisa filesystem
-        /// </summary>
-        public Errno Mount(IMediaImage                imagePlugin, Partition partition, Encoding encoding,
-                           Dictionary<string, string> options,     string    @namespace)
+        /// <summary>Mounts an Apple Lisa filesystem</summary>
+        public Errno Mount(IMediaImage imagePlugin, Partition partition, Encoding encoding,
+                           Dictionary<string, string> options, string @namespace)
         {
             XmlFsType = new FileSystemType();
-            if(options == null) options = GetDefaultOptions();
-            if(options.TryGetValue("debug", out string debugString)) bool.TryParse(debugString, out debug);
+
+            if(options == null)
+                options = GetDefaultOptions();
+
+            if(options.TryGetValue("debug", out string debugString))
+                bool.TryParse(debugString, out debug);
 
             // Default namespace
-            if(@namespace is null) @namespace = "ecs";
+            if(@namespace is null)
+                @namespace = "ecs";
 
             switch(@namespace.ToLowerInvariant())
             {
                 case "dos":
                     this.@namespace = Namespace.Dos;
+
                     break;
                 case "nt":
                     this.@namespace = Namespace.Nt;
+
                     break;
                 case "os2":
                     this.@namespace = Namespace.Os2;
+
                     break;
                 case "ecs":
                     this.@namespace = Namespace.Ecs;
+
                     break;
                 case "lfn":
                     this.@namespace = Namespace.Lfn;
+
                     break;
                 case "human":
                     this.@namespace = Namespace.Human;
+
                     break;
                 default: return Errno.InvalidArgument;
             }
@@ -96,11 +105,9 @@ namespace Aaru.Filesystems.FAT
 
             byte[] bpbSector = imagePlugin.ReadSectors(0 + partition.Start, sectorsPerBpb);
 
-            BpbKind bpbKind = DetectBpbKind(bpbSector, imagePlugin, partition,
-                                            out BiosParameterBlockEbpb fakeBpb,
+            BpbKind bpbKind = DetectBpbKind(bpbSector, imagePlugin, partition, out BiosParameterBlockEbpb fakeBpb,
                                             out HumanParameterBlock humanBpb, out AtariParameterBlock atariBpb,
-                                            out byte minBootNearJump,         out bool andosOemCorrect,
-                                            out bool bootable);
+                                            out byte minBootNearJump, out bool andosOemCorrect, out bool bootable);
 
             fat12              = false;
             fat16              = false;
@@ -110,16 +117,14 @@ namespace Aaru.Filesystems.FAT
 
             statfs = new FileSystemInfo
             {
-                Blocks         = XmlFsType.Clusters,
-                FilenameLength = 11,
-                Files          = 0, // Requires traversing all directories
-                FreeFiles      = 0,
-                PluginId       = Id,
-                FreeBlocks     = 0 // Requires traversing the FAT
+                Blocks    = XmlFsType.Clusters, FilenameLength = 11,
+                Files     = 0,                               // Requires traversing all directories
+                FreeFiles = 0, PluginId = Id, FreeBlocks = 0 // Requires traversing the FAT
             };
 
             // This is needed because for FAT16, GEMDOS increases bytes per sector count instead of using big_sectors field.
             uint sectorsPerRealSector = 1;
+
             // This is needed because some OSes don't put volume label as first entry in the root directory
             uint sectorsForRootDirectory = 0;
             uint rootDirectoryCluster    = 0;
@@ -131,13 +136,16 @@ namespace Aaru.Filesystems.FAT
                 case BpbKind.Msx:
                 case BpbKind.Apricot:
                     fat12 = true;
+
                     break;
                 case BpbKind.ShortFat32:
                 case BpbKind.LongFat32:
                 {
                     fat32 = true;
+
                     Fat32ParameterBlock fat32Bpb =
                         Marshal.ByteArrayToStructureLittleEndian<Fat32ParameterBlock>(bpbSector);
+
                     Fat32ParameterBlockShort shortFat32Bpb =
                         Marshal.ByteArrayToStructureLittleEndian<Fat32ParameterBlockShort>(bpbSector);
 
@@ -155,26 +163,34 @@ namespace Aaru.Filesystems.FAT
 
                     XmlFsType.Type = fat32Bpb.version != 0 ? "FAT+" : "FAT32";
 
-                    if(fat32Bpb.oem_name != null && (fat32Bpb.oem_name[5] != 0x49 || fat32Bpb.oem_name[6] != 0x48 ||
-                                                     fat32Bpb.oem_name[7] != 0x43))
+                    if(fat32Bpb.oem_name != null &&
+                       (fat32Bpb.oem_name[5] != 0x49 || fat32Bpb.oem_name[6] != 0x48 || fat32Bpb.oem_name[7] != 0x43))
                         XmlFsType.SystemIdentifier = StringHandlers.CToString(fat32Bpb.oem_name);
 
                     sectorsPerCluster     = fat32Bpb.spc;
                     XmlFsType.ClusterSize = (uint)(fat32Bpb.bps * fat32Bpb.spc);
                     reservedSectors       = fat32Bpb.rsectors;
-                    if(fat32Bpb.big_sectors == 0 && fat32Bpb.signature == 0x28)
-                        XmlFsType.Clusters  = shortFat32Bpb.huge_sectors / shortFat32Bpb.spc;
-                    else XmlFsType.Clusters = fat32Bpb.big_sectors       / fat32Bpb.spc;
+
+                    if(fat32Bpb.big_sectors == 0 &&
+                       fat32Bpb.signature   == 0x28)
+                        XmlFsType.Clusters = shortFat32Bpb.huge_sectors / shortFat32Bpb.spc;
+                    else
+                        XmlFsType.Clusters = fat32Bpb.big_sectors / fat32Bpb.spc;
 
                     sectorsPerFat          = fat32Bpb.big_spfat;
                     XmlFsType.VolumeSerial = $"{fat32Bpb.serial_no:X8}";
-                    statfs.Id              = new FileSystemId {IsInt = true, Serial32 = fat32Bpb.serial_no};
+
+                    statfs.Id = new FileSystemId
+                    {
+                        IsInt = true, Serial32 = fat32Bpb.serial_no
+                    };
 
                     if((fat32Bpb.flags & 0xF8) == 0x00)
                         if((fat32Bpb.flags & 0x01) == 0x01)
                             XmlFsType.Dirty = true;
 
-                    if((fat32Bpb.mirror_flags & 0x80) == 0x80) useFirstFat = (fat32Bpb.mirror_flags & 0xF) != 1;
+                    if((fat32Bpb.mirror_flags & 0x80) == 0x80)
+                        useFirstFat = (fat32Bpb.mirror_flags & 0xF) != 1;
 
                     if(fat32Bpb.signature == 0x29)
                         XmlFsType.VolumeName = Encoding.ASCII.GetString(fat32Bpb.volume_label);
@@ -182,26 +198,27 @@ namespace Aaru.Filesystems.FAT
                     // Check that jumps to a correct boot code position and has boot signature set.
                     // This will mean that the volume will boot, even if just to say "this is not bootable change disk"......
                     XmlFsType.Bootable =
-                        fat32Bpb.jump[0] == 0xEB && fat32Bpb.jump[1] >= minBootNearJump && fat32Bpb.jump[1] < 0x80 ||
-                        fat32Bpb.jump[0]                        == 0xE9            && fat32Bpb.jump.Length >= 3 &&
-                        BitConverter.ToUInt16(fat32Bpb.jump, 1) >= minBootNearJump &&
-                        BitConverter.ToUInt16(fat32Bpb.jump, 1) <= 0x1FC;
+                        (fat32Bpb.jump[0] == 0xEB && fat32Bpb.jump[1] >= minBootNearJump && fat32Bpb.jump[1] < 0x80) ||
+                        (fat32Bpb.jump[0]                        == 0xE9            && fat32Bpb.jump.Length >= 3 &&
+                         BitConverter.ToUInt16(fat32Bpb.jump, 1) >= minBootNearJump &&
+                         BitConverter.ToUInt16(fat32Bpb.jump, 1) <= 0x1FC);
 
                     sectorsPerRealSector =  fat32Bpb.bps / imagePlugin.Info.SectorSize;
                     sectorsPerCluster    *= sectorsPerRealSector;
 
                     // First root directory sector
                     firstClusterSector =
-                        (ulong)(fat32Bpb.big_spfat * fat32Bpb.fats_no + fat32Bpb.rsectors) * sectorsPerRealSector -
-                        2                                                                  * sectorsPerCluster;
+                        ((ulong)((fat32Bpb.big_spfat * fat32Bpb.fats_no) + fat32Bpb.rsectors) * sectorsPerRealSector) -
+                        (2                                                                    * sectorsPerCluster);
 
                     if(fat32Bpb.fsinfo_sector + partition.Start <= partition.End)
                     {
                         byte[] fsinfoSector = imagePlugin.ReadSector(fat32Bpb.fsinfo_sector + partition.Start);
-                        FsInfoSector fsInfo =
-                            Marshal.ByteArrayToStructureLittleEndian<FsInfoSector>(fsinfoSector);
 
-                        if(fsInfo.signature1 == FSINFO_SIGNATURE1 && fsInfo.signature2 == FSINFO_SIGNATURE2 &&
+                        FsInfoSector fsInfo = Marshal.ByteArrayToStructureLittleEndian<FsInfoSector>(fsinfoSector);
+
+                        if(fsInfo.signature1 == FSINFO_SIGNATURE1 &&
+                           fsInfo.signature2 == FSINFO_SIGNATURE2 &&
                            fsInfo.signature3 == FSINFO_SIGNATURE3)
                             if(fsInfo.free_clusters < 0xFFFFFFFF)
                             {
@@ -216,11 +233,14 @@ namespace Aaru.Filesystems.FAT
                 // Some fields could overflow fake BPB, those will be handled below
                 case BpbKind.Atari:
                 {
-                    ushort sum                                       = 0;
-                    for(int i = 0; i < bpbSector.Length; i += 2) sum += BigEndianBitConverter.ToUInt16(bpbSector, i);
+                    ushort sum = 0;
+
+                    for(int i = 0; i < bpbSector.Length; i += 2)
+                        sum += BigEndianBitConverter.ToUInt16(bpbSector, i);
 
                     // TODO: Check this
-                    if(sum == 0x1234) XmlFsType.Bootable = true;
+                    if(sum == 0x1234)
+                        XmlFsType.Bootable = true;
 
                     break;
                 }
@@ -234,11 +254,11 @@ namespace Aaru.Filesystems.FAT
                     }
 
                     XmlFsType.Bootable = true;
+
                     break;
             }
 
-            Encoding = encoding ?? (bpbKind == BpbKind.Human
-                                        ? Encoding.GetEncoding("shift_jis")
+            Encoding = encoding ?? (bpbKind == BpbKind.Human ? Encoding.GetEncoding("shift_jis")
                                         : Encoding.GetEncoding("IBM437"));
 
             ulong firstRootSector = 0;
@@ -255,34 +275,44 @@ namespace Aaru.Filesystems.FAT
                     fakeBpb.sptrk    /= 4;
                     fakeBpb.rsectors /= 4;
 
-                    if(fakeBpb.spc == 0) fakeBpb.spc = 1;
+                    if(fakeBpb.spc == 0)
+                        fakeBpb.spc = 1;
                 }
 
                 // This assumes no sane implementation will violate cluster size rules
                 // However nothing prevents this to happen
                 // If first file on disk uses only one cluster there is absolutely no way to differentiate between FAT12 and FAT16,
                 // so let's hope implementations use common sense?
-                if(!fat12 && !fat16)
+                if(!fat12 &&
+                   !fat16)
                 {
                     ulong clusters;
 
                     if(fakeBpb.sectors == 0)
-                        clusters  = fakeBpb.spc == 0 ? fakeBpb.big_sectors : fakeBpb.big_sectors / fakeBpb.spc;
-                    else clusters = fakeBpb.spc == 0 ? fakeBpb.sectors : (ulong)fakeBpb.sectors  / fakeBpb.spc;
+                        clusters = fakeBpb.spc == 0 ? fakeBpb.big_sectors : fakeBpb.big_sectors / fakeBpb.spc;
+                    else
+                        clusters = fakeBpb.spc == 0 ? fakeBpb.sectors : (ulong)fakeBpb.sectors / fakeBpb.spc;
 
-                    if(clusters < 4089) fat12 = true;
-                    else fat16                = true;
+                    if(clusters < 4089)
+                        fat12 = true;
+                    else
+                        fat16 = true;
                 }
 
-                if(fat12) XmlFsType.Type      = "FAT12";
-                else if(fat16) XmlFsType.Type = "FAT16";
+                if(fat12)
+                    XmlFsType.Type = "FAT12";
+                else if(fat16)
+                    XmlFsType.Type = "FAT16";
 
                 if(bpbKind == BpbKind.Atari)
                 {
-                    if(atariBpb.serial_no[0] != 0x49 || atariBpb.serial_no[1] != 0x48 || atariBpb.serial_no[2] != 0x43)
+                    if(atariBpb.serial_no[0] != 0x49 ||
+                       atariBpb.serial_no[1] != 0x48 ||
+                       atariBpb.serial_no[2] != 0x43)
                     {
                         XmlFsType.VolumeSerial =
                             $"{atariBpb.serial_no[0]:X2}{atariBpb.serial_no[1]:X2}{atariBpb.serial_no[2]:X2}";
+
                         statfs.Id = new FileSystemId
                         {
                             IsInt = true,
@@ -292,36 +322,62 @@ namespace Aaru.Filesystems.FAT
                     }
 
                     XmlFsType.SystemIdentifier = StringHandlers.CToString(atariBpb.oem_name);
-                    if(string.IsNullOrEmpty(XmlFsType.SystemIdentifier)) XmlFsType.SystemIdentifier = null;
+
+                    if(string.IsNullOrEmpty(XmlFsType.SystemIdentifier))
+                        XmlFsType.SystemIdentifier = null;
                 }
                 else if(fakeBpb.oem_name != null)
                 {
-                    if(fakeBpb.oem_name[5] != 0x49 || fakeBpb.oem_name[6] != 0x48 || fakeBpb.oem_name[7] != 0x43)
+                    if(fakeBpb.oem_name[5] != 0x49 ||
+                       fakeBpb.oem_name[6] != 0x48 ||
+                       fakeBpb.oem_name[7] != 0x43)
                     {
                         // Later versions of Windows create a DOS 3 BPB without OEM name on 8 sectors/track floppies
                         // OEM ID should be ASCII, otherwise ignore it
-                        if(fakeBpb.oem_name[0] >= 0x20 && fakeBpb.oem_name[0] <= 0x7F && fakeBpb.oem_name[1] >= 0x20 &&
-                           fakeBpb.oem_name[1] <= 0x7F && fakeBpb.oem_name[2] >= 0x20 && fakeBpb.oem_name[2] <= 0x7F &&
-                           fakeBpb.oem_name[3] >= 0x20 && fakeBpb.oem_name[3] <= 0x7F && fakeBpb.oem_name[4] >= 0x20 &&
-                           fakeBpb.oem_name[4] <= 0x7F && fakeBpb.oem_name[5] >= 0x20 && fakeBpb.oem_name[5] <= 0x7F &&
-                           fakeBpb.oem_name[6] >= 0x20 && fakeBpb.oem_name[6] <= 0x7F && fakeBpb.oem_name[7] >= 0x20 &&
+                        if(fakeBpb.oem_name[0] >= 0x20 &&
+                           fakeBpb.oem_name[0] <= 0x7F &&
+                           fakeBpb.oem_name[1] >= 0x20 &&
+                           fakeBpb.oem_name[1] <= 0x7F &&
+                           fakeBpb.oem_name[2] >= 0x20 &&
+                           fakeBpb.oem_name[2] <= 0x7F &&
+                           fakeBpb.oem_name[3] >= 0x20 &&
+                           fakeBpb.oem_name[3] <= 0x7F &&
+                           fakeBpb.oem_name[4] >= 0x20 &&
+                           fakeBpb.oem_name[4] <= 0x7F &&
+                           fakeBpb.oem_name[5] >= 0x20 &&
+                           fakeBpb.oem_name[5] <= 0x7F &&
+                           fakeBpb.oem_name[6] >= 0x20 &&
+                           fakeBpb.oem_name[6] <= 0x7F &&
+                           fakeBpb.oem_name[7] >= 0x20 &&
                            fakeBpb.oem_name[7] <= 0x7F)
                             XmlFsType.SystemIdentifier = StringHandlers.CToString(fakeBpb.oem_name);
-                        else if(fakeBpb.oem_name[0] < 0x20  && fakeBpb.oem_name[1] >= 0x20 &&
-                                fakeBpb.oem_name[1] <= 0x7F && fakeBpb.oem_name[2] >= 0x20 &&
-                                fakeBpb.oem_name[2] <= 0x7F && fakeBpb.oem_name[3] >= 0x20 &&
-                                fakeBpb.oem_name[3] <= 0x7F && fakeBpb.oem_name[4] >= 0x20 &&
-                                fakeBpb.oem_name[4] <= 0x7F && fakeBpb.oem_name[5] >= 0x20 &&
-                                fakeBpb.oem_name[5] <= 0x7F && fakeBpb.oem_name[6] >= 0x20 &&
-                                fakeBpb.oem_name[6] <= 0x7F && fakeBpb.oem_name[7] >= 0x20 &&
+                        else if(fakeBpb.oem_name[0] < 0x20  &&
+                                fakeBpb.oem_name[1] >= 0x20 &&
+                                fakeBpb.oem_name[1] <= 0x7F &&
+                                fakeBpb.oem_name[2] >= 0x20 &&
+                                fakeBpb.oem_name[2] <= 0x7F &&
+                                fakeBpb.oem_name[3] >= 0x20 &&
+                                fakeBpb.oem_name[3] <= 0x7F &&
+                                fakeBpb.oem_name[4] >= 0x20 &&
+                                fakeBpb.oem_name[4] <= 0x7F &&
+                                fakeBpb.oem_name[5] >= 0x20 &&
+                                fakeBpb.oem_name[5] <= 0x7F &&
+                                fakeBpb.oem_name[6] >= 0x20 &&
+                                fakeBpb.oem_name[6] <= 0x7F &&
+                                fakeBpb.oem_name[7] >= 0x20 &&
                                 fakeBpb.oem_name[7] <= 0x7F)
                             XmlFsType.SystemIdentifier = StringHandlers.CToString(fakeBpb.oem_name, Encoding, start: 1);
                     }
 
-                    if(fakeBpb.signature == 0x28 || fakeBpb.signature == 0x29)
+                    if(fakeBpb.signature == 0x28 ||
+                       fakeBpb.signature == 0x29)
                     {
                         XmlFsType.VolumeSerial = $"{fakeBpb.serial_no:X8}";
-                        statfs.Id              = new FileSystemId {IsInt = true, Serial32 = fakeBpb.serial_no};
+
+                        statfs.Id = new FileSystemId
+                        {
+                            IsInt = true, Serial32 = fakeBpb.serial_no
+                        };
                     }
                 }
 
@@ -331,14 +387,17 @@ namespace Aaru.Filesystems.FAT
                     else
                         XmlFsType.Clusters =
                             (ulong)(fakeBpb.spc == 0 ? fakeBpb.sectors : fakeBpb.sectors / fakeBpb.spc);
-                else XmlFsType.Clusters = humanBpb.clusters == 0 ? humanBpb.big_clusters : humanBpb.clusters;
+                else
+                    XmlFsType.Clusters = humanBpb.clusters == 0 ? humanBpb.big_clusters : humanBpb.clusters;
 
                 sectorsPerCluster     = fakeBpb.spc;
                 XmlFsType.ClusterSize = (uint)(fakeBpb.bps * fakeBpb.spc);
                 reservedSectors       = fakeBpb.rsectors;
                 sectorsPerFat         = fakeBpb.spfat;
 
-                if(fakeBpb.signature == 0x28 || fakeBpb.signature == 0x29 || andosOemCorrect)
+                if(fakeBpb.signature == 0x28 ||
+                   fakeBpb.signature == 0x29 ||
+                   andosOemCorrect)
                 {
                     if((fakeBpb.flags & 0xF8) == 0x00)
                         if((fakeBpb.flags & 0x01) == 0x01)
@@ -349,21 +408,25 @@ namespace Aaru.Filesystems.FAT
                 }
 
                 // Workaround that PCExchange jumps into "FAT16   "...
-                if(XmlFsType.SystemIdentifier == "PCX 2.0 ") fakeBpb.jump[1] += 8;
+                if(XmlFsType.SystemIdentifier == "PCX 2.0 ")
+                    fakeBpb.jump[1] += 8;
 
                 // Check that jumps to a correct boot code position and has boot signature set.
                 // This will mean that the volume will boot, even if just to say "this is not bootable change disk"......
-                if(XmlFsType.Bootable == false && fakeBpb.jump != null)
+                if(XmlFsType.Bootable == false &&
+                   fakeBpb.jump       != null)
                     XmlFsType.Bootable |=
-                        fakeBpb.jump[0] == 0xEB && fakeBpb.jump[1] >= minBootNearJump && fakeBpb.jump[1] < 0x80 ||
-                        fakeBpb.jump[0]                        == 0xE9            && fakeBpb.jump.Length >= 3 &&
-                        BitConverter.ToUInt16(fakeBpb.jump, 1) >= minBootNearJump &&
-                        BitConverter.ToUInt16(fakeBpb.jump, 1) <= 0x1FC;
+                        (fakeBpb.jump[0] == 0xEB && fakeBpb.jump[1] >= minBootNearJump && fakeBpb.jump[1] < 0x80) ||
+                        (fakeBpb.jump[0]                        == 0xE9            && fakeBpb.jump.Length >= 3 &&
+                         BitConverter.ToUInt16(fakeBpb.jump, 1) >= minBootNearJump &&
+                         BitConverter.ToUInt16(fakeBpb.jump, 1) <= 0x1FC);
 
                 // First root directory sector
-                firstRootSector = (ulong)(fakeBpb.spfat * fakeBpb.fats_no + fakeBpb.rsectors) * sectorsPerRealSector +
-                                  partition.Start;
-                sectorsForRootDirectory = (uint)(fakeBpb.root_ent * 32 / imagePlugin.Info.SectorSize);
+                firstRootSector =
+                    ((ulong)((fakeBpb.spfat * fakeBpb.fats_no) + fakeBpb.rsectors) * sectorsPerRealSector) +
+                    partition.Start;
+
+                sectorsForRootDirectory = (uint)((fakeBpb.root_ent * 32) / imagePlugin.Info.SectorSize);
 
                 sectorsPerRealSector =  fakeBpb.bps / imagePlugin.Info.SectorSize;
                 sectorsPerCluster    *= sectorsPerRealSector;
@@ -373,39 +436,48 @@ namespace Aaru.Filesystems.FAT
 
             image = imagePlugin;
 
-            if(fat32) fatEntriesPerSector      = imagePlugin.Info.SectorSize     / 4;
-            else if(fat16) fatEntriesPerSector = imagePlugin.Info.SectorSize     / 2;
-            else fatEntriesPerSector           = imagePlugin.Info.SectorSize * 2 / 3;
-            fatFirstSector = partition.Start + reservedSectors * sectorsPerRealSector;
+            if(fat32)
+                fatEntriesPerSector = imagePlugin.Info.SectorSize / 4;
+            else if(fat16)
+                fatEntriesPerSector = imagePlugin.Info.SectorSize / 2;
+            else
+                fatEntriesPerSector = (imagePlugin.Info.SectorSize * 2) / 3;
+
+            fatFirstSector = partition.Start + (reservedSectors * sectorsPerRealSector);
 
             rootDirectoryCache = new Dictionary<string, CompleteDirectoryEntry>();
             byte[] rootDirectory = null;
 
             if(!fat32)
             {
-                firstClusterSector = firstRootSector + sectorsForRootDirectory - sectorsPerCluster * 2;
+                firstClusterSector = (firstRootSector + sectorsForRootDirectory) - (sectorsPerCluster * 2);
                 rootDirectory      = imagePlugin.ReadSectors(firstRootSector, sectorsForRootDirectory);
 
                 if(bpbKind == BpbKind.DecRainbow)
                 {
-                    MemoryStream rootMs = new MemoryStream();
-                    foreach(byte[] tmp in from ulong rootSector in new[] {0x17, 0x19, 0x1B, 0x1D, 0x1E, 0x20}
-                                          select imagePlugin.ReadSector(rootSector)) rootMs.Write(tmp, 0, tmp.Length);
+                    var rootMs = new MemoryStream();
+
+                    foreach(byte[] tmp in from ulong rootSector in new[]
+                    {
+                        0x17, 0x19, 0x1B, 0x1D, 0x1E, 0x20
+                    } select imagePlugin.ReadSector(rootSector))
+                        rootMs.Write(tmp, 0, tmp.Length);
 
                     rootDirectory = rootMs.ToArray();
                 }
             }
             else
             {
-                if(rootDirectoryCluster == 0) return Errno.InvalidArgument;
+                if(rootDirectoryCluster == 0)
+                    return Errno.InvalidArgument;
 
-                MemoryStream rootMs                = new MemoryStream();
-                uint[]       rootDirectoryClusters = GetClusters(rootDirectoryCluster);
+                var    rootMs                = new MemoryStream();
+                uint[] rootDirectoryClusters = GetClusters(rootDirectoryCluster);
 
                 foreach(uint cluster in rootDirectoryClusters)
                 {
                     byte[] buffer =
-                        imagePlugin.ReadSectors(firstClusterSector + cluster * sectorsPerCluster, sectorsPerCluster);
+                        imagePlugin.ReadSectors(firstClusterSector + (cluster * sectorsPerCluster), sectorsPerCluster);
 
                     rootMs.Write(buffer, 0, buffer.Length);
                 }
@@ -413,10 +485,12 @@ namespace Aaru.Filesystems.FAT
                 rootDirectory = rootMs.ToArray();
 
                 // OS/2 FAT32.IFS uses LFN instead of .LONGNAME
-                if(this.@namespace == Namespace.Os2) this.@namespace = Namespace.Os2;
+                if(this.@namespace == Namespace.Os2)
+                    this.@namespace = Namespace.Os2;
             }
 
-            if(rootDirectory is null) return Errno.InvalidArgument;
+            if(rootDirectory is null)
+                return Errno.InvalidArgument;
 
             byte[] lastLfnName     = null;
             byte   lastLfnChecksum = 0;
@@ -427,11 +501,14 @@ namespace Aaru.Filesystems.FAT
                     Marshal.ByteArrayToStructureLittleEndian<DirectoryEntry>(rootDirectory, i,
                                                                              Marshal.SizeOf<DirectoryEntry>());
 
-                if(entry.filename[0] == DIRENT_FINISHED) break;
+                if(entry.filename[0] == DIRENT_FINISHED)
+                    break;
 
                 if(entry.attributes.HasFlag(FatAttributes.LFN))
                 {
-                    if(this.@namespace != Namespace.Lfn && this.@namespace != Namespace.Ecs) continue;
+                    if(this.@namespace != Namespace.Lfn &&
+                       this.@namespace != Namespace.Ecs)
+                        continue;
 
                     LfnEntry lfnEntry =
                         Marshal.ByteArrayToStructureLittleEndian<LfnEntry>(rootDirectory, i,
@@ -439,7 +516,8 @@ namespace Aaru.Filesystems.FAT
 
                     int lfnSequence = lfnEntry.sequence & LFN_MASK;
 
-                    if((lfnEntry.sequence & LFN_ERASED) > 0) continue;
+                    if((lfnEntry.sequence & LFN_ERASED) > 0)
+                        continue;
 
                     if((lfnEntry.sequence & LFN_LAST) > 0)
                     {
@@ -447,53 +525,65 @@ namespace Aaru.Filesystems.FAT
                         lastLfnChecksum = lfnEntry.checksum;
                     }
 
-                    if(lastLfnName is null) continue;
-                    if(lfnEntry.checksum != lastLfnChecksum) continue;
+                    if(lastLfnName is null)
+                        continue;
+
+                    if(lfnEntry.checksum != lastLfnChecksum)
+                        continue;
 
                     lfnSequence--;
 
-                    Array.Copy(lfnEntry.name1, 0, lastLfnName, lfnSequence * 26,      10);
-                    Array.Copy(lfnEntry.name2, 0, lastLfnName, lfnSequence * 26 + 10, 12);
-                    Array.Copy(lfnEntry.name3, 0, lastLfnName, lfnSequence * 26 + 22, 4);
+                    Array.Copy(lfnEntry.name1, 0, lastLfnName, lfnSequence * 26, 10);
+                    Array.Copy(lfnEntry.name2, 0, lastLfnName, (lfnSequence * 26) + 10, 12);
+                    Array.Copy(lfnEntry.name3, 0, lastLfnName, (lfnSequence * 26) + 22, 4);
 
                     continue;
                 }
 
                 // Not a correct entry
-                if(entry.filename[0] < DIRENT_MIN && entry.filename[0] != DIRENT_E5) continue;
+                if(entry.filename[0] < DIRENT_MIN &&
+                   entry.filename[0] != DIRENT_E5)
+                    continue;
 
                 // Self
-                if(Encoding.GetString(entry.filename).TrimEnd() == ".") continue;
+                if(Encoding.GetString(entry.filename).TrimEnd() == ".")
+                    continue;
 
                 // Parent
-                if(Encoding.GetString(entry.filename).TrimEnd() == "..") continue;
+                if(Encoding.GetString(entry.filename).TrimEnd() == "..")
+                    continue;
 
                 // Deleted
-                if(entry.filename[0] == DIRENT_DELETED) continue;
+                if(entry.filename[0] == DIRENT_DELETED)
+                    continue;
 
                 string filename;
 
                 if(entry.attributes.HasFlag(FatAttributes.VolumeLabel))
                 {
                     byte[] fullname = new byte[11];
-                    Array.Copy(entry.filename,  0, fullname, 0, 8);
+                    Array.Copy(entry.filename, 0, fullname, 0, 8);
                     Array.Copy(entry.extension, 0, fullname, 8, 3);
                     string volname = Encoding.GetString(fullname).Trim();
+
                     if(!string.IsNullOrEmpty(volname))
                         XmlFsType.VolumeName =
                             entry.caseinfo.HasFlag(CaseInfo.AllLowerCase) && this.@namespace == Namespace.Nt
-                                ? volname.ToLower()
-                                : volname;
+                                ? volname.ToLower() : volname;
 
-                    if(entry.ctime > 0 && entry.cdate > 0)
+                    if(entry.ctime > 0 &&
+                       entry.cdate > 0)
                     {
                         XmlFsType.CreationDate = DateHandlers.DosToDateTime(entry.cdate, entry.ctime);
+
                         if(entry.ctime_ms > 0)
                             XmlFsType.CreationDate = XmlFsType.CreationDate.AddMilliseconds(entry.ctime_ms * 10);
+
                         XmlFsType.CreationDateSpecified = true;
                     }
 
-                    if(entry.mtime > 0 && entry.mdate > 0)
+                    if(entry.mtime > 0 &&
+                       entry.mdate > 0)
                     {
                         XmlFsType.ModificationDate          = DateHandlers.DosToDateTime(entry.mdate, entry.mtime);
                         XmlFsType.ModificationDateSpecified = true;
@@ -502,9 +592,13 @@ namespace Aaru.Filesystems.FAT
                     continue;
                 }
 
-                CompleteDirectoryEntry completeEntry = new CompleteDirectoryEntry {Dirent = entry};
+                var completeEntry = new CompleteDirectoryEntry
+                {
+                    Dirent = entry
+                };
 
-                if((this.@namespace == Namespace.Lfn || this.@namespace == Namespace.Ecs) && lastLfnName != null)
+                if((this.@namespace == Namespace.Lfn || this.@namespace == Namespace.Ecs) &&
+                   lastLfnName != null)
                 {
                     byte calculatedLfnChecksum = LfnChecksum(entry.filename, entry.extension);
 
@@ -518,7 +612,8 @@ namespace Aaru.Filesystems.FAT
                     }
                 }
 
-                if(entry.filename[0] == DIRENT_E5) entry.filename[0] = DIRENT_DELETED;
+                if(entry.filename[0] == DIRENT_E5)
+                    entry.filename[0] = DIRENT_DELETED;
 
                 string name      = Encoding.GetString(entry.filename).TrimEnd();
                 string extension = Encoding.GetString(entry.extension).TrimEnd();
@@ -532,8 +627,10 @@ namespace Aaru.Filesystems.FAT
                         name = name.ToLower(CultureInfo.CurrentCulture);
                 }
 
-                if(extension != "") filename = name + "." + extension;
-                else filename                = name;
+                if(extension != "")
+                    filename = name + "." + extension;
+                else
+                    filename = name;
 
                 completeEntry.Shortname = filename;
 
@@ -541,8 +638,8 @@ namespace Aaru.Filesystems.FAT
                 {
                     HumanDirectoryEntry humanEntry =
                         Marshal.ByteArrayToStructureLittleEndian<HumanDirectoryEntry>(rootDirectory, i,
-                                                                                      Marshal
-                                                                                         .SizeOf<HumanDirectoryEntry
+                                                                                      Marshal.
+                                                                                          SizeOf<HumanDirectoryEntry
                                                                                           >());
 
                     completeEntry.HumanDirent = humanEntry;
@@ -551,19 +648,23 @@ namespace Aaru.Filesystems.FAT
                     extension = StringHandlers.CToString(humanEntry.extension, Encoding).TrimEnd();
                     string name2 = StringHandlers.CToString(humanEntry.name2, Encoding).TrimEnd();
 
-                    if(extension != "") filename = name + name2 + "." + extension;
-                    else filename                = name               + name2;
+                    if(extension != "")
+                        filename = name + name2 + "." + extension;
+                    else
+                        filename = name + name2;
 
                     completeEntry.HumanName = filename;
                 }
 
-                if(!fat32 && filename == "EA DATA. SF")
+                if(!fat32 &&
+                   filename == "EA DATA. SF")
                 {
                     eaDirEntry      = entry;
                     lastLfnName     = null;
                     lastLfnChecksum = 0;
 
-                    if(debug) rootDirectoryCache[completeEntry.ToString()] = completeEntry;
+                    if(debug)
+                        rootDirectoryCache[completeEntry.ToString()] = completeEntry;
 
                     continue;
                 }
@@ -580,12 +681,15 @@ namespace Aaru.Filesystems.FAT
             {
                 case BpbKind.Hardcoded:
                     statfs.Type = $"Microsoft FAT{(fat16 ? "16" : "12")}";
+
                     break;
                 case BpbKind.Atari:
                     statfs.Type = $"Atari FAT{(fat16 ? "16" : "12")}";
+
                     break;
                 case BpbKind.Msx:
                     statfs.Type = $"MSX FAT{(fat16 ? "16" : "12")}";
+
                     break;
                 case BpbKind.Dos2:
                 case BpbKind.Dos3:
@@ -594,22 +698,28 @@ namespace Aaru.Filesystems.FAT
                 case BpbKind.ShortExtended:
                 case BpbKind.Extended:
                     statfs.Type = $"Microsoft FAT{(fat16 ? "16" : "12")}";
+
                     break;
                 case BpbKind.ShortFat32:
                 case BpbKind.LongFat32:
                     statfs.Type = XmlFsType.Type == "FAT+" ? "FAT+" : "Microsoft FAT32";
+
                     break;
                 case BpbKind.Andos:
                     statfs.Type = $"ANDOS FAT{(fat16 ? "16" : "12")}";
+
                     break;
                 case BpbKind.Apricot:
                     statfs.Type = $"Apricot FAT{(fat16 ? "16" : "12")}";
+
                     break;
                 case BpbKind.DecRainbow:
                     statfs.Type = $"DEC FAT{(fat16 ? "16" : "12")}";
+
                     break;
                 case BpbKind.Human:
                     statfs.Type = $"Human68k FAT{(fat16 ? "16" : "12")}";
+
                     break;
                 default: throw new ArgumentOutOfRangeException();
             }
@@ -624,6 +734,7 @@ namespace Aaru.Filesystems.FAT
                 fatEntries = new ushort[statfs.Blocks];
 
                 int pos = 0;
+
                 for(int i = 0; i + 3 < fatBytes.Length && pos < fatEntries.Length; i += 3)
                 {
                     fatEntries[pos++] = (ushort)(((fatBytes[i + 1] & 0xF)  << 8) + fatBytes[i + 0]);
@@ -656,12 +767,15 @@ namespace Aaru.Filesystems.FAT
                     eaDirEntry   = new DirectoryEntry();
                     cachedEaData = null;
                 }
-                else eaCache = new Dictionary<string, Dictionary<string, byte[]>>();
+                else
+                    eaCache = new Dictionary<string, Dictionary<string, byte[]>>();
             }
-            else if(fat32) eaCache = new Dictionary<string, Dictionary<string, byte[]>>();
+            else if(fat32)
+                eaCache = new Dictionary<string, Dictionary<string, byte[]>>();
 
             // Check OS/2 .LONGNAME
-            if(eaCache != null && (this.@namespace == Namespace.Os2 || this.@namespace == Namespace.Ecs))
+            if(eaCache != null &&
+               (this.@namespace == Namespace.Os2 || this.@namespace == Namespace.Ecs))
             {
                 List<KeyValuePair<string, CompleteDirectoryEntry>> rootFilesWithEas =
                     rootDirectoryCache.Where(t => t.Value.Dirent.ea_handle != 0).ToList();
@@ -670,15 +784,19 @@ namespace Aaru.Filesystems.FAT
                 {
                     Dictionary<string, byte[]> eas = GetEas(fileWithEa.Value.Dirent.ea_handle);
 
-                    if(eas is null) continue;
+                    if(eas is null)
+                        continue;
 
-                    if(!eas.TryGetValue("com.microsoft.os2.longname", out byte[] longnameEa)) continue;
+                    if(!eas.TryGetValue("com.microsoft.os2.longname", out byte[] longnameEa))
+                        continue;
 
-                    if(BitConverter.ToUInt16(longnameEa, 0) != EAT_ASCII) continue;
+                    if(BitConverter.ToUInt16(longnameEa, 0) != EAT_ASCII)
+                        continue;
 
                     ushort longnameSize = BitConverter.ToUInt16(longnameEa, 2);
 
-                    if(longnameSize + 4 > longnameEa.Length) continue;
+                    if(longnameSize + 4 > longnameEa.Length)
+                        continue;
 
                     byte[] longnameBytes = new byte[longnameSize];
 
@@ -686,7 +804,8 @@ namespace Aaru.Filesystems.FAT
 
                     string longname = StringHandlers.CToString(longnameBytes, Encoding);
 
-                    if(string.IsNullOrWhiteSpace(longname)) continue;
+                    if(string.IsNullOrWhiteSpace(longname))
+                        continue;
 
                     // Forward slash is allowed in .LONGNAME, so change it to visually similar division slash
                     longname = longname.Replace('/', '\u2215');
@@ -700,20 +819,21 @@ namespace Aaru.Filesystems.FAT
             // Check FAT32.IFS EAs
             if(fat32 || debug)
             {
-                List<KeyValuePair<string, CompleteDirectoryEntry>> fat32EaSidecars = rootDirectoryCache
-                                                                                    .Where(t =>
-                                                                                               t.Key
-                                                                                                .EndsWith(FAT32_EA_TAIL,
+                List<KeyValuePair<string, CompleteDirectoryEntry>> fat32EaSidecars = rootDirectoryCache.
+                                                                                     Where(t =>
+                                                                                               t.Key.
+                                                                                                 EndsWith(FAT32_EA_TAIL,
                                                                                                           true,
-                                                                                                          cultureInfo))
-                                                                                    .ToList();
+                                                                                                          cultureInfo)).
+                                                                                     ToList();
 
                 foreach(KeyValuePair<string, CompleteDirectoryEntry> sidecar in fat32EaSidecars)
                 {
                     // No real file this sidecar accompanies
-                    if(!rootDirectoryCache
-                          .TryGetValue(sidecar.Key.Substring(0, sidecar.Key.Length - FAT32_EA_TAIL.Length),
-                                       out CompleteDirectoryEntry fileWithEa)) continue;
+                    if(!rootDirectoryCache.
+                           TryGetValue(sidecar.Key.Substring(0, sidecar.Key.Length - FAT32_EA_TAIL.Length),
+                                       out CompleteDirectoryEntry fileWithEa))
+                        continue;
 
                     // If not in debug mode we will consider the lack of EA bitflags to mean the EAs are corrupted or not real
                     if(!debug)
@@ -725,36 +845,39 @@ namespace Aaru.Filesystems.FAT
 
                     fileWithEa.Fat32Ea = sidecar.Value.Dirent;
 
-                    if(!debug) rootDirectoryCache.Remove(sidecar.Key);
+                    if(!debug)
+                        rootDirectoryCache.Remove(sidecar.Key);
                 }
             }
 
             mounted = true;
+
             return Errno.NoError;
         }
 
-        /// <summary>
-        ///     Umounts this Lisa filesystem
-        /// </summary>
+        /// <summary>Umounts this Lisa filesystem</summary>
         public Errno Unmount()
         {
-            if(!mounted) return Errno.AccessDenied;
+            if(!mounted)
+                return Errno.AccessDenied;
 
             mounted    = false;
             fatEntries = null;
+
             return Errno.NoError;
         }
 
-        /// <summary>
-        ///     Gets information about the mounted volume.
-        /// </summary>
+        /// <summary>Gets information about the mounted volume.</summary>
         /// <param name="stat">Information about the mounted volume.</param>
         public Errno StatFs(out FileSystemInfo stat)
         {
             stat = null;
-            if(!mounted) return Errno.AccessDenied;
+
+            if(!mounted)
+                return Errno.AccessDenied;
 
             stat = statfs.ShallowCopy();
+
             return Errno.NoError;
         }
     }
diff --git a/Aaru.Filesystems/FAT/Xattr.cs b/Aaru.Filesystems/FAT/Xattr.cs
index f064147d4..ca1a30b01 100644
--- a/Aaru.Filesystems/FAT/Xattr.cs
+++ b/Aaru.Filesystems/FAT/Xattr.cs
@@ -44,77 +44,90 @@ namespace Aaru.Filesystems.FAT
     {
         Dictionary<string, Dictionary<string, byte[]>> eaCache;
 
-        /// <summary>
-        ///     Lists all extended attributes, alternate data streams and forks of the given file.
-        /// </summary>
+        /// <summary>Lists all extended attributes, alternate data streams and forks of the given file.</summary>
         /// <returns>Error number.</returns>
         /// <param name="path">Path.</param>
         /// <param name="xattrs">List of extended attributes, alternate data streams and forks.</param>
         public Errno ListXAttr(string path, out List<string> xattrs)
         {
             xattrs = null;
-            if(!mounted) return Errno.AccessDenied;
+
+            if(!mounted)
+                return Errno.AccessDenied;
 
             // No other xattr recognized yet
-            if(cachedEaData is null && !fat32) return Errno.NotSupported;
+            if(cachedEaData is null &&
+               !fat32)
+                return Errno.NotSupported;
 
-            if(path[0] == '/') path = path.Substring(1);
+            if(path[0] == '/')
+                path = path.Substring(1);
 
             if(eaCache.TryGetValue(path.ToLower(cultureInfo), out Dictionary<string, byte[]> eas))
             {
                 xattrs = eas.Keys.ToList();
+
                 return Errno.NoError;
             }
 
             Errno err = GetFileEntry(path, out CompleteDirectoryEntry entry);
 
-            if(err != Errno.NoError || entry is null) return err;
+            if(err != Errno.NoError ||
+               entry is null)
+                return err;
 
             xattrs = new List<string>();
 
             if(!fat32)
             {
-                if(entry.Dirent.ea_handle == 0) return Errno.NoError;
+                if(entry.Dirent.ea_handle == 0)
+                    return Errno.NoError;
 
                 eas = GetEas(entry.Dirent.ea_handle);
             }
             else
             {
-                if(entry.Fat32Ea.start_cluster == 0) return Errno.NoError;
+                if(entry.Fat32Ea.start_cluster == 0)
+                    return Errno.NoError;
 
                 eas = GetEas(entry.Fat32Ea);
             }
 
-            if(eas is null) return Errno.NoError;
+            if(eas is null)
+                return Errno.NoError;
 
             eaCache.Add(path.ToLower(cultureInfo), eas);
             xattrs = eas.Keys.ToList();
+
             return Errno.NoError;
         }
 
-        /// <summary>
-        ///     Reads an extended attribute, alternate data stream or fork from the given file.
-        /// </summary>
+        /// <summary>Reads an extended attribute, alternate data stream or fork from the given file.</summary>
         /// <returns>Error number.</returns>
         /// <param name="path">File path.</param>
         /// <param name="xattr">Extendad attribute, alternate data stream or fork name.</param>
         /// <param name="buf">Buffer.</param>
         public Errno GetXattr(string path, string xattr, ref byte[] buf)
         {
-            if(!mounted) return Errno.AccessDenied;
+            if(!mounted)
+                return Errno.AccessDenied;
 
             Errno err = ListXAttr(path, out List<string> xattrs);
 
-            if(err != Errno.NoError) return err;
+            if(err != Errno.NoError)
+                return err;
 
-            if(path[0] == '/') path = path.Substring(1);
+            if(path[0] == '/')
+                path = path.Substring(1);
 
-            if(!xattrs.Contains(xattr.ToLower(cultureInfo))) return Errno.NoSuchExtendedAttribute;
+            if(!xattrs.Contains(xattr.ToLower(cultureInfo)))
+                return Errno.NoSuchExtendedAttribute;
 
             if(!eaCache.TryGetValue(path.ToLower(cultureInfo), out Dictionary<string, byte[]> eas))
                 return Errno.InvalidArgument;
 
-            if(!eas.TryGetValue(xattr.ToLower(cultureInfo), out byte[] data)) return Errno.InvalidArgument;
+            if(!eas.TryGetValue(xattr.ToLower(cultureInfo), out byte[] data))
+                return Errno.InvalidArgument;
 
             buf = new byte[data.Length];
             data.CopyTo(buf, 0);
@@ -124,12 +137,13 @@ namespace Aaru.Filesystems.FAT
 
         Dictionary<string, byte[]> GetEas(DirectoryEntry entryFat32Ea)
         {
-            MemoryStream eaMs                  = new MemoryStream();
-            uint[]       rootDirectoryClusters = GetClusters(entryFat32Ea.start_cluster);
+            var    eaMs                  = new MemoryStream();
+            uint[] rootDirectoryClusters = GetClusters(entryFat32Ea.start_cluster);
 
             foreach(uint cluster in rootDirectoryClusters)
             {
-                byte[] buffer = image.ReadSectors(firstClusterSector + cluster * sectorsPerCluster, sectorsPerCluster);
+                byte[] buffer =
+                    image.ReadSectors(firstClusterSector + (cluster * sectorsPerCluster), sectorsPerCluster);
 
                 eaMs.Write(buffer, 0, buffer.Length);
             }
@@ -148,20 +162,23 @@ namespace Aaru.Filesystems.FAT
         Dictionary<string, byte[]> GetEas(ushort eaHandle)
         {
             int aIndex = eaHandle >> 7;
-            // First 0x20 bytes are the magic number and unused words
-            ushort a = BitConverter.ToUInt16(cachedEaData, aIndex * 2 + 0x20);
 
-            ushort b = BitConverter.ToUInt16(cachedEaData, eaHandle * 2 + 0x200);
+            // First 0x20 bytes are the magic number and unused words
+            ushort a = BitConverter.ToUInt16(cachedEaData, (aIndex * 2) + 0x20);
+
+            ushort b = BitConverter.ToUInt16(cachedEaData, (eaHandle * 2) + 0x200);
 
             uint eaCluster = (uint)(a + b);
 
-            if(b == EA_UNUSED) return null;
+            if(b == EA_UNUSED)
+                return null;
 
             EaHeader header =
                 Marshal.ByteArrayToStructureLittleEndian<EaHeader>(cachedEaData, (int)(eaCluster * bytesPerCluster),
                                                                    Marshal.SizeOf<EaHeader>());
 
-            if(header.magic != 0x4145) return null;
+            if(header.magic != 0x4145)
+                return null;
 
             uint eaLen = BitConverter.ToUInt32(cachedEaData,
                                                (int)(eaCluster * bytesPerCluster) + Marshal.SizeOf<EaHeader>());
@@ -174,13 +191,17 @@ namespace Aaru.Filesystems.FAT
 
         Dictionary<string, byte[]> GetEas(byte[] eaData)
         {
-            if(eaData is null || eaData.Length < 4) return null;
+            if(eaData is null ||
+               eaData.Length < 4)
+                return null;
 
             Dictionary<string, byte[]> eas = new Dictionary<string, byte[]>();
 
-            if(debug) eas.Add("com.microsoft.os2.fea", eaData);
+            if(debug)
+                eas.Add("com.microsoft.os2.fea", eaData);
 
             int pos = 4;
+
             while(pos < eaData.Length)
             {
                 byte   fEA     = eaData[pos++];
@@ -200,8 +221,10 @@ namespace Aaru.Filesystems.FAT
                 if(name[0] == '.')
                 {
                     // This is WorkPlace System information so it's IBM
-                    if(name == ".CLASSINFO") name = "com.ibm.os2.classinfo";
-                    else name                     = "com.microsoft.os2" + name.ToLower();
+                    if(name == ".CLASSINFO")
+                        name = "com.ibm.os2.classinfo";
+                    else
+                        name = "com.microsoft.os2" + name.ToLower();
                 }
 
                 eas.Add(name, data);
@@ -212,13 +235,15 @@ namespace Aaru.Filesystems.FAT
 
         void CacheEaData()
         {
-            if(eaDirEntry.start_cluster == 0) return;
+            if(eaDirEntry.start_cluster == 0)
+                return;
 
-            MemoryStream eaDataMs = new MemoryStream();
+            var eaDataMs = new MemoryStream();
 
-            foreach(byte[] buffer in GetClusters(eaDirEntry.start_cluster)
-               .Select(cluster => image.ReadSectors(firstClusterSector + cluster * sectorsPerCluster,
-                                                    sectorsPerCluster))) eaDataMs.Write(buffer, 0, buffer.Length);
+            foreach(byte[] buffer in GetClusters(eaDirEntry.start_cluster).
+                Select(cluster => image.ReadSectors(firstClusterSector + (cluster * sectorsPerCluster),
+                                                    sectorsPerCluster)))
+                eaDataMs.Write(buffer, 0, buffer.Length);
 
             cachedEaData = eaDataMs.ToArray();
         }
diff --git a/Aaru.Filesystems/FATX/Consts.cs b/Aaru.Filesystems/FATX/Consts.cs
index fca2a02fd..77b3310e3 100644
--- a/Aaru.Filesystems/FATX/Consts.cs
+++ b/Aaru.Filesystems/FATX/Consts.cs
@@ -58,11 +58,8 @@ namespace Aaru.Filesystems.FATX
         [Flags]
         enum Attributes : byte
         {
-            ReadOnly  = 0x01,
-            Hidden    = 0x02,
-            System    = 0x04,
-            Directory = 0x10,
-            Archive   = 0x20
+            ReadOnly  = 0x01, Hidden  = 0x02, System = 0x04,
+            Directory = 0x10, Archive = 0x20
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/FATX/Dir.cs b/Aaru.Filesystems/FATX/Dir.cs
index 1da5e0d4c..e2f5e6eed 100644
--- a/Aaru.Filesystems/FATX/Dir.cs
+++ b/Aaru.Filesystems/FATX/Dir.cs
@@ -43,11 +43,15 @@ namespace Aaru.Filesystems.FATX
         public Errno ReadDir(string path, out List<string> contents)
         {
             contents = null;
-            if(!mounted) return Errno.AccessDenied;
 
-            if(string.IsNullOrWhiteSpace(path) || path == "/")
+            if(!mounted)
+                return Errno.AccessDenied;
+
+            if(string.IsNullOrWhiteSpace(path) ||
+               path == "/")
             {
                 contents = rootDirectory.Keys.ToList();
+
                 return Errno.NoError;
             }
 
@@ -56,17 +60,23 @@ namespace Aaru.Filesystems.FATX
             if(directoryCache.TryGetValue(cutPath, out Dictionary<string, DirectoryEntry> currentDirectory))
             {
                 contents = currentDirectory.Keys.ToList();
+
                 return Errno.NoError;
             }
 
-            string[] pieces = cutPath.Split(new[] {'/'}, StringSplitOptions.RemoveEmptyEntries);
+            string[] pieces = cutPath.Split(new[]
+            {
+                '/'
+            }, StringSplitOptions.RemoveEmptyEntries);
 
             KeyValuePair<string, DirectoryEntry> entry =
                 rootDirectory.FirstOrDefault(t => t.Key.ToLower(cultureInfo) == pieces[0]);
 
-            if(string.IsNullOrEmpty(entry.Key)) return Errno.NoSuchFile;
+            if(string.IsNullOrEmpty(entry.Key))
+                return Errno.NoSuchFile;
 
-            if(!entry.Value.attributes.HasFlag(Attributes.Directory)) return Errno.NotDirectory;
+            if(!entry.Value.attributes.HasFlag(Attributes.Directory))
+                return Errno.NotDirectory;
 
             string currentPath = pieces[0];
 
@@ -76,49 +86,60 @@ namespace Aaru.Filesystems.FATX
             {
                 entry = currentDirectory.FirstOrDefault(t => t.Key.ToLower(cultureInfo) == pieces[p]);
 
-                if(string.IsNullOrEmpty(entry.Key)) return Errno.NoSuchFile;
+                if(string.IsNullOrEmpty(entry.Key))
+                    return Errno.NoSuchFile;
 
-                if(!entry.Value.attributes.HasFlag(Attributes.Directory)) return Errno.NotDirectory;
+                if(!entry.Value.attributes.HasFlag(Attributes.Directory))
+                    return Errno.NotDirectory;
 
                 currentPath = p == 0 ? pieces[0] : $"{currentPath}/{pieces[p]}";
                 uint currentCluster = entry.Value.firstCluster;
 
-                if(directoryCache.TryGetValue(currentPath, out currentDirectory)) continue;
+                if(directoryCache.TryGetValue(currentPath, out currentDirectory))
+                    continue;
 
                 uint[] clusters = GetClusters(currentCluster);
 
-                if(clusters is null) return Errno.InvalidArgument;
+                if(clusters is null)
+                    return Errno.InvalidArgument;
 
                 byte[] directoryBuffer = new byte[bytesPerCluster * clusters.Length];
 
                 for(int i = 0; i < clusters.Length; i++)
                 {
-                    byte[] buffer = imagePlugin.ReadSectors(firstClusterSector + (clusters[i] - 1) * sectorsPerCluster,
-                                                            sectorsPerCluster);
+                    byte[] buffer =
+                        imagePlugin.ReadSectors(firstClusterSector + ((clusters[i] - 1) * sectorsPerCluster),
+                                                sectorsPerCluster);
+
                     Array.Copy(buffer, 0, directoryBuffer, i * bytesPerCluster, bytesPerCluster);
                 }
 
                 currentDirectory = new Dictionary<string, DirectoryEntry>();
 
                 int pos = 0;
+
                 while(pos < directoryBuffer.Length)
                 {
                     DirectoryEntry dirent = littleEndian
-                                                ? Marshal
-                                                   .ByteArrayToStructureLittleEndian<DirectoryEntry
+                                                ? Marshal.
+                                                    ByteArrayToStructureLittleEndian<DirectoryEntry
                                                     >(directoryBuffer, pos, Marshal.SizeOf<DirectoryEntry>())
                                                 : Marshal.ByteArrayToStructureBigEndian<DirectoryEntry>(directoryBuffer,
                                                                                                         pos,
-                                                                                                        Marshal
-                                                                                                           .SizeOf<
+                                                                                                        Marshal.
+                                                                                                            SizeOf<
                                                                                                                 DirectoryEntry
                                                                                                             >());
 
                     pos += Marshal.SizeOf<DirectoryEntry>();
 
-                    if(dirent.filenameSize == UNUSED_DIRENTRY || dirent.filenameSize == FINISHED_DIRENTRY) break;
+                    if(dirent.filenameSize == UNUSED_DIRENTRY ||
+                       dirent.filenameSize == FINISHED_DIRENTRY)
+                        break;
 
-                    if(dirent.filenameSize == DELETED_DIRENTRY || dirent.filenameSize > MAX_FILENAME) continue;
+                    if(dirent.filenameSize == DELETED_DIRENTRY ||
+                       dirent.filenameSize > MAX_FILENAME)
+                        continue;
 
                     string filename = Encoding.GetString(dirent.filename, 0, dirent.filenameSize);
 
@@ -129,6 +150,7 @@ namespace Aaru.Filesystems.FATX
             }
 
             contents = currentDirectory?.Keys.ToList();
+
             return Errno.NoError;
         }
     }
diff --git a/Aaru.Filesystems/FATX/FATX.cs b/Aaru.Filesystems/FATX/FATX.cs
index 2250daf6a..4ac5ce8bc 100644
--- a/Aaru.Filesystems/FATX/FATX.cs
+++ b/Aaru.Filesystems/FATX/FATX.cs
@@ -67,6 +67,7 @@ namespace Aaru.Filesystems.FATX
         public Errno ListXAttr(string path, out List<string> xattrs)
         {
             xattrs = null;
+
             return Errno.NotSupported;
         }
 
@@ -75,15 +76,21 @@ namespace Aaru.Filesystems.FATX
         public Errno ReadLink(string path, out string dest)
         {
             dest = null;
+
             return Errno.NotSupported;
         }
 
         public IEnumerable<(string name, Type type, string description)> SupportedOptions =>
-            new (string name, Type type, string description)[] { };
+            new (string name, Type type, string description)[]
+                {};
 
         public Dictionary<string, string> Namespaces => null;
 
-        static Dictionary<string, string> GetDefaultOptions() =>
-            new Dictionary<string, string> {{"debug", false.ToString()}};
+        static Dictionary<string, string> GetDefaultOptions() => new Dictionary<string, string>
+        {
+            {
+                "debug", false.ToString()
+            }
+        };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/FATX/File.cs b/Aaru.Filesystems/FATX/File.cs
index 741a730c9..ed17f913c 100644
--- a/Aaru.Filesystems/FATX/File.cs
+++ b/Aaru.Filesystems/FATX/File.cs
@@ -44,19 +44,25 @@ namespace Aaru.Filesystems.FATX
         public Errno MapBlock(string path, long fileBlock, out long deviceBlock)
         {
             deviceBlock = 0;
-            if(!mounted) return Errno.AccessDenied;
+
+            if(!mounted)
+                return Errno.AccessDenied;
 
             Errno err = Stat(path, out FileEntryInfo stat);
 
-            if(err != Errno.NoError) return err;
+            if(err != Errno.NoError)
+                return err;
 
-            if(stat.Attributes.HasFlag(FileAttributes.Directory) && !debug) return Errno.IsDirectory;
+            if(stat.Attributes.HasFlag(FileAttributes.Directory) &&
+               !debug)
+                return Errno.IsDirectory;
 
             uint[] clusters = GetClusters((uint)stat.Inode);
 
-            if(fileBlock >= clusters.Length) return Errno.InvalidArgument;
+            if(fileBlock >= clusters.Length)
+                return Errno.InvalidArgument;
 
-            deviceBlock = (long)(firstClusterSector + (clusters[fileBlock] - 1) * sectorsPerCluster);
+            deviceBlock = (long)(firstClusterSector + ((clusters[fileBlock] - 1) * sectorsPerCluster));
 
             return Errno.NoError;
         }
@@ -64,11 +70,14 @@ namespace Aaru.Filesystems.FATX
         public Errno GetAttributes(string path, out FileAttributes attributes)
         {
             attributes = new FileAttributes();
-            if(!mounted) return Errno.AccessDenied;
+
+            if(!mounted)
+                return Errno.AccessDenied;
 
             Errno err = Stat(path, out FileEntryInfo stat);
 
-            if(err != Errno.NoError) return err;
+            if(err != Errno.NoError)
+                return err;
 
             attributes = stat.Attributes;
 
@@ -77,33 +86,42 @@ namespace Aaru.Filesystems.FATX
 
         public Errno Read(string path, long offset, long size, ref byte[] buf)
         {
-            if(!mounted) return Errno.AccessDenied;
+            if(!mounted)
+                return Errno.AccessDenied;
 
             Errno err = Stat(path, out FileEntryInfo stat);
 
-            if(err != Errno.NoError) return err;
+            if(err != Errno.NoError)
+                return err;
 
-            if(stat.Attributes.HasFlag(FileAttributes.Directory) && !debug) return Errno.IsDirectory;
+            if(stat.Attributes.HasFlag(FileAttributes.Directory) &&
+               !debug)
+                return Errno.IsDirectory;
 
-            if(offset >= stat.Length) return Errno.InvalidArgument;
+            if(offset >= stat.Length)
+                return Errno.InvalidArgument;
 
-            if(size + offset >= stat.Length) size = stat.Length - offset;
+            if(size + offset >= stat.Length)
+                size = stat.Length - offset;
 
             uint[] clusters = GetClusters((uint)stat.Inode);
 
             long firstCluster    = offset                   / bytesPerCluster;
             long offsetInCluster = offset                   % bytesPerCluster;
             long sizeInClusters  = (size + offsetInCluster) / bytesPerCluster;
-            if((size + offsetInCluster) % bytesPerCluster > 0) sizeInClusters++;
 
-            MemoryStream ms = new MemoryStream();
+            if((size + offsetInCluster) % bytesPerCluster > 0)
+                sizeInClusters++;
+
+            var ms = new MemoryStream();
 
             for(int i = 0; i < sizeInClusters; i++)
             {
-                if(i + firstCluster >= clusters.Length) return Errno.InvalidArgument;
+                if(i + firstCluster >= clusters.Length)
+                    return Errno.InvalidArgument;
 
                 byte[] buffer =
-                    imagePlugin.ReadSectors(firstClusterSector + (clusters[i + firstCluster] - 1) * sectorsPerCluster,
+                    imagePlugin.ReadSectors(firstClusterSector + ((clusters[i + firstCluster] - 1) * sectorsPerCluster),
                                             sectorsPerCluster);
 
                 ms.Write(buffer, 0, buffer.Length);
@@ -119,49 +137,46 @@ namespace Aaru.Filesystems.FATX
         public Errno Stat(string path, out FileEntryInfo stat)
         {
             stat = null;
-            if(!mounted) return Errno.AccessDenied;
+
+            if(!mounted)
+                return Errno.AccessDenied;
 
             if(debug && (string.IsNullOrEmpty(path) || path == "$" || path == "/"))
             {
                 stat = new FileEntryInfo
                 {
                     Attributes = FileAttributes.Directory | FileAttributes.System | FileAttributes.Hidden,
-                    Blocks     = GetClusters(superblock.rootDirectoryCluster).Length,
-                    BlockSize  = bytesPerCluster,
+                    Blocks     = GetClusters(superblock.rootDirectoryCluster).Length, BlockSize = bytesPerCluster,
                     Length     = GetClusters(superblock.rootDirectoryCluster).Length * bytesPerCluster,
-                    Inode      = superblock.rootDirectoryCluster,
-                    Links      = 1
+                    Inode      = superblock.rootDirectoryCluster, Links = 1
                 };
 
                 return Errno.NoError;
             }
 
             Errno err = GetFileEntry(path, out DirectoryEntry entry);
-            if(err != Errno.NoError) return err;
+
+            if(err != Errno.NoError)
+                return err;
 
             stat = new FileEntryInfo
             {
-                Attributes = new FileAttributes(),
-                Blocks     = entry.length / bytesPerCluster,
-                BlockSize  = bytesPerCluster,
-                Length     = entry.length,
-                Inode      = entry.firstCluster,
-                Links      = 1,
-                CreationTime =
-                    littleEndian
-                        ? DateHandlers.DosToDateTime(entry.creationDate, entry.creationTime).AddYears(20)
-                        : DateHandlers.DosToDateTime(entry.creationTime, entry.creationDate),
-                AccessTime =
-                    littleEndian
-                        ? DateHandlers.DosToDateTime(entry.lastAccessDate, entry.lastAccessTime).AddYears(20)
-                        : DateHandlers.DosToDateTime(entry.lastAccessTime, entry.lastAccessDate),
+                Attributes = new FileAttributes(), Blocks = entry.length / bytesPerCluster, BlockSize = bytesPerCluster,
+                Length     = entry.length, Inode          = entry.firstCluster, Links                 = 1,
+                CreationTime = littleEndian
+                                   ? DateHandlers.DosToDateTime(entry.creationDate, entry.creationTime).AddYears(20)
+                                   : DateHandlers.DosToDateTime(entry.creationTime, entry.creationDate),
+                AccessTime = littleEndian
+                                 ? DateHandlers.DosToDateTime(entry.lastAccessDate, entry.lastAccessTime).AddYears(20)
+                                 : DateHandlers.DosToDateTime(entry.lastAccessTime, entry.lastAccessDate),
                 LastWriteTime = littleEndian
-                                    ? DateHandlers
-                                     .DosToDateTime(entry.lastWrittenDate, entry.lastWrittenTime).AddYears(20)
+                                    ? DateHandlers.DosToDateTime(entry.lastWrittenDate, entry.lastWrittenTime).
+                                                   AddYears(20)
                                     : DateHandlers.DosToDateTime(entry.lastWrittenTime, entry.lastWrittenDate)
             };
 
-            if(entry.length % bytesPerCluster > 0) stat.Blocks++;
+            if(entry.length % bytesPerCluster > 0)
+                stat.Blocks++;
 
             if(entry.attributes.HasFlag(Attributes.Directory))
             {
@@ -170,36 +185,48 @@ namespace Aaru.Filesystems.FATX
                 stat.Length     =  stat.Blocks * stat.BlockSize;
             }
 
-            if(entry.attributes.HasFlag(Attributes.ReadOnly)) stat.Attributes |= FileAttributes.ReadOnly;
-            if(entry.attributes.HasFlag(Attributes.Hidden)) stat.Attributes   |= FileAttributes.Hidden;
-            if(entry.attributes.HasFlag(Attributes.System)) stat.Attributes   |= FileAttributes.System;
-            if(entry.attributes.HasFlag(Attributes.Archive)) stat.Attributes  |= FileAttributes.Archive;
+            if(entry.attributes.HasFlag(Attributes.ReadOnly))
+                stat.Attributes |= FileAttributes.ReadOnly;
+
+            if(entry.attributes.HasFlag(Attributes.Hidden))
+                stat.Attributes |= FileAttributes.Hidden;
+
+            if(entry.attributes.HasFlag(Attributes.System))
+                stat.Attributes |= FileAttributes.System;
+
+            if(entry.attributes.HasFlag(Attributes.Archive))
+                stat.Attributes |= FileAttributes.Archive;
 
             return Errno.NoError;
         }
 
         uint[] GetClusters(uint startCluster)
         {
-            if(startCluster == 0) return null;
+            if(startCluster == 0)
+                return null;
 
             if(fat16 is null)
             {
-                if(startCluster >= fat32.Length) return null;
+                if(startCluster >= fat32.Length)
+                    return null;
             }
-            else if(startCluster >= fat16.Length) return null;
+            else if(startCluster >= fat16.Length)
+                return null;
 
             List<uint> clusters = new List<uint>();
 
             uint nextCluster = startCluster;
 
             if(fat16 is null)
-                while((nextCluster & FAT32_MASK) > 0 && (nextCluster & FAT32_MASK) <= FAT32_FORMATTED)
+                while((nextCluster & FAT32_MASK) > 0 &&
+                      (nextCluster & FAT32_MASK) <= FAT32_FORMATTED)
                 {
                     clusters.Add(nextCluster);
                     nextCluster = fat32[nextCluster];
                 }
             else
-                while(nextCluster > 0 && nextCluster <= FAT16_FORMATTED)
+                while(nextCluster > 0 &&
+                      nextCluster <= FAT16_FORMATTED)
                 {
                     clusters.Add(nextCluster);
                     nextCluster = fat16[nextCluster];
@@ -212,29 +239,38 @@ namespace Aaru.Filesystems.FATX
         {
             entry = new DirectoryEntry();
 
-            string cutPath =
-                path.StartsWith("/") ? path.Substring(1).ToLower(cultureInfo) : path.ToLower(cultureInfo);
-            string[] pieces = cutPath.Split(new[] {'/'}, StringSplitOptions.RemoveEmptyEntries);
+            string cutPath = path.StartsWith("/") ? path.Substring(1).ToLower(cultureInfo) : path.ToLower(cultureInfo);
 
-            if(pieces.Length == 0) return Errno.InvalidArgument;
+            string[] pieces = cutPath.Split(new[]
+            {
+                '/'
+            }, StringSplitOptions.RemoveEmptyEntries);
+
+            if(pieces.Length == 0)
+                return Errno.InvalidArgument;
 
             string parentPath = string.Join("/", pieces, 0, pieces.Length - 1);
 
             Errno err = ReadDir(parentPath, out _);
 
-            if(err != Errno.NoError) return err;
+            if(err != Errno.NoError)
+                return err;
 
             Dictionary<string, DirectoryEntry> parent;
 
-            if(pieces.Length == 1) parent = rootDirectory;
-            else if(!directoryCache.TryGetValue(parentPath, out parent)) return Errno.InvalidArgument;
+            if(pieces.Length == 1)
+                parent = rootDirectory;
+            else if(!directoryCache.TryGetValue(parentPath, out parent))
+                return Errno.InvalidArgument;
 
             KeyValuePair<string, DirectoryEntry> dirent =
                 parent.FirstOrDefault(t => t.Key.ToLower(cultureInfo) == pieces[pieces.Length - 1]);
 
-            if(string.IsNullOrEmpty(dirent.Key)) return Errno.NoSuchFile;
+            if(string.IsNullOrEmpty(dirent.Key))
+                return Errno.NoSuchFile;
 
             entry = dirent.Value;
+
             return Errno.NoError;
         }
     }
diff --git a/Aaru.Filesystems/FATX/Info.cs b/Aaru.Filesystems/FATX/Info.cs
index 86e742eb0..b8d5e1562 100644
--- a/Aaru.Filesystems/FATX/Info.cs
+++ b/Aaru.Filesystems/FATX/Info.cs
@@ -42,7 +42,8 @@ namespace Aaru.Filesystems.FATX
     {
         public bool Identify(IMediaImage imagePlugin, Partition partition)
         {
-            if(imagePlugin.Info.SectorSize < 512) return false;
+            if(imagePlugin.Info.SectorSize < 512)
+                return false;
 
             byte[] sector = imagePlugin.ReadSector(partition.Start);
 
@@ -52,11 +53,13 @@ namespace Aaru.Filesystems.FATX
         }
 
         public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding    encoding)
+                                   Encoding encoding)
         {
             Encoding    = Encoding.UTF8;
             information = "";
-            if(imagePlugin.Info.SectorSize < 512) return;
+
+            if(imagePlugin.Info.SectorSize < 512)
+                return;
 
             bool bigEndian = true;
 
@@ -70,18 +73,22 @@ namespace Aaru.Filesystems.FATX
                 bigEndian = false;
             }
 
-            if(fatxSb.magic != FATX_MAGIC) return;
+            if(fatxSb.magic != FATX_MAGIC)
+                return;
 
             int logicalSectorsPerPhysicalSectors = partition.Offset == 0 && !bigEndian ? 8 : 1;
 
-            StringBuilder sb = new StringBuilder();
+            var sb = new StringBuilder();
 
             sb.AppendLine("FATX filesystem");
+
             sb.AppendFormat("{0} logical sectors ({1} bytes) per physical sector", logicalSectorsPerPhysicalSectors,
                             logicalSectorsPerPhysicalSectors * imagePlugin.Info.SectorSize).AppendLine();
+
             sb.AppendFormat("{0} sectors ({1} bytes) per cluster", fatxSb.sectorsPerCluster,
-                            fatxSb.sectorsPerCluster * logicalSectorsPerPhysicalSectors * imagePlugin.Info.SectorSize)
-              .AppendLine();
+                            fatxSb.sectorsPerCluster * logicalSectorsPerPhysicalSectors * imagePlugin.Info.SectorSize).
+               AppendLine();
+
             sb.AppendFormat("Root directory starts on cluster {0}", fatxSb.rootDirectoryCluster).AppendLine();
 
             string volumeLabel = StringHandlers.CToString(fatxSb.volumeLabel,
@@ -96,13 +103,12 @@ namespace Aaru.Filesystems.FATX
             XmlFsType = new FileSystemType
             {
                 Type = "FATX filesystem",
-                ClusterSize =
-                    (uint)(fatxSb.sectorsPerCluster * logicalSectorsPerPhysicalSectors *
-                           imagePlugin.Info.SectorSize),
-                VolumeName   = volumeLabel,
-                VolumeSerial = $"{fatxSb.id:X8}"
+                ClusterSize = (uint)(fatxSb.sectorsPerCluster * logicalSectorsPerPhysicalSectors *
+                                     imagePlugin.Info.SectorSize),
+                VolumeName = volumeLabel, VolumeSerial = $"{fatxSb.id:X8}"
             };
-            XmlFsType.Clusters = (partition.End - partition.Start + 1) * imagePlugin.Info.SectorSize /
+
+            XmlFsType.Clusters = (((partition.End - partition.Start) + 1) * imagePlugin.Info.SectorSize) /
                                  XmlFsType.ClusterSize;
         }
     }
diff --git a/Aaru.Filesystems/FATX/Structs.cs b/Aaru.Filesystems/FATX/Structs.cs
index 15fcc1b87..ad123d28e 100644
--- a/Aaru.Filesystems/FATX/Structs.cs
+++ b/Aaru.Filesystems/FATX/Structs.cs
@@ -39,30 +39,31 @@ namespace Aaru.Filesystems.FATX
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct Superblock
         {
-            public uint magic;
-            public uint id;
-            public uint sectorsPerCluster;
-            public uint rootDirectoryCluster;
+            public readonly uint magic;
+            public readonly uint id;
+            public readonly uint sectorsPerCluster;
+            public readonly uint rootDirectoryCluster;
+
             // TODO: Undetermined size
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
-            public byte[] volumeLabel;
+            public readonly byte[] volumeLabel;
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct DirectoryEntry
         {
-            public byte       filenameSize;
-            public Attributes attributes;
+            public readonly byte       filenameSize;
+            public readonly Attributes attributes;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = MAX_FILENAME)]
-            public byte[] filename;
-            public uint   firstCluster;
-            public uint   length;
-            public ushort lastWrittenTime;
-            public ushort lastWrittenDate;
-            public ushort creationTime;
-            public ushort creationDate;
-            public ushort lastAccessTime;
-            public ushort lastAccessDate;
+            public readonly byte[] filename;
+            public readonly uint   firstCluster;
+            public readonly uint   length;
+            public readonly ushort lastWrittenTime;
+            public readonly ushort lastWrittenDate;
+            public readonly ushort creationTime;
+            public readonly ushort creationDate;
+            public readonly ushort lastAccessTime;
+            public readonly ushort lastAccessDate;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/FATX/Super.cs b/Aaru.Filesystems/FATX/Super.cs
index 2b2476781..e24e0aabd 100644
--- a/Aaru.Filesystems/FATX/Super.cs
+++ b/Aaru.Filesystems/FATX/Super.cs
@@ -46,15 +46,20 @@ namespace Aaru.Filesystems.FATX
 {
     public partial class XboxFatPlugin
     {
-        public Errno Mount(IMediaImage                imagePlugin, Partition partition, Encoding encoding,
-                           Dictionary<string, string> options,     string    @namespace)
+        public Errno Mount(IMediaImage imagePlugin, Partition partition, Encoding encoding,
+                           Dictionary<string, string> options, string @namespace)
         {
             Encoding     = Encoding.GetEncoding("iso-8859-15");
             littleEndian = true;
-            if(options == null) options = GetDefaultOptions();
-            if(options.TryGetValue("debug", out string debugString)) bool.TryParse(debugString, out debug);
 
-            if(imagePlugin.Info.SectorSize < 512) return Errno.InvalidArgument;
+            if(options == null)
+                options = GetDefaultOptions();
+
+            if(options.TryGetValue("debug", out string debugString))
+                bool.TryParse(debugString, out debug);
+
+            if(imagePlugin.Info.SectorSize < 512)
+                return Errno.InvalidArgument;
 
             AaruConsole.DebugWriteLine("Xbox FAT plugin", "Reading superblock");
 
@@ -68,14 +73,16 @@ namespace Aaru.Filesystems.FATX
                 littleEndian = false;
             }
 
-            if(superblock.magic != FATX_MAGIC) return Errno.InvalidArgument;
+            if(superblock.magic != FATX_MAGIC)
+                return Errno.InvalidArgument;
 
             AaruConsole.DebugWriteLine("Xbox FAT plugin",
-                                      littleEndian ? "Filesystem is little endian" : "Filesystem is big endian");
+                                       littleEndian ? "Filesystem is little endian" : "Filesystem is big endian");
 
             int logicalSectorsPerPhysicalSectors = partition.Offset == 0 && littleEndian ? 8 : 1;
+
             AaruConsole.DebugWriteLine("Xbox FAT plugin", "logicalSectorsPerPhysicalSectors = {0}",
-                                      logicalSectorsPerPhysicalSectors);
+                                       logicalSectorsPerPhysicalSectors);
 
             string volumeLabel = StringHandlers.CToString(superblock.volumeLabel,
                                                           !littleEndian ? Encoding.BigEndianUnicode : Encoding.Unicode,
@@ -84,37 +91,36 @@ namespace Aaru.Filesystems.FATX
             XmlFsType = new FileSystemType
             {
                 Type = "FATX filesystem",
-                ClusterSize =
-                    (uint)(superblock.sectorsPerCluster * logicalSectorsPerPhysicalSectors *
-                           imagePlugin.Info.SectorSize),
-                VolumeName   = volumeLabel,
-                VolumeSerial = $"{superblock.id:X8}"
+                ClusterSize = (uint)(superblock.sectorsPerCluster * logicalSectorsPerPhysicalSectors *
+                                     imagePlugin.Info.SectorSize),
+                VolumeName = volumeLabel, VolumeSerial = $"{superblock.id:X8}"
             };
-            XmlFsType.Clusters = (partition.End - partition.Start + 1) * imagePlugin.Info.SectorSize /
+
+            XmlFsType.Clusters = (((partition.End - partition.Start) + 1) * imagePlugin.Info.SectorSize) /
                                  XmlFsType.ClusterSize;
 
             statfs = new FileSystemInfo
             {
-                Blocks         = XmlFsType.Clusters,
-                FilenameLength = MAX_FILENAME,
-                Files          = 0, // Requires traversing all directories
-                FreeFiles      = 0,
-                Id             = {IsInt = true, Serial32 = superblock.magic},
-                PluginId       = Id,
-                Type           = littleEndian ? "Xbox FAT" : "Xbox 360 FAT",
-                FreeBlocks     = 0 // Requires traversing the FAT
+                Blocks    = XmlFsType.Clusters, FilenameLength = MAX_FILENAME,
+                Files     = 0, // Requires traversing all directories
+                FreeFiles = 0, Id =
+                {
+                    IsInt = true, Serial32 = superblock.magic
+                },
+                PluginId   = Id, Type = littleEndian ? "Xbox FAT" : "Xbox 360 FAT",
+                FreeBlocks = 0 // Requires traversing the FAT
             };
 
-            AaruConsole.DebugWriteLine("Xbox FAT plugin", "XmlFsType.ClusterSize: {0}",  XmlFsType.ClusterSize);
-            AaruConsole.DebugWriteLine("Xbox FAT plugin", "XmlFsType.VolumeName: {0}",   XmlFsType.VolumeName);
+            AaruConsole.DebugWriteLine("Xbox FAT plugin", "XmlFsType.ClusterSize: {0}", XmlFsType.ClusterSize);
+            AaruConsole.DebugWriteLine("Xbox FAT plugin", "XmlFsType.VolumeName: {0}", XmlFsType.VolumeName);
             AaruConsole.DebugWriteLine("Xbox FAT plugin", "XmlFsType.VolumeSerial: {0}", XmlFsType.VolumeSerial);
-            AaruConsole.DebugWriteLine("Xbox FAT plugin", "stat.Blocks: {0}",            statfs.Blocks);
-            AaruConsole.DebugWriteLine("Xbox FAT plugin", "stat.FilenameLength: {0}",    statfs.FilenameLength);
-            AaruConsole.DebugWriteLine("Xbox FAT plugin", "stat.Id: {0}",                statfs.Id.Serial32);
-            AaruConsole.DebugWriteLine("Xbox FAT plugin", "stat.Type: {0}",              statfs.Type);
+            AaruConsole.DebugWriteLine("Xbox FAT plugin", "stat.Blocks: {0}", statfs.Blocks);
+            AaruConsole.DebugWriteLine("Xbox FAT plugin", "stat.FilenameLength: {0}", statfs.FilenameLength);
+            AaruConsole.DebugWriteLine("Xbox FAT plugin", "stat.Id: {0}", statfs.Id.Serial32);
+            AaruConsole.DebugWriteLine("Xbox FAT plugin", "stat.Type: {0}", statfs.Type);
 
             byte[] buffer;
-            fatStartSector = FAT_START / imagePlugin.Info.SectorSize + partition.Start;
+            fatStartSector = (FAT_START / imagePlugin.Info.SectorSize) + partition.Start;
             uint fatSize;
 
             AaruConsole.DebugWriteLine("Xbox FAT plugin", "fatStartSector: {0}", fatStartSector);
@@ -123,12 +129,17 @@ namespace Aaru.Filesystems.FATX
             {
                 AaruConsole.DebugWriteLine("Xbox FAT plugin", "Reading FAT32");
 
-                fatSize = (uint)((statfs.Blocks + 1) * sizeof(uint) / imagePlugin.Info.SectorSize);
-                if((uint)((statfs.Blocks        + 1) * sizeof(uint) % imagePlugin.Info.SectorSize) > 0) fatSize++;
+                fatSize = (uint)(((statfs.Blocks + 1) * sizeof(uint)) / imagePlugin.Info.SectorSize);
 
-                long fatClusters = fatSize * imagePlugin.Info.SectorSize / 4096;
-                if(fatSize * imagePlugin.Info.SectorSize % 4096 > 0) fatClusters++;
-                fatSize = (uint)(fatClusters * 4096 / imagePlugin.Info.SectorSize);
+                if((uint)(((statfs.Blocks + 1) * sizeof(uint)) % imagePlugin.Info.SectorSize) > 0)
+                    fatSize++;
+
+                long fatClusters = (fatSize * imagePlugin.Info.SectorSize) / 4096;
+
+                if((fatSize * imagePlugin.Info.SectorSize) % 4096 > 0)
+                    fatClusters++;
+
+                fatSize = (uint)((fatClusters * 4096) / imagePlugin.Info.SectorSize);
 
                 AaruConsole.DebugWriteLine("Xbox FAT plugin", "FAT is {0} sectors", fatSize);
 
@@ -136,23 +147,31 @@ namespace Aaru.Filesystems.FATX
 
                 AaruConsole.DebugWriteLine("Xbox FAT plugin", "Casting FAT");
                 fat32 = MemoryMarshal.Cast<byte, uint>(buffer).ToArray();
+
                 if(!littleEndian)
                     for(int i = 0; i < fat32.Length; i++)
                         fat32[i] = Swapping.Swap(fat32[i]);
 
                 AaruConsole.DebugWriteLine("Xbox FAT plugin", "fat32[0] == FATX32_ID = {0}", fat32[0] == FATX32_ID);
-                if(fat32[0] != FATX32_ID) return Errno.InvalidArgument;
+
+                if(fat32[0] != FATX32_ID)
+                    return Errno.InvalidArgument;
             }
             else
             {
                 AaruConsole.DebugWriteLine("Xbox FAT plugin", "Reading FAT16");
 
-                fatSize = (uint)((statfs.Blocks + 1) * sizeof(ushort) / imagePlugin.Info.SectorSize);
-                if((uint)((statfs.Blocks        + 1) * sizeof(ushort) % imagePlugin.Info.SectorSize) > 0) fatSize++;
+                fatSize = (uint)(((statfs.Blocks + 1) * sizeof(ushort)) / imagePlugin.Info.SectorSize);
 
-                long fatClusters = fatSize * imagePlugin.Info.SectorSize / 4096;
-                if(fatSize * imagePlugin.Info.SectorSize % 4096 > 0) fatClusters++;
-                fatSize = (uint)(fatClusters * 4096 / imagePlugin.Info.SectorSize);
+                if((uint)(((statfs.Blocks + 1) * sizeof(ushort)) % imagePlugin.Info.SectorSize) > 0)
+                    fatSize++;
+
+                long fatClusters = (fatSize * imagePlugin.Info.SectorSize) / 4096;
+
+                if((fatSize * imagePlugin.Info.SectorSize) % 4096 > 0)
+                    fatClusters++;
+
+                fatSize = (uint)((fatClusters * 4096) / imagePlugin.Info.SectorSize);
 
                 AaruConsole.DebugWriteLine("Xbox FAT plugin", "FAT is {0} sectors", fatSize);
 
@@ -160,12 +179,15 @@ namespace Aaru.Filesystems.FATX
 
                 AaruConsole.DebugWriteLine("Xbox FAT plugin", "Casting FAT");
                 fat16 = MemoryMarshal.Cast<byte, ushort>(buffer).ToArray();
+
                 if(!littleEndian)
                     for(int i = 0; i < fat16.Length; i++)
                         fat16[i] = Swapping.Swap(fat16[i]);
 
                 AaruConsole.DebugWriteLine("Xbox FAT plugin", "fat16[0] == FATX16_ID = {0}", fat16[0] == FATX16_ID);
-                if(fat16[0] != FATX16_ID) return Errno.InvalidArgument;
+
+                if(fat16[0] != FATX16_ID)
+                    return Errno.InvalidArgument;
             }
 
             sectorsPerCluster  = (uint)(superblock.sectorsPerCluster * logicalSectorsPerPhysicalSectors);
@@ -173,46 +195,54 @@ namespace Aaru.Filesystems.FATX
             firstClusterSector = fatStartSector + fatSize;
             bytesPerCluster    = sectorsPerCluster * imagePlugin.Info.SectorSize;
 
-            AaruConsole.DebugWriteLine("Xbox FAT plugin", "sectorsPerCluster = {0}",  sectorsPerCluster);
-            AaruConsole.DebugWriteLine("Xbox FAT plugin", "bytesPerCluster = {0}",    bytesPerCluster);
+            AaruConsole.DebugWriteLine("Xbox FAT plugin", "sectorsPerCluster = {0}", sectorsPerCluster);
+            AaruConsole.DebugWriteLine("Xbox FAT plugin", "bytesPerCluster = {0}", bytesPerCluster);
             AaruConsole.DebugWriteLine("Xbox FAT plugin", "firstClusterSector = {0}", firstClusterSector);
 
             uint[] rootDirectoryClusters = GetClusters(superblock.rootDirectoryCluster);
 
-            if(rootDirectoryClusters is null) return Errno.InvalidArgument;
+            if(rootDirectoryClusters is null)
+                return Errno.InvalidArgument;
 
             byte[] rootDirectoryBuffer = new byte[bytesPerCluster * rootDirectoryClusters.Length];
 
             AaruConsole.DebugWriteLine("Xbox FAT plugin", "Reading root directory");
+
             for(int i = 0; i < rootDirectoryClusters.Length; i++)
             {
                 buffer =
-                    imagePlugin.ReadSectors(firstClusterSector + (rootDirectoryClusters[i] - 1) * sectorsPerCluster,
+                    imagePlugin.ReadSectors(firstClusterSector + ((rootDirectoryClusters[i] - 1) * sectorsPerCluster),
                                             sectorsPerCluster);
+
                 Array.Copy(buffer, 0, rootDirectoryBuffer, i * bytesPerCluster, bytesPerCluster);
             }
 
             rootDirectory = new Dictionary<string, DirectoryEntry>();
 
             int pos = 0;
+
             while(pos < rootDirectoryBuffer.Length)
             {
                 DirectoryEntry entry = littleEndian
-                                           ? Marshal
-                                              .ByteArrayToStructureLittleEndian<DirectoryEntry
+                                           ? Marshal.
+                                               ByteArrayToStructureLittleEndian<DirectoryEntry
                                                >(rootDirectoryBuffer, pos, Marshal.SizeOf<DirectoryEntry>())
                                            : Marshal.ByteArrayToStructureBigEndian<DirectoryEntry>(rootDirectoryBuffer,
                                                                                                    pos,
-                                                                                                   Marshal
-                                                                                                      .SizeOf<
+                                                                                                   Marshal.
+                                                                                                       SizeOf<
                                                                                                            DirectoryEntry
                                                                                                        >());
 
                 pos += Marshal.SizeOf<DirectoryEntry>();
 
-                if(entry.filenameSize == UNUSED_DIRENTRY || entry.filenameSize == FINISHED_DIRENTRY) break;
+                if(entry.filenameSize == UNUSED_DIRENTRY ||
+                   entry.filenameSize == FINISHED_DIRENTRY)
+                    break;
 
-                if(entry.filenameSize == DELETED_DIRENTRY || entry.filenameSize > MAX_FILENAME) continue;
+                if(entry.filenameSize == DELETED_DIRENTRY ||
+                   entry.filenameSize > MAX_FILENAME)
+                    continue;
 
                 string filename = Encoding.GetString(entry.filename, 0, entry.filenameSize);
 
@@ -228,7 +258,8 @@ namespace Aaru.Filesystems.FATX
 
         public Errno Unmount()
         {
-            if(!mounted) return Errno.AccessDenied;
+            if(!mounted)
+                return Errno.AccessDenied;
 
             fat16       = null;
             fat32       = null;
@@ -241,7 +272,9 @@ namespace Aaru.Filesystems.FATX
         public Errno StatFs(out FileSystemInfo stat)
         {
             stat = null;
-            if(!mounted) return Errno.AccessDenied;
+
+            if(!mounted)
+                return Errno.AccessDenied;
 
             stat = statfs.ShallowCopy();
 
diff --git a/Aaru.Filesystems/FFS.cs b/Aaru.Filesystems/FFS.cs
index eef4d7a03..9a3c77dd7 100644
--- a/Aaru.Filesystems/FFS.cs
+++ b/Aaru.Filesystems/FFS.cs
@@ -54,30 +54,41 @@ namespace Aaru.Filesystems
         // FreeBSD specifies starts at byte offsets 0, 8192, 65536 and 262144, but in other cases it's following sectors
         // Without bootcode
         const ulong sb_start_floppy = 0;
+
         // With bootcode
         const ulong sb_start_boot = 1;
+
         // Dunno, longer boot code
         const ulong sb_start_long_boot = 8;
+
         // Found on AT&T for MD-2D floppieslzio
         const ulong sb_start_att_dsdd = 14;
+
         // Found on hard disks (Atari UNIX e.g.)
         const ulong sb_start_piggy = 32;
 
         // MAGICs
         // UFS magic
         const uint UFS_MAGIC = 0x00011954;
+
         // Big-endian UFS magic
         const uint UFS_CIGAM = 0x54190100;
+
         // BorderWare UFS
         const uint UFS_MAGIC_BW = 0x0F242697;
+
         // Big-endian BorderWare UFS
         const uint UFS_CIGAM_BW = 0x9726240F;
+
         // UFS2 magic
         const uint UFS2_MAGIC = 0x19540119;
+
         // Big-endian UFS2 magic
         const uint UFS2_CIGAM = 0x19015419;
+
         // Incomplete newfs
         const uint UFS_BAD_MAGIC = 0x19960408;
+
         // Big-endian incomplete newfs
         const uint UFS_BAD_CIGAM = 0x08049619;
 
@@ -89,13 +100,17 @@ namespace Aaru.Filesystems
 
         public bool Identify(IMediaImage imagePlugin, Partition partition)
         {
-            if(2 + partition.Start >= partition.End) return false;
+            if(2 + partition.Start >= partition.End)
+                return false;
 
             uint sbSizeInSectors;
 
-            if(imagePlugin.Info.SectorSize == 2336 || imagePlugin.Info.SectorSize == 2352 ||
-               imagePlugin.Info.SectorSize == 2448) sbSizeInSectors = block_size / 2048;
-            else sbSizeInSectors                                    = block_size / imagePlugin.Info.SectorSize;
+            if(imagePlugin.Info.SectorSize == 2336 ||
+               imagePlugin.Info.SectorSize == 2352 ||
+               imagePlugin.Info.SectorSize == 2448)
+                sbSizeInSectors = block_size / 2048;
+            else
+                sbSizeInSectors = block_size / imagePlugin.Info.SectorSize;
 
             ulong[] locations =
             {
@@ -106,22 +121,25 @@ namespace Aaru.Filesystems
 
             try
             {
-                return locations.Where(loc => partition.End > partition.Start + loc + sbSizeInSectors)
-                                .Select(loc => imagePlugin.ReadSectors(partition.Start + loc, sbSizeInSectors))
-                                .Select(ufsSbSectors => BitConverter.ToUInt32(ufsSbSectors, 0x055C))
-                                .Any(magic => magic == UFS_MAGIC     || magic == UFS_CIGAM  || magic == UFS_MAGIC_BW ||
+                return locations.Where(loc => partition.End > partition.Start + loc + sbSizeInSectors).
+                                 Select(loc => imagePlugin.ReadSectors(partition.Start + loc, sbSizeInSectors)).
+                                 Select(ufsSbSectors => BitConverter.ToUInt32(ufsSbSectors, 0x055C)).
+                                 Any(magic => magic == UFS_MAGIC     || magic == UFS_CIGAM  || magic == UFS_MAGIC_BW ||
                                               magic == UFS_CIGAM_BW  || magic == UFS2_MAGIC || magic == UFS2_CIGAM   ||
                                               magic == UFS_BAD_MAGIC || magic == UFS_BAD_CIGAM);
             }
-            catch(Exception) { return false; }
+            catch(Exception)
+            {
+                return false;
+            }
         }
 
         public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding    encoding)
+                                   Encoding encoding)
         {
             Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-15");
             information = "";
-            StringBuilder sbInformation = new StringBuilder();
+            var sbInformation = new StringBuilder();
 
             uint   magic = 0;
             uint   sb_size_in_sectors;
@@ -135,9 +153,12 @@ namespace Aaru.Filesystems
             bool   fs_type_sun   = false;
             bool   fs_type_sun86 = false;
 
-            if(imagePlugin.Info.SectorSize == 2336 || imagePlugin.Info.SectorSize == 2352 ||
-               imagePlugin.Info.SectorSize == 2448) sb_size_in_sectors = block_size / 2048;
-            else sb_size_in_sectors                                    = block_size / imagePlugin.Info.SectorSize;
+            if(imagePlugin.Info.SectorSize == 2336 ||
+               imagePlugin.Info.SectorSize == 2352 ||
+               imagePlugin.Info.SectorSize == 2448)
+                sb_size_in_sectors = block_size / 2048;
+            else
+                sb_size_in_sectors = block_size / imagePlugin.Info.SectorSize;
 
             ulong[] locations =
             {
@@ -151,10 +172,17 @@ namespace Aaru.Filesystems
                 ufs_sb_sectors = imagePlugin.ReadSectors(partition.Start + loc, sb_size_in_sectors);
                 magic          = BitConverter.ToUInt32(ufs_sb_sectors, 0x055C);
 
-                if(magic == UFS_MAGIC  || magic == UFS_CIGAM  || magic == UFS_MAGIC_BW  || magic == UFS_CIGAM_BW ||
-                   magic == UFS2_MAGIC || magic == UFS2_CIGAM || magic == UFS_BAD_MAGIC || magic == UFS_BAD_CIGAM)
+                if(magic == UFS_MAGIC     ||
+                   magic == UFS_CIGAM     ||
+                   magic == UFS_MAGIC_BW  ||
+                   magic == UFS_CIGAM_BW  ||
+                   magic == UFS2_MAGIC    ||
+                   magic == UFS2_CIGAM    ||
+                   magic == UFS_BAD_MAGIC ||
+                   magic == UFS_BAD_CIGAM)
                 {
                     sb_offset = partition.Start + loc;
+
                     break;
                 }
 
@@ -164,6 +192,7 @@ namespace Aaru.Filesystems
             if(magic == 0)
             {
                 information = "Not a UFS filesystem, I shouldn't have arrived here!";
+
                 return;
             }
 
@@ -174,36 +203,44 @@ namespace Aaru.Filesystems
                 case UFS_MAGIC:
                     sbInformation.AppendLine("UFS filesystem");
                     XmlFsType.Type = "UFS";
+
                     break;
                 case UFS_CIGAM:
                     sbInformation.AppendLine("Big-endian UFS filesystem");
                     XmlFsType.Type = "UFS";
+
                     break;
                 case UFS_MAGIC_BW:
                     sbInformation.AppendLine("BorderWare UFS filesystem");
                     XmlFsType.Type = "UFS";
+
                     break;
                 case UFS_CIGAM_BW:
                     sbInformation.AppendLine("Big-endian BorderWare UFS filesystem");
                     XmlFsType.Type = "UFS";
+
                     break;
                 case UFS2_MAGIC:
                     sbInformation.AppendLine("UFS2 filesystem");
                     XmlFsType.Type = "UFS2";
+
                     break;
                 case UFS2_CIGAM:
                     sbInformation.AppendLine("Big-endian UFS2 filesystem");
                     XmlFsType.Type = "UFS2";
+
                     break;
                 case UFS_BAD_MAGIC:
                     sbInformation.AppendLine("Incompletely initialized UFS filesystem");
                     sbInformation.AppendLine("BEWARE!!! Following information may be completely wrong!");
                     XmlFsType.Type = "UFS";
+
                     break;
                 case UFS_BAD_CIGAM:
                     sbInformation.AppendLine("Incompletely initialized big-endian UFS filesystem");
                     sbInformation.AppendLine("BEWARE!!! Following information may be completely wrong!");
                     XmlFsType.Type = "UFS";
+
                     break;
             }
 
@@ -213,10 +250,11 @@ namespace Aaru.Filesystems
             UFSSuperBlock ufs_sb = Marshal.ByteArrayToStructureLittleEndian<UFSSuperBlock>(ufs_sb_sectors);
 
             UFSSuperBlock bs_sfu = Marshal.ByteArrayToStructureBigEndian<UFSSuperBlock>(ufs_sb_sectors);
-            if(bs_sfu.fs_magic == UFS_MAGIC     && ufs_sb.fs_magic == UFS_CIGAM    ||
-               bs_sfu.fs_magic == UFS_MAGIC_BW  && ufs_sb.fs_magic == UFS_CIGAM_BW ||
-               bs_sfu.fs_magic == UFS2_MAGIC    && ufs_sb.fs_magic == UFS2_CIGAM   ||
-               bs_sfu.fs_magic == UFS_BAD_MAGIC && ufs_sb.fs_magic == UFS_BAD_CIGAM)
+
+            if((bs_sfu.fs_magic == UFS_MAGIC     && ufs_sb.fs_magic == UFS_CIGAM)    ||
+               (bs_sfu.fs_magic == UFS_MAGIC_BW  && ufs_sb.fs_magic == UFS_CIGAM_BW) ||
+               (bs_sfu.fs_magic == UFS2_MAGIC    && ufs_sb.fs_magic == UFS2_CIGAM)   ||
+               (bs_sfu.fs_magic == UFS_BAD_MAGIC && ufs_sb.fs_magic == UFS_BAD_CIGAM))
             {
                 ufs_sb                           = bs_sfu;
                 ufs_sb.fs_old_cstotal.cs_nbfree  = Swapping.Swap(ufs_sb.fs_old_cstotal.cs_nbfree);
@@ -234,46 +272,47 @@ namespace Aaru.Filesystems
             }
 
             AaruConsole.DebugWriteLine("FFS plugin", "ufs_sb offset: 0x{0:X8}", sb_offset);
-            AaruConsole.DebugWriteLine("FFS plugin", "fs_rlink: 0x{0:X8}",      ufs_sb.fs_rlink);
-            AaruConsole.DebugWriteLine("FFS plugin", "fs_sblkno: 0x{0:X8}",     ufs_sb.fs_sblkno);
-            AaruConsole.DebugWriteLine("FFS plugin", "fs_cblkno: 0x{0:X8}",     ufs_sb.fs_cblkno);
-            AaruConsole.DebugWriteLine("FFS plugin", "fs_iblkno: 0x{0:X8}",     ufs_sb.fs_iblkno);
-            AaruConsole.DebugWriteLine("FFS plugin", "fs_dblkno: 0x{0:X8}",     ufs_sb.fs_dblkno);
-            AaruConsole.DebugWriteLine("FFS plugin", "fs_size: 0x{0:X8}",       ufs_sb.fs_size);
-            AaruConsole.DebugWriteLine("FFS plugin", "fs_dsize: 0x{0:X8}",      ufs_sb.fs_dsize);
-            AaruConsole.DebugWriteLine("FFS plugin", "fs_ncg: 0x{0:X8}",        ufs_sb.fs_ncg);
-            AaruConsole.DebugWriteLine("FFS plugin", "fs_bsize: 0x{0:X8}",      ufs_sb.fs_bsize);
-            AaruConsole.DebugWriteLine("FFS plugin", "fs_fsize: 0x{0:X8}",      ufs_sb.fs_fsize);
-            AaruConsole.DebugWriteLine("FFS plugin", "fs_frag: 0x{0:X8}",       ufs_sb.fs_frag);
-            AaruConsole.DebugWriteLine("FFS plugin", "fs_minfree: 0x{0:X8}",    ufs_sb.fs_minfree);
-            AaruConsole.DebugWriteLine("FFS plugin", "fs_bmask: 0x{0:X8}",      ufs_sb.fs_bmask);
-            AaruConsole.DebugWriteLine("FFS plugin", "fs_fmask: 0x{0:X8}",      ufs_sb.fs_fmask);
-            AaruConsole.DebugWriteLine("FFS plugin", "fs_bshift: 0x{0:X8}",     ufs_sb.fs_bshift);
-            AaruConsole.DebugWriteLine("FFS plugin", "fs_fshift: 0x{0:X8}",     ufs_sb.fs_fshift);
-            AaruConsole.DebugWriteLine("FFS plugin", "fs_maxcontig: 0x{0:X8}",  ufs_sb.fs_maxcontig);
-            AaruConsole.DebugWriteLine("FFS plugin", "fs_maxbpg: 0x{0:X8}",     ufs_sb.fs_maxbpg);
-            AaruConsole.DebugWriteLine("FFS plugin", "fs_fragshift: 0x{0:X8}",  ufs_sb.fs_fragshift);
-            AaruConsole.DebugWriteLine("FFS plugin", "fs_fsbtodb: 0x{0:X8}",    ufs_sb.fs_fsbtodb);
-            AaruConsole.DebugWriteLine("FFS plugin", "fs_sbsize: 0x{0:X8}",     ufs_sb.fs_sbsize);
-            AaruConsole.DebugWriteLine("FFS plugin", "fs_csmask: 0x{0:X8}",     ufs_sb.fs_csmask);
-            AaruConsole.DebugWriteLine("FFS plugin", "fs_csshift: 0x{0:X8}",    ufs_sb.fs_csshift);
-            AaruConsole.DebugWriteLine("FFS plugin", "fs_nindir: 0x{0:X8}",     ufs_sb.fs_nindir);
-            AaruConsole.DebugWriteLine("FFS plugin", "fs_inopb: 0x{0:X8}",      ufs_sb.fs_inopb);
-            AaruConsole.DebugWriteLine("FFS plugin", "fs_optim: 0x{0:X8}",      ufs_sb.fs_optim);
-            AaruConsole.DebugWriteLine("FFS plugin", "fs_id_1: 0x{0:X8}",       ufs_sb.fs_id_1);
-            AaruConsole.DebugWriteLine("FFS plugin", "fs_id_2: 0x{0:X8}",       ufs_sb.fs_id_2);
-            AaruConsole.DebugWriteLine("FFS plugin", "fs_csaddr: 0x{0:X8}",     ufs_sb.fs_csaddr);
-            AaruConsole.DebugWriteLine("FFS plugin", "fs_cssize: 0x{0:X8}",     ufs_sb.fs_cssize);
-            AaruConsole.DebugWriteLine("FFS plugin", "fs_cgsize: 0x{0:X8}",     ufs_sb.fs_cgsize);
-            AaruConsole.DebugWriteLine("FFS plugin", "fs_ipg: 0x{0:X8}",        ufs_sb.fs_ipg);
-            AaruConsole.DebugWriteLine("FFS plugin", "fs_fpg: 0x{0:X8}",        ufs_sb.fs_fpg);
-            AaruConsole.DebugWriteLine("FFS plugin", "fs_fmod: 0x{0:X2}",       ufs_sb.fs_fmod);
-            AaruConsole.DebugWriteLine("FFS plugin", "fs_clean: 0x{0:X2}",      ufs_sb.fs_clean);
-            AaruConsole.DebugWriteLine("FFS plugin", "fs_ronly: 0x{0:X2}",      ufs_sb.fs_ronly);
-            AaruConsole.DebugWriteLine("FFS plugin", "fs_flags: 0x{0:X2}",      ufs_sb.fs_flags);
-            AaruConsole.DebugWriteLine("FFS plugin", "fs_magic: 0x{0:X8}",      ufs_sb.fs_magic);
+            AaruConsole.DebugWriteLine("FFS plugin", "fs_rlink: 0x{0:X8}", ufs_sb.fs_rlink);
+            AaruConsole.DebugWriteLine("FFS plugin", "fs_sblkno: 0x{0:X8}", ufs_sb.fs_sblkno);
+            AaruConsole.DebugWriteLine("FFS plugin", "fs_cblkno: 0x{0:X8}", ufs_sb.fs_cblkno);
+            AaruConsole.DebugWriteLine("FFS plugin", "fs_iblkno: 0x{0:X8}", ufs_sb.fs_iblkno);
+            AaruConsole.DebugWriteLine("FFS plugin", "fs_dblkno: 0x{0:X8}", ufs_sb.fs_dblkno);
+            AaruConsole.DebugWriteLine("FFS plugin", "fs_size: 0x{0:X8}", ufs_sb.fs_size);
+            AaruConsole.DebugWriteLine("FFS plugin", "fs_dsize: 0x{0:X8}", ufs_sb.fs_dsize);
+            AaruConsole.DebugWriteLine("FFS plugin", "fs_ncg: 0x{0:X8}", ufs_sb.fs_ncg);
+            AaruConsole.DebugWriteLine("FFS plugin", "fs_bsize: 0x{0:X8}", ufs_sb.fs_bsize);
+            AaruConsole.DebugWriteLine("FFS plugin", "fs_fsize: 0x{0:X8}", ufs_sb.fs_fsize);
+            AaruConsole.DebugWriteLine("FFS plugin", "fs_frag: 0x{0:X8}", ufs_sb.fs_frag);
+            AaruConsole.DebugWriteLine("FFS plugin", "fs_minfree: 0x{0:X8}", ufs_sb.fs_minfree);
+            AaruConsole.DebugWriteLine("FFS plugin", "fs_bmask: 0x{0:X8}", ufs_sb.fs_bmask);
+            AaruConsole.DebugWriteLine("FFS plugin", "fs_fmask: 0x{0:X8}", ufs_sb.fs_fmask);
+            AaruConsole.DebugWriteLine("FFS plugin", "fs_bshift: 0x{0:X8}", ufs_sb.fs_bshift);
+            AaruConsole.DebugWriteLine("FFS plugin", "fs_fshift: 0x{0:X8}", ufs_sb.fs_fshift);
+            AaruConsole.DebugWriteLine("FFS plugin", "fs_maxcontig: 0x{0:X8}", ufs_sb.fs_maxcontig);
+            AaruConsole.DebugWriteLine("FFS plugin", "fs_maxbpg: 0x{0:X8}", ufs_sb.fs_maxbpg);
+            AaruConsole.DebugWriteLine("FFS plugin", "fs_fragshift: 0x{0:X8}", ufs_sb.fs_fragshift);
+            AaruConsole.DebugWriteLine("FFS plugin", "fs_fsbtodb: 0x{0:X8}", ufs_sb.fs_fsbtodb);
+            AaruConsole.DebugWriteLine("FFS plugin", "fs_sbsize: 0x{0:X8}", ufs_sb.fs_sbsize);
+            AaruConsole.DebugWriteLine("FFS plugin", "fs_csmask: 0x{0:X8}", ufs_sb.fs_csmask);
+            AaruConsole.DebugWriteLine("FFS plugin", "fs_csshift: 0x{0:X8}", ufs_sb.fs_csshift);
+            AaruConsole.DebugWriteLine("FFS plugin", "fs_nindir: 0x{0:X8}", ufs_sb.fs_nindir);
+            AaruConsole.DebugWriteLine("FFS plugin", "fs_inopb: 0x{0:X8}", ufs_sb.fs_inopb);
+            AaruConsole.DebugWriteLine("FFS plugin", "fs_optim: 0x{0:X8}", ufs_sb.fs_optim);
+            AaruConsole.DebugWriteLine("FFS plugin", "fs_id_1: 0x{0:X8}", ufs_sb.fs_id_1);
+            AaruConsole.DebugWriteLine("FFS plugin", "fs_id_2: 0x{0:X8}", ufs_sb.fs_id_2);
+            AaruConsole.DebugWriteLine("FFS plugin", "fs_csaddr: 0x{0:X8}", ufs_sb.fs_csaddr);
+            AaruConsole.DebugWriteLine("FFS plugin", "fs_cssize: 0x{0:X8}", ufs_sb.fs_cssize);
+            AaruConsole.DebugWriteLine("FFS plugin", "fs_cgsize: 0x{0:X8}", ufs_sb.fs_cgsize);
+            AaruConsole.DebugWriteLine("FFS plugin", "fs_ipg: 0x{0:X8}", ufs_sb.fs_ipg);
+            AaruConsole.DebugWriteLine("FFS plugin", "fs_fpg: 0x{0:X8}", ufs_sb.fs_fpg);
+            AaruConsole.DebugWriteLine("FFS plugin", "fs_fmod: 0x{0:X2}", ufs_sb.fs_fmod);
+            AaruConsole.DebugWriteLine("FFS plugin", "fs_clean: 0x{0:X2}", ufs_sb.fs_clean);
+            AaruConsole.DebugWriteLine("FFS plugin", "fs_ronly: 0x{0:X2}", ufs_sb.fs_ronly);
+            AaruConsole.DebugWriteLine("FFS plugin", "fs_flags: 0x{0:X2}", ufs_sb.fs_flags);
+            AaruConsole.DebugWriteLine("FFS plugin", "fs_magic: 0x{0:X8}", ufs_sb.fs_magic);
 
-            if(ufs_sb.fs_magic == UFS2_MAGIC) fs_type_ufs2 = true;
+            if(ufs_sb.fs_magic == UFS2_MAGIC)
+                fs_type_ufs2 = true;
             else
             {
                 const uint
@@ -307,7 +346,8 @@ namespace Aaru.Filesystems
                     fs_type_43bsd = false;
                 }
 
-                if(ufs_sb.fs_cgrotor > 0x00000000 && (uint)ufs_sb.fs_cgrotor < 0xFFFFFFFF)
+                if(ufs_sb.fs_cgrotor       > 0x00000000 &&
+                   (uint)ufs_sb.fs_cgrotor < 0xFFFFFFFF)
                 {
                     fs_type_42bsd = false;
                     fs_type_sun   = false;
@@ -326,42 +366,63 @@ namespace Aaru.Filesystems
             if(!fs_type_ufs2)
             {
                 sbInformation.AppendLine("There are a lot of variants of UFS using overlapped values on same fields");
-                sbInformation
-                   .AppendLine("I will try to guess which one it is, but unless it's UFS2, I may be surely wrong");
+
+                sbInformation.
+                    AppendLine("I will try to guess which one it is, but unless it's UFS2, I may be surely wrong");
             }
 
-            if(fs_type_42bsd) sbInformation.AppendLine("Guessed as 42BSD FFS");
-            if(fs_type_43bsd) sbInformation.AppendLine("Guessed as 43BSD FFS");
-            if(fs_type_44bsd) sbInformation.AppendLine("Guessed as 44BSD FFS");
-            if(fs_type_sun) sbInformation.AppendLine("Guessed as SunOS FFS");
-            if(fs_type_sun86) sbInformation.AppendLine("Guessed as SunOS/x86 FFS");
-            if(fs_type_ufs) sbInformation.AppendLine("Guessed as UFS");
+            if(fs_type_42bsd)
+                sbInformation.AppendLine("Guessed as 42BSD FFS");
+
+            if(fs_type_43bsd)
+                sbInformation.AppendLine("Guessed as 43BSD FFS");
+
+            if(fs_type_44bsd)
+                sbInformation.AppendLine("Guessed as 44BSD FFS");
+
+            if(fs_type_sun)
+                sbInformation.AppendLine("Guessed as SunOS FFS");
+
+            if(fs_type_sun86)
+                sbInformation.AppendLine("Guessed as SunOS/x86 FFS");
+
+            if(fs_type_ufs)
+                sbInformation.AppendLine("Guessed as UFS");
 
             if(fs_type_42bsd)
                 sbInformation.AppendFormat("Linked list of filesystems: 0x{0:X8}", ufs_sb.fs_link).AppendLine();
+
             sbInformation.AppendFormat("Superblock LBA: {0}", ufs_sb.fs_sblkno).AppendLine();
             sbInformation.AppendFormat("Cylinder-block LBA: {0}", ufs_sb.fs_cblkno).AppendLine();
             sbInformation.AppendFormat("inode-block LBA: {0}", ufs_sb.fs_iblkno).AppendLine();
             sbInformation.AppendFormat("First data block LBA: {0}", ufs_sb.fs_dblkno).AppendLine();
             sbInformation.AppendFormat("Cylinder group offset in cylinder: {0}", ufs_sb.fs_old_cgoffset).AppendLine();
-            sbInformation.AppendFormat("Volume last written on {0}", DateHandlers.UnixToDateTime(ufs_sb.fs_old_time))
-                         .AppendLine();
+
+            sbInformation.AppendFormat("Volume last written on {0}", DateHandlers.UnixToDateTime(ufs_sb.fs_old_time)).
+                          AppendLine();
+
             XmlFsType.ModificationDate          = DateHandlers.UnixToDateTime(ufs_sb.fs_old_time);
             XmlFsType.ModificationDateSpecified = true;
+
             sbInformation.AppendFormat("{0} blocks in volume ({1} bytes)", ufs_sb.fs_old_size,
                                        (long)ufs_sb.fs_old_size * ufs_sb.fs_fsize).AppendLine();
+
             XmlFsType.Clusters    = (ulong)ufs_sb.fs_old_size;
             XmlFsType.ClusterSize = (uint)ufs_sb.fs_fsize;
+
             sbInformation.AppendFormat("{0} data blocks in volume ({1} bytes)", ufs_sb.fs_old_dsize,
                                        (long)ufs_sb.fs_old_dsize * ufs_sb.fs_fsize).AppendLine();
+
             sbInformation.AppendFormat("{0} cylinder groups in volume", ufs_sb.fs_ncg).AppendLine();
             sbInformation.AppendFormat("{0} bytes in a basic block", ufs_sb.fs_bsize).AppendLine();
             sbInformation.AppendFormat("{0} bytes in a frag block", ufs_sb.fs_fsize).AppendLine();
             sbInformation.AppendFormat("{0} frags in a block", ufs_sb.fs_frag).AppendLine();
             sbInformation.AppendFormat("{0}% of blocks must be free", ufs_sb.fs_minfree).AppendLine();
             sbInformation.AppendFormat("{0}ms for optimal next block", ufs_sb.fs_old_rotdelay).AppendLine();
+
             sbInformation.AppendFormat("disk rotates {0} times per second ({1}rpm)", ufs_sb.fs_old_rps,
                                        ufs_sb.fs_old_rps * 60).AppendLine();
+
             /*          sbInformation.AppendFormat("fs_bmask: 0x{0:X8}", ufs_sb.fs_bmask).AppendLine();
                         sbInformation.AppendFormat("fs_fmask: 0x{0:X8}", ufs_sb.fs_fmask).AppendLine();
                         sbInformation.AppendFormat("fs_bshift: 0x{0:X8}", ufs_sb.fs_bshift).AppendLine();
@@ -372,28 +433,39 @@ namespace Aaru.Filesystems
             sbInformation.AppendFormat("NINDIR: 0x{0:X8}", ufs_sb.fs_nindir).AppendLine();
             sbInformation.AppendFormat("INOPB: 0x{0:X8}", ufs_sb.fs_inopb).AppendLine();
             sbInformation.AppendFormat("NSPF: 0x{0:X8}", ufs_sb.fs_old_nspf).AppendLine();
+
             switch(ufs_sb.fs_optim)
             {
                 case 0:
                     sbInformation.AppendLine("Filesystem will minimize allocation time");
+
                     break;
                 case 1:
                     sbInformation.AppendLine("Filesystem will minimize volume fragmentation");
+
                     break;
                 default:
                     sbInformation.AppendFormat("Unknown optimization value: 0x{0:X8}", ufs_sb.fs_optim).AppendLine();
+
                     break;
             }
 
-            if(fs_type_sun) sbInformation.AppendFormat("{0} sectors/track", ufs_sb.fs_old_npsect).AppendLine();
+            if(fs_type_sun)
+                sbInformation.AppendFormat("{0} sectors/track", ufs_sb.fs_old_npsect).AppendLine();
             else if(fs_type_sun86)
-                sbInformation.AppendFormat("Volume state on {0}", DateHandlers.UnixToDateTime(ufs_sb.fs_old_npsect))
-                             .AppendLine();
+                sbInformation.AppendFormat("Volume state on {0}", DateHandlers.UnixToDateTime(ufs_sb.fs_old_npsect)).
+                              AppendLine();
+
             sbInformation.AppendFormat("Hardware sector interleave: {0}", ufs_sb.fs_old_interleave).AppendLine();
             sbInformation.AppendFormat("Sector 0 skew: {0}/track", ufs_sb.fs_old_trackskew).AppendLine();
-            if(!fs_type_43bsd && ufs_sb.fs_id_1 > 0 && ufs_sb.fs_id_2 > 0)
+
+            if(!fs_type_43bsd     &&
+               ufs_sb.fs_id_1 > 0 &&
+               ufs_sb.fs_id_2 > 0)
                 sbInformation.AppendFormat("Volume ID: 0x{0:X8}{1:X8}", ufs_sb.fs_id_1, ufs_sb.fs_id_2).AppendLine();
-            else if(fs_type_43bsd && ufs_sb.fs_id_1 > 0 && ufs_sb.fs_id_2 > 0)
+            else if(fs_type_43bsd      &&
+                    ufs_sb.fs_id_1 > 0 &&
+                    ufs_sb.fs_id_2 > 0)
             {
                 sbInformation.AppendFormat("{0} µsec for head switch", ufs_sb.fs_id_1).AppendLine();
                 sbInformation.AppendFormat("{0} µsec for track-to-track seek", ufs_sb.fs_id_2).AppendLine();
@@ -410,75 +482,99 @@ namespace Aaru.Filesystems
             sbInformation.AppendFormat("{0} inodes per cylinder group", ufs_sb.fs_ipg).AppendLine();
             sbInformation.AppendFormat("{0} blocks per group", ufs_sb.fs_fpg / ufs_sb.fs_frag).AppendLine();
             sbInformation.AppendFormat("{0} directories", ufs_sb.fs_old_cstotal.cs_ndir).AppendLine();
+
             sbInformation.AppendFormat("{0} free blocks ({1} bytes)", ufs_sb.fs_old_cstotal.cs_nbfree,
                                        (long)ufs_sb.fs_old_cstotal.cs_nbfree * ufs_sb.fs_fsize).AppendLine();
+
             XmlFsType.FreeClusters          = (ulong)ufs_sb.fs_old_cstotal.cs_nbfree;
             XmlFsType.FreeClustersSpecified = true;
             sbInformation.AppendFormat("{0} free inodes", ufs_sb.fs_old_cstotal.cs_nifree).AppendLine();
             sbInformation.AppendFormat("{0} free frags", ufs_sb.fs_old_cstotal.cs_nffree).AppendLine();
+
             if(ufs_sb.fs_fmod == 1)
             {
                 sbInformation.AppendLine("Superblock is under modification");
                 XmlFsType.Dirty = true;
             }
 
-            if(ufs_sb.fs_clean == 1) sbInformation.AppendLine("Volume is clean");
-            if(ufs_sb.fs_ronly == 1) sbInformation.AppendLine("Volume is read-only");
+            if(ufs_sb.fs_clean == 1)
+                sbInformation.AppendLine("Volume is clean");
+
+            if(ufs_sb.fs_ronly == 1)
+                sbInformation.AppendLine("Volume is read-only");
+
             sbInformation.AppendFormat("Volume flags: 0x{0:X2}", ufs_sb.fs_flags).AppendLine();
+
             if(fs_type_ufs)
-                sbInformation.AppendFormat("Volume last mounted on \"{0}\"", StringHandlers.CToString(ufs_sb.fs_fsmnt))
-                             .AppendLine();
+                sbInformation.AppendFormat("Volume last mounted on \"{0}\"", StringHandlers.CToString(ufs_sb.fs_fsmnt)).
+                              AppendLine();
             else if(fs_type_ufs2)
             {
-                sbInformation.AppendFormat("Volume last mounted on \"{0}\"", StringHandlers.CToString(ufs_sb.fs_fsmnt))
-                             .AppendLine();
-                sbInformation.AppendFormat("Volume name: \"{0}\"", StringHandlers.CToString(ufs_sb.fs_volname))
-                             .AppendLine();
+                sbInformation.AppendFormat("Volume last mounted on \"{0}\"", StringHandlers.CToString(ufs_sb.fs_fsmnt)).
+                              AppendLine();
+
+                sbInformation.AppendFormat("Volume name: \"{0}\"", StringHandlers.CToString(ufs_sb.fs_volname)).
+                              AppendLine();
+
                 XmlFsType.VolumeName = StringHandlers.CToString(ufs_sb.fs_volname);
                 sbInformation.AppendFormat("Volume ID: 0x{0:X16}", ufs_sb.fs_swuid).AppendLine();
+
                 //xmlFSType.VolumeSerial = string.Format("{0:X16}", ufs_sb.fs_swuid);
                 sbInformation.AppendFormat("Last searched cylinder group: {0}", ufs_sb.fs_cgrotor).AppendLine();
                 sbInformation.AppendFormat("{0} contiguously allocated directories", ufs_sb.fs_contigdirs).AppendLine();
                 sbInformation.AppendFormat("Standard superblock LBA: {0}", ufs_sb.fs_sblkno).AppendLine();
                 sbInformation.AppendFormat("{0} directories", ufs_sb.fs_cstotal.cs_ndir).AppendLine();
+
                 sbInformation.AppendFormat("{0} free blocks ({1} bytes)", ufs_sb.fs_cstotal.cs_nbfree,
                                            ufs_sb.fs_cstotal.cs_nbfree * ufs_sb.fs_fsize).AppendLine();
+
                 XmlFsType.FreeClusters          = (ulong)ufs_sb.fs_cstotal.cs_nbfree;
                 XmlFsType.FreeClustersSpecified = true;
                 sbInformation.AppendFormat("{0} free inodes", ufs_sb.fs_cstotal.cs_nifree).AppendLine();
                 sbInformation.AppendFormat("{0} free frags", ufs_sb.fs_cstotal.cs_nffree).AppendLine();
                 sbInformation.AppendFormat("{0} free clusters", ufs_sb.fs_cstotal.cs_numclusters).AppendLine();
-                sbInformation.AppendFormat("Volume last written on {0}", DateHandlers.UnixToDateTime(ufs_sb.fs_time))
-                             .AppendLine();
+
+                sbInformation.AppendFormat("Volume last written on {0}", DateHandlers.UnixToDateTime(ufs_sb.fs_time)).
+                              AppendLine();
+
                 XmlFsType.ModificationDate          = DateHandlers.UnixToDateTime(ufs_sb.fs_time);
                 XmlFsType.ModificationDateSpecified = true;
-                sbInformation.AppendFormat("{0} blocks ({1} bytes)", ufs_sb.fs_size, ufs_sb.fs_size * ufs_sb.fs_fsize)
-                             .AppendLine();
+
+                sbInformation.AppendFormat("{0} blocks ({1} bytes)", ufs_sb.fs_size, ufs_sb.fs_size * ufs_sb.fs_fsize).
+                              AppendLine();
+
                 XmlFsType.Clusters = (ulong)ufs_sb.fs_size;
-                sbInformation
-                   .AppendFormat("{0} data blocks ({1} bytes)", ufs_sb.fs_dsize, ufs_sb.fs_dsize * ufs_sb.fs_fsize)
-                   .AppendLine();
+
+                sbInformation.
+                    AppendFormat("{0} data blocks ({1} bytes)", ufs_sb.fs_dsize, ufs_sb.fs_dsize * ufs_sb.fs_fsize).
+                    AppendLine();
+
                 sbInformation.AppendFormat("Cylinder group summary area LBA: {0}", ufs_sb.fs_csaddr).AppendLine();
                 sbInformation.AppendFormat("{0} blocks pending of being freed", ufs_sb.fs_pendingblocks).AppendLine();
                 sbInformation.AppendFormat("{0} inodes pending of being freed", ufs_sb.fs_pendinginodes).AppendLine();
             }
 
             if(fs_type_sun)
-                sbInformation.AppendFormat("Volume state on {0}", DateHandlers.UnixToDateTime(ufs_sb.fs_old_npsect))
-                             .AppendLine();
-            else if(fs_type_sun86) sbInformation.AppendFormat("{0} sectors/track", ufs_sb.fs_state).AppendLine();
+                sbInformation.AppendFormat("Volume state on {0}", DateHandlers.UnixToDateTime(ufs_sb.fs_old_npsect)).
+                              AppendLine();
+            else if(fs_type_sun86)
+                sbInformation.AppendFormat("{0} sectors/track", ufs_sb.fs_state).AppendLine();
             else if(fs_type_44bsd)
             {
                 sbInformation.AppendFormat("{0} blocks on cluster summary array", ufs_sb.fs_contigsumsize).AppendLine();
-                sbInformation.AppendFormat("Maximum length of a symbolic link: {0}", ufs_sb.fs_maxsymlinklen)
-                             .AppendLine();
+
+                sbInformation.AppendFormat("Maximum length of a symbolic link: {0}", ufs_sb.fs_maxsymlinklen).
+                              AppendLine();
+
                 sbInformation.AppendFormat("A file can be {0} bytes at max", ufs_sb.fs_maxfilesize).AppendLine();
-                sbInformation.AppendFormat("Volume state on {0}", DateHandlers.UnixToDateTime(ufs_sb.fs_state))
-                             .AppendLine();
+
+                sbInformation.AppendFormat("Volume state on {0}", DateHandlers.UnixToDateTime(ufs_sb.fs_state)).
+                              AppendLine();
             }
 
             if(ufs_sb.fs_old_nrpos > 0)
                 sbInformation.AppendFormat("{0} rotational positions", ufs_sb.fs_old_nrpos).AppendLine();
+
             if(ufs_sb.fs_old_rotbloff > 0)
                 sbInformation.AppendFormat("{0} blocks per rotation", ufs_sb.fs_old_rotbloff).AppendLine();
 
@@ -521,10 +617,7 @@ namespace Aaru.Filesystems
         {
             /// <summary>linked list of file systems</summary>
             public readonly uint fs_link;
-            /// <summary>
-            ///     used for incore super blocks
-            ///     on Sun: uint fs_rolled; // logging only: fs fully rolled
-            /// </summary>
+            /// <summary>used for incore super blocks on Sun: uint fs_rolled; // logging only: fs fully rolled</summary>
             public readonly uint fs_rlink;
             /// <summary>addr of super-block in filesys</summary>
             public readonly int fs_sblkno;
@@ -591,29 +684,17 @@ namespace Aaru.Filesystems
             /// <summary>value of NSPF</summary>
             public readonly int fs_old_nspf;
             /* yet another configuration parameter */
-            /// <summary>
-            ///     optimization preference, see below
-            ///     On SVR: int fs_state; // file system state
-            /// </summary>
+            /// <summary>optimization preference, see below On SVR: int fs_state; // file system state</summary>
             public readonly int fs_optim;
             /// <summary># sectors/track including spares</summary>
             public readonly int fs_old_npsect;
             /// <summary>hardware sector interleave</summary>
             public readonly int fs_old_interleave;
-            /// <summary>
-            ///     sector 0 skew, per track
-            ///     On A/UX: int fs_state; // file system state
-            /// </summary>
+            /// <summary>sector 0 skew, per track On A/UX: int fs_state; // file system state</summary>
             public readonly int fs_old_trackskew;
-            /// <summary>
-            ///     unique filesystem id
-            ///     On old: int fs_headswitch; // head switch time, usec
-            /// </summary>
+            /// <summary>unique filesystem id On old: int fs_headswitch; // head switch time, usec</summary>
             public readonly int fs_id_1;
-            /// <summary>
-            ///     unique filesystem id
-            ///     On old: int fs_trkseek; // track-to-track seek, usec
-            /// </summary>
+            /// <summary>unique filesystem id On old: int fs_trkseek; // track-to-track seek, usec</summary>
             public readonly int fs_id_2;
             /* sizes determined by number of cylinder groups and their sizes */
             /// <summary>blk addr of cyl grp summary area</summary>
diff --git a/Aaru.Filesystems/Fossil.cs b/Aaru.Filesystems/Fossil.cs
index b55339aba..a6547f389 100644
--- a/Aaru.Filesystems/Fossil.cs
+++ b/Aaru.Filesystems/Fossil.cs
@@ -45,6 +45,7 @@ namespace Aaru.Filesystems
     {
         const uint FOSSIL_HDR_MAGIC = 0x3776AE89;
         const uint FOSSIL_SB_MAGIC  = 0x2340A3B1;
+
         // Fossil header starts at 128KiB
         const ulong HEADER_POS = 128 * 1024;
 
@@ -58,24 +59,27 @@ namespace Aaru.Filesystems
         {
             ulong hdrSector = HEADER_POS / imagePlugin.Info.SectorSize;
 
-            if(partition.Start + hdrSector > imagePlugin.Info.Sectors) return false;
+            if(partition.Start + hdrSector > imagePlugin.Info.Sectors)
+                return false;
 
             byte[]       sector = imagePlugin.ReadSector(partition.Start + hdrSector);
             FossilHeader hdr    = Marshal.ByteArrayToStructureBigEndian<FossilHeader>(sector);
 
             AaruConsole.DebugWriteLine("Fossil plugin", "magic at 0x{0:X8} (expected 0x{1:X8})", hdr.magic,
-                                      FOSSIL_HDR_MAGIC);
+                                       FOSSIL_HDR_MAGIC);
 
             return hdr.magic == FOSSIL_HDR_MAGIC;
         }
 
         public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding    encoding)
+                                   Encoding encoding)
         {
             // Technically everything on Plan 9 from Bell Labs is in UTF-8
             Encoding    = Encoding.UTF8;
             information = "";
-            if(imagePlugin.Info.SectorSize < 512) return;
+
+            if(imagePlugin.Info.SectorSize < 512)
+                return;
 
             ulong hdrSector = HEADER_POS / imagePlugin.Info.SectorSize;
 
@@ -83,9 +87,9 @@ namespace Aaru.Filesystems
             FossilHeader hdr    = Marshal.ByteArrayToStructureBigEndian<FossilHeader>(sector);
 
             AaruConsole.DebugWriteLine("Fossil plugin", "magic at 0x{0:X8} (expected 0x{1:X8})", hdr.magic,
-                                      FOSSIL_HDR_MAGIC);
+                                       FOSSIL_HDR_MAGIC);
 
-            StringBuilder sb = new StringBuilder();
+            var sb = new StringBuilder();
 
             sb.AppendLine("Fossil");
             sb.AppendFormat("Filesystem version {0}", hdr.version).AppendLine();
@@ -95,7 +99,7 @@ namespace Aaru.Filesystems
             sb.AppendFormat("Data starts at block {0}", hdr.data).AppendLine();
             sb.AppendFormat("Volume has {0} blocks", hdr.end).AppendLine();
 
-            ulong sbLocation = hdr.super * (hdr.blockSize / imagePlugin.Info.SectorSize) + partition.Start;
+            ulong sbLocation = (hdr.super * (hdr.blockSize / imagePlugin.Info.SectorSize)) + partition.Start;
 
             XmlFsType = new FileSystemType
             {
@@ -108,7 +112,7 @@ namespace Aaru.Filesystems
                 FossilSuperBlock fsb = Marshal.ByteArrayToStructureBigEndian<FossilSuperBlock>(sector);
 
                 AaruConsole.DebugWriteLine("Fossil plugin", "magic 0x{0:X8} (expected 0x{1:X8})", fsb.magic,
-                                          FOSSIL_SB_MAGIC);
+                                           FOSSIL_SB_MAGIC);
 
                 if(fsb.magic == FOSSIL_SB_MAGIC)
                 {
@@ -129,81 +133,47 @@ namespace Aaru.Filesystems
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct FossilHeader
         {
-            /// <summary>
-            ///     Magic number
-            /// </summary>
-            public uint magic;
-            /// <summary>
-            ///     Header version
-            /// </summary>
-            public ushort version;
-            /// <summary>
-            ///     Block size
-            /// </summary>
-            public ushort blockSize;
-            /// <summary>
-            ///     Block containing superblock
-            /// </summary>
-            public uint super;
-            /// <summary>
-            ///     Block containing labels
-            /// </summary>
-            public uint label;
-            /// <summary>
-            ///     Where do data blocks start
-            /// </summary>
-            public uint data;
-            /// <summary>
-            ///     How many data blocks does it have
-            /// </summary>
-            public uint end;
+            /// <summary>Magic number</summary>
+            public readonly uint magic;
+            /// <summary>Header version</summary>
+            public readonly ushort version;
+            /// <summary>Block size</summary>
+            public readonly ushort blockSize;
+            /// <summary>Block containing superblock</summary>
+            public readonly uint super;
+            /// <summary>Block containing labels</summary>
+            public readonly uint label;
+            /// <summary>Where do data blocks start</summary>
+            public readonly uint data;
+            /// <summary>How many data blocks does it have</summary>
+            public readonly uint end;
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct FossilSuperBlock
         {
-            /// <summary>
-            ///     Magic number
-            /// </summary>
-            public uint magic;
-            /// <summary>
-            ///     Header version
-            /// </summary>
-            public ushort version;
-            /// <summary>
-            ///     file system low epoch
-            /// </summary>
-            public uint epochLow;
-            /// <summary>
-            ///     file system high(active) epoch
-            /// </summary>
-            public uint epochHigh;
-            /// <summary>
-            ///     next qid to allocate
-            /// </summary>
-            public ulong qid;
-            /// <summary>
-            ///     data block number: root of active file system
-            /// </summary>
-            public int active;
-            /// <summary>
-            ///     data block number: root of next file system to archive
-            /// </summary>
-            public int next;
-            /// <summary>
-            ///     data block number: root of file system currently being archived
-            /// </summary>
-            public int current;
-            /// <summary>
-            ///     Venti score of last successful archive
-            /// </summary>
+            /// <summary>Magic number</summary>
+            public readonly uint magic;
+            /// <summary>Header version</summary>
+            public readonly ushort version;
+            /// <summary>file system low epoch</summary>
+            public readonly uint epochLow;
+            /// <summary>file system high(active) epoch</summary>
+            public readonly uint epochHigh;
+            /// <summary>next qid to allocate</summary>
+            public readonly ulong qid;
+            /// <summary>data block number: root of active file system</summary>
+            public readonly int active;
+            /// <summary>data block number: root of next file system to archive</summary>
+            public readonly int next;
+            /// <summary>data block number: root of file system currently being archived</summary>
+            public readonly int current;
+            /// <summary>Venti score of last successful archive</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 20)]
-            public byte[] last;
-            /// <summary>
-            ///     name of file system(just a comment)
-            /// </summary>
+            public readonly byte[] last;
+            /// <summary>name of file system(just a comment)</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 128)]
-            public byte[] name;
+            public readonly byte[] name;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/HAMMER.cs b/Aaru.Filesystems/HAMMER.cs
index 48ca56d2a..ec07258cb 100644
--- a/Aaru.Filesystems/HAMMER.cs
+++ b/Aaru.Filesystems/HAMMER.cs
@@ -63,9 +63,11 @@ namespace Aaru.Filesystems
         {
             uint run = HAMMER_VOLHDR_SIZE / imagePlugin.Info.SectorSize;
 
-            if(HAMMER_VOLHDR_SIZE % imagePlugin.Info.SectorSize > 0) run++;
+            if(HAMMER_VOLHDR_SIZE % imagePlugin.Info.SectorSize > 0)
+                run++;
 
-            if(run + partition.Start >= partition.End) return false;
+            if(run + partition.Start >= partition.End)
+                return false;
 
             byte[] sbSector = imagePlugin.ReadSectors(partition.Start, run);
 
@@ -75,32 +77,36 @@ namespace Aaru.Filesystems
         }
 
         public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding    encoding)
+                                   Encoding encoding)
         {
             Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-15");
             information = "";
 
-            StringBuilder sb = new StringBuilder();
+            var sb = new StringBuilder();
 
             HammerSuperBlock hammerSb;
 
             uint run = HAMMER_VOLHDR_SIZE / imagePlugin.Info.SectorSize;
 
-            if(HAMMER_VOLHDR_SIZE % imagePlugin.Info.SectorSize > 0) run++;
+            if(HAMMER_VOLHDR_SIZE % imagePlugin.Info.SectorSize > 0)
+                run++;
 
             byte[] sbSector = imagePlugin.ReadSectors(partition.Start, run);
 
             ulong magic = BitConverter.ToUInt64(sbSector, 0);
 
             if(magic == HAMMER_FSBUF_VOLUME)
-                hammerSb  = Marshal.ByteArrayToStructureLittleEndian<HammerSuperBlock>(sbSector);
-            else hammerSb = Marshal.ByteArrayToStructureBigEndian<HammerSuperBlock>(sbSector);
+                hammerSb = Marshal.ByteArrayToStructureLittleEndian<HammerSuperBlock>(sbSector);
+            else
+                hammerSb = Marshal.ByteArrayToStructureBigEndian<HammerSuperBlock>(sbSector);
 
             sb.AppendLine("HAMMER filesystem");
 
             sb.AppendFormat("Volume version: {0}", hammerSb.vol_version).AppendLine();
-            sb.AppendFormat("Volume {0} of {1} on this filesystem", hammerSb.vol_no + 1, hammerSb.vol_count)
-              .AppendLine();
+
+            sb.AppendFormat("Volume {0} of {1} on this filesystem", hammerSb.vol_no + 1, hammerSb.vol_count).
+               AppendLine();
+
             sb.AppendFormat("Volume name: {0}", StringHandlers.CToString(hammerSb.vol_label, Encoding)).AppendLine();
             sb.AppendFormat("Volume serial: {0}", hammerSb.vol_fsid).AppendLine();
             sb.AppendFormat("Filesystem type: {0}", hammerSb.vol_fstype).AppendLine();
@@ -111,9 +117,7 @@ namespace Aaru.Filesystems
 
             XmlFsType = new FileSystemType
             {
-                Clusters     = partition.Size / HAMMER_BIGBLOCK_SIZE,
-                ClusterSize  = HAMMER_BIGBLOCK_SIZE,
-                Dirty        = false,
+                Clusters     = partition.Size / HAMMER_BIGBLOCK_SIZE, ClusterSize = HAMMER_BIGBLOCK_SIZE, Dirty = false,
                 Type         = "HAMMER",
                 VolumeName   = StringHandlers.CToString(hammerSb.vol_label, Encoding),
                 VolumeSerial = hammerSb.vol_fsid.ToString()
@@ -123,8 +127,10 @@ namespace Aaru.Filesystems
             {
                 sb.AppendFormat("Filesystem contains {0} \"big-blocks\" ({1} bytes)", hammerSb.vol0_stat_bigblocks,
                                 hammerSb.vol0_stat_bigblocks * HAMMER_BIGBLOCK_SIZE).AppendLine();
+
                 sb.AppendFormat("Filesystem has {0} \"big-blocks\" free ({1} bytes)", hammerSb.vol0_stat_freebigblocks,
                                 hammerSb.vol0_stat_freebigblocks * HAMMER_BIGBLOCK_SIZE).AppendLine();
+
                 sb.AppendFormat("Filesystem has {0} inode used", hammerSb.vol0_stat_inodes).AppendLine();
 
                 XmlFsType.Clusters              = (ulong)hammerSb.vol0_stat_bigblocks;
@@ -133,17 +139,15 @@ namespace Aaru.Filesystems
                 XmlFsType.Files                 = (ulong)hammerSb.vol0_stat_inodes;
                 XmlFsType.FilesSpecified        = true;
             }
+
             // 0 ?
             //sb.AppendFormat("Volume header CRC: 0x{0:X8}", afs_sb.vol_crc).AppendLine();
 
             information = sb.ToString();
         }
 
-        /// <summary>
-        ///     Hammer superblock
-        /// </summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        [SuppressMessage("ReSharper", "BuiltInTypeReferenceStyle")]
+        /// <summary>Hammer superblock</summary>
+        [StructLayout(LayoutKind.Sequential, Pack = 1), SuppressMessage("ReSharper", "BuiltInTypeReferenceStyle")]
         struct HammerSuperBlock
         {
             /// <summary><see cref="HAMMER_FSBUF_VOLUME" /> for a valid header</summary>
@@ -218,8 +222,7 @@ namespace Aaru.Filesystems
             public readonly hammer_off_t[] vol0_undo_array;
         }
 
-        [SuppressMessage("ReSharper", "InconsistentNaming")]
-        [SuppressMessage("ReSharper", "BuiltInTypeReferenceStyle")]
+        [SuppressMessage("ReSharper", "InconsistentNaming"), SuppressMessage("ReSharper", "BuiltInTypeReferenceStyle")]
         struct HammerBlockMap
         {
             /// <summary>zone-2 offset only used by zone-4</summary>
diff --git a/Aaru.Filesystems/HPFS.cs b/Aaru.Filesystems/HPFS.cs
index 5d1226bc9..ac63365f0 100644
--- a/Aaru.Filesystems/HPFS.cs
+++ b/Aaru.Filesystems/HPFS.cs
@@ -52,10 +52,12 @@ namespace Aaru.Filesystems
 
         public bool Identify(IMediaImage imagePlugin, Partition partition)
         {
-            if(16 + partition.Start >= partition.End) return false;
+            if(16 + partition.Start >= partition.End)
+                return false;
 
             byte[] hpfsSbSector =
                 imagePlugin.ReadSector(16 + partition.Start); // Seek to superblock, on logical sector 16
+
             uint magic1 = BitConverter.ToUInt32(hpfsSbSector, 0x000);
             uint magic2 = BitConverter.ToUInt32(hpfsSbSector, 0x004);
 
@@ -63,17 +65,19 @@ namespace Aaru.Filesystems
         }
 
         public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding    encoding)
+                                   Encoding encoding)
         {
             Encoding    = encoding ?? Encoding.GetEncoding("ibm850");
             information = "";
 
-            StringBuilder sb = new StringBuilder();
+            var sb = new StringBuilder();
 
             byte[] hpfsBpbSector =
                 imagePlugin.ReadSector(0 + partition.Start); // Seek to BIOS parameter block, on logical sector 0
+
             byte[] hpfsSbSector =
                 imagePlugin.ReadSector(16 + partition.Start); // Seek to superblock, on logical sector 16
+
             byte[] hpfsSpSector =
                 imagePlugin.ReadSector(17 + partition.Start); // Seek to spareblock, on logical sector 17
 
@@ -84,8 +88,10 @@ namespace Aaru.Filesystems
 
             HpfsSpareBlock hpfsSp = Marshal.ByteArrayToStructureLittleEndian<HpfsSpareBlock>(hpfsSpSector);
 
-            if(StringHandlers.CToString(hpfsBpb.fs_type) != "HPFS    " || hpfsSb.magic1 != 0xF995E849 ||
-               hpfsSb.magic2                             != 0xFA53E9C5 || hpfsSp.magic1 != 0xF9911849 ||
+            if(StringHandlers.CToString(hpfsBpb.fs_type) != "HPFS    " ||
+               hpfsSb.magic1                             != 0xF995E849 ||
+               hpfsSb.magic2                             != 0xFA53E9C5 ||
+               hpfsSp.magic1                             != 0xF9911849 ||
                hpfsSp.magic2                             != 0xFA5229C5)
             {
                 sb.AppendLine("This may not be HPFS, following information may be not correct.");
@@ -98,24 +104,29 @@ namespace Aaru.Filesystems
 
             sb.AppendFormat("OEM name: {0}", StringHandlers.CToString(hpfsBpb.oem_name)).AppendLine();
             sb.AppendFormat("{0} bytes per sector", hpfsBpb.bps).AppendLine();
+
             //          sb.AppendFormat("{0} sectors per cluster", hpfs_bpb.spc).AppendLine();
             //          sb.AppendFormat("{0} reserved sectors", hpfs_bpb.rsectors).AppendLine();
             //          sb.AppendFormat("{0} FATs", hpfs_bpb.fats_no).AppendLine();
             //          sb.AppendFormat("{0} entries on root directory", hpfs_bpb.root_ent).AppendLine();
             //          sb.AppendFormat("{0} mini sectors on volume", hpfs_bpb.sectors).AppendLine();
             sb.AppendFormat("Media descriptor: 0x{0:X2}", hpfsBpb.media).AppendLine();
+
             //          sb.AppendFormat("{0} sectors per FAT", hpfs_bpb.spfat).AppendLine();
             //          sb.AppendFormat("{0} sectors per track", hpfs_bpb.sptrk).AppendLine();
             //          sb.AppendFormat("{0} heads", hpfs_bpb.heads).AppendLine();
             sb.AppendFormat("{0} sectors hidden before BPB", hpfsBpb.hsectors).AppendLine();
-            sb.AppendFormat("{0} sectors on volume ({1} bytes)", hpfsSb.sectors, hpfsSb.sectors * hpfsBpb.bps)
-              .AppendLine();
+
+            sb.AppendFormat("{0} sectors on volume ({1} bytes)", hpfsSb.sectors, hpfsSb.sectors * hpfsBpb.bps).
+               AppendLine();
+
             //          sb.AppendFormat("{0} sectors on volume ({1} bytes)", hpfs_bpb.big_sectors, hpfs_bpb.big_sectors * hpfs_bpb.bps).AppendLine();
             sb.AppendFormat("BIOS Drive Number: 0x{0:X2}", hpfsBpb.drive_no).AppendLine();
             sb.AppendFormat("NT Flags: 0x{0:X2}", hpfsBpb.nt_flags).AppendLine();
             sb.AppendFormat("Signature: 0x{0:X2}", hpfsBpb.signature).AppendLine();
             sb.AppendFormat("Serial number: 0x{0:X8}", hpfsBpb.serial_no).AppendLine();
             sb.AppendFormat("Volume label: {0}", StringHandlers.CToString(hpfsBpb.volume_label, Encoding)).AppendLine();
+
             //          sb.AppendFormat("Filesystem type: \"{0}\"", hpfs_bpb.fs_type).AppendLine();
 
             DateTime lastChk   = DateHandlers.UnixToDateTime(hpfsSb.last_chkdsk);
@@ -127,10 +138,17 @@ namespace Aaru.Filesystems
             sb.AppendFormat("{0} sectors are marked bad", hpfsSb.badblocks).AppendLine();
             sb.AppendFormat("Sector of free space bitmaps: {0}", hpfsSb.bitmap_lsn).AppendLine();
             sb.AppendFormat("Sector of bad blocks list: {0}", hpfsSb.badblock_lsn).AppendLine();
-            if(hpfsSb.last_chkdsk > 0) sb.AppendFormat("Date of last integrity check: {0}", lastChk).AppendLine();
-            else sb.AppendLine("Filesystem integrity has never been checked");
-            if(hpfsSb.last_optim > 0) sb.AppendFormat("Date of last optimization {0}", lastOptim).AppendLine();
-            else sb.AppendLine("Filesystem has never been optimized");
+
+            if(hpfsSb.last_chkdsk > 0)
+                sb.AppendFormat("Date of last integrity check: {0}", lastChk).AppendLine();
+            else
+                sb.AppendLine("Filesystem integrity has never been checked");
+
+            if(hpfsSb.last_optim > 0)
+                sb.AppendFormat("Date of last optimization {0}", lastOptim).AppendLine();
+            else
+                sb.AppendLine("Filesystem has never been optimized");
+
             sb.AppendFormat("Directory band has {0} sectors", hpfsSb.dband_sectors).AppendLine();
             sb.AppendFormat("Directory band starts at sector {0}", hpfsSb.dband_start).AppendLine();
             sb.AppendFormat("Directory band ends at sector {0}", hpfsSb.dband_last).AppendLine();
@@ -149,26 +167,58 @@ namespace Aaru.Filesystems
 
             sb.AppendLine("Flags:");
             sb.AppendLine((hpfsSp.flags1 & 0x01) == 0x01 ? "Filesystem is dirty." : "Filesystem is clean.");
-            if((hpfsSp.flags1 & 0x02) == 0x02) sb.AppendLine("Spare directory blocks are in use");
-            if((hpfsSp.flags1 & 0x04) == 0x04) sb.AppendLine("Hotfixes are in use");
-            if((hpfsSp.flags1 & 0x08) == 0x08) sb.AppendLine("Disk contains bad sectors");
-            if((hpfsSp.flags1 & 0x10) == 0x10) sb.AppendLine("Disk has a bad bitmap");
-            if((hpfsSp.flags1 & 0x20) == 0x20) sb.AppendLine("Filesystem was formatted fast");
-            if((hpfsSp.flags1 & 0x40) == 0x40) sb.AppendLine("Unknown flag 0x40 on flags1 is active");
-            if((hpfsSp.flags1 & 0x80) == 0x80) sb.AppendLine("Filesystem has been mounted by an old IFS");
-            if((hpfsSp.flags2 & 0x01) == 0x01) sb.AppendLine("Install DASD limits");
-            if((hpfsSp.flags2 & 0x02) == 0x02) sb.AppendLine("Resync DASD limits");
-            if((hpfsSp.flags2 & 0x04) == 0x04) sb.AppendLine("DASD limits are operational");
-            if((hpfsSp.flags2 & 0x08) == 0x08) sb.AppendLine("Multimedia is active");
-            if((hpfsSp.flags2 & 0x10) == 0x10) sb.AppendLine("DCE ACLs are active");
-            if((hpfsSp.flags2 & 0x20) == 0x20) sb.AppendLine("DASD limits are dirty");
-            if((hpfsSp.flags2 & 0x40) == 0x40) sb.AppendLine("Unknown flag 0x40 on flags2 is active");
-            if((hpfsSp.flags2 & 0x80) == 0x80) sb.AppendLine("Unknown flag 0x80 on flags2 is active");
+
+            if((hpfsSp.flags1 & 0x02) == 0x02)
+                sb.AppendLine("Spare directory blocks are in use");
+
+            if((hpfsSp.flags1 & 0x04) == 0x04)
+                sb.AppendLine("Hotfixes are in use");
+
+            if((hpfsSp.flags1 & 0x08) == 0x08)
+                sb.AppendLine("Disk contains bad sectors");
+
+            if((hpfsSp.flags1 & 0x10) == 0x10)
+                sb.AppendLine("Disk has a bad bitmap");
+
+            if((hpfsSp.flags1 & 0x20) == 0x20)
+                sb.AppendLine("Filesystem was formatted fast");
+
+            if((hpfsSp.flags1 & 0x40) == 0x40)
+                sb.AppendLine("Unknown flag 0x40 on flags1 is active");
+
+            if((hpfsSp.flags1 & 0x80) == 0x80)
+                sb.AppendLine("Filesystem has been mounted by an old IFS");
+
+            if((hpfsSp.flags2 & 0x01) == 0x01)
+                sb.AppendLine("Install DASD limits");
+
+            if((hpfsSp.flags2 & 0x02) == 0x02)
+                sb.AppendLine("Resync DASD limits");
+
+            if((hpfsSp.flags2 & 0x04) == 0x04)
+                sb.AppendLine("DASD limits are operational");
+
+            if((hpfsSp.flags2 & 0x08) == 0x08)
+                sb.AppendLine("Multimedia is active");
+
+            if((hpfsSp.flags2 & 0x10) == 0x10)
+                sb.AppendLine("DCE ACLs are active");
+
+            if((hpfsSp.flags2 & 0x20) == 0x20)
+                sb.AppendLine("DASD limits are dirty");
+
+            if((hpfsSp.flags2 & 0x40) == 0x40)
+                sb.AppendLine("Unknown flag 0x40 on flags2 is active");
+
+            if((hpfsSp.flags2 & 0x80) == 0x80)
+                sb.AppendLine("Unknown flag 0x80 on flags2 is active");
 
             XmlFsType = new FileSystemType();
 
             // Theoretically everything from BPB to SB is boot code, should I hash everything or only the sector loaded by BIOS itself?
-            if(hpfsBpb.jump[0]    == 0xEB && hpfsBpb.jump[1] > 0x3C && hpfsBpb.jump[1] < 0x80 &&
+            if(hpfsBpb.jump[0]    == 0xEB &&
+               hpfsBpb.jump[1]    > 0x3C  &&
+               hpfsBpb.jump[1]    < 0x80  &&
                hpfsBpb.signature2 == 0xAA55)
             {
                 XmlFsType.Bootable = true;
@@ -188,151 +238,145 @@ namespace Aaru.Filesystems
             information = sb.ToString();
         }
 
-        /// <summary>
-        ///     BIOS Parameter Block, at sector 0
-        /// </summary>
+        /// <summary>BIOS Parameter Block, at sector 0</summary>
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct HpfsBiosParameterBlock
         {
             /// <summary>0x000, Jump to boot code</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
-            public byte[] jump;
+            public readonly byte[] jump;
             /// <summary>0x003, OEM Name, 8 bytes, space-padded</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public byte[] oem_name;
+            public readonly byte[] oem_name;
             /// <summary>0x00B, Bytes per sector</summary>
-            public ushort bps;
+            public readonly ushort bps;
             /// <summary>0x00D, Sectors per cluster</summary>
-            public byte spc;
+            public readonly byte spc;
             /// <summary>0x00E, Reserved sectors between BPB and... does it have sense in HPFS?</summary>
-            public ushort rsectors;
+            public readonly ushort rsectors;
             /// <summary>0x010, Number of FATs... seriously?</summary>
-            public byte fats_no;
+            public readonly byte fats_no;
             /// <summary>0x011, Number of entries on root directory... ok</summary>
-            public ushort root_ent;
+            public readonly ushort root_ent;
             /// <summary>0x013, Sectors in volume... doubt it</summary>
-            public ushort sectors;
+            public readonly ushort sectors;
             /// <summary>0x015, Media descriptor</summary>
-            public byte media;
+            public readonly byte media;
             /// <summary>0x016, Sectors per FAT... again</summary>
-            public ushort spfat;
+            public readonly ushort spfat;
             /// <summary>0x018, Sectors per track... you're kidding</summary>
-            public ushort sptrk;
+            public readonly ushort sptrk;
             /// <summary>0x01A, Heads... stop!</summary>
-            public ushort heads;
+            public readonly ushort heads;
             /// <summary>0x01C, Hidden sectors before BPB</summary>
-            public uint hsectors;
+            public readonly uint hsectors;
             /// <summary>0x024, Sectors in volume if &gt; 65535...</summary>
-            public uint big_sectors;
+            public readonly uint big_sectors;
             /// <summary>0x028, Drive number</summary>
-            public byte drive_no;
+            public readonly byte drive_no;
             /// <summary>0x029, Volume flags?</summary>
-            public byte nt_flags;
+            public readonly byte nt_flags;
             /// <summary>0x02A, EPB signature, 0x29</summary>
-            public byte signature;
+            public readonly byte signature;
             /// <summary>0x02B, Volume serial number</summary>
-            public uint serial_no;
+            public readonly uint serial_no;
             /// <summary>0x02F, Volume label, 11 bytes, space-padded</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 11)]
-            public byte[] volume_label;
+            public readonly byte[] volume_label;
             /// <summary>0x03A, Filesystem type, 8 bytes, space-padded ("HPFS    ")</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public byte[] fs_type;
+            public readonly byte[] fs_type;
             /// <summary>Boot code.</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 448)]
-            public byte[] boot_code;
+            public readonly byte[] boot_code;
             /// <summary>0x1FE, 0xAA55</summary>
-            public ushort signature2;
+            public readonly ushort signature2;
         }
 
-        /// <summary>
-        ///     HPFS superblock at sector 16
-        /// </summary>
+        /// <summary>HPFS superblock at sector 16</summary>
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct HpfsSuperBlock
         {
             /// <summary>0x000, 0xF995E849</summary>
-            public uint magic1;
+            public readonly uint magic1;
             /// <summary>0x004, 0xFA53E9C5</summary>
-            public uint magic2;
+            public readonly uint magic2;
             /// <summary>0x008, HPFS version</summary>
-            public byte version;
+            public readonly byte version;
             /// <summary>0x009, 2 if &lt;= 4 GiB, 3 if &gt; 4 GiB</summary>
-            public byte func_version;
+            public readonly byte func_version;
             /// <summary>0x00A, Alignment</summary>
-            public ushort dummy;
+            public readonly ushort dummy;
             /// <summary>0x00C, LSN pointer to root fnode</summary>
-            public uint root_fnode;
+            public readonly uint root_fnode;
             /// <summary>0x010, Sectors on volume</summary>
-            public uint sectors;
+            public readonly uint sectors;
             /// <summary>0x014, Bad blocks on volume</summary>
-            public uint badblocks;
+            public readonly uint badblocks;
             /// <summary>0x018, LSN pointer to volume bitmap</summary>
-            public uint bitmap_lsn;
+            public readonly uint bitmap_lsn;
             /// <summary>0x01C, 0</summary>
-            public uint zero1;
+            public readonly uint zero1;
             /// <summary>0x020, LSN pointer to badblock directory</summary>
-            public uint badblock_lsn;
+            public readonly uint badblock_lsn;
             /// <summary>0x024, 0</summary>
-            public uint zero2;
+            public readonly uint zero2;
             /// <summary>0x028, Time of last CHKDSK</summary>
-            public int last_chkdsk;
+            public readonly int last_chkdsk;
             /// <summary>0x02C, Time of last optimization</summary>
-            public int last_optim;
+            public readonly int last_optim;
             /// <summary>0x030, Sectors of dir band</summary>
-            public uint dband_sectors;
+            public readonly uint dband_sectors;
             /// <summary>0x034, Start sector of dir band</summary>
-            public uint dband_start;
+            public readonly uint dband_start;
             /// <summary>0x038, Last sector of dir band</summary>
-            public uint dband_last;
+            public readonly uint dband_last;
             /// <summary>0x03C, LSN of free space bitmap</summary>
-            public uint dband_bitmap;
+            public readonly uint dband_bitmap;
             /// <summary>0x040, Can be used for volume name (32 bytes)</summary>
-            public ulong zero3;
+            public readonly ulong zero3;
             /// <summary>0x048, ...</summary>
-            public ulong zero4;
+            public readonly ulong zero4;
             /// <summary>0x04C, ...</summary>
-            public ulong zero5;
+            public readonly ulong zero5;
             /// <summary>0x050, ...;</summary>
-            public ulong zero6;
+            public readonly ulong zero6;
             /// <summary>0x058, LSN pointer to ACLs (only HPFS386)</summary>
-            public uint acl_start;
+            public readonly uint acl_start;
         }
 
-        /// <summary>
-        ///     HPFS spareblock at sector 17
-        /// </summary>
+        /// <summary>HPFS spareblock at sector 17</summary>
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct HpfsSpareBlock
         {
             /// <summary>0x000, 0xF9911849</summary>
-            public uint magic1;
+            public readonly uint magic1;
             /// <summary>0x004, 0xFA5229C5</summary>
-            public uint magic2;
+            public readonly uint magic2;
             /// <summary>0x008, HPFS flags</summary>
-            public byte flags1;
+            public readonly byte flags1;
             /// <summary>0x009, HPFS386 flags</summary>
-            public byte flags2;
+            public readonly byte flags2;
             /// <summary>0x00A, Alignment</summary>
-            public ushort dummy;
+            public readonly ushort dummy;
             /// <summary>0x00C, LSN of hotfix directory</summary>
-            public uint hotfix_start;
+            public readonly uint hotfix_start;
             /// <summary>0x010, Used hotfixes</summary>
-            public uint hotfix_used;
+            public readonly uint hotfix_used;
             /// <summary>0x014, Total hotfixes available</summary>
-            public uint hotfix_entries;
+            public readonly uint hotfix_entries;
             /// <summary>0x018, Unused spare dnodes</summary>
-            public uint spare_dnodes_free;
+            public readonly uint spare_dnodes_free;
             /// <summary>0x01C, Length of spare dnodes list</summary>
-            public uint spare_dnodes;
+            public readonly uint spare_dnodes;
             /// <summary>0x020, LSN of codepage directory</summary>
-            public uint codepage_lsn;
+            public readonly uint codepage_lsn;
             /// <summary>0x024, Number of codepages used</summary>
-            public uint codepages;
+            public readonly uint codepages;
             /// <summary>0x028, SuperBlock CRC32 (only HPFS386)</summary>
-            public uint sb_crc32;
+            public readonly uint sb_crc32;
             /// <summary>0x02C, SpareBlock CRC32 (only HPFS386)</summary>
-            public uint sp_crc32;
+            public readonly uint sp_crc32;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/HPOFS.cs b/Aaru.Filesystems/HPOFS.cs
index f9613438e..5ff58e638 100644
--- a/Aaru.Filesystems/HPOFS.cs
+++ b/Aaru.Filesystems/HPOFS.cs
@@ -47,9 +47,18 @@ namespace Aaru.Filesystems
     // Need to get IBM document GA32-0224 -> IBM 3995 Optical Library Dataserver Products: Optical Disk Format
     public class HPOFS : IFilesystem
     {
-        readonly byte[] hpofsType        = {0x48, 0x50, 0x4F, 0x46, 0x53, 0x00, 0x00, 0x00};
-        readonly byte[] medinfoSignature = {0x4D, 0x45, 0x44, 0x49, 0x4E, 0x46, 0x4F, 0x20};
-        readonly byte[] volinfoSignature = {0x56, 0x4F, 0x4C, 0x49, 0x4E, 0x46, 0x4F, 0x20};
+        readonly byte[] hpofsType =
+        {
+            0x48, 0x50, 0x4F, 0x46, 0x53, 0x00, 0x00, 0x00
+        };
+        readonly byte[] medinfoSignature =
+        {
+            0x4D, 0x45, 0x44, 0x49, 0x4E, 0x46, 0x4F, 0x20
+        };
+        readonly byte[] volinfoSignature =
+        {
+            0x56, 0x4F, 0x4C, 0x49, 0x4E, 0x46, 0x4F, 0x20
+        };
 
         public FileSystemType XmlFsType { get; private set; }
         public Encoding       Encoding  { get; private set; }
@@ -59,12 +68,14 @@ namespace Aaru.Filesystems
 
         public bool Identify(IMediaImage imagePlugin, Partition partition)
         {
-            if(16 + partition.Start >= partition.End) return false;
+            if(16 + partition.Start >= partition.End)
+                return false;
 
             byte[] hpofsBpbSector =
                 imagePlugin.ReadSector(0 + partition.Start); // Seek to BIOS parameter block, on logical sector 0
 
-            if(hpofsBpbSector.Length < 512) return false;
+            if(hpofsBpbSector.Length < 512)
+                return false;
 
             BiosParameterBlock bpb = Marshal.ByteArrayToStructureLittleEndian<BiosParameterBlock>(hpofsBpbSector);
 
@@ -72,17 +83,19 @@ namespace Aaru.Filesystems
         }
 
         public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding    encoding)
+                                   Encoding encoding)
         {
             Encoding    = encoding ?? Encoding.GetEncoding("ibm850");
             information = "";
 
-            StringBuilder sb = new StringBuilder();
+            var sb = new StringBuilder();
 
             byte[] hpofsBpbSector =
                 imagePlugin.ReadSector(0 + partition.Start); // Seek to BIOS parameter block, on logical sector 0
+
             byte[] medInfoSector =
                 imagePlugin.ReadSector(13 + partition.Start); // Seek to media information block, on logical sector 13
+
             byte[] volInfoSector =
                 imagePlugin.ReadSector(14 + partition.Start); // Seek to volume information block, on logical sector 14
 
@@ -91,70 +104,88 @@ namespace Aaru.Filesystems
             VolumeInformationBlock vib = Marshal.ByteArrayToStructureBigEndian<VolumeInformationBlock>(volInfoSector);
 
             AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.oem_name = \"{0}\"",
-                                      StringHandlers.CToString(bpb.oem_name));
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.bps = {0}",            bpb.bps);
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.spc = {0}",            bpb.spc);
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.rsectors = {0}",       bpb.rsectors);
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.fats_no = {0}",        bpb.fats_no);
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.root_ent = {0}",       bpb.root_ent);
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.sectors = {0}",        bpb.sectors);
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.media = 0x{0:X2}",     bpb.media);
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.spfat = {0}",          bpb.spfat);
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.sptrk = {0}",          bpb.sptrk);
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.heads = {0}",          bpb.heads);
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.hsectors = {0}",       bpb.hsectors);
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.big_sectors = {0}",    bpb.big_sectors);
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.drive_no = 0x{0:X2}",  bpb.drive_no);
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.nt_flags = {0}",       bpb.nt_flags);
+                                       StringHandlers.CToString(bpb.oem_name));
+
+            AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.bps = {0}", bpb.bps);
+            AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.spc = {0}", bpb.spc);
+            AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.rsectors = {0}", bpb.rsectors);
+            AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.fats_no = {0}", bpb.fats_no);
+            AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.root_ent = {0}", bpb.root_ent);
+            AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.sectors = {0}", bpb.sectors);
+            AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.media = 0x{0:X2}", bpb.media);
+            AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.spfat = {0}", bpb.spfat);
+            AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.sptrk = {0}", bpb.sptrk);
+            AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.heads = {0}", bpb.heads);
+            AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.hsectors = {0}", bpb.hsectors);
+            AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.big_sectors = {0}", bpb.big_sectors);
+            AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.drive_no = 0x{0:X2}", bpb.drive_no);
+            AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.nt_flags = {0}", bpb.nt_flags);
             AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.signature = 0x{0:X2}", bpb.signature);
             AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.serial_no = 0x{0:X8}", bpb.serial_no);
+
             AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.volume_label = \"{0}\"",
-                                      StringHandlers.SpacePaddedToString(bpb.volume_label));
+                                       StringHandlers.SpacePaddedToString(bpb.volume_label));
+
             AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.fs_type = \"{0}\"", StringHandlers.CToString(bpb.fs_type));
+
             AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.boot_code is empty? = {0}",
-                                      ArrayHelpers.ArrayIsNullOrEmpty(bpb.boot_code));
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.unknown = {0}",     bpb.unknown);
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.unknown2 = {0}",    bpb.unknown2);
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.signature2 = {0}",  bpb.signature2);
+                                       ArrayHelpers.ArrayIsNullOrEmpty(bpb.boot_code));
+
+            AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.unknown = {0}", bpb.unknown);
+            AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.unknown2 = {0}", bpb.unknown2);
+            AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.signature2 = {0}", bpb.signature2);
             AaruConsole.DebugWriteLine("HPOFS Plugin", "mib.blockId = \"{0}\"", StringHandlers.CToString(mib.blockId));
+
             AaruConsole.DebugWriteLine("HPOFS Plugin", "mib.volumeLabel = \"{0}\"",
-                                      StringHandlers.SpacePaddedToString(mib.volumeLabel));
+                                       StringHandlers.SpacePaddedToString(mib.volumeLabel));
+
             AaruConsole.DebugWriteLine("HPOFS Plugin", "mib.comment = \"{0}\"",
-                                      StringHandlers.SpacePaddedToString(mib.comment));
+                                       StringHandlers.SpacePaddedToString(mib.comment));
+
             AaruConsole.DebugWriteLine("HPOFS Plugin", "mib.serial = 0x{0:X8}", mib.serial);
+
             AaruConsole.DebugWriteLine("HPOFS Plugin", "mib.creationTimestamp = {0}",
-                                      DateHandlers.DosToDateTime(mib.creationDate, mib.creationTime));
+                                       DateHandlers.DosToDateTime(mib.creationDate, mib.creationTime));
+
             AaruConsole.DebugWriteLine("HPOFS Plugin", "mib.codepageType = {0}", mib.codepageType);
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "mib.codepage = {0}",     mib.codepage);
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "mib.rps = {0}",          mib.rps);
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "mib.bps = {0}",          mib.bps);
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "mib.bpc = {0}",          mib.bpc);
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "mib.unknown2 = {0}",     mib.unknown2);
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "mib.sectors = {0}",      mib.sectors);
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "mib.unknown3 = {0}",     mib.unknown3);
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "mib.unknown4 = {0}",     mib.unknown4);
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "mib.major = {0}",        mib.major);
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "mib.minor = {0}",        mib.minor);
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "mib.unknown5 = {0}",     mib.unknown5);
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "mib.unknown6 = {0}",     mib.unknown6);
+            AaruConsole.DebugWriteLine("HPOFS Plugin", "mib.codepage = {0}", mib.codepage);
+            AaruConsole.DebugWriteLine("HPOFS Plugin", "mib.rps = {0}", mib.rps);
+            AaruConsole.DebugWriteLine("HPOFS Plugin", "mib.bps = {0}", mib.bps);
+            AaruConsole.DebugWriteLine("HPOFS Plugin", "mib.bpc = {0}", mib.bpc);
+            AaruConsole.DebugWriteLine("HPOFS Plugin", "mib.unknown2 = {0}", mib.unknown2);
+            AaruConsole.DebugWriteLine("HPOFS Plugin", "mib.sectors = {0}", mib.sectors);
+            AaruConsole.DebugWriteLine("HPOFS Plugin", "mib.unknown3 = {0}", mib.unknown3);
+            AaruConsole.DebugWriteLine("HPOFS Plugin", "mib.unknown4 = {0}", mib.unknown4);
+            AaruConsole.DebugWriteLine("HPOFS Plugin", "mib.major = {0}", mib.major);
+            AaruConsole.DebugWriteLine("HPOFS Plugin", "mib.minor = {0}", mib.minor);
+            AaruConsole.DebugWriteLine("HPOFS Plugin", "mib.unknown5 = {0}", mib.unknown5);
+            AaruConsole.DebugWriteLine("HPOFS Plugin", "mib.unknown6 = {0}", mib.unknown6);
+
             AaruConsole.DebugWriteLine("HPOFS Plugin", "mib.filler is empty? = {0}",
-                                      ArrayHelpers.ArrayIsNullOrEmpty(mib.filler));
+                                       ArrayHelpers.ArrayIsNullOrEmpty(mib.filler));
+
             AaruConsole.DebugWriteLine("HPOFS Plugin", "vib.blockId = \"{0}\"", StringHandlers.CToString(vib.blockId));
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "vib.unknown = {0}",     vib.unknown);
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "vib.unknown2 = {0}",    vib.unknown2);
+            AaruConsole.DebugWriteLine("HPOFS Plugin", "vib.unknown = {0}", vib.unknown);
+            AaruConsole.DebugWriteLine("HPOFS Plugin", "vib.unknown2 = {0}", vib.unknown2);
+
             AaruConsole.DebugWriteLine("HPOFS Plugin", "vib.unknown3 is empty? = {0}",
-                                      ArrayHelpers.ArrayIsNullOrEmpty(vib.unknown3));
+                                       ArrayHelpers.ArrayIsNullOrEmpty(vib.unknown3));
+
             AaruConsole.DebugWriteLine("HPOFS Plugin", "vib.unknown4 = \"{0}\"",
-                                      StringHandlers.SpacePaddedToString(vib.unknown4));
+                                       StringHandlers.SpacePaddedToString(vib.unknown4));
+
             AaruConsole.DebugWriteLine("HPOFS Plugin", "vib.owner = \"{0}\"",
-                                      StringHandlers.SpacePaddedToString(vib.owner));
+                                       StringHandlers.SpacePaddedToString(vib.owner));
+
             AaruConsole.DebugWriteLine("HPOFS Plugin", "vib.unknown5 = \"{0}\"",
-                                      StringHandlers.SpacePaddedToString(vib.unknown5));
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "vib.unknown6 = {0}",    vib.unknown6);
+                                       StringHandlers.SpacePaddedToString(vib.unknown5));
+
+            AaruConsole.DebugWriteLine("HPOFS Plugin", "vib.unknown6 = {0}", vib.unknown6);
             AaruConsole.DebugWriteLine("HPOFS Plugin", "vib.percentFull = {0}", vib.percentFull);
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "vib.unknown7 = {0}",    vib.unknown7);
+            AaruConsole.DebugWriteLine("HPOFS Plugin", "vib.unknown7 = {0}", vib.unknown7);
+
             AaruConsole.DebugWriteLine("HPOFS Plugin", "vib.filler is empty? = {0}",
-                                      ArrayHelpers.ArrayIsNullOrEmpty(vib.filler));
+                                       ArrayHelpers.ArrayIsNullOrEmpty(vib.filler));
 
             sb.AppendLine("High Performance Optical File System");
             sb.AppendFormat("OEM name: {0}", StringHandlers.SpacePaddedToString(bpb.oem_name)).AppendLine();
@@ -167,30 +198,33 @@ namespace Aaru.Filesystems
             sb.AppendFormat("{0} sectors on volume ({1} bytes)", mib.sectors, mib.sectors * bpb.bps).AppendLine();
             sb.AppendFormat("BIOS Drive Number: 0x{0:X2}", bpb.drive_no).AppendLine();
             sb.AppendFormat("Serial number: 0x{0:X8}", mib.serial).AppendLine();
-            sb.AppendFormat("Volume label: {0}", StringHandlers.SpacePaddedToString(mib.volumeLabel, Encoding))
-              .AppendLine();
-            sb.AppendFormat("Volume comment: {0}", StringHandlers.SpacePaddedToString(mib.comment, Encoding))
-              .AppendLine();
+
+            sb.AppendFormat("Volume label: {0}", StringHandlers.SpacePaddedToString(mib.volumeLabel, Encoding)).
+               AppendLine();
+
+            sb.AppendFormat("Volume comment: {0}", StringHandlers.SpacePaddedToString(mib.comment, Encoding)).
+               AppendLine();
+
             sb.AppendFormat("Volume owner: {0}", StringHandlers.SpacePaddedToString(vib.owner, Encoding)).AppendLine();
-            sb.AppendFormat("Volume created on {0}", DateHandlers.DosToDateTime(mib.creationDate, mib.creationTime))
-              .AppendLine();
+
+            sb.AppendFormat("Volume created on {0}", DateHandlers.DosToDateTime(mib.creationDate, mib.creationTime)).
+               AppendLine();
+
             sb.AppendFormat("Volume uses {0} codepage {1}", mib.codepageType > 0 && mib.codepageType < 3
                                                                 ? mib.codepageType == 2
                                                                       ? "EBCDIC"
-                                                                      : "ASCII"
-                                                                : "Unknown", mib.codepage).AppendLine();
+                                                                      : "ASCII" : "Unknown", mib.codepage).AppendLine();
+
             sb.AppendFormat("RPS level: {0}", mib.rps).AppendLine();
             sb.AppendFormat("Filesystem version: {0}.{1}", mib.major, mib.minor).AppendLine();
             sb.AppendFormat("Volume can be filled up to {0}%", vib.percentFull).AppendLine();
 
             XmlFsType = new FileSystemType
             {
-                Clusters               = mib.sectors / bpb.spc,
-                ClusterSize            = (uint)(bpb.bps * bpb.spc),
+                Clusters               = mib.sectors / bpb.spc, ClusterSize = (uint)(bpb.bps * bpb.spc),
                 CreationDate           = DateHandlers.DosToDateTime(mib.creationDate, mib.creationTime),
                 CreationDateSpecified  = true,
-                DataPreparerIdentifier = StringHandlers.SpacePaddedToString(vib.owner, Encoding),
-                Type                   = "HPOFS",
+                DataPreparerIdentifier = StringHandlers.SpacePaddedToString(vib.owner, Encoding), Type = "HPOFS",
                 VolumeName             = StringHandlers.SpacePaddedToString(mib.volumeLabel, Encoding),
                 VolumeSerial           = $"{mib.serial:X8}",
                 SystemIdentifier       = StringHandlers.SpacePaddedToString(bpb.oem_name)
@@ -199,9 +233,7 @@ namespace Aaru.Filesystems
             information = sb.ToString();
         }
 
-        /// <summary>
-        ///     BIOS Parameter Block, at sector 0, little-endian
-        /// </summary>
+        /// <summary>BIOS Parameter Block, at sector 0, little-endian</summary>
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct BiosParameterBlock
         {
@@ -260,9 +292,7 @@ namespace Aaru.Filesystems
             public readonly ushort signature2;
         }
 
-        /// <summary>
-        ///     Media Information Block, at sector 13, big-endian
-        /// </summary>
+        /// <summary>Media Information Block, at sector 13, big-endian</summary>
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct MediaInformationBlock
         {
@@ -281,9 +311,7 @@ namespace Aaru.Filesystems
             public readonly ushort creationDate;
             /// <summary>Volume creation time, DOS format</summary>
             public readonly ushort creationTime;
-            /// <summary>
-            ///     Codepage type: 1 ASCII, 2 EBCDIC
-            /// </summary>
+            /// <summary>Codepage type: 1 ASCII, 2 EBCDIC</summary>
             public readonly ushort codepageType;
             /// <summary>Codepage</summary>
             public readonly ushort codepage;
@@ -314,9 +342,7 @@ namespace Aaru.Filesystems
             public readonly byte[] filler;
         }
 
-        /// <summary>
-        ///     Volume Information Block, at sector 14, big-endian
-        /// </summary>
+        /// <summary>Volume Information Block, at sector 14, big-endian</summary>
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct VolumeInformationBlock
         {
diff --git a/Aaru.Filesystems/ISO9660/Consts/Amiga.cs b/Aaru.Filesystems/ISO9660/Consts/Amiga.cs
index 4dd6c279b..21a145937 100644
--- a/Aaru.Filesystems/ISO9660/Consts/Amiga.cs
+++ b/Aaru.Filesystems/ISO9660/Consts/Amiga.cs
@@ -42,35 +42,23 @@ namespace Aaru.Filesystems.ISO9660
         [Flags]
         enum AmigaFlags : byte
         {
-            Protection       = 1 << 0,
-            Comment          = 1 << 1,
-            CommentContinues = 1 << 2
+            Protection = 1 << 0, Comment = 1 << 1, CommentContinues = 1 << 2
         }
 
         [Flags]
         enum AmigaMultiuser : byte
         {
-            GroupDelete = 1 << 0,
-            GroupExec   = 1 << 1,
-            GroupWrite  = 1 << 2,
-            GroupRead   = 1 << 3,
-            OtherDelete = 1 << 4,
-            OtherExec   = 1 << 5,
-            OtherWrite  = 1 << 6,
-            OtherRead   = 1 << 7
+            GroupDelete = 1 << 0, GroupExec   = 1 << 1, GroupWrite = 1 << 2,
+            GroupRead   = 1 << 3, OtherDelete = 1 << 4, OtherExec  = 1 << 5,
+            OtherWrite  = 1 << 6, OtherRead   = 1 << 7
         }
 
         [Flags]
         enum AmigaAttributes : byte
         {
-            OwnerDelete = 1 << 0,
-            OwnerExec   = 1 << 1,
-            OwnerWrite  = 1 << 2,
-            OwnerRead   = 1 << 3,
-            Archive     = 1 << 4,
-            Reentrant   = 1 << 5,
-            Script      = 1 << 6,
-            Reserved    = 1 << 7
+            OwnerDelete = 1 << 0, OwnerExec = 1 << 1, OwnerWrite = 1 << 2,
+            OwnerRead   = 1 << 3, Archive   = 1 << 4, Reentrant  = 1 << 5,
+            Script      = 1 << 6, Reserved  = 1 << 7
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/ISO9660/Consts/Apple.cs b/Aaru.Filesystems/ISO9660/Consts/Apple.cs
index 2028f2953..dedb6737b 100644
--- a/Aaru.Filesystems/ISO9660/Consts/Apple.cs
+++ b/Aaru.Filesystems/ISO9660/Consts/Apple.cs
@@ -40,18 +40,13 @@ namespace Aaru.Filesystems.ISO9660
 
         enum AppleId : byte
         {
-            ProDOS = 1,
-            HFS    = 2
+            ProDOS = 1, HFS = 2
         }
 
         enum AppleOldId : byte
         {
-            ProDOS                = 1,
-            TypeCreator           = 2,
-            TypeCreatorBundle     = 3,
-            TypeCreatorIcon       = 4,
-            TypeCreatorIconBundle = 5,
-            HFS                   = 6
+            ProDOS          = 1, TypeCreator           = 2, TypeCreatorBundle = 3,
+            TypeCreatorIcon = 4, TypeCreatorIconBundle = 5, HFS               = 6
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/ISO9660/Consts/CDi.cs b/Aaru.Filesystems/ISO9660/Consts/CDi.cs
index 376c0f69d..2c2e43ed8 100644
--- a/Aaru.Filesystems/ISO9660/Consts/CDi.cs
+++ b/Aaru.Filesystems/ISO9660/Consts/CDi.cs
@@ -58,14 +58,9 @@ namespace Aaru.Filesystems.ISO9660
         [Flags]
         enum CdiAttributes : ushort
         {
-            OwnerRead    = 1 << 0,
-            OwnerExecute = 1 << 2,
-            GroupRead    = 1 << 4,
-            GroupExecute = 1 << 6,
-            OtherRead    = 1 << 8,
-            OtherExecute = 1 << 10,
-            DigitalAudio = 1 << 14,
-            Directory    = 1 << 15
+            OwnerRead    = 1 << 0, OwnerExecute = 1 << 2, GroupRead    = 1 << 4,
+            GroupExecute = 1 << 6, OtherRead    = 1 << 8, OtherExecute = 1 << 10,
+            DigitalAudio = 1 << 14, Directory   = 1 << 15
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/ISO9660/Consts/ElTorito.cs b/Aaru.Filesystems/ISO9660/Consts/ElTorito.cs
index a031c1430..3f98ec604 100644
--- a/Aaru.Filesystems/ISO9660/Consts/ElTorito.cs
+++ b/Aaru.Filesystems/ISO9660/Consts/ElTorito.cs
@@ -42,37 +42,27 @@ namespace Aaru.Filesystems.ISO9660
 
         enum ElToritoIndicator : byte
         {
-            Header      = 1,
-            Extension   = 0x44,
-            Bootable    = 0x88,
-            MoreHeaders = 0x90,
-            LastHeader  = 0x91
+            Header      = 1, Extension     = 0x44, Bootable = 0x88,
+            MoreHeaders = 0x90, LastHeader = 0x91
         }
 
         enum ElToritoPlatform : byte
         {
-            x86       = 0,
-            PowerPC   = 1,
-            Macintosh = 2,
-            EFI       = 0xef
+            x86 = 0, PowerPC = 1, Macintosh = 2,
+            EFI = 0xef
         }
 
         enum ElToritoEmulation : byte
         {
-            None  = 0,
-            Md2hd = 1,
-            Mf2hd = 2,
-            Mf2ed = 3,
-            Hdd   = 4
+            None  = 0, Md2hd = 1, Mf2hd = 2,
+            Mf2ed = 3, Hdd   = 4
         }
 
         [Flags]
         enum ElToritoFlags : byte
         {
-            Reserved  = 0x10,
-            Continued = 0x20,
-            ATAPI     = 0x40,
-            SCSI      = 0x08
+            Reserved = 0x10, Continued = 0x20, ATAPI = 0x40,
+            SCSI     = 0x08
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/ISO9660/Consts/ISO.cs b/Aaru.Filesystems/ISO9660/Consts/ISO.cs
index 64412dde6..13220192a 100644
--- a/Aaru.Filesystems/ISO9660/Consts/ISO.cs
+++ b/Aaru.Filesystems/ISO9660/Consts/ISO.cs
@@ -42,40 +42,27 @@ namespace Aaru.Filesystems.ISO9660
         [Flags]
         enum FileFlags : byte
         {
-            Hidden      = 0x01,
-            Directory   = 0x02,
-            Associated  = 0x04,
-            Record      = 0x08,
-            Protected   = 0x10,
-            MultiExtent = 0x80
+            Hidden = 0x01, Directory = 0x02, Associated  = 0x04,
+            Record = 0x08, Protected = 0x10, MultiExtent = 0x80
         }
 
         [Flags]
         enum Permissions : ushort
         {
-            SystemRead    = 0x01,
-            SystemExecute = 0x04,
-            OwnerRead     = 0x10,
-            OwnerExecute  = 0x40,
-            GroupRead     = 0x100,
-            GroupExecute  = 0x400,
-            OtherRead     = 0x1000,
-            OtherExecute  = 0x4000
+            SystemRead   = 0x01, SystemExecute  = 0x04, OwnerRead     = 0x10,
+            OwnerExecute = 0x40, GroupRead      = 0x100, GroupExecute = 0x400,
+            OtherRead    = 0x1000, OtherExecute = 0x4000
         }
 
         enum RecordFormat : byte
         {
-            Unspecified             = 0,
-            FixedLength             = 1,
-            VariableLength          = 2,
+            Unspecified             = 0, FixedLength = 1, VariableLength = 2,
             VariableLengthAlternate = 3
         }
 
         enum RecordAttribute : byte
         {
-            LFCR             = 0,
-            ISO1539          = 1,
-            ControlContained = 2
+            LFCR = 0, ISO1539 = 1, ControlContained = 2
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/ISO9660/Consts/Internal.cs b/Aaru.Filesystems/ISO9660/Consts/Internal.cs
index 1693cf434..49b0a48cf 100644
--- a/Aaru.Filesystems/ISO9660/Consts/Internal.cs
+++ b/Aaru.Filesystems/ISO9660/Consts/Internal.cs
@@ -42,11 +42,8 @@ namespace Aaru.Filesystems.ISO9660
 
         enum Namespace
         {
-            Normal,
-            Vms,
-            Joliet,
-            Rrip,
-            Romeo
+            Normal, Vms, Joliet,
+            Rrip, Romeo
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/ISO9660/Consts/RRIP.cs b/Aaru.Filesystems/ISO9660/Consts/RRIP.cs
index 1efe08461..91f102e60 100644
--- a/Aaru.Filesystems/ISO9660/Consts/RRIP.cs
+++ b/Aaru.Filesystems/ISO9660/Consts/RRIP.cs
@@ -51,25 +51,13 @@ namespace Aaru.Filesystems.ISO9660
         [Flags]
         enum PosixMode : uint
         {
-            OwnerRead    = 0x0100,
-            OwnerWrite   = 0x0080,
-            OwnerExecute = 0x0040,
-            GroupRead    = 0x0020,
-            GroupWrite   = 0x0010,
-            GroupExecute = 0x0008,
-            OtherRead    = 0x0004,
-            OtherWrite   = 0x0002,
-            OtherExecute = 0x0001,
-            SetUID       = 0x0800,
-            SetGid       = 0x0400,
-            IsVTX        = 0x0200,
-            Socket       = 0xC000,
-            Symlink      = 0xA000,
-            Regular      = 0x8000,
-            Block        = 0x6000,
-            Character    = 0x2000,
-            Directory    = 0x4000,
-            Pipe         = 0x1000
+            OwnerRead = 0x0100, OwnerWrite = 0x0080, OwnerExecute = 0x0040,
+            GroupRead = 0x0020, GroupWrite = 0x0010, GroupExecute = 0x0008,
+            OtherRead = 0x0004, OtherWrite = 0x0002, OtherExecute = 0x0001,
+            SetUID    = 0x0800, SetGid     = 0x0400, IsVTX        = 0x0200,
+            Socket    = 0xC000, Symlink    = 0xA000, Regular      = 0x8000,
+            Block     = 0x6000, Character  = 0x2000, Directory    = 0x4000,
+            Pipe      = 0x1000
         }
 
         [Flags]
@@ -81,34 +69,23 @@ namespace Aaru.Filesystems.ISO9660
         [Flags]
         enum SymlinkComponentFlags : byte
         {
-            Continue    = 1,
-            Current     = 2,
-            Parent      = 4,
-            Root        = 8,
-            Mountpoint  = 16,
-            Networkname = 32
+            Continue = 1, Current    = 2, Parent       = 4,
+            Root     = 8, Mountpoint = 16, Networkname = 32
         }
 
         [Flags]
         enum AlternateNameFlags : byte
         {
-            Continue    = 1,
-            Current     = 2,
-            Parent      = 4,
+            Continue    = 1, Current = 2, Parent = 4,
             Networkname = 32
         }
 
         [Flags]
         enum TimestampFlags : byte
         {
-            Creation        = 1 << 0,
-            Modification    = 1 << 1,
-            Access          = 1 << 2,
-            AttributeChange = 1 << 3,
-            Backup          = 1 << 4,
-            Expiration      = 1 << 5,
-            Effective       = 1 << 6,
-            LongFormat      = 1 << 7
+            Creation        = 1 << 0, Modification = 1 << 1, Access     = 1 << 2,
+            AttributeChange = 1 << 3, Backup       = 1 << 4, Expiration = 1 << 5,
+            Effective       = 1 << 6, LongFormat   = 1 << 7
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/ISO9660/Consts/XA.cs b/Aaru.Filesystems/ISO9660/Consts/XA.cs
index e1557f691..d1abeb79a 100644
--- a/Aaru.Filesystems/ISO9660/Consts/XA.cs
+++ b/Aaru.Filesystems/ISO9660/Consts/XA.cs
@@ -42,17 +42,10 @@ namespace Aaru.Filesystems.ISO9660
         [Flags]
         enum XaAttributes : ushort
         {
-            SystemRead    = 0x01,
-            SystemExecute = 0x04,
-            OwnerRead     = 0x10,
-            OwnerExecute  = 0x40,
-            GroupRead     = 0x100,
-            GroupExecute  = 0x400,
-            Mode2Form1    = 0x800,
-            Mode2Form2    = 0x1000,
-            Interleaved   = 0x2000,
-            Cdda          = 0x4000,
-            Directory     = 0x8000
+            SystemRead   = 0x01, SystemExecute = 0x04, OwnerRead     = 0x10,
+            OwnerExecute = 0x40, GroupRead     = 0x100, GroupExecute = 0x400,
+            Mode2Form1   = 0x800, Mode2Form2   = 0x1000, Interleaved = 0x2000,
+            Cdda         = 0x4000, Directory   = 0x8000
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/ISO9660/Date.cs b/Aaru.Filesystems/ISO9660/Date.cs
index b766fbf86..11f263d84 100644
--- a/Aaru.Filesystems/ISO9660/Date.cs
+++ b/Aaru.Filesystems/ISO9660/Date.cs
@@ -52,8 +52,8 @@ namespace Aaru.Filesystems.ISO9660
         {
             try
             {
-                DateTime date = new DateTime(timestamp.Years + 1900, timestamp.Month, timestamp.Day, timestamp.Hour,
-                                             timestamp.Minute, timestamp.Second, DateTimeKind.Unspecified);
+                var date = new DateTime(timestamp.Years + 1900, timestamp.Month, timestamp.Day, timestamp.Hour,
+                                        timestamp.Minute, timestamp.Second, DateTimeKind.Unspecified);
 
                 date = date.AddMinutes(timestamp.GmtOffset * 15);
 
@@ -70,8 +70,8 @@ namespace Aaru.Filesystems.ISO9660
         {
             try
             {
-                DateTime date = new DateTime(timestamp.Years + 1900, timestamp.Month, timestamp.Day, timestamp.Hour,
-                                             timestamp.Minute, timestamp.Second, DateTimeKind.Unspecified);
+                var date = new DateTime(timestamp.Years + 1900, timestamp.Month, timestamp.Day, timestamp.Hour,
+                                        timestamp.Minute, timestamp.Second, DateTimeKind.Unspecified);
 
                 return TimeZoneInfo.ConvertTimeToUtc(date, TimeZoneInfo.FindSystemTimeZoneById("GMT"));
             }
diff --git a/Aaru.Filesystems/ISO9660/ISO9660.cs b/Aaru.Filesystems/ISO9660/ISO9660.cs
index be3a7f20c..43c02282b 100644
--- a/Aaru.Filesystems/ISO9660/ISO9660.cs
+++ b/Aaru.Filesystems/ISO9660/ISO9660.cs
@@ -72,17 +72,30 @@ namespace Aaru.Filesystems.ISO9660
                  "If present, use Enhanced Volume Descriptor with specified encoding (overrides namespace)")
             };
 
-        public Dictionary<string, string> Namespaces =>
-            new Dictionary<string, string>
+        public Dictionary<string, string> Namespaces => new Dictionary<string, string>
+        {
             {
-                {"normal", "Primary Volume Descriptor, ignoring ;1 suffixes"},
-                {"vms", "Primary Volume Descriptor, showing version suffixes"},
-                {"joliet", "Joliet Volume Descriptor (default)"},
-                {"rrip", "Rock Ridge"},
-                {"romeo", "Primary Volume Descriptor using the specified encoding codepage"}
-            };
+                "normal", "Primary Volume Descriptor, ignoring ;1 suffixes"
+            },
+            {
+                "vms", "Primary Volume Descriptor, showing version suffixes"
+            },
+            {
+                "joliet", "Joliet Volume Descriptor (default)"
+            },
+            {
+                "rrip", "Rock Ridge"
+            },
+            {
+                "romeo", "Primary Volume Descriptor using the specified encoding codepage"
+            }
+        };
 
-        static Dictionary<string, string> GetDefaultOptions() =>
-            new Dictionary<string, string> {{"debug", false.ToString()}};
+        static Dictionary<string, string> GetDefaultOptions() => new Dictionary<string, string>
+        {
+            {
+                "debug", false.ToString()
+            }
+        };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/ISO9660/Info.cs b/Aaru.Filesystems/ISO9660/Info.cs
index 3697900b2..72ba75dd4 100644
--- a/Aaru.Filesystems/ISO9660/Info.cs
+++ b/Aaru.Filesystems/ISO9660/Info.cs
@@ -49,23 +49,28 @@ namespace Aaru.Filesystems.ISO9660
         public bool Identify(IMediaImage imagePlugin, Partition partition)
         {
             // ISO9660 is designed for 2048 bytes/sector devices
-            if(imagePlugin.Info.SectorSize < 2048) return false;
+            if(imagePlugin.Info.SectorSize < 2048)
+                return false;
 
             // ISO9660 Primary Volume Descriptor starts at sector 16, so that's minimal size.
-            if(partition.End <= 16 + partition.Start) return false;
+            if(partition.End <= 16 + partition.Start)
+                return false;
 
             // Read to Volume Descriptor
             byte[] vdSector = imagePlugin.ReadSector(16 + partition.Start);
 
-            int xaOff                         = 0;
-            if(vdSector.Length == 2336) xaOff = 8;
+            int xaOff = 0;
+
+            if(vdSector.Length == 2336)
+                xaOff = 8;
 
             byte   vdType  = vdSector[0 + xaOff];
             byte[] vdMagic = new byte[5];
             byte[] hsMagic = new byte[5];
 
             // This indicates the end of a volume descriptor. HighSierra here would have 16 so no problem
-            if(vdType == 255) return false;
+            if(vdType == 255)
+                return false;
 
             Array.Copy(vdSector, 0x001 + xaOff, vdMagic, 0, 5);
             Array.Copy(vdSector, 0x009 + xaOff, hsMagic, 0, 5);
@@ -79,13 +84,13 @@ namespace Aaru.Filesystems.ISO9660
         }
 
         public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding    encoding)
+                                   Encoding encoding)
         {
             Encoding    = encoding ?? Encoding.ASCII;
             information = "";
-            StringBuilder isoMetadata = new StringBuilder();
-            byte[]        vdMagic     = new byte[5]; // Volume Descriptor magic "CD001"
-            byte[]        hsMagic     = new byte[5]; // Volume Descriptor magic "CDROM"
+            var    isoMetadata = new StringBuilder();
+            byte[] vdMagic     = new byte[5]; // Volume Descriptor magic "CD001"
+            byte[] hsMagic     = new byte[5]; // Volume Descriptor magic "CDROM"
 
             string bootSpec = "";
 
@@ -97,26 +102,32 @@ namespace Aaru.Filesystems.ISO9660
             ElToritoBootRecord?                torito   = null;
 
             // ISO9660 is designed for 2048 bytes/sector devices
-            if(imagePlugin.Info.SectorSize < 2048) return;
+            if(imagePlugin.Info.SectorSize < 2048)
+                return;
 
             // ISO9660 Primary Volume Descriptor starts at sector 16, so that's minimal size.
-            if(partition.End < 16) return;
+            if(partition.End < 16)
+                return;
 
             ulong counter = 0;
 
             byte[] vdSector = imagePlugin.ReadSector(16 + counter + partition.Start);
             int    xaOff    = vdSector.Length == 2336 ? 8 : 0;
             Array.Copy(vdSector, 0x009 + xaOff, hsMagic, 0, 5);
-            bool highSierraInfo      = Encoding.GetString(hsMagic) == HIGH_SIERRA_MAGIC;
-            int  hsOff               = 0;
-            if(highSierraInfo) hsOff = 8;
-            bool cdiInfo             = false;
-            bool evd                 = false;
-            bool vpd                 = false;
+            bool highSierraInfo = Encoding.GetString(hsMagic) == HIGH_SIERRA_MAGIC;
+            int  hsOff          = 0;
+
+            if(highSierraInfo)
+                hsOff = 8;
+
+            bool cdiInfo = false;
+            bool evd     = false;
+            bool vpd     = false;
 
             while(true)
             {
                 AaruConsole.DebugWriteLine("ISO9660 plugin", "Processing VD loop no. {0}", counter);
+
                 // Seek to Volume Descriptor
                 AaruConsole.DebugWriteLine("ISO9660 plugin", "Reading sector {0}", 16 + counter + partition.Start);
                 byte[] vdSectorTmp = imagePlugin.ReadSector(16 + counter + partition.Start);
@@ -128,7 +139,8 @@ namespace Aaru.Filesystems.ISO9660
 
                 if(vdType == 255) // Supposedly we are in the PVD.
                 {
-                    if(counter == 0) return;
+                    if(counter == 0)
+                        return;
 
                     break;
                 }
@@ -136,11 +148,13 @@ namespace Aaru.Filesystems.ISO9660
                 Array.Copy(vdSector, 0x001, vdMagic, 0, 5);
                 Array.Copy(vdSector, 0x009, hsMagic, 0, 5);
 
-                if(Encoding.GetString(vdMagic) != ISO_MAGIC && Encoding.GetString(hsMagic) != HIGH_SIERRA_MAGIC &&
+                if(Encoding.GetString(vdMagic) != ISO_MAGIC         &&
+                   Encoding.GetString(hsMagic) != HIGH_SIERRA_MAGIC &&
                    Encoding.GetString(vdMagic) != CDI_MAGIC
                 ) // Recognized, it is an ISO9660, now check for rest of data.
                 {
-                    if(counter == 0) return;
+                    if(counter == 0)
+                        return;
 
                     break;
                 }
@@ -158,6 +172,7 @@ namespace Aaru.Filesystems.ISO9660
                         if(Encoding.GetString(bvd.Value.system_id).Substring(0, 23) == "EL TORITO SPECIFICATION")
                         {
                             bootSpec = "El Torito";
+
                             torito =
                                 Marshal.ByteArrayToStructureLittleEndian<ElToritoBootRecord>(vdSector, hsOff,
                                                                                              2048 - hsOff);
@@ -169,11 +184,12 @@ namespace Aaru.Filesystems.ISO9660
                     case 1:
                     {
                         if(highSierraInfo)
-                            hsvd = Marshal
-                               .ByteArrayToStructureLittleEndian<HighSierraPrimaryVolumeDescriptor>(vdSector);
+                            hsvd = Marshal.
+                                ByteArrayToStructureLittleEndian<HighSierraPrimaryVolumeDescriptor>(vdSector);
                         else if(cdiInfo)
                             fsvd = Marshal.ByteArrayToStructureBigEndian<FileStructureVolumeDescriptor>(vdSector);
-                        else pvd = Marshal.ByteArrayToStructureLittleEndian<PrimaryVolumeDescriptor>(vdSector);
+                        else
+                            pvd = Marshal.ByteArrayToStructureLittleEndian<PrimaryVolumeDescriptor>(vdSector);
 
                         break;
                     }
@@ -186,14 +202,18 @@ namespace Aaru.Filesystems.ISO9660
                         // Check if this is Joliet
                         if(svd.version == 1)
                         {
-                            if(svd.escape_sequences[0] == '%' && svd.escape_sequences[1] == '/')
-                                if(svd.escape_sequences[2] == '@' || svd.escape_sequences[2] == 'C' ||
-                                   svd.escape_sequences[2] == 'E') jolietvd = svd;
+                            if(svd.escape_sequences[0] == '%' &&
+                               svd.escape_sequences[1] == '/')
+                                if(svd.escape_sequences[2] == '@' ||
+                                   svd.escape_sequences[2] == 'C' ||
+                                   svd.escape_sequences[2] == 'E')
+                                    jolietvd = svd;
                                 else
                                     AaruConsole.WriteLine("ISO9660 plugin",
-                                                         "Found unknown supplementary volume descriptor");
+                                                          "Found unknown supplementary volume descriptor");
                         }
-                        else evd = true;
+                        else
+                            evd = true;
 
                         break;
                     }
@@ -201,6 +221,7 @@ namespace Aaru.Filesystems.ISO9660
                     case 3:
                     {
                         vpd = true;
+
                         break;
                     }
                 }
@@ -209,21 +230,28 @@ namespace Aaru.Filesystems.ISO9660
             }
 
             DecodedVolumeDescriptor decodedVd;
-            DecodedVolumeDescriptor decodedJolietVd = new DecodedVolumeDescriptor();
+            var                     decodedJolietVd = new DecodedVolumeDescriptor();
 
             XmlFsType = new FileSystemType();
 
-            if(pvd == null && hsvd == null && fsvd == null)
+            if(pvd  == null &&
+               hsvd == null &&
+               fsvd == null)
             {
                 information = "ERROR: Could not find primary volume descriptor";
+
                 return;
             }
 
-            if(highSierraInfo) decodedVd = DecodeVolumeDescriptor(hsvd.Value);
-            else if(cdiInfo) decodedVd   = DecodeVolumeDescriptor(fsvd.Value);
-            else decodedVd               = DecodeVolumeDescriptor(pvd.Value);
+            if(highSierraInfo)
+                decodedVd = DecodeVolumeDescriptor(hsvd.Value);
+            else if(cdiInfo)
+                decodedVd = DecodeVolumeDescriptor(fsvd.Value);
+            else
+                decodedVd = DecodeVolumeDescriptor(pvd.Value);
 
-            if(jolietvd != null) decodedJolietVd = DecodeJolietDescriptor(jolietvd.Value);
+            if(jolietvd != null)
+                decodedJolietVd = DecodeJolietDescriptor(jolietvd.Value);
 
             uint rootLocation = 0;
             uint rootSize     = 0;
@@ -231,19 +259,22 @@ namespace Aaru.Filesystems.ISO9660
             // No need to read root on CD-i, as extensions are not supported...
             if(!cdiInfo)
             {
-                rootLocation = highSierraInfo
-                                   ? hsvd.Value.root_directory_record.extent
+                rootLocation = highSierraInfo ? hsvd.Value.root_directory_record.extent
                                    : pvd.Value.root_directory_record.extent;
 
                 if(highSierraInfo)
                 {
                     rootSize = hsvd.Value.root_directory_record.size / hsvd.Value.logical_block_size;
-                    if(hsvd.Value.root_directory_record.size         % hsvd.Value.logical_block_size > 0) rootSize++;
+
+                    if(hsvd.Value.root_directory_record.size % hsvd.Value.logical_block_size > 0)
+                        rootSize++;
                 }
                 else
                 {
                     rootSize = pvd.Value.root_directory_record.size / pvd.Value.logical_block_size;
-                    if(pvd.Value.root_directory_record.size         % pvd.Value.logical_block_size > 0) rootSize++;
+
+                    if(pvd.Value.root_directory_record.size % pvd.Value.logical_block_size > 0)
+                        rootSize++;
                 }
             }
 
@@ -258,13 +289,14 @@ namespace Aaru.Filesystems.ISO9660
             bool                   aaip            = false;
             List<ContinuationArea> contareas       = new List<ContinuationArea>();
             List<byte[]>           refareas        = new List<byte[]>();
-            StringBuilder          suspInformation = new StringBuilder();
+            var                    suspInformation = new StringBuilder();
 
             if(rootLocation + rootSize < imagePlugin.Info.Sectors)
                 rootDir = imagePlugin.ReadSectors(rootLocation, rootSize);
 
             // Walk thru root directory to see system area extensions in use
-            while(rootOff + Marshal.SizeOf<DirectoryRecord>() < rootDir.Length && !cdiInfo)
+            while(rootOff + Marshal.SizeOf<DirectoryRecord>() < rootDir.Length &&
+                  !cdiInfo)
             {
                 DirectoryRecord record =
                     Marshal.ByteArrayToStructureLittleEndian<DirectoryRecord>(rootDir, rootOff,
@@ -274,7 +306,8 @@ namespace Aaru.Filesystems.ISO9660
                 saOff += saOff % 2;
                 int saLen = record.length - saOff;
 
-                if(saLen > 0 && rootOff + saOff + saLen <= rootDir.Length)
+                if(saLen                   > 0 &&
+                   rootOff + saOff + saLen <= rootDir.Length)
                 {
                     byte[] sa = new byte[saLen];
                     Array.Copy(rootDir, rootOff + saOff, sa, 0, saLen);
@@ -287,6 +320,7 @@ namespace Aaru.Filesystems.ISO9660
                         if(Marshal.SizeOf<CdromXa>() + saOff <= saLen)
                         {
                             CdromXa xa = Marshal.ByteArrayToStructureBigEndian<CdromXa>(sa);
+
                             if(xa.signature == XA_MAGIC)
                             {
                                 xaExtensions =  true;
@@ -295,7 +329,8 @@ namespace Aaru.Filesystems.ISO9660
                             }
                         }
 
-                        if(saOff + 2 >= saLen) break;
+                        if(saOff + 2 >= saLen)
+                            break;
 
                         ushort nextSignature = BigEndianBitConverter.ToUInt16(sa, saOff);
 
@@ -306,32 +341,39 @@ namespace Aaru.Filesystems.ISO9660
                                 apple     =  true;
                                 saOff     += sa[saOff + 2];
                                 noneFound =  false;
+
                                 break;
+
                             // Not easy, contains size field
                             case APPLE_MAGIC_OLD:
                                 apple = true;
-                                AppleOldId appleId = (AppleOldId)sa[saOff + 2];
+                                var appleId = (AppleOldId)sa[saOff + 2];
                                 noneFound = false;
 
                                 switch(appleId)
                                 {
                                     case AppleOldId.ProDOS:
                                         saOff += Marshal.SizeOf<AppleProDOSOldSystemUse>();
+
                                         break;
                                     case AppleOldId.TypeCreator:
                                     case AppleOldId.TypeCreatorBundle:
                                         saOff += Marshal.SizeOf<AppleHFSTypeCreatorSystemUse>();
+
                                         break;
                                     case AppleOldId.TypeCreatorIcon:
                                     case AppleOldId.TypeCreatorIconBundle:
                                         saOff += Marshal.SizeOf<AppleHFSIconSystemUse>();
+
                                         break;
                                     case AppleOldId.HFS:
                                         saOff += Marshal.SizeOf<AppleHFSOldSystemUse>();
+
                                         break;
                                 }
 
                                 break;
+
                             // IEEE-P1281 aka SUSP 1.12
                             case SUSP_INDICATOR:
                                 susp      =  true;
@@ -345,20 +387,28 @@ namespace Aaru.Filesystems.ISO9660
                                     switch(nextSignature)
                                     {
                                         case APPLE_MAGIC:
-                                            if(sa[saOff + 3] == 1 && sa[saOff + 2] == 7) apple =  true;
-                                            else apple                                         |= sa[saOff + 3] != 1;
+                                            if(sa[saOff + 3] == 1 &&
+                                               sa[saOff + 2] == 7)
+                                                apple = true;
+                                            else
+                                                apple |= sa[saOff + 3] != 1;
+
                                             break;
                                         case SUSP_CONTINUATION when saOff + sa[saOff + 2] <= saLen:
                                             byte[] ce = new byte[sa[saOff + 2]];
                                             Array.Copy(sa, saOff, ce, 0, ce.Length);
+
                                             ContinuationArea ca =
                                                 Marshal.ByteArrayToStructureBigEndian<ContinuationArea>(ce);
+
                                             contareas.Add(ca);
+
                                             break;
                                         case SUSP_REFERENCE when saOff + sa[saOff + 2] <= saLen:
                                             byte[] er = new byte[sa[saOff + 2]];
                                             Array.Copy(sa, saOff, er, 0, er.Length);
                                             refareas.Add(er);
+
                                             break;
                                     }
 
@@ -374,33 +424,39 @@ namespace Aaru.Filesystems.ISO9660
 
                                     ziso  |= nextSignature == ZISO_MAGIC;
                                     amiga |= nextSignature == AMIGA_MAGIC;
-                                    aaip |= nextSignature == AAIP_MAGIC || nextSignature == AAIP_MAGIC_OLD &&
-                                            sa[saOff + 3]                                == 1              &&
-                                            sa[saOff + 2]                                >= 9;
+
+                                    aaip |= nextSignature == AAIP_MAGIC || (nextSignature == AAIP_MAGIC_OLD &&
+                                                                            sa[saOff + 3] == 1              &&
+                                                                            sa[saOff + 2] >= 9);
 
                                     saOff += sa[saOff + 2];
 
-                                    if(nextSignature == SUSP_TERMINATOR) break;
+                                    if(nextSignature == SUSP_TERMINATOR)
+                                        break;
                                 }
 
                                 break;
                         }
 
-                        if(noneFound) break;
+                        if(noneFound)
+                            break;
                     }
                 }
 
                 rootOff += record.length;
 
-                if(record.length == 0) break;
+                if(record.length == 0)
+                    break;
             }
 
             foreach(ContinuationArea ca in contareas)
             {
                 uint caLen = (ca.ca_length_be + ca.offset_be) /
                              (highSierraInfo ? hsvd.Value.logical_block_size : pvd.Value.logical_block_size);
+
                 if((ca.ca_length_be + ca.offset_be) %
-                   (highSierraInfo ? hsvd.Value.logical_block_size : pvd.Value.logical_block_size) > 0) caLen++;
+                   (highSierraInfo ? hsvd.Value.logical_block_size : pvd.Value.logical_block_size) > 0)
+                    caLen++;
 
                 byte[] caSectors = imagePlugin.ReadSectors(ca.block_be, caLen);
                 byte[] caData    = new byte[ca.ca_length_be];
@@ -415,13 +471,18 @@ namespace Aaru.Filesystems.ISO9660
                     {
                         // Apple never said to include its extensions inside a continuation area, but just in case
                         case APPLE_MAGIC:
-                            if(caData[caOff + 3] == 1 && caData[caOff + 2] == 7) apple =  true;
-                            else apple                                                 |= caData[caOff + 3] != 1;
+                            if(caData[caOff + 3] == 1 &&
+                               caData[caOff + 2] == 7)
+                                apple = true;
+                            else
+                                apple |= caData[caOff + 3] != 1;
+
                             break;
                         case SUSP_REFERENCE when caOff + caData[caOff + 2] <= ca.ca_length_be:
                             byte[] er = new byte[caData[caOff + 2]];
                             Array.Copy(caData, caOff, er, 0, er.Length);
                             refareas.Add(er);
+
                             break;
                     }
 
@@ -433,8 +494,9 @@ namespace Aaru.Filesystems.ISO9660
 
                     ziso  |= nextSignature == ZISO_MAGIC;
                     amiga |= nextSignature == AMIGA_MAGIC;
-                    aaip |= nextSignature == AAIP_MAGIC || nextSignature == AAIP_MAGIC_OLD && caData[caOff + 3] == 1 &&
-                            caData[caOff                                                                   + 2] >= 9;
+
+                    aaip |= nextSignature == AAIP_MAGIC || (nextSignature == AAIP_MAGIC_OLD && caData[caOff + 3] == 1 &&
+                                                            caData[caOff                                    + 2] >= 9);
 
                     caOff += caData[caOff + 2];
                 }
@@ -447,15 +509,17 @@ namespace Aaru.Filesystems.ISO9660
                 suspInformation.AppendLine("----------------------------------------");
 
                 counter = 1;
+
                 foreach(byte[] erb in refareas)
                 {
-                    ReferenceArea er = Marshal.ByteArrayToStructureBigEndian<ReferenceArea>(erb);
-                    string extId =
-                        Encoding.GetString(erb, Marshal.SizeOf<ReferenceArea>(), er.id_len);
-                    string extDes =
-                        Encoding.GetString(erb, Marshal.SizeOf<ReferenceArea>() + er.id_len, er.des_len);
+                    ReferenceArea er    = Marshal.ByteArrayToStructureBigEndian<ReferenceArea>(erb);
+                    string        extId = Encoding.GetString(erb, Marshal.SizeOf<ReferenceArea>(), er.id_len);
+
+                    string extDes = Encoding.GetString(erb, Marshal.SizeOf<ReferenceArea>() + er.id_len, er.des_len);
+
                     string extSrc = Encoding.GetString(erb, Marshal.SizeOf<ReferenceArea>() + er.id_len + er.des_len,
                                                        er.src_len);
+
                     suspInformation.AppendFormat("Extension: {0}", counter).AppendLine();
                     suspInformation.AppendFormat("\tID: {0}, version {1}", extId, er.ext_ver).AppendLine();
                     suspInformation.AppendFormat("\tDescription: {0}", extDes).AppendLine();
@@ -470,23 +534,49 @@ namespace Aaru.Filesystems.ISO9660
             Dreamcast.IPBin? dreamcast   = Dreamcast.DecodeIPBin(ipbinSector);
 
             string fsFormat;
-            if(highSierraInfo) fsFormat = "High Sierra Format";
-            else if(cdiInfo) fsFormat   = "CD-i";
-            else fsFormat               = "ISO9660";
+
+            if(highSierraInfo)
+                fsFormat = "High Sierra Format";
+            else if(cdiInfo)
+                fsFormat = "CD-i";
+            else
+                fsFormat = "ISO9660";
 
             isoMetadata.AppendFormat("{0} file system", fsFormat).AppendLine();
-            if(xaExtensions) isoMetadata.AppendLine("CD-ROM XA extensions present.");
-            if(amiga) isoMetadata.AppendLine("Amiga extensions present.");
-            if(apple) isoMetadata.AppendLine("Apple extensions present.");
-            if(jolietvd != null) isoMetadata.AppendLine("Joliet extensions present.");
-            if(susp) isoMetadata.AppendLine("System Use Sharing Protocol present.");
-            if(rrip) isoMetadata.AppendLine("Rock Ridge Interchange Protocol present.");
-            if(aaip) isoMetadata.AppendLine("Arbitrary Attribute Interchange Protocol present.");
-            if(ziso) isoMetadata.AppendLine("zisofs compression present.");
-            if(evd) isoMetadata.AppendLine("Contains Enhanved Volume Descriptor.");
-            if(vpd) isoMetadata.AppendLine("Contains Volume Partition Descriptor.");
+
+            if(xaExtensions)
+                isoMetadata.AppendLine("CD-ROM XA extensions present.");
+
+            if(amiga)
+                isoMetadata.AppendLine("Amiga extensions present.");
+
+            if(apple)
+                isoMetadata.AppendLine("Apple extensions present.");
+
+            if(jolietvd != null)
+                isoMetadata.AppendLine("Joliet extensions present.");
+
+            if(susp)
+                isoMetadata.AppendLine("System Use Sharing Protocol present.");
+
+            if(rrip)
+                isoMetadata.AppendLine("Rock Ridge Interchange Protocol present.");
+
+            if(aaip)
+                isoMetadata.AppendLine("Arbitrary Attribute Interchange Protocol present.");
+
+            if(ziso)
+                isoMetadata.AppendLine("zisofs compression present.");
+
+            if(evd)
+                isoMetadata.AppendLine("Contains Enhanved Volume Descriptor.");
+
+            if(vpd)
+                isoMetadata.AppendLine("Contains Volume Partition Descriptor.");
+
             if(bvd != null)
                 isoMetadata.AppendFormat("Disc bootable following {0} specifications.", bootSpec).AppendLine();
+
             if(segaCd != null)
             {
                 isoMetadata.AppendLine("This is a SegaCD / MegaCD disc.");
@@ -505,12 +595,15 @@ namespace Aaru.Filesystems.ISO9660
                 isoMetadata.AppendLine(Dreamcast.Prettify(dreamcast));
             }
 
-            isoMetadata.AppendFormat("{0}------------------------------", cdiInfo ? "---------------" : "")
-                       .AppendLine();
-            isoMetadata.AppendFormat("{0}VOLUME DESCRIPTOR INFORMATION:", cdiInfo ? "FILE STRUCTURE " : "")
-                       .AppendLine();
-            isoMetadata.AppendFormat("{0}------------------------------", cdiInfo ? "---------------" : "")
-                       .AppendLine();
+            isoMetadata.AppendFormat("{0}------------------------------", cdiInfo ? "---------------" : "").
+                        AppendLine();
+
+            isoMetadata.AppendFormat("{0}VOLUME DESCRIPTOR INFORMATION:", cdiInfo ? "FILE STRUCTURE " : "").
+                        AppendLine();
+
+            isoMetadata.AppendFormat("{0}------------------------------", cdiInfo ? "---------------" : "").
+                        AppendLine();
+
             isoMetadata.AppendFormat("System identifier: {0}", decodedVd.SystemIdentifier).AppendLine();
             isoMetadata.AppendFormat("Volume identifier: {0}", decodedVd.VolumeIdentifier).AppendLine();
             isoMetadata.AppendFormat("Volume set identifier: {0}", decodedVd.VolumeSetIdentifier).AppendLine();
@@ -518,17 +611,24 @@ namespace Aaru.Filesystems.ISO9660
             isoMetadata.AppendFormat("Data preparer identifier: {0}", decodedVd.DataPreparerIdentifier).AppendLine();
             isoMetadata.AppendFormat("Application identifier: {0}", decodedVd.ApplicationIdentifier).AppendLine();
             isoMetadata.AppendFormat("Volume creation date: {0}", decodedVd.CreationTime).AppendLine();
+
             if(decodedVd.HasModificationTime)
                 isoMetadata.AppendFormat("Volume modification date: {0}", decodedVd.ModificationTime).AppendLine();
-            else isoMetadata.AppendFormat("Volume has not been modified.").AppendLine();
+            else
+                isoMetadata.AppendFormat("Volume has not been modified.").AppendLine();
+
             if(decodedVd.HasExpirationTime)
                 isoMetadata.AppendFormat("Volume expiration date: {0}", decodedVd.ExpirationTime).AppendLine();
-            else isoMetadata.AppendFormat("Volume does not expire.").AppendLine();
+            else
+                isoMetadata.AppendFormat("Volume does not expire.").AppendLine();
+
             if(decodedVd.HasEffectiveTime)
                 isoMetadata.AppendFormat("Volume effective date: {0}", decodedVd.EffectiveTime).AppendLine();
-            else isoMetadata.AppendFormat("Volume has always been effective.").AppendLine();
-            isoMetadata.AppendFormat("Volume has {0} blocks of {1} bytes each", decodedVd.Blocks, decodedVd.BlockSize)
-                       .AppendLine();
+            else
+                isoMetadata.AppendFormat("Volume has always been effective.").AppendLine();
+
+            isoMetadata.AppendFormat("Volume has {0} blocks of {1} bytes each", decodedVd.Blocks, decodedVd.BlockSize).
+                        AppendLine();
 
             if(jolietvd != null)
             {
@@ -537,25 +637,36 @@ namespace Aaru.Filesystems.ISO9660
                 isoMetadata.AppendLine("-------------------------------------");
                 isoMetadata.AppendFormat("System identifier: {0}", decodedJolietVd.SystemIdentifier).AppendLine();
                 isoMetadata.AppendFormat("Volume identifier: {0}", decodedJolietVd.VolumeIdentifier).AppendLine();
-                isoMetadata.AppendFormat("Volume set identifier: {0}", decodedJolietVd.VolumeSetIdentifier)
-                           .AppendLine();
+
+                isoMetadata.AppendFormat("Volume set identifier: {0}", decodedJolietVd.VolumeSetIdentifier).
+                            AppendLine();
+
                 isoMetadata.AppendFormat("Publisher identifier: {0}", decodedJolietVd.PublisherIdentifier).AppendLine();
-                isoMetadata.AppendFormat("Data preparer identifier: {0}", decodedJolietVd.DataPreparerIdentifier)
-                           .AppendLine();
-                isoMetadata.AppendFormat("Application identifier: {0}", decodedJolietVd.ApplicationIdentifier)
-                           .AppendLine();
+
+                isoMetadata.AppendFormat("Data preparer identifier: {0}", decodedJolietVd.DataPreparerIdentifier).
+                            AppendLine();
+
+                isoMetadata.AppendFormat("Application identifier: {0}", decodedJolietVd.ApplicationIdentifier).
+                            AppendLine();
+
                 isoMetadata.AppendFormat("Volume creation date: {0}", decodedJolietVd.CreationTime).AppendLine();
+
                 if(decodedJolietVd.HasModificationTime)
-                    isoMetadata.AppendFormat("Volume modification date: {0}", decodedJolietVd.ModificationTime)
-                               .AppendLine();
-                else isoMetadata.AppendFormat("Volume has not been modified.").AppendLine();
+                    isoMetadata.AppendFormat("Volume modification date: {0}", decodedJolietVd.ModificationTime).
+                                AppendLine();
+                else
+                    isoMetadata.AppendFormat("Volume has not been modified.").AppendLine();
+
                 if(decodedJolietVd.HasExpirationTime)
-                    isoMetadata.AppendFormat("Volume expiration date: {0}", decodedJolietVd.ExpirationTime)
-                               .AppendLine();
-                else isoMetadata.AppendFormat("Volume does not expire.").AppendLine();
+                    isoMetadata.AppendFormat("Volume expiration date: {0}", decodedJolietVd.ExpirationTime).
+                                AppendLine();
+                else
+                    isoMetadata.AppendFormat("Volume does not expire.").AppendLine();
+
                 if(decodedJolietVd.HasEffectiveTime)
                     isoMetadata.AppendFormat("Volume effective date: {0}", decodedJolietVd.EffectiveTime).AppendLine();
-                else isoMetadata.AppendFormat("Volume has always been effective.").AppendLine();
+                else
+                    isoMetadata.AppendFormat("Volume has always been effective.").AppendLine();
             }
 
             if(torito != null)
@@ -564,13 +675,15 @@ namespace Aaru.Filesystems.ISO9660
 
                 int toritoOff = 0;
 
-                if(vdSector[toritoOff] != 1) goto exit_torito;
+                if(vdSector[toritoOff] != 1)
+                    goto exit_torito;
 
                 ElToritoValidationEntry valentry =
                     Marshal.ByteArrayToStructureLittleEndian<ElToritoValidationEntry>(vdSector, toritoOff,
                                                                                       EL_TORITO_ENTRY_SIZE);
 
-                if(valentry.signature != EL_TORITO_MAGIC) goto exit_torito;
+                if(valentry.signature != EL_TORITO_MAGIC)
+                    goto exit_torito;
 
                 toritoOff += EL_TORITO_ENTRY_SIZE;
 
@@ -581,12 +694,14 @@ namespace Aaru.Filesystems.ISO9660
                 initialEntry.boot_type = (ElToritoEmulation)((byte)initialEntry.boot_type & 0xF);
 
                 AaruConsole.DebugWriteLine("DEBUG (ISO9660 plugin)", "initialEntry.load_rba = {0}",
-                                          initialEntry.load_rba);
+                                           initialEntry.load_rba);
+
                 AaruConsole.DebugWriteLine("DEBUG (ISO9660 plugin)", "initialEntry.sector_count = {0}",
-                                          initialEntry.sector_count);
+                                           initialEntry.sector_count);
 
                 byte[] bootImage =
-                    initialEntry.load_rba + partition.Start + initialEntry.sector_count - 1 <= partition.End
+                    (initialEntry.load_rba + partition.Start + initialEntry.sector_count) - 1 <=
+                    partition.End
                         ? imagePlugin.ReadSectors(initialEntry.load_rba + partition.Start, initialEntry.sector_count)
                         : null;
 
@@ -596,60 +711,74 @@ namespace Aaru.Filesystems.ISO9660
 
                 isoMetadata.AppendLine("Initial entry:");
                 isoMetadata.AppendFormat("\tDeveloper ID: {0}", Encoding.GetString(valentry.developer_id)).AppendLine();
+
                 if(initialEntry.bootable == ElToritoIndicator.Bootable)
                 {
                     isoMetadata.AppendFormat("\tBootable on {0}", valentry.platform_id).AppendLine();
+
                     isoMetadata.AppendFormat("\tBootable image starts at sector {0} and runs for {1} sectors",
                                              initialEntry.load_rba, initialEntry.sector_count).AppendLine();
+
                     if(valentry.platform_id == ElToritoPlatform.x86)
                         isoMetadata.AppendFormat("\tBootable image will be loaded at segment {0:X4}h",
-                                                 initialEntry.load_seg == 0 ? 0x7C0 : initialEntry.load_seg)
-                                   .AppendLine();
+                                                 initialEntry.load_seg == 0 ? 0x7C0 : initialEntry.load_seg).
+                                    AppendLine();
                     else
                         isoMetadata.AppendFormat("\tBootable image will be loaded at 0x{0:X8}",
                                                  (uint)initialEntry.load_seg * 10).AppendLine();
+
                     switch(initialEntry.boot_type)
                     {
                         case ElToritoEmulation.None:
                             isoMetadata.AppendLine("\tImage uses no emulation");
+
                             break;
                         case ElToritoEmulation.Md2hd:
                             isoMetadata.AppendLine("\tImage emulates a 5.25\" high-density (MD2HD, 1.2Mb) floppy");
+
                             break;
                         case ElToritoEmulation.Mf2hd:
                             isoMetadata.AppendLine("\tImage emulates a 3.5\" high-density (MF2HD, 1.44Mb) floppy");
+
                             break;
                         case ElToritoEmulation.Mf2ed:
                             isoMetadata.AppendLine("\tImage emulates a 3.5\" extra-density (MF2ED, 2.88Mb) floppy");
+
                             break;
                         default:
                             isoMetadata.AppendFormat("\tImage uses unknown emulation type {0}",
                                                      (byte)initialEntry.boot_type).AppendLine();
+
                             break;
                     }
 
                     isoMetadata.AppendFormat("\tSystem type: 0x{0:X2}", initialEntry.system_type).AppendLine();
+
                     if(bootImage != null)
-                        isoMetadata.AppendFormat("\tBootable image's SHA1: {0}", Sha1Context.Data(bootImage, out _))
-                                   .AppendLine();
+                        isoMetadata.AppendFormat("\tBootable image's SHA1: {0}", Sha1Context.Data(bootImage, out _)).
+                                    AppendLine();
                 }
-                else isoMetadata.AppendLine("\tNot bootable");
+                else
+                    isoMetadata.AppendLine("\tNot bootable");
 
                 toritoOff += EL_TORITO_ENTRY_SIZE;
 
                 const int SECTION_COUNTER = 2;
 
-                while(toritoOff < vdSector.Length && (vdSector[toritoOff] == (byte)ElToritoIndicator.Header ||
-                                                      vdSector[toritoOff] == (byte)ElToritoIndicator.LastHeader))
+                while(toritoOff < vdSector.Length &&
+                      (vdSector[toritoOff] == (byte)ElToritoIndicator.Header ||
+                       vdSector[toritoOff] == (byte)ElToritoIndicator.LastHeader))
                 {
                     ElToritoSectionHeaderEntry sectionHeader =
                         Marshal.ByteArrayToStructureLittleEndian<ElToritoSectionHeaderEntry>(vdSector, toritoOff,
                                                                                              EL_TORITO_ENTRY_SIZE);
+
                     toritoOff += EL_TORITO_ENTRY_SIZE;
 
                     isoMetadata.AppendFormat("Boot section {0}:", SECTION_COUNTER);
-                    isoMetadata.AppendFormat("\tSection ID: {0}", Encoding.GetString(sectionHeader.identifier))
-                               .AppendLine();
+
+                    isoMetadata.AppendFormat("\tSection ID: {0}", Encoding.GetString(sectionHeader.identifier)).
+                                AppendLine();
 
                     for(int entryCounter = 1; entryCounter <= sectionHeader.entries && toritoOff < vdSector.Length;
                         entryCounter++)
@@ -657,66 +786,83 @@ namespace Aaru.Filesystems.ISO9660
                         ElToritoSectionEntry sectionEntry =
                             Marshal.ByteArrayToStructureLittleEndian<ElToritoSectionEntry>(vdSector, toritoOff,
                                                                                            EL_TORITO_ENTRY_SIZE);
+
                         toritoOff += EL_TORITO_ENTRY_SIZE;
 
                         isoMetadata.AppendFormat("\tEntry {0}:", entryCounter);
+
                         if(sectionEntry.bootable == ElToritoIndicator.Bootable)
                         {
                             bootImage =
-                                sectionEntry.load_rba + partition.Start + sectionEntry.sector_count - 1 <= partition.End
+                                (sectionEntry.load_rba + partition.Start + sectionEntry.sector_count) - 1 <=
+                                partition.End
                                     ? imagePlugin.ReadSectors(sectionEntry.load_rba + partition.Start,
-                                                              sectionEntry.sector_count)
-                                    : null;
+                                                              sectionEntry.sector_count) : null;
 
                             isoMetadata.AppendFormat("\t\tBootable on {0}", sectionHeader.platform_id).AppendLine();
+
                             isoMetadata.AppendFormat("\t\tBootable image starts at sector {0} and runs for {1} sectors",
                                                      sectionEntry.load_rba, sectionEntry.sector_count).AppendLine();
+
                             if(valentry.platform_id == ElToritoPlatform.x86)
                                 isoMetadata.AppendFormat("\t\tBootable image will be loaded at segment {0:X4}h",
-                                                         sectionEntry.load_seg == 0 ? 0x7C0 : sectionEntry.load_seg)
-                                           .AppendLine();
+                                                         sectionEntry.load_seg == 0 ? 0x7C0 : sectionEntry.load_seg).
+                                            AppendLine();
                             else
                                 isoMetadata.AppendFormat("\t\tBootable image will be loaded at 0x{0:X8}",
                                                          (uint)sectionEntry.load_seg * 10).AppendLine();
+
                             switch((ElToritoEmulation)((byte)sectionEntry.boot_type & 0xF))
                             {
                                 case ElToritoEmulation.None:
                                     isoMetadata.AppendLine("\t\tImage uses no emulation");
+
                                     break;
                                 case ElToritoEmulation.Md2hd:
-                                    isoMetadata
-                                       .AppendLine("\t\tImage emulates a 5.25\" high-density (MD2HD, 1.2Mb) floppy");
+                                    isoMetadata.
+                                        AppendLine("\t\tImage emulates a 5.25\" high-density (MD2HD, 1.2Mb) floppy");
+
                                     break;
                                 case ElToritoEmulation.Mf2hd:
-                                    isoMetadata
-                                       .AppendLine("\t\tImage emulates a 3.5\" high-density (MF2HD, 1.44Mb) floppy");
+                                    isoMetadata.
+                                        AppendLine("\t\tImage emulates a 3.5\" high-density (MF2HD, 1.44Mb) floppy");
+
                                     break;
                                 case ElToritoEmulation.Mf2ed:
-                                    isoMetadata
-                                       .AppendLine("\t\tImage emulates a 3.5\" extra-density (MF2ED, 2.88Mb) floppy");
+                                    isoMetadata.
+                                        AppendLine("\t\tImage emulates a 3.5\" extra-density (MF2ED, 2.88Mb) floppy");
+
                                     break;
                                 default:
                                     isoMetadata.AppendFormat("\t\tImage uses unknown emulation type {0}",
                                                              (byte)initialEntry.boot_type).AppendLine();
+
                                     break;
                             }
 
                             isoMetadata.AppendFormat("\t\tSelection criteria type: {0}",
                                                      sectionEntry.selection_criteria_type).AppendLine();
-                            isoMetadata.AppendFormat("\t\tSystem type: 0x{0:X2}", sectionEntry.system_type)
-                                       .AppendLine();
+
+                            isoMetadata.AppendFormat("\t\tSystem type: 0x{0:X2}", sectionEntry.system_type).
+                                        AppendLine();
+
                             if(bootImage != null)
                                 isoMetadata.AppendFormat("\t\tBootable image's SHA1: {0}",
                                                          Sha1Context.Data(bootImage, out _)).AppendLine();
                         }
-                        else isoMetadata.AppendLine("\t\tNot bootable");
+                        else
+                            isoMetadata.AppendLine("\t\tNot bootable");
+
+                        var flags = (ElToritoFlags)((byte)sectionEntry.boot_type & 0xF0);
 
-                        ElToritoFlags flags = (ElToritoFlags)((byte)sectionEntry.boot_type & 0xF0);
                         if(flags.HasFlag(ElToritoFlags.ATAPI))
                             isoMetadata.AppendLine("\t\tImage contains ATAPI drivers");
-                        if(flags.HasFlag(ElToritoFlags.SCSI)) isoMetadata.AppendLine("\t\tImage contains SCSI drivers");
 
-                        if(!flags.HasFlag(ElToritoFlags.Continued)) continue;
+                        if(flags.HasFlag(ElToritoFlags.SCSI))
+                            isoMetadata.AppendLine("\t\tImage contains SCSI drivers");
+
+                        if(!flags.HasFlag(ElToritoFlags.Continued))
+                            continue;
 
                         while(toritoOff < vdSector.Length)
                         {
@@ -724,18 +870,23 @@ namespace Aaru.Filesystems.ISO9660
                                 Marshal.ByteArrayToStructureLittleEndian<ElToritoSectionEntryExtension>(vdSector,
                                                                                                         toritoOff,
                                                                                                         EL_TORITO_ENTRY_SIZE);
+
                             toritoOff += EL_TORITO_ENTRY_SIZE;
 
-                            if(!sectionExtension.extension_flags.HasFlag(ElToritoFlags.Continued)) break;
+                            if(!sectionExtension.extension_flags.HasFlag(ElToritoFlags.Continued))
+                                break;
                         }
                     }
 
-                    if(sectionHeader.header_id == ElToritoIndicator.LastHeader) break;
+                    if(sectionHeader.header_id == ElToritoIndicator.LastHeader)
+                        break;
                 }
             }
 
             exit_torito:
-            if(refareas.Count > 0) isoMetadata.Append(suspInformation);
+
+            if(refareas.Count > 0)
+                isoMetadata.Append(suspInformation);
 
             XmlFsType.Type = fsFormat;
 
@@ -747,24 +898,21 @@ namespace Aaru.Filesystems.ISO9660
                    decodedVd.SystemIdentifier.Length > decodedJolietVd.SystemIdentifier.Length)
                     XmlFsType.SystemIdentifier = decodedVd.SystemIdentifier;
                 else
-                    XmlFsType.SystemIdentifier = string.IsNullOrEmpty(decodedJolietVd.SystemIdentifier)
-                                                     ? null
+                    XmlFsType.SystemIdentifier = string.IsNullOrEmpty(decodedJolietVd.SystemIdentifier) ? null
                                                      : decodedJolietVd.SystemIdentifier;
 
-                if(string.IsNullOrEmpty(decodedJolietVd.VolumeSetIdentifier) || decodedVd.VolumeSetIdentifier.Length >
-                   decodedJolietVd.VolumeSetIdentifier.Length)
+                if(string.IsNullOrEmpty(decodedJolietVd.VolumeSetIdentifier) ||
+                   decodedVd.VolumeSetIdentifier.Length > decodedJolietVd.VolumeSetIdentifier.Length)
                     XmlFsType.VolumeSetIdentifier = decodedVd.VolumeSetIdentifier;
                 else
-                    XmlFsType.VolumeSetIdentifier = string.IsNullOrEmpty(decodedJolietVd.VolumeSetIdentifier)
-                                                        ? null
+                    XmlFsType.VolumeSetIdentifier = string.IsNullOrEmpty(decodedJolietVd.VolumeSetIdentifier) ? null
                                                         : decodedJolietVd.VolumeSetIdentifier;
 
-                if(string.IsNullOrEmpty(decodedJolietVd.PublisherIdentifier) || decodedVd.PublisherIdentifier.Length >
-                   decodedJolietVd.PublisherIdentifier.Length)
+                if(string.IsNullOrEmpty(decodedJolietVd.PublisherIdentifier) ||
+                   decodedVd.PublisherIdentifier.Length > decodedJolietVd.PublisherIdentifier.Length)
                     XmlFsType.PublisherIdentifier = decodedVd.PublisherIdentifier;
                 else
-                    XmlFsType.PublisherIdentifier = string.IsNullOrEmpty(decodedJolietVd.PublisherIdentifier)
-                                                        ? null
+                    XmlFsType.PublisherIdentifier = string.IsNullOrEmpty(decodedJolietVd.PublisherIdentifier) ? null
                                                         : decodedJolietVd.PublisherIdentifier;
 
                 if(string.IsNullOrEmpty(decodedJolietVd.DataPreparerIdentifier) ||
@@ -772,19 +920,18 @@ namespace Aaru.Filesystems.ISO9660
                     XmlFsType.DataPreparerIdentifier = decodedVd.DataPreparerIdentifier;
                 else
                     XmlFsType.DataPreparerIdentifier = string.IsNullOrEmpty(decodedJolietVd.DataPreparerIdentifier)
-                                                           ? null
-                                                           : decodedJolietVd.DataPreparerIdentifier;
+                                                           ? null : decodedJolietVd.DataPreparerIdentifier;
 
                 if(string.IsNullOrEmpty(decodedJolietVd.ApplicationIdentifier) ||
                    decodedVd.ApplicationIdentifier.Length > decodedJolietVd.ApplicationIdentifier.Length)
                     XmlFsType.ApplicationIdentifier = decodedVd.ApplicationIdentifier;
                 else
-                    XmlFsType.ApplicationIdentifier = string.IsNullOrEmpty(decodedJolietVd.ApplicationIdentifier)
-                                                          ? null
+                    XmlFsType.ApplicationIdentifier = string.IsNullOrEmpty(decodedJolietVd.ApplicationIdentifier) ? null
                                                           : decodedJolietVd.ApplicationIdentifier;
 
                 XmlFsType.CreationDate          = decodedJolietVd.CreationTime;
                 XmlFsType.CreationDateSpecified = true;
+
                 if(decodedJolietVd.HasModificationTime)
                 {
                     XmlFsType.ModificationDate          = decodedJolietVd.ModificationTime;
@@ -813,6 +960,7 @@ namespace Aaru.Filesystems.ISO9660
                 XmlFsType.ApplicationIdentifier  = decodedVd.ApplicationIdentifier;
                 XmlFsType.CreationDate           = decodedVd.CreationTime;
                 XmlFsType.CreationDateSpecified  = true;
+
                 if(decodedVd.HasModificationTime)
                 {
                     XmlFsType.ModificationDate          = decodedVd.ModificationTime;
diff --git a/Aaru.Filesystems/ISO9660/Mode2.cs b/Aaru.Filesystems/ISO9660/Mode2.cs
index eec0ceaa0..422d3739f 100644
--- a/Aaru.Filesystems/ISO9660/Mode2.cs
+++ b/Aaru.Filesystems/ISO9660/Mode2.cs
@@ -39,7 +39,7 @@ namespace Aaru.Filesystems.ISO9660
     {
         byte[] ReadSectors(ulong start, uint count)
         {
-            MemoryStream ms = new MemoryStream();
+            var ms = new MemoryStream();
 
             for(ulong sector = start; sector < start + count; sector++)
             {
@@ -50,15 +50,25 @@ namespace Aaru.Filesystems.ISO9660
                     case 2048:
                         // Mode 1 sector
                         ms.Write(data, 0, 2048);
+
                         break;
                     case 2352:
                         // Not a data sector
-                        if(data[0] != 0    || data[1] != 0xFF || data[2] != 0xFF || data[3] != 0xFF ||
-                           data[4] != 0xFF ||
-                           data[5] != 0xFF || data[6]  != 0xFF || data[7]  != 0xFF || data[8] != 0xFF ||
-                           data[9] != 0xFF || data[10] != 0xFF || data[11] != 0x00)
+                        if(data[0]  != 0    ||
+                           data[1]  != 0xFF ||
+                           data[2]  != 0xFF ||
+                           data[3]  != 0xFF ||
+                           data[4]  != 0xFF ||
+                           data[5]  != 0xFF ||
+                           data[6]  != 0xFF ||
+                           data[7]  != 0xFF ||
+                           data[8]  != 0xFF ||
+                           data[9]  != 0xFF ||
+                           data[10] != 0xFF ||
+                           data[11] != 0x00)
                         {
                             ms.Write(data, 0, 2352);
+
                             break;
                         }
 
@@ -67,25 +77,32 @@ namespace Aaru.Filesystems.ISO9660
                             // Mode 0 sector
                             case 0:
                                 ms.Write(new byte[2048], 0, 2048);
+
                                 break;
+
                             // Mode 1 sector
                             case 1:
                                 ms.Write(data, 16, 2048);
+
                                 break;
                             case 2:
                                 // Mode 2 form 1 sector
                                 if((data[16] & MODE2_FORM2) != 0)
                                 {
                                     ms.Write(data, 24, 2048);
+
                                     break;
                                 }
 
                                 // Mode 2 form 2 sector
                                 ms.Write(data, 24, 2324);
+
                                 break;
+
                             // Unknown, audio?
                             default:
                                 ms.Write(data, 0, 2352);
+
                                 break;
                         }
 
@@ -95,15 +112,19 @@ namespace Aaru.Filesystems.ISO9660
                         if((data[16] & MODE2_FORM2) == 0)
                         {
                             ms.Write(data, 8, 2048);
+
                             break;
                         }
 
                         // Mode 2 form 2 sector
                         ms.Write(data, 8, 2324);
+
                         break;
+
                     // Should not happen, but, just in case
                     default:
                         ms.Write(data, 0, data.Length);
+
                         break;
                 }
             }
diff --git a/Aaru.Filesystems/ISO9660/PathTable.cs b/Aaru.Filesystems/ISO9660/PathTable.cs
index 7465ae267..33639abba 100644
--- a/Aaru.Filesystems/ISO9660/PathTable.cs
+++ b/Aaru.Filesystems/ISO9660/PathTable.cs
@@ -40,17 +40,20 @@ namespace Aaru.Filesystems.ISO9660
     {
         PathTableEntryInternal[] DecodePathTable(byte[] data)
         {
-            if(data is null) return null;
+            if(data is null)
+                return null;
 
             List<PathTableEntryInternal> table = new List<PathTableEntryInternal>();
 
             int off = 0;
+
             while(off < data.Length)
             {
                 PathTableEntry entry =
                     Marshal.ByteArrayToStructureBigEndian<PathTableEntry>(data, off, Marshal.SizeOf<PathTableEntry>());
 
-                if(entry.name_len == 0) break;
+                if(entry.name_len == 0)
+                    break;
 
                 off += Marshal.SizeOf<PathTableEntry>();
 
@@ -58,15 +61,13 @@ namespace Aaru.Filesystems.ISO9660
 
                 table.Add(new PathTableEntryInternal
                 {
-                    Extent      = entry.start_lbn,
-                    Name        = name,
-                    Parent      = entry.parent_dirno,
-                    XattrLength = entry.xattr_len
+                    Extent = entry.start_lbn, Name = name, Parent = entry.parent_dirno, XattrLength = entry.xattr_len
                 });
 
                 off += entry.name_len;
 
-                if(entry.name_len % 2 != 0) off++;
+                if(entry.name_len % 2 != 0)
+                    off++;
             }
 
             return table.ToArray();
@@ -74,20 +75,23 @@ namespace Aaru.Filesystems.ISO9660
 
         PathTableEntryInternal[] DecodeHighSierraPathTable(byte[] data)
         {
-            if(data is null) return null;
+            if(data is null)
+                return null;
 
             List<PathTableEntryInternal> table = new List<PathTableEntryInternal>();
 
             int off = 0;
+
             while(off < data.Length)
             {
                 HighSierraPathTableEntry entry =
                     Marshal.ByteArrayToStructureBigEndian<HighSierraPathTableEntry>(data, off,
-                                                                                    Marshal
-                                                                                       .SizeOf<HighSierraPathTableEntry
+                                                                                    Marshal.
+                                                                                        SizeOf<HighSierraPathTableEntry
                                                                                         >());
 
-                if(entry.name_len == 0) break;
+                if(entry.name_len == 0)
+                    break;
 
                 off += Marshal.SizeOf<HighSierraPathTableEntry>();
 
@@ -95,15 +99,13 @@ namespace Aaru.Filesystems.ISO9660
 
                 table.Add(new PathTableEntryInternal
                 {
-                    Extent      = entry.start_lbn,
-                    Name        = name,
-                    Parent      = entry.parent_dirno,
-                    XattrLength = entry.xattr_len
+                    Extent = entry.start_lbn, Name = name, Parent = entry.parent_dirno, XattrLength = entry.xattr_len
                 });
 
                 off += entry.name_len;
 
-                if(entry.name_len % 2 != 0) off++;
+                if(entry.name_len % 2 != 0)
+                    off++;
             }
 
             return table.ToArray();
diff --git a/Aaru.Filesystems/ISO9660/Structs/Amiga.cs b/Aaru.Filesystems/ISO9660/Structs/Amiga.cs
index d34c5b79f..0527b1706 100644
--- a/Aaru.Filesystems/ISO9660/Structs/Amiga.cs
+++ b/Aaru.Filesystems/ISO9660/Structs/Amiga.cs
@@ -44,6 +44,7 @@ namespace Aaru.Filesystems.ISO9660
             public readonly byte       length;
             public readonly byte       version;
             public readonly AmigaFlags flags;
+
             // Followed by AmigaProtection if present
             // Followed by length-prefixed string for comment if present
         }
diff --git a/Aaru.Filesystems/ISO9660/Structs/HighSierra.cs b/Aaru.Filesystems/ISO9660/Structs/HighSierra.cs
index ef1e6238c..d027a9955 100644
--- a/Aaru.Filesystems/ISO9660/Structs/HighSierra.cs
+++ b/Aaru.Filesystems/ISO9660/Structs/HighSierra.cs
@@ -41,7 +41,7 @@ namespace Aaru.Filesystems.ISO9660
     {
         static DecodedVolumeDescriptor DecodeVolumeDescriptor(HighSierraPrimaryVolumeDescriptor pvd)
         {
-            DecodedVolumeDescriptor decodedVD = new DecodedVolumeDescriptor
+            var decodedVD = new DecodedVolumeDescriptor
             {
                 SystemIdentifier       = Encoding.ASCII.GetString(pvd.system_id).TrimEnd().Trim('\0'),
                 VolumeIdentifier       = Encoding.ASCII.GetString(pvd.volume_id).TrimEnd().Trim('\0'),
@@ -51,12 +51,14 @@ namespace Aaru.Filesystems.ISO9660
                 ApplicationIdentifier  = Encoding.ASCII.GetString(pvd.application_data).TrimEnd().Trim('\0')
             };
 
-            if(pvd.creation_date[0] == '0' || pvd.creation_date[0] == 0x00) decodedVD.CreationTime = DateTime.MinValue;
+            if(pvd.creation_date[0] == '0' ||
+               pvd.creation_date[0] == 0x00)
+                decodedVD.CreationTime = DateTime.MinValue;
             else
-                decodedVD.CreationTime =
-                    DateHandlers.HighSierraToDateTime(pvd.creation_date);
+                decodedVD.CreationTime = DateHandlers.HighSierraToDateTime(pvd.creation_date);
 
-            if(pvd.modification_date[0] == '0' || pvd.modification_date[0] == 0x00)
+            if(pvd.modification_date[0] == '0' ||
+               pvd.modification_date[0] == 0x00)
                 decodedVD.HasModificationTime = false;
             else
             {
@@ -64,14 +66,18 @@ namespace Aaru.Filesystems.ISO9660
                 decodedVD.ModificationTime    = DateHandlers.HighSierraToDateTime(pvd.modification_date);
             }
 
-            if(pvd.expiration_date[0] == '0' || pvd.expiration_date[0] == 0x00) decodedVD.HasExpirationTime = false;
+            if(pvd.expiration_date[0] == '0' ||
+               pvd.expiration_date[0] == 0x00)
+                decodedVD.HasExpirationTime = false;
             else
             {
                 decodedVD.HasExpirationTime = true;
                 decodedVD.ExpirationTime    = DateHandlers.HighSierraToDateTime(pvd.expiration_date);
             }
 
-            if(pvd.effective_date[0] == '0' || pvd.effective_date[0] == 0x00) decodedVD.HasEffectiveTime = false;
+            if(pvd.effective_date[0] == '0' ||
+               pvd.effective_date[0] == 0x00)
+                decodedVD.HasEffectiveTime = false;
             else
             {
                 decodedVD.HasEffectiveTime = true;
@@ -93,6 +99,7 @@ namespace Aaru.Filesystems.ISO9660
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 5)]
             public readonly byte[] id;
             public readonly byte version;
+
             // Only used in SVDs
             public readonly byte flags;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
@@ -167,6 +174,7 @@ namespace Aaru.Filesystems.ISO9660
             public readonly ushort              volume_sequence_number;
             public readonly ushort              volume_sequence_number_be;
             public readonly byte                name_len;
+
             // Followed by name[name_len] and then system area until length arrives
         }
 
@@ -189,6 +197,7 @@ namespace Aaru.Filesystems.ISO9660
             public readonly byte   xattr_len;
             public readonly byte   name_len;
             public readonly ushort parent_dirno;
+
             // Followed by name[name_len]
         }
     }
diff --git a/Aaru.Filesystems/ISO9660/Structs/ISO.cs b/Aaru.Filesystems/ISO9660/Structs/ISO.cs
index 943cb3e21..c040dafd8 100644
--- a/Aaru.Filesystems/ISO9660/Structs/ISO.cs
+++ b/Aaru.Filesystems/ISO9660/Structs/ISO.cs
@@ -40,7 +40,7 @@ namespace Aaru.Filesystems.ISO9660
     {
         static DecodedVolumeDescriptor DecodeVolumeDescriptor(PrimaryVolumeDescriptor pvd)
         {
-            DecodedVolumeDescriptor decodedVD = new DecodedVolumeDescriptor
+            var decodedVD = new DecodedVolumeDescriptor
             {
                 SystemIdentifier       = StringHandlers.CToString(pvd.system_id).TrimEnd(),
                 VolumeIdentifier       = StringHandlers.CToString(pvd.volume_id).TrimEnd(),
@@ -50,12 +50,14 @@ namespace Aaru.Filesystems.ISO9660
                 ApplicationIdentifier  = StringHandlers.CToString(pvd.application_id).TrimEnd()
             };
 
-            if(pvd.creation_date[0] == '0' || pvd.creation_date[0] == 0x00) decodedVD.CreationTime = DateTime.MinValue;
+            if(pvd.creation_date[0] == '0' ||
+               pvd.creation_date[0] == 0x00)
+                decodedVD.CreationTime = DateTime.MinValue;
             else
-                decodedVD.CreationTime =
-                    DateHandlers.Iso9660ToDateTime(pvd.creation_date);
+                decodedVD.CreationTime = DateHandlers.Iso9660ToDateTime(pvd.creation_date);
 
-            if(pvd.modification_date[0] == '0' || pvd.modification_date[0] == 0x00)
+            if(pvd.modification_date[0] == '0' ||
+               pvd.modification_date[0] == 0x00)
                 decodedVD.HasModificationTime = false;
             else
             {
@@ -63,14 +65,18 @@ namespace Aaru.Filesystems.ISO9660
                 decodedVD.ModificationTime    = DateHandlers.Iso9660ToDateTime(pvd.modification_date);
             }
 
-            if(pvd.expiration_date[0] == '0' || pvd.expiration_date[0] == 0x00) decodedVD.HasExpirationTime = false;
+            if(pvd.expiration_date[0] == '0' ||
+               pvd.expiration_date[0] == 0x00)
+                decodedVD.HasExpirationTime = false;
             else
             {
                 decodedVD.HasExpirationTime = true;
                 decodedVD.ExpirationTime    = DateHandlers.Iso9660ToDateTime(pvd.expiration_date);
             }
 
-            if(pvd.effective_date[0] == '0' || pvd.effective_date[0] == 0x00) decodedVD.HasEffectiveTime = false;
+            if(pvd.effective_date[0] == '0' ||
+               pvd.effective_date[0] == 0x00)
+                decodedVD.HasEffectiveTime = false;
             else
             {
                 decodedVD.HasEffectiveTime = true;
@@ -90,6 +96,7 @@ namespace Aaru.Filesystems.ISO9660
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 5)]
             public readonly byte[] id;
             public readonly byte version;
+
             // Only used in SVDs
             public readonly byte flags;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
@@ -99,6 +106,7 @@ namespace Aaru.Filesystems.ISO9660
             public readonly ulong reserved1;
             public readonly uint  volume_space_size;
             public readonly uint  volume_space_size_be;
+
             // Only used in SVDs
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
             public readonly byte[] escape_sequences;
@@ -197,6 +205,7 @@ namespace Aaru.Filesystems.ISO9660
             public readonly ushort       volume_sequence_number;
             public readonly ushort       volume_sequence_number_be;
             public readonly byte         name_len;
+
             // Followed by name[name_len] and then system area until length arrives
         }
 
@@ -240,6 +249,7 @@ namespace Aaru.Filesystems.ISO9660
             public readonly byte   xattr_len;
             public readonly uint   start_lbn;
             public readonly ushort parent_dirno;
+
             // Followed by name[name_len]
         }
 
diff --git a/Aaru.Filesystems/ISO9660/Structs/Joliet.cs b/Aaru.Filesystems/ISO9660/Structs/Joliet.cs
index 50afaac78..7b36f90eb 100644
--- a/Aaru.Filesystems/ISO9660/Structs/Joliet.cs
+++ b/Aaru.Filesystems/ISO9660/Structs/Joliet.cs
@@ -40,27 +40,30 @@ namespace Aaru.Filesystems.ISO9660
     {
         static DecodedVolumeDescriptor DecodeJolietDescriptor(PrimaryVolumeDescriptor jolietvd)
         {
-            DecodedVolumeDescriptor decodedVD = new DecodedVolumeDescriptor
+            var decodedVD = new DecodedVolumeDescriptor
             {
-                SystemIdentifier =
-                    Encoding.BigEndianUnicode.GetString(jolietvd.system_id).Replace('\u0000', ' ').TrimEnd(),
-                VolumeIdentifier =
-                    Encoding.BigEndianUnicode.GetString(jolietvd.volume_id).Replace('\u0000', ' ').TrimEnd(),
-                VolumeSetIdentifier =
-                    Encoding.BigEndianUnicode.GetString(jolietvd.volume_set_id).Replace('\u0000', ' ').TrimEnd(),
-                PublisherIdentifier =
-                    Encoding.BigEndianUnicode.GetString(jolietvd.publisher_id).Replace('\u0000', ' ').TrimEnd(),
-                DataPreparerIdentifier =
-                    Encoding.BigEndianUnicode.GetString(jolietvd.preparer_id).Replace('\u0000', ' ').TrimEnd(),
-                ApplicationIdentifier = Encoding.BigEndianUnicode.GetString(jolietvd.application_id)
-                                                .Replace('\u0000', ' ').TrimEnd()
+                SystemIdentifier = Encoding.BigEndianUnicode.GetString(jolietvd.system_id).Replace('\u0000', ' ').
+                                            TrimEnd(),
+                VolumeIdentifier = Encoding.BigEndianUnicode.GetString(jolietvd.volume_id).Replace('\u0000', ' ').
+                                            TrimEnd(),
+                VolumeSetIdentifier = Encoding.BigEndianUnicode.GetString(jolietvd.volume_set_id).
+                                               Replace('\u0000', ' ').TrimEnd(),
+                PublisherIdentifier = Encoding.BigEndianUnicode.GetString(jolietvd.publisher_id).Replace('\u0000', ' ').
+                                               TrimEnd(),
+                DataPreparerIdentifier = Encoding.BigEndianUnicode.GetString(jolietvd.preparer_id).
+                                                  Replace('\u0000', ' ').TrimEnd(),
+                ApplicationIdentifier = Encoding.BigEndianUnicode.GetString(jolietvd.application_id).
+                                                 Replace('\u0000', ' ').TrimEnd()
             };
 
-            if(jolietvd.creation_date[0] < 0x31 || jolietvd.creation_date[0] > 0x39)
-                decodedVD.CreationTime  = DateTime.MinValue;
-            else decodedVD.CreationTime = DateHandlers.Iso9660ToDateTime(jolietvd.creation_date);
+            if(jolietvd.creation_date[0] < 0x31 ||
+               jolietvd.creation_date[0] > 0x39)
+                decodedVD.CreationTime = DateTime.MinValue;
+            else
+                decodedVD.CreationTime = DateHandlers.Iso9660ToDateTime(jolietvd.creation_date);
 
-            if(jolietvd.modification_date[0] < 0x31 || jolietvd.modification_date[0] > 0x39)
+            if(jolietvd.modification_date[0] < 0x31 ||
+               jolietvd.modification_date[0] > 0x39)
                 decodedVD.HasModificationTime = false;
             else
             {
@@ -68,7 +71,8 @@ namespace Aaru.Filesystems.ISO9660
                 decodedVD.ModificationTime    = DateHandlers.Iso9660ToDateTime(jolietvd.modification_date);
             }
 
-            if(jolietvd.expiration_date[0] < 0x31 || jolietvd.expiration_date[0] > 0x39)
+            if(jolietvd.expiration_date[0] < 0x31 ||
+               jolietvd.expiration_date[0] > 0x39)
                 decodedVD.HasExpirationTime = false;
             else
             {
@@ -76,7 +80,8 @@ namespace Aaru.Filesystems.ISO9660
                 decodedVD.ExpirationTime    = DateHandlers.Iso9660ToDateTime(jolietvd.expiration_date);
             }
 
-            if(jolietvd.effective_date[0] < 0x31 || jolietvd.effective_date[0] > 0x39)
+            if(jolietvd.effective_date[0] < 0x31 ||
+               jolietvd.effective_date[0] > 0x39)
                 decodedVD.HasEffectiveTime = false;
             else
             {
diff --git a/Aaru.Filesystems/ISO9660/Structs/RRIP.cs b/Aaru.Filesystems/ISO9660/Structs/RRIP.cs
index ebaf74efe..63e7b557e 100644
--- a/Aaru.Filesystems/ISO9660/Structs/RRIP.cs
+++ b/Aaru.Filesystems/ISO9660/Structs/RRIP.cs
@@ -92,6 +92,7 @@ namespace Aaru.Filesystems.ISO9660
             public readonly byte         length;
             public readonly byte         version;
             public readonly SymlinkFlags flags;
+
             // Followed by SymbolicLinkComponent (link to /bar/foo uses at least two of these structs)
         }
 
@@ -100,6 +101,7 @@ namespace Aaru.Filesystems.ISO9660
         {
             public readonly SymlinkComponentFlags flags;
             public readonly byte                  length;
+
             // Followed by component content
         }
 
@@ -110,6 +112,7 @@ namespace Aaru.Filesystems.ISO9660
             public readonly byte               length;
             public readonly byte               version;
             public readonly AlternateNameFlags flags;
+
             // Folowed by name, can be divided in pieces
         }
 
@@ -148,6 +151,7 @@ namespace Aaru.Filesystems.ISO9660
             public readonly byte           length;
             public readonly byte           version;
             public readonly TimestampFlags flags;
+
             // If flags indicate long format, timestamps are 17 bytes, if not, 7 bytes
             // Followed by creation time if present
             // Followed by modification time if present
diff --git a/Aaru.Filesystems/ISO9660/Structs/SUSP.cs b/Aaru.Filesystems/ISO9660/Structs/SUSP.cs
index 753bbfa18..d558eae0b 100644
--- a/Aaru.Filesystems/ISO9660/Structs/SUSP.cs
+++ b/Aaru.Filesystems/ISO9660/Structs/SUSP.cs
@@ -87,6 +87,7 @@ namespace Aaru.Filesystems.ISO9660
             public readonly byte   des_len;
             public readonly byte   src_len;
             public readonly byte   ext_ver;
+
             // Follows extension identifier for id_len bytes
             // Follows extension descriptor for des_len bytes
             // Follows extension source for src_len bytes
diff --git a/Aaru.Filesystems/ISO9660/Super.cs b/Aaru.Filesystems/ISO9660/Super.cs
index 3fcf956bd..40d61573d 100644
--- a/Aaru.Filesystems/ISO9660/Super.cs
+++ b/Aaru.Filesystems/ISO9660/Super.cs
@@ -74,23 +74,23 @@ namespace Aaru.Filesystems.ISO9660
 
             switch(@namespace.ToLowerInvariant())
             {
-                case"normal":
+                case "normal":
                     this.@namespace = Namespace.Normal;
 
                     break;
-                case"vms":
+                case "vms":
                     this.@namespace = Namespace.Vms;
 
                     break;
-                case"joliet":
+                case "joliet":
                     this.@namespace = Namespace.Joliet;
 
                     break;
-                case"rrip":
+                case "rrip":
                     this.@namespace = Namespace.Rrip;
 
                     break;
-                case"romeo":
+                case "romeo":
                     this.@namespace = Namespace.Romeo;
 
                     break;
@@ -209,7 +209,7 @@ namespace Aaru.Filesystems.ISO9660
                                     jolietvd = svd;
                                 else
                                     AaruConsole.WriteLine("ISO9660 plugin",
-                                                         "Found unknown supplementary volume descriptor");
+                                                          "Found unknown supplementary volume descriptor");
 
                             if(debug)
                                 svdSectors.Add(16 + counter + partition.Start);
diff --git a/Aaru.Filesystems/ISO9660/Xattr.cs b/Aaru.Filesystems/ISO9660/Xattr.cs
index c606f3809..296dce3bb 100644
--- a/Aaru.Filesystems/ISO9660/Xattr.cs
+++ b/Aaru.Filesystems/ISO9660/Xattr.cs
@@ -95,7 +95,7 @@ namespace Aaru.Filesystems.ISO9660
 
             switch(xattr)
             {
-                case"org.iso.9660.ea":
+                case "org.iso.9660.ea":
                     if(entry.XattrLength == 0)
                         return Errno.NoSuchExtendedAttribute;
 
@@ -113,7 +113,7 @@ namespace Aaru.Filesystems.ISO9660
                     Array.Copy(ea, 0, buf, 0, buf.LongLength);
 
                     return Errno.NoError;
-                case"org.iso.9660.AssociatedFile":
+                case "org.iso.9660.AssociatedFile":
                     if(entry.AssociatedFile is null)
                         return Errno.NoSuchExtendedAttribute;
 
@@ -143,7 +143,7 @@ namespace Aaru.Filesystems.ISO9660
                         buf = ReadWithExtents(0, (long)entry.AssociatedFile.Size, entry.AssociatedFile.Extents);
 
                     return Errno.NoError;
-                case"com.apple.dos.type":
+                case "com.apple.dos.type":
                     if(entry.AppleDosType is null)
                         return Errno.NoSuchExtendedAttribute;
 
@@ -151,14 +151,14 @@ namespace Aaru.Filesystems.ISO9660
                     buf[0] = entry.AppleDosType.Value;
 
                     return Errno.NoError;
-                case"com.apple.prodos.type":
+                case "com.apple.prodos.type":
                     if(entry.AppleProDosType is null)
                         return Errno.NoSuchExtendedAttribute;
 
                     buf = BitConverter.GetBytes(entry.AppleProDosType.Value);
 
                     return Errno.NoError;
-                case"com.apple.ResourceFork":
+                case "com.apple.ResourceFork":
                     if(entry.ResourceFork is null)
                         return Errno.NoSuchExtendedAttribute;
 
@@ -188,14 +188,14 @@ namespace Aaru.Filesystems.ISO9660
                         buf = ReadWithExtents(0, (long)entry.ResourceFork.Size, entry.ResourceFork.Extents);
 
                     return Errno.NoError;
-                case"com.apple.FinderInfo":
+                case "com.apple.FinderInfo":
                     if(entry.FinderInfo is null)
                         return Errno.NoSuchExtendedAttribute;
 
                     buf = Marshal.StructureToByteArrayBigEndian(entry.FinderInfo.Value);
 
                     return Errno.NoError;
-                case"com.apple.Macintosh.Icon":
+                case "com.apple.Macintosh.Icon":
                     if(entry.AppleIcon is null)
                         return Errno.NoSuchExtendedAttribute;
 
@@ -203,7 +203,7 @@ namespace Aaru.Filesystems.ISO9660
                     Array.Copy(entry.AppleIcon, 0, buf, 0, entry.AppleIcon.Length);
 
                     return Errno.NoError;
-                case"com.amiga.comments":
+                case "com.amiga.comments":
                     if(entry.AmigaComment is null)
                         return Errno.NoSuchExtendedAttribute;
 
diff --git a/Aaru.Filesystems/JFS.cs b/Aaru.Filesystems/JFS.cs
index 735a682b9..323efc577 100644
--- a/Aaru.Filesystems/JFS.cs
+++ b/Aaru.Filesystems/JFS.cs
@@ -54,10 +54,14 @@ namespace Aaru.Filesystems
         public bool Identify(IMediaImage imagePlugin, Partition partition)
         {
             uint bootSectors = JFS_BOOT_BLOCKS_SIZE / imagePlugin.Info.SectorSize;
-            if(partition.Start + bootSectors >= partition.End) return false;
+
+            if(partition.Start + bootSectors >= partition.End)
+                return false;
 
             byte[] sector = imagePlugin.ReadSector(partition.Start + bootSectors);
-            if(sector.Length < 512) return false;
+
+            if(sector.Length < 512)
+                return false;
 
             JfsSuperBlock jfsSb = Marshal.ByteArrayToStructureLittleEndian<JfsSuperBlock>(sector);
 
@@ -65,14 +69,16 @@ namespace Aaru.Filesystems
         }
 
         public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding    encoding)
+                                   Encoding encoding)
         {
             Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-15");
             information = "";
-            StringBuilder sb          = new StringBuilder();
-            uint          bootSectors = JFS_BOOT_BLOCKS_SIZE / imagePlugin.Info.SectorSize;
-            byte[]        sector      = imagePlugin.ReadSector(partition.Start + bootSectors);
-            if(sector.Length < 512) return;
+            var    sb          = new StringBuilder();
+            uint   bootSectors = JFS_BOOT_BLOCKS_SIZE / imagePlugin.Info.SectorSize;
+            byte[] sector      = imagePlugin.ReadSector(partition.Start + bootSectors);
+
+            if(sector.Length < 512)
+                return;
 
             JfsSuperBlock jfsSb = Marshal.ByteArrayToStructureLittleEndian<JfsSuperBlock>(sector);
 
@@ -81,46 +87,93 @@ namespace Aaru.Filesystems
             sb.AppendFormat("{0} blocks of {1} bytes", jfsSb.s_size, jfsSb.s_bsize).AppendLine();
             sb.AppendFormat("{0} blocks per allocation group", jfsSb.s_agsize).AppendLine();
 
-            if(jfsSb.s_flags.HasFlag(JfsFlags.Unicode)) sb.AppendLine("Volume uses Unicode for directory entries");
-            if(jfsSb.s_flags.HasFlag(JfsFlags.RemountRO)) sb.AppendLine("Volume remounts read-only on error");
-            if(jfsSb.s_flags.HasFlag(JfsFlags.Continue)) sb.AppendLine("Volume continues on error");
-            if(jfsSb.s_flags.HasFlag(JfsFlags.Panic)) sb.AppendLine("Volume panics on error");
-            if(jfsSb.s_flags.HasFlag(JfsFlags.UserQuota)) sb.AppendLine("Volume has user quotas enabled");
-            if(jfsSb.s_flags.HasFlag(JfsFlags.GroupQuota)) sb.AppendLine("Volume has group quotas enabled");
-            if(jfsSb.s_flags.HasFlag(JfsFlags.NoJournal)) sb.AppendLine("Volume is not using any journal");
+            if(jfsSb.s_flags.HasFlag(JfsFlags.Unicode))
+                sb.AppendLine("Volume uses Unicode for directory entries");
+
+            if(jfsSb.s_flags.HasFlag(JfsFlags.RemountRO))
+                sb.AppendLine("Volume remounts read-only on error");
+
+            if(jfsSb.s_flags.HasFlag(JfsFlags.Continue))
+                sb.AppendLine("Volume continues on error");
+
+            if(jfsSb.s_flags.HasFlag(JfsFlags.Panic))
+                sb.AppendLine("Volume panics on error");
+
+            if(jfsSb.s_flags.HasFlag(JfsFlags.UserQuota))
+                sb.AppendLine("Volume has user quotas enabled");
+
+            if(jfsSb.s_flags.HasFlag(JfsFlags.GroupQuota))
+                sb.AppendLine("Volume has group quotas enabled");
+
+            if(jfsSb.s_flags.HasFlag(JfsFlags.NoJournal))
+                sb.AppendLine("Volume is not using any journal");
+
             if(jfsSb.s_flags.HasFlag(JfsFlags.Discard))
                 sb.AppendLine("Volume sends TRIM/UNMAP commands to underlying device");
-            if(jfsSb.s_flags.HasFlag(JfsFlags.GroupCommit)) sb.AppendLine("Volume commits in groups of 1");
-            if(jfsSb.s_flags.HasFlag(JfsFlags.LazyCommit)) sb.AppendLine("Volume commits lazy");
-            if(jfsSb.s_flags.HasFlag(JfsFlags.Temporary)) sb.AppendLine("Volume does not commit to log");
-            if(jfsSb.s_flags.HasFlag(JfsFlags.InlineLog)) sb.AppendLine("Volume has log withing itself");
+
+            if(jfsSb.s_flags.HasFlag(JfsFlags.GroupCommit))
+                sb.AppendLine("Volume commits in groups of 1");
+
+            if(jfsSb.s_flags.HasFlag(JfsFlags.LazyCommit))
+                sb.AppendLine("Volume commits lazy");
+
+            if(jfsSb.s_flags.HasFlag(JfsFlags.Temporary))
+                sb.AppendLine("Volume does not commit to log");
+
+            if(jfsSb.s_flags.HasFlag(JfsFlags.InlineLog))
+                sb.AppendLine("Volume has log withing itself");
+
             if(jfsSb.s_flags.HasFlag(JfsFlags.InlineMoving))
                 sb.AppendLine("Volume has log withing itself and is moving it out");
-            if(jfsSb.s_flags.HasFlag(JfsFlags.BadSAIT)) sb.AppendLine("Volume has bad current secondary ait");
-            if(jfsSb.s_flags.HasFlag(JfsFlags.Sparse)) sb.AppendLine("Volume supports sparse files");
-            if(jfsSb.s_flags.HasFlag(JfsFlags.DASDEnabled)) sb.AppendLine("Volume has DASD limits enabled");
-            if(jfsSb.s_flags.HasFlag(JfsFlags.DASDPrime)) sb.AppendLine("Volume primes DASD on boot");
-            if(jfsSb.s_flags.HasFlag(JfsFlags.SwapBytes)) sb.AppendLine("Volume is in a big-endian system");
-            if(jfsSb.s_flags.HasFlag(JfsFlags.DirIndex)) sb.AppendLine("Volume has presistent indexes");
-            if(jfsSb.s_flags.HasFlag(JfsFlags.Linux)) sb.AppendLine("Volume supports Linux");
-            if(jfsSb.s_flags.HasFlag(JfsFlags.DFS)) sb.AppendLine("Volume supports DCE DFS LFS");
-            if(jfsSb.s_flags.HasFlag(JfsFlags.OS2)) sb.AppendLine("Volume supports OS/2, and is case insensitive");
-            if(jfsSb.s_flags.HasFlag(JfsFlags.AIX)) sb.AppendLine("Volume supports AIX");
-            if(jfsSb.s_state != 0) sb.AppendLine("Volume is dirty");
+
+            if(jfsSb.s_flags.HasFlag(JfsFlags.BadSAIT))
+                sb.AppendLine("Volume has bad current secondary ait");
+
+            if(jfsSb.s_flags.HasFlag(JfsFlags.Sparse))
+                sb.AppendLine("Volume supports sparse files");
+
+            if(jfsSb.s_flags.HasFlag(JfsFlags.DASDEnabled))
+                sb.AppendLine("Volume has DASD limits enabled");
+
+            if(jfsSb.s_flags.HasFlag(JfsFlags.DASDPrime))
+                sb.AppendLine("Volume primes DASD on boot");
+
+            if(jfsSb.s_flags.HasFlag(JfsFlags.SwapBytes))
+                sb.AppendLine("Volume is in a big-endian system");
+
+            if(jfsSb.s_flags.HasFlag(JfsFlags.DirIndex))
+                sb.AppendLine("Volume has presistent indexes");
+
+            if(jfsSb.s_flags.HasFlag(JfsFlags.Linux))
+                sb.AppendLine("Volume supports Linux");
+
+            if(jfsSb.s_flags.HasFlag(JfsFlags.DFS))
+                sb.AppendLine("Volume supports DCE DFS LFS");
+
+            if(jfsSb.s_flags.HasFlag(JfsFlags.OS2))
+                sb.AppendLine("Volume supports OS/2, and is case insensitive");
+
+            if(jfsSb.s_flags.HasFlag(JfsFlags.AIX))
+                sb.AppendLine("Volume supports AIX");
+
+            if(jfsSb.s_state != 0)
+                sb.AppendLine("Volume is dirty");
+
             sb.AppendFormat("Volume was last updated on {0}",
-                            DateHandlers.UnixUnsignedToDateTime(jfsSb.s_time.tv_sec, jfsSb.s_time.tv_nsec))
-              .AppendLine();
+                            DateHandlers.UnixUnsignedToDateTime(jfsSb.s_time.tv_sec, jfsSb.s_time.tv_nsec)).
+               AppendLine();
+
             if(jfsSb.s_version == 1)
                 sb.AppendFormat("Volume name: {0}", StringHandlers.CToString(jfsSb.s_fpack, Encoding)).AppendLine();
-            else sb.AppendFormat("Volume name: {0}", StringHandlers.CToString(jfsSb.s_label, Encoding)).AppendLine();
+            else
+                sb.AppendFormat("Volume name: {0}", StringHandlers.CToString(jfsSb.s_label, Encoding)).AppendLine();
+
             sb.AppendFormat("Volume UUID: {0}", jfsSb.s_uuid).AppendLine();
 
             XmlFsType = new FileSystemType
             {
-                Type        = "JFS filesystem",
-                Clusters    = jfsSb.s_size,
-                ClusterSize = jfsSb.s_bsize,
-                Bootable    = true,
+                Type     = "JFS filesystem", Clusters = jfsSb.s_size, ClusterSize = jfsSb.s_bsize,
+                Bootable = true,
                 VolumeName =
                     StringHandlers.CToString(jfsSb.s_version == 1 ? jfsSb.s_fpack : jfsSb.s_label, Encoding),
                 VolumeSerial = $"{jfsSb.s_uuid}",
@@ -128,7 +181,9 @@ namespace Aaru.Filesystems
                     DateHandlers.UnixUnsignedToDateTime(jfsSb.s_time.tv_sec, jfsSb.s_time.tv_nsec),
                 ModificationDateSpecified = true
             };
-            if(jfsSb.s_state != 0) XmlFsType.Dirty = true;
+
+            if(jfsSb.s_state != 0)
+                XmlFsType.Dirty = true;
 
             information = sb.ToString();
         }
@@ -136,47 +191,27 @@ namespace Aaru.Filesystems
         [Flags]
         enum JfsFlags : uint
         {
-            Unicode      = 0x00000001,
-            RemountRO    = 0x00000002,
-            Continue     = 0x00000004,
-            Panic        = 0x00000008,
-            UserQuota    = 0x00000010,
-            GroupQuota   = 0x00000020,
-            NoJournal    = 0x00000040,
-            Discard      = 0x00000080,
-            GroupCommit  = 0x00000100,
-            LazyCommit   = 0x00000200,
-            Temporary    = 0x00000400,
-            InlineLog    = 0x00000800,
-            InlineMoving = 0x00001000,
-            BadSAIT      = 0x00010000,
-            Sparse       = 0x00020000,
-            DASDEnabled  = 0x00040000,
-            DASDPrime    = 0x00080000,
-            SwapBytes    = 0x00100000,
-            DirIndex     = 0x00200000,
-            Linux        = 0x10000000,
-            DFS          = 0x20000000,
-            OS2          = 0x40000000,
-            AIX          = 0x80000000
+            Unicode      = 0x00000001, RemountRO = 0x00000002, Continue    = 0x00000004,
+            Panic        = 0x00000008, UserQuota = 0x00000010, GroupQuota  = 0x00000020,
+            NoJournal    = 0x00000040, Discard   = 0x00000080, GroupCommit = 0x00000100,
+            LazyCommit   = 0x00000200, Temporary = 0x00000400, InlineLog   = 0x00000800,
+            InlineMoving = 0x00001000, BadSAIT   = 0x00010000, Sparse      = 0x00020000,
+            DASDEnabled  = 0x00040000, DASDPrime = 0x00080000, SwapBytes   = 0x00100000,
+            DirIndex     = 0x00200000, Linux     = 0x10000000, DFS         = 0x20000000,
+            OS2          = 0x40000000, AIX       = 0x80000000
         }
 
         [Flags]
         enum JfsState : uint
         {
-            Clean    = 0,
-            Mounted  = 1,
-            Dirty    = 2,
-            Logredo  = 4,
-            Extendfs = 8
+            Clean   = 0, Mounted  = 1, Dirty = 2,
+            Logredo = 4, Extendfs = 8
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct JfsExtent
         {
-            /// <summary>
-            ///     Leftmost 24 bits are extent length, rest 8 bits are most significant for <see cref="addr2" />
-            /// </summary>
+            /// <summary>Leftmost 24 bits are extent length, rest 8 bits are most significant for <see cref="addr2" /></summary>
             public readonly uint len_addr;
             public readonly uint addr2;
         }
diff --git a/Aaru.Filesystems/LIF.cs b/Aaru.Filesystems/LIF.cs
index 96cfc7715..f4c8df561 100644
--- a/Aaru.Filesystems/LIF.cs
+++ b/Aaru.Filesystems/LIF.cs
@@ -54,7 +54,8 @@ namespace Aaru.Filesystems
 
         public bool Identify(IMediaImage imagePlugin, Partition partition)
         {
-            if(imagePlugin.Info.SectorSize < 256) return false;
+            if(imagePlugin.Info.SectorSize < 256)
+                return false;
 
             byte[]         sector = imagePlugin.ReadSector(partition.Start);
             LifSystemBlock lifSb  = Marshal.ByteArrayToStructureBigEndian<LifSystemBlock>(sector);
@@ -64,25 +65,28 @@ namespace Aaru.Filesystems
         }
 
         public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding    encoding)
+                                   Encoding encoding)
         {
             Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-15");
             information = "";
 
-            if(imagePlugin.Info.SectorSize < 256) return;
+            if(imagePlugin.Info.SectorSize < 256)
+                return;
 
             byte[]         sector = imagePlugin.ReadSector(partition.Start);
             LifSystemBlock lifSb  = Marshal.ByteArrayToStructureBigEndian<LifSystemBlock>(sector);
 
-            if(lifSb.magic != LIF_MAGIC) return;
+            if(lifSb.magic != LIF_MAGIC)
+                return;
 
-            StringBuilder sb = new StringBuilder();
+            var sb = new StringBuilder();
 
             sb.AppendLine("HP Logical Interchange Format");
             sb.AppendFormat("Directory starts at cluster {0}", lifSb.directoryStart).AppendLine();
             sb.AppendFormat("LIF identifier: {0}", lifSb.lifId).AppendLine();
             sb.AppendFormat("Directory size: {0} clusters", lifSb.directorySize).AppendLine();
             sb.AppendFormat("LIF version: {0}", lifSb.lifVersion).AppendLine();
+
             // How is this related to volume size? I have only CDs to test and makes no sense there
             sb.AppendFormat("{0} tracks", lifSb.tracks).AppendLine();
             sb.AppendFormat("{0} heads", lifSb.heads).AppendLine();
@@ -94,12 +98,10 @@ namespace Aaru.Filesystems
 
             XmlFsType = new FileSystemType
             {
-                Type                  = "HP Logical Interchange Format",
-                ClusterSize           = 256,
-                Clusters              = partition.Size / 256,
-                CreationDate          = DateHandlers.LifToDateTime(lifSb.creationDate),
-                CreationDateSpecified = true,
-                VolumeName            = StringHandlers.CToString(lifSb.volumeLabel, Encoding)
+                Type         = "HP Logical Interchange Format", ClusterSize = 256,
+                Clusters     = partition.Size / 256,
+                CreationDate = DateHandlers.LifToDateTime(lifSb.creationDate), CreationDateSpecified = true,
+                VolumeName   = StringHandlers.CToString(lifSb.volumeLabel, Encoding)
             };
         }
 
diff --git a/Aaru.Filesystems/LisaFS/Consts.cs b/Aaru.Filesystems/LisaFS/Consts.cs
index 448b67d0b..935b68e4b 100644
--- a/Aaru.Filesystems/LisaFS/Consts.cs
+++ b/Aaru.Filesystems/LisaFS/Consts.cs
@@ -34,58 +34,38 @@ namespace Aaru.Filesystems.LisaFS
 {
     public partial class LisaFS
     {
-        /// <summary>
-        ///     Lisa FS v1, from Lisa OS 1.0 (Workshop or Office)
-        ///     Never seen on Sony floppies.
-        /// </summary>
+        /// <summary>Lisa FS v1, from Lisa OS 1.0 (Workshop or Office) Never seen on Sony floppies.</summary>
         const byte LISA_V1 = 0x0E;
         /// <summary>
-        ///     Lisa FS v2, from Lisa OS 2.0 (Workshop or Office)
-        ///     Contrary to what most information online says the only difference with V1
-        ///     is the Extents File size. Catalog format is the same
+        ///     Lisa FS v2, from Lisa OS 2.0 (Workshop or Office) Contrary to what most information online says the only
+        ///     difference with V1 is the Extents File size. Catalog format is the same
         /// </summary>
         const byte LISA_V2 = 0x0F;
         /// <summary>
-        ///     Lisa FS v3, from Lisa OS 3.0 (Workshop or Office)
-        ///     Adds support for user catalogs (aka subdirectories),
-        ///     and changes the catalog format from extents to double-linked list.
-        ///     Uses '-' as path separator (so people that created Lisa/FILE.TEXT just
-        ///     created a file named like that :p)
+        ///     Lisa FS v3, from Lisa OS 3.0 (Workshop or Office) Adds support for user catalogs (aka subdirectories), and
+        ///     changes the catalog format from extents to double-linked list. Uses '-' as path separator (so people that created
+        ///     Lisa/FILE.TEXT just created a file named like that :p)
         /// </summary>
         const byte LISA_V3 = 0x11;
         /// <summary>Maximum string size in LisaFS</summary>
         const uint E_NAME = 32;
-        /// <summary>
-        ///     Unused file ID
-        /// </summary>
+        /// <summary>Unused file ID</summary>
         const ushort FILEID_FREE = 0x0000;
-        /// <summary>
-        ///     Used by the boot blocks
-        /// </summary>
+        /// <summary>Used by the boot blocks</summary>
         const ushort FILEID_BOOT = 0xAAAA;
-        /// <summary>
-        ///     Used by the operating system loader blocks
-        /// </summary>
+        /// <summary>Used by the operating system loader blocks</summary>
         const ushort FILEID_LOADER = 0xBBBB;
-        /// <summary>
-        ///     Used by the MDDF
-        /// </summary>
+        /// <summary>Used by the MDDF</summary>
         const ushort FILEID_MDDF = 0x0001;
-        /// <summary>
-        ///     Used by the volume bitmap, sits between MDDF and S-Records file.
-        /// </summary>
+        /// <summary>Used by the volume bitmap, sits between MDDF and S-Records file.</summary>
         const ushort FILEID_BITMAP = 0x0002;
-        /// <summary>
-        ///     S-Records file
-        /// </summary>
+        /// <summary>S-Records file</summary>
         const ushort FILEID_SRECORD = 0x0003;
         /// <summary>The root catalog</summary>
         const ushort FILEID_CATALOG = 0x0004;
         const short FILEID_BOOT_SIGNED   = -21846;
         const short FILEID_LOADER_SIGNED = -17477;
-        /// <summary>
-        ///     A file that has been erased
-        /// </summary>
+        /// <summary>A file that has been erased</summary>
         const ushort FILEID_ERASED = 0x7FFF;
         const ushort FILEID_MAX = FILEID_ERASED;
 
@@ -94,69 +74,37 @@ namespace Aaru.Filesystems.LisaFS
 
         enum FileType : byte
         {
-            /// <summary>
-            ///     Undefined file type
-            /// </summary>
+            /// <summary>Undefined file type</summary>
             Undefined = 0,
-            /// <summary>
-            ///     MDDF
-            /// </summary>
+            /// <summary>MDDF</summary>
             MDDFile = 1,
-            /// <summary>
-            ///     Root catalog
-            /// </summary>
+            /// <summary>Root catalog</summary>
             RootCat = 2,
-            /// <summary>
-            ///     Bitmap
-            /// </summary>
+            /// <summary>Bitmap</summary>
             FreeList = 3,
-            /// <summary>
-            ///     Unknown, maybe refers to the S-Records File?
-            /// </summary>
+            /// <summary>Unknown, maybe refers to the S-Records File?</summary>
             BadBlocks = 4,
-            /// <summary>
-            ///     System data
-            /// </summary>
+            /// <summary>System data</summary>
             SysData = 5,
-            /// <summary>
-            ///     Printer spool
-            /// </summary>
+            /// <summary>Printer spool</summary>
             Spool = 6,
-            /// <summary>
-            ///     Executable. Yet application files don't use it
-            /// </summary>
+            /// <summary>Executable. Yet application files don't use it</summary>
             Exec = 7,
-            /// <summary>
-            ///     User catalog
-            /// </summary>
+            /// <summary>User catalog</summary>
             UserCat = 8,
-            /// <summary>
-            ///     Pipe. Not seen on disk.
-            /// </summary>
+            /// <summary>Pipe. Not seen on disk.</summary>
             Pipe = 9,
-            /// <summary>
-            ///     Boot file?
-            /// </summary>
+            /// <summary>Boot file?</summary>
             BootFile = 10,
-            /// <summary>
-            ///     Swap for data
-            /// </summary>
+            /// <summary>Swap for data</summary>
             SwapData = 11,
-            /// <summary>
-            ///     Swap for code
-            /// </summary>
+            /// <summary>Swap for code</summary>
             SwapCode = 12,
-            /// <summary>
-            ///     Unknown
-            /// </summary>
+            /// <summary>Unknown</summary>
             RamAP = 13,
-            /// <summary>
-            ///     Any file
-            /// </summary>
+            /// <summary>Any file</summary>
             UserFile = 14,
-            /// <summary>
-            ///     Erased?
-            /// </summary>
+            /// <summary>Erased?</summary>
             KilledObject = 15
         }
     }
diff --git a/Aaru.Filesystems/LisaFS/Dir.cs b/Aaru.Filesystems/LisaFS/Dir.cs
index 0f34f7221..adf89cd0b 100644
--- a/Aaru.Filesystems/LisaFS/Dir.cs
+++ b/Aaru.Filesystems/LisaFS/Dir.cs
@@ -41,30 +41,30 @@ namespace Aaru.Filesystems.LisaFS
 {
     public partial class LisaFS
     {
-        /// <summary>
-        ///     Solves a symbolic link.
-        /// </summary>
+        /// <summary>Solves a symbolic link.</summary>
         /// <param name="path">Link path.</param>
         /// <param name="dest">Link destination.</param>
         public Errno ReadLink(string path, out string dest)
         {
             dest = null;
+
             // LisaFS does not support symbolic links (afaik)
             return Errno.NotSupported;
         }
 
-        /// <summary>
-        ///     Lists contents from a directory.
-        /// </summary>
+        /// <summary>Lists contents from a directory.</summary>
         /// <param name="path">Directory path.</param>
         /// <param name="contents">Directory contents.</param>
         public Errno ReadDir(string path, out List<string> contents)
         {
             contents = null;
             Errno error = LookupFileId(path, out short fileId, out bool isDir);
-            if(error != Errno.NoError) return error;
 
-            if(!isDir) return Errno.NotDirectory;
+            if(error != Errno.NoError)
+                return error;
+
+            if(!isDir)
+                return Errno.NotDirectory;
 
             /*List<CatalogEntry> catalog;
             error = ReadCatalog(fileId, out catalog);
@@ -86,6 +86,7 @@ namespace Aaru.Filesystems.LisaFS
             }
 
             contents.Sort();
+
             return Errno.NoError;
         }
 
@@ -93,27 +94,28 @@ namespace Aaru.Filesystems.LisaFS
         {
             // Do same trick as Mac OS X, replace filesystem '/' with '-',
             // as '-' is the path separator in Lisa OS
-            contents = (from entry in catalogCache
-                        where entry.parentID == dirId
+            contents = (from entry in catalogCache where entry.parentID == dirId
                         select StringHandlers.CToString(entry.filename, Encoding).Replace('/', '-')).ToList();
 
             return Errno.NoError;
         }
 
-        /// <summary>
-        ///     Reads, interprets and caches the Catalog File
-        /// </summary>
+        /// <summary>Reads, interprets and caches the Catalog File</summary>
         Errno ReadCatalog()
         {
-            if(!mounted) return Errno.AccessDenied;
+            if(!mounted)
+                return Errno.AccessDenied;
 
             catalogCache = new List<CatalogEntry>();
 
             // Do differently for V1 and V2
-            if(mddf.fsversion == LISA_V2 || mddf.fsversion == LISA_V1)
+            if(mddf.fsversion == LISA_V2 ||
+               mddf.fsversion == LISA_V1)
             {
                 Errno error = ReadFile((short)FILEID_CATALOG, out byte[] buf);
-                if(error != Errno.NoError) return error;
+
+                if(error != Errno.NoError)
+                    return error;
 
                 int                  offset    = 0;
                 List<CatalogEntryV2> catalogV2 = new List<CatalogEntryV2>();
@@ -121,23 +123,25 @@ namespace Aaru.Filesystems.LisaFS
                 // For each entry on the catalog
                 while(offset + 54 < buf.Length)
                 {
-                    CatalogEntryV2 entV2 = new CatalogEntryV2
+                    var entV2 = new CatalogEntryV2
                     {
-                        filenameLen = buf[offset],
-                        filename    = new byte[E_NAME],
-                        unknown1    = buf[offset                                + 0x21],
-                        fileType    = buf[offset                                + 0x22],
-                        unknown2    = buf[offset                                + 0x23],
-                        fileID      = BigEndianBitConverter.ToInt16(buf, offset + 0x24),
+                        filenameLen = buf[offset], filename = new byte[E_NAME], unknown1 = buf[offset + 0x21],
+                        fileType    = buf[offset                                                      + 0x22],
+                        unknown2    = buf[offset                                                      + 0x23],
+                        fileID      = BigEndianBitConverter.ToInt16(buf, offset                       + 0x24),
                         unknown3    = new byte[16]
                     };
+
                     Array.Copy(buf, offset + 0x01, entV2.filename, 0, E_NAME);
                     Array.Copy(buf, offset + 0x26, entV2.unknown3, 0, 16);
 
                     offset += 54;
 
                     // Check that the entry is correct, not empty or garbage
-                    if(entV2.filenameLen != 0 && entV2.filenameLen <= E_NAME && entV2.fileType != 0 && entV2.fileID > 0)
+                    if(entV2.filenameLen != 0      &&
+                       entV2.filenameLen <= E_NAME &&
+                       entV2.fileType    != 0      &&
+                       entV2.fileID      > 0)
                         catalogV2.Add(entV2);
                 }
 
@@ -145,17 +149,16 @@ namespace Aaru.Filesystems.LisaFS
                 foreach(CatalogEntryV2 entV2 in catalogV2)
                 {
                     error = ReadExtentsFile(entV2.fileID, out ExtentFile ext);
-                    if(error != Errno.NoError) continue;
 
-                    CatalogEntry entV3 = new CatalogEntry
+                    if(error != Errno.NoError)
+                        continue;
+
+                    var entV3 = new CatalogEntry
                     {
-                        fileID   = entV2.fileID,
-                        filename = new byte[32],
-                        fileType = entV2.fileType,
-                        length   = (int)srecords[entV2.fileID].filesize,
-                        dtc      = ext.dtc,
-                        dtm      = ext.dtm
+                        fileID = entV2.fileID, filename                    = new byte[32], fileType = entV2.fileType,
+                        length = (int)srecords[entV2.fileID].filesize, dtc = ext.dtc, dtm           = ext.dtm
                     };
+
                     Array.Copy(entV2.filename, 0, entV3.filename, 0, entV2.filenameLen);
 
                     catalogCache.Add(entV3);
@@ -173,14 +176,18 @@ namespace Aaru.Filesystems.LisaFS
             {
                 DecodeTag(device.ReadSectorTag(i, SectorTagType.AppleSectorTag), out LisaTag.PriamTag catTag);
 
-                if(catTag.FileId != FILEID_CATALOG || catTag.RelPage != 0) continue;
+                if(catTag.FileId  != FILEID_CATALOG ||
+                   catTag.RelPage != 0)
+                    continue;
 
                 firstCatalogBlock = device.ReadSectors(i, 4);
+
                 break;
             }
 
             // Catalog not found
-            if(firstCatalogBlock == null) return Errno.NoSuchFile;
+            if(firstCatalogBlock == null)
+                return Errno.NoSuchFile;
 
             ulong prevCatalogPointer;
             prevCatalogPointer = BigEndianBitConverter.ToUInt32(firstCatalogBlock, 0x7F6);
@@ -191,7 +198,8 @@ namespace Aaru.Filesystems.LisaFS
                 DecodeTag(device.ReadSectorTag(prevCatalogPointer + mddf.mddf_block + volumePrefix, SectorTagType.AppleSectorTag),
                           out LisaTag.PriamTag prevTag);
 
-                if(prevTag.FileId != FILEID_CATALOG) return Errno.InvalidArgument;
+                if(prevTag.FileId != FILEID_CATALOG)
+                    return Errno.InvalidArgument;
 
                 firstCatalogBlock  = device.ReadSectors(prevCatalogPointer + mddf.mddf_block + volumePrefix, 4);
                 prevCatalogPointer = BigEndianBitConverter.ToUInt32(firstCatalogBlock, 0x7F6);
@@ -200,7 +208,10 @@ namespace Aaru.Filesystems.LisaFS
             ulong nextCatalogPointer;
             nextCatalogPointer = BigEndianBitConverter.ToUInt32(firstCatalogBlock, 0x7FA);
 
-            List<byte[]> catalogBlocks = new List<byte[]> {firstCatalogBlock};
+            List<byte[]> catalogBlocks = new List<byte[]>
+            {
+                firstCatalogBlock
+            };
 
             // Traverse double-linked list to read full catalog
             while(nextCatalogPointer != 0xFFFFFFFF)
@@ -208,7 +219,8 @@ namespace Aaru.Filesystems.LisaFS
                 DecodeTag(device.ReadSectorTag(nextCatalogPointer + mddf.mddf_block + volumePrefix, SectorTagType.AppleSectorTag),
                           out LisaTag.PriamTag nextTag);
 
-                if(nextTag.FileId != FILEID_CATALOG) return Errno.InvalidArgument;
+                if(nextTag.FileId != FILEID_CATALOG)
+                    return Errno.InvalidArgument;
 
                 byte[] nextCatalogBlock = device.ReadSectors(nextCatalogPointer + mddf.mddf_block + volumePrefix, 4);
                 nextCatalogPointer = BigEndianBitConverter.ToUInt32(nextCatalogBlock, 0x7FA);
@@ -222,33 +234,46 @@ namespace Aaru.Filesystems.LisaFS
 
                 // Traverse all entries
                 while(offset + 64 <= buf.Length)
+
                     // Catalog block header
                     if(buf[offset + 0x24] == 0x08)
                         offset += 78;
+
                     // Maybe just garbage? Found in more than 1 disk
-                    else if(buf[offset + 0x24] == 0x7C) offset += 50;
+                    else if(buf[offset + 0x24] == 0x7C)
+                        offset += 50;
+
                     // Apparently reserved to indicate end of catalog?
-                    else if(buf[offset + 0x24] == 0xFF) break;
+                    else if(buf[offset + 0x24] == 0xFF)
+                        break;
+
                     // Normal entry
-                    else if(buf[offset + 0x24] == 0x03 && buf[offset] == 0x24)
+                    else if(buf[offset + 0x24] == 0x03 &&
+                            buf[offset]        == 0x24)
                     {
-                        CatalogEntry entry = new CatalogEntry
+                        var entry = new CatalogEntry
                         {
                             marker     = buf[offset],
                             parentID   = BigEndianBitConverter.ToUInt16(buf, offset + 0x01),
                             filename   = new byte[E_NAME],
-                            terminator = buf[offset                                 + 0x23],
-                            fileType   = buf[offset                                 + 0x24],
-                            unknown    = buf[offset                                 + 0x25],
-                            fileID     = BigEndianBitConverter.ToInt16(buf, offset  + 0x26),
-                            dtc        = BigEndianBitConverter.ToUInt32(buf, offset + 0x28),
-                            dtm        = BigEndianBitConverter.ToUInt32(buf, offset + 0x2C),
-                            length     = BigEndianBitConverter.ToInt32(buf, offset  + 0x30),
-                            wasted     = BigEndianBitConverter.ToInt32(buf, offset  + 0x34),
-                            tail       = new byte[8]
+                            terminator = buf[offset + 0x23],
+                            fileType   = buf[offset + 0x24],
+                            unknown =
+                                buf[offset + 0x25],
+                            fileID = BigEndianBitConverter.ToInt16(buf, offset + 0x26),
+                            dtc =
+                                BigEndianBitConverter.ToUInt32(buf, offset + 0x28),
+                            dtm =
+                                BigEndianBitConverter.ToUInt32(buf, offset + 0x2C),
+                            length =
+                                BigEndianBitConverter.ToInt32(buf, offset + 0x30),
+                            wasted =
+                                BigEndianBitConverter.ToInt32(buf, offset + 0x34),
+                            tail = new byte[8]
                         };
+
                         Array.Copy(buf, offset + 0x03, entry.filename, 0, E_NAME);
-                        Array.Copy(buf, offset + 0x38, entry.tail,     0, 8);
+                        Array.Copy(buf, offset + 0x38, entry.tail, 0, 8);
 
                         if(ReadExtentsFile(entry.fileID, out _) == Errno.NoError)
                             if(!fileSizeCache.ContainsKey(entry.fileID))
@@ -259,24 +284,29 @@ namespace Aaru.Filesystems.LisaFS
 
                         offset += 64;
                     }
+
                     // Subdirectory entry
-                    else if(buf[offset + 0x24] == 0x01 && buf[offset] == 0x24)
+                    else if(buf[offset + 0x24] == 0x01 &&
+                            buf[offset]        == 0x24)
                     {
-                        CatalogEntry entry = new CatalogEntry
+                        var entry = new CatalogEntry
                         {
                             marker     = buf[offset],
                             parentID   = BigEndianBitConverter.ToUInt16(buf, offset + 0x01),
                             filename   = new byte[E_NAME],
-                            terminator = buf[offset                                 + 0x23],
-                            fileType   = buf[offset                                 + 0x24],
-                            unknown    = buf[offset                                 + 0x25],
-                            fileID     = BigEndianBitConverter.ToInt16(buf, offset  + 0x26),
-                            dtc        = BigEndianBitConverter.ToUInt32(buf, offset + 0x28),
-                            dtm        = BigEndianBitConverter.ToUInt32(buf, offset + 0x2C),
-                            length     = 0,
-                            wasted     = 0,
-                            tail       = null
+                            terminator = buf[offset + 0x23],
+                            fileType   = buf[offset + 0x24],
+                            unknown =
+                                buf[offset + 0x25],
+                            fileID = BigEndianBitConverter.ToInt16(buf, offset + 0x26),
+                            dtc =
+                                BigEndianBitConverter.ToUInt32(buf, offset + 0x28),
+                            dtm =
+                                BigEndianBitConverter.ToUInt32(buf, offset + 0x2C),
+                            length = 0, wasted = 0,
+                            tail   = null
                         };
+
                         Array.Copy(buf, offset + 0x03, entry.filename, 0, E_NAME);
 
                         if(!directoryDtcCache.ContainsKey(entry.fileID))
@@ -286,7 +316,8 @@ namespace Aaru.Filesystems.LisaFS
 
                         offset += 48;
                     }
-                    else break;
+                    else
+                        break;
             }
 
             return Errno.NoError;
@@ -296,20 +327,14 @@ namespace Aaru.Filesystems.LisaFS
         {
             stat = null;
 
-            if(!mounted) return Errno.AccessDenied;
+            if(!mounted)
+                return Errno.AccessDenied;
 
             stat = new FileEntryInfo
             {
-                Attributes = new FileAttributes(),
-                Inode      = FILEID_CATALOG,
-                Mode       = 0x16D,
-                Links      = 0,
-                UID        = 0,
-                GID        = 0,
-                DeviceNo   = 0,
-                Length     = 0,
-                BlockSize  = mddf.datasize,
-                Blocks     = 0
+                Attributes = new FileAttributes(), Inode = FILEID_CATALOG, Mode = 0x16D, Links = 0,
+                UID        = 0, GID                      = 0, DeviceNo          = 0, Length    = 0,
+                BlockSize  = mddf.datasize, Blocks       = 0
             };
 
             directoryDtcCache.TryGetValue(dirId, out DateTime tmp);
diff --git a/Aaru.Filesystems/LisaFS/Extent.cs b/Aaru.Filesystems/LisaFS/Extent.cs
index c4e20ea91..4bb73fbd7 100644
--- a/Aaru.Filesystems/LisaFS/Extent.cs
+++ b/Aaru.Filesystems/LisaFS/Extent.cs
@@ -43,13 +43,12 @@ namespace Aaru.Filesystems.LisaFS
         public Errno MapBlock(string path, long fileBlock, out long deviceBlock)
         {
             deviceBlock = 0;
+
             // TODO: Not really important.
             return Errno.NotImplemented;
         }
 
-        /// <summary>
-        ///     Searches the disk for an extents file (or gets it from cache)
-        /// </summary>
+        /// <summary>Searches the disk for an extents file (or gets it from cache)</summary>
         /// <returns>Error.</returns>
         /// <param name="fileId">File identifier.</param>
         /// <param name="file">Extents file.</param>
@@ -57,20 +56,26 @@ namespace Aaru.Filesystems.LisaFS
         {
             file = new ExtentFile();
 
-            if(!mounted) return Errno.AccessDenied;
+            if(!mounted)
+                return Errno.AccessDenied;
 
-            if(fileId < 4 || fileId == 4 && mddf.fsversion != LISA_V2 && mddf.fsversion != LISA_V1)
+            if(fileId < 4 ||
+               (fileId == 4 && mddf.fsversion != LISA_V2 && mddf.fsversion != LISA_V1))
                 return Errno.InvalidArgument;
 
-            if(extentCache.TryGetValue(fileId, out file)) return Errno.NoError;
+            if(extentCache.TryGetValue(fileId, out file))
+                return Errno.NoError;
 
             // A file ID that cannot be stored in the S-Records File
-            if(fileId >= srecords.Length) return Errno.InvalidArgument;
+            if(fileId >= srecords.Length)
+                return Errno.InvalidArgument;
 
             ulong ptr = srecords[fileId].extent_ptr;
 
             // An invalid pointer denotes file does not exist
-            if(ptr == 0xFFFFFFFF || ptr == 0x00000000) return Errno.NoSuchFile;
+            if(ptr == 0xFFFFFFFF ||
+               ptr == 0x00000000)
+                return Errno.NoSuchFile;
 
             // Pointers are relative to MDDF
             ptr += mddf.mddf_block + volumePrefix;
@@ -87,24 +92,31 @@ namespace Aaru.Filesystems.LisaFS
                 for(ulong i = 0; i < device.Info.Sectors; i++)
                 {
                     DecodeTag(device.ReadSectorTag(i, SectorTagType.AppleSectorTag), out extTag);
-                    if(extTag.FileId != fileId * -1) continue;
+
+                    if(extTag.FileId != fileId * -1)
+                        continue;
 
                     ptr   = i;
                     found = true;
+
                     break;
                 }
 
-                if(!found) return Errno.InvalidArgument;
+                if(!found)
+                    return Errno.InvalidArgument;
             }
 
             // Checks that the sector tag indicates its the Extents File we are searching for
             DecodeTag(device.ReadSectorTag(ptr, SectorTagType.AppleSectorTag), out extTag);
 
-            if(extTag.FileId != (short)(-1 * fileId)) return Errno.NoSuchFile;
+            if(extTag.FileId != (short)(-1 * fileId))
+                return Errno.NoSuchFile;
 
             byte[] sector = mddf.fsversion == LISA_V1 ? device.ReadSectors(ptr, 2) : device.ReadSector(ptr);
 
-            if(sector[0] >= 32 || sector[0] == 0) return Errno.InvalidArgument;
+            if(sector[0] >= 32 ||
+               sector[0] == 0)
+                return Errno.InvalidArgument;
 
             file.filenameLen = sector[0];
             file.filename    = new byte[file.filenameLen];
@@ -165,7 +177,8 @@ namespace Aaru.Filesystems.LisaFS
 
             for(int j = 0; j < 41; j++)
             {
-                if(BigEndianBitConverter.ToInt16(sector, extentsOffset + j * 6 + 4) == 0) break;
+                if(BigEndianBitConverter.ToInt16(sector, extentsOffset + (j * 6) + 4) == 0)
+                    break;
 
                 extentsCount++;
             }
@@ -175,77 +188,87 @@ namespace Aaru.Filesystems.LisaFS
             for(int j = 0; j < extentsCount; j++)
                 file.extents[j] = new Extent
                 {
-                    start  = BigEndianBitConverter.ToInt32(sector, extentsOffset         + j * 6),
-                    length = BigEndianBitConverter.ToInt16(sector, extentsOffset + j * 6 + 4)
+                    start  = BigEndianBitConverter.ToInt32(sector, extentsOffset           + (j * 6)),
+                    length = BigEndianBitConverter.ToInt16(sector, extentsOffset + (j * 6) + 4)
                 };
 
             extentCache.Add(fileId, file);
 
-            if(!debug) return Errno.NoError;
+            if(!debug)
+                return Errno.NoError;
 
-            if(printedExtents.Contains(fileId)) return Errno.NoError;
+            if(printedExtents.Contains(fileId))
+                return Errno.NoError;
 
             AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].filenameLen = {1}", fileId, file.filenameLen);
+
             AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].filename = {1}", fileId,
-                                      StringHandlers.CToString(file.filename, Encoding));
-            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].unknown1 = 0x{1:X4}",  fileId, file.unknown1);
+                                       StringHandlers.CToString(file.filename, Encoding));
+
+            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].unknown1 = 0x{1:X4}", fileId, file.unknown1);
             AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].file_uid = 0x{1:X16}", fileId, file.file_uid);
-            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].unknown2 = 0x{1:X2}",  fileId, file.unknown2);
-            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].etype = 0x{1:X2}",     fileId, file.etype);
-            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].ftype = {1}",          fileId, file.ftype);
-            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].unknown3 = 0x{1:X2}",  fileId, file.unknown3);
-            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].dtc = {1}",            fileId, file.dtc);
-            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].dta = {1}",            fileId, file.dta);
-            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].dtm = {1}",            fileId, file.dtm);
-            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].dtb = {1}",            fileId, file.dtb);
-            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].dts = {1}",            fileId, file.dts);
-            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].serial = {1}",         fileId, file.serial);
-            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].unknown4 = 0x{1:X2}",  fileId, file.unknown4);
-            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].locked = {1}", fileId,
-                                      file.locked > 0);
-            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].protect = {1}", fileId,
-                                      file.protect > 0);
-            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].master = {1}", fileId,
-                                      file.master > 0);
-            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].scavenged = {1}", fileId,
-                                      file.scavenged > 0);
-            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].closed = {1}", fileId,
-                                      file.closed > 0);
-            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].open = {1}", fileId,
-                                      file.open > 0);
+            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].unknown2 = 0x{1:X2}", fileId, file.unknown2);
+            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].etype = 0x{1:X2}", fileId, file.etype);
+            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].ftype = {1}", fileId, file.ftype);
+            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].unknown3 = 0x{1:X2}", fileId, file.unknown3);
+            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].dtc = {1}", fileId, file.dtc);
+            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].dta = {1}", fileId, file.dta);
+            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].dtm = {1}", fileId, file.dtm);
+            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].dtb = {1}", fileId, file.dtb);
+            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].dts = {1}", fileId, file.dts);
+            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].serial = {1}", fileId, file.serial);
+            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].unknown4 = 0x{1:X2}", fileId, file.unknown4);
+            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].locked = {1}", fileId, file.locked       > 0);
+            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].protect = {1}", fileId, file.protect     > 0);
+            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].master = {1}", fileId, file.master       > 0);
+            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].scavenged = {1}", fileId, file.scavenged > 0);
+            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].closed = {1}", fileId, file.closed       > 0);
+            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].open = {1}", fileId, file.open           > 0);
+
             AaruConsole.DebugWriteLine("LisaFS plugin",
-                                      "ExtentFile[{0}].unknown5 = 0x{1:X2}{2:X2}{3:X2}{4:X2}{5:X2}{6:X2}{7:X2}{8:X2}{9:X2}" +
-                                      "{10:X2}{11:X2}", fileId, file.unknown5[0], file.unknown5[1], file.unknown5[2],
-                                      file.unknown5[3], file.unknown5[4], file.unknown5[5], file.unknown5[6],
-                                      file.unknown5[7], file.unknown5[8], file.unknown5[9], file.unknown5[10]);
+                                       "ExtentFile[{0}].unknown5 = 0x{1:X2}{2:X2}{3:X2}{4:X2}{5:X2}{6:X2}{7:X2}{8:X2}{9:X2}" +
+                                       "{10:X2}{11:X2}", fileId, file.unknown5[0], file.unknown5[1], file.unknown5[2],
+                                       file.unknown5[3], file.unknown5[4], file.unknown5[5], file.unknown5[6],
+                                       file.unknown5[7], file.unknown5[8], file.unknown5[9], file.unknown5[10]);
+
             AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].release = {1}", fileId, file.release);
-            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].build = {1}",   fileId, file.build);
+            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].build = {1}", fileId, file.build);
+
             AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].compatibility = {1}", fileId,
-                                      file.compatibility);
-            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].revision = {1}",      fileId, file.revision);
+                                       file.compatibility);
+
+            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].revision = {1}", fileId, file.revision);
             AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].unknown6 = 0x{1:X4}", fileId, file.unknown6);
+
             AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].password_valid = {1}", fileId,
-                                      file.password_valid > 0);
+                                       file.password_valid > 0);
+
             AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].password = {1}", fileId,
-                                      Encoding.GetString(file.password));
+                                       Encoding.GetString(file.password));
+
             AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].unknown7 = 0x{1:X2}{2:X2}{3:X2}", fileId,
-                                      file.unknown7[0], file.unknown7[1], file.unknown7[2]);
+                                       file.unknown7[0], file.unknown7[1], file.unknown7[2]);
+
             AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].overhead = {1}", fileId, file.overhead);
+
             AaruConsole.DebugWriteLine("LisaFS plugin",
-                                      "ExtentFile[{0}].unknown8 = 0x{1:X2}{2:X2}{3:X2}{4:X2}{5:X2}{6:X2}{7:X2}{8:X2}{9:X2}" +
-                                      "{10:X2}{11:X2}{12:X2}{13:X2}{14:X2}{15:X2}{16:X2}", fileId, file.unknown8[0],
-                                      file.unknown8[1], file.unknown8[2], file.unknown8[3], file.unknown8[4],
-                                      file.unknown8[5], file.unknown8[6], file.unknown8[7], file.unknown8[8],
-                                      file.unknown8[9], file.unknown8[10], file.unknown8[11], file.unknown8[12],
-                                      file.unknown8[13], file.unknown8[14], file.unknown8[15]);
-            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].length = {1}",        fileId, file.length);
+                                       "ExtentFile[{0}].unknown8 = 0x{1:X2}{2:X2}{3:X2}{4:X2}{5:X2}{6:X2}{7:X2}{8:X2}{9:X2}" +
+                                       "{10:X2}{11:X2}{12:X2}{13:X2}{14:X2}{15:X2}{16:X2}", fileId, file.unknown8[0],
+                                       file.unknown8[1], file.unknown8[2], file.unknown8[3], file.unknown8[4],
+                                       file.unknown8[5], file.unknown8[6], file.unknown8[7], file.unknown8[8],
+                                       file.unknown8[9], file.unknown8[10], file.unknown8[11], file.unknown8[12],
+                                       file.unknown8[13], file.unknown8[14], file.unknown8[15]);
+
+            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].length = {1}", fileId, file.length);
             AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].unknown9 = 0x{1:X8}", fileId, file.unknown9);
+
             for(int ext = 0; ext < file.extents.Length; ext++)
             {
                 AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].extents[{1}].start = {2}", fileId, ext,
-                                          file.extents[ext].start);
+                                           file.extents[ext].start);
+
                 AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].extents[{1}].length = {2}", fileId, ext,
-                                          file.extents[ext].length);
+                                           file.extents[ext].length);
             }
 
             AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].unknown10 = 0x{1:X4}", fileId, file.unknown10);
@@ -255,12 +278,11 @@ namespace Aaru.Filesystems.LisaFS
             return Errno.NoError;
         }
 
-        /// <summary>
-        ///     Reads all the S-Records and caches it
-        /// </summary>
+        /// <summary>Reads all the S-Records and caches it</summary>
         Errno ReadSRecords()
         {
-            if(!mounted) return Errno.AccessDenied;
+            if(!mounted)
+                return Errno.AccessDenied;
 
             // Searches the S-Records place using MDDF pointers
             byte[] sectors = device.ReadSectors(mddf.srec_ptr + mddf.mddf_block + volumePrefix, mddf.srec_len);
@@ -271,10 +293,10 @@ namespace Aaru.Filesystems.LisaFS
             for(int s = 0; s < srecords.Length; s++)
                 srecords[s] = new SRecord
                 {
-                    extent_ptr = BigEndianBitConverter.ToUInt32(sectors, 0x00 + 14 * s),
-                    unknown    = BigEndianBitConverter.ToUInt32(sectors, 0x04 + 14 * s),
-                    filesize   = BigEndianBitConverter.ToUInt32(sectors, 0x08 + 14 * s),
-                    flags      = BigEndianBitConverter.ToUInt16(sectors, 0x0C + 14 * s)
+                    extent_ptr = BigEndianBitConverter.ToUInt32(sectors, 0x00 + (14 * s)),
+                    unknown    = BigEndianBitConverter.ToUInt32(sectors, 0x04 + (14 * s)),
+                    filesize   = BigEndianBitConverter.ToUInt32(sectors, 0x08 + (14 * s)),
+                    flags      = BigEndianBitConverter.ToUInt16(sectors, 0x0C + (14 * s))
                 };
 
             return Errno.NoError;
diff --git a/Aaru.Filesystems/LisaFS/File.cs b/Aaru.Filesystems/LisaFS/File.cs
index b219b1256..8636ccfed 100644
--- a/Aaru.Filesystems/LisaFS/File.cs
+++ b/Aaru.Filesystems/LisaFS/File.cs
@@ -45,9 +45,12 @@ namespace Aaru.Filesystems.LisaFS
             attributes = new FileAttributes();
 
             Errno error = LookupFileId(path, out short fileId, out bool isDir);
-            if(error != Errno.NoError) return error;
 
-            if(!isDir) return GetAttributes(fileId, out attributes);
+            if(error != Errno.NoError)
+                return error;
+
+            if(!isDir)
+                return GetAttributes(fileId, out attributes);
 
             attributes = FileAttributes.Directory;
 
@@ -59,15 +62,20 @@ namespace Aaru.Filesystems.LisaFS
             if(size == 0)
             {
                 buf = new byte[0];
+
                 return Errno.NoError;
             }
 
-            if(offset < 0) return Errno.InvalidArgument;
+            if(offset < 0)
+                return Errno.InvalidArgument;
 
             Errno error = LookupFileId(path, out short fileId, out _);
-            if(error != Errno.NoError) return error;
+
+            if(error != Errno.NoError)
+                return error;
 
             byte[] tmp;
+
             if(debug)
                 switch(fileId)
                 {
@@ -78,21 +86,28 @@ namespace Aaru.Filesystems.LisaFS
                     case (short)FILEID_SRECORD:
                     case (short)FILEID_CATALOG:
                         error = ReadSystemFile(fileId, out tmp);
+
                         break;
                     default:
                         error = ReadFile(fileId, out tmp);
+
                         break;
                 }
-            else error = ReadFile(fileId, out tmp);
+            else
+                error = ReadFile(fileId, out tmp);
 
-            if(error != Errno.NoError) return error;
+            if(error != Errno.NoError)
+                return error;
 
-            if(offset >= tmp.Length) return Errno.EINVAL;
+            if(offset >= tmp.Length)
+                return Errno.EINVAL;
 
-            if(size + offset >= tmp.Length) size = tmp.Length - offset;
+            if(size + offset >= tmp.Length)
+                size = tmp.Length - offset;
 
             buf = new byte[size];
             Array.Copy(tmp, offset, buf, 0, size);
+
             return Errno.NoError;
         }
 
@@ -100,7 +115,9 @@ namespace Aaru.Filesystems.LisaFS
         {
             stat = null;
             Errno error = LookupFileId(path, out short fileId, out bool isDir);
-            if(error != Errno.NoError) return error;
+
+            if(error != Errno.NoError)
+                return error;
 
             return isDir ? StatDir(fileId, out stat) : Stat(fileId, out stat);
         }
@@ -108,11 +125,14 @@ namespace Aaru.Filesystems.LisaFS
         Errno GetAttributes(short fileId, out FileAttributes attributes)
         {
             attributes = new FileAttributes();
-            if(!mounted) return Errno.AccessDenied;
+
+            if(!mounted)
+                return Errno.AccessDenied;
 
             if(fileId < 4)
             {
-                if(!debug) return Errno.NoSuchFile;
+                if(!debug)
+                    return Errno.NoSuchFile;
 
                 attributes =  new FileAttributes();
                 attributes =  FileAttributes.System;
@@ -125,30 +145,40 @@ namespace Aaru.Filesystems.LisaFS
 
             Errno error = ReadExtentsFile(fileId, out ExtentFile extFile);
 
-            if(error != Errno.NoError) return error;
+            if(error != Errno.NoError)
+                return error;
 
             switch(extFile.ftype)
             {
                 case FileType.Spool:
                     attributes |= FileAttributes.CharDevice;
+
                     break;
                 case FileType.UserCat:
                 case FileType.RootCat:
                     attributes |= FileAttributes.Directory;
+
                     break;
                 case FileType.Pipe:
                     attributes |= FileAttributes.Pipe;
+
                     break;
                 case FileType.Undefined: break;
                 default:
                     attributes |= FileAttributes.File;
                     attributes |= FileAttributes.Extents;
+
                     break;
             }
 
-            if(extFile.protect        > 0) attributes |= FileAttributes.Immutable;
-            if(extFile.locked         > 0) attributes |= FileAttributes.ReadOnly;
-            if(extFile.password_valid > 0) attributes |= FileAttributes.Password;
+            if(extFile.protect > 0)
+                attributes |= FileAttributes.Immutable;
+
+            if(extFile.locked > 0)
+                attributes |= FileAttributes.ReadOnly;
+
+            if(extFile.password_valid > 0)
+                attributes |= FileAttributes.Password;
 
             return Errno.NoError;
         }
@@ -158,13 +188,20 @@ namespace Aaru.Filesystems.LisaFS
         Errno ReadSystemFile(short fileId, out byte[] buf, bool tags)
         {
             buf = null;
-            if(!mounted || !debug) return Errno.AccessDenied;
 
-            if(fileId > 4 || fileId <= 0)
-                if(fileId != FILEID_BOOT_SIGNED && fileId != FILEID_LOADER_SIGNED)
+            if(!mounted ||
+               !debug)
+                return Errno.AccessDenied;
+
+            if(fileId > 4 ||
+               fileId <= 0)
+                if(fileId != FILEID_BOOT_SIGNED &&
+                   fileId != FILEID_LOADER_SIGNED)
                     return Errno.InvalidArgument;
 
-            if(systemFileCache.TryGetValue(fileId, out buf) && !tags) return Errno.NoError;
+            if(systemFileCache.TryGetValue(fileId, out buf) &&
+               !tags)
+                return Errno.NoError;
 
             int count = 0;
 
@@ -173,12 +210,14 @@ namespace Aaru.Filesystems.LisaFS
                 {
                     buf = device.ReadSectors(mddf.mddf_block + volumePrefix + mddf.srec_ptr, mddf.srec_len);
                     systemFileCache.Add(fileId, buf);
+
                     return Errno.NoError;
                 }
                 else
                 {
                     buf = device.ReadSectorsTag(mddf.mddf_block + volumePrefix + mddf.srec_ptr, mddf.srec_len,
                                                 SectorTagType.AppleSectorTag);
+
                     return Errno.NoError;
                 }
 
@@ -189,10 +228,12 @@ namespace Aaru.Filesystems.LisaFS
             {
                 DecodeTag(device.ReadSectorTag(i, SectorTagType.AppleSectorTag), out sysTag);
 
-                if(sysTag.FileId == fileId) count++;
+                if(sysTag.FileId == fileId)
+                    count++;
             }
 
-            if(count == 0) return Errno.NoSuchFile;
+            if(count == 0)
+                return Errno.NoSuchFile;
 
             buf = !tags ? new byte[count * device.Info.SectorSize] : new byte[count * devTagSize];
 
@@ -201,17 +242,20 @@ namespace Aaru.Filesystems.LisaFS
             {
                 DecodeTag(device.ReadSectorTag(i, SectorTagType.AppleSectorTag), out sysTag);
 
-                if(sysTag.FileId != fileId) continue;
+                if(sysTag.FileId != fileId)
+                    continue;
 
                 byte[] sector = !tags ? device.ReadSector(i) : device.ReadSectorTag(i, SectorTagType.AppleSectorTag);
 
                 // Relative block for $Loader starts at $Boot block
-                if(sysTag.FileId == FILEID_LOADER_SIGNED) sysTag.RelPage--;
+                if(sysTag.FileId == FILEID_LOADER_SIGNED)
+                    sysTag.RelPage--;
 
                 Array.Copy(sector, 0, buf, sector.Length * sysTag.RelPage, sector.Length);
             }
 
-            if(!tags) systemFileCache.Add(fileId, buf);
+            if(!tags)
+                systemFileCache.Add(fileId, buf);
 
             return Errno.NoError;
         }
@@ -220,24 +264,36 @@ namespace Aaru.Filesystems.LisaFS
         {
             stat = null;
 
-            if(!mounted) return Errno.AccessDenied;
+            if(!mounted)
+                return Errno.AccessDenied;
 
             Errno      error;
             ExtentFile file;
 
             if(fileId <= 4)
-                if(!debug || fileId == 0) return Errno.NoSuchFile;
+                if(!debug ||
+                   fileId == 0)
+                    return Errno.NoSuchFile;
                 else
                 {
-                    stat = new FileEntryInfo {Attributes = new FileAttributes()};
+                    stat = new FileEntryInfo
+                    {
+                        Attributes = new FileAttributes()
+                    };
 
                     error = GetAttributes(fileId, out stat.Attributes);
-                    if(error != Errno.NoError) return error;
 
-                    if(fileId < 0 && fileId != FILEID_BOOT_SIGNED && fileId != FILEID_LOADER_SIGNED)
+                    if(error != Errno.NoError)
+                        return error;
+
+                    if(fileId < 0                   &&
+                       fileId != FILEID_BOOT_SIGNED &&
+                       fileId != FILEID_LOADER_SIGNED)
                     {
                         error = ReadExtentsFile((short)(fileId * -1), out file);
-                        if(error != Errno.NoError) return error;
+
+                        if(error != Errno.NoError)
+                            return error;
 
                         stat.CreationTime  = DateHandlers.LisaToDateTime(file.dtc);
                         stat.AccessTime    = DateHandlers.LisaToDateTime(file.dta);
@@ -253,7 +309,9 @@ namespace Aaru.Filesystems.LisaFS
                     else
                     {
                         error = ReadSystemFile(fileId, out byte[] buf);
-                        if(error != Errno.NoError) return error;
+
+                        if(error != Errno.NoError)
+                            return error;
 
                         stat.CreationTime = fileId != 4 ? mddf.dtvc : mddf.dtcc;
 
@@ -269,12 +327,20 @@ namespace Aaru.Filesystems.LisaFS
                     return Errno.NoError;
                 }
 
-            stat  = new FileEntryInfo {Attributes = new FileAttributes()};
+            stat = new FileEntryInfo
+            {
+                Attributes = new FileAttributes()
+            };
+
             error = GetAttributes(fileId, out stat.Attributes);
-            if(error != Errno.NoError) return error;
+
+            if(error != Errno.NoError)
+                return error;
 
             error = ReadExtentsFile(fileId, out file);
-            if(error != Errno.NoError) return error;
+
+            if(error != Errno.NoError)
+                return error;
 
             stat.CreationTime  = DateHandlers.LisaToDateTime(file.dtc);
             stat.AccessTime    = DateHandlers.LisaToDateTime(file.dta);
@@ -283,8 +349,12 @@ namespace Aaru.Filesystems.LisaFS
 
             stat.Inode = (ulong)fileId;
             stat.Links = 1;
-            if(!fileSizeCache.TryGetValue(fileId, out int len)) stat.Length = srecords[fileId].filesize;
-            else stat.Length                                                = len;
+
+            if(!fileSizeCache.TryGetValue(fileId, out int len))
+                stat.Length = srecords[fileId].filesize;
+            else
+                stat.Length = len;
+
             stat.BlockSize = mddf.datasize;
             stat.Blocks    = file.length;
 
@@ -296,25 +366,36 @@ namespace Aaru.Filesystems.LisaFS
         Errno ReadFile(short fileId, out byte[] buf, bool tags)
         {
             buf = null;
-            if(!mounted) return Errno.AccessDenied;
+
+            if(!mounted)
+                return Errno.AccessDenied;
 
             tags &= debug;
 
-            if(fileId < 4 || fileId == 4 && mddf.fsversion != LISA_V2 && mddf.fsversion != LISA_V1)
+            if(fileId < 4 ||
+               (fileId == 4 && mddf.fsversion != LISA_V2 && mddf.fsversion != LISA_V1))
                 return Errno.InvalidArgument;
 
-            if(!tags && fileCache.TryGetValue(fileId, out buf)) return Errno.NoError;
+            if(!tags &&
+               fileCache.TryGetValue(fileId, out buf))
+                return Errno.NoError;
 
             Errno error = ReadExtentsFile(fileId, out ExtentFile file);
-            if(error != Errno.NoError) return error;
+
+            if(error != Errno.NoError)
+                return error;
 
             int sectorSize;
-            if(tags) sectorSize = devTagSize;
-            else sectorSize     = (int)device.Info.SectorSize;
+
+            if(tags)
+                sectorSize = devTagSize;
+            else
+                sectorSize = (int)device.Info.SectorSize;
 
             byte[] temp = new byte[file.length * sectorSize];
 
             int offset = 0;
+
             for(int i = 0; i < file.extents.Length; i++)
             {
                 byte[] sector;
@@ -335,11 +416,13 @@ namespace Aaru.Filesystems.LisaFS
                 if(fileSizeCache.TryGetValue(fileId, out int realSize))
                     if(realSize > temp.Length)
                         AaruConsole.ErrorWriteLine("File {0} gets truncated.", fileId);
+
                 buf = temp;
 
                 fileCache.Add(fileId, buf);
             }
-            else buf = temp;
+            else
+                buf = temp;
 
             return Errno.NoError;
         }
@@ -349,49 +432,61 @@ namespace Aaru.Filesystems.LisaFS
             fileId = 0;
             isDir  = false;
 
-            if(!mounted) return Errno.AccessDenied;
+            if(!mounted)
+                return Errno.AccessDenied;
 
-            string[] pathElements = path.Split(new[] {'/'}, StringSplitOptions.RemoveEmptyEntries);
+            string[] pathElements = path.Split(new[]
+            {
+                '/'
+            }, StringSplitOptions.RemoveEmptyEntries);
 
             if(pathElements.Length == 0)
             {
                 fileId = DIRID_ROOT;
                 isDir  = true;
+
                 return Errno.NoError;
             }
 
             // Only V3 supports subdirectories
-            if(pathElements.Length > 1 && mddf.fsversion != LISA_V3) return Errno.NotSupported;
+            if(pathElements.Length > 1 &&
+               mddf.fsversion      != LISA_V3)
+                return Errno.NotSupported;
 
             if(debug && pathElements.Length == 1)
             {
                 if(string.Compare(pathElements[0], "$MDDF", StringComparison.InvariantCulture) == 0)
                 {
                     fileId = (short)FILEID_MDDF;
+
                     return Errno.NoError;
                 }
 
                 if(string.Compare(pathElements[0], "$Boot", StringComparison.InvariantCulture) == 0)
                 {
                     fileId = FILEID_BOOT_SIGNED;
+
                     return Errno.NoError;
                 }
 
                 if(string.Compare(pathElements[0], "$Loader", StringComparison.InvariantCulture) == 0)
                 {
                     fileId = FILEID_LOADER_SIGNED;
+
                     return Errno.NoError;
                 }
 
                 if(string.Compare(pathElements[0], "$Bitmap", StringComparison.InvariantCulture) == 0)
                 {
                     fileId = (short)FILEID_BITMAP;
+
                     return Errno.NoError;
                 }
 
                 if(string.Compare(pathElements[0], "$S-Record", StringComparison.InvariantCulture) == 0)
                 {
                     fileId = (short)FILEID_SRECORD;
+
                     return Errno.NoError;
                 }
 
@@ -399,6 +494,7 @@ namespace Aaru.Filesystems.LisaFS
                 {
                     fileId = DIRID_ROOT;
                     isDir  = true;
+
                     return Errno.NoError;
                 }
             }
@@ -413,17 +509,20 @@ namespace Aaru.Filesystems.LisaFS
 
                     // LisaOS is case insensitive
                     if(string.Compare(wantedFilename, filename, StringComparison.InvariantCultureIgnoreCase) != 0 ||
-                       entry.parentID !=
-                       fileId) continue;
+                       entry.parentID                                                                        != fileId)
+                        continue;
 
                     fileId = entry.fileID;
                     isDir  = entry.fileType == 0x01;
 
                     // Not last path element, and it's not a directory
-                    if(lvl != pathElements.Length - 1 && !isDir) return Errno.NotDirectory;
+                    if(lvl != pathElements.Length - 1 &&
+                       !isDir)
+                        return Errno.NotDirectory;
 
                     // Arrived last path element
-                    if(lvl == pathElements.Length - 1) return Errno.NoError;
+                    if(lvl == pathElements.Length - 1)
+                        return Errno.NoError;
                 }
             }
 
diff --git a/Aaru.Filesystems/LisaFS/Info.cs b/Aaru.Filesystems/LisaFS/Info.cs
index bb5236399..2af46814d 100644
--- a/Aaru.Filesystems/LisaFS/Info.cs
+++ b/Aaru.Filesystems/LisaFS/Info.cs
@@ -32,12 +32,12 @@
 
 using System;
 using System.Text;
-using Claunia.Encoding;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
 using Aaru.Decoders;
+using Claunia.Encoding;
 using Schemas;
 using Encoding = System.Text.Encoding;
 
@@ -49,12 +49,15 @@ namespace Aaru.Filesystems.LisaFS
         {
             try
             {
-                if(imagePlugin.Info.ReadableSectorTags == null) return false;
+                if(imagePlugin.Info.ReadableSectorTags == null)
+                    return false;
 
-                if(!imagePlugin.Info.ReadableSectorTags.Contains(SectorTagType.AppleSectorTag)) return false;
+                if(!imagePlugin.Info.ReadableSectorTags.Contains(SectorTagType.AppleSectorTag))
+                    return false;
 
                 // Minimal LisaOS disk is 3.5" single sided double density, 800 sectors
-                if(imagePlugin.Info.Sectors < 800) return false;
+                if(imagePlugin.Info.Sectors < 800)
+                    return false;
 
                 int beforeMddf = -1;
 
@@ -66,12 +69,16 @@ namespace Aaru.Filesystems.LisaFS
 
                     AaruConsole.DebugWriteLine("LisaFS plugin", "Sector {0}, file ID 0x{1:X4}", i, searchTag.FileId);
 
-                    if(beforeMddf == -1 && searchTag.FileId == FILEID_LOADER_SIGNED) beforeMddf = i - 1;
+                    if(beforeMddf       == -1 &&
+                       searchTag.FileId == FILEID_LOADER_SIGNED)
+                        beforeMddf = i - 1;
 
-                    if(searchTag.FileId != FILEID_MDDF) continue;
+                    if(searchTag.FileId != FILEID_MDDF)
+                        continue;
 
                     byte[] sector = imagePlugin.ReadSector((ulong)i);
-                    MDDF infoMddf = new MDDF
+
+                    var infoMddf = new MDDF
                     {
                         mddf_block                   = BigEndianBitConverter.ToUInt32(sector, 0x6C),
                         volsize_minus_one            = BigEndianBitConverter.ToUInt32(sector, 0x70),
@@ -81,30 +88,36 @@ namespace Aaru.Filesystems.LisaFS
                         datasize                     = BigEndianBitConverter.ToUInt16(sector, 0x7E)
                     };
 
-                    AaruConsole.DebugWriteLine("LisaFS plugin", "Current sector = {0}",        i);
-                    AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.mddf_block = {0}",       infoMddf.mddf_block);
-                    AaruConsole.DebugWriteLine("LisaFS plugin", "Disk size = {0} sectors",     imagePlugin.Info.Sectors);
+                    AaruConsole.DebugWriteLine("LisaFS plugin", "Current sector = {0}", i);
+                    AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.mddf_block = {0}", infoMddf.mddf_block);
+                    AaruConsole.DebugWriteLine("LisaFS plugin", "Disk size = {0} sectors", imagePlugin.Info.Sectors);
                     AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.vol_size = {0} sectors", infoMddf.vol_size);
-                    AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.vol_size - 1 = {0}",
-                                              infoMddf.volsize_minus_one);
+                    AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.vol_size - 1 = {0}", infoMddf.volsize_minus_one);
+
                     AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.vol_size - mddf.mddf_block -1 = {0}",
-                                              infoMddf.volsize_minus_mddf_minus_one);
-                    AaruConsole.DebugWriteLine("LisaFS plugin", "Disk sector = {0} bytes",
-                                              imagePlugin.Info.SectorSize);
+                                               infoMddf.volsize_minus_mddf_minus_one);
+
+                    AaruConsole.DebugWriteLine("LisaFS plugin", "Disk sector = {0} bytes", imagePlugin.Info.SectorSize);
                     AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.blocksize = {0} bytes", infoMddf.blocksize);
-                    AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.datasize = {0} bytes",  infoMddf.datasize);
+                    AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.datasize = {0} bytes", infoMddf.datasize);
 
-                    if(infoMddf.mddf_block != i - beforeMddf) return false;
+                    if(infoMddf.mddf_block != i - beforeMddf)
+                        return false;
 
-                    if(infoMddf.vol_size > imagePlugin.Info.Sectors) return false;
+                    if(infoMddf.vol_size > imagePlugin.Info.Sectors)
+                        return false;
 
-                    if(infoMddf.vol_size - 1 != infoMddf.volsize_minus_one) return false;
+                    if(infoMddf.vol_size - 1 != infoMddf.volsize_minus_one)
+                        return false;
 
-                    if(infoMddf.vol_size - i - 1 != infoMddf.volsize_minus_mddf_minus_one - beforeMddf) return false;
+                    if(infoMddf.vol_size - i - 1 != infoMddf.volsize_minus_mddf_minus_one - beforeMddf)
+                        return false;
 
-                    if(infoMddf.datasize > infoMddf.blocksize) return false;
+                    if(infoMddf.datasize > infoMddf.blocksize)
+                        return false;
 
-                    if(infoMddf.blocksize < imagePlugin.Info.SectorSize) return false;
+                    if(infoMddf.blocksize < imagePlugin.Info.SectorSize)
+                        return false;
 
                     return infoMddf.datasize == imagePlugin.Info.SectorSize;
                 }
@@ -114,25 +127,29 @@ namespace Aaru.Filesystems.LisaFS
             catch(Exception ex)
             {
                 AaruConsole.ErrorWriteLine("Exception {0}, {1}, {2}", ex.Message, ex.InnerException, ex.StackTrace);
+
                 return false;
             }
         }
 
         public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding    encoding)
+                                   Encoding encoding)
         {
             Encoding    = new LisaRoman();
             information = "";
-            StringBuilder sb = new StringBuilder();
+            var sb = new StringBuilder();
 
             try
             {
-                if(imagePlugin.Info.ReadableSectorTags == null) return;
+                if(imagePlugin.Info.ReadableSectorTags == null)
+                    return;
 
-                if(!imagePlugin.Info.ReadableSectorTags.Contains(SectorTagType.AppleSectorTag)) return;
+                if(!imagePlugin.Info.ReadableSectorTags.Contains(SectorTagType.AppleSectorTag))
+                    return;
 
                 // Minimal LisaOS disk is 3.5" single sided double density, 800 sectors
-                if(imagePlugin.Info.Sectors < 800) return;
+                if(imagePlugin.Info.Sectors < 800)
+                    return;
 
                 int beforeMddf = -1;
 
@@ -144,12 +161,15 @@ namespace Aaru.Filesystems.LisaFS
 
                     AaruConsole.DebugWriteLine("LisaFS plugin", "Sector {0}, file ID 0x{1:X4}", i, searchTag.FileId);
 
-                    if(beforeMddf == -1 && searchTag.FileId == FILEID_LOADER_SIGNED) beforeMddf = i - 1;
+                    if(beforeMddf       == -1 &&
+                       searchTag.FileId == FILEID_LOADER_SIGNED)
+                        beforeMddf = i - 1;
 
-                    if(searchTag.FileId != FILEID_MDDF) continue;
+                    if(searchTag.FileId != FILEID_MDDF)
+                        continue;
 
                     byte[] sector   = imagePlugin.ReadSector((ulong)i);
-                    MDDF   infoMddf = new MDDF();
+                    var    infoMddf = new MDDF();
                     byte[] pString  = new byte[33];
 
                     infoMddf.fsversion = BigEndianBitConverter.ToUInt16(sector, 0x00);
@@ -159,6 +179,7 @@ namespace Aaru.Filesystems.LisaFS
                     infoMddf.volname  = StringHandlers.PascalToString(pString, Encoding);
                     infoMddf.unknown1 = sector[0x2D];
                     Array.Copy(sector, 0x2E, pString, 0, 33);
+
                     // Prevent garbage
                     infoMddf.password       = pString[0] <= 32 ? StringHandlers.PascalToString(pString, Encoding) : "";
                     infoMddf.unknown2       = sector[0x4F];
@@ -231,14 +252,14 @@ namespace Aaru.Filesystems.LisaFS
                     infoMddf.vol_sequence                 = BigEndianBitConverter.ToUInt16(sector, 0x136);
                     infoMddf.vol_left_mounted             = sector[0x138];
 
-                    AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown1 = 0x{0:X2} ({0})",  infoMddf.unknown1);
-                    AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown2 = 0x{0:X2} ({0})",  infoMddf.unknown2);
-                    AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown3 = 0x{0:X8} ({0})",  infoMddf.unknown3);
-                    AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown4 = 0x{0:X4} ({0})",  infoMddf.unknown4);
-                    AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown5 = 0x{0:X8} ({0})",  infoMddf.unknown5);
-                    AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown6 = 0x{0:X8} ({0})",  infoMddf.unknown6);
-                    AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown7 = 0x{0:X8} ({0})",  infoMddf.unknown7);
-                    AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown9 = 0x{0:X4} ({0})",  infoMddf.unknown9);
+                    AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown1 = 0x{0:X2} ({0})", infoMddf.unknown1);
+                    AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown2 = 0x{0:X2} ({0})", infoMddf.unknown2);
+                    AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown3 = 0x{0:X8} ({0})", infoMddf.unknown3);
+                    AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown4 = 0x{0:X4} ({0})", infoMddf.unknown4);
+                    AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown5 = 0x{0:X8} ({0})", infoMddf.unknown5);
+                    AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown6 = 0x{0:X8} ({0})", infoMddf.unknown6);
+                    AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown7 = 0x{0:X8} ({0})", infoMddf.unknown7);
+                    AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown9 = 0x{0:X4} ({0})", infoMddf.unknown9);
                     AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown10 = 0x{0:X8} ({0})", infoMddf.unknown10);
                     AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown11 = 0x{0:X8} ({0})", infoMddf.unknown11);
                     AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown12 = 0x{0:X8} ({0})", infoMddf.unknown12);
@@ -268,37 +289,49 @@ namespace Aaru.Filesystems.LisaFS
                     AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown36 = 0x{0:X8} ({0})", infoMddf.unknown36);
                     AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown37 = 0x{0:X8} ({0})", infoMddf.unknown37);
                     AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown38 = 0x{0:X8} ({0})", infoMddf.unknown38);
+
                     AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown_timestamp = 0x{0:X8} ({0}, {1})",
-                                              infoMddf.unknown_timestamp,
-                                              DateHandlers.LisaToDateTime(infoMddf.unknown_timestamp));
+                                               infoMddf.unknown_timestamp,
+                                               DateHandlers.LisaToDateTime(infoMddf.unknown_timestamp));
 
-                    if(infoMddf.mddf_block != i - beforeMddf) return;
+                    if(infoMddf.mddf_block != i - beforeMddf)
+                        return;
 
-                    if(infoMddf.vol_size > imagePlugin.Info.Sectors) return;
+                    if(infoMddf.vol_size > imagePlugin.Info.Sectors)
+                        return;
 
-                    if(infoMddf.vol_size - 1 != infoMddf.volsize_minus_one) return;
+                    if(infoMddf.vol_size - 1 != infoMddf.volsize_minus_one)
+                        return;
 
-                    if(infoMddf.vol_size - i - 1 != infoMddf.volsize_minus_mddf_minus_one - beforeMddf) return;
+                    if(infoMddf.vol_size - i - 1 != infoMddf.volsize_minus_mddf_minus_one - beforeMddf)
+                        return;
 
-                    if(infoMddf.datasize > infoMddf.blocksize) return;
+                    if(infoMddf.datasize > infoMddf.blocksize)
+                        return;
 
-                    if(infoMddf.blocksize < imagePlugin.Info.SectorSize) return;
+                    if(infoMddf.blocksize < imagePlugin.Info.SectorSize)
+                        return;
 
-                    if(infoMddf.datasize != imagePlugin.Info.SectorSize) return;
+                    if(infoMddf.datasize != imagePlugin.Info.SectorSize)
+                        return;
 
                     switch(infoMddf.fsversion)
                     {
                         case LISA_V1:
                             sb.AppendLine("LisaFS v1");
+
                             break;
                         case LISA_V2:
                             sb.AppendLine("LisaFS v2");
+
                             break;
                         case LISA_V3:
                             sb.AppendLine("LisaFS v3");
+
                             break;
                         default:
                             sb.AppendFormat("Uknown LisaFS version {0}", infoMddf.fsversion).AppendLine();
+
                             break;
                     }
 
@@ -311,8 +344,9 @@ namespace Aaru.Filesystems.LisaFS
 
                     sb.AppendFormat("Volume is number {0} of {1}", infoMddf.volnum, infoMddf.vol_sequence).AppendLine();
 
-                    sb.AppendFormat("Serial number of Lisa computer that created this volume: {0}", infoMddf.machine_id)
-                      .AppendLine();
+                    sb.AppendFormat("Serial number of Lisa computer that created this volume: {0}",
+                                    infoMddf.machine_id).AppendLine();
+
                     sb.AppendFormat("Serial number of Lisa computer that can use this volume's software {0}",
                                     infoMddf.serialization).AppendLine();
 
@@ -323,8 +357,10 @@ namespace Aaru.Filesystems.LisaFS
                     sb.AppendFormat("MDDF is in block {0}", infoMddf.mddf_block + beforeMddf).AppendLine();
                     sb.AppendFormat("There are {0} reserved blocks before volume", beforeMddf).AppendLine();
                     sb.AppendFormat("{0} blocks minus one", infoMddf.volsize_minus_one).AppendLine();
-                    sb.AppendFormat("{0} blocks minus one minus MDDF offset", infoMddf.volsize_minus_mddf_minus_one)
-                      .AppendLine();
+
+                    sb.AppendFormat("{0} blocks minus one minus MDDF offset", infoMddf.volsize_minus_mddf_minus_one).
+                       AppendLine();
+
                     sb.AppendFormat("{0} blocks in volume", infoMddf.vol_size).AppendLine();
                     sb.AppendFormat("{0} bytes per sector (uncooked)", infoMddf.blocksize).AppendLine();
                     sb.AppendFormat("{0} bytes per sector", infoMddf.datasize).AppendLine();
@@ -338,15 +374,17 @@ namespace Aaru.Filesystems.LisaFS
                     sb.AppendFormat("Boot code: 0x{0:X8}", infoMddf.boot_code).AppendLine();
                     sb.AppendFormat("Boot environment:  0x{0:X8}", infoMddf.boot_environ).AppendLine();
                     sb.AppendFormat("Overmount stamp: 0x{0:X16}", infoMddf.overmount_stamp).AppendLine();
+
                     sb.AppendFormat("S-Records start at {0} and spans for {1} blocks",
-                                    infoMddf.srec_ptr + infoMddf.mddf_block + beforeMddf, infoMddf.srec_len)
-                      .AppendLine();
+                                    infoMddf.srec_ptr + infoMddf.mddf_block + beforeMddf, infoMddf.srec_len).
+                       AppendLine();
 
                     sb.AppendLine(infoMddf.vol_left_mounted == 0 ? "Volume is clean" : "Volume is dirty");
 
                     information = sb.ToString();
 
                     XmlFsType = new FileSystemType();
+
                     if(DateTime.Compare(infoMddf.dtvb, DateHandlers.LisaToDateTime(0)) > 0)
                     {
                         XmlFsType.BackupDate          = infoMddf.dtvb;
@@ -355,6 +393,7 @@ namespace Aaru.Filesystems.LisaFS
 
                     XmlFsType.Clusters    = infoMddf.vol_size;
                     XmlFsType.ClusterSize = (uint)(infoMddf.clustersize * infoMddf.datasize);
+
                     if(DateTime.Compare(infoMddf.dtvc, DateHandlers.LisaToDateTime(0)) > 0)
                     {
                         XmlFsType.CreationDate          = infoMddf.dtvc;
diff --git a/Aaru.Filesystems/LisaFS/LisaFS.cs b/Aaru.Filesystems/LisaFS/LisaFS.cs
index 0faa7a382..470b536aa 100644
--- a/Aaru.Filesystems/LisaFS/LisaFS.cs
+++ b/Aaru.Filesystems/LisaFS/LisaFS.cs
@@ -59,17 +59,25 @@ namespace Aaru.Filesystems.LisaFS
 
         // TODO: Implement Lisa 7/7 namespace (needs decoding {!CATALOG} file)
         public IEnumerable<(string name, Type type, string description)> SupportedOptions =>
-            new (string name, Type type, string description)[] { };
+            new (string name, Type type, string description)[]
+                {};
 
-        public Dictionary<string, string> Namespaces =>
-            new Dictionary<string, string>
+        public Dictionary<string, string> Namespaces => new Dictionary<string, string>
+        {
             {
-                {"workshop", "Filenames as shown by the Lisa Pascal Workshop (default)"},
-                {"office", "Filenames as shown by the Lisa Office System (not yet implemented)"}
-            };
+                "workshop", "Filenames as shown by the Lisa Pascal Workshop (default)"
+            },
+            {
+                "office", "Filenames as shown by the Lisa Office System (not yet implemented)"
+            }
+        };
 
-        static Dictionary<string, string> GetDefaultOptions() =>
-            new Dictionary<string, string> {{"debug", false.ToString()}};
+        static Dictionary<string, string> GetDefaultOptions() => new Dictionary<string, string>
+        {
+            {
+                "debug", false.ToString()
+            }
+        };
 
         #region Caches
         /// <summary>Caches Extents Files</summary>
diff --git a/Aaru.Filesystems/LisaFS/Structs.cs b/Aaru.Filesystems/LisaFS/Structs.cs
index 783390d4e..085d44bd1 100644
--- a/Aaru.Filesystems/LisaFS/Structs.cs
+++ b/Aaru.Filesystems/LisaFS/Structs.cs
@@ -37,11 +37,9 @@ namespace Aaru.Filesystems.LisaFS
     public partial class LisaFS
     {
         /// <summary>
-        ///     The MDDF is the most import block on a Lisa FS volume.
-        ///     It describes the volume and its contents.
-        ///     On initialization the memory where it resides is not emptied
-        ///     so it tends to contain a lot of garbage. This has difficulted
-        ///     its reverse engineering.
+        ///     The MDDF is the most import block on a Lisa FS volume. It describes the volume and its contents. On
+        ///     initialization the memory where it resides is not emptied so it tends to contain a lot of garbage. This has
+        ///     difficulted its reverse engineering.
         /// </summary>
         struct MDDF
         {
@@ -193,6 +191,7 @@ namespace Aaru.Filesystems.LisaFS
             public uint opencount;
             /// <summary>No idea (On-disk position unknown)</summary>
             public uint copy_thread;
+
             // Flags are boolean, but Pascal seems to use them as full unsigned 8 bit values
             /// <summary>No idea (On-disk position unknown)</summary>
             public byte privileged;
@@ -209,10 +208,10 @@ namespace Aaru.Filesystems.LisaFS
         }
 
         /// <summary>
-        ///     An entry in the catalog from V3.
-        ///     The first entry is bigger than the rest, may be a header, I have not needed any of its values so I just ignored it.
-        ///     Each catalog is divided in 4-sector blocks, and if it needs more than a block there are previous and next block
-        ///     pointers, effectively making the V3 catalog a double-linked list. Garbage is not zeroed.
+        ///     An entry in the catalog from V3. The first entry is bigger than the rest, may be a header, I have not needed
+        ///     any of its values so I just ignored it. Each catalog is divided in 4-sector blocks, and if it needs more than a
+        ///     block there are previous and next block pointers, effectively making the V3 catalog a double-linked list. Garbage
+        ///     is not zeroed.
         /// </summary>
         struct CatalogEntry
         {
@@ -225,11 +224,8 @@ namespace Aaru.Filesystems.LisaFS
             /// <summary>0x23, null-termination</summary>
             public byte terminator;
             /// <summary>
-            ///     At 0x24
-            ///     0x01 here for subdirectories, entries 48 bytes long
-            ///     0x03 here for entries 64 bytes long
-            ///     0x08 here for entries 78 bytes long
-            ///     This is incomplete, may fail, mostly works...
+            ///     At 0x24 0x01 here for subdirectories, entries 48 bytes long 0x03 here for entries 64 bytes long 0x08 here for
+            ///     entries 78 bytes long This is incomplete, may fail, mostly works...
             /// </summary>
             public byte fileType;
             /// <summary>0x25, lot of values found here, unknown</summary>
@@ -248,9 +244,7 @@ namespace Aaru.Filesystems.LisaFS
             public byte[] tail;
         }
 
-        /// <summary>
-        ///     An extent indicating a start and a run of sectors.
-        /// </summary>
+        /// <summary>An extent indicating a start and a run of sectors.</summary>
         struct Extent
         {
             public int   start;
@@ -258,12 +252,10 @@ namespace Aaru.Filesystems.LisaFS
         }
 
         /// <summary>
-        ///     The Extents File. There is one Extents File per each file stored on disk.
-        ///     The file ID present on the sectors tags for the Extents File is the negated
-        ///     value of the file ID it represents. e.g. file = 5 (0x0005) extents = -5 (0xFFFB)
-        ///     It spans a single sector on V2 and V3 but 2 sectors on V1.
-        ///     It contains all information about a file, and is indexed in the S-Records file.
-        ///     It also contains the label. Garbage is zeroed.
+        ///     The Extents File. There is one Extents File per each file stored on disk. The file ID present on the sectors
+        ///     tags for the Extents File is the negated value of the file ID it represents. e.g. file = 5 (0x0005) extents = -5
+        ///     (0xFFFB) It spans a single sector on V2 and V3 but 2 sectors on V1. It contains all information about a file, and
+        ///     is indexed in the S-Records file. It also contains the label. Garbage is zeroed.
         /// </summary>
         struct ExtentFile
         {
@@ -343,30 +335,23 @@ namespace Aaru.Filesystems.LisaFS
             /// <summary>0x17E, unknown, empty, padding?</summary>
             public short unknown10;
             /// <summary>
-            ///     At 0x180, this is the label.
-            ///     While 1982 pre-release documentation says the label can be up to 448 bytes, v1 onward only have space for a 128
-            ///     bytes one.
-            ///     Any application can write whatever they want in the label, however, Lisa Office uses it to store its own
-            ///     information, something
-            ///     that will effectively overwrite any information a user application wrote there.
-            ///     The information written here by Lisa Office is like the information Finder writes in the FinderInfo structures,
-            ///     plus
-            ///     the non-unique name that is shown on the GUI. For this reason I called it LisaInfo.
-            ///     I have not tried to reverse engineer it.
+            ///     At 0x180, this is the label. While 1982 pre-release documentation says the label can be up to 448 bytes, v1
+            ///     onward only have space for a 128 bytes one. Any application can write whatever they want in the label, however,
+            ///     Lisa Office uses it to store its own information, something that will effectively overwrite any information a user
+            ///     application wrote there. The information written here by Lisa Office is like the information Finder writes in the
+            ///     FinderInfo structures, plus the non-unique name that is shown on the GUI. For this reason I called it LisaInfo. I
+            ///     have not tried to reverse engineer it.
             /// </summary>
             public byte[] LisaInfo;
         }
 
         /// <summary>
-        ///     The S-Records File is a hashtable of S-Records, where the hash is the file ID they belong to.
-        ///     The S-Records File cannot be fragmented or grown, and it can easily become full before the 32766 file IDs are
-        ///     exhausted.
-        ///     Each S-Record entry contains a block pointer to the Extents File that correspond to that file ID as well as the
-        ///     real file size,
-        ///     the only important information about a file that's not inside the Extents File.
-        ///     It also contains a low value (less than 0x200) variable field of unknown meaning and another one that seems to be
-        ///     flags,
-        ///     with values like 0, 1, 3 and 5.
+        ///     The S-Records File is a hashtable of S-Records, where the hash is the file ID they belong to. The S-Records
+        ///     File cannot be fragmented or grown, and it can easily become full before the 32766 file IDs are exhausted. Each
+        ///     S-Record entry contains a block pointer to the Extents File that correspond to that file ID as well as the real
+        ///     file size, the only important information about a file that's not inside the Extents File. It also contains a low
+        ///     value (less than 0x200) variable field of unknown meaning and another one that seems to be flags, with values like
+        ///     0, 1, 3 and 5.
         /// </summary>
         struct SRecord
         {
@@ -381,13 +366,12 @@ namespace Aaru.Filesystems.LisaFS
         }
 
         /// <summary>
-        ///     The catalog entry for the V1 and V2 volume formats.
-        ///     It merely contains the file name, type and ID, plus a few (mostly empty) unknown fields.
-        ///     Contrary to V3, it has no header and instead of being a double-linked list it is fragmented using an Extents File.
-        ///     The Extents File position for the root catalog is then stored in the S-Records File.
-        ///     Its entries are not filed sequentially denoting some kind of in-memory structure while at the same time
-        ///     forcing LisaOS to read the whole catalog. That or I missed the pointers.
-        ///     Empty entries just contain a 0-len filename. Garbage is not zeroed.
+        ///     The catalog entry for the V1 and V2 volume formats. It merely contains the file name, type and ID, plus a few
+        ///     (mostly empty) unknown fields. Contrary to V3, it has no header and instead of being a double-linked list it is
+        ///     fragmented using an Extents File. The Extents File position for the root catalog is then stored in the S-Records
+        ///     File. Its entries are not filed sequentially denoting some kind of in-memory structure while at the same time
+        ///     forcing LisaOS to read the whole catalog. That or I missed the pointers. Empty entries just contain a 0-len
+        ///     filename. Garbage is not zeroed.
         /// </summary>
         struct CatalogEntryV2
         {
diff --git a/Aaru.Filesystems/LisaFS/Super.cs b/Aaru.Filesystems/LisaFS/Super.cs
index 80c7904bd..d64a0275a 100644
--- a/Aaru.Filesystems/LisaFS/Super.cs
+++ b/Aaru.Filesystems/LisaFS/Super.cs
@@ -32,13 +32,13 @@
 
 using System;
 using System.Collections.Generic;
-using Claunia.Encoding;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 using Aaru.Console;
 using Aaru.Decoders;
+using Claunia.Encoding;
 using Schemas;
 using Encoding = System.Text.Encoding;
 
@@ -46,11 +46,9 @@ namespace Aaru.Filesystems.LisaFS
 {
     public partial class LisaFS
     {
-        /// <summary>
-        ///     Mounts an Apple Lisa filesystem
-        /// </summary>
-        public Errno Mount(IMediaImage                imagePlugin, Partition partition, Encoding encoding,
-                           Dictionary<string, string> options,     string    @namespace)
+        /// <summary>Mounts an Apple Lisa filesystem</summary>
+        public Errno Mount(IMediaImage imagePlugin, Partition partition, Encoding encoding,
+                           Dictionary<string, string> options, string @namespace)
         {
             try
             {
@@ -64,6 +62,7 @@ namespace Aaru.Filesystems.LisaFS
                    !device.Info.ReadableSectorTags.Contains(SectorTagType.AppleSectorTag))
                 {
                     AaruConsole.DebugWriteLine("LisaFS plugin", "Underlying device does not support Lisa tags");
+
                     return Errno.InOutError;
                 }
 
@@ -71,6 +70,7 @@ namespace Aaru.Filesystems.LisaFS
                 if(device.Info.Sectors < 800)
                 {
                     AaruConsole.DebugWriteLine("LisaFS plugin", "Device is too small");
+
                     return Errno.InOutError;
                 }
 
@@ -84,10 +84,12 @@ namespace Aaru.Filesystems.LisaFS
 
                     AaruConsole.DebugWriteLine("LisaFS plugin", "Sector {0}, file ID 0x{1:X4}", i, searchTag.FileId);
 
-                    if(volumePrefix == device.Info.Sectors && searchTag.FileId == FILEID_LOADER_SIGNED)
+                    if(volumePrefix     == device.Info.Sectors &&
+                       searchTag.FileId == FILEID_LOADER_SIGNED)
                         volumePrefix = i - 1;
 
-                    if(searchTag.FileId != FILEID_MDDF) continue;
+                    if(searchTag.FileId != FILEID_MDDF)
+                        continue;
 
                     devTagSize = device.ReadSectorTag(i, SectorTagType.AppleSectorTag).Length;
 
@@ -102,6 +104,7 @@ namespace Aaru.Filesystems.LisaFS
                     mddf.volname  = StringHandlers.PascalToString(pString, Encoding);
                     mddf.unknown1 = sector[0x2D];
                     Array.Copy(sector, 0x2E, pString, 0, 33);
+
                     // Prevent garbage
                     mddf.password       = pString[0] <= 32 ? StringHandlers.PascalToString(pString, Encoding) : "";
                     mddf.unknown2       = sector[0x4F];
@@ -175,17 +178,16 @@ namespace Aaru.Filesystems.LisaFS
                     mddf.vol_left_mounted             = sector[0x138];
 
                     // Check that the MDDF is correct
-                    if(mddf.mddf_block != i - volumePrefix   ||
-                       mddf.vol_size   > device.Info.Sectors ||
-                       mddf.vol_size - 1 !=
-                       mddf.volsize_minus_one ||
-                       mddf.vol_size - i                 - 1 !=
-                       mddf.volsize_minus_mddf_minus_one - volumePrefix ||
-                       mddf.datasize >
-                       mddf.blocksize || mddf.blocksize < device.Info.SectorSize ||
-                       mddf.datasize                    != device.Info.SectorSize)
+                    if(mddf.mddf_block       != i - volumePrefix                                 ||
+                       mddf.vol_size         > device.Info.Sectors                               ||
+                       mddf.vol_size     - 1 != mddf.volsize_minus_one                           ||
+                       mddf.vol_size - i - 1 != mddf.volsize_minus_mddf_minus_one - volumePrefix ||
+                       mddf.datasize         > mddf.blocksize                                    ||
+                       mddf.blocksize        < device.Info.SectorSize                            ||
+                       mddf.datasize         != device.Info.SectorSize)
                     {
                         AaruConsole.DebugWriteLine("LisaFS plugin", "Incorrect MDDF found");
+
                         return Errno.InvalidArgument;
                     }
 
@@ -194,15 +196,19 @@ namespace Aaru.Filesystems.LisaFS
                     {
                         case LISA_V1:
                             AaruConsole.DebugWriteLine("LisaFS plugin", "Mounting LisaFS v1");
+
                             break;
                         case LISA_V2:
                             AaruConsole.DebugWriteLine("LisaFS plugin", "Mounting LisaFS v2");
+
                             break;
                         case LISA_V3:
                             AaruConsole.DebugWriteLine("LisaFS plugin", "Mounting LisaFS v3");
+
                             break;
                         default:
                             AaruConsole.ErrorWriteLine("Cannot mount LisaFS version {0}", mddf.fsversion.ToString());
+
                             return Errno.NotSupported;
                     }
 
@@ -210,24 +216,37 @@ namespace Aaru.Filesystems.LisaFS
                     extentCache     = new Dictionary<short, ExtentFile>();
                     systemFileCache = new Dictionary<short, byte[]>();
                     fileCache       = new Dictionary<short, byte[]>();
+
                     //catalogCache = new Dictionary<short, List<CatalogEntry>>();
                     fileSizeCache = new Dictionary<short, int>();
 
                     mounted = true;
-                    if(options == null) options = GetDefaultOptions();
-                    if(options.TryGetValue("debug", out string debugString)) bool.TryParse(debugString, out debug);
 
-                    if(debug) printedExtents = new List<short>();
+                    if(options == null)
+                        options = GetDefaultOptions();
+
+                    if(options.TryGetValue("debug", out string debugString))
+                        bool.TryParse(debugString, out debug);
+
+                    if(debug)
+                        printedExtents = new List<short>();
 
                     // Read the S-Records file
                     Errno error = ReadSRecords();
+
                     if(error != Errno.NoError)
                     {
                         AaruConsole.ErrorWriteLine("Error {0} reading S-Records file.", error);
+
                         return error;
                     }
 
-                    directoryDtcCache = new Dictionary<short, DateTime> {{DIRID_ROOT, mddf.dtcc}};
+                    directoryDtcCache = new Dictionary<short, DateTime>
+                    {
+                        {
+                            DIRID_ROOT, mddf.dtcc
+                        }
+                    };
 
                     // Read the Catalog File
                     error = ReadCatalog();
@@ -235,8 +254,10 @@ namespace Aaru.Filesystems.LisaFS
                     if(error != Errno.NoError)
                     {
                         AaruConsole.DebugWriteLine("LisaFS plugin", "Cannot read Catalog File, error {0}",
-                                                  error.ToString());
+                                                   error.ToString());
+
                         mounted = false;
+
                         return error;
                     }
 
@@ -244,48 +265,59 @@ namespace Aaru.Filesystems.LisaFS
                     if(debug)
                     {
                         error = ReadSystemFile(FILEID_BOOT_SIGNED, out _);
+
                         if(error != Errno.NoError)
                         {
                             AaruConsole.DebugWriteLine("LisaFS plugin", "Unable to read boot blocks");
                             mounted = false;
+
                             return error;
                         }
 
                         error = ReadSystemFile(FILEID_LOADER_SIGNED, out _);
+
                         if(error != Errno.NoError)
                         {
                             AaruConsole.DebugWriteLine("LisaFS plugin", "Unable to read boot loader");
                             mounted = false;
+
                             return error;
                         }
 
                         error = ReadSystemFile((short)FILEID_MDDF, out _);
+
                         if(error != Errno.NoError)
                         {
                             AaruConsole.DebugWriteLine("LisaFS plugin", "Unable to read MDDF");
                             mounted = false;
+
                             return error;
                         }
 
                         error = ReadSystemFile((short)FILEID_BITMAP, out _);
+
                         if(error != Errno.NoError)
                         {
                             AaruConsole.DebugWriteLine("LisaFS plugin", "Unable to read volume bitmap");
                             mounted = false;
+
                             return error;
                         }
 
                         error = ReadSystemFile((short)FILEID_SRECORD, out _);
+
                         if(error != Errno.NoError)
                         {
                             AaruConsole.DebugWriteLine("LisaFS plugin", "Unable to read S-Records file");
                             mounted = false;
+
                             return error;
                         }
                     }
 
                     // Create XML metadata for mounted filesystem
                     XmlFsType = new FileSystemType();
+
                     if(DateTime.Compare(mddf.dtvb, DateHandlers.LisaToDateTime(0)) > 0)
                     {
                         XmlFsType.BackupDate          = mddf.dtvb;
@@ -294,6 +326,7 @@ namespace Aaru.Filesystems.LisaFS
 
                     XmlFsType.Clusters    = mddf.vol_size;
                     XmlFsType.ClusterSize = (uint)(mddf.clustersize * mddf.datasize);
+
                     if(DateTime.Compare(mddf.dtvc, DateHandlers.LisaToDateTime(0)) > 0)
                     {
                         XmlFsType.CreationDate          = mddf.dtvc;
@@ -313,18 +346,18 @@ namespace Aaru.Filesystems.LisaFS
                 }
 
                 AaruConsole.DebugWriteLine("LisaFS plugin", "Not a Lisa filesystem");
+
                 return Errno.NotSupported;
             }
             catch(Exception ex)
             {
                 AaruConsole.ErrorWriteLine("Exception {0}, {1}, {2}", ex.Message, ex.InnerException, ex.StackTrace);
+
                 return Errno.InOutError;
             }
         }
 
-        /// <summary>
-        ///     Umounts this Lisa filesystem
-        /// </summary>
+        /// <summary>Umounts this Lisa filesystem</summary>
         public Errno Unmount()
         {
             mounted         = false;
@@ -342,35 +375,40 @@ namespace Aaru.Filesystems.LisaFS
             return Errno.NoError;
         }
 
-        /// <summary>
-        ///     Gets information about the mounted volume.
-        /// </summary>
+        /// <summary>Gets information about the mounted volume.</summary>
         /// <param name="stat">Information about the mounted volume.</param>
         public Errno StatFs(out FileSystemInfo stat)
         {
             stat = null;
-            if(!mounted) return Errno.AccessDenied;
+
+            if(!mounted)
+                return Errno.AccessDenied;
 
             stat = new FileSystemInfo
             {
-                Blocks         = mddf.vol_size,
-                FilenameLength = (ushort)E_NAME,
-                Files          = mddf.filecount,
-                FreeBlocks     = mddf.freecount,
-                Id             = {Serial64 = mddf.volid, IsLong = true},
-                PluginId       = Id
+                Blocks     = mddf.vol_size, FilenameLength = (ushort)E_NAME, Files = mddf.filecount,
+                FreeBlocks = mddf.freecount, Id =
+                {
+                    Serial64 = mddf.volid, IsLong = true
+                },
+                PluginId = Id
             };
+
             stat.FreeFiles = FILEID_MAX - stat.Files;
+
             switch(mddf.fsversion)
             {
                 case LISA_V1:
                     stat.Type = "LisaFS v1";
+
                     break;
                 case LISA_V2:
                     stat.Type = "LisaFS v2";
+
                     break;
                 case LISA_V3:
                     stat.Type = "LisaFS v3";
+
                     break;
             }
 
diff --git a/Aaru.Filesystems/LisaFS/Xattr.cs b/Aaru.Filesystems/LisaFS/Xattr.cs
index ecbe20d23..b011928b0 100644
--- a/Aaru.Filesystems/LisaFS/Xattr.cs
+++ b/Aaru.Filesystems/LisaFS/Xattr.cs
@@ -41,9 +41,7 @@ namespace Aaru.Filesystems.LisaFS
 {
     public partial class LisaFS
     {
-        /// <summary>
-        ///     Lists all extended attributes, alternate data streams and forks of the given file.
-        /// </summary>
+        /// <summary>Lists all extended attributes, alternate data streams and forks of the given file.</summary>
         /// <returns>Error number.</returns>
         /// <param name="path">Path.</param>
         /// <param name="xattrs">List of extended attributes, alternate data streams and forks.</param>
@@ -51,14 +49,14 @@ namespace Aaru.Filesystems.LisaFS
         {
             xattrs = null;
             Errno error = LookupFileId(path, out short fileId, out bool isDir);
-            if(error != Errno.NoError) return error;
+
+            if(error != Errno.NoError)
+                return error;
 
             return isDir ? Errno.InvalidArgument : ListXAttr(fileId, out xattrs);
         }
 
-        /// <summary>
-        ///     Reads an extended attribute, alternate data stream or fork from the given file.
-        /// </summary>
+        /// <summary>Reads an extended attribute, alternate data stream or fork from the given file.</summary>
         /// <returns>Error number.</returns>
         /// <param name="path">File path.</param>
         /// <param name="xattr">Extendad attribute, alternate data stream or fork name.</param>
@@ -66,14 +64,14 @@ namespace Aaru.Filesystems.LisaFS
         public Errno GetXattr(string path, string xattr, ref byte[] buf)
         {
             Errno error = LookupFileId(path, out short fileId, out bool isDir);
-            if(error != Errno.NoError) return error;
+
+            if(error != Errno.NoError)
+                return error;
 
             return isDir ? Errno.InvalidArgument : GetXattr(fileId, xattr, out buf);
         }
 
-        /// <summary>
-        ///     Lists special Apple Lisa filesystem features as extended attributes
-        /// </summary>
+        /// <summary>Lists special Apple Lisa filesystem features as extended attributes</summary>
         /// <returns>Error number.</returns>
         /// <param name="fileId">File identifier.</param>
         /// <param name="xattrs">Extended attributes.</param>
@@ -81,12 +79,15 @@ namespace Aaru.Filesystems.LisaFS
         {
             xattrs = null;
 
-            if(!mounted) return Errno.AccessDenied;
+            if(!mounted)
+                return Errno.AccessDenied;
 
             // System files
             if(fileId < 4)
             {
-                if(!debug || fileId == 0) return Errno.InvalidArgument;
+                if(!debug ||
+                   fileId == 0)
+                    return Errno.InvalidArgument;
 
                 xattrs = new List<string>();
 
@@ -96,7 +97,8 @@ namespace Aaru.Filesystems.LisaFS
                     byte[] buf = Encoding.ASCII.GetBytes(mddf.password);
 
                     // If the MDDF contains a password, show it
-                    if(buf.Length > 0) xattrs.Add("com.apple.lisa.password");
+                    if(buf.Length > 0)
+                        xattrs.Add("com.apple.lisa.password");
                 }
             }
             else
@@ -104,31 +106,34 @@ namespace Aaru.Filesystems.LisaFS
                 // Search for the file
                 Errno error = ReadExtentsFile(fileId, out ExtentFile file);
 
-                if(error != Errno.NoError) return error;
+                if(error != Errno.NoError)
+                    return error;
 
                 xattrs = new List<string>();
 
                 // Password field is never emptied, check if valid
-                if(file.password_valid > 0) xattrs.Add("com.apple.lisa.password");
+                if(file.password_valid > 0)
+                    xattrs.Add("com.apple.lisa.password");
 
                 // Check for a valid copy-protection serial number
-                if(file.serial > 0) xattrs.Add("com.apple.lisa.serial");
+                if(file.serial > 0)
+                    xattrs.Add("com.apple.lisa.serial");
 
                 // Check if the label contains something or is empty
-                if(!ArrayHelpers.ArrayIsNullOrEmpty(file.LisaInfo)) xattrs.Add("com.apple.lisa.label");
+                if(!ArrayHelpers.ArrayIsNullOrEmpty(file.LisaInfo))
+                    xattrs.Add("com.apple.lisa.label");
             }
 
             // On debug mode allow sector tags to be accessed as an xattr
-            if(debug) xattrs.Add("com.apple.lisa.tags");
+            if(debug)
+                xattrs.Add("com.apple.lisa.tags");
 
             xattrs.Sort();
 
             return Errno.NoError;
         }
 
-        /// <summary>
-        ///     Lists special Apple Lisa filesystem features as extended attributes
-        /// </summary>
+        /// <summary>Lists special Apple Lisa filesystem features as extended attributes</summary>
         /// <returns>Error number.</returns>
         /// <param name="fileId">File identifier.</param>
         /// <param name="xattr">Extended attribute name.</param>
@@ -137,23 +142,28 @@ namespace Aaru.Filesystems.LisaFS
         {
             buf = null;
 
-            if(!mounted) return Errno.AccessDenied;
+            if(!mounted)
+                return Errno.AccessDenied;
 
             // System files
             if(fileId < 4)
             {
-                if(!debug || fileId == 0) return Errno.InvalidArgument;
+                if(!debug ||
+                   fileId == 0)
+                    return Errno.InvalidArgument;
 
                 // Only MDDF contains an extended attributes
                 if(fileId == FILEID_MDDF)
                     if(xattr == "com.apple.lisa.password")
                     {
                         buf = Encoding.ASCII.GetBytes(mddf.password);
+
                         return Errno.NoError;
                     }
 
                 // But on debug mode even system files contain tags
-                if(debug && xattr == "com.apple.lisa.tags") return ReadSystemFile(fileId, out buf, true);
+                if(debug && xattr == "com.apple.lisa.tags")
+                    return ReadSystemFile(fileId, out buf, true);
 
                 return Errno.NoSuchExtendedAttribute;
             }
@@ -161,34 +171,38 @@ namespace Aaru.Filesystems.LisaFS
             // Search for the file
             Errno error = ReadExtentsFile(fileId, out ExtentFile file);
 
-            if(error != Errno.NoError) return error;
+            if(error != Errno.NoError)
+                return error;
 
             switch(xattr)
             {
                 case "com.apple.lisa.password" when file.password_valid > 0:
                     buf = new byte[8];
                     Array.Copy(file.password, 0, buf, 0, 8);
+
                     return Errno.NoError;
                 case "com.apple.lisa.serial" when file.serial > 0:
                     buf = Encoding.ASCII.GetBytes(file.serial.ToString());
+
                     return Errno.NoError;
             }
 
-            if(!ArrayHelpers.ArrayIsNullOrEmpty(file.LisaInfo) && xattr == "com.apple.lisa.label")
+            if(!ArrayHelpers.ArrayIsNullOrEmpty(file.LisaInfo) &&
+               xattr == "com.apple.lisa.label")
             {
                 buf = new byte[128];
                 Array.Copy(file.LisaInfo, 0, buf, 0, 128);
+
                 return Errno.NoError;
             }
 
-            if(debug && xattr == "com.apple.lisa.tags") return ReadFile(fileId, out buf, true);
+            if(debug && xattr == "com.apple.lisa.tags")
+                return ReadFile(fileId, out buf, true);
 
             return Errno.NoSuchExtendedAttribute;
         }
 
-        /// <summary>
-        ///     Decodes a sector tag. Not tested with 24-byte tags.
-        /// </summary>
+        /// <summary>Decodes a sector tag. Not tested with 24-byte tags.</summary>
         /// <returns>Error number.</returns>
         /// <param name="tag">Sector tag.</param>
         /// <param name="decoded">Decoded sector tag.</param>
@@ -197,9 +211,11 @@ namespace Aaru.Filesystems.LisaFS
             decoded = new LisaTag.PriamTag();
             LisaTag.PriamTag? pmTag = LisaTag.DecodeTag(tag);
 
-            if(!pmTag.HasValue) return Errno.InvalidArgument;
+            if(!pmTag.HasValue)
+                return Errno.InvalidArgument;
 
             decoded = pmTag.Value;
+
             return Errno.NoError;
         }
     }
diff --git a/Aaru.Filesystems/Locus.cs b/Aaru.Filesystems/Locus.cs
index 69a792aea..d2e2de3bf 100644
--- a/Aaru.Filesystems/Locus.cs
+++ b/Aaru.Filesystems/Locus.cs
@@ -38,19 +38,26 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
 using Schemas;
+
 // Commit count
 using commitcnt_t = System.Int32;
+
 // Disk address
 using daddr_t = System.Int32;
+
 // Fstore
 using fstore_t = System.Int32;
+
 // Global File System number
 using gfs_t = System.Int32;
+
 // Inode number
 using ino_t = System.Int32;
 using Marshal = Aaru.Helpers.Marshal;
+
 // Filesystem pack number
 using pckno_t = System.Int16;
+
 // Timestamp
 using time_t = System.Int32;
 
@@ -76,65 +83,87 @@ namespace Aaru.Filesystems
 
         public bool Identify(IMediaImage imagePlugin, Partition partition)
         {
-            if(imagePlugin.Info.SectorSize < 512) return false;
+            if(imagePlugin.Info.SectorSize < 512)
+                return false;
 
             for(ulong location = 0; location <= 8; location++)
             {
                 uint sbSize = (uint)(Marshal.SizeOf<Locus_Superblock>() / imagePlugin.Info.SectorSize);
-                if(Marshal.SizeOf<Locus_Superblock>() % imagePlugin.Info.SectorSize != 0) sbSize++;
 
-                if(partition.Start + location + sbSize >= imagePlugin.Info.Sectors) break;
+                if(Marshal.SizeOf<Locus_Superblock>() % imagePlugin.Info.SectorSize != 0)
+                    sbSize++;
+
+                if(partition.Start + location + sbSize >= imagePlugin.Info.Sectors)
+                    break;
 
                 byte[] sector = imagePlugin.ReadSectors(partition.Start + location, sbSize);
-                if(sector.Length < Marshal.SizeOf<Locus_Superblock>()) return false;
+
+                if(sector.Length < Marshal.SizeOf<Locus_Superblock>())
+                    return false;
 
                 Locus_Superblock locusSb = Marshal.ByteArrayToStructureLittleEndian<Locus_Superblock>(sector);
 
                 AaruConsole.DebugWriteLine("Locus plugin", "magic at {1} = 0x{0:X8}", locusSb.s_magic, location);
 
-                if(locusSb.s_magic == LOCUS_MAGIC     || locusSb.s_magic == LOCUS_CIGAM ||
-                   locusSb.s_magic == LOCUS_MAGIC_OLD || locusSb.s_magic == LOCUS_CIGAM_OLD) return true;
+                if(locusSb.s_magic == LOCUS_MAGIC     ||
+                   locusSb.s_magic == LOCUS_CIGAM     ||
+                   locusSb.s_magic == LOCUS_MAGIC_OLD ||
+                   locusSb.s_magic == LOCUS_CIGAM_OLD)
+                    return true;
             }
 
             return false;
         }
 
         public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding    encoding)
+                                   Encoding encoding)
         {
             Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-15");
             information = "";
-            if(imagePlugin.Info.SectorSize < 512) return;
 
-            Locus_Superblock locusSb = new Locus_Superblock();
-            byte[]           sector  = null;
+            if(imagePlugin.Info.SectorSize < 512)
+                return;
+
+            var    locusSb = new Locus_Superblock();
+            byte[] sector  = null;
 
             for(ulong location = 0; location <= 8; location++)
             {
                 uint sbSize = (uint)(Marshal.SizeOf<Locus_Superblock>() / imagePlugin.Info.SectorSize);
-                if(Marshal.SizeOf<Locus_Superblock>() % imagePlugin.Info.SectorSize != 0) sbSize++;
+
+                if(Marshal.SizeOf<Locus_Superblock>() % imagePlugin.Info.SectorSize != 0)
+                    sbSize++;
 
                 sector = imagePlugin.ReadSectors(partition.Start + location, sbSize);
-                if(sector.Length < Marshal.SizeOf<Locus_Superblock>()) return;
+
+                if(sector.Length < Marshal.SizeOf<Locus_Superblock>())
+                    return;
 
                 locusSb = Marshal.ByteArrayToStructureLittleEndian<Locus_Superblock>(sector);
 
-                if(locusSb.s_magic == LOCUS_MAGIC     || locusSb.s_magic == LOCUS_CIGAM ||
-                   locusSb.s_magic == LOCUS_MAGIC_OLD || locusSb.s_magic == LOCUS_CIGAM_OLD) break;
+                if(locusSb.s_magic == LOCUS_MAGIC     ||
+                   locusSb.s_magic == LOCUS_CIGAM     ||
+                   locusSb.s_magic == LOCUS_MAGIC_OLD ||
+                   locusSb.s_magic == LOCUS_CIGAM_OLD)
+                    break;
             }
 
             // We don't care about old version for information
-            if(locusSb.s_magic != LOCUS_MAGIC && locusSb.s_magic != LOCUS_CIGAM && locusSb.s_magic != LOCUS_MAGIC_OLD &&
-               locusSb.s_magic != LOCUS_CIGAM_OLD) return;
+            if(locusSb.s_magic != LOCUS_MAGIC     &&
+               locusSb.s_magic != LOCUS_CIGAM     &&
+               locusSb.s_magic != LOCUS_MAGIC_OLD &&
+               locusSb.s_magic != LOCUS_CIGAM_OLD)
+                return;
 
             // Numerical arrays are not important for information so no need to swap them
-            if(locusSb.s_magic == LOCUS_CIGAM || locusSb.s_magic == LOCUS_CIGAM_OLD)
+            if(locusSb.s_magic == LOCUS_CIGAM ||
+               locusSb.s_magic == LOCUS_CIGAM_OLD)
             {
                 locusSb         = Marshal.ByteArrayToStructureBigEndian<Locus_Superblock>(sector);
                 locusSb.s_flags = (LocusFlags)Swapping.Swap((ushort)locusSb.s_flags);
             }
 
-            StringBuilder sb = new StringBuilder();
+            var sb = new StringBuilder();
 
             sb.AppendLine(locusSb.s_magic == LOCUS_MAGIC_OLD ? "Locus filesystem (old)" : "Locus filesystem");
 
@@ -144,49 +173,77 @@ namespace Aaru.Filesystems
             string s_fpack = StringHandlers.CToString(locusSb.s_fpack, Encoding);
 
             AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_magic = 0x{0:X8}", locusSb.s_magic);
-            AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_gfs = {0}",        locusSb.s_gfs);
-            AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_fsize = {0}",      locusSb.s_fsize);
-            AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_lwm = {0}",        locusSb.s_lwm);
-            AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_hwm = {0}",        locusSb.s_hwm);
-            AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_llst = {0}",       locusSb.s_llst);
-            AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_fstore = {0}",     locusSb.s_fstore);
-            AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_time = {0}",       locusSb.s_time);
-            AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_tfree = {0}",      locusSb.s_tfree);
-            AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_isize = {0}",      locusSb.s_isize);
-            AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_nfree = {0}",      locusSb.s_nfree);
-            AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_flags = {0}",      locusSb.s_flags);
-            AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_tinode = {0}",     locusSb.s_tinode);
-            AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_lasti = {0}",      locusSb.s_lasti);
-            AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_nbehind = {0}",    locusSb.s_nbehind);
-            AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_gfspack = {0}",    locusSb.s_gfspack);
-            AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_ninode = {0}",     locusSb.s_ninode);
-            AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_flock = {0}",      locusSb.s_flock);
-            AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_ilock = {0}",      locusSb.s_ilock);
-            AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_fmod = {0}",       locusSb.s_fmod);
-            AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_version = {0}",    locusSb.s_version);
+            AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_gfs = {0}", locusSb.s_gfs);
+            AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_fsize = {0}", locusSb.s_fsize);
+            AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_lwm = {0}", locusSb.s_lwm);
+            AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_hwm = {0}", locusSb.s_hwm);
+            AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_llst = {0}", locusSb.s_llst);
+            AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_fstore = {0}", locusSb.s_fstore);
+            AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_time = {0}", locusSb.s_time);
+            AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_tfree = {0}", locusSb.s_tfree);
+            AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_isize = {0}", locusSb.s_isize);
+            AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_nfree = {0}", locusSb.s_nfree);
+            AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_flags = {0}", locusSb.s_flags);
+            AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_tinode = {0}", locusSb.s_tinode);
+            AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_lasti = {0}", locusSb.s_lasti);
+            AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_nbehind = {0}", locusSb.s_nbehind);
+            AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_gfspack = {0}", locusSb.s_gfspack);
+            AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_ninode = {0}", locusSb.s_ninode);
+            AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_flock = {0}", locusSb.s_flock);
+            AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_ilock = {0}", locusSb.s_ilock);
+            AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_fmod = {0}", locusSb.s_fmod);
+            AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_version = {0}", locusSb.s_version);
+
+            sb.AppendFormat("Superblock last modified on {0}", DateHandlers.UnixToDateTime(locusSb.s_time)).
+               AppendLine();
 
-            sb.AppendFormat("Superblock last modified on {0}", DateHandlers.UnixToDateTime(locusSb.s_time))
-              .AppendLine();
             sb.AppendFormat("Volume has {0} blocks of {1} bytes each (total {2} bytes)", locusSb.s_fsize, blockSize,
                             locusSb.s_fsize * blockSize).AppendLine();
+
             sb.AppendFormat("{0} blocks free ({1} bytes)", locusSb.s_tfree, locusSb.s_tfree * blockSize).AppendLine();
             sb.AppendFormat("I-node list uses {0} blocks", locusSb.s_isize).AppendLine();
             sb.AppendFormat("{0} free inodes", locusSb.s_tinode).AppendLine();
             sb.AppendFormat("Next free inode search will start at inode {0}", locusSb.s_lasti).AppendLine();
-            sb.AppendFormat("There are an estimate of {0} free inodes before next search start", locusSb.s_nbehind)
-              .AppendLine();
-            if(locusSb.s_flags.HasFlag(LocusFlags.SB_RDONLY)) sb.AppendLine("Read-only volume");
-            if(locusSb.s_flags.HasFlag(LocusFlags.SB_CLEAN)) sb.AppendLine("Clean volume");
-            if(locusSb.s_flags.HasFlag(LocusFlags.SB_DIRTY)) sb.AppendLine("Dirty volume");
-            if(locusSb.s_flags.HasFlag(LocusFlags.SB_RMV)) sb.AppendLine("Removable volume");
-            if(locusSb.s_flags.HasFlag(LocusFlags.SB_PRIMPACK)) sb.AppendLine("This is the primary pack");
-            if(locusSb.s_flags.HasFlag(LocusFlags.SB_REPLTYPE)) sb.AppendLine("Replicated volume");
-            if(locusSb.s_flags.HasFlag(LocusFlags.SB_USER)) sb.AppendLine("User replicated volume");
-            if(locusSb.s_flags.HasFlag(LocusFlags.SB_BACKBONE)) sb.AppendLine("Backbone volume");
-            if(locusSb.s_flags.HasFlag(LocusFlags.SB_NFS)) sb.AppendLine("NFS volume");
-            if(locusSb.s_flags.HasFlag(LocusFlags.SB_BYHAND)) sb.AppendLine("Volume inhibits automatic fsck");
-            if(locusSb.s_flags.HasFlag(LocusFlags.SB_NOSUID)) sb.AppendLine("Set-uid/set-gid is disabled");
-            if(locusSb.s_flags.HasFlag(LocusFlags.SB_SYNCW)) sb.AppendLine("Volume uses synchronous writes");
+
+            sb.AppendFormat("There are an estimate of {0} free inodes before next search start", locusSb.s_nbehind).
+               AppendLine();
+
+            if(locusSb.s_flags.HasFlag(LocusFlags.SB_RDONLY))
+                sb.AppendLine("Read-only volume");
+
+            if(locusSb.s_flags.HasFlag(LocusFlags.SB_CLEAN))
+                sb.AppendLine("Clean volume");
+
+            if(locusSb.s_flags.HasFlag(LocusFlags.SB_DIRTY))
+                sb.AppendLine("Dirty volume");
+
+            if(locusSb.s_flags.HasFlag(LocusFlags.SB_RMV))
+                sb.AppendLine("Removable volume");
+
+            if(locusSb.s_flags.HasFlag(LocusFlags.SB_PRIMPACK))
+                sb.AppendLine("This is the primary pack");
+
+            if(locusSb.s_flags.HasFlag(LocusFlags.SB_REPLTYPE))
+                sb.AppendLine("Replicated volume");
+
+            if(locusSb.s_flags.HasFlag(LocusFlags.SB_USER))
+                sb.AppendLine("User replicated volume");
+
+            if(locusSb.s_flags.HasFlag(LocusFlags.SB_BACKBONE))
+                sb.AppendLine("Backbone volume");
+
+            if(locusSb.s_flags.HasFlag(LocusFlags.SB_NFS))
+                sb.AppendLine("NFS volume");
+
+            if(locusSb.s_flags.HasFlag(LocusFlags.SB_BYHAND))
+                sb.AppendLine("Volume inhibits automatic fsck");
+
+            if(locusSb.s_flags.HasFlag(LocusFlags.SB_NOSUID))
+                sb.AppendLine("Set-uid/set-gid is disabled");
+
+            if(locusSb.s_flags.HasFlag(LocusFlags.SB_SYNCW))
+                sb.AppendLine("Volume uses synchronous writes");
+
             sb.AppendFormat("Volume label: {0}", s_fsmnt).AppendLine();
             sb.AppendFormat("Physical volume name: {0}", s_fpack).AppendLine();
             sb.AppendFormat("Global File System number: {0}", locusSb.s_gfs).AppendLine();
@@ -196,23 +253,19 @@ namespace Aaru.Filesystems
 
             XmlFsType = new FileSystemType
             {
-                Type        = "Locus filesystem",
-                ClusterSize = (uint)blockSize,
-                Clusters    = (ulong)locusSb.s_fsize,
+                Type = "Locus filesystem", ClusterSize = (uint)blockSize, Clusters = (ulong)locusSb.s_fsize,
+
                 // Sometimes it uses one, or the other. Use the bigger
-                VolumeName                = string.IsNullOrEmpty(s_fsmnt) ? s_fpack : s_fsmnt,
-                ModificationDate          = DateHandlers.UnixToDateTime(locusSb.s_time),
-                ModificationDateSpecified = true,
+                VolumeName       = string.IsNullOrEmpty(s_fsmnt) ? s_fpack : s_fsmnt,
+                ModificationDate = DateHandlers.UnixToDateTime(locusSb.s_time), ModificationDateSpecified = true,
                 Dirty = !locusSb.s_flags.HasFlag(LocusFlags.SB_CLEAN) ||
-                                            locusSb.s_flags.HasFlag(LocusFlags.SB_DIRTY),
-                FreeClusters          = (ulong)locusSb.s_tfree,
-                FreeClustersSpecified = true
+                                   locusSb.s_flags.HasFlag(LocusFlags.SB_DIRTY),
+                FreeClusters = (ulong)locusSb.s_tfree, FreeClustersSpecified = true
             };
         }
 
-        [SuppressMessage("ReSharper", "InconsistentNaming")]
-        [SuppressMessage("ReSharper", "BuiltInTypeReferenceStyle")]
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
+        [SuppressMessage("ReSharper", "InconsistentNaming"), SuppressMessage("ReSharper", "BuiltInTypeReferenceStyle"),
+         StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct Locus_Superblock
         {
             public readonly uint s_magic; /* identifies this as a locus filesystem */
@@ -245,6 +298,7 @@ namespace Aaru.Filesystems
             public readonly short      s_ninode;  /* number of i-nodes in s_inode */
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
             public readonly short[] s_dinfo; /* interleave stuff */
+
             //#define s_m s_dinfo[0]
             //#define s_skip  s_dinfo[0]      /* AIX defines  */
             //#define s_n s_dinfo[1]
@@ -265,9 +319,8 @@ namespace Aaru.Filesystems
             public readonly byte s_byteorder;  /* byte order of integers */
         }
 
-        [SuppressMessage("ReSharper", "InconsistentNaming")]
-        [SuppressMessage("ReSharper", "BuiltInTypeReferenceStyle")]
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
+        [SuppressMessage("ReSharper", "InconsistentNaming"), SuppressMessage("ReSharper", "BuiltInTypeReferenceStyle"),
+         StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct Locus_OldSuperblock
         {
             public readonly uint s_magic; /* identifies this as a locus filesystem */
@@ -300,6 +353,7 @@ namespace Aaru.Filesystems
             public readonly short      s_ninode;  /* number of i-nodes in s_inode */
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
             public readonly short[] s_dinfo; /* interleave stuff */
+
             //#define s_m s_dinfo[0]
             //#define s_skip  s_dinfo[0]      /* AIX defines  */
             //#define s_n s_dinfo[1]
@@ -320,33 +374,35 @@ namespace Aaru.Filesystems
             public readonly byte s_byteorder;  /* byte order of integers */
         }
 
-        [SuppressMessage("ReSharper", "InconsistentNaming")]
-        [SuppressMessage("ReSharper", "BuiltInTypeReferenceStyle")]
-        [Flags]
+        [SuppressMessage("ReSharper", "InconsistentNaming"), SuppressMessage("ReSharper", "BuiltInTypeReferenceStyle"),
+         Flags]
         enum LocusFlags : ushort
         {
-            SB_RDONLY   = 0x1,   /* no writes on filesystem */
-            SB_CLEAN    = 0x2,   /* fs unmounted cleanly (or checks run) */
-            SB_DIRTY    = 0x4,   /* fs mounted without CLEAN bit set */
-            SB_RMV      = 0x8,   /* fs is a removable file system */
-            SB_PRIMPACK = 0x10,  /* This is the primary pack of the filesystem */
-            SB_REPLTYPE = 0x20,  /* This is a replicated type filesystem. */
-            SB_USER     = 0x40,  /* This is a "user" replicated filesystem. */
-            SB_BACKBONE = 0x80,  /* backbone pack ; complete copy of primary pack but not modifiable */
-            SB_NFS      = 0x100, /* This is a NFS type filesystem */
-            SB_BYHAND   = 0x200, /* Inhibits automatic fscks on a mangled file system */
-            SB_NOSUID   = 0x400, /* Set-uid/Set-gid is disabled */
-            SB_SYNCW    = 0x800  /* Synchronous Write */
+            SB_RDONLY = 0x1,                                                      /* no writes on filesystem */
+            SB_CLEAN  = 0x2,                                                      /* fs unmounted cleanly (or checks run) */
+            SB_DIRTY  = 0x4, /* fs mounted without CLEAN bit set */ SB_RMV = 0x8, /* fs is a removable file system */
+            SB_PRIMPACK =
+                0x10, /* This is the primary pack of the filesystem */
+            SB_REPLTYPE =
+                0x20, /* This is a replicated type filesystem. */
+            SB_USER =
+                0x40, /* This is a "user" replicated filesystem. */
+            SB_BACKBONE =
+                0x80,       /* backbone pack ; complete copy of primary pack but not modifiable */
+            SB_NFS = 0x100, /* This is a NFS type filesystem */
+            SB_BYHAND =
+                0x200,                                                            /* Inhibits automatic fscks on a mangled file system */
+            SB_NOSUID = 0x400, /* Set-uid/Set-gid is disabled */ SB_SYNCW = 0x800 /* Synchronous Write */
         }
 
-        [SuppressMessage("ReSharper", "InconsistentNaming")]
-        [SuppressMessage("ReSharper", "BuiltInTypeReferenceStyle")]
-        [Flags]
+        [SuppressMessage("ReSharper", "InconsistentNaming"), SuppressMessage("ReSharper", "BuiltInTypeReferenceStyle"),
+         Flags]
         enum LocusVersion : byte
         {
-            SB_SB4096  = 1, /* smallblock filesys with 4096 byte blocks */
-            SB_B1024   = 2, /* 1024 byte block filesystem */
-            NUMSCANDEV = 5  /* Used by scangfs(), refed in space.h */
+            SB_SB4096 = 1, /* smallblock filesys with 4096 byte blocks */
+            SB_B1024  = 2, /* 1024 byte block filesystem */
+            NUMSCANDEV =
+                5 /* Used by scangfs(), refed in space.h */
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/MicroDOS.cs b/Aaru.Filesystems/MicroDOS.cs
index db2594dc8..a804f34ff 100644
--- a/Aaru.Filesystems/MicroDOS.cs
+++ b/Aaru.Filesystems/MicroDOS.cs
@@ -55,9 +55,11 @@ namespace Aaru.Filesystems
 
         public bool Identify(IMediaImage imagePlugin, Partition partition)
         {
-            if(1 + partition.Start >= partition.End) return false;
+            if(1 + partition.Start >= partition.End)
+                return false;
 
-            if(imagePlugin.Info.SectorSize < 512) return false;
+            if(imagePlugin.Info.SectorSize < 512)
+                return false;
 
             byte[] bk0 = imagePlugin.ReadSector(0 + partition.Start);
 
@@ -67,12 +69,12 @@ namespace Aaru.Filesystems
         }
 
         public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding    encoding)
+                                   Encoding encoding)
         {
             Encoding    = encoding ?? Encoding.GetEncoding("koi8-r");
             information = "";
 
-            StringBuilder sb = new StringBuilder();
+            var sb = new StringBuilder();
 
             byte[] bk0 = imagePlugin.ReadSector(0 + partition.Start);
 
@@ -80,19 +82,17 @@ namespace Aaru.Filesystems
 
             sb.AppendLine("MicroDOS filesystem");
             sb.AppendFormat("Volume has {0} blocks ({1} bytes)", block0.blocks, block0.blocks * 512).AppendLine();
-            sb.AppendFormat("Volume has {0} blocks used ({1} bytes)", block0.usedBlocks, block0.usedBlocks * 512)
-              .AppendLine();
+
+            sb.AppendFormat("Volume has {0} blocks used ({1} bytes)", block0.usedBlocks, block0.usedBlocks * 512).
+               AppendLine();
+
             sb.AppendFormat("Volume contains {0} files", block0.files).AppendLine();
             sb.AppendFormat("First used block is {0}", block0.firstUsedBlock).AppendLine();
 
             XmlFsType = new FileSystemType
             {
-                Type                  = "MicroDOS",
-                ClusterSize           = 512,
-                Clusters              = block0.blocks,
-                Files                 = block0.files,
-                FilesSpecified        = true,
-                FreeClusters          = (ulong)(block0.blocks - block0.usedBlocks),
+                Type                  = "MicroDOS", ClusterSize = 512, Clusters = block0.blocks, Files = block0.files,
+                FilesSpecified        = true, FreeClusters      = (ulong)(block0.blocks - block0.usedBlocks),
                 FreeClustersSpecified = true
             };
 
@@ -121,9 +121,8 @@ namespace Aaru.Filesystems
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 50)]
             public readonly byte[] unknown2;
             /// <summary>
-            ///     Disk size in blocks (absolute value for the system unlike NORD, NORTON etc.) that
-            ///     doesn't use two fixed values 40 or 80 tracks, but i.e. if you drive works with 76 tracks
-            ///     this field will contain an appropriate number of blocks
+            ///     Disk size in blocks (absolute value for the system unlike NORD, NORTON etc.) that doesn't use two fixed values
+            ///     40 or 80 tracks, but i.e. if you drive works with 76 tracks this field will contain an appropriate number of blocks
             /// </summary>
             public readonly ushort blocks;
             /// <summary> Number of the first file's block. Value is changable</summary>
@@ -155,11 +154,8 @@ namespace Aaru.Filesystems
 
         enum FileStatus : byte
         {
-            CommonFile  = 0,
-            Protected   = 1,
-            LogicalDisk = 2,
-            BadFile     = 0x80,
-            Deleted     = 0xFF
+            CommonFile = 0, Protected  = 1, LogicalDisk = 2,
+            BadFile    = 0x80, Deleted = 0xFF
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/MinixFS.cs b/Aaru.Filesystems/MinixFS.cs
index b68c42b41..3e6b2b34c 100644
--- a/Aaru.Filesystems/MinixFS.cs
+++ b/Aaru.Filesystems/MinixFS.cs
@@ -54,6 +54,7 @@ namespace Aaru.Filesystems
         const ushort MINIX2_MAGIC2 = 0x2478;
         /// <summary>Minix v3, 60 char filenames</summary>
         const ushort MINIX3_MAGIC = 0x4D5A;
+
         // Byteswapped
         /// <summary>Minix v1, 14 char filenames</summary>
         const ushort MINIX_CIGAM = 0x7F13;
@@ -83,7 +84,8 @@ namespace Aaru.Filesystems
                 offset = 0x400;
             }
 
-            if(sector + partition.Start >= partition.End) return false;
+            if(sector + partition.Start >= partition.End)
+                return false;
 
             byte[] minixSbSector = imagePlugin.ReadSector(sector + partition.Start);
 
@@ -97,9 +99,15 @@ namespace Aaru.Filesystems
 
             ushort magic = BitConverter.ToUInt16(minixSbSector, 0x010);
 
-            if(magic == MINIX_MAGIC || magic == MINIX_MAGIC2 || magic == MINIX2_MAGIC || magic == MINIX2_MAGIC2 ||
-               magic == MINIX_CIGAM || magic == MINIX_CIGAM2 || magic == MINIX2_CIGAM ||
-               magic == MINIX2_CIGAM2) return true;
+            if(magic == MINIX_MAGIC   ||
+               magic == MINIX_MAGIC2  ||
+               magic == MINIX2_MAGIC  ||
+               magic == MINIX2_MAGIC2 ||
+               magic == MINIX_CIGAM   ||
+               magic == MINIX_CIGAM2  ||
+               magic == MINIX2_CIGAM  ||
+               magic == MINIX2_CIGAM2)
+                return true;
 
             magic = BitConverter.ToUInt16(minixSbSector, 0x018); // Here should reside magic number on Minix v3
 
@@ -108,12 +116,12 @@ namespace Aaru.Filesystems
         }
 
         public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding    encoding)
+                                   Encoding encoding)
         {
             Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-15");
             information = "";
 
-            StringBuilder sb = new StringBuilder();
+            var sb = new StringBuilder();
 
             uint sector = 2;
             uint offset = 0;
@@ -143,8 +151,12 @@ namespace Aaru.Filesystems
 
             bool littleEndian;
 
-            if(magic == MINIX3_MAGIC || magic == MINIX3_CIGAM || magic == MINIX2_MAGIC || magic == MINIX2_CIGAM ||
-               magic == MINIX_MAGIC  || magic == MINIX_CIGAM)
+            if(magic == MINIX3_MAGIC ||
+               magic == MINIX3_CIGAM ||
+               magic == MINIX2_MAGIC ||
+               magic == MINIX2_CIGAM ||
+               magic == MINIX_MAGIC  ||
+               magic == MINIX_CIGAM)
             {
                 filenamesize = 60;
                 littleEndian = magic != MINIX3_CIGAM || magic == MINIX2_CIGAM || magic == MINIX_CIGAM;
@@ -155,15 +167,18 @@ namespace Aaru.Filesystems
                     case MINIX3_CIGAM:
                         minixVersion   = "Minix v3 filesystem";
                         XmlFsType.Type = "Minix v3";
+
                         break;
                     case MINIX2_MAGIC:
                     case MINIX2_CIGAM:
                         minixVersion   = "Minix 3 v2 filesystem";
                         XmlFsType.Type = "Minix 3 v2";
+
                         break;
                     default:
                         minixVersion   = "Minix 3 v1 filesystem";
                         XmlFsType.Type = "Minix 3 v1";
+
                         break;
                 }
 
@@ -180,48 +195,56 @@ namespace Aaru.Filesystems
                         minixVersion   = "Minix v1 filesystem";
                         littleEndian   = true;
                         XmlFsType.Type = "Minix v1";
+
                         break;
                     case MINIX_MAGIC2:
                         filenamesize   = 30;
                         minixVersion   = "Minix v1 filesystem";
                         littleEndian   = true;
                         XmlFsType.Type = "Minix v1";
+
                         break;
                     case MINIX2_MAGIC:
                         filenamesize   = 14;
                         minixVersion   = "Minix v2 filesystem";
                         littleEndian   = true;
                         XmlFsType.Type = "Minix v2";
+
                         break;
                     case MINIX2_MAGIC2:
                         filenamesize   = 30;
                         minixVersion   = "Minix v2 filesystem";
                         littleEndian   = true;
                         XmlFsType.Type = "Minix v2";
+
                         break;
                     case MINIX_CIGAM:
                         filenamesize   = 14;
                         minixVersion   = "Minix v1 filesystem";
                         littleEndian   = false;
                         XmlFsType.Type = "Minix v1";
+
                         break;
                     case MINIX_CIGAM2:
                         filenamesize   = 30;
                         minixVersion   = "Minix v1 filesystem";
                         littleEndian   = false;
                         XmlFsType.Type = "Minix v1";
+
                         break;
                     case MINIX2_CIGAM:
                         filenamesize   = 14;
                         minixVersion   = "Minix v2 filesystem";
                         littleEndian   = false;
                         XmlFsType.Type = "Minix v2";
+
                         break;
                     case MINIX2_CIGAM2:
                         filenamesize   = 30;
                         minixVersion   = "Minix v2 filesystem";
                         littleEndian   = false;
                         XmlFsType.Type = "Minix v2";
+
                         break;
                     default: return;
                 }
@@ -231,26 +254,36 @@ namespace Aaru.Filesystems
             {
                 Minix3SuperBlock mnxSb;
 
-                if(littleEndian) mnxSb = Marshal.ByteArrayToStructureLittleEndian<Minix3SuperBlock>(minixSbSector);
-                else mnxSb             = Marshal.ByteArrayToStructureBigEndian<Minix3SuperBlock>(minixSbSector);
+                if(littleEndian)
+                    mnxSb = Marshal.ByteArrayToStructureLittleEndian<Minix3SuperBlock>(minixSbSector);
+                else
+                    mnxSb = Marshal.ByteArrayToStructureBigEndian<Minix3SuperBlock>(minixSbSector);
 
-                if(magic != MINIX3_MAGIC && magic != MINIX3_CIGAM) mnxSb.s_blocksize = 1024;
+                if(magic != MINIX3_MAGIC &&
+                   magic != MINIX3_CIGAM)
+                    mnxSb.s_blocksize = 1024;
 
                 sb.AppendLine(minixVersion);
                 sb.AppendFormat("{0} chars in filename", filenamesize).AppendLine();
+
                 if(mnxSb.s_zones > 0) // On V2
-                    sb.AppendFormat("{0} zones on volume ({1} bytes)", mnxSb.s_zones, mnxSb.s_zones * 1024)
-                      .AppendLine();
+                    sb.AppendFormat("{0} zones on volume ({1} bytes)", mnxSb.s_zones, mnxSb.s_zones * 1024).
+                       AppendLine();
                 else
-                    sb.AppendFormat("{0} zones on volume ({1} bytes)", mnxSb.s_nzones, mnxSb.s_nzones * 1024)
-                      .AppendLine();
+                    sb.AppendFormat("{0} zones on volume ({1} bytes)", mnxSb.s_nzones, mnxSb.s_nzones * 1024).
+                       AppendLine();
+
                 sb.AppendFormat("{0} bytes/block", mnxSb.s_blocksize).AppendLine();
                 sb.AppendFormat("{0} inodes on volume", mnxSb.s_ninodes).AppendLine();
+
                 sb.AppendFormat("{0} blocks on inode map ({1} bytes)", mnxSb.s_imap_blocks,
                                 mnxSb.s_imap_blocks * mnxSb.s_blocksize).AppendLine();
+
                 sb.AppendFormat("{0} blocks on zone map ({1} bytes)", mnxSb.s_zmap_blocks,
                                 mnxSb.s_zmap_blocks * mnxSb.s_blocksize).AppendLine();
+
                 sb.AppendFormat("First data zone: {0}", mnxSb.s_firstdatazone).AppendLine();
+
                 //sb.AppendFormat("log2 of blocks/zone: {0}", mnx_sb.s_log_zone_size).AppendLine(); // Apparently 0
                 sb.AppendFormat("{0} bytes maximum per file", mnxSb.s_max_size).AppendLine();
                 sb.AppendFormat("On-disk filesystem version: {0}", mnxSb.s_disk_version).AppendLine();
@@ -262,23 +295,31 @@ namespace Aaru.Filesystems
             {
                 MinixSuperBlock mnxSb;
 
-                if(littleEndian) mnxSb = Marshal.ByteArrayToStructureLittleEndian<MinixSuperBlock>(minixSbSector);
-                else mnxSb             = Marshal.ByteArrayToStructureBigEndian<MinixSuperBlock>(minixSbSector);
+                if(littleEndian)
+                    mnxSb = Marshal.ByteArrayToStructureLittleEndian<MinixSuperBlock>(minixSbSector);
+                else
+                    mnxSb = Marshal.ByteArrayToStructureBigEndian<MinixSuperBlock>(minixSbSector);
 
                 sb.AppendLine(minixVersion);
                 sb.AppendFormat("{0} chars in filename", filenamesize).AppendLine();
+
                 if(mnxSb.s_zones > 0) // On V2
-                    sb.AppendFormat("{0} zones on volume ({1} bytes)", mnxSb.s_zones, mnxSb.s_zones * 1024)
-                      .AppendLine();
+                    sb.AppendFormat("{0} zones on volume ({1} bytes)", mnxSb.s_zones, mnxSb.s_zones * 1024).
+                       AppendLine();
                 else
-                    sb.AppendFormat("{0} zones on volume ({1} bytes)", mnxSb.s_nzones, mnxSb.s_nzones * 1024)
-                      .AppendLine();
+                    sb.AppendFormat("{0} zones on volume ({1} bytes)", mnxSb.s_nzones, mnxSb.s_nzones * 1024).
+                       AppendLine();
+
                 sb.AppendFormat("{0} inodes on volume", mnxSb.s_ninodes).AppendLine();
-                sb.AppendFormat("{0} blocks on inode map ({1} bytes)", mnxSb.s_imap_blocks, mnxSb.s_imap_blocks * 1024)
-                  .AppendLine();
-                sb.AppendFormat("{0} blocks on zone map ({1} bytes)", mnxSb.s_zmap_blocks, mnxSb.s_zmap_blocks * 1024)
-                  .AppendLine();
+
+                sb.AppendFormat("{0} blocks on inode map ({1} bytes)", mnxSb.s_imap_blocks, mnxSb.s_imap_blocks * 1024).
+                   AppendLine();
+
+                sb.AppendFormat("{0} blocks on zone map ({1} bytes)", mnxSb.s_zmap_blocks, mnxSb.s_zmap_blocks * 1024).
+                   AppendLine();
+
                 sb.AppendFormat("First data zone: {0}", mnxSb.s_firstdatazone).AppendLine();
+
                 //sb.AppendFormat("log2 of blocks/zone: {0}", mnx_sb.s_log_zone_size).AppendLine(); // Apparently 0
                 sb.AppendFormat("{0} bytes maximum per file", mnxSb.s_max_size).AppendLine();
                 sb.AppendFormat("Filesystem state: {0:X4}", mnxSb.s_state).AppendLine();
@@ -289,66 +330,62 @@ namespace Aaru.Filesystems
             information = sb.ToString();
         }
 
-        /// <summary>
-        ///     Superblock for Minix v1 and V2 filesystems
-        /// </summary>
+        /// <summary>Superblock for Minix v1 and V2 filesystems</summary>
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct MinixSuperBlock
         {
             /// <summary>0x00, inodes on volume</summary>
-            public ushort s_ninodes;
+            public readonly ushort s_ninodes;
             /// <summary>0x02, zones on volume</summary>
-            public ushort s_nzones;
+            public readonly ushort s_nzones;
             /// <summary>0x04, blocks on inode map</summary>
-            public short s_imap_blocks;
+            public readonly short s_imap_blocks;
             /// <summary>0x06, blocks on zone map</summary>
-            public short s_zmap_blocks;
+            public readonly short s_zmap_blocks;
             /// <summary>0x08, first data zone</summary>
-            public ushort s_firstdatazone;
+            public readonly ushort s_firstdatazone;
             /// <summary>0x0A, log2 of blocks/zone</summary>
-            public short s_log_zone_size;
+            public readonly short s_log_zone_size;
             /// <summary>0x0C, max file size</summary>
-            public uint s_max_size;
+            public readonly uint s_max_size;
             /// <summary>0x10, magic</summary>
-            public ushort s_magic;
+            public readonly ushort s_magic;
             /// <summary>0x12, filesystem state</summary>
-            public ushort s_state;
+            public readonly ushort s_state;
             /// <summary>0x14, number of zones</summary>
-            public uint s_zones;
+            public readonly uint s_zones;
         }
 
-        /// <summary>
-        ///     Superblock for Minix v3 filesystems
-        /// </summary>
+        /// <summary>Superblock for Minix v3 filesystems</summary>
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct Minix3SuperBlock
         {
             /// <summary>0x00, inodes on volume</summary>
-            public uint s_ninodes;
+            public readonly uint s_ninodes;
             /// <summary>0x02, old zones on volume</summary>
-            public ushort s_nzones;
+            public readonly ushort s_nzones;
             /// <summary>0x06, blocks on inode map</summary>
-            public ushort s_imap_blocks;
+            public readonly ushort s_imap_blocks;
             /// <summary>0x08, blocks on zone map</summary>
-            public ushort s_zmap_blocks;
+            public readonly ushort s_zmap_blocks;
             /// <summary>0x0A, first data zone</summary>
-            public ushort s_firstdatazone;
+            public readonly ushort s_firstdatazone;
             /// <summary>0x0C, log2 of blocks/zone</summary>
-            public ushort s_log_zone_size;
+            public readonly ushort s_log_zone_size;
             /// <summary>0x0E, padding</summary>
-            public ushort s_pad1;
+            public readonly ushort s_pad1;
             /// <summary>0x10, max file size</summary>
-            public uint s_max_size;
+            public readonly uint s_max_size;
             /// <summary>0x14, number of zones</summary>
-            public uint s_zones;
+            public readonly uint s_zones;
             /// <summary>0x18, magic</summary>
-            public ushort s_magic;
+            public readonly ushort s_magic;
             /// <summary>0x1A, padding</summary>
-            public ushort s_pad2;
+            public readonly ushort s_pad2;
             /// <summary>0x1C, bytes in a block</summary>
             public ushort s_blocksize;
             /// <summary>0x1E, on-disk structures version</summary>
-            public byte s_disk_version;
+            public readonly byte s_disk_version;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/NILFS2.cs b/Aaru.Filesystems/NILFS2.cs
index 560fd4b19..017b3f4f4 100644
--- a/Aaru.Filesystems/NILFS2.cs
+++ b/Aaru.Filesystems/NILFS2.cs
@@ -53,18 +53,26 @@ namespace Aaru.Filesystems
 
         public bool Identify(IMediaImage imagePlugin, Partition partition)
         {
-            if(imagePlugin.Info.SectorSize < 512) return false;
+            if(imagePlugin.Info.SectorSize < 512)
+                return false;
 
-            uint sbAddr            = NILFS2_SUPER_OFFSET / imagePlugin.Info.SectorSize;
-            if(sbAddr == 0) sbAddr = 1;
+            uint sbAddr = NILFS2_SUPER_OFFSET / imagePlugin.Info.SectorSize;
+
+            if(sbAddr == 0)
+                sbAddr = 1;
 
             uint sbSize = (uint)(Marshal.SizeOf<NILFS2_Superblock>() / imagePlugin.Info.SectorSize);
-            if(Marshal.SizeOf<NILFS2_Superblock>() % imagePlugin.Info.SectorSize != 0) sbSize++;
 
-            if(partition.Start + sbAddr + sbSize >= partition.End) return false;
+            if(Marshal.SizeOf<NILFS2_Superblock>() % imagePlugin.Info.SectorSize != 0)
+                sbSize++;
+
+            if(partition.Start + sbAddr + sbSize >= partition.End)
+                return false;
 
             byte[] sector = imagePlugin.ReadSectors(partition.Start + sbAddr, sbSize);
-            if(sector.Length < Marshal.SizeOf<NILFS2_Superblock>()) return false;
+
+            if(sector.Length < Marshal.SizeOf<NILFS2_Superblock>())
+                return false;
 
             NILFS2_Superblock nilfsSb = Marshal.ByteArrayToStructureLittleEndian<NILFS2_Superblock>(sector);
 
@@ -72,26 +80,35 @@ namespace Aaru.Filesystems
         }
 
         public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding    encoding)
+                                   Encoding encoding)
         {
             Encoding    = encoding ?? Encoding.UTF8;
             information = "";
-            if(imagePlugin.Info.SectorSize < 512) return;
 
-            uint sbAddr            = NILFS2_SUPER_OFFSET / imagePlugin.Info.SectorSize;
-            if(sbAddr == 0) sbAddr = 1;
+            if(imagePlugin.Info.SectorSize < 512)
+                return;
+
+            uint sbAddr = NILFS2_SUPER_OFFSET / imagePlugin.Info.SectorSize;
+
+            if(sbAddr == 0)
+                sbAddr = 1;
 
             uint sbSize = (uint)(Marshal.SizeOf<NILFS2_Superblock>() / imagePlugin.Info.SectorSize);
-            if(Marshal.SizeOf<NILFS2_Superblock>() % imagePlugin.Info.SectorSize != 0) sbSize++;
+
+            if(Marshal.SizeOf<NILFS2_Superblock>() % imagePlugin.Info.SectorSize != 0)
+                sbSize++;
 
             byte[] sector = imagePlugin.ReadSectors(partition.Start + sbAddr, sbSize);
-            if(sector.Length < Marshal.SizeOf<NILFS2_Superblock>()) return;
+
+            if(sector.Length < Marshal.SizeOf<NILFS2_Superblock>())
+                return;
 
             NILFS2_Superblock nilfsSb = Marshal.ByteArrayToStructureLittleEndian<NILFS2_Superblock>(sector);
 
-            if(nilfsSb.magic != NILFS2_MAGIC) return;
+            if(nilfsSb.magic != NILFS2_MAGIC)
+                return;
 
-            StringBuilder sb = new StringBuilder();
+            var sb = new StringBuilder();
 
             sb.AppendLine("NILFS2 filesystem");
             sb.AppendFormat("Version {0}.{1}", nilfsSb.rev_level, nilfsSb.minor_rev_level).AppendLine();
@@ -99,39 +116,43 @@ namespace Aaru.Filesystems
             sb.AppendFormat("{0} bytes in volume", nilfsSb.dev_size).AppendLine();
             sb.AppendFormat("{0} blocks per segment", nilfsSb.blocks_per_segment).AppendLine();
             sb.AppendFormat("{0} segments", nilfsSb.nsegments).AppendLine();
-            if(nilfsSb.creator_os == 0) sb.AppendLine("Filesystem created on Linux");
-            else sb.AppendFormat("Creator OS code: {0}", nilfsSb.creator_os).AppendLine();
+
+            if(nilfsSb.creator_os == 0)
+                sb.AppendLine("Filesystem created on Linux");
+            else
+                sb.AppendFormat("Creator OS code: {0}", nilfsSb.creator_os).AppendLine();
+
             sb.AppendFormat("{0} bytes per inode", nilfsSb.inode_size).AppendLine();
             sb.AppendFormat("Volume UUID: {0}", nilfsSb.uuid).AppendLine();
             sb.AppendFormat("Volume name: {0}", StringHandlers.CToString(nilfsSb.volume_name, Encoding)).AppendLine();
             sb.AppendFormat("Volume created on {0}", DateHandlers.UnixUnsignedToDateTime(nilfsSb.ctime)).AppendLine();
-            sb.AppendFormat("Volume last mounted on {0}", DateHandlers.UnixUnsignedToDateTime(nilfsSb.mtime))
-              .AppendLine();
-            sb.AppendFormat("Volume last written on {0}", DateHandlers.UnixUnsignedToDateTime(nilfsSb.wtime))
-              .AppendLine();
+
+            sb.AppendFormat("Volume last mounted on {0}", DateHandlers.UnixUnsignedToDateTime(nilfsSb.mtime)).
+               AppendLine();
+
+            sb.AppendFormat("Volume last written on {0}", DateHandlers.UnixUnsignedToDateTime(nilfsSb.wtime)).
+               AppendLine();
 
             information = sb.ToString();
 
             XmlFsType = new FileSystemType
             {
-                Type                      = "NILFS2 filesystem",
-                ClusterSize               = (uint)(1 << (int)(nilfsSb.log_block_size + 10)),
-                VolumeName                = StringHandlers.CToString(nilfsSb.volume_name, Encoding),
-                VolumeSerial              = nilfsSb.uuid.ToString(),
-                CreationDate              = DateHandlers.UnixUnsignedToDateTime(nilfsSb.ctime),
-                CreationDateSpecified     = true,
-                ModificationDate          = DateHandlers.UnixUnsignedToDateTime(nilfsSb.wtime),
-                ModificationDateSpecified = true
+                Type             = "NILFS2 filesystem", ClusterSize = (uint)(1 << (int)(nilfsSb.log_block_size + 10)),
+                VolumeName       = StringHandlers.CToString(nilfsSb.volume_name, Encoding),
+                VolumeSerial     = nilfsSb.uuid.ToString(),
+                CreationDate     = DateHandlers.UnixUnsignedToDateTime(nilfsSb.ctime), CreationDateSpecified     = true,
+                ModificationDate = DateHandlers.UnixUnsignedToDateTime(nilfsSb.wtime), ModificationDateSpecified = true
             };
-            if(nilfsSb.creator_os == 0) XmlFsType.SystemIdentifier = "Linux";
+
+            if(nilfsSb.creator_os == 0)
+                XmlFsType.SystemIdentifier = "Linux";
+
             XmlFsType.Clusters = nilfsSb.dev_size / XmlFsType.ClusterSize;
         }
 
         enum NILFS2_State : ushort
         {
-            Valid  = 0x0001,
-            Error  = 0x0002,
-            Resize = 0x0004
+            Valid = 0x0001, Error = 0x0002, Resize = 0x0004
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
diff --git a/Aaru.Filesystems/NTFS.cs b/Aaru.Filesystems/NTFS.cs
index 97fd81c20..925a94eab 100644
--- a/Aaru.Filesystems/NTFS.cs
+++ b/Aaru.Filesystems/NTFS.cs
@@ -52,7 +52,8 @@ namespace Aaru.Filesystems
 
         public bool Identify(IMediaImage imagePlugin, Partition partition)
         {
-            if(2 + partition.Start >= partition.End) return false;
+            if(2 + partition.Start >= partition.End)
+                return false;
 
             byte[] eigthBytes = new byte[8];
 
@@ -61,25 +62,29 @@ namespace Aaru.Filesystems
             Array.Copy(ntfsBpb, 0x003, eigthBytes, 0, 8);
             string oemName = StringHandlers.CToString(eigthBytes);
 
-            if(oemName != "NTFS    ") return false;
+            if(oemName != "NTFS    ")
+                return false;
 
             byte   fatsNo    = ntfsBpb[0x010];
             ushort spFat     = BitConverter.ToUInt16(ntfsBpb, 0x016);
             ushort signature = BitConverter.ToUInt16(ntfsBpb, 0x1FE);
 
-            if(fatsNo != 0) return false;
-            if(spFat  != 0) return false;
+            if(fatsNo != 0)
+                return false;
+
+            if(spFat != 0)
+                return false;
 
             return signature == 0xAA55;
         }
 
         public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding    encoding)
+                                   Encoding encoding)
         {
             Encoding    = Encoding.Unicode;
             information = "";
 
-            StringBuilder sb = new StringBuilder();
+            var sb = new StringBuilder();
 
             byte[] ntfsBpb = imagePlugin.ReadSector(0 + partition.Start);
 
@@ -87,39 +92,51 @@ namespace Aaru.Filesystems
 
             sb.AppendFormat("{0} bytes per sector", ntfsBb.bps).AppendLine();
             sb.AppendFormat("{0} sectors per cluster ({1} bytes)", ntfsBb.spc, ntfsBb.spc * ntfsBb.bps).AppendLine();
+
             //          sb.AppendFormat("{0} reserved sectors", ntfs_bb.rsectors).AppendLine();
             //          sb.AppendFormat("{0} FATs", ntfs_bb.fats_no).AppendLine();
             //          sb.AppendFormat("{0} entries in the root folder", ntfs_bb.root_ent).AppendLine();
             //          sb.AppendFormat("{0} sectors on volume (small)", ntfs_bb.sml_sectors).AppendLine();
             sb.AppendFormat("Media descriptor: 0x{0:X2}", ntfsBb.media).AppendLine();
+
             //          sb.AppendFormat("{0} sectors per FAT", ntfs_bb.spfat).AppendLine();
             sb.AppendFormat("{0} sectors per track", ntfsBb.sptrk).AppendLine();
             sb.AppendFormat("{0} heads", ntfsBb.heads).AppendLine();
             sb.AppendFormat("{0} hidden sectors before filesystem", ntfsBb.hsectors).AppendLine();
+
             //          sb.AppendFormat("{0} sectors on volume (big)", ntfs_bb.big_sectors).AppendLine();
             sb.AppendFormat("BIOS drive number: 0x{0:X2}", ntfsBb.drive_no).AppendLine();
+
             //          sb.AppendFormat("NT flags: 0x{0:X2}", ntfs_bb.nt_flags).AppendLine();
             //          sb.AppendFormat("Signature 1: 0x{0:X2}", ntfs_bb.signature1).AppendLine();
-            sb.AppendFormat("{0} sectors on volume ({1} bytes)", ntfsBb.sectors, ntfsBb.sectors * ntfsBb.bps)
-              .AppendLine();
+            sb.AppendFormat("{0} sectors on volume ({1} bytes)", ntfsBb.sectors, ntfsBb.sectors * ntfsBb.bps).
+               AppendLine();
+
             sb.AppendFormat("Cluster where $MFT starts: {0}", ntfsBb.mft_lsn).AppendLine();
             sb.AppendFormat("Cluster where $MFTMirr starts: {0}", ntfsBb.mftmirror_lsn).AppendLine();
 
             if(ntfsBb.mft_rc_clusters > 0)
                 sb.AppendFormat("{0} clusters per MFT record ({1} bytes)", ntfsBb.mft_rc_clusters,
                                 ntfsBb.mft_rc_clusters * ntfsBb.bps * ntfsBb.spc).AppendLine();
-            else sb.AppendFormat("{0} bytes per MFT record", 1 << -ntfsBb.mft_rc_clusters).AppendLine();
+            else
+                sb.AppendFormat("{0} bytes per MFT record", 1 << -ntfsBb.mft_rc_clusters).AppendLine();
+
             if(ntfsBb.index_blk_cts > 0)
                 sb.AppendFormat("{0} clusters per Index block ({1} bytes)", ntfsBb.index_blk_cts,
                                 ntfsBb.index_blk_cts * ntfsBb.bps * ntfsBb.spc).AppendLine();
-            else sb.AppendFormat("{0} bytes per Index block", 1 << -ntfsBb.index_blk_cts).AppendLine();
+            else
+                sb.AppendFormat("{0} bytes per Index block", 1 << -ntfsBb.index_blk_cts).AppendLine();
 
             sb.AppendFormat("Volume serial number: {0:X16}", ntfsBb.serial_no).AppendLine();
+
             //          sb.AppendFormat("Signature 2: 0x{0:X4}", ntfs_bb.signature2).AppendLine();
 
             XmlFsType = new FileSystemType();
 
-            if(ntfsBb.jump[0] == 0xEB && ntfsBb.jump[1] > 0x4E && ntfsBb.jump[1] < 0x80 && ntfsBb.signature2 == 0xAA55)
+            if(ntfsBb.jump[0]    == 0xEB &&
+               ntfsBb.jump[1]    > 0x4E  &&
+               ntfsBb.jump[1]    < 0x80  &&
+               ntfsBb.signature2 == 0xAA55)
             {
                 XmlFsType.Bootable = true;
                 string bootChk = Sha1Context.Data(ntfsBb.boot_code, out _);
@@ -135,9 +152,7 @@ namespace Aaru.Filesystems
             information = sb.ToString();
         }
 
-        /// <summary>
-        ///     NTFS $BOOT
-        /// </summary>
+        /// <summary>NTFS $BOOT</summary>
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct NtfsBootBlock
         {
@@ -180,6 +195,7 @@ namespace Aaru.Filesystems
             public readonly byte signature1;
             /// <summary>0x027, Alignment</summary>
             public readonly byte dummy;
+
             // End of BIOS Parameter Block
 
             // Start of NTFS real superblock
diff --git a/Aaru.Filesystems/Nintendo.cs b/Aaru.Filesystems/Nintendo.cs
index b6e86debb..538c7111a 100644
--- a/Aaru.Filesystems/Nintendo.cs
+++ b/Aaru.Filesystems/Nintendo.cs
@@ -49,9 +49,11 @@ namespace Aaru.Filesystems
 
         public bool Identify(IMediaImage imagePlugin, Partition partition)
         {
-            if(partition.Start != 0) return false;
+            if(partition.Start != 0)
+                return false;
 
-            if(imagePlugin.Info.Sectors * imagePlugin.Info.SectorSize < 0x50000) return false;
+            if(imagePlugin.Info.Sectors * imagePlugin.Info.SectorSize < 0x50000)
+                return false;
 
             byte[] header = imagePlugin.ReadSectors(0, 0x50000 / imagePlugin.Info.SectorSize);
 
@@ -62,14 +64,14 @@ namespace Aaru.Filesystems
         }
 
         public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding    encoding)
+                                   Encoding encoding)
         {
             Encoding = encoding ?? Encoding.GetEncoding("shift_jis");
-            StringBuilder sbInformation = new StringBuilder();
+            var sbInformation = new StringBuilder();
             information = "";
             XmlFsType   = new FileSystemType();
 
-            NintendoFields fields = new NintendoFields();
+            var fields = new NintendoFields();
 
             byte[] header = imagePlugin.ReadSectors(0, 0x50000 / imagePlugin.Info.SectorSize);
 
@@ -78,8 +80,10 @@ namespace Aaru.Filesystems
             uint magicGc  = BigEndianBitConverter.ToUInt32(header, 0x1C);
             uint magicWii = BigEndianBitConverter.ToUInt32(header, 0x18);
 
-            if(magicWii     == 0x5D1C9EA3) wii = true;
-            else if(magicGc != 0xC2339F3D) return;
+            if(magicWii == 0x5D1C9EA3)
+                wii = true;
+            else if(magicGc != 0xC2339F3D)
+                return;
 
             fields.DiscType         =  Encoding.ASCII.GetString(header, 0, 1);
             fields.GameCode         =  Encoding.ASCII.GetString(header, 1, 2);
@@ -117,39 +121,43 @@ namespace Aaru.Filesystems
                 fields.FourthPartitions = new NintendoPartition[BigEndianBitConverter.ToUInt32(header, 0x40018)];
 
                 for(int i = 0; i < fields.FirstPartitions.Length; i++)
-                    if(offset1 + i * 8 + 8 < 0x50000)
+                    if(offset1 + (i * 8) + 8 < 0x50000)
                     {
                         fields.FirstPartitions[i].Offset =
-                            BigEndianBitConverter.ToUInt32(header, (int)(offset1 + i * 8 + 0)) << 2;
+                            BigEndianBitConverter.ToUInt32(header, (int)(offset1 + (i * 8) + 0)) << 2;
+
                         fields.FirstPartitions[i].Type =
-                            BigEndianBitConverter.ToUInt32(header, (int)(offset1 + i * 8 + 4));
+                            BigEndianBitConverter.ToUInt32(header, (int)(offset1 + (i * 8) + 4));
                     }
 
                 for(int i = 0; i < fields.SecondPartitions.Length; i++)
-                    if(offset1 + i * 8 + 8 < 0x50000)
+                    if(offset1 + (i * 8) + 8 < 0x50000)
                     {
                         fields.FirstPartitions[i].Offset =
-                            BigEndianBitConverter.ToUInt32(header, (int)(offset2 + i * 8 + 0)) << 2;
+                            BigEndianBitConverter.ToUInt32(header, (int)(offset2 + (i * 8) + 0)) << 2;
+
                         fields.FirstPartitions[i].Type =
-                            BigEndianBitConverter.ToUInt32(header, (int)(offset2 + i * 8 + 4));
+                            BigEndianBitConverter.ToUInt32(header, (int)(offset2 + (i * 8) + 4));
                     }
 
                 for(int i = 0; i < fields.ThirdPartitions.Length; i++)
-                    if(offset1 + i * 8 + 8 < 0x50000)
+                    if(offset1 + (i * 8) + 8 < 0x50000)
                     {
                         fields.FirstPartitions[i].Offset =
-                            BigEndianBitConverter.ToUInt32(header, (int)(offset3 + i * 8 + 0)) << 2;
+                            BigEndianBitConverter.ToUInt32(header, (int)(offset3 + (i * 8) + 0)) << 2;
+
                         fields.FirstPartitions[i].Type =
-                            BigEndianBitConverter.ToUInt32(header, (int)(offset3 + i * 8 + 4));
+                            BigEndianBitConverter.ToUInt32(header, (int)(offset3 + (i * 8) + 4));
                     }
 
                 for(int i = 0; i < fields.FourthPartitions.Length; i++)
-                    if(offset1 + i * 8 + 8 < 0x50000)
+                    if(offset1 + (i * 8) + 8 < 0x50000)
                     {
                         fields.FirstPartitions[i].Offset =
-                            BigEndianBitConverter.ToUInt32(header, (int)(offset4 + i * 8 + 0)) << 2;
+                            BigEndianBitConverter.ToUInt32(header, (int)(offset4 + (i * 8) + 0)) << 2;
+
                         fields.FirstPartitions[i].Type =
-                            BigEndianBitConverter.ToUInt32(header, (int)(offset4 + i * 8 + 4));
+                            BigEndianBitConverter.ToUInt32(header, (int)(offset4 + (i * 8) + 4));
                     }
 
                 fields.Region       = header[0x4E000];
@@ -171,64 +179,69 @@ namespace Aaru.Filesystems
                 fields.FourthPartitions = new NintendoPartition[0];
             }
 
-            AaruConsole.DebugWriteLine("Nintendo plugin", "discType = {0}",         fields.DiscType);
-            AaruConsole.DebugWriteLine("Nintendo plugin", "gameCode = {0}",         fields.GameCode);
-            AaruConsole.DebugWriteLine("Nintendo plugin", "regionCode = {0}",       fields.RegionCode);
-            AaruConsole.DebugWriteLine("Nintendo plugin", "publisherCode = {0}",    fields.PublisherCode);
-            AaruConsole.DebugWriteLine("Nintendo plugin", "discID = {0}",           fields.DiscId);
-            AaruConsole.DebugWriteLine("Nintendo plugin", "discNumber = {0}",       fields.DiscNumber);
-            AaruConsole.DebugWriteLine("Nintendo plugin", "discVersion = {0}",      fields.DiscVersion);
-            AaruConsole.DebugWriteLine("Nintendo plugin", "streaming = {0}",        fields.Streaming);
+            AaruConsole.DebugWriteLine("Nintendo plugin", "discType = {0}", fields.DiscType);
+            AaruConsole.DebugWriteLine("Nintendo plugin", "gameCode = {0}", fields.GameCode);
+            AaruConsole.DebugWriteLine("Nintendo plugin", "regionCode = {0}", fields.RegionCode);
+            AaruConsole.DebugWriteLine("Nintendo plugin", "publisherCode = {0}", fields.PublisherCode);
+            AaruConsole.DebugWriteLine("Nintendo plugin", "discID = {0}", fields.DiscId);
+            AaruConsole.DebugWriteLine("Nintendo plugin", "discNumber = {0}", fields.DiscNumber);
+            AaruConsole.DebugWriteLine("Nintendo plugin", "discVersion = {0}", fields.DiscVersion);
+            AaruConsole.DebugWriteLine("Nintendo plugin", "streaming = {0}", fields.Streaming);
             AaruConsole.DebugWriteLine("Nintendo plugin", "streamBufferSize = {0}", fields.StreamBufferSize);
-            AaruConsole.DebugWriteLine("Nintendo plugin", "title = \"{0}\"",        fields.Title);
-            AaruConsole.DebugWriteLine("Nintendo plugin", "debugOff = 0x{0:X8}",    fields.DebugOff);
-            AaruConsole.DebugWriteLine("Nintendo plugin", "debugAddr = 0x{0:X8}",   fields.DebugAddr);
-            AaruConsole.DebugWriteLine("Nintendo plugin", "dolOff = 0x{0:X8}",      fields.DolOff);
-            AaruConsole.DebugWriteLine("Nintendo plugin", "fstOff = 0x{0:X8}",      fields.FstOff);
-            AaruConsole.DebugWriteLine("Nintendo plugin", "fstSize = {0}",          fields.FstSize);
-            AaruConsole.DebugWriteLine("Nintendo plugin", "fstMax = {0}",           fields.FstMax);
+            AaruConsole.DebugWriteLine("Nintendo plugin", "title = \"{0}\"", fields.Title);
+            AaruConsole.DebugWriteLine("Nintendo plugin", "debugOff = 0x{0:X8}", fields.DebugOff);
+            AaruConsole.DebugWriteLine("Nintendo plugin", "debugAddr = 0x{0:X8}", fields.DebugAddr);
+            AaruConsole.DebugWriteLine("Nintendo plugin", "dolOff = 0x{0:X8}", fields.DolOff);
+            AaruConsole.DebugWriteLine("Nintendo plugin", "fstOff = 0x{0:X8}", fields.FstOff);
+            AaruConsole.DebugWriteLine("Nintendo plugin", "fstSize = {0}", fields.FstSize);
+            AaruConsole.DebugWriteLine("Nintendo plugin", "fstMax = {0}", fields.FstMax);
+
             for(int i = 0; i < fields.FirstPartitions.Length; i++)
             {
                 AaruConsole.DebugWriteLine("Nintendo plugin", "firstPartitions[{1}].offset = {0}",
-                                          fields.FirstPartitions[i].Offset, i);
+                                           fields.FirstPartitions[i].Offset, i);
+
                 AaruConsole.DebugWriteLine("Nintendo plugin", "firstPartitions[{1}].type = {0}",
-                                          fields.FirstPartitions[i].Type, i);
+                                           fields.FirstPartitions[i].Type, i);
             }
 
             for(int i = 0; i < fields.SecondPartitions.Length; i++)
             {
                 AaruConsole.DebugWriteLine("Nintendo plugin", "secondPartitions[{1}].offset = {0}",
-                                          fields.SecondPartitions[i].Offset, i);
+                                           fields.SecondPartitions[i].Offset, i);
+
                 AaruConsole.DebugWriteLine("Nintendo plugin", "secondPartitions[{1}].type = {0}",
-                                          fields.SecondPartitions[i].Type, i);
+                                           fields.SecondPartitions[i].Type, i);
             }
 
             for(int i = 0; i < fields.ThirdPartitions.Length; i++)
             {
                 AaruConsole.DebugWriteLine("Nintendo plugin", "thirdPartitions[{1}].offset = {0}",
-                                          fields.ThirdPartitions[i].Offset, i);
+                                           fields.ThirdPartitions[i].Offset, i);
+
                 AaruConsole.DebugWriteLine("Nintendo plugin", "thirdPartitions[{1}].type = {0}",
-                                          fields.ThirdPartitions[i].Type, i);
+                                           fields.ThirdPartitions[i].Type, i);
             }
 
             for(int i = 0; i < fields.FourthPartitions.Length; i++)
             {
                 AaruConsole.DebugWriteLine("Nintendo plugin", "fourthPartitions[{1}].offset = {0}",
-                                          fields.FourthPartitions[i].Offset, i);
+                                           fields.FourthPartitions[i].Offset, i);
+
                 AaruConsole.DebugWriteLine("Nintendo plugin", "fourthPartitions[{1}].type = {0}",
-                                          fields.FourthPartitions[i].Type, i);
+                                           fields.FourthPartitions[i].Type, i);
             }
 
-            AaruConsole.DebugWriteLine("Nintendo plugin", "region = {0}",       fields.Region);
-            AaruConsole.DebugWriteLine("Nintendo plugin", "japanAge = {0}",     fields.JapanAge);
-            AaruConsole.DebugWriteLine("Nintendo plugin", "usaAge = {0}",       fields.UsaAge);
-            AaruConsole.DebugWriteLine("Nintendo plugin", "germanAge = {0}",    fields.GermanAge);
-            AaruConsole.DebugWriteLine("Nintendo plugin", "pegiAge = {0}",      fields.PegiAge);
-            AaruConsole.DebugWriteLine("Nintendo plugin", "finlandAge = {0}",   fields.FinlandAge);
-            AaruConsole.DebugWriteLine("Nintendo plugin", "portugalAge = {0}",  fields.PortugalAge);
-            AaruConsole.DebugWriteLine("Nintendo plugin", "ukAge = {0}",        fields.UkAge);
+            AaruConsole.DebugWriteLine("Nintendo plugin", "region = {0}", fields.Region);
+            AaruConsole.DebugWriteLine("Nintendo plugin", "japanAge = {0}", fields.JapanAge);
+            AaruConsole.DebugWriteLine("Nintendo plugin", "usaAge = {0}", fields.UsaAge);
+            AaruConsole.DebugWriteLine("Nintendo plugin", "germanAge = {0}", fields.GermanAge);
+            AaruConsole.DebugWriteLine("Nintendo plugin", "pegiAge = {0}", fields.PegiAge);
+            AaruConsole.DebugWriteLine("Nintendo plugin", "finlandAge = {0}", fields.FinlandAge);
+            AaruConsole.DebugWriteLine("Nintendo plugin", "portugalAge = {0}", fields.PortugalAge);
+            AaruConsole.DebugWriteLine("Nintendo plugin", "ukAge = {0}", fields.UkAge);
             AaruConsole.DebugWriteLine("Nintendo plugin", "australiaAge = {0}", fields.AustraliaAge);
-            AaruConsole.DebugWriteLine("Nintendo plugin", "koreaAge = {0}",     fields.KoreaAge);
+            AaruConsole.DebugWriteLine("Nintendo plugin", "koreaAge = {0}", fields.KoreaAge);
 
             sbInformation.AppendLine("Nintendo optical filesystem");
             sbInformation.AppendLine(wii ? "Nintendo Wii Optical Disc" : "Nintendo GameCube Optical Disc");
@@ -236,12 +249,17 @@ namespace Aaru.Filesystems
             sbInformation.AppendFormat("Disc is a {0} disc", DiscTypeToString(fields.DiscType)).AppendLine();
             sbInformation.AppendFormat("Disc region is {0}", RegionCodeToString(fields.RegionCode)).AppendLine();
             sbInformation.AppendFormat("Published by {0}", PublisherCodeToString(fields.PublisherCode)).AppendLine();
+
             if(fields.DiscNumber > 0)
                 sbInformation.AppendFormat("Disc number {0} of a multi-disc set", fields.DiscNumber + 1).AppendLine();
-            if(fields.Streaming) sbInformation.AppendLine("Disc is prepared for audio streaming");
+
+            if(fields.Streaming)
+                sbInformation.AppendLine("Disc is prepared for audio streaming");
+
             if(fields.StreamBufferSize > 0)
-                sbInformation.AppendFormat("Audio streaming buffer size is {0} bytes", fields.StreamBufferSize)
-                             .AppendLine();
+                sbInformation.AppendFormat("Audio streaming buffer size is {0} bytes", fields.StreamBufferSize).
+                              AppendLine();
+
             sbInformation.AppendFormat("Title: {0}", fields.Title).AppendLine();
 
             if(wii)
@@ -250,14 +268,17 @@ namespace Aaru.Filesystems
                     sbInformation.AppendFormat("First {0} partition starts at sector {1}",
                                                PartitionTypeToString(fields.FirstPartitions[i].Type),
                                                fields.FirstPartitions[i].Offset / 2048).AppendLine();
+
                 for(int i = 0; i < fields.SecondPartitions.Length; i++)
                     sbInformation.AppendFormat("Second {0} partition starts at sector {1}",
                                                PartitionTypeToString(fields.SecondPartitions[i].Type),
                                                fields.SecondPartitions[i].Offset / 2048).AppendLine();
+
                 for(int i = 0; i < fields.ThirdPartitions.Length; i++)
                     sbInformation.AppendFormat("Third {0} partition starts at sector {1}",
                                                PartitionTypeToString(fields.ThirdPartitions[i].Type),
                                                fields.ThirdPartitions[i].Offset / 2048).AppendLine();
+
                 for(int i = 0; i < fields.FourthPartitions.Length; i++)
                     sbInformation.AppendFormat("Fourth {0} partition starts at sector {1}",
                                                PartitionTypeToString(fields.FourthPartitions[i].Type),
@@ -266,30 +287,38 @@ namespace Aaru.Filesystems
                 //                sbInformation.AppendFormat("Region byte is {0}", fields.region).AppendLine();
                 if((fields.JapanAge & 0x80) != 0x80)
                     sbInformation.AppendFormat("Japan age rating is {0}", fields.JapanAge).AppendLine();
+
                 if((fields.UsaAge & 0x80) != 0x80)
                     sbInformation.AppendFormat("ESRB age rating is {0}", fields.UsaAge).AppendLine();
+
                 if((fields.GermanAge & 0x80) != 0x80)
                     sbInformation.AppendFormat("German age rating is {0}", fields.GermanAge).AppendLine();
+
                 if((fields.PegiAge & 0x80) != 0x80)
                     sbInformation.AppendFormat("PEGI age rating is {0}", fields.PegiAge).AppendLine();
+
                 if((fields.FinlandAge & 0x80) != 0x80)
                     sbInformation.AppendFormat("Finland age rating is {0}", fields.FinlandAge).AppendLine();
+
                 if((fields.PortugalAge & 0x80) != 0x80)
                     sbInformation.AppendFormat("Portugal age rating is {0}", fields.PortugalAge).AppendLine();
+
                 if((fields.UkAge & 0x80) != 0x80)
                     sbInformation.AppendFormat("UK age rating is {0}", fields.UkAge).AppendLine();
+
                 if((fields.AustraliaAge & 0x80) != 0x80)
                     sbInformation.AppendFormat("Australia age rating is {0}", fields.AustraliaAge).AppendLine();
+
                 if((fields.KoreaAge & 0x80) != 0x80)
                     sbInformation.AppendFormat("Korea age rating is {0}", fields.KoreaAge).AppendLine();
             }
             else
-                sbInformation.AppendFormat("FST starts at {0} and has {1} bytes", fields.FstOff, fields.FstSize)
-                             .AppendLine();
+                sbInformation.AppendFormat("FST starts at {0} and has {1} bytes", fields.FstOff, fields.FstSize).
+                              AppendLine();
 
             information            = sbInformation.ToString();
             XmlFsType.Bootable     = true;
-            XmlFsType.Clusters     = imagePlugin.Info.Sectors * imagePlugin.Info.SectorSize / 2048;
+            XmlFsType.Clusters     = (imagePlugin.Info.Sectors * imagePlugin.Info.SectorSize) / 2048;
             XmlFsType.ClusterSize  = 2048;
             XmlFsType.Type         = wii ? "Nintendo Wii filesystem" : "Nintendo Gamecube filesystem";
             XmlFsType.VolumeName   = fields.Title;
diff --git a/Aaru.Filesystems/ODS.cs b/Aaru.Filesystems/ODS.cs
index edb488c52..0ea1bb5f0 100644
--- a/Aaru.Filesystems/ODS.cs
+++ b/Aaru.Filesystems/ODS.cs
@@ -61,9 +61,11 @@ namespace Aaru.Filesystems
 
         public bool Identify(IMediaImage imagePlugin, Partition partition)
         {
-            if(2 + partition.Start >= partition.End) return false;
+            if(2 + partition.Start >= partition.End)
+                return false;
 
-            if(imagePlugin.Info.SectorSize < 512) return false;
+            if(imagePlugin.Info.SectorSize < 512)
+                return false;
 
             byte[] magicB   = new byte[12];
             byte[] hbSector = imagePlugin.ReadSector(1 + partition.Start);
@@ -73,12 +75,16 @@ namespace Aaru.Filesystems
 
             AaruConsole.DebugWriteLine("Files-11 plugin", "magic: \"{0}\"", magic);
 
-            if(magic == "DECFILE11A  " || magic == "DECFILE11B  ") return true;
+            if(magic == "DECFILE11A  " ||
+               magic == "DECFILE11B  ")
+                return true;
 
             // Optical disc
-            if(imagePlugin.Info.XmlMediaType != XmlMediaType.OpticalDisc) return false;
+            if(imagePlugin.Info.XmlMediaType != XmlMediaType.OpticalDisc)
+                return false;
 
-            if(hbSector.Length < 0x400) return false;
+            if(hbSector.Length < 0x400)
+                return false;
 
             hbSector = imagePlugin.ReadSector(partition.Start);
 
@@ -91,12 +97,12 @@ namespace Aaru.Filesystems
         }
 
         public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding    encoding)
+                                   Encoding encoding)
         {
             Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-1");
             information = "";
 
-            StringBuilder sb = new StringBuilder();
+            var sb = new StringBuilder();
 
             byte[] hbSector = imagePlugin.ReadSector(1 + partition.Start);
 
@@ -107,7 +113,8 @@ namespace Aaru.Filesystems
                StringHandlers.CToString(homeblock.format) != "DECFILE11A  "           &&
                StringHandlers.CToString(homeblock.format) != "DECFILE11B  ")
             {
-                if(hbSector.Length < 0x400) return;
+                if(hbSector.Length < 0x400)
+                    return;
 
                 byte[] tmp = imagePlugin.ReadSector(partition.Start);
                 hbSector = new byte[0x200];
@@ -116,79 +123,117 @@ namespace Aaru.Filesystems
                 homeblock = Marshal.ByteArrayToStructureLittleEndian<OdsHomeBlock>(hbSector);
 
                 if(StringHandlers.CToString(homeblock.format) != "DECFILE11A  " &&
-                   StringHandlers.CToString(homeblock.format) != "DECFILE11B  ") return;
+                   StringHandlers.CToString(homeblock.format) != "DECFILE11B  ")
+                    return;
             }
 
-            if((homeblock.struclev & 0xFF00)              != 0x0200 || (homeblock.struclev & 0xFF) != 1 ||
+            if((homeblock.struclev & 0xFF00)              != 0x0200 ||
+               (homeblock.struclev & 0xFF)                != 1      ||
                StringHandlers.CToString(homeblock.format) != "DECFILE11B  ")
                 sb.AppendLine("The following information may be incorrect for this volume.");
-            if(homeblock.resfiles < 5 || homeblock.devtype != 0) sb.AppendLine("This volume may be corrupted.");
 
-            sb.AppendFormat("Volume format is {0}", StringHandlers.SpacePaddedToString(homeblock.format, Encoding))
-              .AppendLine();
+            if(homeblock.resfiles < 5 ||
+               homeblock.devtype  != 0)
+                sb.AppendLine("This volume may be corrupted.");
+
+            sb.AppendFormat("Volume format is {0}", StringHandlers.SpacePaddedToString(homeblock.format, Encoding)).
+               AppendLine();
+
             sb.AppendFormat("Volume is Level {0} revision {1}", (homeblock.struclev & 0xFF00) >> 8,
                             homeblock.struclev & 0xFF).AppendLine();
+
             sb.AppendFormat("Lowest structure in the volume is Level {0}, revision {1}",
                             (homeblock.lowstruclev & 0xFF00) >> 8, homeblock.lowstruclev & 0xFF).AppendLine();
+
             sb.AppendFormat("Highest structure in the volume is Level {0}, revision {1}",
                             (homeblock.highstruclev & 0xFF00) >> 8, homeblock.highstruclev & 0xFF).AppendLine();
-            sb.AppendFormat("{0} sectors per cluster ({1} bytes)", homeblock.cluster, homeblock.cluster * 512)
-              .AppendLine();
-            sb.AppendFormat("This home block is on sector {0} (VBN {1})", homeblock.homelbn, homeblock.homevbn)
-              .AppendLine();
-            sb.AppendFormat("Secondary home block is on sector {0} (VBN {1})", homeblock.alhomelbn, homeblock.alhomevbn)
-              .AppendLine();
-            sb.AppendFormat("Volume bitmap starts in sector {0} (VBN {1})", homeblock.ibmaplbn, homeblock.ibmapvbn)
-              .AppendLine();
+
+            sb.AppendFormat("{0} sectors per cluster ({1} bytes)", homeblock.cluster, homeblock.cluster * 512).
+               AppendLine();
+
+            sb.AppendFormat("This home block is on sector {0} (VBN {1})", homeblock.homelbn, homeblock.homevbn).
+               AppendLine();
+
+            sb.AppendFormat("Secondary home block is on sector {0} (VBN {1})", homeblock.alhomelbn,
+                            homeblock.alhomevbn).AppendLine();
+
+            sb.AppendFormat("Volume bitmap starts in sector {0} (VBN {1})", homeblock.ibmaplbn, homeblock.ibmapvbn).
+               AppendLine();
+
             sb.AppendFormat("Volume bitmap runs for {0} sectors ({1} bytes)", homeblock.ibmapsize,
                             homeblock.ibmapsize * 512).AppendLine();
-            sb.AppendFormat("Backup INDEXF.SYS;1 is in sector {0} (VBN {1})", homeblock.altidxlbn, homeblock.altidxvbn)
-              .AppendLine();
+
+            sb.AppendFormat("Backup INDEXF.SYS;1 is in sector {0} (VBN {1})", homeblock.altidxlbn, homeblock.altidxvbn).
+               AppendLine();
+
             sb.AppendFormat("{0} maximum files on the volume", homeblock.maxfiles).AppendLine();
             sb.AppendFormat("{0} reserved files", homeblock.resfiles).AppendLine();
-            if(homeblock.rvn                                 > 0 && homeblock.setcount > 0 &&
+
+            if(homeblock.rvn                                 > 0 &&
+               homeblock.setcount                            > 0 &&
                StringHandlers.CToString(homeblock.strucname) != "            ")
                 sb.AppendFormat("Volume is {0} of {1} in set \"{2}\".", homeblock.rvn, homeblock.setcount,
                                 StringHandlers.SpacePaddedToString(homeblock.strucname, Encoding)).AppendLine();
+
             sb.AppendFormat("Volume owner is \"{0}\" (ID 0x{1:X8})",
-                            StringHandlers.SpacePaddedToString(homeblock.ownername, Encoding), homeblock.volowner)
-              .AppendLine();
-            sb.AppendFormat("Volume label: \"{0}\"", StringHandlers.SpacePaddedToString(homeblock.volname, Encoding))
-              .AppendLine();
+                            StringHandlers.SpacePaddedToString(homeblock.ownername, Encoding), homeblock.volowner).
+               AppendLine();
+
+            sb.AppendFormat("Volume label: \"{0}\"", StringHandlers.SpacePaddedToString(homeblock.volname, Encoding)).
+               AppendLine();
+
             sb.AppendFormat("Drive serial number: 0x{0:X8}", homeblock.serialnum).AppendLine();
             sb.AppendFormat("Volume was created on {0}", DateHandlers.VmsToDateTime(homeblock.credate)).AppendLine();
+
             if(homeblock.revdate > 0)
-                sb.AppendFormat("Volume was last modified on {0}", DateHandlers.VmsToDateTime(homeblock.revdate))
-                  .AppendLine();
+                sb.AppendFormat("Volume was last modified on {0}", DateHandlers.VmsToDateTime(homeblock.revdate)).
+                   AppendLine();
+
             if(homeblock.copydate > 0)
                 sb.AppendFormat("Volume copied on {0}", DateHandlers.VmsToDateTime(homeblock.copydate)).AppendLine();
+
             sb.AppendFormat("Checksums: 0x{0:X4} and 0x{1:X4}", homeblock.checksum1, homeblock.checksum2).AppendLine();
             sb.AppendLine("Flags:");
             sb.AppendFormat("Window: {0}", homeblock.window).AppendLine();
             sb.AppendFormat("Cached directores: {0}", homeblock.lru_lim).AppendLine();
             sb.AppendFormat("Default allocation: {0} blocks", homeblock.extend).AppendLine();
-            if((homeblock.volchar & 0x01) == 0x01) sb.AppendLine("Readings should be verified");
-            if((homeblock.volchar & 0x02) == 0x02) sb.AppendLine("Writings should be verified");
-            if((homeblock.volchar & 0x04) == 0x04) sb.AppendLine("Files should be erased or overwritten when deleted");
-            if((homeblock.volchar & 0x08) == 0x08) sb.AppendLine("Highwater mark is to be disabled");
-            if((homeblock.volchar & 0x10) == 0x10) sb.AppendLine("Classification checks are enabled");
+
+            if((homeblock.volchar & 0x01) == 0x01)
+                sb.AppendLine("Readings should be verified");
+
+            if((homeblock.volchar & 0x02) == 0x02)
+                sb.AppendLine("Writings should be verified");
+
+            if((homeblock.volchar & 0x04) == 0x04)
+                sb.AppendLine("Files should be erased or overwritten when deleted");
+
+            if((homeblock.volchar & 0x08) == 0x08)
+                sb.AppendLine("Highwater mark is to be disabled");
+
+            if((homeblock.volchar & 0x10) == 0x10)
+                sb.AppendLine("Classification checks are enabled");
+
             sb.AppendLine("Volume permissions (r = read, w = write, c = create, d = delete)");
             sb.AppendLine("System, owner, group, world");
+
             // System
             sb.Append((homeblock.protect & 0x1000) == 0x1000 ? "-" : "r");
             sb.Append((homeblock.protect & 0x2000) == 0x2000 ? "-" : "w");
             sb.Append((homeblock.protect & 0x4000) == 0x4000 ? "-" : "c");
             sb.Append((homeblock.protect & 0x8000) == 0x8000 ? "-" : "d");
+
             // Owner
             sb.Append((homeblock.protect & 0x100) == 0x100 ? "-" : "r");
             sb.Append((homeblock.protect & 0x200) == 0x200 ? "-" : "w");
             sb.Append((homeblock.protect & 0x400) == 0x400 ? "-" : "c");
             sb.Append((homeblock.protect & 0x800) == 0x800 ? "-" : "d");
+
             // Group
             sb.Append((homeblock.protect & 0x10) == 0x10 ? "-" : "r");
             sb.Append((homeblock.protect & 0x20) == 0x20 ? "-" : "w");
             sb.Append((homeblock.protect & 0x40) == 0x40 ? "-" : "c");
             sb.Append((homeblock.protect & 0x80) == 0x80 ? "-" : "d");
+
             // World (other)
             sb.Append((homeblock.protect & 0x1) == 0x1 ? "-" : "r");
             sb.Append((homeblock.protect & 0x2) == 0x2 ? "-" : "w");
@@ -204,12 +249,12 @@ namespace Aaru.Filesystems
 
             XmlFsType = new FileSystemType
             {
-                Type         = "FILES-11",
-                ClusterSize  = (uint)(homeblock.cluster * 512),
+                Type         = "FILES-11", ClusterSize = (uint)(homeblock.cluster * 512),
                 Clusters     = partition.Size / (ulong)(homeblock.cluster * 512),
                 VolumeName   = StringHandlers.SpacePaddedToString(homeblock.volname, Encoding),
                 VolumeSerial = $"{homeblock.serialnum:X8}"
             };
+
             if(homeblock.credate > 0)
             {
                 XmlFsType.CreationDate          = DateHandlers.VmsToDateTime(homeblock.credate);
diff --git a/Aaru.Filesystems/Opera/Consts.cs b/Aaru.Filesystems/Opera/Consts.cs
index 13b1d98bc..e691be549 100644
--- a/Aaru.Filesystems/Opera/Consts.cs
+++ b/Aaru.Filesystems/Opera/Consts.cs
@@ -8,27 +8,18 @@ namespace Aaru.Filesystems
         const uint   FLAGS_MASK = 0xFF;
         const int    MAX_NAME   = 32;
 
-        /// <summary>
-        ///     Directory
-        /// </summary>
+        /// <summary>Directory</summary>
         const uint TYPE_DIR = 0x2A646972;
-        /// <summary>
-        ///     Disc label
-        /// </summary>
+        /// <summary>Disc label</summary>
         const uint TYPE_LBL = 0x2A6C626C;
-        /// <summary>
-        ///     Catapult
-        /// </summary>
+        /// <summary>Catapult</summary>
         const uint TYPE_ZAP = 0x2A7A6170;
         static readonly int DirectoryEntrySize = Marshal.SizeOf<DirectoryEntry>();
 
         enum FileFlags : uint
         {
-            File             = 2,
-            Special          = 6,
-            Directory        = 7,
-            LastEntryInBlock = 0x40000000,
-            LastEntry        = 0x80000000
+            File             = 2, Special            = 6, Directory = 7,
+            LastEntryInBlock = 0x40000000, LastEntry = 0x80000000
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/Opera/Dir.cs b/Aaru.Filesystems/Opera/Dir.cs
index 7db8409ba..2410c8b2e 100644
--- a/Aaru.Filesystems/Opera/Dir.cs
+++ b/Aaru.Filesystems/Opera/Dir.cs
@@ -12,11 +12,15 @@ namespace Aaru.Filesystems
         public Errno ReadDir(string path, out List<string> contents)
         {
             contents = null;
-            if(!mounted) return Errno.AccessDenied;
 
-            if(string.IsNullOrWhiteSpace(path) || path == "/")
+            if(!mounted)
+                return Errno.AccessDenied;
+
+            if(string.IsNullOrWhiteSpace(path) ||
+               path == "/")
             {
                 contents = rootDirectoryCache.Keys.ToList();
+
                 return Errno.NoError;
             }
 
@@ -27,17 +31,23 @@ namespace Aaru.Filesystems
             if(directoryCache.TryGetValue(cutPath, out Dictionary<string, DirectoryEntryWithPointers> currentDirectory))
             {
                 contents = currentDirectory.Keys.ToList();
+
                 return Errno.NoError;
             }
 
-            string[] pieces = cutPath.Split(new[] {'/'}, StringSplitOptions.RemoveEmptyEntries);
+            string[] pieces = cutPath.Split(new[]
+            {
+                '/'
+            }, StringSplitOptions.RemoveEmptyEntries);
 
             KeyValuePair<string, DirectoryEntryWithPointers> entry =
                 rootDirectoryCache.FirstOrDefault(t => t.Key.ToLower(CultureInfo.CurrentUICulture) == pieces[0]);
 
-            if(string.IsNullOrEmpty(entry.Key)) return Errno.NoSuchFile;
+            if(string.IsNullOrEmpty(entry.Key))
+                return Errno.NoSuchFile;
 
-            if((entry.Value.entry.flags & FLAGS_MASK) != (int)FileFlags.Directory) return Errno.NotDirectory;
+            if((entry.Value.entry.flags & FLAGS_MASK) != (int)FileFlags.Directory)
+                return Errno.NotDirectory;
 
             string currentPath = pieces[0];
 
@@ -47,15 +57,19 @@ namespace Aaru.Filesystems
             {
                 entry = currentDirectory.FirstOrDefault(t => t.Key.ToLower(CultureInfo.CurrentUICulture) == pieces[p]);
 
-                if(string.IsNullOrEmpty(entry.Key)) return Errno.NoSuchFile;
+                if(string.IsNullOrEmpty(entry.Key))
+                    return Errno.NoSuchFile;
 
-                if((entry.Value.entry.flags & FLAGS_MASK) != (int)FileFlags.Directory) return Errno.NotDirectory;
+                if((entry.Value.entry.flags & FLAGS_MASK) != (int)FileFlags.Directory)
+                    return Errno.NotDirectory;
 
                 currentPath = p == 0 ? pieces[0] : $"{currentPath}/{pieces[p]}";
 
-                if(directoryCache.TryGetValue(currentPath, out currentDirectory)) continue;
+                if(directoryCache.TryGetValue(currentPath, out currentDirectory))
+                    continue;
 
-                if(entry.Value.pointers.Length < 1) return Errno.InvalidArgument;
+                if(entry.Value.pointers.Length < 1)
+                    return Errno.InvalidArgument;
 
                 currentDirectory = DecodeDirectory((int)entry.Value.pointers[0]);
 
@@ -63,6 +77,7 @@ namespace Aaru.Filesystems
             }
 
             contents = currentDirectory?.Keys.ToList();
+
             return Errno.NoError;
         }
 
@@ -83,31 +98,34 @@ namespace Aaru.Filesystems
 
                 int off = (int)header.first_used;
 
-                DirectoryEntry entry = new DirectoryEntry();
+                var entry = new DirectoryEntry();
 
                 while(off + DirectoryEntrySize < data.Length)
                 {
                     entry = Marshal.ByteArrayToStructureBigEndian<DirectoryEntry>(data, off, DirectoryEntrySize);
                     string name = StringHandlers.CToString(entry.name, Encoding);
 
-                    DirectoryEntryWithPointers entryWithPointers =
-                        new DirectoryEntryWithPointers {entry = entry, pointers = new uint[entry.last_copy + 1]};
+                    var entryWithPointers = new DirectoryEntryWithPointers
+                    {
+                        entry = entry, pointers = new uint[entry.last_copy + 1]
+                    };
 
                     for(int i = 0; i <= entry.last_copy; i++)
                         entryWithPointers.pointers[i] =
-                            BigEndianBitConverter.ToUInt32(data, off + DirectoryEntrySize + i * 4);
+                            BigEndianBitConverter.ToUInt32(data, off + DirectoryEntrySize + (i * 4));
 
                     entries.Add(name, entryWithPointers);
 
                     if((entry.flags & (uint)FileFlags.LastEntry)        != 0 ||
-                       (entry.flags & (uint)FileFlags.LastEntryInBlock) != 0) break;
+                       (entry.flags & (uint)FileFlags.LastEntryInBlock) != 0)
+                        break;
 
-                    off += (int)(DirectoryEntrySize + (entry.last_copy + 1) * 4);
+                    off += (int)(DirectoryEntrySize + ((entry.last_copy + 1) * 4));
                 }
 
-                if((entry.flags & (uint)FileFlags.LastEntry) != 0) break;
-            }
-            while(header.next_block != -1);
+                if((entry.flags & (uint)FileFlags.LastEntry) != 0)
+                    break;
+            } while(header.next_block != -1);
 
             return entries;
         }
diff --git a/Aaru.Filesystems/Opera/File.cs b/Aaru.Filesystems/Opera/File.cs
index 11da93e62..eb18ffa04 100644
--- a/Aaru.Filesystems/Opera/File.cs
+++ b/Aaru.Filesystems/Opera/File.cs
@@ -11,12 +11,18 @@ namespace Aaru.Filesystems
         public Errno MapBlock(string path, long fileBlock, out long deviceBlock)
         {
             deviceBlock = 0;
-            if(!mounted) return Errno.AccessDenied;
+
+            if(!mounted)
+                return Errno.AccessDenied;
 
             Errno err = GetFileEntry(path, out DirectoryEntryWithPointers entry);
-            if(err != Errno.NoError) return err;
 
-            if((entry.entry.flags & FLAGS_MASK) == (uint)FileFlags.Directory && !debug) return Errno.IsDirectory;
+            if(err != Errno.NoError)
+                return err;
+
+            if((entry.entry.flags & FLAGS_MASK) == (uint)FileFlags.Directory &&
+               !debug)
+                return Errno.IsDirectory;
 
             deviceBlock = entry.pointers[0] + fileBlock;
 
@@ -26,11 +32,14 @@ namespace Aaru.Filesystems
         public Errno GetAttributes(string path, out FileAttributes attributes)
         {
             attributes = new FileAttributes();
-            if(!mounted) return Errno.AccessDenied;
+
+            if(!mounted)
+                return Errno.AccessDenied;
 
             Errno err = Stat(path, out FileEntryInfo stat);
 
-            if(err != Errno.NoError) return err;
+            if(err != Errno.NoError)
+                return err;
 
             attributes = stat.Attributes;
 
@@ -40,36 +49,52 @@ namespace Aaru.Filesystems
         public Errno Read(string path, long offset, long size, ref byte[] buf)
         {
             buf = null;
-            if(!mounted) return Errno.AccessDenied;
+
+            if(!mounted)
+                return Errno.AccessDenied;
 
             Errno err = GetFileEntry(path, out DirectoryEntryWithPointers entry);
-            if(err != Errno.NoError) return err;
 
-            if((entry.entry.flags & FLAGS_MASK) == (uint)FileFlags.Directory && !debug) return Errno.IsDirectory;
+            if(err != Errno.NoError)
+                return err;
 
-            if(entry.pointers.Length < 1) return Errno.InvalidArgument;
+            if((entry.entry.flags & FLAGS_MASK) == (uint)FileFlags.Directory &&
+               !debug)
+                return Errno.IsDirectory;
+
+            if(entry.pointers.Length < 1)
+                return Errno.InvalidArgument;
 
             if(entry.entry.byte_count == 0)
             {
                 buf = new byte[0];
+
                 return Errno.NoError;
             }
 
-            if(offset >= entry.entry.byte_count) return Errno.InvalidArgument;
+            if(offset >= entry.entry.byte_count)
+                return Errno.InvalidArgument;
 
-            if(size + offset >= entry.entry.byte_count) size = entry.entry.byte_count - offset;
+            if(size + offset >= entry.entry.byte_count)
+                size = entry.entry.byte_count - offset;
 
             long firstBlock    = offset                 / entry.entry.block_size;
             long offsetInBlock = offset                 % entry.entry.block_size;
             long sizeInBlocks  = (size + offsetInBlock) / entry.entry.block_size;
-            if((size + offsetInBlock) % entry.entry.block_size > 0) sizeInBlocks++;
+
+            if((size + offsetInBlock) % entry.entry.block_size > 0)
+                sizeInBlocks++;
 
             uint fileBlockSizeRatio;
-            if(image.Info.SectorSize == 2336 || image.Info.SectorSize == 2352 || image.Info.SectorSize == 2448)
-                fileBlockSizeRatio  = entry.entry.block_size / 2048;
-            else fileBlockSizeRatio = entry.entry.block_size / image.Info.SectorSize;
 
-            byte[] buffer = image.ReadSectors((ulong)(entry.pointers[0] + firstBlock * fileBlockSizeRatio),
+            if(image.Info.SectorSize == 2336 ||
+               image.Info.SectorSize == 2352 ||
+               image.Info.SectorSize == 2448)
+                fileBlockSizeRatio = entry.entry.block_size / 2048;
+            else
+                fileBlockSizeRatio = entry.entry.block_size / image.Info.SectorSize;
+
+            byte[] buffer = image.ReadSectors((ulong)(entry.pointers[0] + (firstBlock * fileBlockSizeRatio)),
                                               (uint)(sizeInBlocks * fileBlockSizeRatio));
 
             buf = new byte[size];
@@ -81,27 +106,31 @@ namespace Aaru.Filesystems
         public Errno Stat(string path, out FileEntryInfo stat)
         {
             stat = null;
-            if(!mounted) return Errno.AccessDenied;
+
+            if(!mounted)
+                return Errno.AccessDenied;
 
             Errno err = GetFileEntry(path, out DirectoryEntryWithPointers entryWithPointers);
-            if(err != Errno.NoError) return err;
+
+            if(err != Errno.NoError)
+                return err;
 
             DirectoryEntry entry = entryWithPointers.entry;
 
             stat = new FileEntryInfo
             {
-                Attributes = new FileAttributes(),
-                Blocks     = entry.block_count,
-                BlockSize  = entry.block_size,
-                Length     = entry.byte_count,
-                Inode      = entry.id,
+                Attributes = new FileAttributes(), Blocks = entry.block_count, BlockSize = entry.block_size,
+                Length     = entry.byte_count, Inode      = entry.id,
                 Links      = (ulong)entryWithPointers.pointers.Length
             };
 
-            FileFlags flags = (FileFlags)(entry.flags & FLAGS_MASK);
+            var flags = (FileFlags)(entry.flags & FLAGS_MASK);
 
-            if(flags == FileFlags.Directory) stat.Attributes |= FileAttributes.Directory;
-            if(flags == FileFlags.Special) stat.Attributes   |= FileAttributes.Device;
+            if(flags == FileFlags.Directory)
+                stat.Attributes |= FileAttributes.Directory;
+
+            if(flags == FileFlags.Special)
+                stat.Attributes |= FileAttributes.Device;
 
             return Errno.NoError;
         }
@@ -113,9 +142,14 @@ namespace Aaru.Filesystems
             string cutPath = path.StartsWith("/", StringComparison.Ordinal)
                                  ? path.Substring(1).ToLower(CultureInfo.CurrentUICulture)
                                  : path.ToLower(CultureInfo.CurrentUICulture);
-            string[] pieces = cutPath.Split(new[] {'/'}, StringSplitOptions.RemoveEmptyEntries);
 
-            if(pieces.Length == 0) return Errno.InvalidArgument;
+            string[] pieces = cutPath.Split(new[]
+            {
+                '/'
+            }, StringSplitOptions.RemoveEmptyEntries);
+
+            if(pieces.Length == 0)
+                return Errno.InvalidArgument;
 
             string parentPath = string.Join("/", pieces, 0, pieces.Length - 1);
 
@@ -123,20 +157,25 @@ namespace Aaru.Filesystems
             {
                 Errno err = ReadDir(parentPath, out _);
 
-                if(err != Errno.NoError) return err;
+                if(err != Errno.NoError)
+                    return err;
             }
 
             Dictionary<string, DirectoryEntryWithPointers> parent;
 
-            if(pieces.Length == 1) parent = rootDirectoryCache;
-            else if(!directoryCache.TryGetValue(parentPath, out parent)) return Errno.InvalidArgument;
+            if(pieces.Length == 1)
+                parent = rootDirectoryCache;
+            else if(!directoryCache.TryGetValue(parentPath, out parent))
+                return Errno.InvalidArgument;
 
             KeyValuePair<string, DirectoryEntryWithPointers> dirent =
                 parent.FirstOrDefault(t => t.Key.ToLower(CultureInfo.CurrentUICulture) == pieces[pieces.Length - 1]);
 
-            if(string.IsNullOrEmpty(dirent.Key)) return Errno.NoSuchFile;
+            if(string.IsNullOrEmpty(dirent.Key))
+                return Errno.NoSuchFile;
 
             entry = dirent.Value;
+
             return Errno.NoError;
         }
     }
diff --git a/Aaru.Filesystems/Opera/Info.cs b/Aaru.Filesystems/Opera/Info.cs
index cb5a27491..8a85637b7 100644
--- a/Aaru.Filesystems/Opera/Info.cs
+++ b/Aaru.Filesystems/Opera/Info.cs
@@ -11,7 +11,8 @@ namespace Aaru.Filesystems
     {
         public bool Identify(IMediaImage imagePlugin, Partition partition)
         {
-            if(2 + partition.Start >= partition.End) return false;
+            if(2 + partition.Start >= partition.End)
+                return false;
 
             byte[] sbSector = imagePlugin.ReadSector(0 + partition.Start);
 
@@ -21,70 +22,83 @@ namespace Aaru.Filesystems
             Array.Copy(sbSector, 0x001, syncBytes, 0, 5);
             byte recordVersion = sbSector[0x006];
 
-            if(recordType != 1 || recordVersion != 1) return false;
+            if(recordType    != 1 ||
+               recordVersion != 1)
+                return false;
 
             return Encoding.ASCII.GetString(syncBytes) == SYNC;
         }
 
         public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding    encoding)
+                                   Encoding encoding)
         {
             // TODO: Find correct default encoding
             Encoding    = Encoding.ASCII;
             information = "";
-            StringBuilder superBlockMetadata = new StringBuilder();
+            var superBlockMetadata = new StringBuilder();
 
             byte[] sbSector = imagePlugin.ReadSector(0 + partition.Start);
 
             SuperBlock sb = Marshal.ByteArrayToStructureBigEndian<SuperBlock>(sbSector);
 
-            if(sb.record_type != 1 || sb.record_version != 1) return;
-            if(Encoding.ASCII.GetString(sb.sync_bytes) != SYNC) return;
+            if(sb.record_type    != 1 ||
+               sb.record_version != 1)
+                return;
+
+            if(Encoding.ASCII.GetString(sb.sync_bytes) != SYNC)
+                return;
 
             superBlockMetadata.AppendFormat("Opera filesystem disc.").AppendLine();
+
             if(!string.IsNullOrEmpty(StringHandlers.CToString(sb.volume_label, Encoding)))
-                superBlockMetadata
-                   .AppendFormat("Volume label: {0}", StringHandlers.CToString(sb.volume_label, Encoding)).AppendLine();
+                superBlockMetadata.
+                    AppendFormat("Volume label: {0}", StringHandlers.CToString(sb.volume_label, Encoding)).AppendLine();
+
             if(!string.IsNullOrEmpty(StringHandlers.CToString(sb.volume_comment, Encoding)))
-                superBlockMetadata
-                   .AppendFormat("Volume comment: {0}", StringHandlers.CToString(sb.volume_comment, Encoding))
-                   .AppendLine();
+                superBlockMetadata.
+                    AppendFormat("Volume comment: {0}", StringHandlers.CToString(sb.volume_comment, Encoding)).
+                    AppendLine();
+
             superBlockMetadata.AppendFormat("Volume identifier: 0x{0:X8}", sb.volume_id).AppendLine();
             superBlockMetadata.AppendFormat("Block size: {0} bytes", sb.block_size).AppendLine();
-            if(imagePlugin.Info.SectorSize == 2336 || imagePlugin.Info.SectorSize == 2352 ||
+
+            if(imagePlugin.Info.SectorSize == 2336 ||
+               imagePlugin.Info.SectorSize == 2352 ||
                imagePlugin.Info.SectorSize == 2448)
             {
                 if(sb.block_size != 2048)
-                    superBlockMetadata
-                       .AppendFormat("WARNING: Filesystem indicates {0} bytes/block while device indicates {1} bytes/block",
+                    superBlockMetadata.
+                        AppendFormat("WARNING: Filesystem indicates {0} bytes/block while device indicates {1} bytes/block",
                                      sb.block_size, 2048);
             }
             else if(imagePlugin.Info.SectorSize != sb.block_size)
-                superBlockMetadata
-                   .AppendFormat("WARNING: Filesystem indicates {0} bytes/block while device indicates {1} bytes/block",
+                superBlockMetadata.
+                    AppendFormat("WARNING: Filesystem indicates {0} bytes/block while device indicates {1} bytes/block",
                                  sb.block_size, imagePlugin.Info.SectorSize);
 
-            superBlockMetadata
-               .AppendFormat("Volume size: {0} blocks, {1} bytes", sb.block_count, sb.block_size * sb.block_count)
-               .AppendLine();
+            superBlockMetadata.
+                AppendFormat("Volume size: {0} blocks, {1} bytes", sb.block_count, sb.block_size * sb.block_count).
+                AppendLine();
+
             if(sb.block_count > imagePlugin.Info.Sectors)
-                superBlockMetadata
-                   .AppendFormat("WARNING: Filesystem indicates {0} blocks while device indicates {1} blocks",
+                superBlockMetadata.
+                    AppendFormat("WARNING: Filesystem indicates {0} blocks while device indicates {1} blocks",
                                  sb.block_count, imagePlugin.Info.Sectors);
+
             superBlockMetadata.AppendFormat("Root directory identifier: 0x{0:X8}", sb.root_dirid).AppendLine();
             superBlockMetadata.AppendFormat("Root directory block size: {0} bytes", sb.rootdir_bsize).AppendLine();
+
             superBlockMetadata.AppendFormat("Root directory size: {0} blocks, {1} bytes", sb.rootdir_blocks,
                                             sb.rootdir_bsize * sb.rootdir_blocks).AppendLine();
+
             superBlockMetadata.AppendFormat("Last root directory copy: {0}", sb.last_root_copy).AppendLine();
 
             information = superBlockMetadata.ToString();
 
             XmlFsType = new FileSystemType
             {
-                Type        = "Opera",
-                VolumeName  = StringHandlers.CToString(sb.volume_label, Encoding),
-                ClusterSize = sb.block_size,
-                Clusters    = sb.block_count
+                Type        = "Opera", VolumeName     = StringHandlers.CToString(sb.volume_label, Encoding),
+                ClusterSize = sb.block_size, Clusters = sb.block_count
             };
         }
     }
diff --git a/Aaru.Filesystems/Opera/Opera.cs b/Aaru.Filesystems/Opera/Opera.cs
index 57b9c4d14..e6bc8f0d6 100644
--- a/Aaru.Filesystems/Opera/Opera.cs
+++ b/Aaru.Filesystems/Opera/Opera.cs
@@ -58,6 +58,7 @@ namespace Aaru.Filesystems
         public Errno ListXAttr(string path, out List<string> xattrs)
         {
             xattrs = null;
+
             return Errno.NotSupported;
         }
 
@@ -66,15 +67,21 @@ namespace Aaru.Filesystems
         public Errno ReadLink(string path, out string dest)
         {
             dest = null;
+
             return Errno.NotSupported;
         }
 
         public IEnumerable<(string name, Type type, string description)> SupportedOptions =>
-            new (string name, Type type, string description)[] { };
+            new (string name, Type type, string description)[]
+                {};
 
         public Dictionary<string, string> Namespaces => null;
 
-        static Dictionary<string, string> GetDefaultOptions() =>
-            new Dictionary<string, string> {{"debug", false.ToString()}};
+        static Dictionary<string, string> GetDefaultOptions() => new Dictionary<string, string>
+        {
+            {
+                "debug", false.ToString()
+            }
+        };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/Opera/Structs.cs b/Aaru.Filesystems/Opera/Structs.cs
index 65a40af7e..1ef4e9a74 100644
--- a/Aaru.Filesystems/Opera/Structs.cs
+++ b/Aaru.Filesystems/Opera/Structs.cs
@@ -41,71 +41,41 @@ namespace Aaru.Filesystems
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct DirectoryHeader
         {
-            /// <summary>
-            ///     Next block from this directory, -1 if last
-            /// </summary>
+            /// <summary>Next block from this directory, -1 if last</summary>
             public readonly int next_block;
-            /// <summary>
-            ///     Previous block from this directory, -1 if first
-            /// </summary>
+            /// <summary>Previous block from this directory, -1 if first</summary>
             public readonly int prev_block;
-            /// <summary>
-            ///     Directory flags
-            /// </summary>
+            /// <summary>Directory flags</summary>
             public readonly uint flags;
-            /// <summary>
-            ///     Offset to first free unused byte in the directory
-            /// </summary>
+            /// <summary>Offset to first free unused byte in the directory</summary>
             public readonly uint first_free;
-            /// <summary>
-            ///     Offset to first directory entry
-            /// </summary>
+            /// <summary>Offset to first directory entry</summary>
             public readonly uint first_used;
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct DirectoryEntry
         {
-            /// <summary>
-            ///     File flags, see <see cref="FileFlags" />
-            /// </summary>
+            /// <summary>File flags, see <see cref="FileFlags" /></summary>
             public readonly uint flags;
-            /// <summary>
-            ///     Unique file identifier
-            /// </summary>
+            /// <summary>Unique file identifier</summary>
             public readonly uint id;
-            /// <summary>
-            ///     Entry type
-            /// </summary>
+            /// <summary>Entry type</summary>
             public readonly uint type;
-            /// <summary>
-            ///     Block size
-            /// </summary>
+            /// <summary>Block size</summary>
             public readonly uint block_size;
-            /// <summary>
-            ///     Size in bytes
-            /// </summary>
+            /// <summary>Size in bytes</summary>
             public readonly uint byte_count;
-            /// <summary>
-            ///     Block count
-            /// </summary>
+            /// <summary>Block count</summary>
             public readonly uint block_count;
-            /// <summary>
-            ///     Unknown
-            /// </summary>
+            /// <summary>Unknown</summary>
             public readonly uint burst;
-            /// <summary>
-            ///     Unknown
-            /// </summary>
+            /// <summary>Unknown</summary>
             public readonly uint gap;
-            /// <summary>
-            ///     Filename
-            /// </summary>
+            /// <summary>Filename</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = MAX_NAME)]
             public readonly byte[] name;
-            /// <summary>
-            ///     Last copy
-            /// </summary>
+            /// <summary>Last copy</summary>
             public readonly uint last_copy;
         }
 
diff --git a/Aaru.Filesystems/Opera/Super.cs b/Aaru.Filesystems/Opera/Super.cs
index 8681a3878..f62cc2ef5 100644
--- a/Aaru.Filesystems/Opera/Super.cs
+++ b/Aaru.Filesystems/Opera/Super.cs
@@ -10,44 +10,50 @@ namespace Aaru.Filesystems
 {
     public partial class OperaFS
     {
-        public Errno Mount(IMediaImage                imagePlugin, Partition partition, Encoding encoding,
-                           Dictionary<string, string> options,     string    @namespace)
+        public Errno Mount(IMediaImage imagePlugin, Partition partition, Encoding encoding,
+                           Dictionary<string, string> options, string @namespace)
         {
             // TODO: Find correct default encoding
             Encoding = Encoding.ASCII;
 
-            if(options == null) options = GetDefaultOptions();
-            if(options.TryGetValue("debug", out string debugString)) bool.TryParse(debugString, out debug);
+            if(options == null)
+                options = GetDefaultOptions();
+
+            if(options.TryGetValue("debug", out string debugString))
+                bool.TryParse(debugString, out debug);
 
             byte[] sbSector = imagePlugin.ReadSector(0 + partition.Start);
 
             SuperBlock sb = Marshal.ByteArrayToStructureBigEndian<SuperBlock>(sbSector);
 
-            if(sb.record_type != 1 || sb.record_version != 1) return Errno.InvalidArgument;
-            if(Encoding.ASCII.GetString(sb.sync_bytes) != SYNC) return Errno.InvalidArgument;
+            if(sb.record_type    != 1 ||
+               sb.record_version != 1)
+                return Errno.InvalidArgument;
 
-            if(imagePlugin.Info.SectorSize == 2336 || imagePlugin.Info.SectorSize == 2352 ||
-               imagePlugin.Info.SectorSize == 2448) volumeBlockSizeRatio = sb.block_size / 2048;
-            else volumeBlockSizeRatio                                    = sb.block_size / imagePlugin.Info.SectorSize;
+            if(Encoding.ASCII.GetString(sb.sync_bytes) != SYNC)
+                return Errno.InvalidArgument;
+
+            if(imagePlugin.Info.SectorSize == 2336 ||
+               imagePlugin.Info.SectorSize == 2352 ||
+               imagePlugin.Info.SectorSize == 2448)
+                volumeBlockSizeRatio = sb.block_size / 2048;
+            else
+                volumeBlockSizeRatio = sb.block_size / imagePlugin.Info.SectorSize;
 
             XmlFsType = new FileSystemType
             {
-                Type         = "Opera",
-                VolumeName   = StringHandlers.CToString(sb.volume_label, Encoding),
-                ClusterSize  = sb.block_size,
-                Clusters     = sb.block_count,
-                Bootable     = true,
+                Type         = "Opera", VolumeName     = StringHandlers.CToString(sb.volume_label, Encoding),
+                ClusterSize  = sb.block_size, Clusters = sb.block_count, Bootable = true,
                 VolumeSerial = $"{sb.volume_id:X8}"
             };
 
             statfs = new FileSystemInfo
             {
-                Blocks         = sb.block_count,
-                FilenameLength = MAX_NAME,
-                FreeBlocks     = 0,
-                Id             = new FileSystemId {IsInt = true, Serial32 = sb.volume_id},
-                PluginId       = Id,
-                Type           = "Opera"
+                Blocks = sb.block_count, FilenameLength = MAX_NAME, FreeBlocks = 0, Id = new FileSystemId
+                {
+                    IsInt = true, Serial32 = sb.volume_id
+                },
+                PluginId = Id, Type = "Opera"
             };
 
             image = imagePlugin;
@@ -61,7 +67,8 @@ namespace Aaru.Filesystems
 
         public Errno Unmount()
         {
-            if(!mounted) return Errno.AccessDenied;
+            if(!mounted)
+                return Errno.AccessDenied;
 
             mounted = false;
 
@@ -71,9 +78,12 @@ namespace Aaru.Filesystems
         public Errno StatFs(out FileSystemInfo stat)
         {
             stat = null;
-            if(!mounted) return Errno.AccessDenied;
+
+            if(!mounted)
+                return Errno.AccessDenied;
 
             stat = statfs.ShallowCopy();
+
             return Errno.NoError;
         }
     }
diff --git a/Aaru.Filesystems/PCEngine.cs b/Aaru.Filesystems/PCEngine.cs
index 033aea0d3..7f1215244 100644
--- a/Aaru.Filesystems/PCEngine.cs
+++ b/Aaru.Filesystems/PCEngine.cs
@@ -48,7 +48,8 @@ namespace Aaru.Filesystems
 
         public bool Identify(IMediaImage imagePlugin, Partition partition)
         {
-            if(2 + partition.Start >= partition.End) return false;
+            if(2 + partition.Start >= partition.End)
+                return false;
 
             byte[] systemDescriptor = new byte[23];
             byte[] sector           = imagePlugin.ReadSector(1 + partition.Start);
@@ -59,14 +60,15 @@ namespace Aaru.Filesystems
         }
 
         public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding    encoding)
+                                   Encoding encoding)
         {
             Encoding    = encoding ?? Encoding.GetEncoding("shift_jis");
             information = "";
+
             XmlFsType = new FileSystemType
             {
                 Type        = "PC Engine filesystem",
-                Clusters    = (partition.End - partition.Start + 1) / imagePlugin.Info.SectorSize * 2048,
+                Clusters    = (((partition.End - partition.Start) + 1) / imagePlugin.Info.SectorSize) * 2048,
                 ClusterSize = 2048
             };
         }
diff --git a/Aaru.Filesystems/PCFX.cs b/Aaru.Filesystems/PCFX.cs
index 7ae86e82e..73ce1032d 100644
--- a/Aaru.Filesystems/PCFX.cs
+++ b/Aaru.Filesystems/PCFX.cs
@@ -54,17 +54,18 @@ namespace Aaru.Filesystems
         public bool Identify(IMediaImage imagePlugin, Partition partition)
         {
             if(2 + partition.Start           >= partition.End ||
-               imagePlugin.Info.XmlMediaType != XmlMediaType.OpticalDisc) return false;
+               imagePlugin.Info.XmlMediaType != XmlMediaType.OpticalDisc)
+                return false;
 
             byte[] sector = imagePlugin.ReadSectors(partition.Start, 2);
 
-            Encoding encoding = Encoding.GetEncoding("shift_jis");
+            var encoding = Encoding.GetEncoding("shift_jis");
 
             return encoding.GetString(sector, 0, 16) == IDENTIFIER;
         }
 
         public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding    encoding)
+                                   Encoding encoding)
         {
             // Always Shift-JIS
             Encoding    = Encoding.GetEncoding("shift_jis");
@@ -84,9 +85,12 @@ namespace Aaru.Filesystems
                 int day   = int.Parse(date.Substring(6, 2));
                 dateTime = new DateTime(year, month, day);
             }
-            catch { date = null; }
+            catch
+            {
+                date = null;
+            }
 
-            StringBuilder sb = new StringBuilder();
+            var sb = new StringBuilder();
             sb.AppendLine("PC-FX executable:");
             sb.AppendFormat("Identifier: {0}", StringHandlers.CToString(header.signature, Encoding)).AppendLine();
             sb.AppendFormat("Copyright: {0}", StringHandlers.CToString(header.copyright, Encoding)).AppendLine();
@@ -96,24 +100,24 @@ namespace Aaru.Filesystems
             sb.AppendFormat("Volume number: {0}", header.volumeNumber).AppendLine();
             sb.AppendFormat("Country code: {0}", header.country).AppendLine();
             sb.AppendFormat("Version: {0}.{1}", header.minorVersion, header.majorVersion).AppendLine();
-            if(date != null) sb.AppendFormat("Dated {0}", dateTime).AppendLine();
+
+            if(date != null)
+                sb.AppendFormat("Dated {0}", dateTime).AppendLine();
+
             sb.AppendFormat("Load {0} sectors from sector {1}", header.loadCount, header.loadOffset).AppendLine();
-            sb.AppendFormat("Load at 0x{0:X8} and jump to 0x{1:X8}", header.loadAddress, header.entryPoint)
-              .AppendLine();
+
+            sb.AppendFormat("Load at 0x{0:X8} and jump to 0x{1:X8}", header.loadAddress, header.entryPoint).
+               AppendLine();
 
             information = sb.ToString();
 
             XmlFsType = new FileSystemType
             {
-                Type                  = "PC-FX",
-                Clusters              = partition.Length,
-                ClusterSize           = 2048,
-                Bootable              = true,
-                CreationDate          = dateTime,
-                CreationDateSpecified = date != null,
-                PublisherIdentifier   = StringHandlers.CToString(header.makerName, Encoding),
-                VolumeName            = StringHandlers.CToString(header.title,     Encoding),
-                SystemIdentifier      = "PC-FX"
+                Type                = "PC-FX", Clusters = partition.Length, ClusterSize = 2048,
+                Bootable            = true,
+                CreationDate        = dateTime, CreationDateSpecified = date != null,
+                PublisherIdentifier = StringHandlers.CToString(header.makerName, Encoding),
+                VolumeName          = StringHandlers.CToString(header.title, Encoding), SystemIdentifier = "PC-FX"
             };
         }
 
diff --git a/Aaru.Filesystems/PFS.cs b/Aaru.Filesystems/PFS.cs
index c4e21249f..ccb34d669 100644
--- a/Aaru.Filesystems/PFS.cs
+++ b/Aaru.Filesystems/PFS.cs
@@ -42,25 +42,15 @@ namespace Aaru.Filesystems
 {
     public class PFS : IFilesystem
     {
-        /// <summary>
-        ///     Identifier for AFS (PFS v1)
-        /// </summary>
+        /// <summary>Identifier for AFS (PFS v1)</summary>
         const uint AFS_DISK = 0x41465301;
-        /// <summary>
-        ///     Identifier for PFS v2
-        /// </summary>
+        /// <summary>Identifier for PFS v2</summary>
         const uint PFS2_DISK = 0x50465302;
-        /// <summary>
-        ///     Identifier for PFS v3
-        /// </summary>
+        /// <summary>Identifier for PFS v3</summary>
         const uint PFS_DISK = 0x50465301;
-        /// <summary>
-        ///     Identifier for multi-user AFS
-        /// </summary>
+        /// <summary>Identifier for multi-user AFS</summary>
         const uint MUAF_DISK = 0x6D754146;
-        /// <summary>
-        ///     Identifier for multi-user PFS
-        /// </summary>
+        /// <summary>Identifier for multi-user PFS</summary>
         const uint MUPFS_DISK = 0x6D755046;
 
         public FileSystemType XmlFsType { get; private set; }
@@ -71,7 +61,8 @@ namespace Aaru.Filesystems
 
         public bool Identify(IMediaImage imagePlugin, Partition partition)
         {
-            if(partition.Length < 3) return false;
+            if(partition.Length < 3)
+                return false;
 
             byte[] sector = imagePlugin.ReadSector(2 + partition.Start);
 
@@ -82,13 +73,13 @@ namespace Aaru.Filesystems
         }
 
         public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding    encoding)
+                                   Encoding encoding)
         {
             Encoding = encoding ?? Encoding.GetEncoding("iso-8859-1");
             byte[]    rootBlockSector = imagePlugin.ReadSector(2 + partition.Start);
             RootBlock rootBlock       = Marshal.ByteArrayToStructureBigEndian<RootBlock>(rootBlockSector);
 
-            StringBuilder sbInformation = new StringBuilder();
+            var sbInformation = new StringBuilder();
             XmlFsType = new FileSystemType();
 
             switch(rootBlock.diskType)
@@ -97,38 +88,46 @@ namespace Aaru.Filesystems
                 case MUAF_DISK:
                     sbInformation.Append("Professional File System v1");
                     XmlFsType.Type = "PFS v1";
+
                     break;
                 case PFS2_DISK:
                     sbInformation.Append("Professional File System v2");
                     XmlFsType.Type = "PFS v2";
+
                     break;
                 case PFS_DISK:
                 case MUPFS_DISK:
                     sbInformation.Append("Professional File System v3");
                     XmlFsType.Type = "PFS v3";
+
                     break;
             }
 
-            if(rootBlock.diskType == MUAF_DISK || rootBlock.diskType == MUPFS_DISK)
+            if(rootBlock.diskType == MUAF_DISK ||
+               rootBlock.diskType == MUPFS_DISK)
                 sbInformation.Append(", with multi-user support");
 
             sbInformation.AppendLine();
 
-            sbInformation.AppendFormat("Volume name: {0}", StringHandlers.PascalToString(rootBlock.diskname, Encoding))
-                         .AppendLine();
-            sbInformation.AppendFormat("Volume has {0} free sectors of {1}", rootBlock.blocksfree, rootBlock.diskSize)
-                         .AppendLine();
+            sbInformation.AppendFormat("Volume name: {0}", StringHandlers.PascalToString(rootBlock.diskname, Encoding)).
+                          AppendLine();
+
+            sbInformation.AppendFormat("Volume has {0} free sectors of {1}", rootBlock.blocksfree, rootBlock.diskSize).
+                          AppendLine();
+
             sbInformation.AppendFormat("Volume created on {0}",
                                        DateHandlers.AmigaToDateTime(rootBlock.creationday, rootBlock.creationminute,
                                                                     rootBlock.creationtick)).AppendLine();
+
             if(rootBlock.extension > 0)
-                sbInformation.AppendFormat("Root block extension resides at block {0}", rootBlock.extension)
-                             .AppendLine();
+                sbInformation.AppendFormat("Root block extension resides at block {0}", rootBlock.extension).
+                              AppendLine();
 
             information = sbInformation.ToString();
 
             XmlFsType.CreationDate =
                 DateHandlers.AmigaToDateTime(rootBlock.creationday, rootBlock.creationminute, rootBlock.creationtick);
+
             XmlFsType.CreationDateSpecified = true;
             XmlFsType.FreeClusters          = rootBlock.blocksfree;
             XmlFsType.FreeClustersSpecified = true;
@@ -137,105 +136,59 @@ namespace Aaru.Filesystems
             XmlFsType.VolumeName            = StringHandlers.PascalToString(rootBlock.diskname, Encoding);
         }
 
-        /// <summary>
-        ///     Boot block, first 2 sectors
-        /// </summary>
+        /// <summary>Boot block, first 2 sectors</summary>
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct BootBlock
         {
-            /// <summary>
-            ///     "PFS\1" disk type
-            /// </summary>
+            /// <summary>"PFS\1" disk type</summary>
             public readonly uint diskType;
-            /// <summary>
-            ///     Boot code, til completion
-            /// </summary>
+            /// <summary>Boot code, til completion</summary>
             public readonly byte[] bootCode;
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct RootBlock
         {
-            /// <summary>
-            ///     Disk type
-            /// </summary>
+            /// <summary>Disk type</summary>
             public readonly uint diskType;
-            /// <summary>
-            ///     Options
-            /// </summary>
+            /// <summary>Options</summary>
             public readonly uint options;
-            /// <summary>
-            ///     Current datestamp
-            /// </summary>
+            /// <summary>Current datestamp</summary>
             public readonly uint datestamp;
-            /// <summary>
-            ///     Volume creation day
-            /// </summary>
+            /// <summary>Volume creation day</summary>
             public readonly ushort creationday;
-            /// <summary>
-            ///     Volume creation minute
-            /// </summary>
+            /// <summary>Volume creation minute</summary>
             public readonly ushort creationminute;
-            /// <summary>
-            ///     Volume creation tick
-            /// </summary>
+            /// <summary>Volume creation tick</summary>
             public readonly ushort creationtick;
-            /// <summary>
-            ///     AmigaDOS protection bits
-            /// </summary>
+            /// <summary>AmigaDOS protection bits</summary>
             public readonly ushort protection;
-            /// <summary>
-            ///     Volume label (Pascal string)
-            /// </summary>
+            /// <summary>Volume label (Pascal string)</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
             public readonly byte[] diskname;
-            /// <summary>
-            ///     Last reserved block
-            /// </summary>
+            /// <summary>Last reserved block</summary>
             public readonly uint lastreserved;
-            /// <summary>
-            ///     First reserved block
-            /// </summary>
+            /// <summary>First reserved block</summary>
             public readonly uint firstreserved;
-            /// <summary>
-            ///     Free reserved blocks
-            /// </summary>
+            /// <summary>Free reserved blocks</summary>
             public readonly uint reservedfree;
-            /// <summary>
-            ///     Size of reserved blocks in bytes
-            /// </summary>
+            /// <summary>Size of reserved blocks in bytes</summary>
             public readonly ushort reservedblocksize;
-            /// <summary>
-            ///     Blocks in rootblock, including bitmap
-            /// </summary>
+            /// <summary>Blocks in rootblock, including bitmap</summary>
             public readonly ushort rootblockclusters;
-            /// <summary>
-            ///     Free blocks
-            /// </summary>
+            /// <summary>Free blocks</summary>
             public readonly uint blocksfree;
-            /// <summary>
-            ///     Blocks that must be always free
-            /// </summary>
+            /// <summary>Blocks that must be always free</summary>
             public readonly uint alwaysfree;
-            /// <summary>
-            ///     Current bitmapfield number for allocation
-            /// </summary>
+            /// <summary>Current bitmapfield number for allocation</summary>
             public readonly uint rovingPointer;
-            /// <summary>
-            ///     Pointer to deldir
-            /// </summary>
+            /// <summary>Pointer to deldir</summary>
             public readonly uint delDirPtr;
-            /// <summary>
-            ///     Disk size in sectors
-            /// </summary>
+            /// <summary>Disk size in sectors</summary>
             public readonly uint diskSize;
-            /// <summary>
-            ///     Rootblock extension
-            /// </summary>
+            /// <summary>Rootblock extension</summary>
             public readonly uint extension;
-            /// <summary>
-            ///     Unused
-            /// </summary>
+            /// <summary>Unused</summary>
             public readonly uint unused;
         }
     }
diff --git a/Aaru.Filesystems/ProDOS.cs b/Aaru.Filesystems/ProDOS.cs
index 7f1ba296e..49bda6cf5 100644
--- a/Aaru.Filesystems/ProDOS.cs
+++ b/Aaru.Filesystems/ProDOS.cs
@@ -33,10 +33,10 @@
 using System;
 using System.Linq;
 using System.Text;
-using Claunia.Encoding;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
+using Claunia.Encoding;
 using Schemas;
 using Encoding = System.Text.Encoding;
 
@@ -46,17 +46,11 @@ namespace Aaru.Filesystems
     public class ProDOSPlugin : IFilesystem
     {
         const byte EMPTY_STORAGE_TYPE = 0x00;
-        /// <summary>
-        ///     A file that occupies one block or less
-        /// </summary>
+        /// <summary>A file that occupies one block or less</summary>
         const byte SEEDLING_FILE_TYPE = 0x01;
-        /// <summary>
-        ///     A file that occupies between 2 and 256 blocks
-        /// </summary>
+        /// <summary>A file that occupies between 2 and 256 blocks</summary>
         const byte SAPLING_FILE_TYPE = 0x02;
-        /// <summary>
-        ///     A file that occupies between 257 and 32768 blocks
-        /// </summary>
+        /// <summary>A file that occupies between 257 and 32768 blocks</summary>
         const byte TREE_FILE_TYPE = 0x03;
         const byte PASCAL_AREA_TYPE         = 0x04;
         const byte SUBDIRECTORY_TYPE        = 0x0D;
@@ -91,107 +85,111 @@ namespace Aaru.Filesystems
 
         public bool Identify(IMediaImage imagePlugin, Partition partition)
         {
-            if(partition.Length < 3) return false;
+            if(partition.Length < 3)
+                return false;
 
             uint multiplier = (uint)(imagePlugin.Info.SectorSize == 256 ? 2 : 1);
 
             // Blocks 0 and 1 are boot code
-            byte[] rootDirectoryKeyBlock = imagePlugin.ReadSectors(2 * multiplier + partition.Start, multiplier);
+            byte[] rootDirectoryKeyBlock = imagePlugin.ReadSectors((2 * multiplier) + partition.Start, multiplier);
             bool   apmFromHddOnCd        = false;
 
-            if(imagePlugin.Info.SectorSize == 2352 || imagePlugin.Info.SectorSize == 2448 ||
+            if(imagePlugin.Info.SectorSize == 2352 ||
+               imagePlugin.Info.SectorSize == 2448 ||
                imagePlugin.Info.SectorSize == 2048)
             {
                 byte[] tmp = imagePlugin.ReadSectors(partition.Start, 2);
 
-                foreach(int offset in new[] {0, 0x200, 0x400, 0x600, 0x800, 0xA00}.Where(offset =>
-                                                                                             BitConverter
-                                                                                                .ToUInt16(tmp,
-                                                                                                          offset) ==
-                                                                                             0 &&
-                                                                                             (byte)
-                                                                                             ((tmp[offset + 0x04] &
-                                                                                               STORAGE_TYPE_MASK) >>
-                                                                                              4) ==
-                                                                                             ROOT_DIRECTORY_TYPE &&
-                                                                                             tmp[offset + 0x23] ==
-                                                                                             ENTRY_LENGTH &&
-                                                                                             tmp[offset + 0x24] ==
-                                                                                             ENTRIES_PER_BLOCK))
+                foreach(int offset in new[]
+                {
+                    0, 0x200, 0x400, 0x600, 0x800, 0xA00
+                }.Where(offset => BitConverter.ToUInt16(tmp, offset)                    == 0                   &&
+                                  (byte)((tmp[offset + 0x04] & STORAGE_TYPE_MASK) >> 4) == ROOT_DIRECTORY_TYPE &&
+                                  tmp[offset + 0x23]                                    == ENTRY_LENGTH        &&
+                                  tmp[offset + 0x24]                                    == ENTRIES_PER_BLOCK))
                 {
                     Array.Copy(tmp, offset, rootDirectoryKeyBlock, 0, 0x200);
                     apmFromHddOnCd = true;
+
                     break;
                 }
             }
 
             ushort prePointer = BitConverter.ToUInt16(rootDirectoryKeyBlock, 0);
             AaruConsole.DebugWriteLine("ProDOS plugin", "prePointer = {0}", prePointer);
-            if(prePointer != 0) return false;
+
+            if(prePointer != 0)
+                return false;
 
             byte storageType = (byte)((rootDirectoryKeyBlock[0x04] & STORAGE_TYPE_MASK) >> 4);
             AaruConsole.DebugWriteLine("ProDOS plugin", "storage_type = {0}", storageType);
-            if(storageType != ROOT_DIRECTORY_TYPE) return false;
+
+            if(storageType != ROOT_DIRECTORY_TYPE)
+                return false;
 
             byte entryLength = rootDirectoryKeyBlock[0x23];
             AaruConsole.DebugWriteLine("ProDOS plugin", "entry_length = {0}", entryLength);
-            if(entryLength != ENTRY_LENGTH) return false;
+
+            if(entryLength != ENTRY_LENGTH)
+                return false;
 
             byte entriesPerBlock = rootDirectoryKeyBlock[0x24];
             AaruConsole.DebugWriteLine("ProDOS plugin", "entries_per_block = {0}", entriesPerBlock);
-            if(entriesPerBlock != ENTRIES_PER_BLOCK) return false;
+
+            if(entriesPerBlock != ENTRIES_PER_BLOCK)
+                return false;
 
             ushort bitMapPointer = BitConverter.ToUInt16(rootDirectoryKeyBlock, 0x27);
             AaruConsole.DebugWriteLine("ProDOS plugin", "bit_map_pointer = {0}", bitMapPointer);
-            if(bitMapPointer > partition.End) return false;
 
-            ushort totalBlocks             = BitConverter.ToUInt16(rootDirectoryKeyBlock, 0x29);
-            if(apmFromHddOnCd) totalBlocks /= 4;
+            if(bitMapPointer > partition.End)
+                return false;
+
+            ushort totalBlocks = BitConverter.ToUInt16(rootDirectoryKeyBlock, 0x29);
+
+            if(apmFromHddOnCd)
+                totalBlocks /= 4;
 
             AaruConsole.DebugWriteLine("ProDOS plugin", "{0} <= ({1} - {2} + 1)? {3}", totalBlocks, partition.End,
-                                      partition.Start, totalBlocks <= partition.End - partition.Start + 1);
-            return totalBlocks <= partition.End - partition.Start + 1;
+                                       partition.Start, totalBlocks <= (partition.End - partition.Start) + 1);
+
+            return totalBlocks <= (partition.End - partition.Start) + 1;
         }
 
         public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding    encoding)
+                                   Encoding encoding)
         {
             Encoding = encoding ?? new Apple2c();
-            StringBuilder sbInformation = new StringBuilder();
-            uint          multiplier    = (uint)(imagePlugin.Info.SectorSize == 256 ? 2 : 1);
+            var  sbInformation = new StringBuilder();
+            uint multiplier    = (uint)(imagePlugin.Info.SectorSize == 256 ? 2 : 1);
 
             // Blocks 0 and 1 are boot code
-            byte[] rootDirectoryKeyBlockBytes = imagePlugin.ReadSectors(2 * multiplier + partition.Start, multiplier);
+            byte[] rootDirectoryKeyBlockBytes = imagePlugin.ReadSectors((2 * multiplier) + partition.Start, multiplier);
 
             bool apmFromHddOnCd = false;
 
-            if(imagePlugin.Info.SectorSize == 2352 || imagePlugin.Info.SectorSize == 2448 ||
+            if(imagePlugin.Info.SectorSize == 2352 ||
+               imagePlugin.Info.SectorSize == 2448 ||
                imagePlugin.Info.SectorSize == 2048)
             {
                 byte[] tmp = imagePlugin.ReadSectors(partition.Start, 2);
 
-                foreach(int offset in new[] {0, 0x200, 0x400, 0x600, 0x800, 0xA00}.Where(offset =>
-                                                                                             BitConverter
-                                                                                                .ToUInt16(tmp,
-                                                                                                          offset) ==
-                                                                                             0 &&
-                                                                                             (byte)
-                                                                                             ((tmp[offset + 0x04] &
-                                                                                               STORAGE_TYPE_MASK) >>
-                                                                                              4) ==
-                                                                                             ROOT_DIRECTORY_TYPE &&
-                                                                                             tmp[offset + 0x23] ==
-                                                                                             ENTRY_LENGTH &&
-                                                                                             tmp[offset + 0x24] ==
-                                                                                             ENTRIES_PER_BLOCK))
+                foreach(int offset in new[]
+                {
+                    0, 0x200, 0x400, 0x600, 0x800, 0xA00
+                }.Where(offset => BitConverter.ToUInt16(tmp, offset)                    == 0                   &&
+                                  (byte)((tmp[offset + 0x04] & STORAGE_TYPE_MASK) >> 4) == ROOT_DIRECTORY_TYPE &&
+                                  tmp[offset + 0x23]                                    == ENTRY_LENGTH        &&
+                                  tmp[offset + 0x24]                                    == ENTRIES_PER_BLOCK))
                 {
                     Array.Copy(tmp, offset, rootDirectoryKeyBlockBytes, 0, 0x200);
                     apmFromHddOnCd = true;
+
                     break;
                 }
             }
 
-            ProDOSRootDirectoryKeyBlock rootDirectoryKeyBlock = new ProDOSRootDirectoryKeyBlock
+            var rootDirectoryKeyBlock = new ProDOSRootDirectoryKeyBlock
             {
                 header       = new ProDOSRootDirectoryHeader(),
                 zero         = BitConverter.ToUInt16(rootDirectoryKeyBlockBytes, 0x00),
@@ -200,6 +198,7 @@ namespace Aaru.Filesystems
 
             rootDirectoryKeyBlock.header.storage_type =
                 (byte)((rootDirectoryKeyBlockBytes[0x04] & STORAGE_TYPE_MASK) >> 4);
+
             rootDirectoryKeyBlock.header.name_length = (byte)(rootDirectoryKeyBlockBytes[0x04] & NAME_LENGTH_MASK);
             byte[] temporal = new byte[rootDirectoryKeyBlock.header.name_length];
             Array.Copy(rootDirectoryKeyBlockBytes, 0x05, temporal, 0, rootDirectoryKeyBlock.header.name_length);
@@ -210,6 +209,7 @@ namespace Aaru.Filesystems
             ushort tempTimestampRight = BitConverter.ToUInt16(rootDirectoryKeyBlockBytes, 0x1E);
 
             bool dateCorrect;
+
             try
             {
                 uint tempTimestamp = (uint)((tempTimestampLeft << 16) + tempTimestampRight);
@@ -219,19 +219,25 @@ namespace Aaru.Filesystems
                 int  hour          = (int)((tempTimestamp & HOUR_MASK)  >> 8);
                 int  minute        = (int)(tempTimestamp & MINUTE_MASK);
                 year += 1900;
-                if(year < 1940) year += 100;
 
-                AaruConsole.DebugWriteLine("ProDOS plugin", "temp_timestamp_left = 0x{0:X4}",  tempTimestampLeft);
+                if(year < 1940)
+                    year += 100;
+
+                AaruConsole.DebugWriteLine("ProDOS plugin", "temp_timestamp_left = 0x{0:X4}", tempTimestampLeft);
                 AaruConsole.DebugWriteLine("ProDOS plugin", "temp_timestamp_right = 0x{0:X4}", tempTimestampRight);
-                AaruConsole.DebugWriteLine("ProDOS plugin", "temp_timestamp = 0x{0:X8}",       tempTimestamp);
+                AaruConsole.DebugWriteLine("ProDOS plugin", "temp_timestamp = 0x{0:X8}", tempTimestamp);
+
                 AaruConsole.DebugWriteLine("ProDOS plugin",
-                                          "Datetime field year {0}, month {1}, day {2}, hour {3}, minute {4}.", year,
-                                          month, day, hour, minute);
+                                           "Datetime field year {0}, month {1}, day {2}, hour {3}, minute {4}.", year,
+                                           month, day, hour, minute);
 
                 rootDirectoryKeyBlock.header.creation_time = new DateTime(year, month, day, hour, minute, 0);
                 dateCorrect                                = true;
             }
-            catch(ArgumentOutOfRangeException) { dateCorrect = false; }
+            catch(ArgumentOutOfRangeException)
+            {
+                dateCorrect = false;
+            }
 
             rootDirectoryKeyBlock.header.version           = rootDirectoryKeyBlockBytes[0x20];
             rootDirectoryKeyBlock.header.min_version       = rootDirectoryKeyBlockBytes[0x21];
@@ -244,10 +250,11 @@ namespace Aaru.Filesystems
             rootDirectoryKeyBlock.header.total_blocks    = BitConverter.ToUInt16(rootDirectoryKeyBlockBytes, 0x29);
 
             if(apmFromHddOnCd)
-                sbInformation.AppendLine("ProDOS uses 512 bytes/sector while devices uses 2048 bytes/sector.")
-                             .AppendLine();
+                sbInformation.AppendLine("ProDOS uses 512 bytes/sector while devices uses 2048 bytes/sector.").
+                              AppendLine();
 
-            if(rootDirectoryKeyBlock.header.version != VERSION1 || rootDirectoryKeyBlock.header.min_version != VERSION1)
+            if(rootDirectoryKeyBlock.header.version     != VERSION1 ||
+               rootDirectoryKeyBlock.header.min_version != VERSION1)
             {
                 sbInformation.AppendLine("Warning! Detected unknown ProDOS version ProDOS filesystem.");
                 sbInformation.AppendLine("All of the following information may be incorrect");
@@ -262,39 +269,49 @@ namespace Aaru.Filesystems
             if(rootDirectoryKeyBlock.header.min_version == VERSION1)
                 sbInformation.AppendLine("ProDOS version 1 at least required for reading this volume.");
             else
-                sbInformation
-                   .AppendFormat("Unknown ProDOS version with field {0} is at least required for reading this volume.",
+                sbInformation.
+                    AppendFormat("Unknown ProDOS version with field {0} is at least required for reading this volume.",
                                  rootDirectoryKeyBlock.header.min_version).AppendLine();
 
             sbInformation.AppendFormat("Volume name is {0}", rootDirectoryKeyBlock.header.volume_name).AppendLine();
+
             if(dateCorrect)
-                sbInformation.AppendFormat("Volume created on {0}", rootDirectoryKeyBlock.header.creation_time)
-                             .AppendLine();
-            sbInformation.AppendFormat("{0} bytes per directory entry", rootDirectoryKeyBlock.header.entry_length)
-                         .AppendLine();
-            sbInformation
-               .AppendFormat("{0} entries per directory block", rootDirectoryKeyBlock.header.entries_per_block)
-               .AppendLine();
-            sbInformation.AppendFormat("{0} files in root directory", rootDirectoryKeyBlock.header.file_count)
-                         .AppendLine();
+                sbInformation.AppendFormat("Volume created on {0}", rootDirectoryKeyBlock.header.creation_time).
+                              AppendLine();
+
+            sbInformation.AppendFormat("{0} bytes per directory entry", rootDirectoryKeyBlock.header.entry_length).
+                          AppendLine();
+
+            sbInformation.
+                AppendFormat("{0} entries per directory block", rootDirectoryKeyBlock.header.entries_per_block).
+                AppendLine();
+
+            sbInformation.AppendFormat("{0} files in root directory", rootDirectoryKeyBlock.header.file_count).
+                          AppendLine();
+
             sbInformation.AppendFormat("{0} blocks in volume", rootDirectoryKeyBlock.header.total_blocks).AppendLine();
-            sbInformation.AppendFormat("Bitmap starts at block {0}", rootDirectoryKeyBlock.header.bit_map_pointer)
-                         .AppendLine();
+
+            sbInformation.AppendFormat("Bitmap starts at block {0}", rootDirectoryKeyBlock.header.bit_map_pointer).
+                          AppendLine();
 
             if((rootDirectoryKeyBlock.header.access & READ_ATTRIBUTE) == READ_ATTRIBUTE)
                 sbInformation.AppendLine("Volume can be read");
+
             if((rootDirectoryKeyBlock.header.access & WRITE_ATTRIBUTE) == WRITE_ATTRIBUTE)
                 sbInformation.AppendLine("Volume can be written");
+
             if((rootDirectoryKeyBlock.header.access & RENAME_ATTRIBUTE) == RENAME_ATTRIBUTE)
                 sbInformation.AppendLine("Volume can be renamed");
+
             if((rootDirectoryKeyBlock.header.access & DESTROY_ATTRIBUTE) == DESTROY_ATTRIBUTE)
                 sbInformation.AppendLine("Volume can be destroyed");
+
             if((rootDirectoryKeyBlock.header.access & BACKUP_ATTRIBUTE) == BACKUP_ATTRIBUTE)
                 sbInformation.AppendLine("Volume must be backed up");
 
             if((rootDirectoryKeyBlock.header.access & RESERVED_ATTRIBUTE_MASK) != 0)
                 AaruConsole.DebugWriteLine("ProDOS plugin", "Reserved attributes are set: {0:X2}",
-                                          rootDirectoryKeyBlock.header.access);
+                                           rootDirectoryKeyBlock.header.access);
 
             information = sbInformation.ToString();
 
@@ -303,326 +320,163 @@ namespace Aaru.Filesystems
                 VolumeName     = rootDirectoryKeyBlock.header.volume_name,
                 Files          = rootDirectoryKeyBlock.header.file_count,
                 FilesSpecified = true,
-                Clusters       = rootDirectoryKeyBlock.header.total_blocks,
-                Type           = "ProDOS"
+                Clusters       = rootDirectoryKeyBlock.header.total_blocks, Type = "ProDOS"
             };
 
-            XmlFsType.ClusterSize = (uint)((partition.End - partition.Start + 1) * imagePlugin.Info.SectorSize /
+            XmlFsType.ClusterSize = (uint)((((partition.End - partition.Start) + 1) * imagePlugin.Info.SectorSize) /
                                            XmlFsType.Clusters);
-            if(!dateCorrect) return;
+
+            if(!dateCorrect)
+                return;
 
             XmlFsType.CreationDate          = rootDirectoryKeyBlock.header.creation_time;
             XmlFsType.CreationDateSpecified = true;
         }
 
-        /// <summary>
-        ///     ProDOS directory entry, decoded structure
-        /// </summary>
+        /// <summary>ProDOS directory entry, decoded structure</summary>
         struct ProDOSEntry
         {
-            /// <summary>
-            ///     Type of file pointed by this entry
-            ///     Offset 0x00, mask 0xF0
-            /// </summary>
+            /// <summary>Type of file pointed by this entry Offset 0x00, mask 0xF0</summary>
             public byte storage_type;
-            /// <summary>
-            ///     Length of name_length pascal string
-            ///     Offset 0x00, mask 0x0F
-            /// </summary>
+            /// <summary>Length of name_length pascal string Offset 0x00, mask 0x0F</summary>
             public byte name_length;
-            /// <summary>
-            ///     Pascal string of file name
-            ///     Offset 0x01, 15 bytes
-            /// </summary>
+            /// <summary>Pascal string of file name Offset 0x01, 15 bytes</summary>
             public string file_name;
-            /// <summary>
-            ///     Descriptor of internal structure of the file
-            ///     Offset 0x10, 1 byte
-            /// </summary>
+            /// <summary>Descriptor of internal structure of the file Offset 0x10, 1 byte</summary>
             public byte file_type;
             /// <summary>
-            ///     Block address of master index block for tree files.
-            ///     Block address of index block for sapling files.
-            ///     Block address of block for seedling files.
-            ///     Offset 0x11, 2 bytes
+            ///     Block address of master index block for tree files. Block address of index block for sapling files. Block
+            ///     address of block for seedling files. Offset 0x11, 2 bytes
             /// </summary>
             public ushort key_pointer;
-            /// <summary>
-            ///     Blocks used by file or directory, including index blocks.
-            ///     Offset 0x13, 2 bytes
-            /// </summary>
+            /// <summary>Blocks used by file or directory, including index blocks. Offset 0x13, 2 bytes</summary>
             public ushort blocks_used;
-            /// <summary>
-            ///     Size of file in bytes
-            ///     Offset 0x15, 3 bytes
-            /// </summary>
+            /// <summary>Size of file in bytes Offset 0x15, 3 bytes</summary>
             public uint EOF;
-            /// <summary>
-            ///     File creation datetime
-            ///     Offset 0x18, 4 bytes
-            /// </summary>
+            /// <summary>File creation datetime Offset 0x18, 4 bytes</summary>
             public DateTime creation_time;
-            /// <summary>
-            ///     Version of ProDOS that created this file
-            ///     Offset 0x1C, 1 byte
-            /// </summary>
+            /// <summary>Version of ProDOS that created this file Offset 0x1C, 1 byte</summary>
             public byte version;
-            /// <summary>
-            ///     Minimum version of ProDOS needed to access this file
-            ///     Offset 0x1D, 1 byte
-            /// </summary>
+            /// <summary>Minimum version of ProDOS needed to access this file Offset 0x1D, 1 byte</summary>
             public byte min_version;
-            /// <summary>
-            ///     File permissions
-            ///     Offset 0x1E, 1 byte
-            /// </summary>
+            /// <summary>File permissions Offset 0x1E, 1 byte</summary>
             public byte access;
-            /// <summary>
-            ///     General purpose field to store additional information about file format
-            ///     Offset 0x1F, 2 bytes
-            /// </summary>
+            /// <summary>General purpose field to store additional information about file format Offset 0x1F, 2 bytes</summary>
             public ushort aux_type;
-            /// <summary>
-            ///     File last modification date time
-            ///     Offset 0x21, 4 bytes
-            /// </summary>
+            /// <summary>File last modification date time Offset 0x21, 4 bytes</summary>
             public DateTime last_mod;
-            /// <summary>
-            ///     Block address pointer to key block of the directory containing this entry
-            ///     Offset 0x25, 2 bytes
-            /// </summary>
+            /// <summary>Block address pointer to key block of the directory containing this entry Offset 0x25, 2 bytes</summary>
             public ushort header_pointer;
         }
 
         struct ProDOSRootDirectoryHeader
         {
-            /// <summary>
-            ///     Constant 0x0F
-            ///     Offset 0x04, mask 0xF0
-            /// </summary>
+            /// <summary>Constant 0x0F Offset 0x04, mask 0xF0</summary>
             public byte storage_type;
-            /// <summary>
-            ///     Length of volume_name pascal string
-            ///     Offset 0x04, mask 0x0F
-            /// </summary>
+            /// <summary>Length of volume_name pascal string Offset 0x04, mask 0x0F</summary>
             public byte name_length;
-            /// <summary>
-            ///     The name of the volume.
-            ///     Offset 0x05, 15 bytes
-            /// </summary>
+            /// <summary>The name of the volume. Offset 0x05, 15 bytes</summary>
             public string volume_name;
-            /// <summary>
-            ///     Reserved for future expansion
-            ///     Offset 0x14, 8 bytes
-            /// </summary>
+            /// <summary>Reserved for future expansion Offset 0x14, 8 bytes</summary>
             public ulong reserved;
-            /// <summary>
-            ///     Creation time of the volume
-            ///     Offset 0x1C, 4 bytes
-            /// </summary>
+            /// <summary>Creation time of the volume Offset 0x1C, 4 bytes</summary>
             public DateTime creation_time;
-            /// <summary>
-            ///     Version number of the volume format
-            ///     Offset 0x20, 1 byte
-            /// </summary>
+            /// <summary>Version number of the volume format Offset 0x20, 1 byte</summary>
             public byte version;
-            /// <summary>
-            ///     Reserved for future use
-            ///     Offset 0x21, 1 byte
-            /// </summary>
+            /// <summary>Reserved for future use Offset 0x21, 1 byte</summary>
             public byte min_version;
-            /// <summary>
-            ///     Permissions for the volume
-            ///     Offset 0x22, 1 byte
-            /// </summary>
+            /// <summary>Permissions for the volume Offset 0x22, 1 byte</summary>
             public byte access;
-            /// <summary>
-            ///     Length of an entry in this directory
-            ///     Const 0x27
-            ///     Offset 0x23, 1 byte
-            /// </summary>
+            /// <summary>Length of an entry in this directory Const 0x27 Offset 0x23, 1 byte</summary>
             public byte entry_length;
-            /// <summary>
-            ///     Number of entries per block
-            ///     Const 0x0D
-            ///     Offset 0x24, 1 byte
-            /// </summary>
+            /// <summary>Number of entries per block Const 0x0D Offset 0x24, 1 byte</summary>
             public byte entries_per_block;
-            /// <summary>
-            ///     Number of active files in this directory
-            ///     Offset 0x25, 2 bytes
-            /// </summary>
+            /// <summary>Number of active files in this directory Offset 0x25, 2 bytes</summary>
             public ushort file_count;
             /// <summary>
-            ///     Block address of the first block of the volume's bitmap,
-            ///     one for every 4096 blocks or fraction
-            ///     Offset 0x27, 2 bytes
+            ///     Block address of the first block of the volume's bitmap, one for every 4096 blocks or fraction Offset 0x27, 2
+            ///     bytes
             /// </summary>
             public ushort bit_map_pointer;
-            /// <summary>
-            ///     Total number of blocks in the volume
-            ///     Offset 0x29, 2 bytes
-            /// </summary>
+            /// <summary>Total number of blocks in the volume Offset 0x29, 2 bytes</summary>
             public ushort total_blocks;
         }
 
         struct ProDOSDirectoryHeader
         {
-            /// <summary>
-            ///     Constant 0x0E
-            ///     Offset 0x04, mask 0xF0
-            /// </summary>
+            /// <summary>Constant 0x0E Offset 0x04, mask 0xF0</summary>
             public byte storage_type;
-            /// <summary>
-            ///     Length of volume_name pascal string
-            ///     Offset 0x04, mask 0x0F
-            /// </summary>
+            /// <summary>Length of volume_name pascal string Offset 0x04, mask 0x0F</summary>
             public byte name_length;
-            /// <summary>
-            ///     The name of the directory.
-            ///     Offset 0x05, 15 bytes
-            /// </summary>
+            /// <summary>The name of the directory. Offset 0x05, 15 bytes</summary>
             public string directory_name;
-            /// <summary>
-            ///     Reserved for future expansion
-            ///     Offset 0x14, 8 bytes
-            /// </summary>
+            /// <summary>Reserved for future expansion Offset 0x14, 8 bytes</summary>
             public ulong reserved;
-            /// <summary>
-            ///     Creation time of the volume
-            ///     Offset 0x1C, 4 bytes
-            /// </summary>
+            /// <summary>Creation time of the volume Offset 0x1C, 4 bytes</summary>
             public DateTime creation_time;
-            /// <summary>
-            ///     Version number of the volume format
-            ///     Offset 0x20, 1 byte
-            /// </summary>
+            /// <summary>Version number of the volume format Offset 0x20, 1 byte</summary>
             public byte version;
-            /// <summary>
-            ///     Reserved for future use
-            ///     Offset 0x21, 1 byte
-            /// </summary>
+            /// <summary>Reserved for future use Offset 0x21, 1 byte</summary>
             public byte min_version;
-            /// <summary>
-            ///     Permissions for the volume
-            ///     Offset 0x22, 1 byte
-            /// </summary>
+            /// <summary>Permissions for the volume Offset 0x22, 1 byte</summary>
             public byte access;
-            /// <summary>
-            ///     Length of an entry in this directory
-            ///     Const 0x27
-            ///     Offset 0x23, 1 byte
-            /// </summary>
+            /// <summary>Length of an entry in this directory Const 0x27 Offset 0x23, 1 byte</summary>
             public byte entry_length;
-            /// <summary>
-            ///     Number of entries per block
-            ///     Const 0x0D
-            ///     Offset 0x24, 1 byte
-            /// </summary>
+            /// <summary>Number of entries per block Const 0x0D Offset 0x24, 1 byte</summary>
             public byte entries_per_block;
-            /// <summary>
-            ///     Number of active files in this directory
-            ///     Offset 0x25, 2 bytes
-            /// </summary>
+            /// <summary>Number of active files in this directory Offset 0x25, 2 bytes</summary>
             public ushort file_count;
-            /// <summary>
-            ///     Block address of parent directory block that contains this entry
-            ///     Offset 0x27, 2 bytes
-            /// </summary>
+            /// <summary>Block address of parent directory block that contains this entry Offset 0x27, 2 bytes</summary>
             public ushort parent_pointer;
-            /// <summary>
-            ///     Entry number within the block indicated in parent_pointer
-            ///     Offset 0x29, 1 byte
-            /// </summary>
+            /// <summary>Entry number within the block indicated in parent_pointer Offset 0x29, 1 byte</summary>
             public byte parent_entry_number;
-            /// <summary>
-            ///     Length of the entry that holds this directory, in the parent entry
-            ///     Const 0x27
-            ///     Offset 0x2A, 1 byte
-            /// </summary>
+            /// <summary>Length of the entry that holds this directory, in the parent entry Const 0x27 Offset 0x2A, 1 byte</summary>
             public byte parent_entry_length;
         }
 
         struct ProDOSDirectoryKeyBlock
         {
-            /// <summary>
-            ///     Always 0
-            ///     Offset 0x00, 2 bytes
-            /// </summary>
+            /// <summary>Always 0 Offset 0x00, 2 bytes</summary>
             public ushort zero;
-            /// <summary>
-            ///     Pointer to next directory block, 0 if last
-            ///     Offset 0x02, 2 bytes
-            /// </summary>
+            /// <summary>Pointer to next directory block, 0 if last Offset 0x02, 2 bytes</summary>
             public ushort next_pointer;
-            /// <summary>
-            ///     Directory header
-            ///     Offset 0x04, 39 bytes
-            /// </summary>
+            /// <summary>Directory header Offset 0x04, 39 bytes</summary>
             public ProDOSDirectoryHeader header;
-            /// <summary>
-            ///     Directory entries
-            ///     Offset 0x2F, 39 bytes each, 12 entries
-            /// </summary>
+            /// <summary>Directory entries Offset 0x2F, 39 bytes each, 12 entries</summary>
             public ProDOSEntry[] entries;
         }
 
         struct ProDOSRootDirectoryKeyBlock
         {
-            /// <summary>
-            ///     Always 0
-            ///     Offset 0x00, 2 bytes
-            /// </summary>
+            /// <summary>Always 0 Offset 0x00, 2 bytes</summary>
             public ushort zero;
-            /// <summary>
-            ///     Pointer to next directory block, 0 if last
-            ///     Offset 0x02, 2 bytes
-            /// </summary>
+            /// <summary>Pointer to next directory block, 0 if last Offset 0x02, 2 bytes</summary>
             public ushort next_pointer;
-            /// <summary>
-            ///     Directory header
-            ///     Offset 0x04, 39 bytes
-            /// </summary>
+            /// <summary>Directory header Offset 0x04, 39 bytes</summary>
             public ProDOSRootDirectoryHeader header;
-            /// <summary>
-            ///     Directory entries
-            ///     Offset 0x2F, 39 bytes each, 12 entries
-            /// </summary>
+            /// <summary>Directory entries Offset 0x2F, 39 bytes each, 12 entries</summary>
             public ProDOSEntry[] entries;
         }
 
         struct ProDOSDirectoryBlock
         {
-            /// <summary>
-            ///     Pointer to previous directory block
-            ///     Offset 0x00, 2 bytes
-            /// </summary>
+            /// <summary>Pointer to previous directory block Offset 0x00, 2 bytes</summary>
             public ushort zero;
-            /// <summary>
-            ///     Pointer to next directory block, 0 if last
-            ///     Offset 0x02, 2 bytes
-            /// </summary>
+            /// <summary>Pointer to next directory block, 0 if last Offset 0x02, 2 bytes</summary>
             public ushort next_pointer;
-            /// <summary>
-            ///     Directory entries
-            ///     Offset 0x2F, 39 bytes each, 13 entries
-            /// </summary>
+            /// <summary>Directory entries Offset 0x2F, 39 bytes each, 13 entries</summary>
             public ProDOSEntry[] entries;
         }
 
         struct ProDOSIndexBlock
         {
-            /// <summary>
-            ///     Up to 256 pointers to blocks, 0 to indicate the block is sparsed (non-allocated)
-            /// </summary>
+            /// <summary>Up to 256 pointers to blocks, 0 to indicate the block is sparsed (non-allocated)</summary>
             public ushort[] block_pointer;
         }
 
         struct ProDOSMasterIndexBlock
         {
-            /// <summary>
-            ///     Up to 128 pointers to index blocks
-            /// </summary>
+            /// <summary>Up to 128 pointers to index blocks</summary>
             public ushort[] index_block_pointer;
         }
     }
diff --git a/Aaru.Filesystems/QNX4.cs b/Aaru.Filesystems/QNX4.cs
index f2e930f4f..a43b9908b 100644
--- a/Aaru.Filesystems/QNX4.cs
+++ b/Aaru.Filesystems/QNX4.cs
@@ -56,41 +56,53 @@ namespace Aaru.Filesystems
 
         public bool Identify(IMediaImage imagePlugin, Partition partition)
         {
-            if(partition.Start + 1 >= imagePlugin.Info.Sectors) return false;
+            if(partition.Start + 1 >= imagePlugin.Info.Sectors)
+                return false;
 
             byte[] sector = imagePlugin.ReadSector(partition.Start + 1);
-            if(sector.Length < 512) return false;
+
+            if(sector.Length < 512)
+                return false;
 
             QNX4_Superblock qnxSb = Marshal.ByteArrayToStructureLittleEndian<QNX4_Superblock>(sector);
 
             // Check root directory name
-            if(!qnx4_rootDir_fname.SequenceEqual(qnxSb.rootDir.di_fname)) return false;
+            if(!qnx4_rootDir_fname.SequenceEqual(qnxSb.rootDir.di_fname))
+                return false;
 
             // Check sizes are multiple of blocks
-            if(qnxSb.rootDir.di_size % 512 != 0 || qnxSb.inode.di_size % 512 != 0 || qnxSb.boot.di_size % 512 != 0 ||
-               qnxSb.altBoot.di_size % 512 != 0) return false;
+            if(qnxSb.rootDir.di_size % 512 != 0 ||
+               qnxSb.inode.di_size   % 512 != 0 ||
+               qnxSb.boot.di_size    % 512 != 0 ||
+               qnxSb.altBoot.di_size % 512 != 0)
+                return false;
 
             // Check extents are not past device
             if(qnxSb.rootDir.di_first_xtnt.block + partition.Start >= partition.End ||
                qnxSb.inode.di_first_xtnt.block   + partition.Start >= partition.End ||
                qnxSb.boot.di_first_xtnt.block    + partition.Start >= partition.End ||
-               qnxSb.altBoot.di_first_xtnt.block + partition.Start >= partition.End) return false;
+               qnxSb.altBoot.di_first_xtnt.block + partition.Start >= partition.End)
+                return false;
 
             // Check inodes are in use
-            if((qnxSb.rootDir.di_status & 0x01) != 0x01 || (qnxSb.inode.di_status & 0x01) != 0x01 ||
-               (qnxSb.boot.di_status    & 0x01) != 0x01) return false;
+            if((qnxSb.rootDir.di_status & 0x01) != 0x01 ||
+               (qnxSb.inode.di_status   & 0x01) != 0x01 ||
+               (qnxSb.boot.di_status    & 0x01) != 0x01)
+                return false;
 
             // All hail filesystems without identification marks
             return true;
         }
 
         public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding    encoding)
+                                   Encoding encoding)
         {
             Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-15");
             information = "";
             byte[] sector = imagePlugin.ReadSector(partition.Start + 1);
-            if(sector.Length < 512) return;
+
+            if(sector.Length < 512)
+                return;
 
             QNX4_Superblock qnxSb = Marshal.ByteArrayToStructureLittleEndian<QNX4_Superblock>(sector);
 
@@ -174,14 +186,13 @@ namespace Aaru.Filesystems
 
             XmlFsType = new FileSystemType
             {
-                Type                      = "QNX4 filesystem",
-                Clusters                  = partition.Length,
-                ClusterSize               = 512,
+                Type                      = "QNX4 filesystem", Clusters = partition.Length, ClusterSize = 512,
                 CreationDate              = DateHandlers.UnixUnsignedToDateTime(qnxSb.rootDir.di_ftime),
                 CreationDateSpecified     = true,
                 ModificationDate          = DateHandlers.UnixUnsignedToDateTime(qnxSb.rootDir.di_mtime),
                 ModificationDateSpecified = true
             };
+
             XmlFsType.Bootable |= qnxSb.boot.di_size != 0 || qnxSb.altBoot.di_size != 0;
         }
 
diff --git a/Aaru.Filesystems/QNX6.cs b/Aaru.Filesystems/QNX6.cs
index 1c4d9ef16..00265832d 100644
--- a/Aaru.Filesystems/QNX6.cs
+++ b/Aaru.Filesystems/QNX6.cs
@@ -57,11 +57,14 @@ namespace Aaru.Filesystems
             uint sectors     = QNX6_SUPER_BLOCK_SIZE / imagePlugin.Info.SectorSize;
             uint bootSectors = QNX6_BOOT_BLOCKS_SIZE / imagePlugin.Info.SectorSize;
 
-            if(partition.Start + bootSectors + sectors >= partition.End) return false;
+            if(partition.Start + bootSectors + sectors >= partition.End)
+                return false;
 
-            byte[] audiSector = imagePlugin.ReadSectors(partition.Start,               sectors);
+            byte[] audiSector = imagePlugin.ReadSectors(partition.Start, sectors);
             byte[] sector     = imagePlugin.ReadSectors(partition.Start + bootSectors, sectors);
-            if(sector.Length < QNX6_SUPER_BLOCK_SIZE) return false;
+
+            if(sector.Length < QNX6_SUPER_BLOCK_SIZE)
+                return false;
 
             QNX6_AudiSuperBlock audiSb = Marshal.ByteArrayToStructureLittleEndian<QNX6_AudiSuperBlock>(audiSector);
 
@@ -71,17 +74,19 @@ namespace Aaru.Filesystems
         }
 
         public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding    encoding)
+                                   Encoding encoding)
         {
             Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-15");
             information = "";
-            StringBuilder sb          = new StringBuilder();
-            uint          sectors     = QNX6_SUPER_BLOCK_SIZE / imagePlugin.Info.SectorSize;
-            uint          bootSectors = QNX6_BOOT_BLOCKS_SIZE / imagePlugin.Info.SectorSize;
+            var  sb          = new StringBuilder();
+            uint sectors     = QNX6_SUPER_BLOCK_SIZE / imagePlugin.Info.SectorSize;
+            uint bootSectors = QNX6_BOOT_BLOCKS_SIZE / imagePlugin.Info.SectorSize;
 
-            byte[] audiSector = imagePlugin.ReadSectors(partition.Start,               sectors);
+            byte[] audiSector = imagePlugin.ReadSectors(partition.Start, sectors);
             byte[] sector     = imagePlugin.ReadSectors(partition.Start + bootSectors, sectors);
-            if(sector.Length < QNX6_SUPER_BLOCK_SIZE) return;
+
+            if(sector.Length < QNX6_SUPER_BLOCK_SIZE)
+                return;
 
             QNX6_AudiSuperBlock audiSb = Marshal.ByteArrayToStructureLittleEndian<QNX6_AudiSuperBlock>(audiSector);
 
@@ -96,25 +101,25 @@ namespace Aaru.Filesystems
                 sb.AppendFormat("Serial: 0x{0:X16}", audiSb.checksum).AppendLine();
                 sb.AppendFormat("{0} bytes per block", audiSb.blockSize).AppendLine();
                 sb.AppendFormat("{0} inodes free of {1}", audiSb.freeInodes, audiSb.numInodes).AppendLine();
+
                 sb.AppendFormat("{0} blocks ({1} bytes) free of {2} ({3} bytes)", audiSb.freeBlocks,
                                 audiSb.freeBlocks * audiSb.blockSize, audiSb.numBlocks,
                                 audiSb.numBlocks  * audiSb.blockSize).AppendLine();
 
                 XmlFsType = new FileSystemType
                 {
-                    Type                  = "QNX6 (Audi) filesystem",
-                    Clusters              = audiSb.numBlocks,
-                    ClusterSize           = audiSb.blockSize,
-                    Bootable              = true,
-                    Files                 = audiSb.numInodes - audiSb.freeInodes,
-                    FilesSpecified        = true,
-                    FreeClusters          = audiSb.freeBlocks,
-                    FreeClustersSpecified = true,
-                    VolumeSerial          = $"{audiSb.serial:X16}"
+                    Type           = "QNX6 (Audi) filesystem", Clusters = audiSb.numBlocks,
+                    ClusterSize    = audiSb.blockSize,
+                    Bootable       = true, Files = audiSb.numInodes - audiSb.freeInodes,
+                    FilesSpecified = true,
+                    FreeClusters   = audiSb.freeBlocks, FreeClustersSpecified = true,
+                    VolumeSerial   = $"{audiSb.serial:X16}"
                 };
+
                 //xmlFSType.VolumeName = CurrentEncoding.GetString(audiSb.id);
 
                 information = sb.ToString();
+
                 return;
             }
 
@@ -126,22 +131,22 @@ namespace Aaru.Filesystems
             sb.AppendFormat("Flags: 0x{0:X8}", qnxSb.flags).AppendLine();
             sb.AppendFormat("Version1: 0x{0:X4}", qnxSb.version1).AppendLine();
             sb.AppendFormat("Version2: 0x{0:X4}", qnxSb.version2).AppendLine();
+
             //sb.AppendFormat("Volume ID: \"{0}\"", CurrentEncoding.GetString(qnxSb.volumeid)).AppendLine();
             sb.AppendFormat("{0} bytes per block", qnxSb.blockSize).AppendLine();
             sb.AppendFormat("{0} inodes free of {1}", qnxSb.freeInodes, qnxSb.numInodes).AppendLine();
+
             sb.AppendFormat("{0} blocks ({1} bytes) free of {2} ({3} bytes)", qnxSb.freeBlocks,
-                            qnxSb.freeBlocks * qnxSb.blockSize, qnxSb.numBlocks, qnxSb.numBlocks * qnxSb.blockSize)
-              .AppendLine();
+                            qnxSb.freeBlocks * qnxSb.blockSize, qnxSb.numBlocks, qnxSb.numBlocks * qnxSb.blockSize).
+               AppendLine();
 
             XmlFsType = new FileSystemType
             {
                 Type                      = "QNX6 filesystem",
                 Clusters                  = qnxSb.numBlocks,
-                ClusterSize               = qnxSb.blockSize,
-                Bootable                  = true,
+                ClusterSize               = qnxSb.blockSize, Bootable = true,
                 Files                     = qnxSb.numInodes - qnxSb.freeInodes,
-                FilesSpecified            = true,
-                FreeClusters              = qnxSb.freeBlocks,
+                FilesSpecified            = true, FreeClusters = qnxSb.freeBlocks,
                 FreeClustersSpecified     = true,
                 VolumeSerial              = $"{qnxSb.serial:X16}",
                 CreationDate              = DateHandlers.UnixUnsignedToDateTime(qnxSb.ctime),
@@ -149,6 +154,7 @@ namespace Aaru.Filesystems
                 ModificationDate          = DateHandlers.UnixUnsignedToDateTime(qnxSb.atime),
                 ModificationDateSpecified = true
             };
+
             //xmlFSType.VolumeName = CurrentEncoding.GetString(qnxSb.volumeid);
 
             information = sb.ToString();
diff --git a/Aaru.Filesystems/RBF.cs b/Aaru.Filesystems/RBF.cs
index c8ddb024d..09e1dea19 100644
--- a/Aaru.Filesystems/RBF.cs
+++ b/Aaru.Filesystems/RBF.cs
@@ -55,31 +55,42 @@ namespace Aaru.Filesystems
 
         public bool Identify(IMediaImage imagePlugin, Partition partition)
         {
-            if(imagePlugin.Info.SectorSize < 256) return false;
+            if(imagePlugin.Info.SectorSize < 256)
+                return false;
 
             // Documentation says ID should be sector 0
             // I've found that OS-9/X68000 has it on sector 4
             // I've read OS-9/Apple2 has it on sector 15
-            foreach(int i in new[] {0, 4, 15})
+            foreach(int i in new[]
+            {
+                0, 4, 15
+            })
             {
                 ulong location = (ulong)i;
 
                 uint sbSize = (uint)(Marshal.SizeOf<RBF_IdSector>() / imagePlugin.Info.SectorSize);
-                if(Marshal.SizeOf<RBF_IdSector>() % imagePlugin.Info.SectorSize != 0) sbSize++;
 
-                if(partition.Start + location + sbSize >= imagePlugin.Info.Sectors) break;
+                if(Marshal.SizeOf<RBF_IdSector>() % imagePlugin.Info.SectorSize != 0)
+                    sbSize++;
+
+                if(partition.Start + location + sbSize >= imagePlugin.Info.Sectors)
+                    break;
 
                 byte[] sector = imagePlugin.ReadSectors(partition.Start + location, sbSize);
-                if(sector.Length < Marshal.SizeOf<RBF_IdSector>()) return false;
+
+                if(sector.Length < Marshal.SizeOf<RBF_IdSector>())
+                    return false;
 
                 RBF_IdSector    rbfSb     = Marshal.ByteArrayToStructureBigEndian<RBF_IdSector>(sector);
                 RBF_NewIdSector rbf9000Sb = Marshal.ByteArrayToStructureBigEndian<RBF_NewIdSector>(sector);
 
                 AaruConsole.DebugWriteLine("RBF plugin",
-                                          "magic at {0} = 0x{1:X8} or 0x{2:X8} (expected 0x{3:X8} or 0x{4:X8})",
-                                          location, rbfSb.dd_sync, rbf9000Sb.rid_sync, RBF_SYNC, RBF_CNYS);
+                                           "magic at {0} = 0x{1:X8} or 0x{2:X8} (expected 0x{3:X8} or 0x{4:X8})",
+                                           location, rbfSb.dd_sync, rbf9000Sb.rid_sync, RBF_SYNC, RBF_CNYS);
 
-                if(rbfSb.dd_sync == RBF_SYNC || rbf9000Sb.rid_sync == RBF_SYNC || rbf9000Sb.rid_sync == RBF_CNYS)
+                if(rbfSb.dd_sync      == RBF_SYNC ||
+                   rbf9000Sb.rid_sync == RBF_SYNC ||
+                   rbf9000Sb.rid_sync == RBF_CNYS)
                     return true;
             }
 
@@ -87,40 +98,55 @@ namespace Aaru.Filesystems
         }
 
         public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding    encoding)
+                                   Encoding encoding)
         {
             Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-15");
             information = "";
-            if(imagePlugin.Info.SectorSize < 256) return;
 
-            RBF_IdSector    rbfSb     = new RBF_IdSector();
-            RBF_NewIdSector rbf9000Sb = new RBF_NewIdSector();
+            if(imagePlugin.Info.SectorSize < 256)
+                return;
 
-            foreach(int i in new[] {0, 4, 15})
+            var rbfSb     = new RBF_IdSector();
+            var rbf9000Sb = new RBF_NewIdSector();
+
+            foreach(int i in new[]
+            {
+                0, 4, 15
+            })
             {
                 ulong location = (ulong)i;
                 uint  sbSize   = (uint)(Marshal.SizeOf<RBF_IdSector>() / imagePlugin.Info.SectorSize);
-                if(Marshal.SizeOf<RBF_IdSector>() % imagePlugin.Info.SectorSize != 0) sbSize++;
+
+                if(Marshal.SizeOf<RBF_IdSector>() % imagePlugin.Info.SectorSize != 0)
+                    sbSize++;
 
                 byte[] sector = imagePlugin.ReadSectors(partition.Start + location, sbSize);
-                if(sector.Length < Marshal.SizeOf<RBF_IdSector>()) return;
+
+                if(sector.Length < Marshal.SizeOf<RBF_IdSector>())
+                    return;
 
                 rbfSb     = Marshal.ByteArrayToStructureBigEndian<RBF_IdSector>(sector);
                 rbf9000Sb = Marshal.ByteArrayToStructureBigEndian<RBF_NewIdSector>(sector);
 
                 AaruConsole.DebugWriteLine("RBF plugin",
-                                          "magic at {0} = 0x{1:X8} or 0x{2:X8} (expected 0x{3:X8} or 0x{4:X8})",
-                                          location, rbfSb.dd_sync, rbf9000Sb.rid_sync, RBF_SYNC, RBF_CNYS);
+                                           "magic at {0} = 0x{1:X8} or 0x{2:X8} (expected 0x{3:X8} or 0x{4:X8})",
+                                           location, rbfSb.dd_sync, rbf9000Sb.rid_sync, RBF_SYNC, RBF_CNYS);
 
-                if(rbfSb.dd_sync == RBF_SYNC || rbf9000Sb.rid_sync == RBF_SYNC || rbf9000Sb.rid_sync == RBF_CNYS) break;
+                if(rbfSb.dd_sync      == RBF_SYNC ||
+                   rbf9000Sb.rid_sync == RBF_SYNC ||
+                   rbf9000Sb.rid_sync == RBF_CNYS)
+                    break;
             }
 
-            if(rbfSb.dd_sync != RBF_SYNC && rbf9000Sb.rid_sync != RBF_SYNC && rbf9000Sb.rid_sync != RBF_CNYS) return;
+            if(rbfSb.dd_sync      != RBF_SYNC &&
+               rbf9000Sb.rid_sync != RBF_SYNC &&
+               rbf9000Sb.rid_sync != RBF_CNYS)
+                return;
 
             if(rbf9000Sb.rid_sync == RBF_CNYS)
                 rbf9000Sb = (RBF_NewIdSector)Marshal.SwapStructureMembersEndian(rbf9000Sb);
 
-            StringBuilder sb = new StringBuilder();
+            var sb = new StringBuilder();
 
             sb.AppendLine("OS-9 Random Block File");
 
@@ -133,30 +159,44 @@ namespace Aaru.Filesystems
                 sb.AppendFormat("{0} blocks per cylinder", rbf9000Sb.rid_cylsize).AppendLine();
                 sb.AppendFormat("{0} heads", rbf9000Sb.rid_heads).AppendLine();
                 sb.AppendFormat("{0} bytes per block", rbf9000Sb.rid_blocksize).AppendLine();
+
                 // TODO: Convert to flags?
                 sb.AppendLine((rbf9000Sb.rid_format & 0x01) == 0x01 ? "Disk is double sided" : "Disk is single sided");
-                sb.AppendLine((rbf9000Sb.rid_format & 0x02) == 0x02
-                                  ? "Disk is double density"
+
+                sb.AppendLine((rbf9000Sb.rid_format & 0x02) == 0x02 ? "Disk is double density"
                                   : "Disk is single density");
-                if((rbf9000Sb.rid_format      & 0x10) == 0x10) sb.AppendLine("Disk is 384 TPI");
-                else if((rbf9000Sb.rid_format & 0x08) == 0x08) sb.AppendLine("Disk is 192 TPI");
-                else if((rbf9000Sb.rid_format & 0x04) == 0x04) sb.AppendLine("Disk is 96 TPI or 135 TPI");
-                else sb.AppendLine("Disk is 48 TPI");
+
+                if((rbf9000Sb.rid_format & 0x10) == 0x10)
+                    sb.AppendLine("Disk is 384 TPI");
+                else if((rbf9000Sb.rid_format & 0x08) == 0x08)
+                    sb.AppendLine("Disk is 192 TPI");
+                else if((rbf9000Sb.rid_format & 0x04) == 0x04)
+                    sb.AppendLine("Disk is 96 TPI or 135 TPI");
+                else
+                    sb.AppendLine("Disk is 48 TPI");
+
                 sb.AppendFormat("Allocation bitmap descriptor starts at block {0}",
                                 rbf9000Sb.rid_bitmap == 0 ? 1 : rbf9000Sb.rid_bitmap).AppendLine();
+
                 if(rbf9000Sb.rid_firstboot > 0)
                     sb.AppendFormat("Debugger descriptor starts at block {0}", rbf9000Sb.rid_firstboot).AppendLine();
+
                 if(rbf9000Sb.rid_bootfile > 0)
                     sb.AppendFormat("Boot file descriptor starts at block {0}", rbf9000Sb.rid_bootfile).AppendLine();
+
                 sb.AppendFormat("Root directory descriptor starts at block {0}", rbf9000Sb.rid_rootdir).AppendLine();
-                sb.AppendFormat("Disk is owned by group {0} user {1}", rbf9000Sb.rid_group, rbf9000Sb.rid_owner)
-                  .AppendLine();
-                sb.AppendFormat("Volume was created on {0}", DateHandlers.UnixToDateTime(rbf9000Sb.rid_ctime))
-                  .AppendLine();
+
+                sb.AppendFormat("Disk is owned by group {0} user {1}", rbf9000Sb.rid_group, rbf9000Sb.rid_owner).
+                   AppendLine();
+
+                sb.AppendFormat("Volume was created on {0}", DateHandlers.UnixToDateTime(rbf9000Sb.rid_ctime)).
+                   AppendLine();
+
                 sb.AppendFormat("Volume's identification block was last written on {0}",
                                 DateHandlers.UnixToDateTime(rbf9000Sb.rid_mtime)).AppendLine();
-                sb.AppendFormat("Volume name: {0}", StringHandlers.CToString(rbf9000Sb.rid_name, Encoding))
-                  .AppendLine();
+
+                sb.AppendFormat("Volume name: {0}", StringHandlers.CToString(rbf9000Sb.rid_name, Encoding)).
+                   AppendLine();
 
                 XmlFsType = new FileSystemType
                 {
@@ -179,29 +219,43 @@ namespace Aaru.Filesystems
                 sb.AppendFormat("{0} tracks", rbfSb.dd_tks).AppendLine();
                 sb.AppendFormat("{0} sectors per track", rbfSb.dd_spt).AppendLine();
                 sb.AppendFormat("{0} bytes per sector", 256 << rbfSb.dd_lsnsize).AppendLine();
+
                 sb.AppendFormat("{0} sectors per cluster ({1} bytes)", rbfSb.dd_bit,
                                 rbfSb.dd_bit * (256 << rbfSb.dd_lsnsize)).AppendLine();
+
                 // TODO: Convert to flags?
                 sb.AppendLine((rbfSb.dd_fmt & 0x01) == 0x01 ? "Disk is double sided" : "Disk is single sided");
                 sb.AppendLine((rbfSb.dd_fmt & 0x02) == 0x02 ? "Disk is double density" : "Disk is single density");
-                if((rbfSb.dd_fmt      & 0x10) == 0x10) sb.AppendLine("Disk is 384 TPI");
-                else if((rbfSb.dd_fmt & 0x08) == 0x08) sb.AppendLine("Disk is 192 TPI");
-                else if((rbfSb.dd_fmt & 0x04) == 0x04) sb.AppendLine("Disk is 96 TPI or 135 TPI");
-                else sb.AppendLine("Disk is 48 TPI");
+
+                if((rbfSb.dd_fmt & 0x10) == 0x10)
+                    sb.AppendLine("Disk is 384 TPI");
+                else if((rbfSb.dd_fmt & 0x08) == 0x08)
+                    sb.AppendLine("Disk is 192 TPI");
+                else if((rbfSb.dd_fmt & 0x04) == 0x04)
+                    sb.AppendLine("Disk is 96 TPI or 135 TPI");
+                else
+                    sb.AppendLine("Disk is 48 TPI");
+
                 sb.AppendFormat("Allocation bitmap descriptor starts at block {0}",
                                 rbfSb.dd_maplsn == 0 ? 1 : rbfSb.dd_maplsn).AppendLine();
+
                 sb.AppendFormat("{0} bytes in allocation bitmap", rbfSb.dd_map).AppendLine();
-                if(LSNToUInt32(rbfSb.dd_bt) > 0 && rbfSb.dd_bsz > 0)
+
+                if(LSNToUInt32(rbfSb.dd_bt) > 0 &&
+                   rbfSb.dd_bsz             > 0)
                     sb.AppendFormat("Boot file starts at block {0} and has {1} bytes", LSNToUInt32(rbfSb.dd_bt),
                                     rbfSb.dd_bsz).AppendLine();
-                sb.AppendFormat("Root directory descriptor starts at block {0}", LSNToUInt32(rbfSb.dd_dir))
-                  .AppendLine();
+
+                sb.AppendFormat("Root directory descriptor starts at block {0}", LSNToUInt32(rbfSb.dd_dir)).
+                   AppendLine();
+
                 sb.AppendFormat("Disk is owned by user {0}", rbfSb.dd_own).AppendLine();
                 sb.AppendFormat("Volume was created on {0}", DateHandlers.Os9ToDateTime(rbfSb.dd_dat)).AppendLine();
                 sb.AppendFormat("Volume attributes: {0:X2}", rbfSb.dd_att).AppendLine();
                 sb.AppendFormat("Volume name: {0}", StringHandlers.CToString(rbfSb.dd_nam, Encoding)).AppendLine();
-                sb.AppendFormat("Path descriptor options: {0}", StringHandlers.CToString(rbfSb.dd_opt, Encoding))
-                  .AppendLine();
+
+                sb.AppendFormat("Path descriptor options: {0}", StringHandlers.CToString(rbfSb.dd_opt, Encoding)).
+                   AppendLine();
 
                 XmlFsType = new FileSystemType
                 {
@@ -221,14 +275,14 @@ namespace Aaru.Filesystems
 
         static uint LSNToUInt32(byte[] lsn)
         {
-            if(lsn == null || lsn.Length != 3) return 0;
+            if(lsn        == null ||
+               lsn.Length != 3)
+                return 0;
 
             return (uint)((lsn[0] << 16) + (lsn[1] << 8) + lsn[2]);
         }
 
-        /// <summary>
-        ///     Identification sector. Wherever the sector this resides on, becomes LSN 0.
-        /// </summary>
+        /// <summary>Identification sector. Wherever the sector this resides on, becomes LSN 0.</summary>
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct RBF_IdSector
         {
@@ -283,8 +337,8 @@ namespace Aaru.Filesystems
         }
 
         /// <summary>
-        ///     Identification sector. Wherever the sector this resides on, becomes LSN 0.
-        ///     Introduced on OS-9000, this can be big or little endian.
+        ///     Identification sector. Wherever the sector this resides on, becomes LSN 0. Introduced on OS-9000, this can be
+        ///     big or little endian.
         /// </summary>
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct RBF_NewIdSector
diff --git a/Aaru.Filesystems/RT11.cs b/Aaru.Filesystems/RT11.cs
index 020fa315f..d7def2792 100644
--- a/Aaru.Filesystems/RT11.cs
+++ b/Aaru.Filesystems/RT11.cs
@@ -33,9 +33,9 @@
 using System;
 using System.Runtime.InteropServices;
 using System.Text;
-using Claunia.Encoding;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
+using Claunia.Encoding;
 using Schemas;
 using Encoding = System.Text.Encoding;
 using Marshal = Aaru.Helpers.Marshal;
@@ -54,12 +54,14 @@ namespace Aaru.Filesystems
 
         public bool Identify(IMediaImage imagePlugin, Partition partition)
         {
-            if(1 + partition.Start >= partition.End) return false;
+            if(1 + partition.Start >= partition.End)
+                return false;
 
             byte[] magicB   = new byte[12];
             byte[] hbSector = imagePlugin.ReadSector(1 + partition.Start);
 
-            if(hbSector.Length < 512) return false;
+            if(hbSector.Length < 512)
+                return false;
 
             Array.Copy(hbSector, 0x1F0, magicB, 0, 12);
             string magic = Encoding.ASCII.GetString(magicB);
@@ -68,12 +70,12 @@ namespace Aaru.Filesystems
         }
 
         public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding    encoding)
+                                   Encoding encoding)
         {
             Encoding    = new Radix50();
             information = "";
 
-            StringBuilder sb = new StringBuilder();
+            var sb = new StringBuilder();
 
             byte[] hbSector = imagePlugin.ReadSector(1 + partition.Start);
 
@@ -88,13 +90,17 @@ namespace Aaru.Filesystems
              *      SOB R2, 10$
              *      MOV 1,@R0
              */
-            ushort check                          = 0;
-            for(int i = 0; i < 512; i += 2) check += BitConverter.ToUInt16(hbSector, i);
+            ushort check = 0;
+
+            for(int i = 0; i < 512; i += 2)
+                check += BitConverter.ToUInt16(hbSector, i);
 
             sb.AppendFormat("Volume format is {0}",
                             StringHandlers.SpacePaddedToString(homeblock.format, Encoding.ASCII)).AppendLine();
-            sb.AppendFormat("{0} sectors per cluster ({1} bytes)", homeblock.cluster, homeblock.cluster * 512)
-              .AppendLine();
+
+            sb.AppendFormat("{0} sectors per cluster ({1} bytes)", homeblock.cluster, homeblock.cluster * 512).
+               AppendLine();
+
             sb.AppendFormat("First directory segment starts at block {0}", homeblock.rootBlock).AppendLine();
             sb.AppendFormat("Volume owner is \"{0}\"", Encoding.GetString(homeblock.ownername).TrimEnd()).AppendLine();
             sb.AppendFormat("Volume label: \"{0}\"", Encoding.GetString(homeblock.volname).TrimEnd()).AppendLine();
@@ -104,11 +110,9 @@ namespace Aaru.Filesystems
 
             XmlFsType = new FileSystemType
             {
-                Type        = "RT-11",
-                ClusterSize = (uint)(homeblock.cluster * 512),
-                Clusters    = homeblock.cluster,
-                VolumeName  = StringHandlers.SpacePaddedToString(homeblock.volname, Encoding),
-                Bootable    = !ArrayHelpers.ArrayIsNullOrEmpty(bootBlock)
+                Type       = "RT-11", ClusterSize = (uint)(homeblock.cluster * 512), Clusters = homeblock.cluster,
+                VolumeName = StringHandlers.SpacePaddedToString(homeblock.volname, Encoding),
+                Bootable   = !ArrayHelpers.ArrayIsNullOrEmpty(bootBlock)
             };
 
             information = sb.ToString();
diff --git a/Aaru.Filesystems/ReFS.cs b/Aaru.Filesystems/ReFS.cs
index 9d4313480..8e04fe240 100644
--- a/Aaru.Filesystems/ReFS.cs
+++ b/Aaru.Filesystems/ReFS.cs
@@ -44,23 +44,31 @@ namespace Aaru.Filesystems
 {
     public class ReFS : IFilesystem
     {
-        const    uint           FSRS          = 0x53525346;
-        readonly byte[]         refsSignature = {0x52, 0x65, 0x46, 0x53, 0x00, 0x00, 0x00, 0x00};
-        public   string         Name      => "Resilient File System plugin";
-        public   Guid           Id        => new Guid("37766C4E-EBF5-4113-A712-B758B756ABD6");
-        public   FileSystemType XmlFsType { get; private set; }
-        public   Encoding       Encoding  { get; private set; }
-        public   string         Author    => "Natalia Portillo";
+        const uint FSRS = 0x53525346;
+        readonly byte[] refsSignature =
+        {
+            0x52, 0x65, 0x46, 0x53, 0x00, 0x00, 0x00, 0x00
+        };
+        public string         Name      => "Resilient File System plugin";
+        public Guid           Id        => new Guid("37766C4E-EBF5-4113-A712-B758B756ABD6");
+        public FileSystemType XmlFsType { get; private set; }
+        public Encoding       Encoding  { get; private set; }
+        public string         Author    => "Natalia Portillo";
 
         public bool Identify(IMediaImage imagePlugin, Partition partition)
         {
             uint sbSize = (uint)(Marshal.SizeOf<RefsVolumeHeader>() / imagePlugin.Info.SectorSize);
-            if(Marshal.SizeOf<RefsVolumeHeader>() % imagePlugin.Info.SectorSize != 0) sbSize++;
 
-            if(partition.Start + sbSize >= partition.End) return false;
+            if(Marshal.SizeOf<RefsVolumeHeader>() % imagePlugin.Info.SectorSize != 0)
+                sbSize++;
+
+            if(partition.Start + sbSize >= partition.End)
+                return false;
 
             byte[] sector = imagePlugin.ReadSectors(partition.Start, sbSize);
-            if(sector.Length < Marshal.SizeOf<RefsVolumeHeader>()) return false;
+
+            if(sector.Length < Marshal.SizeOf<RefsVolumeHeader>())
+                return false;
 
             RefsVolumeHeader refsVhdr = Marshal.ByteArrayToStructureLittleEndian<RefsVolumeHeader>(sector);
 
@@ -69,51 +77,67 @@ namespace Aaru.Filesystems
         }
 
         public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding    encoding)
+                                   Encoding encoding)
         {
             Encoding    = Encoding.UTF8;
             information = "";
 
             uint sbSize = (uint)(Marshal.SizeOf<RefsVolumeHeader>() / imagePlugin.Info.SectorSize);
-            if(Marshal.SizeOf<RefsVolumeHeader>() % imagePlugin.Info.SectorSize != 0) sbSize++;
 
-            if(partition.Start + sbSize >= partition.End) return;
+            if(Marshal.SizeOf<RefsVolumeHeader>() % imagePlugin.Info.SectorSize != 0)
+                sbSize++;
+
+            if(partition.Start + sbSize >= partition.End)
+                return;
 
             byte[] sector = imagePlugin.ReadSectors(partition.Start, sbSize);
-            if(sector.Length < Marshal.SizeOf<RefsVolumeHeader>()) return;
+
+            if(sector.Length < Marshal.SizeOf<RefsVolumeHeader>())
+                return;
 
             RefsVolumeHeader refsVhdr = Marshal.ByteArrayToStructureLittleEndian<RefsVolumeHeader>(sector);
 
             AaruConsole.DebugWriteLine("ReFS plugin", "VolumeHeader.jump empty? = {0}",
-                                      ArrayHelpers.ArrayIsNullOrEmpty(refsVhdr.jump));
+                                       ArrayHelpers.ArrayIsNullOrEmpty(refsVhdr.jump));
+
             AaruConsole.DebugWriteLine("ReFS plugin", "VolumeHeader.signature = {0}",
-                                      StringHandlers.CToString(refsVhdr.signature));
+                                       StringHandlers.CToString(refsVhdr.signature));
+
             AaruConsole.DebugWriteLine("ReFS plugin", "VolumeHeader.mustBeZero empty? = {0}",
-                                      ArrayHelpers.ArrayIsNullOrEmpty(refsVhdr.mustBeZero));
+                                       ArrayHelpers.ArrayIsNullOrEmpty(refsVhdr.mustBeZero));
+
             AaruConsole.DebugWriteLine("ReFS plugin", "VolumeHeader.identifier = {0}",
-                                      StringHandlers.CToString(BitConverter.GetBytes(refsVhdr.identifier)));
-            AaruConsole.DebugWriteLine("ReFS plugin", "VolumeHeader.length = {0}",         refsVhdr.length);
-            AaruConsole.DebugWriteLine("ReFS plugin", "VolumeHeader.checksum = 0x{0:X4}",  refsVhdr.checksum);
-            AaruConsole.DebugWriteLine("ReFS plugin", "VolumeHeader.sectors = {0}",        refsVhdr.sectors);
+                                       StringHandlers.CToString(BitConverter.GetBytes(refsVhdr.identifier)));
+
+            AaruConsole.DebugWriteLine("ReFS plugin", "VolumeHeader.length = {0}", refsVhdr.length);
+            AaruConsole.DebugWriteLine("ReFS plugin", "VolumeHeader.checksum = 0x{0:X4}", refsVhdr.checksum);
+            AaruConsole.DebugWriteLine("ReFS plugin", "VolumeHeader.sectors = {0}", refsVhdr.sectors);
             AaruConsole.DebugWriteLine("ReFS plugin", "VolumeHeader.bytesPerSector = {0}", refsVhdr.bytesPerSector);
+
             AaruConsole.DebugWriteLine("ReFS plugin", "VolumeHeader.sectorsPerCluster = {0}",
-                                      refsVhdr.sectorsPerCluster);
+                                       refsVhdr.sectorsPerCluster);
+
             AaruConsole.DebugWriteLine("ReFS plugin", "VolumeHeader.unknown1 zero? = {0}", refsVhdr.unknown1 == 0);
             AaruConsole.DebugWriteLine("ReFS plugin", "VolumeHeader.unknown2 zero? = {0}", refsVhdr.unknown2 == 0);
             AaruConsole.DebugWriteLine("ReFS plugin", "VolumeHeader.unknown3 zero? = {0}", refsVhdr.unknown3 == 0);
             AaruConsole.DebugWriteLine("ReFS plugin", "VolumeHeader.unknown4 zero? = {0}", refsVhdr.unknown4 == 0);
+
             AaruConsole.DebugWriteLine("ReFS plugin", "VolumeHeader.unknown5 empty? = {0}",
-                                      ArrayHelpers.ArrayIsNullOrEmpty(refsVhdr.unknown5));
+                                       ArrayHelpers.ArrayIsNullOrEmpty(refsVhdr.unknown5));
 
-            if(refsVhdr.identifier != FSRS || !ArrayHelpers.ArrayIsNullOrEmpty(refsVhdr.mustBeZero) ||
-               !refsVhdr.signature.SequenceEqual(refsSignature)) return;
+            if(refsVhdr.identifier != FSRS                           ||
+               !ArrayHelpers.ArrayIsNullOrEmpty(refsVhdr.mustBeZero) ||
+               !refsVhdr.signature.SequenceEqual(refsSignature))
+                return;
 
-            StringBuilder sb = new StringBuilder();
+            var sb = new StringBuilder();
 
             sb.AppendLine("Microsoft Resilient File System");
             sb.AppendFormat("Volume uses {0} bytes per sector", refsVhdr.bytesPerSector).AppendLine();
+
             sb.AppendFormat("Volume uses {0} sectors per cluster ({1} bytes)", refsVhdr.sectorsPerCluster,
                             refsVhdr.sectorsPerCluster * refsVhdr.bytesPerSector).AppendLine();
+
             sb.AppendFormat("Volume has {0} sectors ({1} bytes)", refsVhdr.sectors,
                             refsVhdr.sectors * refsVhdr.bytesPerSector).AppendLine();
 
@@ -121,9 +145,8 @@ namespace Aaru.Filesystems
 
             XmlFsType = new FileSystemType
             {
-                Type        = "Resilient File System",
-                ClusterSize = refsVhdr.bytesPerSector * refsVhdr.sectorsPerCluster,
-                Clusters    = refsVhdr.sectors        / refsVhdr.sectorsPerCluster
+                Type     = "Resilient File System", ClusterSize = refsVhdr.bytesPerSector * refsVhdr.sectorsPerCluster,
+                Clusters = refsVhdr.sectors                                               / refsVhdr.sectorsPerCluster
             };
         }
 
diff --git a/Aaru.Filesystems/Register.cs b/Aaru.Filesystems/Register.cs
index bd6629098..231fcfc03 100644
--- a/Aaru.Filesystems/Register.cs
+++ b/Aaru.Filesystems/Register.cs
@@ -48,11 +48,10 @@ namespace Aaru.Filesystems
     {
         public List<Type> GetAllChecksumPlugins() => null;
 
-        public List<Type> GetAllFilesystemPlugins()
-        {
-            return Assembly.GetExecutingAssembly().GetTypes()
-                           .Where(t => t.GetInterfaces().Contains(typeof(IFilesystem))).Where(t => t.IsClass).ToList();
-        }
+        public List<Type> GetAllFilesystemPlugins() => Assembly.
+                                                       GetExecutingAssembly().GetTypes().
+                                                       Where(t => t.GetInterfaces().Contains(typeof(IFilesystem))).
+                                                       Where(t => t.IsClass).ToList();
 
         public List<Type> GetAllFilterPlugins() => null;
 
@@ -62,12 +61,11 @@ namespace Aaru.Filesystems
 
         public List<Type> GetAllPartitionPlugins() => null;
 
-        public List<Type> GetAllReadOnlyFilesystemPlugins()
-        {
-            return Assembly.GetExecutingAssembly().GetTypes()
-                           .Where(t => t.GetInterfaces().Contains(typeof(IReadOnlyFilesystem))).Where(t => t.IsClass)
-                           .ToList();
-        }
+        public List<Type> GetAllReadOnlyFilesystemPlugins() => Assembly.
+                                                               GetExecutingAssembly().GetTypes().
+                                                               Where(t => t.GetInterfaces().
+                                                                            Contains(typeof(IReadOnlyFilesystem))).
+                                                               Where(t => t.IsClass).ToList();
 
         public List<Type> GetAllWritableFloppyImagePlugins() => null;
 
diff --git a/Aaru.Filesystems/Reiser.cs b/Aaru.Filesystems/Reiser.cs
index a463503ac..d421bbedf 100644
--- a/Aaru.Filesystems/Reiser.cs
+++ b/Aaru.Filesystems/Reiser.cs
@@ -45,9 +45,18 @@ namespace Aaru.Filesystems
     {
         const uint REISER_SUPER_OFFSET = 0x10000;
 
-        readonly byte[] reiser35_magic = {0x52, 0x65, 0x49, 0x73, 0x45, 0x72, 0x46, 0x73, 0x00, 0x00};
-        readonly byte[] reiser36_magic = {0x52, 0x65, 0x49, 0x73, 0x45, 0x72, 0x32, 0x46, 0x73, 0x00};
-        readonly byte[] reiserJr_magic = {0x52, 0x65, 0x49, 0x73, 0x45, 0x72, 0x33, 0x46, 0x73, 0x00};
+        readonly byte[] reiser35_magic =
+        {
+            0x52, 0x65, 0x49, 0x73, 0x45, 0x72, 0x46, 0x73, 0x00, 0x00
+        };
+        readonly byte[] reiser36_magic =
+        {
+            0x52, 0x65, 0x49, 0x73, 0x45, 0x72, 0x32, 0x46, 0x73, 0x00
+        };
+        readonly byte[] reiserJr_magic =
+        {
+            0x52, 0x65, 0x49, 0x73, 0x45, 0x72, 0x33, 0x46, 0x73, 0x00
+        };
 
         public FileSystemType XmlFsType { get; private set; }
         public Encoding       Encoding  { get; private set; }
@@ -57,18 +66,26 @@ namespace Aaru.Filesystems
 
         public bool Identify(IMediaImage imagePlugin, Partition partition)
         {
-            if(imagePlugin.Info.SectorSize < 512) return false;
+            if(imagePlugin.Info.SectorSize < 512)
+                return false;
 
-            uint sbAddr            = REISER_SUPER_OFFSET / imagePlugin.Info.SectorSize;
-            if(sbAddr == 0) sbAddr = 1;
+            uint sbAddr = REISER_SUPER_OFFSET / imagePlugin.Info.SectorSize;
+
+            if(sbAddr == 0)
+                sbAddr = 1;
 
             uint sbSize = (uint)(Marshal.SizeOf<Reiser_Superblock>() / imagePlugin.Info.SectorSize);
-            if(Marshal.SizeOf<Reiser_Superblock>() % imagePlugin.Info.SectorSize != 0) sbSize++;
 
-            if(partition.Start + sbAddr + sbSize >= partition.End) return false;
+            if(Marshal.SizeOf<Reiser_Superblock>() % imagePlugin.Info.SectorSize != 0)
+                sbSize++;
+
+            if(partition.Start + sbAddr + sbSize >= partition.End)
+                return false;
 
             byte[] sector = imagePlugin.ReadSectors(partition.Start + sbAddr, sbSize);
-            if(sector.Length < Marshal.SizeOf<Reiser_Superblock>()) return false;
+
+            if(sector.Length < Marshal.SizeOf<Reiser_Superblock>())
+                return false;
 
             Reiser_Superblock reiserSb = Marshal.ByteArrayToStructureLittleEndian<Reiser_Superblock>(sector);
 
@@ -77,38 +94,57 @@ namespace Aaru.Filesystems
         }
 
         public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding    encoding)
+                                   Encoding encoding)
         {
             Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-15");
             information = "";
-            if(imagePlugin.Info.SectorSize < 512) return;
 
-            uint sbAddr            = REISER_SUPER_OFFSET / imagePlugin.Info.SectorSize;
-            if(sbAddr == 0) sbAddr = 1;
+            if(imagePlugin.Info.SectorSize < 512)
+                return;
+
+            uint sbAddr = REISER_SUPER_OFFSET / imagePlugin.Info.SectorSize;
+
+            if(sbAddr == 0)
+                sbAddr = 1;
 
             uint sbSize = (uint)(Marshal.SizeOf<Reiser_Superblock>() / imagePlugin.Info.SectorSize);
-            if(Marshal.SizeOf<Reiser_Superblock>() % imagePlugin.Info.SectorSize != 0) sbSize++;
+
+            if(Marshal.SizeOf<Reiser_Superblock>() % imagePlugin.Info.SectorSize != 0)
+                sbSize++;
 
             byte[] sector = imagePlugin.ReadSectors(partition.Start + sbAddr, sbSize);
-            if(sector.Length < Marshal.SizeOf<Reiser_Superblock>()) return;
+
+            if(sector.Length < Marshal.SizeOf<Reiser_Superblock>())
+                return;
 
             Reiser_Superblock reiserSb = Marshal.ByteArrayToStructureLittleEndian<Reiser_Superblock>(sector);
 
-            if(!reiser35_magic.SequenceEqual(reiserSb.magic) && !reiser36_magic.SequenceEqual(reiserSb.magic) &&
-               !reiserJr_magic.SequenceEqual(reiserSb.magic)) return;
+            if(!reiser35_magic.SequenceEqual(reiserSb.magic) &&
+               !reiser36_magic.SequenceEqual(reiserSb.magic) &&
+               !reiserJr_magic.SequenceEqual(reiserSb.magic))
+                return;
 
-            StringBuilder sb = new StringBuilder();
+            var sb = new StringBuilder();
+
+            if(reiser35_magic.SequenceEqual(reiserSb.magic))
+                sb.AppendLine("Reiser 3.5 filesystem");
+            else if(reiser36_magic.SequenceEqual(reiserSb.magic))
+                sb.AppendLine("Reiser 3.6 filesystem");
+            else if(reiserJr_magic.SequenceEqual(reiserSb.magic))
+                sb.AppendLine("Reiser Jr. filesystem");
+
+            sb.AppendFormat("Volume has {0} blocks with {1} blocks free", reiserSb.block_count, reiserSb.free_blocks).
+               AppendLine();
 
-            if(reiser35_magic.SequenceEqual(reiserSb.magic)) sb.AppendLine("Reiser 3.5 filesystem");
-            else if(reiser36_magic.SequenceEqual(reiserSb.magic)) sb.AppendLine("Reiser 3.6 filesystem");
-            else if(reiserJr_magic.SequenceEqual(reiserSb.magic)) sb.AppendLine("Reiser Jr. filesystem");
-            sb.AppendFormat("Volume has {0} blocks with {1} blocks free", reiserSb.block_count, reiserSb.free_blocks)
-              .AppendLine();
             sb.AppendFormat("{0} bytes per block", reiserSb.blocksize).AppendLine();
             sb.AppendFormat("Root directory resides on block {0}", reiserSb.root_block).AppendLine();
-            if(reiserSb.umount_state == 2) sb.AppendLine("Volume has not been cleanly umounted");
-            sb.AppendFormat("Volume last checked on {0}", DateHandlers.UnixUnsignedToDateTime(reiserSb.last_check))
-              .AppendLine();
+
+            if(reiserSb.umount_state == 2)
+                sb.AppendLine("Volume has not been cleanly umounted");
+
+            sb.AppendFormat("Volume last checked on {0}", DateHandlers.UnixUnsignedToDateTime(reiserSb.last_check)).
+               AppendLine();
+
             if(reiserSb.version >= 2)
             {
                 sb.AppendFormat("Volume UUID: {0}", reiserSb.uuid).AppendLine();
@@ -118,15 +154,22 @@ namespace Aaru.Filesystems
             information = sb.ToString();
 
             XmlFsType = new FileSystemType();
-            if(reiser35_magic.SequenceEqual(reiserSb.magic)) XmlFsType.Type      = "Reiser 3.5 filesystem";
-            else if(reiser36_magic.SequenceEqual(reiserSb.magic)) XmlFsType.Type = "Reiser 3.6 filesystem";
-            else if(reiserJr_magic.SequenceEqual(reiserSb.magic)) XmlFsType.Type = "Reiser Jr. filesystem";
+
+            if(reiser35_magic.SequenceEqual(reiserSb.magic))
+                XmlFsType.Type = "Reiser 3.5 filesystem";
+            else if(reiser36_magic.SequenceEqual(reiserSb.magic))
+                XmlFsType.Type = "Reiser 3.6 filesystem";
+            else if(reiserJr_magic.SequenceEqual(reiserSb.magic))
+                XmlFsType.Type = "Reiser Jr. filesystem";
+
             XmlFsType.ClusterSize           = reiserSb.blocksize;
             XmlFsType.Clusters              = reiserSb.block_count;
             XmlFsType.FreeClusters          = reiserSb.free_blocks;
             XmlFsType.FreeClustersSpecified = true;
             XmlFsType.Dirty                 = reiserSb.umount_state == 2;
-            if(reiserSb.version < 2) return;
+
+            if(reiserSb.version < 2)
+                return;
 
             XmlFsType.VolumeName   = Encoding.GetString(reiserSb.label);
             XmlFsType.VolumeSerial = reiserSb.uuid.ToString();
@@ -135,46 +178,46 @@ namespace Aaru.Filesystems
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct ReiserJournalParams
         {
-            public uint journal_1stblock;
-            public uint journal_dev;
-            public uint journal_size;
-            public uint journal_trans_max;
-            public uint journal_magic;
-            public uint journal_max_batch;
-            public uint journal_max_commit_age;
-            public uint journal_max_trans_age;
+            public readonly uint journal_1stblock;
+            public readonly uint journal_dev;
+            public readonly uint journal_size;
+            public readonly uint journal_trans_max;
+            public readonly uint journal_magic;
+            public readonly uint journal_max_batch;
+            public readonly uint journal_max_commit_age;
+            public readonly uint journal_max_trans_age;
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct Reiser_Superblock
         {
-            public uint                block_count;
-            public uint                free_blocks;
-            public uint                root_block;
-            public ReiserJournalParams journal;
-            public ushort              blocksize;
-            public ushort              oid_maxsize;
-            public ushort              oid_cursize;
-            public ushort              umount_state;
+            public readonly uint                block_count;
+            public readonly uint                free_blocks;
+            public readonly uint                root_block;
+            public readonly ReiserJournalParams journal;
+            public readonly ushort              blocksize;
+            public readonly ushort              oid_maxsize;
+            public readonly ushort              oid_cursize;
+            public readonly ushort              umount_state;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 10)]
-            public byte[] magic;
-            public ushort fs_state;
-            public uint   hash_function_code;
-            public ushort tree_height;
-            public ushort bmap_nr;
-            public ushort version;
-            public ushort reserved_for_journal;
-            public uint   inode_generation;
-            public uint   flags;
-            public Guid   uuid;
+            public readonly byte[] magic;
+            public readonly ushort fs_state;
+            public readonly uint   hash_function_code;
+            public readonly ushort tree_height;
+            public readonly ushort bmap_nr;
+            public readonly ushort version;
+            public readonly ushort reserved_for_journal;
+            public readonly uint   inode_generation;
+            public readonly uint   flags;
+            public          Guid   uuid;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public byte[] label;
-            public ushort mnt_count;
-            public ushort max_mnt_count;
-            public uint   last_check;
-            public uint   check_interval;
+            public readonly byte[] label;
+            public readonly ushort mnt_count;
+            public readonly ushort max_mnt_count;
+            public readonly uint   last_check;
+            public readonly uint   check_interval;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 76)]
-            public byte[] unused;
+            public readonly byte[] unused;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/Reiser4.cs b/Aaru.Filesystems/Reiser4.cs
index 75298f77c..2122085be 100644
--- a/Aaru.Filesystems/Reiser4.cs
+++ b/Aaru.Filesystems/Reiser4.cs
@@ -58,18 +58,26 @@ namespace Aaru.Filesystems
 
         public bool Identify(IMediaImage imagePlugin, Partition partition)
         {
-            if(imagePlugin.Info.SectorSize < 512) return false;
+            if(imagePlugin.Info.SectorSize < 512)
+                return false;
 
-            uint sbAddr            = REISER4_SUPER_OFFSET / imagePlugin.Info.SectorSize;
-            if(sbAddr == 0) sbAddr = 1;
+            uint sbAddr = REISER4_SUPER_OFFSET / imagePlugin.Info.SectorSize;
+
+            if(sbAddr == 0)
+                sbAddr = 1;
 
             uint sbSize = (uint)(Marshal.SizeOf<Reiser4_Superblock>() / imagePlugin.Info.SectorSize);
-            if(Marshal.SizeOf<Reiser4_Superblock>() % imagePlugin.Info.SectorSize != 0) sbSize++;
 
-            if(partition.Start + sbAddr + sbSize >= partition.End) return false;
+            if(Marshal.SizeOf<Reiser4_Superblock>() % imagePlugin.Info.SectorSize != 0)
+                sbSize++;
+
+            if(partition.Start + sbAddr + sbSize >= partition.End)
+                return false;
 
             byte[] sector = imagePlugin.ReadSectors(partition.Start + sbAddr, sbSize);
-            if(sector.Length < Marshal.SizeOf<Reiser4_Superblock>()) return false;
+
+            if(sector.Length < Marshal.SizeOf<Reiser4_Superblock>())
+                return false;
 
             Reiser4_Superblock reiserSb = Marshal.ByteArrayToStructureLittleEndian<Reiser4_Superblock>(sector);
 
@@ -77,26 +85,35 @@ namespace Aaru.Filesystems
         }
 
         public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding    encoding)
+                                   Encoding encoding)
         {
             Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-15");
             information = "";
-            if(imagePlugin.Info.SectorSize < 512) return;
 
-            uint sbAddr            = REISER4_SUPER_OFFSET / imagePlugin.Info.SectorSize;
-            if(sbAddr == 0) sbAddr = 1;
+            if(imagePlugin.Info.SectorSize < 512)
+                return;
+
+            uint sbAddr = REISER4_SUPER_OFFSET / imagePlugin.Info.SectorSize;
+
+            if(sbAddr == 0)
+                sbAddr = 1;
 
             uint sbSize = (uint)(Marshal.SizeOf<Reiser4_Superblock>() / imagePlugin.Info.SectorSize);
-            if(Marshal.SizeOf<Reiser4_Superblock>() % imagePlugin.Info.SectorSize != 0) sbSize++;
+
+            if(Marshal.SizeOf<Reiser4_Superblock>() % imagePlugin.Info.SectorSize != 0)
+                sbSize++;
 
             byte[] sector = imagePlugin.ReadSectors(partition.Start + sbAddr, sbSize);
-            if(sector.Length < Marshal.SizeOf<Reiser4_Superblock>()) return;
+
+            if(sector.Length < Marshal.SizeOf<Reiser4_Superblock>())
+                return;
 
             Reiser4_Superblock reiserSb = Marshal.ByteArrayToStructureLittleEndian<Reiser4_Superblock>(sector);
 
-            if(!reiser4_magic.SequenceEqual(reiserSb.magic)) return;
+            if(!reiser4_magic.SequenceEqual(reiserSb.magic))
+                return;
 
-            StringBuilder sb = new StringBuilder();
+            var sb = new StringBuilder();
 
             sb.AppendLine("Reiser 4 filesystem");
             sb.AppendFormat("{0} bytes per block", reiserSb.blocksize).AppendLine();
@@ -108,11 +125,9 @@ namespace Aaru.Filesystems
 
             XmlFsType = new FileSystemType
             {
-                Type         = "Reiser 4 filesystem",
-                ClusterSize  = reiserSb.blocksize,
-                Clusters     = (partition.End - partition.Start) * imagePlugin.Info.SectorSize / reiserSb.blocksize,
-                VolumeName   = StringHandlers.CToString(reiserSb.label, Encoding),
-                VolumeSerial = reiserSb.uuid.ToString()
+                Type       = "Reiser 4 filesystem", ClusterSize = reiserSb.blocksize,
+                Clusters   = ((partition.End - partition.Start) * imagePlugin.Info.SectorSize) / reiserSb.blocksize,
+                VolumeName = StringHandlers.CToString(reiserSb.label, Encoding), VolumeSerial = reiserSb.uuid.ToString()
             };
         }
 
diff --git a/Aaru.Filesystems/SFS.cs b/Aaru.Filesystems/SFS.cs
index 47dc24a84..37687451a 100644
--- a/Aaru.Filesystems/SFS.cs
+++ b/Aaru.Filesystems/SFS.cs
@@ -55,7 +55,8 @@ namespace Aaru.Filesystems
 
         public bool Identify(IMediaImage imagePlugin, Partition partition)
         {
-            if(partition.Start >= partition.End) return false;
+            if(partition.Start >= partition.End)
+                return false;
 
             byte[] sector = imagePlugin.ReadSector(partition.Start);
 
@@ -65,45 +66,56 @@ namespace Aaru.Filesystems
         }
 
         public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding    encoding)
+                                   Encoding encoding)
         {
             Encoding = encoding ?? Encoding.GetEncoding("iso-8859-1");
             byte[]    rootBlockSector = imagePlugin.ReadSector(partition.Start);
             RootBlock rootBlock       = Marshal.ByteArrayToStructureBigEndian<RootBlock>(rootBlockSector);
 
-            StringBuilder sbInformation = new StringBuilder();
+            var sbInformation = new StringBuilder();
 
             sbInformation.AppendLine("SmartFileSystem");
 
             sbInformation.AppendFormat("Volume version {0}", rootBlock.version).AppendLine();
+
             sbInformation.AppendFormat("Volume starts on device byte {0} and ends on byte {1}", rootBlock.firstbyte,
                                        rootBlock.lastbyte).AppendLine();
-            sbInformation
-               .AppendFormat("Volume has {0} blocks of {1} bytes each", rootBlock.totalblocks, rootBlock.blocksize)
-               .AppendLine();
+
+            sbInformation.
+                AppendFormat("Volume has {0} blocks of {1} bytes each", rootBlock.totalblocks, rootBlock.blocksize).
+                AppendLine();
+
             sbInformation.AppendFormat("Volume created on {0}",
-                                       DateHandlers.UnixUnsignedToDateTime(rootBlock.datecreated).AddYears(8))
-                         .AppendLine();
+                                       DateHandlers.UnixUnsignedToDateTime(rootBlock.datecreated).AddYears(8)).
+                          AppendLine();
+
             sbInformation.AppendFormat("Bitmap starts in block {0}", rootBlock.bitmapbase).AppendLine();
-            sbInformation.AppendFormat("Admin space container starts in block {0}", rootBlock.adminspacecontainer)
-                         .AppendLine();
-            sbInformation.AppendFormat("Root object container starts in block {0}", rootBlock.rootobjectcontainer)
-                         .AppendLine();
-            sbInformation.AppendFormat("Root node of the extent B-tree resides in block {0}", rootBlock.extentbnoderoot)
-                         .AppendLine();
-            sbInformation.AppendFormat("Root node of the object B-tree resides in block {0}", rootBlock.objectnoderoot)
-                         .AppendLine();
-            if(rootBlock.bits.HasFlag(SFSFlags.CaseSensitive)) sbInformation.AppendLine("Volume is case sensitive");
+
+            sbInformation.AppendFormat("Admin space container starts in block {0}", rootBlock.adminspacecontainer).
+                          AppendLine();
+
+            sbInformation.AppendFormat("Root object container starts in block {0}", rootBlock.rootobjectcontainer).
+                          AppendLine();
+
+            sbInformation.
+                AppendFormat("Root node of the extent B-tree resides in block {0}", rootBlock.extentbnoderoot).
+                AppendLine();
+
+            sbInformation.AppendFormat("Root node of the object B-tree resides in block {0}", rootBlock.objectnoderoot).
+                          AppendLine();
+
+            if(rootBlock.bits.HasFlag(SFSFlags.CaseSensitive))
+                sbInformation.AppendLine("Volume is case sensitive");
+
             if(rootBlock.bits.HasFlag(SFSFlags.RecyledFolder))
                 sbInformation.AppendLine("Volume moves deleted files to a recycled folder");
+
             information = sbInformation.ToString();
 
             XmlFsType = new FileSystemType
             {
                 CreationDate          = DateHandlers.UnixUnsignedToDateTime(rootBlock.datecreated).AddYears(8),
-                CreationDateSpecified = true,
-                Clusters              = rootBlock.totalblocks,
-                ClusterSize           = rootBlock.blocksize,
+                CreationDateSpecified = true, Clusters = rootBlock.totalblocks, ClusterSize = rootBlock.blocksize,
                 Type                  = "SmartFileSystem"
             };
         }
@@ -111,8 +123,7 @@ namespace Aaru.Filesystems
         [Flags]
         enum SFSFlags : byte
         {
-            RecyledFolder = 64,
-            CaseSensitive = 128
+            RecyledFolder = 64, CaseSensitive = 128
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
diff --git a/Aaru.Filesystems/SolarFS.cs b/Aaru.Filesystems/SolarFS.cs
index 79da1c7ae..3fab81167 100644
--- a/Aaru.Filesystems/SolarFS.cs
+++ b/Aaru.Filesystems/SolarFS.cs
@@ -50,7 +50,8 @@ namespace Aaru.Filesystems
 
         public bool Identify(IMediaImage imagePlugin, Partition partition)
         {
-            if(2 + partition.Start >= partition.End) return false;
+            if(2 + partition.Start >= partition.End)
+                return false;
 
             byte[] bpb = imagePlugin.ReadSector(0 + partition.Start);
 
@@ -64,25 +65,22 @@ namespace Aaru.Filesystems
         }
 
         public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding    encoding)
+                                   Encoding encoding)
         {
             Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-15");
             information = "";
 
-            StringBuilder sb        = new StringBuilder();
-            byte[]        bpbSector = imagePlugin.ReadSector(0 + partition.Start);
+            var    sb        = new StringBuilder();
+            byte[] bpbSector = imagePlugin.ReadSector(0 + partition.Start);
 
-            SolarOSParameterBlock bpb = new SolarOSParameterBlock
+            var bpb = new SolarOSParameterBlock
             {
-                bps       = BitConverter.ToUInt16(bpbSector, 0x0B),
-                root_ent  = BitConverter.ToUInt16(bpbSector, 0x10),
-                sectors   = BitConverter.ToUInt16(bpbSector, 0x12),
-                media     = bpbSector[0x14],
-                spfat     = BitConverter.ToUInt16(bpbSector, 0x15),
-                sptrk     = BitConverter.ToUInt16(bpbSector, 0x17),
-                heads     = BitConverter.ToUInt16(bpbSector, 0x19),
-                signature = bpbSector[0x25]
+                bps     = BitConverter.ToUInt16(bpbSector, 0x0B), root_ent  = BitConverter.ToUInt16(bpbSector, 0x10),
+                sectors = BitConverter.ToUInt16(bpbSector, 0x12), media     = bpbSector[0x14],
+                spfat   = BitConverter.ToUInt16(bpbSector, 0x15), sptrk     = BitConverter.ToUInt16(bpbSector, 0x17),
+                heads   = BitConverter.ToUInt16(bpbSector, 0x19), signature = bpbSector[0x25]
             };
+
             byte[] bpbStrings = new byte[8];
             Array.Copy(bpbSector, 0x03, bpbStrings, 0, 8);
             bpb.OEMName = StringHandlers.CToString(bpbStrings);
@@ -102,46 +100,53 @@ namespace Aaru.Filesystems
             bpb.unk4 = BitConverter.ToUInt32(bpbSector, 0x26);
 
             AaruConsole.DebugWriteLine("SolarFS plugin", "BPB.x86_jump: 0x{0:X2}{1:X2}{2:X2}", bpb.x86_jump[0],
-                                      bpb.x86_jump[1], bpb.x86_jump[2]);
+                                       bpb.x86_jump[1], bpb.x86_jump[2]);
+
             AaruConsole.DebugWriteLine("SolarFS plugin", "BPB.OEMName: \"{0}\"", bpb.OEMName);
-            AaruConsole.DebugWriteLine("SolarFS plugin", "BPB.bps: {0}",         bpb.bps);
-            AaruConsole.DebugWriteLine("SolarFS plugin", "BPB.unk1: 0x{0:X2}",   bpb.unk1);
-            AaruConsole.DebugWriteLine("SolarFS plugin", "BPB.unk2: 0x{0:X4}",   bpb.unk2);
-            AaruConsole.DebugWriteLine("SolarFS plugin", "BPB.root_ent: {0}",    bpb.root_ent);
-            AaruConsole.DebugWriteLine("SolarFS plugin", "BPB.sectors: {0}",     bpb.sectors);
-            AaruConsole.DebugWriteLine("SolarFS plugin", "BPB.media: 0x{0:X2}",  bpb.media);
-            AaruConsole.DebugWriteLine("SolarFS plugin", "BPB.spfat: {0}",       bpb.spfat);
-            AaruConsole.DebugWriteLine("SolarFS plugin", "BPB.sptrk: {0}",       bpb.sptrk);
-            AaruConsole.DebugWriteLine("SolarFS plugin", "BPB.heads: {0}",       bpb.heads);
+            AaruConsole.DebugWriteLine("SolarFS plugin", "BPB.bps: {0}", bpb.bps);
+            AaruConsole.DebugWriteLine("SolarFS plugin", "BPB.unk1: 0x{0:X2}", bpb.unk1);
+            AaruConsole.DebugWriteLine("SolarFS plugin", "BPB.unk2: 0x{0:X4}", bpb.unk2);
+            AaruConsole.DebugWriteLine("SolarFS plugin", "BPB.root_ent: {0}", bpb.root_ent);
+            AaruConsole.DebugWriteLine("SolarFS plugin", "BPB.sectors: {0}", bpb.sectors);
+            AaruConsole.DebugWriteLine("SolarFS plugin", "BPB.media: 0x{0:X2}", bpb.media);
+            AaruConsole.DebugWriteLine("SolarFS plugin", "BPB.spfat: {0}", bpb.spfat);
+            AaruConsole.DebugWriteLine("SolarFS plugin", "BPB.sptrk: {0}", bpb.sptrk);
+            AaruConsole.DebugWriteLine("SolarFS plugin", "BPB.heads: {0}", bpb.heads);
+
             AaruConsole.DebugWriteLine("SolarFS plugin",
-                                      "BPB.unk3: 0x{0:X2}{1:X2}{2:X2}{3:X2}{4:X2}{5:X2}{6:X2}{7:X2}{8:X2}{9:X2}",
-                                      bpb.unk3[0], bpb.unk3[1], bpb.unk3[2], bpb.unk3[3], bpb.unk3[4], bpb.unk3[5],
-                                      bpb.unk3[6], bpb.unk3[7], bpb.unk3[8], bpb.unk3[9]);
+                                       "BPB.unk3: 0x{0:X2}{1:X2}{2:X2}{3:X2}{4:X2}{5:X2}{6:X2}{7:X2}{8:X2}{9:X2}",
+                                       bpb.unk3[0], bpb.unk3[1], bpb.unk3[2], bpb.unk3[3], bpb.unk3[4], bpb.unk3[5],
+                                       bpb.unk3[6], bpb.unk3[7], bpb.unk3[8], bpb.unk3[9]);
+
             AaruConsole.DebugWriteLine("SolarFS plugin", "BPB.signature: 0x{0:X2}", bpb.signature);
-            AaruConsole.DebugWriteLine("SolarFS plugin", "BPB.unk4: 0x{0:X8}",      bpb.unk4);
-            AaruConsole.DebugWriteLine("SolarFS plugin", "BPB.vol_name: \"{0}\"",   bpb.vol_name);
-            AaruConsole.DebugWriteLine("SolarFS plugin", "BPB.fs_type: \"{0}\"",    bpb.fs_type);
+            AaruConsole.DebugWriteLine("SolarFS plugin", "BPB.unk4: 0x{0:X8}", bpb.unk4);
+            AaruConsole.DebugWriteLine("SolarFS plugin", "BPB.vol_name: \"{0}\"", bpb.vol_name);
+            AaruConsole.DebugWriteLine("SolarFS plugin", "BPB.fs_type: \"{0}\"", bpb.fs_type);
 
             sb.AppendLine("Solar_OS filesystem");
             sb.AppendFormat("Media descriptor: 0x{0:X2}", bpb.media).AppendLine();
             sb.AppendFormat("{0} bytes per sector", bpb.bps).AppendLine();
-            if(imagePlugin.Info.SectorSize == 2336 || imagePlugin.Info.SectorSize == 2352 ||
+
+            if(imagePlugin.Info.SectorSize == 2336 ||
+               imagePlugin.Info.SectorSize == 2352 ||
                imagePlugin.Info.SectorSize == 2448)
             {
                 if(bpb.bps != imagePlugin.Info.SectorSize)
-                    sb
-                       .AppendFormat("WARNING: Filesystem describes a {0} bytes/sector, while device describes a {1} bytes/sector",
+                    sb.
+                        AppendFormat("WARNING: Filesystem describes a {0} bytes/sector, while device describes a {1} bytes/sector",
                                      bpb.bps, 2048).AppendLine();
             }
             else if(bpb.bps != imagePlugin.Info.SectorSize)
-                sb
-                   .AppendFormat("WARNING: Filesystem describes a {0} bytes/sector, while device describes a {1} bytes/sector",
+                sb.
+                    AppendFormat("WARNING: Filesystem describes a {0} bytes/sector, while device describes a {1} bytes/sector",
                                  bpb.bps, imagePlugin.Info.SectorSize).AppendLine();
 
             sb.AppendFormat("{0} sectors on volume ({1} bytes)", bpb.sectors, bpb.sectors * bpb.bps).AppendLine();
+
             if(bpb.sectors > imagePlugin.Info.Sectors)
                 sb.AppendFormat("WARNING: Filesystem describes a {0} sectors volume, bigger than device ({1} sectors)",
                                 bpb.sectors, imagePlugin.Info.Sectors);
+
             sb.AppendFormat("{0} heads", bpb.heads).AppendLine();
             sb.AppendFormat("{0} sectors per track", bpb.sptrk).AppendLine();
             sb.AppendFormat("Volume name: {0}", bpb.vol_name).AppendLine();
diff --git a/Aaru.Filesystems/Squash.cs b/Aaru.Filesystems/Squash.cs
index 11f64abb1..7d7b12d3d 100644
--- a/Aaru.Filesystems/Squash.cs
+++ b/Aaru.Filesystems/Squash.cs
@@ -42,9 +42,7 @@ namespace Aaru.Filesystems
 {
     public class Squash : IFilesystem
     {
-        /// <summary>
-        ///     Identifier for Squash
-        /// </summary>
+        /// <summary>Identifier for Squash</summary>
         const uint SQUASH_MAGIC = 0x73717368;
         const uint SQUASH_CIGAM = 0x68737173;
 
@@ -56,7 +54,8 @@ namespace Aaru.Filesystems
 
         public bool Identify(IMediaImage imagePlugin, Partition partition)
         {
-            if(partition.Start >= partition.End) return false;
+            if(partition.Start >= partition.End)
+                return false;
 
             byte[] sector = imagePlugin.ReadSector(partition.Start);
 
@@ -66,59 +65,71 @@ namespace Aaru.Filesystems
         }
 
         public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding    encoding)
+                                   Encoding encoding)
         {
             Encoding = encoding ?? Encoding.UTF8;
             byte[] sector = imagePlugin.ReadSector(partition.Start);
             uint   magic  = BitConverter.ToUInt32(sector, 0x00);
 
-            SquashSuperBlock sqSb         = new SquashSuperBlock();
-            bool             littleEndian = true;
+            var  sqSb         = new SquashSuperBlock();
+            bool littleEndian = true;
 
             switch(magic)
             {
                 case SQUASH_MAGIC:
                     sqSb = Marshal.ByteArrayToStructureLittleEndian<SquashSuperBlock>(sector);
+
                     break;
                 case SQUASH_CIGAM:
                     sqSb         = Marshal.ByteArrayToStructureBigEndian<SquashSuperBlock>(sector);
                     littleEndian = false;
+
                     break;
             }
 
-            StringBuilder sbInformation = new StringBuilder();
+            var sbInformation = new StringBuilder();
 
             sbInformation.AppendLine("Squash file system");
             sbInformation.AppendLine(littleEndian ? "Little-endian" : "Big-endian");
             sbInformation.AppendFormat("Volume version {0}.{1}", sqSb.s_major, sqSb.s_minor).AppendLine();
             sbInformation.AppendFormat("Volume has {0} bytes", sqSb.bytes_used).AppendLine();
             sbInformation.AppendFormat("Volume has {0} bytes per block", sqSb.block_size).AppendLine();
-            sbInformation.AppendFormat("Volume created on {0}", DateHandlers.UnixUnsignedToDateTime(sqSb.mkfs_time))
-                         .AppendLine();
+
+            sbInformation.AppendFormat("Volume created on {0}", DateHandlers.UnixUnsignedToDateTime(sqSb.mkfs_time)).
+                          AppendLine();
+
             sbInformation.AppendFormat("Volume has {0} inodes", sqSb.inodes).AppendLine();
+
             switch(sqSb.compression)
             {
                 case (ushort)SquashCompression.Lz4:
                     sbInformation.AppendLine("Volume is compressed using LZ4");
+
                     break;
                 case (ushort)SquashCompression.Lzo:
                     sbInformation.AppendLine("Volume is compressed using LZO");
+
                     break;
                 case (ushort)SquashCompression.Lzma:
                     sbInformation.AppendLine("Volume is compressed using LZMA");
+
                     break;
                 case (ushort)SquashCompression.Xz:
                     sbInformation.AppendLine("Volume is compressed using XZ");
+
                     break;
                 case (ushort)SquashCompression.Zlib:
                     sbInformation.AppendLine("Volume is compressed using GZIP");
+
                     break;
                 case (ushort)SquashCompression.Zstd:
                     sbInformation.AppendLine("Volume is compressed using Zstandard");
+
                     break;
                 default:
-                    sbInformation.AppendFormat("Volume is compressed using unknown algorithm {0}", sqSb.compression)
-                                 .AppendLine();
+                    sbInformation.AppendFormat("Volume is compressed using unknown algorithm {0}", sqSb.compression).
+                                  AppendLine();
+
                     break;
             }
 
@@ -129,24 +140,17 @@ namespace Aaru.Filesystems
                 Type                  = "Squash file system",
                 CreationDate          = DateHandlers.UnixUnsignedToDateTime(sqSb.mkfs_time),
                 CreationDateSpecified = true,
-                Clusters =
-                    (partition.End - partition.Start + 1) * imagePlugin.Info.SectorSize / sqSb.block_size,
-                ClusterSize           = sqSb.block_size,
-                Files                 = sqSb.inodes,
-                FilesSpecified        = true,
-                FreeClusters          = 0,
+                Clusters = (((partition.End - partition.Start) + 1) * imagePlugin.Info.SectorSize) /
+                                        sqSb.block_size,
+                ClusterSize           = sqSb.block_size, Files = sqSb.inodes, FilesSpecified = true, FreeClusters = 0,
                 FreeClustersSpecified = true
             };
         }
 
         enum SquashCompression : ushort
         {
-            Zlib = 1,
-            Lzma = 2,
-            Lzo  = 3,
-            Xz   = 4,
-            Lz4  = 5,
-            Zstd = 6
+            Zlib = 1, Lzma = 2, Lzo  = 3,
+            Xz   = 4, Lz4  = 5, Zstd = 6
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
diff --git a/Aaru.Filesystems/SysV.cs b/Aaru.Filesystems/SysV.cs
index 7cfc34694..a2f5bf1af 100644
--- a/Aaru.Filesystems/SysV.cs
+++ b/Aaru.Filesystems/SysV.cs
@@ -48,6 +48,7 @@ namespace Aaru.Filesystems
         const uint XENIX_CIGAM = 0x44552B00;
         const uint SYSV_MAGIC  = 0xFD187E20;
         const uint SYSV_CIGAM  = 0x207E18FD;
+
         // Rest have no magic.
         // Per a Linux kernel, Coherent fs has following:
         const string COH_FNAME = "noname";
@@ -55,8 +56,10 @@ namespace Aaru.Filesystems
         const string COH_XXXXX = "xxxxx";
         const string COH_XXXXS = "xxxxx ";
         const string COH_XXXXN = "xxxxx\n";
+
         // SCO AFS
         const ushort SCO_NFREE = 0xFFFF;
+
         // UNIX 7th Edition has nothing to detect it, so check for a valid filesystem is a must :(
         const ushort V7_NICINOD = 100;
         const ushort V7_NICFREE = 100;
@@ -70,16 +73,18 @@ namespace Aaru.Filesystems
 
         public bool Identify(IMediaImage imagePlugin, Partition partition)
         {
-            if(2 + partition.Start >= partition.End) return false;
+            if(2 + partition.Start >= partition.End)
+                return false;
 
             byte sb_size_in_sectors;
 
             if(imagePlugin.Info.SectorSize <= 0x400
             ) // Check if underlying device sector size is smaller than SuperBlock size
-                sb_size_in_sectors  = (byte)(0x400 / imagePlugin.Info.SectorSize);
-            else sb_size_in_sectors = 1; // If not a single sector can store it
+                sb_size_in_sectors = (byte)(0x400 / imagePlugin.Info.SectorSize);
+            else
+                sb_size_in_sectors = 1; // If not a single sector can store it
 
-            if(partition.End <= partition.Start + 4 * (ulong)sb_size_in_sectors + sb_size_in_sectors
+            if(partition.End <= partition.Start + (4 * (ulong)sb_size_in_sectors) + sb_size_in_sectors
             ) // Device must be bigger than SB location + SB size + offset
                 return false;
 
@@ -90,28 +95,36 @@ namespace Aaru.Filesystems
             int[] locations =
             {
                 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+
                 // Superblock can also skip one cylinder (for boot)
                 spc
             };
 
-            foreach(byte[] sb_sector in locations
-                                       .TakeWhile(i => (ulong)i + partition.Start + sb_size_in_sectors <
-                                                       imagePlugin.Info.Sectors)
-                                       .Select(i => imagePlugin.ReadSectors((ulong)i + partition.Start,
+            foreach(byte[] sb_sector in locations.
+                                        TakeWhile(i => (ulong)i + partition.Start + sb_size_in_sectors <
+                                                       imagePlugin.Info.Sectors).
+                                        Select(i => imagePlugin.ReadSectors((ulong)i + partition.Start,
                                                                             sb_size_in_sectors)))
             {
                 uint magic = BitConverter.ToUInt32(sb_sector, 0x3F8);
 
-                if(magic == XENIX_MAGIC || magic == XENIX_CIGAM || magic == SYSV_MAGIC || magic == SYSV_CIGAM)
+                if(magic == XENIX_MAGIC ||
+                   magic == XENIX_CIGAM ||
+                   magic == SYSV_MAGIC  ||
+                   magic == SYSV_CIGAM)
                     return true;
 
                 magic = BitConverter.ToUInt32(sb_sector, 0x1F8); // System V magic location
 
-                if(magic == SYSV_MAGIC || magic == SYSV_CIGAM) return true;
+                if(magic == SYSV_MAGIC ||
+                   magic == SYSV_CIGAM)
+                    return true;
 
                 magic = BitConverter.ToUInt32(sb_sector, 0x1F0); // XENIX 3 magic location
 
-                if(magic == XENIX_MAGIC || magic == XENIX_CIGAM) return true;
+                if(magic == XENIX_MAGIC ||
+                   magic == XENIX_CIGAM)
+                    return true;
 
                 byte[] coherent_string = new byte[6];
                 Array.Copy(sb_sector, 0x1E4, coherent_string, 0, 6); // Coherent UNIX s_fname location
@@ -119,60 +132,78 @@ namespace Aaru.Filesystems
                 Array.Copy(sb_sector, 0x1EA, coherent_string, 0, 6); // Coherent UNIX s_fpack location
                 string s_fpack = StringHandlers.CToString(coherent_string);
 
-                if(s_fname == COH_FNAME && s_fpack == COH_FPACK || s_fname == COH_XXXXX && s_fpack == COH_XXXXX ||
-                   s_fname == COH_XXXXS && s_fpack == COH_XXXXN) return true;
+                if((s_fname == COH_FNAME && s_fpack == COH_FPACK) ||
+                   (s_fname == COH_XXXXX && s_fpack == COH_XXXXX) ||
+                   (s_fname == COH_XXXXS && s_fpack == COH_XXXXN))
+                    return true;
 
                 // Now try to identify 7th edition
                 uint   s_fsize  = BitConverter.ToUInt32(sb_sector, 0x002);
                 ushort s_nfree  = BitConverter.ToUInt16(sb_sector, 0x006);
                 ushort s_ninode = BitConverter.ToUInt16(sb_sector, 0x0D0);
 
-                if(s_fsize  <= 0 || s_fsize >= 0xFFFFFFFF || s_nfree <= 0 || s_nfree >= 0xFFFF || s_ninode <= 0 ||
-                   s_ninode >= 0xFFFF) continue;
+                if(s_fsize  <= 0          ||
+                   s_fsize  >= 0xFFFFFFFF ||
+                   s_nfree  <= 0          ||
+                   s_nfree  >= 0xFFFF     ||
+                   s_ninode <= 0          ||
+                   s_ninode >= 0xFFFF)
+                    continue;
 
-                if((s_fsize & 0xFF) == 0x00 && (s_nfree & 0xFF) == 0x00 && (s_ninode & 0xFF) == 0x00)
+                if((s_fsize  & 0xFF) == 0x00 &&
+                   (s_nfree  & 0xFF) == 0x00 &&
+                   (s_ninode & 0xFF) == 0x00)
                 {
                     // Byteswap
                     s_fsize = ((s_fsize & 0xFF)       << 24) + ((s_fsize & 0xFF00) << 8) + ((s_fsize & 0xFF0000) >> 8) +
                               ((s_fsize & 0xFF000000) >> 24);
+
                     s_nfree  = (ushort)(s_nfree  >> 8);
                     s_ninode = (ushort)(s_ninode >> 8);
                 }
 
-                if((s_fsize  & 0xFF000000) != 0x00 || (s_nfree & 0xFF00) != 0x00 ||
-                   (s_ninode & 0xFF00)     != 0x00) continue;
+                if((s_fsize  & 0xFF000000) != 0x00 ||
+                   (s_nfree  & 0xFF00)     != 0x00 ||
+                   (s_ninode & 0xFF00)     != 0x00)
+                    continue;
 
-                if(s_fsize >= V7_MAXSIZE || s_nfree >= V7_NICFREE || s_ninode >= V7_NICINOD) continue;
+                if(s_fsize  >= V7_MAXSIZE ||
+                   s_nfree  >= V7_NICFREE ||
+                   s_ninode >= V7_NICINOD)
+                    continue;
 
                 if(s_fsize * 1024 == (partition.End - partition.Start) * imagePlugin.Info.SectorSize ||
-                   s_fsize * 512  == (partition.End - partition.Start) * imagePlugin.Info.SectorSize) return true;
+                   s_fsize * 512  == (partition.End - partition.Start) * imagePlugin.Info.SectorSize)
+                    return true;
             }
 
             return false;
         }
 
         public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding    encoding)
+                                   Encoding encoding)
         {
             Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-15");
             information = "";
 
-            StringBuilder sb        = new StringBuilder();
-            bool          bigEndian = false; // Start in little endian until we know what are we handling here
-            int           start     = 0;
-            bool          xenix     = false;
-            bool          sysv      = false;
-            bool          sys7th    = false;
-            bool          coherent  = false;
-            bool          xenix3    = false;
-            byte[]        sb_sector;
-            byte          sb_size_in_sectors;
-            int           offset = 0;
+            var    sb        = new StringBuilder();
+            bool   bigEndian = false; // Start in little endian until we know what are we handling here
+            int    start     = 0;
+            bool   xenix     = false;
+            bool   sysv      = false;
+            bool   sys7th    = false;
+            bool   coherent  = false;
+            bool   xenix3    = false;
+            byte[] sb_sector;
+            byte   sb_size_in_sectors;
+            int    offset = 0;
 
             if(imagePlugin.Info.SectorSize <= 0x400
             ) // Check if underlying device sector size is smaller than SuperBlock size
-                sb_size_in_sectors  = (byte)(0x400 / imagePlugin.Info.SectorSize);
-            else sb_size_in_sectors = 1; // If not a single sector can store it
+                sb_size_in_sectors = (byte)(0x400 / imagePlugin.Info.SectorSize);
+            else
+                sb_size_in_sectors = 1; // If not a single sector can store it
+
             // Sectors in a cylinder
             int spc = (int)(imagePlugin.Info.Heads * imagePlugin.Info.SectorsPerTrack);
 
@@ -180,6 +211,7 @@ namespace Aaru.Filesystems
             int[] locations =
             {
                 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+
                 // Superblock can also skip one cylinder (for boot)
                 spc
             };
@@ -189,31 +221,39 @@ namespace Aaru.Filesystems
                 sb_sector = imagePlugin.ReadSectors((ulong)i + partition.Start, sb_size_in_sectors);
                 uint magic = BitConverter.ToUInt32(sb_sector, 0x3F8);
 
-                if(magic == XENIX_MAGIC || magic == SYSV_MAGIC)
+                if(magic == XENIX_MAGIC ||
+                   magic == SYSV_MAGIC)
                 {
                     bigEndian = false; // Little endian
+
                     if(magic == SYSV_MAGIC)
                     {
                         sysv   = true;
                         offset = 0x200;
                     }
-                    else xenix = true;
+                    else
+                        xenix = true;
 
                     start = i;
+
                     break;
                 }
 
-                if(magic == XENIX_CIGAM || magic == SYSV_CIGAM)
+                if(magic == XENIX_CIGAM ||
+                   magic == SYSV_CIGAM)
                 {
                     bigEndian = true; // Big endian
+
                     if(magic == SYSV_CIGAM)
                     {
                         sysv   = true;
                         offset = 0x200;
                     }
-                    else xenix = true;
+                    else
+                        xenix = true;
 
                     start = i;
+
                     break;
                 }
 
@@ -224,6 +264,7 @@ namespace Aaru.Filesystems
                     bigEndian = false; // Little endian
                     xenix3    = true;
                     start     = i;
+
                     break;
                 }
 
@@ -232,6 +273,7 @@ namespace Aaru.Filesystems
                     bigEndian = true; // Big endian
                     xenix3    = true;
                     start     = i;
+
                     break;
                 }
 
@@ -242,6 +284,7 @@ namespace Aaru.Filesystems
                     bigEndian = false; // Little endian
                     sysv      = true;
                     start     = i;
+
                     break;
                 }
 
@@ -250,6 +293,7 @@ namespace Aaru.Filesystems
                     bigEndian = true; // Big endian
                     sysv      = true;
                     start     = i;
+
                     break;
                 }
 
@@ -259,12 +303,14 @@ namespace Aaru.Filesystems
                 Array.Copy(sb_sector, 0x1EA, coherent_string, 0, 6); // Coherent UNIX s_fpack location
                 string s_fpack = StringHandlers.CToString(coherent_string, Encoding);
 
-                if(s_fname == COH_FNAME && s_fpack == COH_FPACK || s_fname == COH_XXXXX && s_fpack == COH_XXXXX ||
-                   s_fname == COH_XXXXS && s_fpack == COH_XXXXN)
+                if((s_fname == COH_FNAME && s_fpack == COH_FPACK) ||
+                   (s_fname == COH_XXXXX && s_fpack == COH_XXXXX) ||
+                   (s_fname == COH_XXXXS && s_fpack == COH_XXXXN))
                 {
                     bigEndian = false; // Coherent is in PDP endianness, use helper for that
                     coherent  = true;
                     start     = i;
+
                     break;
                 }
 
@@ -273,40 +319,60 @@ namespace Aaru.Filesystems
                 ushort s_nfree  = BitConverter.ToUInt16(sb_sector, 0x006);
                 ushort s_ninode = BitConverter.ToUInt16(sb_sector, 0x0D0);
 
-                if(s_fsize  <= 0 || s_fsize >= 0xFFFFFFFF || s_nfree <= 0 || s_nfree >= 0xFFFF || s_ninode <= 0 ||
-                   s_ninode >= 0xFFFF) continue;
+                if(s_fsize  <= 0          ||
+                   s_fsize  >= 0xFFFFFFFF ||
+                   s_nfree  <= 0          ||
+                   s_nfree  >= 0xFFFF     ||
+                   s_ninode <= 0          ||
+                   s_ninode >= 0xFFFF)
+                    continue;
 
-                if((s_fsize & 0xFF) == 0x00 && (s_nfree & 0xFF) == 0x00 && (s_ninode & 0xFF) == 0x00)
+                if((s_fsize  & 0xFF) == 0x00 &&
+                   (s_nfree  & 0xFF) == 0x00 &&
+                   (s_ninode & 0xFF) == 0x00)
                 {
                     // Byteswap
                     s_fsize = ((s_fsize & 0xFF)       << 24) + ((s_fsize & 0xFF00) << 8) + ((s_fsize & 0xFF0000) >> 8) +
                               ((s_fsize & 0xFF000000) >> 24);
+
                     s_nfree  = (ushort)(s_nfree  >> 8);
                     s_ninode = (ushort)(s_ninode >> 8);
                 }
 
-                if((s_fsize  & 0xFF000000) != 0x00 || (s_nfree & 0xFF00) != 0x00 ||
-                   (s_ninode & 0xFF00)     != 0x00) continue;
+                if((s_fsize  & 0xFF000000) != 0x00 ||
+                   (s_nfree  & 0xFF00)     != 0x00 ||
+                   (s_ninode & 0xFF00)     != 0x00)
+                    continue;
 
-                if(s_fsize >= V7_MAXSIZE || s_nfree >= V7_NICFREE || s_ninode >= V7_NICINOD) continue;
+                if(s_fsize  >= V7_MAXSIZE ||
+                   s_nfree  >= V7_NICFREE ||
+                   s_ninode >= V7_NICINOD)
+                    continue;
 
                 if(s_fsize * 1024 != (partition.End - partition.Start) * imagePlugin.Info.SectorSize &&
-                   s_fsize * 512  != (partition.End - partition.Start) * imagePlugin.Info.SectorSize) continue;
+                   s_fsize * 512  != (partition.End - partition.Start) * imagePlugin.Info.SectorSize)
+                    continue;
 
                 sys7th    = true;
                 bigEndian = false;
                 start     = i;
+
                 break;
             }
 
-            if(!sys7th && !sysv && !coherent && !xenix && !xenix3) return;
+            if(!sys7th   &&
+               !sysv     &&
+               !coherent &&
+               !xenix    &&
+               !xenix3)
+                return;
 
             XmlFsType = new FileSystemType();
 
             if(xenix || xenix3)
             {
-                byte[]          xenix_strings = new byte[6];
-                XenixSuperBlock xnx_sb        = new XenixSuperBlock();
+                byte[] xenix_strings = new byte[6];
+                var    xnx_sb        = new XenixSuperBlock();
                 sb_sector = imagePlugin.ReadSectors((ulong)start + partition.Start, sb_size_in_sectors);
 
                 if(xenix3)
@@ -380,60 +446,80 @@ namespace Aaru.Filesystems
                 uint bs = 512;
                 sb.AppendLine("XENIX filesystem");
                 XmlFsType.Type = "XENIX fs";
+
                 switch(xnx_sb.s_type)
                 {
                     case 1:
                         sb.AppendLine("512 bytes per block");
                         XmlFsType.ClusterSize = 512;
+
                         break;
                     case 2:
                         sb.AppendLine("1024 bytes per block");
                         bs                    = 1024;
                         XmlFsType.ClusterSize = 1024;
+
                         break;
                     case 3:
                         sb.AppendLine("2048 bytes per block");
                         bs                    = 2048;
                         XmlFsType.ClusterSize = 2048;
+
                         break;
                     default:
                         sb.AppendFormat("Unknown s_type value: 0x{0:X8}", xnx_sb.s_type).AppendLine();
+
                         break;
                 }
 
-                if(imagePlugin.Info.SectorSize == 2336 || imagePlugin.Info.SectorSize == 2352 ||
+                if(imagePlugin.Info.SectorSize == 2336 ||
+                   imagePlugin.Info.SectorSize == 2352 ||
                    imagePlugin.Info.SectorSize == 2448)
                 {
                     if(bs != 2048)
-                        sb
-                           .AppendFormat("WARNING: Filesystem indicates {0} bytes/block while device indicates {1} bytes/sector",
+                        sb.
+                            AppendFormat("WARNING: Filesystem indicates {0} bytes/block while device indicates {1} bytes/sector",
                                          bs, 2048).AppendLine();
                 }
                 else
                 {
                     if(bs != imagePlugin.Info.SectorSize)
-                        sb
-                           .AppendFormat("WARNING: Filesystem indicates {0} bytes/block while device indicates {1} bytes/sector",
+                        sb.
+                            AppendFormat("WARNING: Filesystem indicates {0} bytes/block while device indicates {1} bytes/sector",
                                          bs, imagePlugin.Info.SectorSize).AppendLine();
                 }
 
                 sb.AppendFormat("{0} zones on volume ({1} bytes)", xnx_sb.s_fsize, xnx_sb.s_fsize * bs).AppendLine();
-                sb.AppendFormat("{0} free zones on volume ({1} bytes)", xnx_sb.s_tfree, xnx_sb.s_tfree * bs)
-                  .AppendLine();
-                sb.AppendFormat("{0} free blocks on list ({1} bytes)", xnx_sb.s_nfree, xnx_sb.s_nfree * bs)
-                  .AppendLine();
-                sb.AppendFormat("{0} blocks per cylinder ({1} bytes)", xnx_sb.s_cylblks, xnx_sb.s_cylblks * bs)
-                  .AppendLine();
+
+                sb.AppendFormat("{0} free zones on volume ({1} bytes)", xnx_sb.s_tfree, xnx_sb.s_tfree * bs).
+                   AppendLine();
+
+                sb.AppendFormat("{0} free blocks on list ({1} bytes)", xnx_sb.s_nfree, xnx_sb.s_nfree * bs).
+                   AppendLine();
+
+                sb.AppendFormat("{0} blocks per cylinder ({1} bytes)", xnx_sb.s_cylblks, xnx_sb.s_cylblks * bs).
+                   AppendLine();
+
                 sb.AppendFormat("{0} blocks per gap ({1} bytes)", xnx_sb.s_gapblks, xnx_sb.s_gapblks * bs).AppendLine();
                 sb.AppendFormat("First data zone: {0}", xnx_sb.s_isize).AppendLine();
                 sb.AppendFormat("{0} free inodes on volume", xnx_sb.s_tinode).AppendLine();
                 sb.AppendFormat("{0} free inodes on list", xnx_sb.s_ninode).AppendLine();
-                if(xnx_sb.s_flock > 0) sb.AppendLine("Free block list is locked");
-                if(xnx_sb.s_ilock > 0) sb.AppendLine("inode cache is locked");
-                if(xnx_sb.s_fmod  > 0) sb.AppendLine("Superblock is being modified");
-                if(xnx_sb.s_ronly > 0) sb.AppendLine("Volume is mounted read-only");
-                sb.AppendFormat("Superblock last updated on {0}", DateHandlers.UnixToDateTime(xnx_sb.s_time))
-                  .AppendLine();
+
+                if(xnx_sb.s_flock > 0)
+                    sb.AppendLine("Free block list is locked");
+
+                if(xnx_sb.s_ilock > 0)
+                    sb.AppendLine("inode cache is locked");
+
+                if(xnx_sb.s_fmod > 0)
+                    sb.AppendLine("Superblock is being modified");
+
+                if(xnx_sb.s_ronly > 0)
+                    sb.AppendLine("Volume is mounted read-only");
+
+                sb.AppendFormat("Superblock last updated on {0}", DateHandlers.UnixToDateTime(xnx_sb.s_time)).
+                   AppendLine();
+
                 if(xnx_sb.s_time != 0)
                 {
                     XmlFsType.ModificationDate          = DateHandlers.UnixToDateTime(xnx_sb.s_time);
@@ -443,7 +529,9 @@ namespace Aaru.Filesystems
                 sb.AppendFormat("Volume name: {0}", xnx_sb.s_fname).AppendLine();
                 XmlFsType.VolumeName = xnx_sb.s_fname;
                 sb.AppendFormat("Pack name: {0}", xnx_sb.s_fpack).AppendLine();
-                if(xnx_sb.s_clean == 0x46) sb.AppendLine("Volume is clean");
+
+                if(xnx_sb.s_clean == 0x46)
+                    sb.AppendLine("Volume is clean");
                 else
                 {
                     sb.AppendLine("Volume is dirty");
@@ -456,34 +544,42 @@ namespace Aaru.Filesystems
                 sb_sector = imagePlugin.ReadSectors((ulong)start + partition.Start, sb_size_in_sectors);
                 byte[] sysv_strings = new byte[6];
 
-                SystemVRelease4SuperBlock sysv_sb = new SystemVRelease4SuperBlock
+                var sysv_sb = new SystemVRelease4SuperBlock
                 {
                     s_type = BitConverter.ToUInt32(sb_sector, 0x1FC + offset)
                 };
 
-                if(bigEndian) sysv_sb.s_type = Swapping.Swap(sysv_sb.s_type);
+                if(bigEndian)
+                    sysv_sb.s_type = Swapping.Swap(sysv_sb.s_type);
 
                 uint bs = 512;
+
                 switch(sysv_sb.s_type)
                 {
                     case 1:
                         XmlFsType.ClusterSize = 512;
+
                         break;
                     case 2:
                         bs                    = 1024;
                         XmlFsType.ClusterSize = 1024;
+
                         break;
                     case 3:
                         bs                    = 2048;
                         XmlFsType.ClusterSize = 2048;
+
                         break;
                     default:
                         sb.AppendFormat("Unknown s_type value: 0x{0:X8}", sysv_sb.s_type).AppendLine();
+
                         break;
                 }
 
                 sysv_sb.s_fsize = BitConverter.ToUInt32(sb_sector, 0x002 + offset);
-                if(bigEndian) sysv_sb.s_fsize = Swapping.Swap(sysv_sb.s_fsize);
+
+                if(bigEndian)
+                    sysv_sb.s_fsize = Swapping.Swap(sysv_sb.s_fsize);
 
                 bool sysvr4 = sysv_sb.s_fsize * bs <= 0 || sysv_sb.s_fsize * bs != partition.Size;
 
@@ -561,23 +657,38 @@ namespace Aaru.Filesystems
 
                 XmlFsType.Clusters = sysv_sb.s_fsize;
                 sb.AppendFormat("{0} zones on volume ({1} bytes)", sysv_sb.s_fsize, sysv_sb.s_fsize * bs).AppendLine();
-                sb.AppendFormat("{0} free zones on volume ({1} bytes)", sysv_sb.s_tfree, sysv_sb.s_tfree * bs)
-                  .AppendLine();
-                sb.AppendFormat("{0} free blocks on list ({1} bytes)", sysv_sb.s_nfree, sysv_sb.s_nfree * bs)
-                  .AppendLine();
-                sb.AppendFormat("{0} blocks per cylinder ({1} bytes)", sysv_sb.s_cylblks, sysv_sb.s_cylblks * bs)
-                  .AppendLine();
-                sb.AppendFormat("{0} blocks per gap ({1} bytes)", sysv_sb.s_gapblks, sysv_sb.s_gapblks * bs)
-                  .AppendLine();
+
+                sb.AppendFormat("{0} free zones on volume ({1} bytes)", sysv_sb.s_tfree, sysv_sb.s_tfree * bs).
+                   AppendLine();
+
+                sb.AppendFormat("{0} free blocks on list ({1} bytes)", sysv_sb.s_nfree, sysv_sb.s_nfree * bs).
+                   AppendLine();
+
+                sb.AppendFormat("{0} blocks per cylinder ({1} bytes)", sysv_sb.s_cylblks, sysv_sb.s_cylblks * bs).
+                   AppendLine();
+
+                sb.AppendFormat("{0} blocks per gap ({1} bytes)", sysv_sb.s_gapblks, sysv_sb.s_gapblks * bs).
+                   AppendLine();
+
                 sb.AppendFormat("First data zone: {0}", sysv_sb.s_isize).AppendLine();
                 sb.AppendFormat("{0} free inodes on volume", sysv_sb.s_tinode).AppendLine();
                 sb.AppendFormat("{0} free inodes on list", sysv_sb.s_ninode).AppendLine();
-                if(sysv_sb.s_flock > 0) sb.AppendLine("Free block list is locked");
-                if(sysv_sb.s_ilock > 0) sb.AppendLine("inode cache is locked");
-                if(sysv_sb.s_fmod  > 0) sb.AppendLine("Superblock is being modified");
-                if(sysv_sb.s_ronly > 0) sb.AppendLine("Volume is mounted read-only");
-                sb.AppendFormat("Superblock last updated on {0}", DateHandlers.UnixUnsignedToDateTime(sysv_sb.s_time))
-                  .AppendLine();
+
+                if(sysv_sb.s_flock > 0)
+                    sb.AppendLine("Free block list is locked");
+
+                if(sysv_sb.s_ilock > 0)
+                    sb.AppendLine("inode cache is locked");
+
+                if(sysv_sb.s_fmod > 0)
+                    sb.AppendLine("Superblock is being modified");
+
+                if(sysv_sb.s_ronly > 0)
+                    sb.AppendLine("Volume is mounted read-only");
+
+                sb.AppendFormat("Superblock last updated on {0}", DateHandlers.UnixUnsignedToDateTime(sysv_sb.s_time)).
+                   AppendLine();
+
                 if(sysv_sb.s_time != 0)
                 {
                     XmlFsType.ModificationDate          = DateHandlers.UnixUnsignedToDateTime(sysv_sb.s_time);
@@ -587,7 +698,9 @@ namespace Aaru.Filesystems
                 sb.AppendFormat("Volume name: {0}", sysv_sb.s_fname).AppendLine();
                 XmlFsType.VolumeName = sysv_sb.s_fname;
                 sb.AppendFormat("Pack name: {0}", sysv_sb.s_fpack).AppendLine();
-                if(sysv_sb.s_state == 0x7C269D38 - sysv_sb.s_time) sb.AppendLine("Volume is clean");
+
+                if(sysv_sb.s_state == 0x7C269D38 - sysv_sb.s_time)
+                    sb.AppendLine("Volume is clean");
                 else
                 {
                     sb.AppendLine("Volume is dirty");
@@ -598,8 +711,8 @@ namespace Aaru.Filesystems
             if(coherent)
             {
                 sb_sector = imagePlugin.ReadSectors((ulong)start + partition.Start, sb_size_in_sectors);
-                CoherentSuperBlock coh_sb      = new CoherentSuperBlock();
-                byte[]             coh_strings = new byte[6];
+                var    coh_sb      = new CoherentSuperBlock();
+                byte[] coh_strings = new byte[6];
 
                 coh_sb.s_isize  = BitConverter.ToUInt16(sb_sector, 0x000);
                 coh_sb.s_fsize  = Swapping.PDPFromLittleEndian(BitConverter.ToUInt32(sb_sector, 0x002));
@@ -624,24 +737,39 @@ namespace Aaru.Filesystems
                 XmlFsType.Clusters    = coh_sb.s_fsize;
 
                 sb.AppendLine("Coherent UNIX filesystem");
+
                 if(imagePlugin.Info.SectorSize != 512)
-                    sb
-                       .AppendFormat("WARNING: Filesystem indicates {0} bytes/block while device indicates {1} bytes/sector",
+                    sb.
+                        AppendFormat("WARNING: Filesystem indicates {0} bytes/block while device indicates {1} bytes/sector",
                                      512, 2048).AppendLine();
+
                 sb.AppendFormat("{0} zones on volume ({1} bytes)", coh_sb.s_fsize, coh_sb.s_fsize * 512).AppendLine();
-                sb.AppendFormat("{0} free zones on volume ({1} bytes)", coh_sb.s_tfree, coh_sb.s_tfree * 512)
-                  .AppendLine();
-                sb.AppendFormat("{0} free blocks on list ({1} bytes)", coh_sb.s_nfree, coh_sb.s_nfree * 512)
-                  .AppendLine();
+
+                sb.AppendFormat("{0} free zones on volume ({1} bytes)", coh_sb.s_tfree, coh_sb.s_tfree * 512).
+                   AppendLine();
+
+                sb.AppendFormat("{0} free blocks on list ({1} bytes)", coh_sb.s_nfree, coh_sb.s_nfree * 512).
+                   AppendLine();
+
                 sb.AppendFormat("First data zone: {0}", coh_sb.s_isize).AppendLine();
                 sb.AppendFormat("{0} free inodes on volume", coh_sb.s_tinode).AppendLine();
                 sb.AppendFormat("{0} free inodes on list", coh_sb.s_ninode).AppendLine();
-                if(coh_sb.s_flock > 0) sb.AppendLine("Free block list is locked");
-                if(coh_sb.s_ilock > 0) sb.AppendLine("inode cache is locked");
-                if(coh_sb.s_fmod  > 0) sb.AppendLine("Superblock is being modified");
-                if(coh_sb.s_ronly > 0) sb.AppendLine("Volume is mounted read-only");
-                sb.AppendFormat("Superblock last updated on {0}", DateHandlers.UnixUnsignedToDateTime(coh_sb.s_time))
-                  .AppendLine();
+
+                if(coh_sb.s_flock > 0)
+                    sb.AppendLine("Free block list is locked");
+
+                if(coh_sb.s_ilock > 0)
+                    sb.AppendLine("inode cache is locked");
+
+                if(coh_sb.s_fmod > 0)
+                    sb.AppendLine("Superblock is being modified");
+
+                if(coh_sb.s_ronly > 0)
+                    sb.AppendLine("Volume is mounted read-only");
+
+                sb.AppendFormat("Superblock last updated on {0}", DateHandlers.UnixUnsignedToDateTime(coh_sb.s_time)).
+                   AppendLine();
+
                 if(coh_sb.s_time != 0)
                 {
                     XmlFsType.ModificationDate          = DateHandlers.UnixUnsignedToDateTime(coh_sb.s_time);
@@ -656,8 +784,8 @@ namespace Aaru.Filesystems
             if(sys7th)
             {
                 sb_sector = imagePlugin.ReadSectors((ulong)start + partition.Start, sb_size_in_sectors);
-                UNIX7thEditionSuperBlock v7_sb        = new UNIX7thEditionSuperBlock();
-                byte[]                   sys7_strings = new byte[6];
+                var    v7_sb        = new UNIX7thEditionSuperBlock();
+                byte[] sys7_strings = new byte[6];
 
                 v7_sb.s_isize  = BitConverter.ToUInt16(sb_sector, 0x000);
                 v7_sb.s_fsize  = BitConverter.ToUInt32(sb_sector, 0x002);
@@ -681,23 +809,37 @@ namespace Aaru.Filesystems
                 XmlFsType.ClusterSize = 512;
                 XmlFsType.Clusters    = v7_sb.s_fsize;
                 sb.AppendLine("UNIX 7th Edition filesystem");
+
                 if(imagePlugin.Info.SectorSize != 512)
-                    sb
-                       .AppendFormat("WARNING: Filesystem indicates {0} bytes/block while device indicates {1} bytes/sector",
+                    sb.
+                        AppendFormat("WARNING: Filesystem indicates {0} bytes/block while device indicates {1} bytes/sector",
                                      512, 2048).AppendLine();
+
                 sb.AppendFormat("{0} zones on volume ({1} bytes)", v7_sb.s_fsize, v7_sb.s_fsize * 512).AppendLine();
-                sb.AppendFormat("{0} free zones on volume ({1} bytes)", v7_sb.s_tfree, v7_sb.s_tfree * 512)
-                  .AppendLine();
+
+                sb.AppendFormat("{0} free zones on volume ({1} bytes)", v7_sb.s_tfree, v7_sb.s_tfree * 512).
+                   AppendLine();
+
                 sb.AppendFormat("{0} free blocks on list ({1} bytes)", v7_sb.s_nfree, v7_sb.s_nfree * 512).AppendLine();
                 sb.AppendFormat("First data zone: {0}", v7_sb.s_isize).AppendLine();
                 sb.AppendFormat("{0} free inodes on volume", v7_sb.s_tinode).AppendLine();
                 sb.AppendFormat("{0} free inodes on list", v7_sb.s_ninode).AppendLine();
-                if(v7_sb.s_flock > 0) sb.AppendLine("Free block list is locked");
-                if(v7_sb.s_ilock > 0) sb.AppendLine("inode cache is locked");
-                if(v7_sb.s_fmod  > 0) sb.AppendLine("Superblock is being modified");
-                if(v7_sb.s_ronly > 0) sb.AppendLine("Volume is mounted read-only");
-                sb.AppendFormat("Superblock last updated on {0}", DateHandlers.UnixUnsignedToDateTime(v7_sb.s_time))
-                  .AppendLine();
+
+                if(v7_sb.s_flock > 0)
+                    sb.AppendLine("Free block list is locked");
+
+                if(v7_sb.s_ilock > 0)
+                    sb.AppendLine("inode cache is locked");
+
+                if(v7_sb.s_fmod > 0)
+                    sb.AppendLine("Superblock is being modified");
+
+                if(v7_sb.s_ronly > 0)
+                    sb.AppendLine("Volume is mounted read-only");
+
+                sb.AppendFormat("Superblock last updated on {0}", DateHandlers.UnixUnsignedToDateTime(v7_sb.s_time)).
+                   AppendLine();
+
                 if(v7_sb.s_time != 0)
                 {
                     XmlFsType.ModificationDate          = DateHandlers.UnixUnsignedToDateTime(v7_sb.s_time);
@@ -719,11 +861,13 @@ namespace Aaru.Filesystems
             public ushort s_isize;
             /// <summary>0x002, total number of zones of this volume</summary>
             public uint s_fsize;
+
             // the start of the free block list:
             /// <summary>0x006, blocks in s_free, &lt;=100</summary>
             public ushort s_nfree;
             /// <summary>0x008, 100 entries, 50 entries for Xenix 3, first free block list chunk</summary>
             public uint[] s_free;
+
             // the cache of free inodes:
             /// <summary>0x198 (0xD0), number of inodes in s_inode, &lt;= 100</summary>
             public ushort s_ninode;
@@ -773,6 +917,7 @@ namespace Aaru.Filesystems
             public ushort s_pad0;
             /// <summary>0x004, total number of zones of this volume</summary>
             public uint s_fsize;
+
             // the start of the free block list:
             /// <summary>0x008, blocks in s_free, &lt;=100</summary>
             public ushort s_nfree;
@@ -780,6 +925,7 @@ namespace Aaru.Filesystems
             public ushort s_pad1;
             /// <summary>0x00C, 50 entries, first free block list chunk</summary>
             public uint[] s_free;
+
             // the cache of free inodes:
             /// <summary>0x0D4, number of inodes in s_inode, &lt;= 100</summary>
             public ushort s_ninode;
@@ -831,11 +977,13 @@ namespace Aaru.Filesystems
             public ushort s_isize;
             /// <summary>0x002, total number of zones of this volume</summary>
             public uint s_fsize;
+
             // the start of the free block list:
             /// <summary>0x006, blocks in s_free, &lt;=100</summary>
             public ushort s_nfree;
             /// <summary>0x008, 50 entries, first free block list chunk</summary>
             public uint[] s_free;
+
             // the cache of free inodes:
             /// <summary>0x0D0, number of inodes in s_inode, &lt;= 100</summary>
             public ushort s_ninode;
@@ -883,11 +1031,13 @@ namespace Aaru.Filesystems
             public ushort s_isize;
             /// <summary>0x002, total number of zones of this volume</summary>
             public uint s_fsize;
+
             // the start of the free block list:
             /// <summary>0x006, blocks in s_free, &lt;=100</summary>
             public ushort s_nfree;
             /// <summary>0x008, 50 entries, first free block list chunk</summary>
             public uint[] s_free;
+
             // the cache of free inodes:
             /// <summary>0x0D0, number of inodes in s_inode, &lt;= 100</summary>
             public ushort s_ninode;
@@ -923,11 +1073,13 @@ namespace Aaru.Filesystems
             public ushort s_isize;
             /// <summary>0x002, total number of zones of this volume</summary>
             public uint s_fsize;
+
             // the start of the free block list:
             /// <summary>0x006, blocks in s_free, &lt;=100</summary>
             public ushort s_nfree;
             /// <summary>0x008, 64 entries, first free block list chunk</summary>
             public uint[] s_free;
+
             // the cache of free inodes:
             /// <summary>0x108, number of inodes in s_inode, &lt;= 100</summary>
             public ushort s_ninode;
diff --git a/Aaru.Filesystems/UCSDPascal/Dir.cs b/Aaru.Filesystems/UCSDPascal/Dir.cs
index f35970199..1b0fdf3bd 100644
--- a/Aaru.Filesystems/UCSDPascal/Dir.cs
+++ b/Aaru.Filesystems/UCSDPascal/Dir.cs
@@ -43,9 +43,12 @@ namespace Aaru.Filesystems.UCSDPascal
         public Errno ReadDir(string path, out List<string> contents)
         {
             contents = null;
-            if(!mounted) return Errno.AccessDenied;
 
-            if(!string.IsNullOrEmpty(path) && string.Compare(path, "/", StringComparison.OrdinalIgnoreCase) != 0)
+            if(!mounted)
+                return Errno.AccessDenied;
+
+            if(!string.IsNullOrEmpty(path) &&
+               string.Compare(path, "/", StringComparison.OrdinalIgnoreCase) != 0)
                 return Errno.NotSupported;
 
             contents = fileEntries.Select(ent => StringHandlers.PascalToString(ent.Filename, Encoding)).ToList();
@@ -57,6 +60,7 @@ namespace Aaru.Filesystems.UCSDPascal
             }
 
             contents.Sort();
+
             return Errno.NoError;
         }
     }
diff --git a/Aaru.Filesystems/UCSDPascal/File.cs b/Aaru.Filesystems/UCSDPascal/File.cs
index 95c0ff226..6ba656a0f 100644
--- a/Aaru.Filesystems/UCSDPascal/File.cs
+++ b/Aaru.Filesystems/UCSDPascal/File.cs
@@ -42,20 +42,29 @@ namespace Aaru.Filesystems.UCSDPascal
         public Errno MapBlock(string path, long fileBlock, out long deviceBlock)
         {
             deviceBlock = 0;
+
             return !mounted ? Errno.AccessDenied : Errno.NotImplemented;
         }
 
         public Errno GetAttributes(string path, out FileAttributes attributes)
         {
             attributes = new FileAttributes();
-            if(!mounted) return Errno.AccessDenied;
 
-            string[] pathElements = path.Split(new[] {'/'}, StringSplitOptions.RemoveEmptyEntries);
-            if(pathElements.Length != 1) return Errno.NotSupported;
+            if(!mounted)
+                return Errno.AccessDenied;
+
+            string[] pathElements = path.Split(new[]
+            {
+                '/'
+            }, StringSplitOptions.RemoveEmptyEntries);
+
+            if(pathElements.Length != 1)
+                return Errno.NotSupported;
 
             Errno error = GetFileEntry(path, out _);
 
-            if(error != Errno.NoError) return error;
+            if(error != Errno.NoError)
+                return error;
 
             attributes = FileAttributes.File;
 
@@ -64,32 +73,43 @@ namespace Aaru.Filesystems.UCSDPascal
 
         public Errno Read(string path, long offset, long size, ref byte[] buf)
         {
-            if(!mounted) return Errno.AccessDenied;
+            if(!mounted)
+                return Errno.AccessDenied;
 
-            string[] pathElements = path.Split(new[] {'/'}, StringSplitOptions.RemoveEmptyEntries);
-            if(pathElements.Length != 1) return Errno.NotSupported;
+            string[] pathElements = path.Split(new[]
+            {
+                '/'
+            }, StringSplitOptions.RemoveEmptyEntries);
+
+            if(pathElements.Length != 1)
+                return Errno.NotSupported;
 
             byte[] file;
 
-            if(debug && (string.Compare(path, "$",     StringComparison.InvariantCulture) == 0 ||
+            if(debug && (string.Compare(path, "$", StringComparison.InvariantCulture)     == 0 ||
                          string.Compare(path, "$Boot", StringComparison.InvariantCulture) == 0))
                 file = string.Compare(path, "$", StringComparison.InvariantCulture) == 0 ? catalogBlocks : bootBlocks;
             else
             {
                 Errno error = GetFileEntry(path, out PascalFileEntry entry);
 
-                if(error != Errno.NoError) return error;
+                if(error != Errno.NoError)
+                    return error;
 
                 byte[] tmp = device.ReadSectors((ulong)entry.FirstBlock                    * multiplier,
                                                 (uint)(entry.LastBlock - entry.FirstBlock) * multiplier);
-                file = new byte[(entry.LastBlock - entry.FirstBlock - 1) * device.Info.SectorSize * multiplier +
+
+                file = new byte[((entry.LastBlock - entry.FirstBlock - 1) * device.Info.SectorSize * multiplier) +
                                 entry.LastBytes];
+
                 Array.Copy(tmp, 0, file, 0, file.Length);
             }
 
-            if(offset >= file.Length) return Errno.EINVAL;
+            if(offset >= file.Length)
+                return Errno.EINVAL;
 
-            if(size + offset >= file.Length) size = file.Length - offset;
+            if(size + offset >= file.Length)
+                size = file.Length - offset;
 
             buf = new byte[size];
 
@@ -102,28 +122,31 @@ namespace Aaru.Filesystems.UCSDPascal
         {
             stat = null;
 
-            string[] pathElements = path.Split(new[] {'/'}, StringSplitOptions.RemoveEmptyEntries);
-            if(pathElements.Length != 1) return Errno.NotSupported;
+            string[] pathElements = path.Split(new[]
+            {
+                '/'
+            }, StringSplitOptions.RemoveEmptyEntries);
+
+            if(pathElements.Length != 1)
+                return Errno.NotSupported;
 
             if(debug)
-                if(string.Compare(path, "$",     StringComparison.InvariantCulture) == 0 ||
+                if(string.Compare(path, "$", StringComparison.InvariantCulture)     == 0 ||
                    string.Compare(path, "$Boot", StringComparison.InvariantCulture) == 0)
                 {
                     stat = new FileEntryInfo
                     {
-                        Attributes = FileAttributes.System,
-                        BlockSize  = device.Info.SectorSize * multiplier,
-                        Links      = 1
+                        Attributes = FileAttributes.System, BlockSize = device.Info.SectorSize * multiplier, Links = 1
                     };
 
                     if(string.Compare(path, "$", StringComparison.InvariantCulture) == 0)
                     {
-                        stat.Blocks = catalogBlocks.Length / stat.BlockSize + catalogBlocks.Length % stat.BlockSize;
+                        stat.Blocks = (catalogBlocks.Length / stat.BlockSize) + (catalogBlocks.Length % stat.BlockSize);
                         stat.Length = catalogBlocks.Length;
                     }
                     else
                     {
-                        stat.Blocks = bootBlocks.Length / stat.BlockSize + catalogBlocks.Length % stat.BlockSize;
+                        stat.Blocks = (bootBlocks.Length / stat.BlockSize) + (catalogBlocks.Length % stat.BlockSize);
                         stat.Length = bootBlocks.Length;
                     }
 
@@ -132,16 +155,16 @@ namespace Aaru.Filesystems.UCSDPascal
 
             Errno error = GetFileEntry(path, out PascalFileEntry entry);
 
-            if(error != Errno.NoError) return error;
+            if(error != Errno.NoError)
+                return error;
 
             stat = new FileEntryInfo
             {
-                Attributes       = FileAttributes.File,
-                Blocks           = entry.LastBlock - entry.FirstBlock,
+                Attributes       = FileAttributes.File, Blocks = entry.LastBlock - entry.FirstBlock,
                 BlockSize        = device.Info.SectorSize * multiplier,
                 LastWriteTimeUtc = DateHandlers.UcsdPascalToDateTime(entry.ModificationTime),
-                Length = (entry.LastBlock - entry.FirstBlock) * device.Info.SectorSize * multiplier +
-                         entry.LastBytes,
+                Length = ((entry.LastBlock - entry.FirstBlock) * device.Info.SectorSize * multiplier) +
+                                   entry.LastBytes,
                 Links = 1
             };
 
@@ -154,13 +177,14 @@ namespace Aaru.Filesystems.UCSDPascal
 
             foreach(PascalFileEntry ent in fileEntries.Where(ent =>
                                                                  string.Compare(path,
-                                                                                StringHandlers
-                                                                                   .PascalToString(ent.Filename,
+                                                                                StringHandlers.
+                                                                                    PascalToString(ent.Filename,
                                                                                                    Encoding),
-                                                                                StringComparison
-                                                                                   .InvariantCultureIgnoreCase) == 0))
+                                                                                StringComparison.
+                                                                                    InvariantCultureIgnoreCase) == 0))
             {
                 entry = ent;
+
                 return Errno.NoError;
             }
 
diff --git a/Aaru.Filesystems/UCSDPascal/Info.cs b/Aaru.Filesystems/UCSDPascal/Info.cs
index be3866bfd..9c597f88c 100644
--- a/Aaru.Filesystems/UCSDPascal/Info.cs
+++ b/Aaru.Filesystems/UCSDPascal/Info.cs
@@ -32,10 +32,10 @@
 
 using System;
 using System.Text;
-using Claunia.Encoding;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
+using Claunia.Encoding;
 using Schemas;
 using Encoding = System.Text.Encoding;
 
@@ -46,86 +46,94 @@ namespace Aaru.Filesystems.UCSDPascal
     {
         public bool Identify(IMediaImage imagePlugin, Partition partition)
         {
-            if(partition.Length < 3) return false;
+            if(partition.Length < 3)
+                return false;
 
             multiplier = (uint)(imagePlugin.Info.SectorSize == 256 ? 2 : 1);
 
             // Blocks 0 and 1 are boot code
-            byte[] volBlock = imagePlugin.ReadSectors(multiplier * 2 + partition.Start, multiplier);
+            byte[] volBlock = imagePlugin.ReadSectors((multiplier * 2) + partition.Start, multiplier);
 
             // On Apple II, it's little endian
             // TODO: Fix
             /*BigEndianBitConverter.IsLittleEndian =
                 multiplier == 2 ? !BitConverter.IsLittleEndian : BitConverter.IsLittleEndian;*/
 
-            PascalVolumeEntry volEntry = new PascalVolumeEntry
+            var volEntry = new PascalVolumeEntry
             {
                 FirstBlock = BigEndianBitConverter.ToInt16(volBlock, 0x00),
                 LastBlock  = BigEndianBitConverter.ToInt16(volBlock, 0x02),
-                EntryType  = (PascalFileKind)BigEndianBitConverter.ToInt16(volBlock, 0x04),
-                VolumeName = new byte[8],
+                EntryType  = (PascalFileKind)BigEndianBitConverter.ToInt16(volBlock, 0x04), VolumeName = new byte[8],
                 Blocks     = BigEndianBitConverter.ToInt16(volBlock, 0x0E),
                 Files      = BigEndianBitConverter.ToInt16(volBlock, 0x10),
                 Dummy      = BigEndianBitConverter.ToInt16(volBlock, 0x12),
                 LastBoot   = BigEndianBitConverter.ToInt16(volBlock, 0x14),
                 Tail       = BigEndianBitConverter.ToInt32(volBlock, 0x16)
             };
+
             Array.Copy(volBlock, 0x06, volEntry.VolumeName, 0, 8);
 
             AaruConsole.DebugWriteLine("UCSD Pascal Plugin", "volEntry.firstBlock = {0}", volEntry.FirstBlock);
-            AaruConsole.DebugWriteLine("UCSD Pascal Plugin", "volEntry.lastBlock = {0}",  volEntry.LastBlock);
-            AaruConsole.DebugWriteLine("UCSD Pascal Plugin", "volEntry.entryType = {0}",  volEntry.EntryType);
+            AaruConsole.DebugWriteLine("UCSD Pascal Plugin", "volEntry.lastBlock = {0}", volEntry.LastBlock);
+            AaruConsole.DebugWriteLine("UCSD Pascal Plugin", "volEntry.entryType = {0}", volEntry.EntryType);
             AaruConsole.DebugWriteLine("UCSD Pascal Plugin", "volEntry.volumeName = {0}", volEntry.VolumeName);
-            AaruConsole.DebugWriteLine("UCSD Pascal Plugin", "volEntry.blocks = {0}",     volEntry.Blocks);
-            AaruConsole.DebugWriteLine("UCSD Pascal Plugin", "volEntry.files = {0}",      volEntry.Files);
-            AaruConsole.DebugWriteLine("UCSD Pascal Plugin", "volEntry.dummy = {0}",      volEntry.Dummy);
-            AaruConsole.DebugWriteLine("UCSD Pascal Plugin", "volEntry.lastBoot = {0}",   volEntry.LastBoot);
-            AaruConsole.DebugWriteLine("UCSD Pascal Plugin", "volEntry.tail = {0}",       volEntry.Tail);
+            AaruConsole.DebugWriteLine("UCSD Pascal Plugin", "volEntry.blocks = {0}", volEntry.Blocks);
+            AaruConsole.DebugWriteLine("UCSD Pascal Plugin", "volEntry.files = {0}", volEntry.Files);
+            AaruConsole.DebugWriteLine("UCSD Pascal Plugin", "volEntry.dummy = {0}", volEntry.Dummy);
+            AaruConsole.DebugWriteLine("UCSD Pascal Plugin", "volEntry.lastBoot = {0}", volEntry.LastBoot);
+            AaruConsole.DebugWriteLine("UCSD Pascal Plugin", "volEntry.tail = {0}", volEntry.Tail);
 
             // First block is always 0 (even is it's sector 2)
-            if(volEntry.FirstBlock != 0) return false;
+            if(volEntry.FirstBlock != 0)
+                return false;
 
             // Last volume record block must be after first block, and before end of device
             if(volEntry.LastBlock        <= volEntry.FirstBlock ||
-               (ulong)volEntry.LastBlock > imagePlugin.Info.Sectors / multiplier - 2) return false;
+               (ulong)volEntry.LastBlock > (imagePlugin.Info.Sectors / multiplier) - 2)
+                return false;
 
             // Volume record entry type must be volume or secure
-            if(volEntry.EntryType != PascalFileKind.Volume && volEntry.EntryType != PascalFileKind.Secure) return false;
+            if(volEntry.EntryType != PascalFileKind.Volume &&
+               volEntry.EntryType != PascalFileKind.Secure)
+                return false;
 
             // Volume name is max 7 characters
-            if(volEntry.VolumeName[0] > 7) return false;
+            if(volEntry.VolumeName[0] > 7)
+                return false;
 
             // Volume blocks is equal to volume sectors
-            if(volEntry.Blocks < 0 || (ulong)volEntry.Blocks != imagePlugin.Info.Sectors / multiplier) return false;
+            if(volEntry.Blocks        < 0 ||
+               (ulong)volEntry.Blocks != imagePlugin.Info.Sectors / multiplier)
+                return false;
 
             // There can be not less than zero files
             return volEntry.Files >= 0;
         }
 
         public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding    encoding)
+                                   Encoding encoding)
         {
             Encoding = encoding ?? new Apple2();
-            StringBuilder sbInformation = new StringBuilder();
+            var sbInformation = new StringBuilder();
             information = "";
             multiplier  = (uint)(imagePlugin.Info.SectorSize == 256 ? 2 : 1);
 
-            if(imagePlugin.Info.Sectors < 3) return;
+            if(imagePlugin.Info.Sectors < 3)
+                return;
 
             // Blocks 0 and 1 are boot code
-            byte[] volBlock = imagePlugin.ReadSectors(multiplier * 2 + partition.Start, multiplier);
+            byte[] volBlock = imagePlugin.ReadSectors((multiplier * 2) + partition.Start, multiplier);
 
             // On Apple //, it's little endian
             // TODO: Fix
             //BigEndianBitConverter.IsLittleEndian =
             //    multiplier == 2 ? !BitConverter.IsLittleEndian : BitConverter.IsLittleEndian;
 
-            PascalVolumeEntry volEntry = new PascalVolumeEntry
+            var volEntry = new PascalVolumeEntry
             {
                 FirstBlock = BigEndianBitConverter.ToInt16(volBlock, 0x00),
                 LastBlock  = BigEndianBitConverter.ToInt16(volBlock, 0x02),
-                EntryType  = (PascalFileKind)BigEndianBitConverter.ToInt16(volBlock, 0x04),
-                VolumeName = new byte[8],
+                EntryType  = (PascalFileKind)BigEndianBitConverter.ToInt16(volBlock, 0x04), VolumeName = new byte[8],
                 Blocks     = BigEndianBitConverter.ToInt16(volBlock, 0x0E),
                 Files      = BigEndianBitConverter.ToInt16(volBlock, 0x10),
                 Dummy      = BigEndianBitConverter.ToInt16(volBlock, 0x12),
@@ -136,46 +144,54 @@ namespace Aaru.Filesystems.UCSDPascal
             Array.Copy(volBlock, 0x06, volEntry.VolumeName, 0, 8);
 
             // First block is always 0 (even is it's sector 2)
-            if(volEntry.FirstBlock != 0) return;
+            if(volEntry.FirstBlock != 0)
+                return;
 
             // Last volume record block must be after first block, and before end of device
             if(volEntry.LastBlock        <= volEntry.FirstBlock ||
-               (ulong)volEntry.LastBlock > imagePlugin.Info.Sectors / multiplier - 2) return;
+               (ulong)volEntry.LastBlock > (imagePlugin.Info.Sectors / multiplier) - 2)
+                return;
 
             // Volume record entry type must be volume or secure
-            if(volEntry.EntryType != PascalFileKind.Volume && volEntry.EntryType != PascalFileKind.Secure) return;
+            if(volEntry.EntryType != PascalFileKind.Volume &&
+               volEntry.EntryType != PascalFileKind.Secure)
+                return;
 
             // Volume name is max 7 characters
-            if(volEntry.VolumeName[0] > 7) return;
+            if(volEntry.VolumeName[0] > 7)
+                return;
 
             // Volume blocks is equal to volume sectors
-            if(volEntry.Blocks < 0 || (ulong)volEntry.Blocks != imagePlugin.Info.Sectors / multiplier) return;
+            if(volEntry.Blocks        < 0 ||
+               (ulong)volEntry.Blocks != imagePlugin.Info.Sectors / multiplier)
+                return;
 
             // There can be not less than zero files
-            if(volEntry.Files < 0) return;
+            if(volEntry.Files < 0)
+                return;
 
             sbInformation.AppendFormat("Volume record spans from block {0} to block {1}", volEntry.FirstBlock,
                                        volEntry.LastBlock).AppendLine();
-            sbInformation.AppendFormat("Volume name: {0}", StringHandlers.PascalToString(volEntry.VolumeName, Encoding))
-                         .AppendLine();
+
+            sbInformation.
+                AppendFormat("Volume name: {0}", StringHandlers.PascalToString(volEntry.VolumeName, Encoding)).
+                AppendLine();
+
             sbInformation.AppendFormat("Volume has {0} blocks", volEntry.Blocks).AppendLine();
             sbInformation.AppendFormat("Volume has {0} files", volEntry.Files).AppendLine();
-            sbInformation
-               .AppendFormat("Volume last booted at {0}", DateHandlers.UcsdPascalToDateTime(volEntry.LastBoot))
-               .AppendLine();
+
+            sbInformation.
+                AppendFormat("Volume last booted at {0}", DateHandlers.UcsdPascalToDateTime(volEntry.LastBoot)).
+                AppendLine();
 
             information = sbInformation.ToString();
 
             XmlFsType = new FileSystemType
             {
-                Bootable =
-                    !ArrayHelpers.ArrayIsNullOrEmpty(imagePlugin.ReadSectors(partition.Start, multiplier * 2)),
-                Clusters       = (ulong)volEntry.Blocks,
-                ClusterSize    = imagePlugin.Info.SectorSize,
-                Files          = (ulong)volEntry.Files,
-                FilesSpecified = true,
-                Type           = "UCSD Pascal",
-                VolumeName     = StringHandlers.PascalToString(volEntry.VolumeName, Encoding)
+                Bootable   = !ArrayHelpers.ArrayIsNullOrEmpty(imagePlugin.ReadSectors(partition.Start, multiplier * 2)),
+                Clusters   = (ulong)volEntry.Blocks, ClusterSize   = imagePlugin.Info.SectorSize,
+                Files      = (ulong)volEntry.Files, FilesSpecified = true, Type = "UCSD Pascal",
+                VolumeName = StringHandlers.PascalToString(volEntry.VolumeName, Encoding)
             };
         }
     }
diff --git a/Aaru.Filesystems/UCSDPascal/Super.cs b/Aaru.Filesystems/UCSDPascal/Super.cs
index d6ec8a028..16cbe1041 100644
--- a/Aaru.Filesystems/UCSDPascal/Super.cs
+++ b/Aaru.Filesystems/UCSDPascal/Super.cs
@@ -32,10 +32,10 @@
 
 using System;
 using System.Collections.Generic;
-using Claunia.Encoding;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
+using Claunia.Encoding;
 using Schemas;
 using Encoding = System.Text.Encoding;
 
@@ -44,14 +44,20 @@ namespace Aaru.Filesystems.UCSDPascal
     // Information from Call-A.P.P.L.E. Pascal Disk Directory Structure
     public partial class PascalPlugin
     {
-        public Errno Mount(IMediaImage                imagePlugin, Partition partition, Encoding encoding,
-                           Dictionary<string, string> options,     string    @namespace)
+        public Errno Mount(IMediaImage imagePlugin, Partition partition, Encoding encoding,
+                           Dictionary<string, string> options, string @namespace)
         {
             device   = imagePlugin;
             Encoding = encoding ?? new Apple2();
-            if(options == null) options = GetDefaultOptions();
-            if(options.TryGetValue("debug", out string debugString)) bool.TryParse(debugString, out debug);
-            if(device.Info.Sectors < 3) return Errno.InvalidArgument;
+
+            if(options == null)
+                options = GetDefaultOptions();
+
+            if(options.TryGetValue("debug", out string debugString))
+                bool.TryParse(debugString, out debug);
+
+            if(device.Info.Sectors < 3)
+                return Errno.InvalidArgument;
 
             multiplier = (uint)(imagePlugin.Info.SectorSize == 256 ? 2 : 1);
 
@@ -74,36 +80,43 @@ namespace Aaru.Filesystems.UCSDPascal
             mountedVolEntry.LastBoot = BigEndianBitConverter.ToInt16(catalogBlocks, 0x14);
             mountedVolEntry.Tail     = BigEndianBitConverter.ToInt32(catalogBlocks, 0x16);
 
-            if(mountedVolEntry.FirstBlock       != 0                                   ||
-               mountedVolEntry.LastBlock        <= mountedVolEntry.FirstBlock          ||
-               (ulong)mountedVolEntry.LastBlock > device.Info.Sectors / multiplier - 2 ||
-               mountedVolEntry.EntryType != PascalFileKind.Volume &&
-               mountedVolEntry.EntryType != PascalFileKind.Secure || mountedVolEntry.VolumeName[0] > 7                                 ||
-               mountedVolEntry.Blocks                                                              < 0                                 ||
-               (ulong)mountedVolEntry.Blocks                                                       != device.Info.Sectors / multiplier ||
-               mountedVolEntry.Files                                                               < 0)
+            if(mountedVolEntry.FirstBlock       != 0                                     ||
+               mountedVolEntry.LastBlock        <= mountedVolEntry.FirstBlock            ||
+               (ulong)mountedVolEntry.LastBlock > (device.Info.Sectors / multiplier) - 2 ||
+               (mountedVolEntry.EntryType != PascalFileKind.Volume &&
+                mountedVolEntry.EntryType != PascalFileKind.Secure)              ||
+               mountedVolEntry.VolumeName[0] > 7                                 ||
+               mountedVolEntry.Blocks        < 0                                 ||
+               (ulong)mountedVolEntry.Blocks != device.Info.Sectors / multiplier ||
+               mountedVolEntry.Files         < 0)
                 return Errno.InvalidArgument;
 
             catalogBlocks = device.ReadSectors(multiplier * 2,
                                                (uint)(mountedVolEntry.LastBlock - mountedVolEntry.FirstBlock - 2) *
                                                multiplier);
+
             int offset = 26;
 
             fileEntries = new List<PascalFileEntry>();
+
             while(offset + 26 < catalogBlocks.Length)
             {
-                PascalFileEntry entry = new PascalFileEntry
+                var entry = new PascalFileEntry
                 {
-                    Filename         = new byte[16],
-                    FirstBlock       = BigEndianBitConverter.ToInt16(catalogBlocks, offset + 0x00),
-                    LastBlock        = BigEndianBitConverter.ToInt16(catalogBlocks, offset + 0x02),
+                    Filename   = new byte[16],
+                    FirstBlock = BigEndianBitConverter.ToInt16(catalogBlocks, offset + 0x00),
+                    LastBlock =
+                        BigEndianBitConverter.ToInt16(catalogBlocks, offset + 0x02),
                     EntryType        = (PascalFileKind)BigEndianBitConverter.ToInt16(catalogBlocks, offset + 0x04),
                     LastBytes        = BigEndianBitConverter.ToInt16(catalogBlocks, offset + 0x16),
                     ModificationTime = BigEndianBitConverter.ToInt16(catalogBlocks, offset + 0x18)
                 };
+
                 Array.Copy(catalogBlocks, offset + 0x06, entry.Filename, 0, 16);
 
-                if(entry.Filename[0] <= 15 && entry.Filename[0] > 0) fileEntries.Add(entry);
+                if(entry.Filename[0] <= 15 &&
+                   entry.Filename[0] > 0)
+                    fileEntries.Add(entry);
 
                 offset += 26;
             }
@@ -112,13 +125,12 @@ namespace Aaru.Filesystems.UCSDPascal
 
             XmlFsType = new FileSystemType
             {
-                Bootable       = !ArrayHelpers.ArrayIsNullOrEmpty(bootBlocks),
-                Clusters       = (ulong)mountedVolEntry.Blocks,
-                ClusterSize    = device.Info.SectorSize,
-                Files          = (ulong)mountedVolEntry.Files,
+                Bootable       = !ArrayHelpers.ArrayIsNullOrEmpty(bootBlocks), Clusters = (ulong)mountedVolEntry.Blocks,
+                ClusterSize    = device.Info.SectorSize, Files                          = (ulong)mountedVolEntry.Files,
                 FilesSpecified = true,
                 Type           = "UCSD Pascal",
-                VolumeName     = StringHandlers.PascalToString(mountedVolEntry.VolumeName, Encoding)
+                VolumeName =
+                    StringHandlers.PascalToString(mountedVolEntry.VolumeName, Encoding)
             };
 
             mounted = true;
@@ -130,6 +142,7 @@ namespace Aaru.Filesystems.UCSDPascal
         {
             mounted     = false;
             fileEntries = null;
+
             return Errno.NoError;
         }
 
@@ -137,12 +150,8 @@ namespace Aaru.Filesystems.UCSDPascal
         {
             stat = new FileSystemInfo
             {
-                Blocks         = (ulong)mountedVolEntry.Blocks,
-                FilenameLength = 16,
-                Files          = (ulong)mountedVolEntry.Files,
-                FreeBlocks     = 0,
-                PluginId       = Id,
-                Type           = "UCSD Pascal"
+                Blocks     = (ulong)mountedVolEntry.Blocks, FilenameLength = 16, Files = (ulong)mountedVolEntry.Files,
+                FreeBlocks = 0, PluginId                                   = Id, Type  = "UCSD Pascal"
             };
 
             stat.FreeBlocks =
diff --git a/Aaru.Filesystems/UCSDPascal/UCSDPascal.cs b/Aaru.Filesystems/UCSDPascal/UCSDPascal.cs
index bfdc60a71..aa795d51f 100644
--- a/Aaru.Filesystems/UCSDPascal/UCSDPascal.cs
+++ b/Aaru.Filesystems/UCSDPascal/UCSDPascal.cs
@@ -63,6 +63,7 @@ namespace Aaru.Filesystems.UCSDPascal
         public Errno ListXAttr(string path, out List<string> xattrs)
         {
             xattrs = null;
+
             return Errno.NotSupported;
         }
 
@@ -71,15 +72,21 @@ namespace Aaru.Filesystems.UCSDPascal
         public Errno ReadLink(string path, out string dest)
         {
             dest = null;
+
             return Errno.NotSupported;
         }
 
         public IEnumerable<(string name, Type type, string description)> SupportedOptions =>
-            new (string name, Type type, string description)[] { };
+            new (string name, Type type, string description)[]
+                {};
 
         public Dictionary<string, string> Namespaces => null;
 
-        static Dictionary<string, string> GetDefaultOptions() =>
-            new Dictionary<string, string> {{"debug", false.ToString()}};
+        static Dictionary<string, string> GetDefaultOptions() => new Dictionary<string, string>
+        {
+            {
+                "debug", false.ToString()
+            }
+        };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/UDF.cs b/Aaru.Filesystems/UDF.cs
index ca3320bb2..64b5a0eb5 100644
--- a/Aaru.Filesystems/UDF.cs
+++ b/Aaru.Filesystems/UDF.cs
@@ -47,8 +47,8 @@ namespace Aaru.Filesystems
     {
         readonly byte[] UDF_Magic =
         {
-            0x2A, 0x4F, 0x53, 0x54, 0x41, 0x20, 0x55, 0x44, 0x46, 0x20, 0x43, 0x6F, 0x6D, 0x70, 0x6C, 0x69, 0x61,
-            0x6E, 0x74, 0x00, 0x00, 0x00, 0x00
+            0x2A, 0x4F, 0x53, 0x54, 0x41, 0x20, 0x55, 0x44, 0x46, 0x20, 0x43, 0x6F, 0x6D, 0x70, 0x6C, 0x69, 0x61, 0x6E,
+            0x74, 0x00, 0x00, 0x00, 0x00
         };
 
         public FileSystemType XmlFsType { get; private set; }
@@ -60,16 +60,23 @@ namespace Aaru.Filesystems
         public bool Identify(IMediaImage imagePlugin, Partition partition)
         {
             // UDF needs at least that
-            if(partition.End - partition.Start < 256) return false;
+            if(partition.End - partition.Start < 256)
+                return false;
 
             // UDF needs at least that
-            if(imagePlugin.Info.SectorSize < 512) return false;
+            if(imagePlugin.Info.SectorSize < 512)
+                return false;
+
+            byte[] sector;
+            var    anchor = new AnchorVolumeDescriptorPointer();
 
-            byte[]                        sector;
-            AnchorVolumeDescriptorPointer anchor = new AnchorVolumeDescriptorPointer();
             // All positions where anchor may reside
-            ulong[] positions   = {256, 512, partition.End - 256, partition.End};
-            bool    anchorFound = false;
+            ulong[] positions =
+            {
+                256, 512, partition.End - 256, partition.End
+            };
+
+            bool anchorFound = false;
 
             foreach(ulong position in positions.Where(position => position + partition.Start < partition.End))
             {
@@ -77,37 +84,50 @@ namespace Aaru.Filesystems
                 anchor = Marshal.ByteArrayToStructureLittleEndian<AnchorVolumeDescriptorPointer>(sector);
 
                 AaruConsole.DebugWriteLine("UDF Plugin", "anchor.tag.tagIdentifier = {0}", anchor.tag.tagIdentifier);
+
                 AaruConsole.DebugWriteLine("UDF Plugin", "anchor.tag.descriptorVersion = {0}",
-                                          anchor.tag.descriptorVersion);
+                                           anchor.tag.descriptorVersion);
+
                 AaruConsole.DebugWriteLine("UDF Plugin", "anchor.tag.tagChecksum = 0x{0:X2}", anchor.tag.tagChecksum);
-                AaruConsole.DebugWriteLine("UDF Plugin", "anchor.tag.reserved = {0}",         anchor.tag.reserved);
+                AaruConsole.DebugWriteLine("UDF Plugin", "anchor.tag.reserved = {0}", anchor.tag.reserved);
+
                 AaruConsole.DebugWriteLine("UDF Plugin", "anchor.tag.tagSerialNumber = {0}",
-                                          anchor.tag.tagSerialNumber);
+                                           anchor.tag.tagSerialNumber);
+
                 AaruConsole.DebugWriteLine("UDF Plugin", "anchor.tag.descriptorCrc = 0x{0:X4}",
-                                          anchor.tag.descriptorCrc);
+                                           anchor.tag.descriptorCrc);
+
                 AaruConsole.DebugWriteLine("UDF Plugin", "anchor.tag.descriptorCrcLength = {0}",
-                                          anchor.tag.descriptorCrcLength);
+                                           anchor.tag.descriptorCrcLength);
+
                 AaruConsole.DebugWriteLine("UDF Plugin", "anchor.tag.tagLocation = {0}", anchor.tag.tagLocation);
+
                 AaruConsole.DebugWriteLine("UDF Plugin", "anchor.mainVolumeDescriptorSequenceExtent.length = {0}",
-                                          anchor.mainVolumeDescriptorSequenceExtent.length);
+                                           anchor.mainVolumeDescriptorSequenceExtent.length);
+
                 AaruConsole.DebugWriteLine("UDF Plugin", "anchor.mainVolumeDescriptorSequenceExtent.location = {0}",
-                                          anchor.mainVolumeDescriptorSequenceExtent.location);
+                                           anchor.mainVolumeDescriptorSequenceExtent.location);
+
                 AaruConsole.DebugWriteLine("UDF Plugin", "anchor.reserveVolumeDescriptorSequenceExtent.length = {0}",
-                                          anchor.reserveVolumeDescriptorSequenceExtent.length);
+                                           anchor.reserveVolumeDescriptorSequenceExtent.length);
+
                 AaruConsole.DebugWriteLine("UDF Plugin", "anchor.reserveVolumeDescriptorSequenceExtent.location = {0}",
-                                          anchor.reserveVolumeDescriptorSequenceExtent.location);
+                                           anchor.reserveVolumeDescriptorSequenceExtent.location);
 
                 if(anchor.tag.tagIdentifier !=
                    TagIdentifier.AnchorVolumeDescriptorPointer ||
                    anchor.tag.tagLocation !=
                    position ||
-                   anchor.mainVolumeDescriptorSequenceExtent.location + partition.Start >= partition.End) continue;
+                   anchor.mainVolumeDescriptorSequenceExtent.location + partition.Start >= partition.End)
+                    continue;
 
                 anchorFound = true;
+
                 break;
             }
 
-            if(!anchorFound) return false;
+            if(!anchorFound)
+                return false;
 
             ulong count = 0;
 
@@ -115,12 +135,14 @@ namespace Aaru.Filesystems
             {
                 sector = imagePlugin.ReadSector(partition.Start + anchor.mainVolumeDescriptorSequenceExtent.location +
                                                 count);
-                TagIdentifier tagId    = (TagIdentifier)BitConverter.ToUInt16(sector, 0);
-                uint          location = BitConverter.ToUInt32(sector, 0x0C);
+
+                var  tagId    = (TagIdentifier)BitConverter.ToUInt16(sector, 0);
+                uint location = BitConverter.ToUInt32(sector, 0x0C);
 
                 if(location == partition.Start + anchor.mainVolumeDescriptorSequenceExtent.location + count)
                 {
-                    if(tagId == TagIdentifier.TerminatingDescriptor) break;
+                    if(tagId == TagIdentifier.TerminatingDescriptor)
+                        break;
 
                     if(tagId == TagIdentifier.LogicalVolumeDescriptor)
                     {
@@ -130,7 +152,8 @@ namespace Aaru.Filesystems
                         return UDF_Magic.SequenceEqual(lvd.domainIdentifier.identifier);
                     }
                 }
-                else break;
+                else
+                    break;
 
                 count++;
             }
@@ -139,19 +162,23 @@ namespace Aaru.Filesystems
         }
 
         public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding    encoding)
+                                   Encoding encoding)
         {
             // UDF is always UTF-8
             Encoding = Encoding.UTF8;
             byte[] sector;
 
-            StringBuilder sbInformation = new StringBuilder();
+            var sbInformation = new StringBuilder();
 
             sbInformation.AppendLine("Universal Disk Format");
 
-            AnchorVolumeDescriptorPointer anchor = new AnchorVolumeDescriptorPointer();
+            var anchor = new AnchorVolumeDescriptorPointer();
+
             // All positions where anchor may reside
-            ulong[] positions = {256, 512, partition.End - 256, partition.End};
+            ulong[] positions =
+            {
+                256, 512, partition.End - 256, partition.End
+            };
 
             foreach(ulong position in positions)
             {
@@ -162,39 +189,44 @@ namespace Aaru.Filesystems
                    TagIdentifier.AnchorVolumeDescriptorPointer &&
                    anchor.tag.tagLocation ==
                    position &&
-                   anchor.mainVolumeDescriptorSequenceExtent.location + partition.Start < partition.End) break;
+                   anchor.mainVolumeDescriptorSequenceExtent.location + partition.Start < partition.End)
+                    break;
             }
 
             ulong count = 0;
 
-            PrimaryVolumeDescriptor          pvd  = new PrimaryVolumeDescriptor();
-            LogicalVolumeDescriptor          lvd  = new LogicalVolumeDescriptor();
-            LogicalVolumeIntegrityDescriptor lvid = new LogicalVolumeIntegrityDescriptor();
-            LogicalVolumeIntegrityDescriptorImplementationUse lvidiu =
-                new LogicalVolumeIntegrityDescriptorImplementationUse();
+            var pvd    = new PrimaryVolumeDescriptor();
+            var lvd    = new LogicalVolumeDescriptor();
+            var lvid   = new LogicalVolumeIntegrityDescriptor();
+            var lvidiu = new LogicalVolumeIntegrityDescriptorImplementationUse();
 
             while(count < 256)
             {
                 sector = imagePlugin.ReadSector(partition.Start + anchor.mainVolumeDescriptorSequenceExtent.location +
                                                 count);
-                TagIdentifier tagId    = (TagIdentifier)BitConverter.ToUInt16(sector, 0);
-                uint          location = BitConverter.ToUInt32(sector, 0x0C);
+
+                var  tagId    = (TagIdentifier)BitConverter.ToUInt16(sector, 0);
+                uint location = BitConverter.ToUInt32(sector, 0x0C);
 
                 if(location == partition.Start + anchor.mainVolumeDescriptorSequenceExtent.location + count)
                 {
-                    if(tagId == TagIdentifier.TerminatingDescriptor) break;
+                    if(tagId == TagIdentifier.TerminatingDescriptor)
+                        break;
 
                     switch(tagId)
                     {
                         case TagIdentifier.LogicalVolumeDescriptor:
                             lvd = Marshal.ByteArrayToStructureLittleEndian<LogicalVolumeDescriptor>(sector);
+
                             break;
                         case TagIdentifier.PrimaryVolumeDescriptor:
                             pvd = Marshal.ByteArrayToStructureLittleEndian<PrimaryVolumeDescriptor>(sector);
+
                             break;
                     }
                 }
-                else break;
+                else
+                    break;
 
                 count++;
             }
@@ -207,46 +239,58 @@ namespace Aaru.Filesystems
                 lvidiu =
                     Marshal.ByteArrayToStructureLittleEndian<LogicalVolumeIntegrityDescriptorImplementationUse>(sector,
                                                                                                                 (int)
-                                                                                                                (lvid
-                                                                                                                    .numberOfPartitions *
-                                                                                                                 8 +
+                                                                                                                ((lvid.
+                                                                                                                      numberOfPartitions *
+                                                                                                                  8) +
                                                                                                                  80),
-                                                                                                                System
-                                                                                                                   .Runtime
-                                                                                                                   .InteropServices
-                                                                                                                   .Marshal
-                                                                                                                   .SizeOf(lvidiu));
-            else lvid = new LogicalVolumeIntegrityDescriptor();
+                                                                                                                System.
+                                                                                                                    Runtime.
+                                                                                                                    InteropServices.
+                                                                                                                    Marshal.
+                                                                                                                    SizeOf(lvidiu));
+            else
+                lvid = new LogicalVolumeIntegrityDescriptor();
 
             sbInformation.AppendFormat("Volume is number {0} of {1}", pvd.volumeSequenceNumber,
                                        pvd.maximumVolumeSequenceNumber).AppendLine();
+
             sbInformation.AppendFormat("Volume set identifier: {0}",
                                        StringHandlers.DecompressUnicode(pvd.volumeSetIdentifier)).AppendLine();
-            sbInformation
-               .AppendFormat("Volume name: {0}", StringHandlers.DecompressUnicode(lvd.logicalVolumeIdentifier))
-               .AppendLine();
+
+            sbInformation.
+                AppendFormat("Volume name: {0}", StringHandlers.DecompressUnicode(lvd.logicalVolumeIdentifier)).
+                AppendLine();
+
             sbInformation.AppendFormat("Volume uses {0} bytes per block", lvd.logicalBlockSize).AppendLine();
-            sbInformation.AppendFormat("Volume was las written in {0}", EcmaToDateTime(lvid.recordingDateTime))
-                         .AppendLine();
+
+            sbInformation.AppendFormat("Volume was las written in {0}", EcmaToDateTime(lvid.recordingDateTime)).
+                          AppendLine();
+
             sbInformation.AppendFormat("Volume contains {0} partitions", lvid.numberOfPartitions).AppendLine();
-            sbInformation
-               .AppendFormat("Volume contains {0} files and {1} directories", lvidiu.files, lvidiu.directories)
-               .AppendLine();
+
+            sbInformation.
+                AppendFormat("Volume contains {0} files and {1} directories", lvidiu.files, lvidiu.directories).
+                AppendLine();
+
             sbInformation.AppendFormat("Volume conforms to {0}",
-                                       Encoding.GetString(lvd.domainIdentifier.identifier).TrimEnd('\u0000'))
-                         .AppendLine();
+                                       Encoding.GetString(lvd.domainIdentifier.identifier).TrimEnd('\u0000')).
+                          AppendLine();
+
             sbInformation.AppendFormat("Volume was last written by: {0}",
-                                       Encoding.GetString(pvd.implementationIdentifier.identifier).TrimEnd('\u0000'))
-                         .AppendLine();
+                                       Encoding.GetString(pvd.implementationIdentifier.identifier).TrimEnd('\u0000')).
+                          AppendLine();
+
             sbInformation.AppendFormat("Volume requires UDF version {0}.{1:X2} to be read",
                                        Convert.ToInt32($"{(lvidiu.minimumReadUDF & 0xFF00) >> 8}", 10),
-                                       Convert.ToInt32($"{lvidiu.minimumReadUDF & 0xFF}",          10)).AppendLine();
+                                       Convert.ToInt32($"{lvidiu.minimumReadUDF & 0xFF}", 10)).AppendLine();
+
             sbInformation.AppendFormat("Volume requires UDF version {0}.{1:X2} to be written to",
                                        Convert.ToInt32($"{(lvidiu.minimumWriteUDF & 0xFF00) >> 8}", 10),
-                                       Convert.ToInt32($"{lvidiu.minimumWriteUDF & 0xFF}",          10)).AppendLine();
+                                       Convert.ToInt32($"{lvidiu.minimumWriteUDF & 0xFF}", 10)).AppendLine();
+
             sbInformation.AppendFormat("Volume cannot be written by any UDF version higher than {0}.{1:X2}",
                                        Convert.ToInt32($"{(lvidiu.maximumWriteUDF & 0xFF00) >> 8}", 10),
-                                       Convert.ToInt32($"{lvidiu.maximumWriteUDF & 0xFF}",          10)).AppendLine();
+                                       Convert.ToInt32($"{lvidiu.maximumWriteUDF & 0xFF}", 10)).AppendLine();
 
             XmlFsType = new FileSystemType
             {
@@ -256,47 +300,47 @@ namespace Aaru.Filesystems
                     Encoding.GetString(pvd.implementationIdentifier.identifier).TrimEnd('\u0000'),
                 ClusterSize               = lvd.logicalBlockSize,
                 ModificationDate          = EcmaToDateTime(lvid.recordingDateTime),
-                ModificationDateSpecified = true,
-                Files                     = lvidiu.files,
+                ModificationDateSpecified = true, Files = lvidiu.files,
                 FilesSpecified            = true,
                 VolumeName                = StringHandlers.DecompressUnicode(lvd.logicalVolumeIdentifier),
                 VolumeSetIdentifier       = StringHandlers.DecompressUnicode(pvd.volumeSetIdentifier),
                 SystemIdentifier =
                     Encoding.GetString(pvd.implementationIdentifier.identifier).TrimEnd('\u0000')
             };
-            XmlFsType.Clusters = (partition.End - partition.Start + 1) * imagePlugin.Info.SectorSize /
+
+            XmlFsType.Clusters = (((partition.End - partition.Start) + 1) * imagePlugin.Info.SectorSize) /
                                  XmlFsType.ClusterSize;
 
             information = sbInformation.ToString();
         }
 
-        static DateTime EcmaToDateTime(Timestamp timestamp) =>
-            DateHandlers.EcmaToDateTime(timestamp.typeAndZone, timestamp.year, timestamp.month, timestamp.day,
-                                        timestamp.hour, timestamp.minute, timestamp.second, timestamp.centiseconds,
-                                        timestamp.hundredsMicroseconds, timestamp.microseconds);
+        static DateTime EcmaToDateTime(Timestamp timestamp) => DateHandlers.EcmaToDateTime(timestamp.typeAndZone,
+                                                                                           timestamp.year,
+                                                                                           timestamp.month,
+                                                                                           timestamp.day,
+                                                                                           timestamp.hour,
+                                                                                           timestamp.minute,
+                                                                                           timestamp.second,
+                                                                                           timestamp.centiseconds,
+                                                                                           timestamp.
+                                                                                               hundredsMicroseconds,
+                                                                                           timestamp.microseconds);
 
         [Flags]
         enum EntityFlags : byte
         {
-            Dirty     = 0x01,
-            Protected = 0x02
+            Dirty = 0x01, Protected = 0x02
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct EntityIdentifier
         {
-            /// <summary>
-            ///     Entity flags
-            /// </summary>
+            /// <summary>Entity flags</summary>
             public readonly EntityFlags flags;
-            /// <summary>
-            ///     Structure identifier
-            /// </summary>
+            /// <summary>Structure identifier</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 23)]
             public readonly byte[] identifier;
-            /// <summary>
-            ///     Structure data
-            /// </summary>
+            /// <summary>Structure data</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
             public readonly byte[] identifierSuffix;
         }
@@ -318,14 +362,11 @@ namespace Aaru.Filesystems
 
         enum TagIdentifier : ushort
         {
-            PrimaryVolumeDescriptor           = 1,
-            AnchorVolumeDescriptorPointer     = 2,
+            PrimaryVolumeDescriptor           = 1, AnchorVolumeDescriptorPointer = 2,
             VolumeDescriptorPointer           = 3,
-            ImplementationUseVolumeDescriptor = 4,
-            PartitionDescriptor               = 5,
+            ImplementationUseVolumeDescriptor = 4, PartitionDescriptor = 5,
             LogicalVolumeDescriptor           = 6,
-            UnallocatedSpaceDescriptor        = 7,
-            TerminatingDescriptor             = 8,
+            UnallocatedSpaceDescriptor        = 7, TerminatingDescriptor = 8,
             LogicalVolumeIntegrityDescriptor  = 9
         }
 
@@ -429,6 +470,7 @@ namespace Aaru.Filesystems
             public readonly byte[] logicalVolumeContentsUse;
             public readonly uint numberOfPartitions;
             public readonly uint lengthOfImplementationUse;
+
             // Follows uint[numberOfPartitions] freeSpaceTable;
             // Follows uint[numberOfPartitions] sizeTable;
             // Follows byte[lengthOfImplementationUse] implementationUse;
diff --git a/Aaru.Filesystems/UNICOS.cs b/Aaru.Filesystems/UNICOS.cs
index f74632bb0..edf9d6efc 100644
--- a/Aaru.Filesystems/UNICOS.cs
+++ b/Aaru.Filesystems/UNICOS.cs
@@ -38,6 +38,7 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
 using Schemas;
+
 // UNICOS is ILP64 so let's think everything is 64-bit
 using blkno_t = System.Int64;
 using daddr_t = System.Int64;
@@ -65,43 +66,58 @@ namespace Aaru.Filesystems
 
         public bool Identify(IMediaImage imagePlugin, Partition partition)
         {
-            if(imagePlugin.Info.SectorSize < 512) return false;
+            if(imagePlugin.Info.SectorSize < 512)
+                return false;
 
             uint sbSize = (uint)(Marshal.SizeOf<UNICOS_Superblock>() / imagePlugin.Info.SectorSize);
-            if(Marshal.SizeOf<UNICOS_Superblock>() % imagePlugin.Info.SectorSize != 0) sbSize++;
+
+            if(Marshal.SizeOf<UNICOS_Superblock>() % imagePlugin.Info.SectorSize != 0)
+                sbSize++;
 
             byte[] sector = imagePlugin.ReadSectors(partition.Start, sbSize);
-            if(sector.Length < Marshal.SizeOf<UNICOS_Superblock>()) return false;
+
+            if(sector.Length < Marshal.SizeOf<UNICOS_Superblock>())
+                return false;
 
             UNICOS_Superblock unicosSb = Marshal.ByteArrayToStructureBigEndian<UNICOS_Superblock>(sector);
 
             AaruConsole.DebugWriteLine("UNICOS plugin", "magic = 0x{0:X16} (expected 0x{1:X16})", unicosSb.s_magic,
-                                      UNICOS_MAGIC);
+                                       UNICOS_MAGIC);
 
             return unicosSb.s_magic == UNICOS_MAGIC;
         }
 
         public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding    encoding)
+                                   Encoding encoding)
         {
             Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-15");
             information = "";
-            if(imagePlugin.Info.SectorSize < 512) return;
+
+            if(imagePlugin.Info.SectorSize < 512)
+                return;
 
             uint sbSize = (uint)(Marshal.SizeOf<UNICOS_Superblock>() / imagePlugin.Info.SectorSize);
-            if(Marshal.SizeOf<UNICOS_Superblock>() % imagePlugin.Info.SectorSize != 0) sbSize++;
+
+            if(Marshal.SizeOf<UNICOS_Superblock>() % imagePlugin.Info.SectorSize != 0)
+                sbSize++;
 
             byte[] sector = imagePlugin.ReadSectors(partition.Start, sbSize);
-            if(sector.Length < Marshal.SizeOf<UNICOS_Superblock>()) return;
+
+            if(sector.Length < Marshal.SizeOf<UNICOS_Superblock>())
+                return;
 
             UNICOS_Superblock unicosSb = Marshal.ByteArrayToStructureBigEndian<UNICOS_Superblock>(sector);
 
-            if(unicosSb.s_magic != UNICOS_MAGIC) return;
+            if(unicosSb.s_magic != UNICOS_MAGIC)
+                return;
 
-            StringBuilder sb = new StringBuilder();
+            var sb = new StringBuilder();
 
             sb.AppendLine("UNICOS filesystem");
-            if(unicosSb.s_secure == UNICOS_SECURE) sb.AppendLine("Volume is secure");
+
+            if(unicosSb.s_secure == UNICOS_SECURE)
+                sb.AppendLine("Volume is secure");
+
             sb.AppendFormat("Volume contains {0} partitions", unicosSb.s_npart).AppendLine();
             sb.AppendFormat("{0} bytes per sector", unicosSb.s_iounit).AppendLine();
             sb.AppendLine("4096 bytes per block");
@@ -109,26 +125,25 @@ namespace Aaru.Filesystems
             sb.AppendFormat("Root resides on inode {0}", unicosSb.s_root).AppendLine();
             sb.AppendFormat("{0} inodes in volume", unicosSb.s_isize).AppendLine();
             sb.AppendFormat("Volume last updated on {0}", DateHandlers.UnixToDateTime(unicosSb.s_time)).AppendLine();
+
             if(unicosSb.s_error > 0)
                 sb.AppendFormat("Volume is dirty, error code = 0x{0:X16}", unicosSb.s_error).AppendLine();
+
             sb.AppendFormat("Volume name: {0}", StringHandlers.CToString(unicosSb.s_fname, Encoding)).AppendLine();
 
             information = sb.ToString();
 
             XmlFsType = new FileSystemType
             {
-                Type                      = "UNICOS filesystem",
-                ClusterSize               = 4096,
-                Clusters                  = (ulong)unicosSb.s_fsize,
-                VolumeName                = StringHandlers.CToString(unicosSb.s_fname, Encoding),
-                ModificationDate          = DateHandlers.UnixToDateTime(unicosSb.s_time),
-                ModificationDateSpecified = true
+                Type             = "UNICOS filesystem", ClusterSize = 4096, Clusters = (ulong)unicosSb.s_fsize,
+                VolumeName       = StringHandlers.CToString(unicosSb.s_fname, Encoding),
+                ModificationDate = DateHandlers.UnixToDateTime(unicosSb.s_time), ModificationDateSpecified = true
             };
+
             XmlFsType.Dirty |= unicosSb.s_error > 0;
         }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        [SuppressMessage("ReSharper", "InconsistentNaming")]
+        [StructLayout(LayoutKind.Sequential, Pack = 1), SuppressMessage("ReSharper", "InconsistentNaming")]
         struct nc1ireg_sb
         {
             public readonly ushort i_unused; /* reserved */
@@ -136,8 +151,7 @@ namespace Aaru.Filesystems
             public readonly uint   i_sblk;   /* start block number */
         }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        [SuppressMessage("ReSharper", "InconsistentNaming")]
+        [StructLayout(LayoutKind.Sequential, Pack = 1), SuppressMessage("ReSharper", "InconsistentNaming")]
         struct nc1fdev_sb
         {
             public readonly long fd_name; /* Physical device name */
@@ -147,9 +161,8 @@ namespace Aaru.Filesystems
             public readonly nc1ireg_sb[] fd_ireg; /* Inode regions */
         }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        [SuppressMessage("ReSharper", "InconsistentNaming")]
-        [SuppressMessage("ReSharper", "BuiltInTypeReferenceStyle")]
+        [StructLayout(LayoutKind.Sequential, Pack = 1), SuppressMessage("ReSharper", "InconsistentNaming"),
+         SuppressMessage("ReSharper", "BuiltInTypeReferenceStyle")]
         struct UNICOS_Superblock
         {
             public readonly ulong s_magic; /* magic number to indicate file system type */
diff --git a/Aaru.Filesystems/UNIXBFS.cs b/Aaru.Filesystems/UNIXBFS.cs
index 1b38433d1..6f9ada2eb 100644
--- a/Aaru.Filesystems/UNIXBFS.cs
+++ b/Aaru.Filesystems/UNIXBFS.cs
@@ -52,7 +52,8 @@ namespace Aaru.Filesystems
 
         public bool Identify(IMediaImage imagePlugin, Partition partition)
         {
-            if(2 + partition.Start >= partition.End) return false;
+            if(2 + partition.Start >= partition.End)
+                return false;
 
             uint magic = BitConverter.ToUInt32(imagePlugin.ReadSector(0 + partition.Start), 0);
 
@@ -60,23 +61,20 @@ namespace Aaru.Filesystems
         }
 
         public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding    encoding)
+                                   Encoding encoding)
         {
             Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-15");
             information = "";
 
-            StringBuilder sb          = new StringBuilder();
-            byte[]        bfsSbSector = imagePlugin.ReadSector(0 + partition.Start);
-            byte[]        sbStrings   = new byte[6];
+            var    sb          = new StringBuilder();
+            byte[] bfsSbSector = imagePlugin.ReadSector(0 + partition.Start);
+            byte[] sbStrings   = new byte[6];
 
-            BFSSuperBlock bfsSb = new BFSSuperBlock
+            var bfsSb = new BFSSuperBlock
             {
-                s_magic = BitConverter.ToUInt32(bfsSbSector, 0x00),
-                s_start = BitConverter.ToUInt32(bfsSbSector, 0x04),
-                s_end   = BitConverter.ToUInt32(bfsSbSector, 0x08),
-                s_from  = BitConverter.ToUInt32(bfsSbSector, 0x0C),
-                s_to    = BitConverter.ToUInt32(bfsSbSector, 0x10),
-                s_bfrom = BitConverter.ToInt32(bfsSbSector, 0x14),
+                s_magic = BitConverter.ToUInt32(bfsSbSector, 0x00), s_start = BitConverter.ToUInt32(bfsSbSector, 0x04),
+                s_end   = BitConverter.ToUInt32(bfsSbSector, 0x08), s_from  = BitConverter.ToUInt32(bfsSbSector, 0x0C),
+                s_to    = BitConverter.ToUInt32(bfsSbSector, 0x10), s_bfrom = BitConverter.ToInt32(bfsSbSector, 0x14),
                 s_bto   = BitConverter.ToInt32(bfsSbSector, 0x18)
             };
 
@@ -87,26 +85,26 @@ namespace Aaru.Filesystems
 
             AaruConsole.DebugWriteLine("BFS plugin", "bfs_sb.s_magic: 0x{0:X8}", bfsSb.s_magic);
             AaruConsole.DebugWriteLine("BFS plugin", "bfs_sb.s_start: 0x{0:X8}", bfsSb.s_start);
-            AaruConsole.DebugWriteLine("BFS plugin", "bfs_sb.s_end: 0x{0:X8}",   bfsSb.s_end);
-            AaruConsole.DebugWriteLine("BFS plugin", "bfs_sb.s_from: 0x{0:X8}",  bfsSb.s_from);
-            AaruConsole.DebugWriteLine("BFS plugin", "bfs_sb.s_to: 0x{0:X8}",    bfsSb.s_to);
+            AaruConsole.DebugWriteLine("BFS plugin", "bfs_sb.s_end: 0x{0:X8}", bfsSb.s_end);
+            AaruConsole.DebugWriteLine("BFS plugin", "bfs_sb.s_from: 0x{0:X8}", bfsSb.s_from);
+            AaruConsole.DebugWriteLine("BFS plugin", "bfs_sb.s_to: 0x{0:X8}", bfsSb.s_to);
             AaruConsole.DebugWriteLine("BFS plugin", "bfs_sb.s_bfrom: 0x{0:X8}", bfsSb.s_bfrom);
-            AaruConsole.DebugWriteLine("BFS plugin", "bfs_sb.s_bto: 0x{0:X8}",   bfsSb.s_bto);
-            AaruConsole.DebugWriteLine("BFS plugin", "bfs_sb.s_fsname: 0x{0}",   bfsSb.s_fsname);
-            AaruConsole.DebugWriteLine("BFS plugin", "bfs_sb.s_volume: 0x{0}",   bfsSb.s_volume);
+            AaruConsole.DebugWriteLine("BFS plugin", "bfs_sb.s_bto: 0x{0:X8}", bfsSb.s_bto);
+            AaruConsole.DebugWriteLine("BFS plugin", "bfs_sb.s_fsname: 0x{0}", bfsSb.s_fsname);
+            AaruConsole.DebugWriteLine("BFS plugin", "bfs_sb.s_volume: 0x{0}", bfsSb.s_volume);
 
             sb.AppendLine("UNIX Boot filesystem");
+
             sb.AppendFormat("Volume goes from byte {0} to byte {1}, for {2} bytes", bfsSb.s_start, bfsSb.s_end,
                             bfsSb.s_end - bfsSb.s_start).AppendLine();
+
             sb.AppendFormat("Filesystem name: {0}", bfsSb.s_fsname).AppendLine();
             sb.AppendFormat("Volume name: {0}", bfsSb.s_volume).AppendLine();
 
             XmlFsType = new FileSystemType
             {
-                Type        = "BFS",
-                VolumeName  = bfsSb.s_volume,
-                ClusterSize = imagePlugin.Info.SectorSize,
-                Clusters    = partition.End - partition.Start + 1
+                Type     = "BFS", VolumeName = bfsSb.s_volume, ClusterSize = imagePlugin.Info.SectorSize,
+                Clusters = (partition.End - partition.Start) + 1
             };
 
             information = sb.ToString();
diff --git a/Aaru.Filesystems/VMfs.cs b/Aaru.Filesystems/VMfs.cs
index 9544a48a1..2fcd6a6a7 100644
--- a/Aaru.Filesystems/VMfs.cs
+++ b/Aaru.Filesystems/VMfs.cs
@@ -42,9 +42,7 @@ namespace Aaru.Filesystems
 {
     public class VMfs : IFilesystem
     {
-        /// <summary>
-        ///     Identifier for VMfs
-        /// </summary>
+        /// <summary>Identifier for VMfs</summary>
         const uint VMFS_MAGIC = 0xC001D00D;
         const uint VMFS_BASE = 0x00100000;
 
@@ -56,11 +54,13 @@ namespace Aaru.Filesystems
 
         public bool Identify(IMediaImage imagePlugin, Partition partition)
         {
-            if(partition.Start >= partition.End) return false;
+            if(partition.Start >= partition.End)
+                return false;
 
             ulong vmfsSuperOff = VMFS_BASE / imagePlugin.Info.SectorSize;
 
-            if(partition.Start + vmfsSuperOff > partition.End) return false;
+            if(partition.Start + vmfsSuperOff > partition.End)
+                return false;
 
             byte[] sector = imagePlugin.ReadSector(partition.Start + vmfsSuperOff);
 
@@ -70,7 +70,7 @@ namespace Aaru.Filesystems
         }
 
         public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding    encoding)
+                                   Encoding encoding)
         {
             Encoding = encoding ?? Encoding.UTF8;
             ulong  vmfsSuperOff = VMFS_BASE / imagePlugin.Info.SectorSize;
@@ -78,7 +78,7 @@ namespace Aaru.Filesystems
 
             VolumeInfo volInfo = Marshal.ByteArrayToStructureLittleEndian<VolumeInfo>(sector);
 
-            StringBuilder sbInformation = new StringBuilder();
+            var sbInformation = new StringBuilder();
 
             sbInformation.AppendLine("VMware file system");
 
@@ -88,13 +88,17 @@ namespace Aaru.Filesystems
             uint mtimeNanoSecs = (uint)(volInfo.mtime % 1000000);
 
             sbInformation.AppendFormat("Volume version {0}", volInfo.version).AppendLine();
-            sbInformation.AppendFormat("Volume name {0}", StringHandlers.CToString(volInfo.name, Encoding))
-                         .AppendLine();
+
+            sbInformation.AppendFormat("Volume name {0}", StringHandlers.CToString(volInfo.name, Encoding)).
+                          AppendLine();
+
             sbInformation.AppendFormat("Volume size {0} bytes", volInfo.size * 256).AppendLine();
             sbInformation.AppendFormat("Volume UUID {0}", volInfo.uuid).AppendLine();
-            sbInformation
-               .AppendFormat("Volume created on {0}", DateHandlers.UnixUnsignedToDateTime(ctimeSecs, ctimeNanoSecs))
-               .AppendLine();
+
+            sbInformation.
+                AppendFormat("Volume created on {0}", DateHandlers.UnixUnsignedToDateTime(ctimeSecs, ctimeNanoSecs)).
+                AppendLine();
+
             sbInformation.AppendFormat("Volume last modified on {0}",
                                        DateHandlers.UnixUnsignedToDateTime(mtimeSecs, mtimeNanoSecs)).AppendLine();
 
@@ -107,17 +111,15 @@ namespace Aaru.Filesystems
                 CreationDateSpecified     = true,
                 ModificationDate          = DateHandlers.UnixUnsignedToDateTime(mtimeSecs, mtimeNanoSecs),
                 ModificationDateSpecified = true,
-                Clusters                  = volInfo.size * 256 / imagePlugin.Info.SectorSize,
-                ClusterSize               = imagePlugin.Info.SectorSize,
-                VolumeSerial              = volInfo.uuid.ToString()
+                Clusters                  = (volInfo.size * 256) / imagePlugin.Info.SectorSize,
+                ClusterSize               = imagePlugin.Info.SectorSize, VolumeSerial = volInfo.uuid.ToString()
             };
         }
 
         [Flags]
         enum VMfsFlags : byte
         {
-            RecyledFolder = 64,
-            CaseSensitive = 128
+            RecyledFolder = 64, CaseSensitive = 128
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
diff --git a/Aaru.Filesystems/VxFS.cs b/Aaru.Filesystems/VxFS.cs
index ae13d39ed..657b0dcea 100644
--- a/Aaru.Filesystems/VxFS.cs
+++ b/Aaru.Filesystems/VxFS.cs
@@ -42,9 +42,7 @@ namespace Aaru.Filesystems
 {
     public class VxFS : IFilesystem
     {
-        /// <summary>
-        ///     Identifier for VxFS
-        /// </summary>
+        /// <summary>Identifier for VxFS</summary>
         const uint VXFS_MAGIC = 0xA501FCF5;
         const uint VXFS_BASE = 0x400;
 
@@ -58,7 +56,8 @@ namespace Aaru.Filesystems
         {
             ulong vmfsSuperOff = VXFS_BASE / imagePlugin.Info.SectorSize;
 
-            if(partition.Start + vmfsSuperOff >= partition.End) return false;
+            if(partition.Start + vmfsSuperOff >= partition.End)
+                return false;
 
             byte[] sector = imagePlugin.ReadSector(partition.Start + vmfsSuperOff);
 
@@ -68,7 +67,7 @@ namespace Aaru.Filesystems
         }
 
         public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding    encoding)
+                                   Encoding encoding)
         {
             Encoding = encoding ?? Encoding.UTF8;
             ulong  vmfsSuperOff = VXFS_BASE / imagePlugin.Info.SectorSize;
@@ -76,23 +75,30 @@ namespace Aaru.Filesystems
 
             VxSuperBlock vxSb = Marshal.ByteArrayToStructureLittleEndian<VxSuperBlock>(sector);
 
-            StringBuilder sbInformation = new StringBuilder();
+            var sbInformation = new StringBuilder();
 
             sbInformation.AppendLine("Veritas file system");
 
             sbInformation.AppendFormat("Volume version {0}", vxSb.vs_version).AppendLine();
-            sbInformation.AppendFormat("Volume name {0}", StringHandlers.CToString(vxSb.vs_fname, Encoding))
-                         .AppendLine();
-            sbInformation.AppendFormat("Volume has {0} blocks of {1} bytes each", vxSb.vs_bsize, vxSb.vs_size)
-                         .AppendLine();
+
+            sbInformation.AppendFormat("Volume name {0}", StringHandlers.CToString(vxSb.vs_fname, Encoding)).
+                          AppendLine();
+
+            sbInformation.AppendFormat("Volume has {0} blocks of {1} bytes each", vxSb.vs_bsize, vxSb.vs_size).
+                          AppendLine();
+
             sbInformation.AppendFormat("Volume has {0} inodes per block", vxSb.vs_inopb).AppendLine();
             sbInformation.AppendFormat("Volume has {0} free inodes", vxSb.vs_ifree).AppendLine();
             sbInformation.AppendFormat("Volume has {0} free blocks", vxSb.vs_free).AppendLine();
+
             sbInformation.AppendFormat("Volume created on {0}",
                                        DateHandlers.UnixUnsignedToDateTime(vxSb.vs_ctime, vxSb.vs_cutime)).AppendLine();
+
             sbInformation.AppendFormat("Volume last modified on {0}",
                                        DateHandlers.UnixUnsignedToDateTime(vxSb.vs_wtime, vxSb.vs_wutime)).AppendLine();
-            if(vxSb.vs_clean != 0) sbInformation.AppendLine("Volume is dirty");
+
+            if(vxSb.vs_clean != 0)
+                sbInformation.AppendLine("Volume is dirty");
 
             information = sbInformation.ToString();
 
@@ -102,11 +108,9 @@ namespace Aaru.Filesystems
                 CreationDate              = DateHandlers.UnixUnsignedToDateTime(vxSb.vs_ctime, vxSb.vs_cutime),
                 CreationDateSpecified     = true,
                 ModificationDate          = DateHandlers.UnixUnsignedToDateTime(vxSb.vs_wtime, vxSb.vs_wutime),
-                ModificationDateSpecified = true,
-                Clusters                  = (ulong)vxSb.vs_size,
+                ModificationDateSpecified = true, Clusters = (ulong)vxSb.vs_size,
                 ClusterSize               = (uint)vxSb.vs_bsize,
-                Dirty                     = vxSb.vs_clean != 0,
-                FreeClusters              = (ulong)vxSb.vs_free,
+                Dirty                     = vxSb.vs_clean != 0, FreeClusters = (ulong)vxSb.vs_free,
                 FreeClustersSpecified     = true
             };
         }
diff --git a/Aaru.Filesystems/XFS.cs b/Aaru.Filesystems/XFS.cs
index 4978f89c3..5a14d382e 100644
--- a/Aaru.Filesystems/XFS.cs
+++ b/Aaru.Filesystems/XFS.cs
@@ -54,106 +54,142 @@ namespace Aaru.Filesystems
 
         public bool Identify(IMediaImage imagePlugin, Partition partition)
         {
-            if(imagePlugin.Info.SectorSize < 512) return false;
+            if(imagePlugin.Info.SectorSize < 512)
+                return false;
 
             // Misaligned
             if(imagePlugin.Info.XmlMediaType == XmlMediaType.OpticalDisc)
             {
                 uint sbSize = (uint)((Marshal.SizeOf<XFS_Superblock>() + 0x400) / imagePlugin.Info.SectorSize);
-                if((Marshal.SizeOf<XFS_Superblock>() + 0x400) % imagePlugin.Info.SectorSize != 0) sbSize++;
+
+                if((Marshal.SizeOf<XFS_Superblock>() + 0x400) % imagePlugin.Info.SectorSize != 0)
+                    sbSize++;
 
                 byte[] sector = imagePlugin.ReadSectors(partition.Start, sbSize);
-                if(sector.Length < Marshal.SizeOf<XFS_Superblock>()) return false;
+
+                if(sector.Length < Marshal.SizeOf<XFS_Superblock>())
+                    return false;
 
                 byte[] sbpiece = new byte[Marshal.SizeOf<XFS_Superblock>()];
 
-                foreach(int location in new[] {0, 0x200, 0x400})
+                foreach(int location in new[]
+                {
+                    0, 0x200, 0x400
+                })
                 {
                     Array.Copy(sector, location, sbpiece, 0, Marshal.SizeOf<XFS_Superblock>());
 
                     XFS_Superblock xfsSb = Marshal.ByteArrayToStructureBigEndian<XFS_Superblock>(sbpiece);
 
                     AaruConsole.DebugWriteLine("XFS plugin", "magic at 0x{0:X3} = 0x{1:X8} (expected 0x{2:X8})",
-                                              location, xfsSb.magicnum, XFS_MAGIC);
+                                               location, xfsSb.magicnum, XFS_MAGIC);
 
-                    if(xfsSb.magicnum == XFS_MAGIC) return true;
+                    if(xfsSb.magicnum == XFS_MAGIC)
+                        return true;
                 }
             }
             else
-                foreach(int i in new[] {0, 1, 2})
+                foreach(int i in new[]
+                {
+                    0, 1, 2
+                })
                 {
                     ulong location = (ulong)i;
 
                     uint sbSize = (uint)(Marshal.SizeOf<XFS_Superblock>() / imagePlugin.Info.SectorSize);
-                    if(Marshal.SizeOf<XFS_Superblock>() % imagePlugin.Info.SectorSize != 0) sbSize++;
+
+                    if(Marshal.SizeOf<XFS_Superblock>() % imagePlugin.Info.SectorSize != 0)
+                        sbSize++;
 
                     byte[] sector = imagePlugin.ReadSectors(partition.Start + location, sbSize);
-                    if(sector.Length < Marshal.SizeOf<XFS_Superblock>()) return false;
+
+                    if(sector.Length < Marshal.SizeOf<XFS_Superblock>())
+                        return false;
 
                     XFS_Superblock xfsSb = Marshal.ByteArrayToStructureBigEndian<XFS_Superblock>(sector);
 
                     AaruConsole.DebugWriteLine("XFS plugin", "magic at {0} = 0x{1:X8} (expected 0x{2:X8})", location,
-                                              xfsSb.magicnum, XFS_MAGIC);
+                                               xfsSb.magicnum, XFS_MAGIC);
 
-                    if(xfsSb.magicnum == XFS_MAGIC) return true;
+                    if(xfsSb.magicnum == XFS_MAGIC)
+                        return true;
                 }
 
             return false;
         }
 
         public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding    encoding)
+                                   Encoding encoding)
         {
             Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-15");
             information = "";
-            if(imagePlugin.Info.SectorSize < 512) return;
 
-            XFS_Superblock xfsSb = new XFS_Superblock();
+            if(imagePlugin.Info.SectorSize < 512)
+                return;
+
+            var xfsSb = new XFS_Superblock();
 
             // Misaligned
             if(imagePlugin.Info.XmlMediaType == XmlMediaType.OpticalDisc)
             {
                 uint sbSize = (uint)((Marshal.SizeOf<XFS_Superblock>() + 0x400) / imagePlugin.Info.SectorSize);
-                if((Marshal.SizeOf<XFS_Superblock>() + 0x400) % imagePlugin.Info.SectorSize != 0) sbSize++;
+
+                if((Marshal.SizeOf<XFS_Superblock>() + 0x400) % imagePlugin.Info.SectorSize != 0)
+                    sbSize++;
 
                 byte[] sector = imagePlugin.ReadSectors(partition.Start, sbSize);
-                if(sector.Length < Marshal.SizeOf<XFS_Superblock>()) return;
+
+                if(sector.Length < Marshal.SizeOf<XFS_Superblock>())
+                    return;
 
                 byte[] sbpiece = new byte[Marshal.SizeOf<XFS_Superblock>()];
 
-                foreach(int location in new[] {0, 0x200, 0x400})
+                foreach(int location in new[]
+                {
+                    0, 0x200, 0x400
+                })
                 {
                     Array.Copy(sector, location, sbpiece, 0, Marshal.SizeOf<XFS_Superblock>());
 
                     xfsSb = Marshal.ByteArrayToStructureBigEndian<XFS_Superblock>(sbpiece);
 
                     AaruConsole.DebugWriteLine("XFS plugin", "magic at 0x{0:X3} = 0x{1:X8} (expected 0x{2:X8})",
-                                              location, xfsSb.magicnum, XFS_MAGIC);
+                                               location, xfsSb.magicnum, XFS_MAGIC);
 
-                    if(xfsSb.magicnum == XFS_MAGIC) break;
+                    if(xfsSb.magicnum == XFS_MAGIC)
+                        break;
                 }
             }
             else
-                foreach(int i in new[] {0, 1, 2})
+                foreach(int i in new[]
+                {
+                    0, 1, 2
+                })
                 {
                     ulong location = (ulong)i;
                     uint  sbSize   = (uint)(Marshal.SizeOf<XFS_Superblock>() / imagePlugin.Info.SectorSize);
-                    if(Marshal.SizeOf<XFS_Superblock>() % imagePlugin.Info.SectorSize != 0) sbSize++;
+
+                    if(Marshal.SizeOf<XFS_Superblock>() % imagePlugin.Info.SectorSize != 0)
+                        sbSize++;
 
                     byte[] sector = imagePlugin.ReadSectors(partition.Start + location, sbSize);
-                    if(sector.Length < Marshal.SizeOf<XFS_Superblock>()) return;
+
+                    if(sector.Length < Marshal.SizeOf<XFS_Superblock>())
+                        return;
 
                     xfsSb = Marshal.ByteArrayToStructureBigEndian<XFS_Superblock>(sector);
 
                     AaruConsole.DebugWriteLine("XFS plugin", "magic at {0} = 0x{1:X8} (expected 0x{2:X8})", location,
-                                              xfsSb.magicnum, XFS_MAGIC);
+                                               xfsSb.magicnum, XFS_MAGIC);
 
-                    if(xfsSb.magicnum == XFS_MAGIC) break;
+                    if(xfsSb.magicnum == XFS_MAGIC)
+                        break;
                 }
 
-            if(xfsSb.magicnum != XFS_MAGIC) return;
+            if(xfsSb.magicnum != XFS_MAGIC)
+                return;
 
-            StringBuilder sb = new StringBuilder();
+            var sb = new StringBuilder();
 
             sb.AppendLine("XFS filesystem");
             sb.AppendFormat("Filesystem version {0}", xfsSb.version & 0xF).AppendLine();
@@ -164,7 +200,10 @@ namespace Aaru.Filesystems
             sb.AppendFormat("{0} blocks per allocation group", xfsSb.agblocks).AppendLine();
             sb.AppendFormat("{0} allocation groups in volume", xfsSb.agcount).AppendLine();
             sb.AppendFormat("{0} inodes in volume, {1} free", xfsSb.icount, xfsSb.ifree).AppendLine();
-            if(xfsSb.inprogress > 0) sb.AppendLine("fsck in progress");
+
+            if(xfsSb.inprogress > 0)
+                sb.AppendLine("fsck in progress");
+
             sb.AppendFormat("Volume name: {0}", StringHandlers.CToString(xfsSb.fname, Encoding)).AppendLine();
             sb.AppendFormat("Volume UUID: {0}", xfsSb.uuid).AppendLine();
 
@@ -172,16 +211,12 @@ namespace Aaru.Filesystems
 
             XmlFsType = new FileSystemType
             {
-                Type                  = "XFS filesystem",
-                ClusterSize           = xfsSb.blocksize,
-                Clusters              = xfsSb.dblocks,
-                FreeClusters          = xfsSb.fdblocks,
-                FreeClustersSpecified = true,
-                Files                 = xfsSb.icount - xfsSb.ifree,
-                FilesSpecified        = true,
-                Dirty                 = xfsSb.inprogress > 0,
-                VolumeName            = StringHandlers.CToString(xfsSb.fname, Encoding),
-                VolumeSerial          = xfsSb.uuid.ToString()
+                Type           = "XFS filesystem", ClusterSize = xfsSb.blocksize,
+                Clusters       = xfsSb.dblocks,
+                FreeClusters   = xfsSb.fdblocks, FreeClustersSpecified = true,
+                Files          = xfsSb.icount - xfsSb.ifree,
+                FilesSpecified = true, Dirty                                                   = xfsSb.inprogress > 0,
+                VolumeName     = StringHandlers.CToString(xfsSb.fname, Encoding), VolumeSerial = xfsSb.uuid.ToString()
             };
         }
 
@@ -239,6 +274,7 @@ namespace Aaru.Filesystems
             public readonly uint   features_ro_compat;
             public readonly uint   features_incompat;
             public readonly uint   features_log_incompat;
+
             // This field is little-endian while rest of superblock is big-endian
             public readonly uint  crc;
             public readonly uint  spino_align;
diff --git a/Aaru.Filesystems/Xia.cs b/Aaru.Filesystems/Xia.cs
index 78a05d5d5..9e1071816 100644
--- a/Aaru.Filesystems/Xia.cs
+++ b/Aaru.Filesystems/Xia.cs
@@ -61,8 +61,12 @@ namespace Aaru.Filesystems
         {
             int  sbSizeInBytes   = Marshal.SizeOf<XiaSuperBlock>();
             uint sbSizeInSectors = (uint)(sbSizeInBytes / imagePlugin.Info.SectorSize);
-            if(sbSizeInBytes % imagePlugin.Info.SectorSize > 0) sbSizeInSectors++;
-            if(sbSizeInSectors + partition.Start           >= partition.End) return false;
+
+            if(sbSizeInBytes % imagePlugin.Info.SectorSize > 0)
+                sbSizeInSectors++;
+
+            if(sbSizeInSectors + partition.Start >= partition.End)
+                return false;
 
             byte[]        sbSector = imagePlugin.ReadSectors(partition.Start, sbSizeInSectors);
             XiaSuperBlock supblk   = Marshal.ByteArrayToStructureLittleEndian<XiaSuperBlock>(sbSector);
@@ -71,51 +75,58 @@ namespace Aaru.Filesystems
         }
 
         public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding    encoding)
+                                   Encoding encoding)
         {
             Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-15");
             information = "";
 
-            StringBuilder sb = new StringBuilder();
+            var sb = new StringBuilder();
 
             int  sbSizeInBytes   = Marshal.SizeOf<XiaSuperBlock>();
             uint sbSizeInSectors = (uint)(sbSizeInBytes / imagePlugin.Info.SectorSize);
-            if(sbSizeInBytes % imagePlugin.Info.SectorSize > 0) sbSizeInSectors++;
+
+            if(sbSizeInBytes % imagePlugin.Info.SectorSize > 0)
+                sbSizeInSectors++;
 
             byte[]        sbSector = imagePlugin.ReadSectors(partition.Start, sbSizeInSectors);
             XiaSuperBlock supblk   = Marshal.ByteArrayToStructureLittleEndian<XiaSuperBlock>(sbSector);
 
             sb.AppendFormat("{0} bytes per zone", supblk.s_zone_size).AppendLine();
-            sb.AppendFormat("{0} zones in volume ({1} bytes)", supblk.s_nzones, supblk.s_nzones * supblk.s_zone_size)
-              .AppendLine();
+
+            sb.AppendFormat("{0} zones in volume ({1} bytes)", supblk.s_nzones, supblk.s_nzones * supblk.s_zone_size).
+               AppendLine();
+
             sb.AppendFormat("{0} inodes", supblk.s_ninodes).AppendLine();
-            sb.AppendFormat("{0} data zones ({1} bytes)", supblk.s_ndatazones, supblk.s_ndatazones * supblk.s_zone_size)
-              .AppendLine();
-            sb.AppendFormat("{0} imap zones ({1} bytes)", supblk.s_imap_zones, supblk.s_imap_zones * supblk.s_zone_size)
-              .AppendLine();
-            sb.AppendFormat("{0} zmap zones ({1} bytes)", supblk.s_zmap_zones, supblk.s_zmap_zones * supblk.s_zone_size)
-              .AppendLine();
+
+            sb.AppendFormat("{0} data zones ({1} bytes)", supblk.s_ndatazones,
+                            supblk.s_ndatazones * supblk.s_zone_size).AppendLine();
+
+            sb.AppendFormat("{0} imap zones ({1} bytes)", supblk.s_imap_zones,
+                            supblk.s_imap_zones * supblk.s_zone_size).AppendLine();
+
+            sb.AppendFormat("{0} zmap zones ({1} bytes)", supblk.s_zmap_zones,
+                            supblk.s_zmap_zones * supblk.s_zone_size).AppendLine();
+
             sb.AppendFormat("First data zone: {0}", supblk.s_firstdatazone).AppendLine();
-            sb.AppendFormat("Maximum filesize is {0} bytes ({1} MiB)", supblk.s_max_size, supblk.s_max_size / 1048576)
-              .AppendLine();
+
+            sb.AppendFormat("Maximum filesize is {0} bytes ({1} MiB)", supblk.s_max_size, supblk.s_max_size / 1048576).
+               AppendLine();
+
             sb.AppendFormat("{0} zones reserved for kernel images ({1} bytes)", supblk.s_kernzones,
                             supblk.s_kernzones * supblk.s_zone_size).AppendLine();
+
             sb.AppendFormat("First kernel zone: {0}", supblk.s_firstkernzone).AppendLine();
 
             XmlFsType = new FileSystemType
             {
-                Bootable    = !ArrayHelpers.ArrayIsNullOrEmpty(supblk.s_boot_segment),
-                Clusters    = supblk.s_nzones,
-                ClusterSize = supblk.s_zone_size,
-                Type        = "Xia filesystem"
+                Bootable    = !ArrayHelpers.ArrayIsNullOrEmpty(supblk.s_boot_segment), Clusters = supblk.s_nzones,
+                ClusterSize = supblk.s_zone_size, Type                                          = "Xia filesystem"
             };
 
             information = sb.ToString();
         }
 
-        /// <summary>
-        ///     Xia superblock
-        /// </summary>
+        /// <summary>Xia superblock</summary>
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct XiaSuperBlock
         {
@@ -156,9 +167,7 @@ namespace Aaru.Filesystems
             public readonly uint s_magic;
         }
 
-        /// <summary>
-        ///     Xia directory entry
-        /// </summary>
+        /// <summary>Xia directory entry</summary>
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct XiaDirect
         {
@@ -169,9 +178,7 @@ namespace Aaru.Filesystems
             public readonly byte[] d_name;
         }
 
-        /// <summary>
-        ///     Xia inode
-        /// </summary>
+        /// <summary>Xia inode</summary>
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct XiaInode
         {
diff --git a/Aaru.Filesystems/ZFS.cs b/Aaru.Filesystems/ZFS.cs
index 0db69fffa..b7aac14b0 100644
--- a/Aaru.Filesystems/ZFS.cs
+++ b/Aaru.Filesystems/ZFS.cs
@@ -84,7 +84,8 @@ namespace Aaru.Filesystems
 
         public bool Identify(IMediaImage imagePlugin, Partition partition)
         {
-            if(imagePlugin.Info.SectorSize < 512) return false;
+            if(imagePlugin.Info.SectorSize < 512)
+                return false;
 
             byte[] sector;
             ulong  magic;
@@ -93,23 +94,30 @@ namespace Aaru.Filesystems
             {
                 sector = imagePlugin.ReadSector(partition.Start + 31);
                 magic  = BitConverter.ToUInt64(sector, 0x1D8);
-                if(magic == ZEC_MAGIC || magic == ZEC_CIGAM) return true;
+
+                if(magic == ZEC_MAGIC ||
+                   magic == ZEC_CIGAM)
+                    return true;
             }
 
-            if(partition.Start + 16 >= partition.End) return false;
+            if(partition.Start + 16 >= partition.End)
+                return false;
 
             sector = imagePlugin.ReadSector(partition.Start + 16);
             magic  = BitConverter.ToUInt64(sector, 0x1D8);
+
             return magic == ZEC_MAGIC || magic == ZEC_CIGAM;
         }
 
         public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding    encoding)
+                                   Encoding encoding)
         {
             // ZFS is always UTF-8
             Encoding    = Encoding.UTF8;
             information = "";
-            if(imagePlugin.Info.SectorSize < 512) return;
+
+            if(imagePlugin.Info.SectorSize < 512)
+                return;
 
             byte[] sector;
             ulong  magic;
@@ -121,30 +129,43 @@ namespace Aaru.Filesystems
             {
                 sector = imagePlugin.ReadSector(partition.Start + 31);
                 magic  = BitConverter.ToUInt64(sector, 0x1D8);
-                if(magic == ZEC_MAGIC || magic == ZEC_CIGAM) nvlistOff = 32;
+
+                if(magic == ZEC_MAGIC ||
+                   magic == ZEC_CIGAM)
+                    nvlistOff = 32;
             }
 
             if(partition.Start + 16 < partition.End)
             {
                 sector = imagePlugin.ReadSector(partition.Start + 16);
                 magic  = BitConverter.ToUInt64(sector, 0x1D8);
-                if(magic == ZEC_MAGIC || magic == ZEC_CIGAM) nvlistOff = 17;
+
+                if(magic == ZEC_MAGIC ||
+                   magic == ZEC_CIGAM)
+                    nvlistOff = 17;
             }
 
-            StringBuilder sb = new StringBuilder();
+            var sb = new StringBuilder();
             sb.AppendLine("ZFS filesystem");
 
             byte[] nvlist = imagePlugin.ReadSectors(partition.Start + nvlistOff, nvlistLen);
 
             sb.AppendLine(!DecodeNvList(nvlist, out Dictionary<string, NVS_Item> decodedNvList)
-                              ? "Could not decode nvlist"
-                              : PrintNvList(decodedNvList));
+                              ? "Could not decode nvlist" : PrintNvList(decodedNvList));
 
             information = sb.ToString();
 
-            XmlFsType = new FileSystemType {Type = "ZFS filesystem"};
-            if(decodedNvList.TryGetValue("name", out NVS_Item tmpObj)) XmlFsType.VolumeName = (string)tmpObj.value;
-            if(decodedNvList.TryGetValue("guid", out tmpObj)) XmlFsType.VolumeSerial        = $"{(ulong)tmpObj.value}";
+            XmlFsType = new FileSystemType
+            {
+                Type = "ZFS filesystem"
+            };
+
+            if(decodedNvList.TryGetValue("name", out NVS_Item tmpObj))
+                XmlFsType.VolumeName = (string)tmpObj.value;
+
+            if(decodedNvList.TryGetValue("guid", out tmpObj))
+                XmlFsType.VolumeSerial = $"{(ulong)tmpObj.value}";
+
             if(decodedNvList.TryGetValue("pool_guid", out tmpObj))
                 XmlFsType.VolumeSetIdentifier = $"{(ulong)tmpObj.value}";
         }
@@ -161,32 +182,40 @@ namespace Aaru.Filesystems
 
         // TODO: Decode native nvlist
         static bool DecodeNvList(byte[] nvlist, out Dictionary<string, NVS_Item> decodedNvList, bool xdr,
-                                 bool   littleEndian)
+                                 bool littleEndian)
         {
             decodedNvList = new Dictionary<string, NVS_Item>();
 
-            if(nvlist == null || nvlist.Length < 16) return false;
+            if(nvlist        == null ||
+               nvlist.Length < 16)
+                return false;
 
-            if(!xdr) return false;
+            if(!xdr)
+                return false;
 
             int offset = 8;
+
             while(offset < nvlist.Length)
             {
-                NVS_Item item    = new NVS_Item();
-                int      currOff = offset;
+                var item    = new NVS_Item();
+                int currOff = offset;
 
                 item.encodedSize = BigEndianBitConverter.ToUInt32(nvlist, offset);
 
                 // Finished
-                if(item.encodedSize == 0) break;
+                if(item.encodedSize == 0)
+                    break;
 
                 offset           += 4;
                 item.decodedSize =  BigEndianBitConverter.ToUInt32(nvlist, offset);
                 offset           += 4;
                 uint nameLength = BigEndianBitConverter.ToUInt32(nvlist, offset);
                 offset += 4;
-                if(nameLength % 4 > 0) nameLength += 4 - nameLength % 4;
-                byte[] nameBytes                  = new byte[nameLength];
+
+                if(nameLength % 4 > 0)
+                    nameLength += 4 - (nameLength % 4);
+
+                byte[] nameBytes = new byte[nameLength];
                 Array.Copy(nvlist, offset, nameBytes, 0, nameLength);
                 item.name     =  StringHandlers.CToString(nameBytes);
                 offset        += (int)nameLength;
@@ -198,6 +227,7 @@ namespace Aaru.Filesystems
                 if(item.elements == 0)
                 {
                     decodedNvList.Add(item.name, item);
+
                     continue;
                 }
 
@@ -209,6 +239,7 @@ namespace Aaru.Filesystems
                         if(item.elements > 1)
                         {
                             bool[] boolArray = new bool[item.elements];
+
                             for(int i = 0; i < item.elements; i++)
                             {
                                 uint temp = BigEndianBitConverter.ToUInt32(nvlist, offset);
@@ -235,7 +266,10 @@ namespace Aaru.Filesystems
                             byte[] byteArray = new byte[item.elements];
                             Array.Copy(nvlist, offset, byteArray, 0, item.elements);
                             offset += (int)item.elements;
-                            if(item.elements % 4 > 0) offset += 4 - (int)(item.elements % 4);
+
+                            if(item.elements % 4 > 0)
+                                offset += 4 - (int)(item.elements % 4);
+
                             item.value = byteArray;
                         }
                         else
@@ -249,6 +283,7 @@ namespace Aaru.Filesystems
                         if(item.elements > 1)
                         {
                             double[] doubleArray = new double[item.elements];
+
                             for(int i = 0; i < item.elements; i++)
                             {
                                 double temp = BigEndianBitConverter.ToDouble(nvlist, offset);
@@ -269,10 +304,12 @@ namespace Aaru.Filesystems
                         if(item.elements > 1)
                         {
                             DateTime[] hrtimeArray = new DateTime[item.elements];
+
                             for(int i = 0; i < item.elements; i++)
                             {
                                 DateTime temp =
                                     DateHandlers.UnixHrTimeToDateTime(BigEndianBitConverter.ToUInt64(nvlist, offset));
+
                                 hrtimeArray[i] =  temp;
                                 offset         += 8;
                             }
@@ -283,6 +320,7 @@ namespace Aaru.Filesystems
                         {
                             item.value =
                                 DateHandlers.UnixHrTimeToDateTime(BigEndianBitConverter.ToUInt64(nvlist, offset));
+
                             offset += 8;
                         }
 
@@ -292,6 +330,7 @@ namespace Aaru.Filesystems
                         if(item.elements > 1)
                         {
                             short[] shortArray = new short[item.elements];
+
                             for(int i = 0; i < item.elements; i++)
                             {
                                 short temp = BigEndianBitConverter.ToInt16(nvlist, offset);
@@ -313,6 +352,7 @@ namespace Aaru.Filesystems
                         if(item.elements > 1)
                         {
                             int[] intArray = new int[item.elements];
+
                             for(int i = 0; i < item.elements; i++)
                             {
                                 int temp = BigEndianBitConverter.ToInt32(nvlist, offset);
@@ -334,6 +374,7 @@ namespace Aaru.Filesystems
                         if(item.elements > 1)
                         {
                             long[] longArray = new long[item.elements];
+
                             for(int i = 0; i < item.elements; i++)
                             {
                                 long temp = BigEndianBitConverter.ToInt64(nvlist, offset);
@@ -355,6 +396,7 @@ namespace Aaru.Filesystems
                         if(item.elements > 1)
                         {
                             sbyte[] sbyteArray = new sbyte[item.elements];
+
                             for(int i = 0; i < item.elements; i++)
                             {
                                 sbyte temp = (sbyte)nvlist[offset];
@@ -363,7 +405,9 @@ namespace Aaru.Filesystems
                             }
 
                             item.value = sbyteArray;
-                            if(sbyteArray.Length % 4 > 0) offset += 4 - sbyteArray.Length % 4;
+
+                            if(sbyteArray.Length % 4 > 0)
+                                offset += 4 - (sbyteArray.Length % 4);
                         }
                         else
                         {
@@ -377,6 +421,7 @@ namespace Aaru.Filesystems
                         if(item.elements > 1)
                         {
                             string[] stringArray = new string[item.elements];
+
                             for(int i = 0; i < item.elements; i++)
                             {
                                 uint strLength = BigEndianBitConverter.ToUInt32(nvlist, offset);
@@ -385,7 +430,9 @@ namespace Aaru.Filesystems
                                 Array.Copy(nvlist, offset, strBytes, 0, strLength);
                                 stringArray[i] =  StringHandlers.CToString(strBytes);
                                 offset         += (int)strLength;
-                                if(strLength % 4 > 0) offset += 4 - (int)(strLength % 4);
+
+                                if(strLength % 4 > 0)
+                                    offset += 4 - (int)(strLength % 4);
                             }
 
                             item.value = stringArray;
@@ -398,7 +445,9 @@ namespace Aaru.Filesystems
                             Array.Copy(nvlist, offset, strBytes, 0, strLength);
                             item.value =  StringHandlers.CToString(strBytes);
                             offset     += (int)strLength;
-                            if(strLength % 4 > 0) offset += 4 - (int)(strLength % 4);
+
+                            if(strLength % 4 > 0)
+                                offset += 4 - (int)(strLength % 4);
                         }
 
                         break;
@@ -407,6 +456,7 @@ namespace Aaru.Filesystems
                         if(item.elements > 1)
                         {
                             ushort[] ushortArray = new ushort[item.elements];
+
                             for(int i = 0; i < item.elements; i++)
                             {
                                 ushort temp = BigEndianBitConverter.ToUInt16(nvlist, offset);
@@ -428,6 +478,7 @@ namespace Aaru.Filesystems
                         if(item.elements > 1)
                         {
                             uint[] uintArray = new uint[item.elements];
+
                             for(int i = 0; i < item.elements; i++)
                             {
                                 uint temp = BigEndianBitConverter.ToUInt32(nvlist, offset);
@@ -449,6 +500,7 @@ namespace Aaru.Filesystems
                         if(item.elements > 1)
                         {
                             ulong[] ulongArray = new ulong[item.elements];
+
                             for(int i = 0; i < item.elements; i++)
                             {
                                 ulong temp = BigEndianBitConverter.ToUInt64(nvlist, offset);
@@ -466,20 +518,26 @@ namespace Aaru.Filesystems
 
                         break;
                     case NVS_DataTypes.DATA_TYPE_NVLIST:
-                        if(item.elements > 1) goto default;
+                        if(item.elements > 1)
+                            goto default;
 
                         byte[] subListBytes = new byte[item.encodedSize - (offset - currOff)];
                         Array.Copy(nvlist, offset, subListBytes, 0, subListBytes.Length);
+
                         if(DecodeNvList(subListBytes, out Dictionary<string, NVS_Item> subList, true, littleEndian))
                             item.value = subList;
-                        else goto default;
+                        else
+                            goto default;
+
                         offset = (int)(currOff + item.encodedSize);
+
                         break;
                     default:
                         byte[] unknown = new byte[item.encodedSize - (offset - currOff)];
                         Array.Copy(nvlist, offset, unknown, 0, unknown.Length);
                         item.value = unknown;
                         offset     = (int)(currOff + item.encodedSize);
+
                         break;
                 }
 
@@ -491,12 +549,14 @@ namespace Aaru.Filesystems
 
         static string PrintNvList(Dictionary<string, NVS_Item> decodedNvList)
         {
-            StringBuilder sb = new StringBuilder();
+            var sb = new StringBuilder();
+
             foreach(NVS_Item item in decodedNvList.Values)
             {
                 if(item.elements == 0)
                 {
                     sb.AppendFormat("{0} is not set", item.name).AppendLine();
+
                     continue;
                 }
 
@@ -508,7 +568,8 @@ namespace Aaru.Filesystems
                         if(item.elements > 1)
                             for(int i = 0; i < item.elements; i++)
                                 sb.AppendFormat("{0}[{1}] = {2}", item.name, i, ((bool[])item.value)[i]).AppendLine();
-                        else sb.AppendFormat("{0} = {1}", item.name, (bool)item.value).AppendLine();
+                        else
+                            sb.AppendFormat("{0} = {1}", item.name, (bool)item.value).AppendLine();
 
                         break;
                     case NVS_DataTypes.DATA_TYPE_BYTE:
@@ -518,22 +579,25 @@ namespace Aaru.Filesystems
                         if(item.elements > 1)
                             for(int i = 0; i < item.elements; i++)
                                 sb.AppendFormat("{0}[{1}] = {2}", item.name, i, ((byte[])item.value)[i]).AppendLine();
-                        else sb.AppendFormat("{0} = {1}", item.name, (byte)item.value).AppendLine();
+                        else
+                            sb.AppendFormat("{0} = {1}", item.name, (byte)item.value).AppendLine();
 
                         break;
                     case NVS_DataTypes.DATA_TYPE_DOUBLE:
                         if(item.elements > 1)
                             for(int i = 0; i < item.elements; i++)
                                 sb.AppendFormat("{0}[{1}] = {2}", item.name, i, ((double[])item.value)[i]).AppendLine();
-                        else sb.AppendFormat("{0} = {1}", item.name, (double)item.value).AppendLine();
+                        else
+                            sb.AppendFormat("{0} = {1}", item.name, (double)item.value).AppendLine();
 
                         break;
                     case NVS_DataTypes.DATA_TYPE_HRTIME:
                         if(item.elements > 1)
                             for(int i = 0; i < item.elements; i++)
-                                sb.AppendFormat("{0}[{1}] = {2}", item.name, i, ((DateTime[])item.value)[i])
-                                  .AppendLine();
-                        else sb.AppendFormat("{0} = {1}", item.name, (DateTime)item.value).AppendLine();
+                                sb.AppendFormat("{0}[{1}] = {2}", item.name, i, ((DateTime[])item.value)[i]).
+                                   AppendLine();
+                        else
+                            sb.AppendFormat("{0} = {1}", item.name, (DateTime)item.value).AppendLine();
 
                         break;
                     case NVS_DataTypes.DATA_TYPE_INT16:
@@ -541,7 +605,8 @@ namespace Aaru.Filesystems
                         if(item.elements > 1)
                             for(int i = 0; i < item.elements; i++)
                                 sb.AppendFormat("{0}[{1}] = {2}", item.name, i, ((short[])item.value)[i]).AppendLine();
-                        else sb.AppendFormat("{0} = {1}", item.name, (short)item.value).AppendLine();
+                        else
+                            sb.AppendFormat("{0} = {1}", item.name, (short)item.value).AppendLine();
 
                         break;
                     case NVS_DataTypes.DATA_TYPE_INT32:
@@ -549,7 +614,8 @@ namespace Aaru.Filesystems
                         if(item.elements > 1)
                             for(int i = 0; i < item.elements; i++)
                                 sb.AppendFormat("{0}[{1}] = {2}", item.name, i, ((int[])item.value)[i]).AppendLine();
-                        else sb.AppendFormat("{0} = {1}", item.name, (int)item.value).AppendLine();
+                        else
+                            sb.AppendFormat("{0} = {1}", item.name, (int)item.value).AppendLine();
 
                         break;
                     case NVS_DataTypes.DATA_TYPE_INT64:
@@ -557,7 +623,8 @@ namespace Aaru.Filesystems
                         if(item.elements > 1)
                             for(int i = 0; i < item.elements; i++)
                                 sb.AppendFormat("{0}[{1}] = {2}", item.name, i, ((long[])item.value)[i]).AppendLine();
-                        else sb.AppendFormat("{0} = {1}", item.name, (long)item.value).AppendLine();
+                        else
+                            sb.AppendFormat("{0} = {1}", item.name, (long)item.value).AppendLine();
 
                         break;
                     case NVS_DataTypes.DATA_TYPE_INT8:
@@ -565,7 +632,8 @@ namespace Aaru.Filesystems
                         if(item.elements > 1)
                             for(int i = 0; i < item.elements; i++)
                                 sb.AppendFormat("{0}[{1}] = {2}", item.name, i, ((sbyte[])item.value)[i]).AppendLine();
-                        else sb.AppendFormat("{0} = {1}", item.name, (sbyte)item.value).AppendLine();
+                        else
+                            sb.AppendFormat("{0} = {1}", item.name, (sbyte)item.value).AppendLine();
 
                         break;
                     case NVS_DataTypes.DATA_TYPE_STRING:
@@ -573,7 +641,8 @@ namespace Aaru.Filesystems
                         if(item.elements > 1)
                             for(int i = 0; i < item.elements; i++)
                                 sb.AppendFormat("{0}[{1}] = {2}", item.name, i, ((string[])item.value)[i]).AppendLine();
-                        else sb.AppendFormat("{0} = {1}", item.name, (string)item.value).AppendLine();
+                        else
+                            sb.AppendFormat("{0} = {1}", item.name, (string)item.value).AppendLine();
 
                         break;
                     case NVS_DataTypes.DATA_TYPE_UINT16:
@@ -581,7 +650,8 @@ namespace Aaru.Filesystems
                         if(item.elements > 1)
                             for(int i = 0; i < item.elements; i++)
                                 sb.AppendFormat("{0}[{1}] = {2}", item.name, i, ((ushort[])item.value)[i]).AppendLine();
-                        else sb.AppendFormat("{0} = {1}", item.name, (ushort)item.value).AppendLine();
+                        else
+                            sb.AppendFormat("{0} = {1}", item.name, (ushort)item.value).AppendLine();
 
                         break;
                     case NVS_DataTypes.DATA_TYPE_UINT32:
@@ -589,7 +659,8 @@ namespace Aaru.Filesystems
                         if(item.elements > 1)
                             for(int i = 0; i < item.elements; i++)
                                 sb.AppendFormat("{0}[{1}] = {2}", item.name, i, ((uint[])item.value)[i]).AppendLine();
-                        else sb.AppendFormat("{0} = {1}", item.name, (uint)item.value).AppendLine();
+                        else
+                            sb.AppendFormat("{0} = {1}", item.name, (uint)item.value).AppendLine();
 
                         break;
                     case NVS_DataTypes.DATA_TYPE_UINT64:
@@ -597,7 +668,8 @@ namespace Aaru.Filesystems
                         if(item.elements > 1)
                             for(int i = 0; i < item.elements; i++)
                                 sb.AppendFormat("{0}[{1}] = {2}", item.name, i, ((ulong[])item.value)[i]).AppendLine();
-                        else sb.AppendFormat("{0} = {1}", item.name, (ulong)item.value).AppendLine();
+                        else
+                            sb.AppendFormat("{0} = {1}", item.name, (ulong)item.value).AppendLine();
 
                         break;
                     case NVS_DataTypes.DATA_TYPE_NVLIST:
@@ -605,15 +677,17 @@ namespace Aaru.Filesystems
                             sb.AppendFormat("{0} =\n{1}", item.name,
                                             PrintNvList((Dictionary<string, NVS_Item>)item.value)).AppendLine();
                         else
-                            sb.AppendFormat("{0} = {1} elements nvlist[], unable to print", item.name, item.elements)
-                              .AppendLine();
+                            sb.AppendFormat("{0} = {1} elements nvlist[], unable to print", item.name, item.elements).
+                               AppendLine();
+
                         break;
                     default:
                         if(item.elements > 1)
                             for(int i = 0; i < item.elements; i++)
-                                sb.AppendFormat("{0}[{1}] = Unknown data type {2}", item.name, i, item.dataType)
-                                  .AppendLine();
-                        else sb.AppendFormat("{0} = Unknown data type {1}", item.name, item.dataType).AppendLine();
+                                sb.AppendFormat("{0}[{1}] = Unknown data type {2}", item.name, i, item.dataType).
+                                   AppendLine();
+                        else
+                            sb.AppendFormat("{0} = Unknown data type {1}", item.name, item.dataType).AppendLine();
 
                         break;
                 }
@@ -629,7 +703,8 @@ namespace Aaru.Filesystems
         }
 
         /// <summary>
-        ///     There is an empty ZIO at sector 16 or sector 31, with magic and checksum, to detect it is really ZFS I suppose.
+        ///     There is an empty ZIO at sector 16 or sector 31, with magic and checksum, to detect it is really ZFS I
+        ///     suppose.
         /// </summary>
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct ZIO_Empty
@@ -640,9 +715,7 @@ namespace Aaru.Filesystems
             public readonly ZIO_Checksum checksum;
         }
 
-        /// <summary>
-        ///     This structure indicates which encoding method and endianness is used to encode the nvlist
-        /// </summary>
+        /// <summary>This structure indicates which encoding method and endianness is used to encode the nvlist</summary>
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct NVS_Method
         {
@@ -652,9 +725,7 @@ namespace Aaru.Filesystems
             public readonly byte reserved2;
         }
 
-        /// <summary>
-        ///     This structure gives information about the encoded nvlist
-        /// </summary>
+        /// <summary>This structure gives information about the encoded nvlist</summary>
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct NVS_XDR_Header
         {
@@ -665,64 +736,32 @@ namespace Aaru.Filesystems
 
         enum NVS_DataTypes : uint
         {
-            DATA_TYPE_UNKNOWN = 0,
-            DATA_TYPE_BOOLEAN,
-            DATA_TYPE_BYTE,
-            DATA_TYPE_INT16,
-            DATA_TYPE_UINT16,
-            DATA_TYPE_INT32,
-            DATA_TYPE_UINT32,
-            DATA_TYPE_INT64,
-            DATA_TYPE_UINT64,
-            DATA_TYPE_STRING,
-            DATA_TYPE_BYTE_ARRAY,
-            DATA_TYPE_INT16_ARRAY,
-            DATA_TYPE_UINT16_ARRAY,
-            DATA_TYPE_INT32_ARRAY,
-            DATA_TYPE_UINT32_ARRAY,
-            DATA_TYPE_INT64_ARRAY,
-            DATA_TYPE_UINT64_ARRAY,
-            DATA_TYPE_STRING_ARRAY,
-            DATA_TYPE_HRTIME,
-            DATA_TYPE_NVLIST,
-            DATA_TYPE_NVLIST_ARRAY,
-            DATA_TYPE_BOOLEAN_VALUE,
-            DATA_TYPE_INT8,
-            DATA_TYPE_UINT8,
-            DATA_TYPE_BOOLEAN_ARRAY,
-            DATA_TYPE_INT8_ARRAY,
-            DATA_TYPE_UINT8_ARRAY,
+            DATA_TYPE_UNKNOWN = 0, DATA_TYPE_BOOLEAN, DATA_TYPE_BYTE,
+            DATA_TYPE_INT16, DATA_TYPE_UINT16, DATA_TYPE_INT32,
+            DATA_TYPE_UINT32, DATA_TYPE_INT64, DATA_TYPE_UINT64,
+            DATA_TYPE_STRING, DATA_TYPE_BYTE_ARRAY, DATA_TYPE_INT16_ARRAY,
+            DATA_TYPE_UINT16_ARRAY, DATA_TYPE_INT32_ARRAY, DATA_TYPE_UINT32_ARRAY,
+            DATA_TYPE_INT64_ARRAY, DATA_TYPE_UINT64_ARRAY, DATA_TYPE_STRING_ARRAY,
+            DATA_TYPE_HRTIME, DATA_TYPE_NVLIST, DATA_TYPE_NVLIST_ARRAY,
+            DATA_TYPE_BOOLEAN_VALUE, DATA_TYPE_INT8, DATA_TYPE_UINT8,
+            DATA_TYPE_BOOLEAN_ARRAY, DATA_TYPE_INT8_ARRAY, DATA_TYPE_UINT8_ARRAY,
             DATA_TYPE_DOUBLE
         }
 
-        /// <summary>
-        ///     This represent an encoded nvpair (an item of an nvlist)
-        /// </summary>
+        /// <summary>This represent an encoded nvpair (an item of an nvlist)</summary>
         struct NVS_Item
         {
-            /// <summary>
-            ///     Size in bytes when encoded in XDR
-            /// </summary>
+            /// <summary>Size in bytes when encoded in XDR</summary>
             public uint encodedSize;
-            /// <summary>
-            ///     Size in bytes when decoded
-            /// </summary>
+            /// <summary>Size in bytes when decoded</summary>
             public uint decodedSize;
-            /// <summary>
-            ///     On disk, it is null-padded for alignment to 4 bytes and prepended by a 4 byte length indicator
-            /// </summary>
+            /// <summary>On disk, it is null-padded for alignment to 4 bytes and prepended by a 4 byte length indicator</summary>
             public string name;
-            /// <summary>
-            ///     Data type
-            /// </summary>
+            /// <summary>Data type</summary>
             public NVS_DataTypes dataType;
-            /// <summary>
-            ///     How many elements are here
-            /// </summary>
+            /// <summary>How many elements are here</summary>
             public uint elements;
-            /// <summary>
-            ///     On disk size is relative to <see cref="dataType" /> and <see cref="elements" /> always aligned to 4 bytes
-            /// </summary>
+            /// <summary>On disk size is relative to <see cref="dataType" /> and <see cref="elements" /> always aligned to 4 bytes</summary>
             public object value;
         }
 
@@ -736,30 +775,18 @@ namespace Aaru.Filesystems
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct SPA_BlockPointer
         {
-            /// <summary>
-            ///     Data virtual address
-            /// </summary>
+            /// <summary>Data virtual address</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
             public readonly DVA[] dataVirtualAddress;
-            /// <summary>
-            ///     Block properties
-            /// </summary>
+            /// <summary>Block properties</summary>
             public readonly ulong properties;
-            /// <summary>
-            ///     Reserved for future expansion
-            /// </summary>
+            /// <summary>Reserved for future expansion</summary>
             public readonly ulong[] padding;
-            /// <summary>
-            ///     TXG when block was allocated
-            /// </summary>
+            /// <summary>TXG when block was allocated</summary>
             public readonly ulong birthTxg;
-            /// <summary>
-            ///     Transaction group at birth
-            /// </summary>
+            /// <summary>Transaction group at birth</summary>
             public readonly ulong birth;
-            /// <summary>
-            ///     Fill count
-            /// </summary>
+            /// <summary>Fill count</summary>
             public readonly ulong fill;
             public readonly ZIO_Checksum checksum;
         }
diff --git a/Aaru.Filesystems/dump.cs b/Aaru.Filesystems/dump.cs
index d35ed032e..efd3866d7 100644
--- a/Aaru.Filesystems/dump.cs
+++ b/Aaru.Filesystems/dump.cs
@@ -65,29 +65,17 @@ namespace Aaru.Filesystems
 
         const int TP_BSIZE = 1024;
 
-        /// <summary>
-        ///     Dump tape header
-        /// </summary>
+        /// <summary>Dump tape header</summary>
         const short TS_TAPE = 1;
-        /// <summary>
-        ///     Beginning of file record
-        /// </summary>
+        /// <summary>Beginning of file record</summary>
         const short TS_INODE = 2;
-        /// <summary>
-        ///     Map of inodes on tape
-        /// </summary>
+        /// <summary>Map of inodes on tape</summary>
         const short TS_BITS = 3;
-        /// <summary>
-        ///     Continuation of file record
-        /// </summary>
+        /// <summary>Continuation of file record</summary>
         const short TS_ADDR = 4;
-        /// <summary>
-        ///     Map of inodes deleted since last dump
-        /// </summary>
+        /// <summary>Map of inodes deleted since last dump</summary>
         const short TS_END = 5;
-        /// <summary>
-        ///     Inode bitmap
-        /// </summary>
+        /// <summary>Inode bitmap</summary>
         const short TS_CLRI = 6;
         const short TS_ACL = 7;
         const short TS_PCL = 8;
@@ -107,16 +95,22 @@ namespace Aaru.Filesystems
 
         public bool Identify(IMediaImage imagePlugin, Partition partition)
         {
-            if(imagePlugin.Info.SectorSize < 512) return false;
+            if(imagePlugin.Info.SectorSize < 512)
+                return false;
 
             // It should be start of a tape or floppy or file
-            if(partition.Start != 0) return false;
+            if(partition.Start != 0)
+                return false;
 
             uint sbSize = (uint)(Marshal.SizeOf<s_spcl>() / imagePlugin.Info.SectorSize);
-            if(Marshal.SizeOf<s_spcl>() % imagePlugin.Info.SectorSize != 0) sbSize++;
+
+            if(Marshal.SizeOf<s_spcl>() % imagePlugin.Info.SectorSize != 0)
+                sbSize++;
 
             byte[] sector = imagePlugin.ReadSectors(partition.Start, sbSize);
-            if(sector.Length < Marshal.SizeOf<s_spcl>()) return false;
+
+            if(sector.Length < Marshal.SizeOf<s_spcl>())
+                return false;
 
             spcl16   oldHdr = Marshal.ByteArrayToStructureLittleEndian<spcl16>(sector);
             spcl_aix aixHdr = Marshal.ByteArrayToStructureLittleEndian<spcl_aix>(sector);
@@ -132,19 +126,26 @@ namespace Aaru.Filesystems
         }
 
         public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding    encoding)
+                                   Encoding encoding)
         {
             Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-15");
             information = "";
-            if(imagePlugin.Info.SectorSize < 512) return;
 
-            if(partition.Start != 0) return;
+            if(imagePlugin.Info.SectorSize < 512)
+                return;
+
+            if(partition.Start != 0)
+                return;
 
             uint sbSize = (uint)(Marshal.SizeOf<s_spcl>() / imagePlugin.Info.SectorSize);
-            if(Marshal.SizeOf<s_spcl>() % imagePlugin.Info.SectorSize != 0) sbSize++;
+
+            if(Marshal.SizeOf<s_spcl>() % imagePlugin.Info.SectorSize != 0)
+                sbSize++;
 
             byte[] sector = imagePlugin.ReadSectors(partition.Start, sbSize);
-            if(sector.Length < Marshal.SizeOf<s_spcl>()) return;
+
+            if(sector.Length < Marshal.SizeOf<s_spcl>())
+                return;
 
             spcl16   oldHdr = Marshal.ByteArrayToStructureLittleEndian<spcl16>(sector);
             spcl_aix aixHdr = Marshal.ByteArrayToStructureLittleEndian<spcl_aix>(sector);
@@ -153,17 +154,25 @@ namespace Aaru.Filesystems
             bool useOld = false;
             bool useAix = false;
 
-            if(newHdr.c_magic == OFS_MAGIC || newHdr.c_magic == NFS_MAGIC  || newHdr.c_magic == OFS_CIGAM ||
-               newHdr.c_magic == NFS_CIGAM || newHdr.c_magic == UFS2_MAGIC || newHdr.c_magic == UFS2_CIGAM)
+            if(newHdr.c_magic == OFS_MAGIC  ||
+               newHdr.c_magic == NFS_MAGIC  ||
+               newHdr.c_magic == OFS_CIGAM  ||
+               newHdr.c_magic == NFS_CIGAM  ||
+               newHdr.c_magic == UFS2_MAGIC ||
+               newHdr.c_magic == UFS2_CIGAM)
             {
-                if(newHdr.c_magic == OFS_CIGAM || newHdr.c_magic == NFS_CIGAM || newHdr.c_magic == UFS2_CIGAM)
+                if(newHdr.c_magic == OFS_CIGAM ||
+                   newHdr.c_magic == NFS_CIGAM ||
+                   newHdr.c_magic == UFS2_CIGAM)
                     newHdr = Marshal.ByteArrayToStructureBigEndian<s_spcl>(sector);
             }
-            else if(aixHdr.c_magic == XIX_MAGIC || aixHdr.c_magic == XIX_CIGAM)
+            else if(aixHdr.c_magic == XIX_MAGIC ||
+                    aixHdr.c_magic == XIX_CIGAM)
             {
                 useAix = true;
 
-                if(aixHdr.c_magic == XIX_CIGAM) aixHdr = Marshal.ByteArrayToStructureBigEndian<spcl_aix>(sector);
+                if(aixHdr.c_magic == XIX_CIGAM)
+                    aixHdr = Marshal.ByteArrayToStructureBigEndian<spcl_aix>(sector);
             }
             else if(oldHdr.c_magic == OFS_MAGIC)
             {
@@ -176,17 +185,22 @@ namespace Aaru.Filesystems
             else
             {
                 information = "Could not read dump(8) header block";
+
                 return;
             }
 
-            StringBuilder sb = new StringBuilder();
+            var sb = new StringBuilder();
 
-            XmlFsType = new FileSystemType {ClusterSize = 1024, Clusters = partition.Size / 1024};
+            XmlFsType = new FileSystemType
+            {
+                ClusterSize = 1024, Clusters = partition.Size / 1024
+            };
 
             if(useOld)
             {
                 XmlFsType.Type = "Old 16-bit dump(8)";
                 sb.AppendLine(XmlFsType.Type);
+
                 if(oldHdr.c_date > 0)
                 {
                     XmlFsType.CreationDate          = DateHandlers.UnixToDateTime(oldHdr.c_date);
@@ -207,6 +221,7 @@ namespace Aaru.Filesystems
             {
                 XmlFsType.Type = "AIX dump(8)";
                 sb.AppendLine(XmlFsType.Type);
+
                 if(aixHdr.c_date > 0)
                 {
                     XmlFsType.CreationDate          = DateHandlers.UnixToDateTime(aixHdr.c_date);
@@ -227,6 +242,7 @@ namespace Aaru.Filesystems
             {
                 XmlFsType.Type = "dump(8)";
                 sb.AppendLine(XmlFsType.Type);
+
                 if(newHdr.c_ndate > 0)
                 {
                     XmlFsType.CreationDate          = DateHandlers.UnixToDateTime(newHdr.c_ndate);
@@ -256,6 +272,7 @@ namespace Aaru.Filesystems
                 sb.AppendFormat("Dump volume number: {0}", newHdr.c_volume).AppendLine();
                 sb.AppendFormat("Dump level: {0}", newHdr.c_level).AppendLine();
                 string dumpname = StringHandlers.CToString(newHdr.c_label);
+
                 if(!string.IsNullOrEmpty(dumpname))
                 {
                     XmlFsType.VolumeName = dumpname;
@@ -263,11 +280,19 @@ namespace Aaru.Filesystems
                 }
 
                 string str = StringHandlers.CToString(newHdr.c_filesys);
-                if(!string.IsNullOrEmpty(str)) sb.AppendFormat("Dumped filesystem name: {0}", str).AppendLine();
+
+                if(!string.IsNullOrEmpty(str))
+                    sb.AppendFormat("Dumped filesystem name: {0}", str).AppendLine();
+
                 str = StringHandlers.CToString(newHdr.c_dev);
-                if(!string.IsNullOrEmpty(str)) sb.AppendFormat("Dumped device: {0}", str).AppendLine();
+
+                if(!string.IsNullOrEmpty(str))
+                    sb.AppendFormat("Dumped device: {0}", str).AppendLine();
+
                 str = StringHandlers.CToString(newHdr.c_host);
-                if(!string.IsNullOrEmpty(str)) sb.AppendFormat("Dump hostname: {0}", str).AppendLine();
+
+                if(!string.IsNullOrEmpty(str))
+                    sb.AppendFormat("Dump hostname: {0}", str).AppendLine();
             }
 
             information = sb.ToString();
@@ -293,6 +318,7 @@ namespace Aaru.Filesystems
             public readonly ushort c_magic;
             /// <summary>Record checksum</summary>
             public readonly int c_checksum;
+
             // Unneeded for now
             /*
             struct dinode  c_dinode;
@@ -318,6 +344,7 @@ namespace Aaru.Filesystems
             public readonly uint c_inumber;
             public readonly uint c_magic;
             public readonly int  c_checksum;
+
             // Unneeded for now
             /*
             public bsd_dinode  bsd_c_dinode;
diff --git a/Aaru.Filesystems/exFAT.cs b/Aaru.Filesystems/exFAT.cs
index 0aad8a10f..49c1dde1d 100644
--- a/Aaru.Filesystems/exFAT.cs
+++ b/Aaru.Filesystems/exFAT.cs
@@ -46,7 +46,10 @@ namespace Aaru.Filesystems
     {
         readonly Guid OEM_FLASH_PARAMETER_GUID = new Guid("0A0C7E46-3399-4021-90C8-FA6D389C4BA2");
 
-        readonly byte[] signature = {0x45, 0x58, 0x46, 0x41, 0x54, 0x20, 0x20, 0x20};
+        readonly byte[] signature =
+        {
+            0x45, 0x58, 0x46, 0x41, 0x54, 0x20, 0x20, 0x20
+        };
 
         public FileSystemType XmlFsType { get; private set; }
         public Encoding       Encoding  { get; private set; }
@@ -56,10 +59,13 @@ namespace Aaru.Filesystems
 
         public bool Identify(IMediaImage imagePlugin, Partition partition)
         {
-            if(12 + partition.Start >= partition.End) return false;
+            if(12 + partition.Start >= partition.End)
+                return false;
 
             byte[] vbrSector = imagePlugin.ReadSector(0 + partition.Start);
-            if(vbrSector.Length < 512) return false;
+
+            if(vbrSector.Length < 512)
+                return false;
 
             VolumeBootRecord vbr = Marshal.ByteArrayToStructureLittleEndian<VolumeBootRecord>(vbrSector);
 
@@ -67,18 +73,19 @@ namespace Aaru.Filesystems
         }
 
         public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding    encoding)
+                                   Encoding encoding)
         {
             Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-15");
             information = "";
 
-            StringBuilder sb = new StringBuilder();
+            var sb = new StringBuilder();
             XmlFsType = new FileSystemType();
 
             byte[]           vbrSector = imagePlugin.ReadSector(0 + partition.Start);
             VolumeBootRecord vbr       = Marshal.ByteArrayToStructureLittleEndian<VolumeBootRecord>(vbrSector);
 
             byte[] parametersSector = imagePlugin.ReadSector(9 + partition.Start);
+
             OemParameterTable parametersTable =
                 Marshal.ByteArrayToStructureLittleEndian<OemParameterTable>(parametersSector);
 
@@ -87,25 +94,40 @@ namespace Aaru.Filesystems
 
             sb.AppendLine("Microsoft exFAT");
             sb.AppendFormat("Partition offset: {0}", vbr.offset).AppendLine();
+
             sb.AppendFormat("Volume has {0} sectors of {1} bytes each for a total of {2} bytes", vbr.sectors,
                             1 << vbr.sectorShift, vbr.sectors * (ulong)(1 << vbr.sectorShift)).AppendLine();
+
             sb.AppendFormat("Volume uses clusters of {0} sectors ({1} bytes) each", 1 << vbr.clusterShift,
                             (1 << vbr.sectorShift) * (1 << vbr.clusterShift)).AppendLine();
-            sb.AppendFormat("First FAT starts at sector {0} and runs for {1} sectors", vbr.fatOffset, vbr.fatLength)
-              .AppendLine();
+
+            sb.AppendFormat("First FAT starts at sector {0} and runs for {1} sectors", vbr.fatOffset, vbr.fatLength).
+               AppendLine();
+
             sb.AppendFormat("Volume uses {0} FATs", vbr.fats).AppendLine();
+
             sb.AppendFormat("Cluster heap starts at sector {0}, contains {1} clusters and is {2}% used",
                             vbr.clusterHeapOffset, vbr.clusterHeapLength, vbr.heapUsage).AppendLine();
+
             sb.AppendFormat("Root directory starts at cluster {0}", vbr.rootDirectoryCluster).AppendLine();
-            sb.AppendFormat("Filesystem revision is {0}.{1:D2}", (vbr.revision & 0xFF00) >> 8, vbr.revision & 0xFF)
-              .AppendLine();
+
+            sb.AppendFormat("Filesystem revision is {0}.{1:D2}", (vbr.revision & 0xFF00) >> 8, vbr.revision & 0xFF).
+               AppendLine();
+
             sb.AppendFormat("Volume serial number: {0:X8}", vbr.volumeSerial).AppendLine();
             sb.AppendFormat("BIOS drive is {0:X2}h", vbr.drive).AppendLine();
-            if(vbr.flags.HasFlag(VolumeFlags.SecondFatActive)) sb.AppendLine("2nd FAT is in use");
-            if(vbr.flags.HasFlag(VolumeFlags.VolumeDirty)) sb.AppendLine("Volume is dirty");
-            if(vbr.flags.HasFlag(VolumeFlags.MediaFailure)) sb.AppendLine("Underlying media presented errors");
+
+            if(vbr.flags.HasFlag(VolumeFlags.SecondFatActive))
+                sb.AppendLine("2nd FAT is in use");
+
+            if(vbr.flags.HasFlag(VolumeFlags.VolumeDirty))
+                sb.AppendLine("Volume is dirty");
+
+            if(vbr.flags.HasFlag(VolumeFlags.MediaFailure))
+                sb.AppendLine("Underlying media presented errors");
 
             int count = 1;
+
             foreach(OemParameter parameter in parametersTable.parameters)
             {
                 if(parameter.OemParameterType == OEM_FLASH_PARAMETER_GUID)
@@ -139,9 +161,7 @@ namespace Aaru.Filesystems
         [Flags]
         enum VolumeFlags : ushort
         {
-            SecondFatActive = 1,
-            VolumeDirty     = 2,
-            MediaFailure    = 4,
+            SecondFatActive = 1, VolumeDirty = 2, MediaFailure = 4,
             ClearToZero     = 8
         }
 
diff --git a/Aaru.Filesystems/ext2FS.cs b/Aaru.Filesystems/ext2FS.cs
index 487023a0d..6e7c93bad 100644
--- a/Aaru.Filesystems/ext2FS.cs
+++ b/Aaru.Filesystems/ext2FS.cs
@@ -46,9 +46,7 @@ namespace Aaru.Filesystems
     {
         const int SB_POS = 0x400;
 
-        /// <summary>
-        ///     Same magic for ext2, ext3 and ext4
-        /// </summary>
+        /// <summary>Same magic for ext2, ext3 and ext4</summary>
         const ushort EXT2_MAGIC = 0xEF53;
 
         const ushort EXT2_MAGIC_OLD = 0xEF51;
@@ -173,15 +171,20 @@ namespace Aaru.Filesystems
             ulong sbSectorOff = SB_POS / imagePlugin.Info.SectorSize;
             uint  sbOff       = SB_POS % imagePlugin.Info.SectorSize;
 
-            if(sbSectorOff + partition.Start >= partition.End) return false;
+            if(sbSectorOff + partition.Start >= partition.End)
+                return false;
 
             int  sbSizeInBytes   = Marshal.SizeOf<ext2FSSuperBlock>();
             uint sbSizeInSectors = (uint)(sbSizeInBytes / imagePlugin.Info.SectorSize);
-            if(sbSizeInBytes % imagePlugin.Info.SectorSize > 0) sbSizeInSectors++;
+
+            if(sbSizeInBytes % imagePlugin.Info.SectorSize > 0)
+                sbSizeInSectors++;
 
             byte[] sbSector = imagePlugin.ReadSectors(sbSectorOff + partition.Start, sbSizeInSectors);
             byte[] sb       = new byte[sbSizeInBytes];
-            if(sbOff + sbSizeInBytes > sbSector.Length) return false;
+
+            if(sbOff + sbSizeInBytes > sbSector.Length)
+                return false;
 
             Array.Copy(sbSector, sbOff, sb, 0, sbSizeInBytes);
 
@@ -191,12 +194,12 @@ namespace Aaru.Filesystems
         }
 
         public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding    encoding)
+                                   Encoding encoding)
         {
             Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-15");
             information = "";
 
-            StringBuilder sb = new StringBuilder();
+            var sb = new StringBuilder();
 
             bool newExt2 = false;
             bool ext3    = false;
@@ -204,7 +207,9 @@ namespace Aaru.Filesystems
 
             int  sbSizeInBytes   = Marshal.SizeOf<ext2FSSuperBlock>();
             uint sbSizeInSectors = (uint)(sbSizeInBytes / imagePlugin.Info.SectorSize);
-            if(sbSizeInBytes % imagePlugin.Info.SectorSize > 0) sbSizeInSectors++;
+
+            if(sbSizeInBytes % imagePlugin.Info.SectorSize > 0)
+                sbSizeInSectors++;
 
             ulong sbSectorOff = SB_POS / imagePlugin.Info.SectorSize;
             uint  sbOff       = SB_POS % imagePlugin.Info.SectorSize;
@@ -221,6 +226,7 @@ namespace Aaru.Filesystems
                 case EXT2_MAGIC_OLD:
                     sb.AppendLine("ext2 (old) filesystem");
                     XmlFsType.Type = "ext2";
+
                     break;
                 case EXT2_MAGIC:
                     ext3 |=
@@ -267,29 +273,37 @@ namespace Aaru.Filesystems
                     break;
                 default:
                     information = "Not a ext2/3/4 filesystem" + Environment.NewLine;
+
                     return;
             }
 
             string extOs;
+
             switch(supblk.creator_os)
             {
                 case EXT2_OS_FREEBSD:
                     extOs = "FreeBSD";
+
                     break;
                 case EXT2_OS_HURD:
                     extOs = "Hurd";
+
                     break;
                 case EXT2_OS_LINUX:
                     extOs = "Linux";
+
                     break;
                 case EXT2_OS_LITES:
                     extOs = "Lites";
+
                     break;
                 case EXT2_OS_MASIX:
                     extOs = "MasIX";
+
                     break;
                 default:
                     extOs = $"Unknown OS ({supblk.creator_os})";
+
                     break;
             }
 
@@ -299,10 +313,12 @@ namespace Aaru.Filesystems
             {
                 sb.AppendFormat("Volume was created on {0} for {1}", DateHandlers.UnixUnsignedToDateTime(supblk.mkfs_t),
                                 extOs).AppendLine();
+
                 XmlFsType.CreationDate          = DateHandlers.UnixUnsignedToDateTime(supblk.mkfs_t);
                 XmlFsType.CreationDateSpecified = true;
             }
-            else sb.AppendFormat("Volume was created for {0}", extOs).AppendLine();
+            else
+                sb.AppendFormat("Volume was created for {0}", extOs).AppendLine();
 
             byte[] tempBytes = new byte[8];
             ulong  blocks, reserved, free;
@@ -356,24 +372,30 @@ namespace Aaru.Filesystems
                 supblk.block_size = 1024;
 
             sb.AppendFormat("Volume has {0} blocks of {1} bytes, for a total of {2} bytes", blocks,
-                            1024 << (int)supblk.block_size, blocks * (ulong)(1024 << (int)supblk.block_size))
-              .AppendLine();
+                            1024 << (int)supblk.block_size, blocks * (ulong)(1024 << (int)supblk.block_size)).
+               AppendLine();
+
             XmlFsType.Clusters    = blocks;
             XmlFsType.ClusterSize = (uint)(1024 << (int)supblk.block_size);
-            if(supblk.mount_t > 0 || supblk.mount_c > 0)
+
+            if(supblk.mount_t > 0 ||
+               supblk.mount_c > 0)
             {
                 if(supblk.mount_t > 0)
-                    sb.AppendFormat("Last mounted on {0}", DateHandlers.UnixUnsignedToDateTime(supblk.mount_t))
-                      .AppendLine();
+                    sb.AppendFormat("Last mounted on {0}", DateHandlers.UnixUnsignedToDateTime(supblk.mount_t)).
+                       AppendLine();
+
                 if(supblk.max_mount_c != -1)
                     sb.AppendFormat("Volume has been mounted {0} times of a maximum of {1} mounts before checking",
                                     supblk.mount_c, supblk.max_mount_c).AppendLine();
                 else
                     sb.AppendFormat("Volume has been mounted {0} times with no maximum no. of mounts before checking",
                                     supblk.mount_c).AppendLine();
+
                 if(!string.IsNullOrEmpty(StringHandlers.CToString(supblk.last_mount_dir, Encoding)))
                     sb.AppendFormat("Last mounted on: \"{0}\"",
                                     StringHandlers.CToString(supblk.last_mount_dir, Encoding)).AppendLine();
+
                 if(!string.IsNullOrEmpty(StringHandlers.CToString(supblk.mount_options, Encoding)))
                     sb.AppendFormat("Last used mount options were: {0}",
                                     StringHandlers.CToString(supblk.mount_options, Encoding)).AppendLine();
@@ -381,9 +403,11 @@ namespace Aaru.Filesystems
             else
             {
                 sb.AppendLine("Volume has never been mounted");
+
                 if(supblk.max_mount_c != -1)
                     sb.AppendFormat("Volume can be mounted {0} times before checking", supblk.max_mount_c).AppendLine();
-                else sb.AppendLine("Volume has no maximum no. of mounts before checking");
+                else
+                    sb.AppendLine("Volume has no maximum no. of mounts before checking");
             }
 
             if(supblk.check_t > 0)
@@ -391,47 +415,56 @@ namespace Aaru.Filesystems
                     sb.AppendFormat("Last checked on {0} (should check every {1} seconds)",
                                     DateHandlers.UnixUnsignedToDateTime(supblk.check_t), supblk.check_inv).AppendLine();
                 else
-                    sb.AppendFormat("Last checked on {0}", DateHandlers.UnixUnsignedToDateTime(supblk.check_t))
-                      .AppendLine();
+                    sb.AppendFormat("Last checked on {0}", DateHandlers.UnixUnsignedToDateTime(supblk.check_t)).
+                       AppendLine();
             else
             {
                 if(supblk.check_inv > 0)
-                    sb.AppendFormat("Volume has never been checked (should check every {0})", supblk.check_inv)
-                      .AppendLine();
-                else sb.AppendLine("Volume has never been checked");
+                    sb.AppendFormat("Volume has never been checked (should check every {0})", supblk.check_inv).
+                       AppendLine();
+                else
+                    sb.AppendLine("Volume has never been checked");
             }
 
             if(supblk.write_t > 0)
             {
-                sb.AppendFormat("Last written on {0}", DateHandlers.UnixUnsignedToDateTime(supblk.write_t))
-                  .AppendLine();
+                sb.AppendFormat("Last written on {0}", DateHandlers.UnixUnsignedToDateTime(supblk.write_t)).
+                   AppendLine();
+
                 XmlFsType.ModificationDate          = DateHandlers.UnixUnsignedToDateTime(supblk.write_t);
                 XmlFsType.ModificationDateSpecified = true;
             }
-            else sb.AppendLine("Volume has never been written");
+            else
+                sb.AppendLine("Volume has never been written");
 
             XmlFsType.Dirty = true;
+
             switch(supblk.state)
             {
                 case EXT2_VALID_FS:
                     sb.AppendLine("Volume is clean");
                     XmlFsType.Dirty = false;
+
                     break;
                 case EXT2_ERROR_FS:
                     sb.AppendLine("Volume is dirty");
+
                     break;
                 case EXT3_ORPHAN_FS:
                     sb.AppendLine("Volume is recovering orphan files");
+
                     break;
                 default:
                     sb.AppendFormat("Volume is in an unknown state ({0})", supblk.state).AppendLine();
+
                     break;
             }
 
             if(!string.IsNullOrEmpty(StringHandlers.CToString(supblk.volume_name, Encoding)))
             {
-                sb.AppendFormat("Volume name: \"{0}\"", StringHandlers.CToString(supblk.volume_name, Encoding))
-                  .AppendLine();
+                sb.AppendFormat("Volume name: \"{0}\"", StringHandlers.CToString(supblk.volume_name, Encoding)).
+                   AppendLine();
+
                 XmlFsType.VolumeName = StringHandlers.CToString(supblk.volume_name, Encoding);
             }
 
@@ -439,16 +472,20 @@ namespace Aaru.Filesystems
             {
                 case EXT2_ERRORS_CONTINUE:
                     sb.AppendLine("On errors, filesystem should continue");
+
                     break;
                 case EXT2_ERRORS_RO:
                     sb.AppendLine("On errors, filesystem should remount read-only");
+
                     break;
                 case EXT2_ERRORS_PANIC:
                     sb.AppendLine("On errors, filesystem should panic");
+
                     break;
                 default:
-                    sb.AppendFormat("On errors filesystem will do an unknown thing ({0})", supblk.err_behaviour)
-                      .AppendLine();
+                    sb.AppendFormat("On errors filesystem will do an unknown thing ({0})", supblk.err_behaviour).
+                       AppendLine();
+
                     break;
             }
 
@@ -467,178 +504,251 @@ namespace Aaru.Filesystems
             sb.AppendFormat("{0} reserved and {1} free blocks", reserved, free).AppendLine();
             XmlFsType.FreeClusters          = free;
             XmlFsType.FreeClustersSpecified = true;
+
             sb.AppendFormat("{0} inodes with {1} free inodes ({2}%)", supblk.inodes, supblk.free_inodes,
-                            supblk.free_inodes * 100 / supblk.inodes).AppendLine();
-            if(supblk.first_inode > 0) sb.AppendFormat("First inode is {0}", supblk.first_inode).AppendLine();
-            if(supblk.frag_size   > 0) sb.AppendFormat("{0} bytes per fragment", supblk.frag_size).AppendLine();
-            if(supblk.blocks_per_grp > 0 && supblk.flags_per_grp > 0 && supblk.inodes_per_grp > 0)
+                            (supblk.free_inodes * 100) / supblk.inodes).AppendLine();
+
+            if(supblk.first_inode > 0)
+                sb.AppendFormat("First inode is {0}", supblk.first_inode).AppendLine();
+
+            if(supblk.frag_size > 0)
+                sb.AppendFormat("{0} bytes per fragment", supblk.frag_size).AppendLine();
+
+            if(supblk.blocks_per_grp > 0 &&
+               supblk.flags_per_grp  > 0 &&
+               supblk.inodes_per_grp > 0)
                 sb.AppendFormat("{0} blocks, {1} flags and {2} inodes per group", supblk.blocks_per_grp,
                                 supblk.flags_per_grp, supblk.inodes_per_grp).AppendLine();
-            if(supblk.first_block > 0) sb.AppendFormat("{0} is first data block", supblk.first_block).AppendLine();
+
+            if(supblk.first_block > 0)
+                sb.AppendFormat("{0} is first data block", supblk.first_block).AppendLine();
+
             sb.AppendFormat("Default UID: {0}, GID: {1}", supblk.default_uid, supblk.default_gid).AppendLine();
+
             if(supblk.block_group_no > 0)
                 sb.AppendFormat("Block group number is {0}", supblk.block_group_no).AppendLine();
+
             if(supblk.desc_grp_size > 0)
                 sb.AppendFormat("Group descriptor size is {0} bytes", supblk.desc_grp_size).AppendLine();
+
             if(supblk.first_meta_bg > 0)
                 sb.AppendFormat("First metablock group is {0}", supblk.first_meta_bg).AppendLine();
-            if(supblk.raid_stride > 0) sb.AppendFormat("RAID stride: {0}", supblk.raid_stride).AppendLine();
+
+            if(supblk.raid_stride > 0)
+                sb.AppendFormat("RAID stride: {0}", supblk.raid_stride).AppendLine();
+
             if(supblk.raid_stripe_width > 0)
                 sb.AppendFormat("{0} blocks on all data disks", supblk.raid_stripe_width).AppendLine();
-            if(supblk.mmp_interval > 0 && supblk.mmp_block > 0)
+
+            if(supblk.mmp_interval > 0 &&
+               supblk.mmp_block    > 0)
                 sb.AppendFormat("{0} seconds for multi-mount protection wait, on block {1}", supblk.mmp_interval,
                                 supblk.mmp_block).AppendLine();
+
             if(supblk.flex_bg_grp_size > 0)
                 sb.AppendFormat("{0} Flexible block group size", supblk.flex_bg_grp_size).AppendLine();
-            if(supblk.hash_seed_1 > 0 && supblk.hash_seed_2 > 0 && supblk.hash_seed_3 > 0 && supblk.hash_seed_4 > 0)
+
+            if(supblk.hash_seed_1 > 0 &&
+               supblk.hash_seed_2 > 0 &&
+               supblk.hash_seed_3 > 0 &&
+               supblk.hash_seed_4 > 0)
                 sb.AppendFormat("Hash seed: {0:X8}{1:X8}{2:X8}{3:X8}, version {4}", supblk.hash_seed_1,
-                                supblk.hash_seed_2, supblk.hash_seed_3, supblk.hash_seed_4, supblk.hash_version)
-                  .AppendLine();
+                                supblk.hash_seed_2, supblk.hash_seed_3, supblk.hash_seed_4, supblk.hash_version).
+                   AppendLine();
 
             if((supblk.ftr_compat   & EXT3_FEATURE_COMPAT_HAS_JOURNAL)   == EXT3_FEATURE_COMPAT_HAS_JOURNAL ||
                (supblk.ftr_incompat & EXT3_FEATURE_INCOMPAT_JOURNAL_DEV) == EXT3_FEATURE_INCOMPAT_JOURNAL_DEV)
             {
                 sb.AppendLine("Volume is journaled");
+
                 if(supblk.journal_uuid != Guid.Empty)
                     sb.AppendFormat("Journal UUID: {0}", supblk.journal_uuid).AppendLine();
+
                 sb.AppendFormat("Journal has inode {0}", supblk.journal_inode).AppendLine();
+
                 if((supblk.ftr_compat & EXT3_FEATURE_INCOMPAT_JOURNAL_DEV) == EXT3_FEATURE_INCOMPAT_JOURNAL_DEV &&
                    supblk.journal_dev                                      > 0)
                     sb.AppendFormat("Journal is on device {0}", supblk.journal_dev).AppendLine();
+
                 if(supblk.jnl_backup_type > 0)
                     sb.AppendFormat("Journal backup type: {0}", supblk.jnl_backup_type).AppendLine();
+
                 if(supblk.last_orphan > 0)
                     sb.AppendFormat("Last orphaned inode is {0}", supblk.last_orphan).AppendLine();
-                else sb.AppendLine("There are no orphaned inodes");
+                else
+                    sb.AppendLine("There are no orphaned inodes");
             }
 
             if(ext4)
             {
                 if(supblk.snapshot_id > 0)
-                    sb
-                       .AppendFormat("Active snapshot has ID {0}, on inode {1}, with {2} blocks reserved, list starting on block {3}",
+                    sb.
+                        AppendFormat("Active snapshot has ID {0}, on inode {1}, with {2} blocks reserved, list starting on block {3}",
                                      supblk.snapshot_id, supblk.snapshot_inum, supblk.snapshot_blocks,
                                      supblk.snapshot_list).AppendLine();
 
                 if(supblk.error_count > 0)
                 {
                     sb.AppendFormat("{0} errors registered", supblk.error_count).AppendLine();
+
                     sb.AppendFormat("First error occurred on {0}, last on {1}",
                                     DateHandlers.UnixUnsignedToDateTime(supblk.first_error_t),
                                     DateHandlers.UnixUnsignedToDateTime(supblk.last_error_t)).AppendLine();
+
                     sb.AppendFormat("First error inode is {0}, last is {1}", supblk.first_error_inode,
                                     supblk.last_error_inode).AppendLine();
+
                     sb.AppendFormat("First error block is {0}, last is {1}", supblk.first_error_block,
                                     supblk.last_error_block).AppendLine();
+
                     sb.AppendFormat("First error function is \"{0}\", last is \"{1}\"", supblk.first_error_func,
                                     supblk.last_error_func).AppendLine();
                 }
             }
 
             sb.AppendFormat("Flags…:").AppendLine();
+
             if((supblk.flags & EXT2_FLAGS_SIGNED_HASH) == EXT2_FLAGS_SIGNED_HASH)
                 sb.AppendLine("Signed directory hash is in use");
+
             if((supblk.flags & EXT2_FLAGS_UNSIGNED_HASH) == EXT2_FLAGS_UNSIGNED_HASH)
                 sb.AppendLine("Unsigned directory hash is in use");
+
             if((supblk.flags & EXT2_FLAGS_TEST_FILESYS) == EXT2_FLAGS_TEST_FILESYS)
                 sb.AppendLine("Volume is testing development code");
-            if((supblk.flags & 0xFFFFFFF8) != 0) sb.AppendFormat("Unknown set flags: {0:X8}", supblk.flags);
+
+            if((supblk.flags & 0xFFFFFFF8) != 0)
+                sb.AppendFormat("Unknown set flags: {0:X8}", supblk.flags);
 
             sb.AppendLine();
 
             sb.AppendFormat("Default mount options…:").AppendLine();
+
             if((supblk.default_mnt_opts & EXT2_DEFM_DEBUG) == EXT2_DEFM_DEBUG)
                 sb.AppendLine("(debug): Enable debugging code");
+
             if((supblk.default_mnt_opts & EXT2_DEFM_BSDGROUPS) == EXT2_DEFM_BSDGROUPS)
                 sb.AppendLine("(bsdgroups): Emulate BSD behaviour when creating new files");
+
             if((supblk.default_mnt_opts & EXT2_DEFM_XATTR_USER) == EXT2_DEFM_XATTR_USER)
                 sb.AppendLine("(user_xattr): Enable user-specified extended attributes");
-            if((supblk.default_mnt_opts & EXT2_DEFM_ACL) == EXT2_DEFM_ACL) sb.AppendLine("(acl): Enable POSIX ACLs");
+
+            if((supblk.default_mnt_opts & EXT2_DEFM_ACL) == EXT2_DEFM_ACL)
+                sb.AppendLine("(acl): Enable POSIX ACLs");
+
             if((supblk.default_mnt_opts & EXT2_DEFM_UID16) == EXT2_DEFM_UID16)
                 sb.AppendLine("(uid16): Disable 32bit UIDs and GIDs");
+
             if((supblk.default_mnt_opts & EXT3_DEFM_JMODE_DATA) == EXT3_DEFM_JMODE_DATA)
                 sb.AppendLine("(journal_data): Journal data and metadata");
+
             if((supblk.default_mnt_opts & EXT3_DEFM_JMODE_ORDERED) == EXT3_DEFM_JMODE_ORDERED)
                 sb.AppendLine("(journal_data_ordered): Write data before journaling metadata");
+
             if((supblk.default_mnt_opts & EXT3_DEFM_JMODE_WBACK) == EXT3_DEFM_JMODE_WBACK)
                 sb.AppendLine("(journal_data_writeback): Write journal before data");
+
             if((supblk.default_mnt_opts & 0xFFFFFE20) != 0)
                 sb.AppendFormat("Unknown set default mount options: {0:X8}", supblk.default_mnt_opts);
 
             sb.AppendLine();
 
             sb.AppendFormat("Compatible features…:").AppendLine();
+
             if((supblk.ftr_compat & EXT2_FEATURE_COMPAT_DIR_PREALLOC) == EXT2_FEATURE_COMPAT_DIR_PREALLOC)
                 sb.AppendLine("Pre-allocate directories");
+
             if((supblk.ftr_compat & EXT2_FEATURE_COMPAT_IMAGIC_INODES) == EXT2_FEATURE_COMPAT_IMAGIC_INODES)
                 sb.AppendLine("imagic inodes ?");
+
             if((supblk.ftr_compat & EXT3_FEATURE_COMPAT_HAS_JOURNAL) == EXT3_FEATURE_COMPAT_HAS_JOURNAL)
                 sb.AppendLine("Has journal (ext3)");
+
             if((supblk.ftr_compat & EXT2_FEATURE_COMPAT_EXT_ATTR) == EXT2_FEATURE_COMPAT_EXT_ATTR)
                 sb.AppendLine("Has extended attribute blocks");
+
             if((supblk.ftr_compat & EXT2_FEATURE_COMPAT_RESIZE_INO) == EXT2_FEATURE_COMPAT_RESIZE_INO)
                 sb.AppendLine("Has online filesystem resize reservations");
+
             if((supblk.ftr_compat & EXT2_FEATURE_COMPAT_DIR_INDEX) == EXT2_FEATURE_COMPAT_DIR_INDEX)
                 sb.AppendLine("Can use hashed indexes on directories");
+
             if((supblk.ftr_compat & 0xFFFFFFC0) != 0)
                 sb.AppendFormat("Unknown compatible features: {0:X8}", supblk.ftr_compat);
 
             sb.AppendLine();
 
             sb.AppendFormat("Compatible features if read-only…:").AppendLine();
+
             if((supblk.ftr_ro_compat & EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER) == EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER)
                 sb.AppendLine("Reduced number of superblocks");
+
             if((supblk.ftr_ro_compat & EXT2_FEATURE_RO_COMPAT_LARGE_FILE) == EXT2_FEATURE_RO_COMPAT_LARGE_FILE)
                 sb.AppendLine("Can have files bigger than 2GiB");
+
             if((supblk.ftr_ro_compat & EXT2_FEATURE_RO_COMPAT_BTREE_DIR) == EXT2_FEATURE_RO_COMPAT_BTREE_DIR)
                 sb.AppendLine("Uses B-Tree for directories");
+
             if((supblk.ftr_ro_compat & EXT4_FEATURE_RO_COMPAT_HUGE_FILE) == EXT4_FEATURE_RO_COMPAT_HUGE_FILE)
                 sb.AppendLine("Can have files bigger than 2TiB (ext4)");
+
             if((supblk.ftr_ro_compat & EXT4_FEATURE_RO_COMPAT_GDT_CSUM) == EXT4_FEATURE_RO_COMPAT_GDT_CSUM)
                 sb.AppendLine("Group descriptor checksums and sparse inode table (ext4)");
+
             if((supblk.ftr_ro_compat & EXT4_FEATURE_RO_COMPAT_DIR_NLINK) == EXT4_FEATURE_RO_COMPAT_DIR_NLINK)
                 sb.AppendLine("More than 32000 directory entries (ext4)");
+
             if((supblk.ftr_ro_compat & EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE) == EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE)
                 sb.AppendLine("Supports nanosecond timestamps and creation time (ext4)");
+
             if((supblk.ftr_ro_compat & 0xFFFFFF80) != 0)
                 sb.AppendFormat("Unknown read-only compatible features: {0:X8}", supblk.ftr_ro_compat);
 
             sb.AppendLine();
 
             sb.AppendFormat("Incompatible features…:").AppendLine();
+
             if((supblk.ftr_incompat & EXT2_FEATURE_INCOMPAT_COMPRESSION) == EXT2_FEATURE_INCOMPAT_COMPRESSION)
                 sb.AppendLine("Uses compression");
+
             if((supblk.ftr_incompat & EXT2_FEATURE_INCOMPAT_FILETYPE) == EXT2_FEATURE_INCOMPAT_FILETYPE)
                 sb.AppendLine("Filetype in directory entries");
+
             if((supblk.ftr_incompat & EXT3_FEATURE_INCOMPAT_RECOVER) == EXT3_FEATURE_INCOMPAT_RECOVER)
                 sb.AppendLine("Journal needs recovery (ext3)");
+
             if((supblk.ftr_incompat & EXT3_FEATURE_INCOMPAT_JOURNAL_DEV) == EXT3_FEATURE_INCOMPAT_JOURNAL_DEV)
                 sb.AppendLine("Has journal on another device (ext3)");
+
             if((supblk.ftr_incompat & EXT2_FEATURE_INCOMPAT_META_BG) == EXT2_FEATURE_INCOMPAT_META_BG)
                 sb.AppendLine("Reduced block group backups");
+
             if((supblk.ftr_incompat & EXT4_FEATURE_INCOMPAT_EXTENTS) == EXT4_FEATURE_INCOMPAT_EXTENTS)
                 sb.AppendLine("Volume use extents (ext4)");
+
             if((supblk.ftr_incompat & EXT4_FEATURE_INCOMPAT_64BIT) == EXT4_FEATURE_INCOMPAT_64BIT)
                 sb.AppendLine("Supports volumes bigger than 2^32 blocks (ext4)");
+
             if((supblk.ftr_incompat & EXT4_FEATURE_INCOMPAT_MMP) == EXT4_FEATURE_INCOMPAT_MMP)
                 sb.AppendLine("Multi-mount protection (ext4)");
+
             if((supblk.ftr_incompat & EXT4_FEATURE_INCOMPAT_FLEX_BG) == EXT4_FEATURE_INCOMPAT_FLEX_BG)
                 sb.AppendLine("Flexible block group metadata location (ext4)");
+
             if((supblk.ftr_incompat & EXT4_FEATURE_INCOMPAT_EA_INODE) == EXT4_FEATURE_INCOMPAT_EA_INODE)
                 sb.AppendLine("Extended attributes can reside in inode (ext4)");
+
             if((supblk.ftr_incompat & EXT4_FEATURE_INCOMPAT_DIRDATA) == EXT4_FEATURE_INCOMPAT_DIRDATA)
                 sb.AppendLine("Data can reside in directory entry (ext4)");
+
             if((supblk.ftr_incompat & 0xFFFFF020) != 0)
                 sb.AppendFormat("Unknown incompatible features: {0:X8}", supblk.ftr_incompat);
 
             information = sb.ToString();
         }
 
-        /// <summary>
-        ///     ext2/3/4 superblock
-        /// </summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        [SuppressMessage("ReSharper", "InconsistentNaming")]
+        /// <summary>ext2/3/4 superblock</summary>
+        [StructLayout(LayoutKind.Sequential, Pack = 1), SuppressMessage("ReSharper", "InconsistentNaming")]
         struct ext2FSSuperBlock
         {
             /// <summary>0x000, inodes on volume</summary>
@@ -794,6 +904,7 @@ namespace Aaru.Filesystems
             public readonly byte encryption_level;
             /// <summary>0x173 Padding</summary>
             public readonly ushort padding;
+
             // Following are introduced with ext4
             /// <summary>0x174, Kibibytes written in volume lifetime</summary>
             public readonly ulong kbytes_written;
@@ -831,6 +942,7 @@ namespace Aaru.Filesystems
             /// <summary>0x1C8, 32 bytes, function where the error happened</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
             public readonly byte[] last_error_func;
+
             // End of optional error-handling features
 
             // 0x1D8, 64 bytes, last used mount options</summary>
diff --git a/Aaru.Filesystems/extFS.cs b/Aaru.Filesystems/extFS.cs
index 79d6f7857..0463c2fb5 100644
--- a/Aaru.Filesystems/extFS.cs
+++ b/Aaru.Filesystems/extFS.cs
@@ -44,9 +44,7 @@ namespace Aaru.Filesystems
     {
         const int SB_POS = 0x400;
 
-        /// <summary>
-        ///     ext superblock magic
-        /// </summary>
+        /// <summary>ext superblock magic</summary>
         const ushort EXT_MAGIC = 0x137D;
 
         public FileSystemType XmlFsType { get; private set; }
@@ -57,16 +55,20 @@ namespace Aaru.Filesystems
 
         public bool Identify(IMediaImage imagePlugin, Partition partition)
         {
-            if(imagePlugin.Info.SectorSize < 512) return false;
+            if(imagePlugin.Info.SectorSize < 512)
+                return false;
 
             ulong sbSectorOff = SB_POS / imagePlugin.Info.SectorSize;
             uint  sbOff       = SB_POS % imagePlugin.Info.SectorSize;
 
-            if(sbSectorOff + partition.Start >= partition.End) return false;
+            if(sbSectorOff + partition.Start >= partition.End)
+                return false;
 
             byte[] sbSector = imagePlugin.ReadSector(sbSectorOff + partition.Start);
             byte[] sb       = new byte[512];
-            if(sbOff + 512 > sbSector.Length) return false;
+
+            if(sbOff + 512 > sbSector.Length)
+                return false;
 
             Array.Copy(sbSector, sbOff, sb, 0, 512);
 
@@ -76,63 +78,60 @@ namespace Aaru.Filesystems
         }
 
         public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding    encoding)
+                                   Encoding encoding)
         {
             Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-15");
             information = "";
 
-            StringBuilder sb = new StringBuilder();
+            var sb = new StringBuilder();
 
-            if(imagePlugin.Info.SectorSize < 512) return;
+            if(imagePlugin.Info.SectorSize < 512)
+                return;
 
             ulong sbSectorOff = SB_POS / imagePlugin.Info.SectorSize;
             uint  sbOff       = SB_POS % imagePlugin.Info.SectorSize;
 
-            if(sbSectorOff + partition.Start >= partition.End) return;
+            if(sbSectorOff + partition.Start >= partition.End)
+                return;
 
             byte[] sblock   = imagePlugin.ReadSector(sbSectorOff + partition.Start);
             byte[] sbSector = new byte[512];
             Array.Copy(sblock, sbOff, sbSector, 0, 512);
 
-            extFSSuperBlock extSb = new extFSSuperBlock
+            var extSb = new extFSSuperBlock
             {
-                inodes        = BitConverter.ToUInt32(sbSector, 0x000),
-                zones         = BitConverter.ToUInt32(sbSector, 0x004),
+                inodes        = BitConverter.ToUInt32(sbSector, 0x000), zones = BitConverter.ToUInt32(sbSector, 0x004),
                 firstfreeblk  = BitConverter.ToUInt32(sbSector, 0x008),
                 freecountblk  = BitConverter.ToUInt32(sbSector, 0x00C),
                 firstfreeind  = BitConverter.ToUInt32(sbSector, 0x010),
                 freecountind  = BitConverter.ToUInt32(sbSector, 0x014),
                 firstdatazone = BitConverter.ToUInt32(sbSector, 0x018),
-                logzonesize   = BitConverter.ToUInt32(sbSector, 0x01C),
-                maxsize       = BitConverter.ToUInt32(sbSector, 0x020)
+                logzonesize   = BitConverter.ToUInt32(sbSector, 0x01C), maxsize = BitConverter.ToUInt32(sbSector, 0x020)
             };
 
             sb.AppendLine("ext filesystem");
-            sb.AppendFormat("{0} zones on volume",         extSb.zones);
+            sb.AppendFormat("{0} zones on volume", extSb.zones);
             sb.AppendFormat("{0} free blocks ({1} bytes)", extSb.freecountblk, extSb.freecountblk * 1024);
+
             sb.AppendFormat("{0} inodes on volume, {1} free ({2}%)", extSb.inodes, extSb.freecountind,
-                            extSb.freecountind * 100 / extSb.inodes);
+                            (extSb.freecountind * 100) / extSb.inodes);
+
             sb.AppendFormat("First free inode is {0}", extSb.firstfreeind);
             sb.AppendFormat("First free block is {0}", extSb.firstfreeblk);
-            sb.AppendFormat("First data zone is {0}",  extSb.firstdatazone);
-            sb.AppendFormat("Log zone size: {0}",      extSb.logzonesize);
-            sb.AppendFormat("Max zone size: {0}",      extSb.maxsize);
+            sb.AppendFormat("First data zone is {0}", extSb.firstdatazone);
+            sb.AppendFormat("Log zone size: {0}", extSb.logzonesize);
+            sb.AppendFormat("Max zone size: {0}", extSb.maxsize);
 
             XmlFsType = new FileSystemType
             {
-                Type                  = "ext",
-                FreeClusters          = extSb.freecountblk,
-                FreeClustersSpecified = true,
-                ClusterSize           = 1024,
-                Clusters              = (partition.End - partition.Start + 1) * imagePlugin.Info.SectorSize / 1024
+                Type     = "ext", FreeClusters = extSb.freecountblk, FreeClustersSpecified = true, ClusterSize = 1024,
+                Clusters = (((partition.End - partition.Start) + 1) * imagePlugin.Info.SectorSize) / 1024
             };
 
             information = sb.ToString();
         }
 
-        /// <summary>
-        ///     ext superblock
-        /// </summary>
+        /// <summary>ext superblock</summary>
         [SuppressMessage("ReSharper", "InconsistentNaming")]
         struct extFSSuperBlock
         {
diff --git a/Aaru.Filters/AppleDouble.cs b/Aaru.Filters/AppleDouble.cs
index 7140e7f76..54822fdba 100644
--- a/Aaru.Filters/AppleDouble.cs
+++ b/Aaru.Filters/AppleDouble.cs
@@ -39,9 +39,7 @@ using Marshal = Aaru.Helpers.Marshal;
 
 namespace Aaru.Filters
 {
-    /// <summary>
-    ///     Decodes AppleDouble files
-    /// </summary>
+    /// <summary>Decodes AppleDouble files</summary>
     public class AppleDouble : IFilter
     {
         const uint AppleDoubleMagic    = 0x00051607;
@@ -86,10 +84,7 @@ namespace Aaru.Filters
         public Guid   Id     => new Guid("1B2165EE-C9DF-4B21-BBBB-9E5892B2DF4D");
         public string Author => "Natalia Portillo";
 
-        public void Close()
-        {
-            opened = false;
-        }
+        public void Close() => opened = false;
 
         public string GetBasePath() => basePath;
 
@@ -113,10 +108,11 @@ namespace Aaru.Filters
 
         public Stream GetResourceForkStream()
         {
-            if(rsrcFork.length == 0) return null;
+            if(rsrcFork.length == 0)
+                return null;
 
             return new OffsetStream(headerPath, FileMode.Open, FileAccess.Read, rsrcFork.offset,
-                                    rsrcFork.offset + rsrcFork.length - 1);
+                                    (rsrcFork.offset + rsrcFork.length) - 1);
         }
 
         public bool HasResourceFork() => rsrcFork.length > 0;
@@ -132,157 +128,186 @@ namespace Aaru.Filters
             string parentFolder  = Path.GetDirectoryName(path);
 
             parentFolder = parentFolder ?? "";
-            if(filename is null || filenameNoExt is null) return false;
+
+            if(filename is null ||
+               filenameNoExt is null)
+                return false;
 
             // Prepend data fork name with "R."
             string ProDosAppleDouble = Path.Combine(parentFolder, "R." + filename);
+
             // Prepend data fork name with '%'
             string UNIXAppleDouble = Path.Combine(parentFolder, "%" + filename);
+
             // Change file extension to ADF
             string DOSAppleDouble = Path.Combine(parentFolder, filenameNoExt + ".ADF");
+
             // Change file extension to adf
             string DOSAppleDoubleLower = Path.Combine(parentFolder, filenameNoExt + ".adf");
+
             // Store AppleDouble header file in ".AppleDouble" folder with same name
             string NetatalkAppleDouble = Path.Combine(parentFolder, ".AppleDouble", filename);
+
             // Store AppleDouble header file in "resource.frk" folder with same name
             string DAVEAppleDouble = Path.Combine(parentFolder, "resource.frk", filename);
+
             // Prepend data fork name with "._"
             string OSXAppleDouble = Path.Combine(parentFolder, "._" + filename);
+
             // Adds ".rsrc" extension
             string UnArAppleDouble = Path.Combine(parentFolder, filename + ".rsrc");
 
             // Check AppleDouble created by A/UX in ProDOS filesystem
             if(File.Exists(ProDosAppleDouble))
             {
-                FileStream prodosStream = new FileStream(ProDosAppleDouble, FileMode.Open, FileAccess.Read);
+                var prodosStream = new FileStream(ProDosAppleDouble, FileMode.Open, FileAccess.Read);
+
                 if(prodosStream.Length > 26)
                 {
                     byte[] prodos_b = new byte[26];
                     prodosStream.Read(prodos_b, 0, 26);
                     header = Marshal.ByteArrayToStructureBigEndian<AppleDoubleHeader>(prodos_b);
                     prodosStream.Close();
+
                     if(header.magic == AppleDoubleMagic &&
-                       (header.version == AppleDoubleVersion || header.version == AppleDoubleVersion2)) return true;
+                       (header.version == AppleDoubleVersion || header.version == AppleDoubleVersion2))
+                        return true;
                 }
             }
 
             // Check AppleDouble created by A/UX in UFS filesystem
             if(File.Exists(UNIXAppleDouble))
             {
-                FileStream unixStream = new FileStream(UNIXAppleDouble, FileMode.Open, FileAccess.Read);
+                var unixStream = new FileStream(UNIXAppleDouble, FileMode.Open, FileAccess.Read);
+
                 if(unixStream.Length > 26)
                 {
                     byte[] unix_b = new byte[26];
                     unixStream.Read(unix_b, 0, 26);
                     header = Marshal.ByteArrayToStructureBigEndian<AppleDoubleHeader>(unix_b);
                     unixStream.Close();
+
                     if(header.magic == AppleDoubleMagic &&
-                       (header.version == AppleDoubleVersion || header.version == AppleDoubleVersion2)) return true;
+                       (header.version == AppleDoubleVersion || header.version == AppleDoubleVersion2))
+                        return true;
                 }
             }
 
             // Check AppleDouble created by A/UX in FAT filesystem
             if(File.Exists(DOSAppleDouble))
             {
-                FileStream dosStream = new FileStream(DOSAppleDouble, FileMode.Open, FileAccess.Read);
+                var dosStream = new FileStream(DOSAppleDouble, FileMode.Open, FileAccess.Read);
+
                 if(dosStream.Length > 26)
                 {
                     byte[] dos_b = new byte[26];
                     dosStream.Read(dos_b, 0, 26);
                     header = Marshal.ByteArrayToStructureBigEndian<AppleDoubleHeader>(dos_b);
                     dosStream.Close();
+
                     if(header.magic == AppleDoubleMagic &&
-                       (header.version == AppleDoubleVersion || header.version == AppleDoubleVersion2)) return true;
+                       (header.version == AppleDoubleVersion || header.version == AppleDoubleVersion2))
+                        return true;
                 }
             }
 
             // Check AppleDouble created by A/UX in case preserving FAT filesystem
             if(File.Exists(DOSAppleDoubleLower))
             {
-                FileStream doslStream = new FileStream(DOSAppleDoubleLower, FileMode.Open, FileAccess.Read);
+                var doslStream = new FileStream(DOSAppleDoubleLower, FileMode.Open, FileAccess.Read);
+
                 if(doslStream.Length > 26)
                 {
                     byte[] dosl_b = new byte[26];
                     doslStream.Read(dosl_b, 0, 26);
                     header = Marshal.ByteArrayToStructureBigEndian<AppleDoubleHeader>(dosl_b);
                     doslStream.Close();
+
                     if(header.magic == AppleDoubleMagic &&
-                       (header.version == AppleDoubleVersion || header.version == AppleDoubleVersion2)) return true;
+                       (header.version == AppleDoubleVersion || header.version == AppleDoubleVersion2))
+                        return true;
                 }
             }
 
             // Check AppleDouble created by Netatalk
             if(File.Exists(NetatalkAppleDouble))
             {
-                FileStream netatalkStream = new FileStream(NetatalkAppleDouble, FileMode.Open, FileAccess.Read);
+                var netatalkStream = new FileStream(NetatalkAppleDouble, FileMode.Open, FileAccess.Read);
+
                 if(netatalkStream.Length > 26)
                 {
                     byte[] netatalk_b = new byte[26];
                     netatalkStream.Read(netatalk_b, 0, 26);
                     header = Marshal.ByteArrayToStructureBigEndian<AppleDoubleHeader>(netatalk_b);
                     netatalkStream.Close();
+
                     if(header.magic == AppleDoubleMagic &&
-                       (header.version == AppleDoubleVersion || header.version == AppleDoubleVersion2)) return true;
+                       (header.version == AppleDoubleVersion || header.version == AppleDoubleVersion2))
+                        return true;
                 }
             }
 
             // Check AppleDouble created by DAVE
             if(File.Exists(DAVEAppleDouble))
             {
-                FileStream daveStream = new FileStream(DAVEAppleDouble, FileMode.Open, FileAccess.Read);
+                var daveStream = new FileStream(DAVEAppleDouble, FileMode.Open, FileAccess.Read);
+
                 if(daveStream.Length > 26)
                 {
                     byte[] dave_b = new byte[26];
                     daveStream.Read(dave_b, 0, 26);
                     header = Marshal.ByteArrayToStructureBigEndian<AppleDoubleHeader>(dave_b);
                     daveStream.Close();
+
                     if(header.magic == AppleDoubleMagic &&
-                       (header.version == AppleDoubleVersion || header.version == AppleDoubleVersion2)) return true;
+                       (header.version == AppleDoubleVersion || header.version == AppleDoubleVersion2))
+                        return true;
                 }
             }
 
             // Check AppleDouble created by Mac OS X
             if(File.Exists(OSXAppleDouble))
             {
-                FileStream osxStream = new FileStream(OSXAppleDouble, FileMode.Open, FileAccess.Read);
+                var osxStream = new FileStream(OSXAppleDouble, FileMode.Open, FileAccess.Read);
+
                 if(osxStream.Length > 26)
                 {
                     byte[] osx_b = new byte[26];
                     osxStream.Read(osx_b, 0, 26);
                     header = Marshal.ByteArrayToStructureBigEndian<AppleDoubleHeader>(osx_b);
                     osxStream.Close();
+
                     if(header.magic == AppleDoubleMagic &&
-                       (header.version == AppleDoubleVersion || header.version == AppleDoubleVersion2)) return true;
+                       (header.version == AppleDoubleVersion || header.version == AppleDoubleVersion2))
+                        return true;
                 }
             }
 
             // Check AppleDouble created by UnAr (from The Unarchiver)
-            if(!File.Exists(UnArAppleDouble)) return false;
+            if(!File.Exists(UnArAppleDouble))
+                return false;
 
-            FileStream unarStream = new FileStream(UnArAppleDouble, FileMode.Open, FileAccess.Read);
-            if(unarStream.Length <= 26) return false;
+            var unarStream = new FileStream(UnArAppleDouble, FileMode.Open, FileAccess.Read);
+
+            if(unarStream.Length <= 26)
+                return false;
 
             byte[] unar_b = new byte[26];
             unarStream.Read(unar_b, 0, 26);
             header = Marshal.ByteArrayToStructureBigEndian<AppleDoubleHeader>(unar_b);
             unarStream.Close();
+
             return header.magic == AppleDoubleMagic &&
                    (header.version == AppleDoubleVersion || header.version == AppleDoubleVersion2);
         }
 
         public bool IsOpened() => opened;
 
-        public void Open(byte[] buffer)
-        {
-            // Now way to have two files in a single byte array
-            throw new NotSupportedException();
-        }
+        // Now way to have two files in a single byte array
+        public void Open(byte[] buffer) => throw new NotSupportedException();
 
-        public void Open(Stream stream)
-        {
-            // Now way to have two files in a single stream
-            throw new NotSupportedException();
-        }
+        // Now way to have two files in a single stream
+        public void Open(Stream stream) => throw new NotSupportedException();
 
         public void Open(string path)
         {
@@ -291,35 +316,47 @@ namespace Aaru.Filters
             string parentFolder  = Path.GetDirectoryName(path);
 
             parentFolder = parentFolder ?? "";
-            if(filename is null || filenameNoExt is null) throw new ArgumentNullException(nameof(path));
+
+            if(filename is null ||
+               filenameNoExt is null)
+                throw new ArgumentNullException(nameof(path));
 
             // Prepend data fork name with "R."
             string ProDosAppleDouble = Path.Combine(parentFolder, "R." + filename);
+
             // Prepend data fork name with '%'
             string UNIXAppleDouble = Path.Combine(parentFolder, "%" + filename);
+
             // Change file extension to ADF
             string DOSAppleDouble = Path.Combine(parentFolder, filenameNoExt + ".ADF");
+
             // Change file extension to adf
             string DOSAppleDoubleLower = Path.Combine(parentFolder, filenameNoExt + ".adf");
+
             // Store AppleDouble header file in ".AppleDouble" folder with same name
             string NetatalkAppleDouble = Path.Combine(parentFolder, ".AppleDouble", filename);
+
             // Store AppleDouble header file in "resource.frk" folder with same name
             string DAVEAppleDouble = Path.Combine(parentFolder, "resource.frk", filename);
+
             // Prepend data fork name with "._"
             string OSXAppleDouble = Path.Combine(parentFolder, "._" + filename);
+
             // Adds ".rsrc" extension
             string UnArAppleDouble = Path.Combine(parentFolder, filename + ".rsrc");
 
             // Check AppleDouble created by A/UX in ProDOS filesystem
             if(File.Exists(ProDosAppleDouble))
             {
-                FileStream prodosStream = new FileStream(ProDosAppleDouble, FileMode.Open, FileAccess.Read);
+                var prodosStream = new FileStream(ProDosAppleDouble, FileMode.Open, FileAccess.Read);
+
                 if(prodosStream.Length > 26)
                 {
                     byte[] prodos_b = new byte[26];
                     prodosStream.Read(prodos_b, 0, 26);
                     header = Marshal.ByteArrayToStructureBigEndian<AppleDoubleHeader>(prodos_b);
                     prodosStream.Close();
+
                     if(header.magic == AppleDoubleMagic &&
                        (header.version == AppleDoubleVersion || header.version == AppleDoubleVersion2))
                         headerPath = ProDosAppleDouble;
@@ -329,13 +366,15 @@ namespace Aaru.Filters
             // Check AppleDouble created by A/UX in UFS filesystem
             if(File.Exists(UNIXAppleDouble))
             {
-                FileStream unixStream = new FileStream(UNIXAppleDouble, FileMode.Open, FileAccess.Read);
+                var unixStream = new FileStream(UNIXAppleDouble, FileMode.Open, FileAccess.Read);
+
                 if(unixStream.Length > 26)
                 {
                     byte[] unix_b = new byte[26];
                     unixStream.Read(unix_b, 0, 26);
                     header = Marshal.ByteArrayToStructureBigEndian<AppleDoubleHeader>(unix_b);
                     unixStream.Close();
+
                     if(header.magic == AppleDoubleMagic &&
                        (header.version == AppleDoubleVersion || header.version == AppleDoubleVersion2))
                         headerPath = UNIXAppleDouble;
@@ -345,13 +384,15 @@ namespace Aaru.Filters
             // Check AppleDouble created by A/UX in FAT filesystem
             if(File.Exists(DOSAppleDouble))
             {
-                FileStream dosStream = new FileStream(DOSAppleDouble, FileMode.Open, FileAccess.Read);
+                var dosStream = new FileStream(DOSAppleDouble, FileMode.Open, FileAccess.Read);
+
                 if(dosStream.Length > 26)
                 {
                     byte[] dos_b = new byte[26];
                     dosStream.Read(dos_b, 0, 26);
                     header = Marshal.ByteArrayToStructureBigEndian<AppleDoubleHeader>(dos_b);
                     dosStream.Close();
+
                     if(header.magic == AppleDoubleMagic &&
                        (header.version == AppleDoubleVersion || header.version == AppleDoubleVersion2))
                         headerPath = DOSAppleDouble;
@@ -361,13 +402,15 @@ namespace Aaru.Filters
             // Check AppleDouble created by A/UX in case preserving FAT filesystem
             if(File.Exists(DOSAppleDoubleLower))
             {
-                FileStream doslStream = new FileStream(DOSAppleDoubleLower, FileMode.Open, FileAccess.Read);
+                var doslStream = new FileStream(DOSAppleDoubleLower, FileMode.Open, FileAccess.Read);
+
                 if(doslStream.Length > 26)
                 {
                     byte[] dosl_b = new byte[26];
                     doslStream.Read(dosl_b, 0, 26);
                     header = Marshal.ByteArrayToStructureBigEndian<AppleDoubleHeader>(dosl_b);
                     doslStream.Close();
+
                     if(header.magic == AppleDoubleMagic &&
                        (header.version == AppleDoubleVersion || header.version == AppleDoubleVersion2))
                         headerPath = DOSAppleDoubleLower;
@@ -377,13 +420,15 @@ namespace Aaru.Filters
             // Check AppleDouble created by Netatalk
             if(File.Exists(NetatalkAppleDouble))
             {
-                FileStream netatalkStream = new FileStream(NetatalkAppleDouble, FileMode.Open, FileAccess.Read);
+                var netatalkStream = new FileStream(NetatalkAppleDouble, FileMode.Open, FileAccess.Read);
+
                 if(netatalkStream.Length > 26)
                 {
                     byte[] netatalk_b = new byte[26];
                     netatalkStream.Read(netatalk_b, 0, 26);
                     header = Marshal.ByteArrayToStructureBigEndian<AppleDoubleHeader>(netatalk_b);
                     netatalkStream.Close();
+
                     if(header.magic == AppleDoubleMagic &&
                        (header.version == AppleDoubleVersion || header.version == AppleDoubleVersion2))
                         headerPath = NetatalkAppleDouble;
@@ -393,13 +438,15 @@ namespace Aaru.Filters
             // Check AppleDouble created by DAVE
             if(File.Exists(DAVEAppleDouble))
             {
-                FileStream daveStream = new FileStream(DAVEAppleDouble, FileMode.Open, FileAccess.Read);
+                var daveStream = new FileStream(DAVEAppleDouble, FileMode.Open, FileAccess.Read);
+
                 if(daveStream.Length > 26)
                 {
                     byte[] dave_b = new byte[26];
                     daveStream.Read(dave_b, 0, 26);
                     header = Marshal.ByteArrayToStructureBigEndian<AppleDoubleHeader>(dave_b);
                     daveStream.Close();
+
                     if(header.magic == AppleDoubleMagic &&
                        (header.version == AppleDoubleVersion || header.version == AppleDoubleVersion2))
                         headerPath = DAVEAppleDouble;
@@ -409,13 +456,15 @@ namespace Aaru.Filters
             // Check AppleDouble created by Mac OS X
             if(File.Exists(OSXAppleDouble))
             {
-                FileStream osxStream = new FileStream(OSXAppleDouble, FileMode.Open, FileAccess.Read);
+                var osxStream = new FileStream(OSXAppleDouble, FileMode.Open, FileAccess.Read);
+
                 if(osxStream.Length > 26)
                 {
                     byte[] osx_b = new byte[26];
                     osxStream.Read(osx_b, 0, 26);
                     header = Marshal.ByteArrayToStructureBigEndian<AppleDoubleHeader>(osx_b);
                     osxStream.Close();
+
                     if(header.magic == AppleDoubleMagic &&
                        (header.version == AppleDoubleVersion || header.version == AppleDoubleVersion2))
                         headerPath = OSXAppleDouble;
@@ -425,20 +474,22 @@ namespace Aaru.Filters
             // Check AppleDouble created by UnAr (from The Unarchiver)
             if(File.Exists(UnArAppleDouble))
             {
-                FileStream unarStream = new FileStream(UnArAppleDouble, FileMode.Open, FileAccess.Read);
+                var unarStream = new FileStream(UnArAppleDouble, FileMode.Open, FileAccess.Read);
+
                 if(unarStream.Length > 26)
                 {
                     byte[] unar_b = new byte[26];
                     unarStream.Read(unar_b, 0, 26);
                     header = Marshal.ByteArrayToStructureBigEndian<AppleDoubleHeader>(unar_b);
                     unarStream.Close();
+
                     if(header.magic == AppleDoubleMagic &&
                        (header.version == AppleDoubleVersion || header.version == AppleDoubleVersion2))
                         headerPath = UnArAppleDouble;
                 }
             }
 
-            FileStream fs = new FileStream(headerPath, FileMode.Open, FileAccess.Read);
+            var fs = new FileStream(headerPath, FileMode.Open, FileAccess.Read);
             fs.Seek(0, SeekOrigin.Begin);
 
             byte[] hdr_b = new byte[26];
@@ -446,6 +497,7 @@ namespace Aaru.Filters
             header = Marshal.ByteArrayToStructureBigEndian<AppleDoubleHeader>(hdr_b);
 
             AppleDoubleEntry[] entries = new AppleDoubleEntry[header.entries];
+
             for(int i = 0; i < header.entries; i++)
             {
                 byte[] entry = new byte[12];
@@ -455,6 +507,7 @@ namespace Aaru.Filters
 
             creationTime  = DateTime.UtcNow;
             lastWriteTime = creationTime;
+
             foreach(AppleDoubleEntry entry in entries)
                 switch((AppleDoubleEntryID)entry.id)
                 {
@@ -465,19 +518,24 @@ namespace Aaru.Filters
                         fs.Seek(entry.offset, SeekOrigin.Begin);
                         byte[] dates_b = new byte[16];
                         fs.Read(dates_b, 0, 16);
+
                         AppleDoubleFileDates dates =
                             Marshal.ByteArrayToStructureBigEndian<AppleDoubleFileDates>(dates_b);
+
                         creationTime  = DateHandlers.UnixUnsignedToDateTime(dates.creationDate);
                         lastWriteTime = DateHandlers.UnixUnsignedToDateTime(dates.modificationDate);
+
                         break;
                     case AppleDoubleEntryID.FileInfo:
                         fs.Seek(entry.offset, SeekOrigin.Begin);
                         byte[] finfo = new byte[entry.length];
                         fs.Read(finfo, 0, finfo.Length);
+
                         if(MacintoshHome.SequenceEqual(header.homeFilesystem))
                         {
                             AppleDoubleMacFileInfo macinfo =
                                 Marshal.ByteArrayToStructureBigEndian<AppleDoubleMacFileInfo>(finfo);
+
                             creationTime  = DateHandlers.MacToDateTime(macinfo.creationDate);
                             lastWriteTime = DateHandlers.MacToDateTime(macinfo.modificationDate);
                         }
@@ -485,6 +543,7 @@ namespace Aaru.Filters
                         {
                             AppleDoubleProDOSFileInfo prodosinfo =
                                 Marshal.ByteArrayToStructureBigEndian<AppleDoubleProDOSFileInfo>(finfo);
+
                             creationTime  = DateHandlers.MacToDateTime(prodosinfo.creationDate);
                             lastWriteTime = DateHandlers.MacToDateTime(prodosinfo.modificationDate);
                         }
@@ -492,6 +551,7 @@ namespace Aaru.Filters
                         {
                             AppleDoubleUNIXFileInfo unixinfo =
                                 Marshal.ByteArrayToStructureBigEndian<AppleDoubleUNIXFileInfo>(finfo);
+
                             creationTime  = DateHandlers.UnixUnsignedToDateTime(unixinfo.creationDate);
                             lastWriteTime = DateHandlers.UnixUnsignedToDateTime(unixinfo.modificationDate);
                         }
@@ -499,6 +559,7 @@ namespace Aaru.Filters
                         {
                             AppleDoubleDOSFileInfo dosinfo =
                                 Marshal.ByteArrayToStructureBigEndian<AppleDoubleDOSFileInfo>(finfo);
+
                             lastWriteTime =
                                 DateHandlers.DosToDateTime(dosinfo.modificationDate, dosinfo.modificationTime);
                         }
@@ -506,13 +567,18 @@ namespace Aaru.Filters
                         break;
                     case AppleDoubleEntryID.ResourceFork:
                         rsrcFork = entry;
+
                         break;
                 }
 
-            dataFork = new AppleDoubleEntry {id = (uint)AppleDoubleEntryID.DataFork};
+            dataFork = new AppleDoubleEntry
+            {
+                id = (uint)AppleDoubleEntryID.DataFork
+            };
+
             if(File.Exists(path))
             {
-                FileStream dataFs = new FileStream(path, FileMode.Open, FileAccess.Read);
+                var dataFs = new FileStream(path, FileMode.Open, FileAccess.Read);
                 dataFork.length = (uint)dataFs.Length;
                 dataFs.Close();
             }
@@ -524,22 +590,12 @@ namespace Aaru.Filters
 
         enum AppleDoubleEntryID : uint
         {
-            Invalid        = 0,
-            DataFork       = 1,
-            ResourceFork   = 2,
-            RealName       = 3,
-            Comment        = 4,
-            Icon           = 5,
-            ColorIcon      = 6,
-            FileInfo       = 7,
-            FileDates      = 8,
-            FinderInfo     = 9,
-            MacFileInfo    = 10,
-            ProDOSFileInfo = 11,
-            DOSFileInfo    = 12,
-            ShortName      = 13,
-            AFPFileInfo    = 14,
-            DirectoryID    = 15
+            Invalid     = 0, DataFork    = 1, ResourceFork    = 2,
+            RealName    = 3, Comment     = 4, Icon            = 5,
+            ColorIcon   = 6, FileInfo    = 7, FileDates       = 8,
+            FinderInfo  = 9, MacFileInfo = 10, ProDOSFileInfo = 11,
+            DOSFileInfo = 12, ShortName  = 13, AFPFileInfo    = 14,
+            DirectoryID = 15
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
diff --git a/Aaru.Filters/AppleSingle.cs b/Aaru.Filters/AppleSingle.cs
index a929c22be..e7c8f187b 100644
--- a/Aaru.Filters/AppleSingle.cs
+++ b/Aaru.Filters/AppleSingle.cs
@@ -39,9 +39,7 @@ using Marshal = Aaru.Helpers.Marshal;
 
 namespace Aaru.Filters
 {
-    /// <summary>
-    ///     Decodes AppleSingle files
-    /// </summary>
+    /// <summary>Decodes AppleSingle files</summary>
     public class AppleSingle : IFilter
     {
         const uint AppleSingleMagic    = 0x00051600;
@@ -105,13 +103,18 @@ namespace Aaru.Filters
 
         public Stream GetDataForkStream()
         {
-            if(dataFork.length == 0) return null;
+            if(dataFork.length == 0)
+                return null;
+
+            if(isBytes)
+                return new OffsetStream(bytes, dataFork.offset, (dataFork.offset + dataFork.length) - 1);
+
+            if(isStream)
+                return new OffsetStream(stream, dataFork.offset, (dataFork.offset + dataFork.length) - 1);
 
-            if(isBytes) return new OffsetStream(bytes,   dataFork.offset, dataFork.offset + dataFork.length - 1);
-            if(isStream) return new OffsetStream(stream, dataFork.offset, dataFork.offset + dataFork.length - 1);
             if(isPath)
                 return new OffsetStream(basePath, FileMode.Open, FileAccess.Read, dataFork.offset,
-                                        dataFork.offset + dataFork.length - 1);
+                                        (dataFork.offset + dataFork.length) - 1);
 
             return null;
         }
@@ -130,13 +133,18 @@ namespace Aaru.Filters
 
         public Stream GetResourceForkStream()
         {
-            if(rsrcFork.length == 0) return null;
+            if(rsrcFork.length == 0)
+                return null;
+
+            if(isBytes)
+                return new OffsetStream(bytes, rsrcFork.offset, (rsrcFork.offset + rsrcFork.length) - 1);
+
+            if(isStream)
+                return new OffsetStream(stream, rsrcFork.offset, (rsrcFork.offset + rsrcFork.length) - 1);
 
-            if(isBytes) return new OffsetStream(bytes,   rsrcFork.offset, rsrcFork.offset + rsrcFork.length - 1);
-            if(isStream) return new OffsetStream(stream, rsrcFork.offset, rsrcFork.offset + rsrcFork.length - 1);
             if(isPath)
                 return new OffsetStream(basePath, FileMode.Open, FileAccess.Read, rsrcFork.offset,
-                                        rsrcFork.offset + rsrcFork.length - 1);
+                                        (rsrcFork.offset + rsrcFork.length) - 1);
 
             return null;
         }
@@ -145,7 +153,9 @@ namespace Aaru.Filters
 
         public bool Identify(byte[] buffer)
         {
-            if(buffer == null || buffer.Length < 26) return false;
+            if(buffer        == null ||
+               buffer.Length < 26)
+                return false;
 
             byte[] hdr_b = new byte[26];
             Array.Copy(buffer, 0, hdr_b, 0, 26);
@@ -157,7 +167,9 @@ namespace Aaru.Filters
 
         public bool Identify(Stream stream)
         {
-            if(stream == null || stream.Length < 26) return false;
+            if(stream        == null ||
+               stream.Length < 26)
+                return false;
 
             byte[] hdr_b = new byte[26];
             stream.Seek(0, SeekOrigin.Begin);
@@ -170,14 +182,17 @@ namespace Aaru.Filters
 
         public bool Identify(string path)
         {
-            FileStream fstream = new FileStream(path, FileMode.Open, FileAccess.Read);
-            if(fstream.Length < 26) return false;
+            var fstream = new FileStream(path, FileMode.Open, FileAccess.Read);
+
+            if(fstream.Length < 26)
+                return false;
 
             byte[] hdr_b = new byte[26];
             fstream.Read(hdr_b, 0, 26);
             header = Marshal.ByteArrayToStructureBigEndian<AppleSingleHeader>(hdr_b);
 
             fstream.Close();
+
             return header.magic == AppleSingleMagic &&
                    (header.version == AppleSingleVersion || header.version == AppleSingleVersion2);
         }
@@ -186,7 +201,7 @@ namespace Aaru.Filters
 
         public void Open(byte[] buffer)
         {
-            MemoryStream ms = new MemoryStream(buffer);
+            var ms = new MemoryStream(buffer);
             ms.Seek(0, SeekOrigin.Begin);
 
             byte[] hdr_b = new byte[26];
@@ -194,6 +209,7 @@ namespace Aaru.Filters
             header = Marshal.ByteArrayToStructureBigEndian<AppleSingleHeader>(hdr_b);
 
             AppleSingleEntry[] entries = new AppleSingleEntry[header.entries];
+
             for(int i = 0; i < header.entries; i++)
             {
                 byte[] entry = new byte[12];
@@ -203,29 +219,36 @@ namespace Aaru.Filters
 
             creationTime  = DateTime.UtcNow;
             lastWriteTime = creationTime;
+
             foreach(AppleSingleEntry entry in entries)
                 switch((AppleSingleEntryID)entry.id)
                 {
                     case AppleSingleEntryID.DataFork:
                         dataFork = entry;
+
                         break;
                     case AppleSingleEntryID.FileDates:
                         ms.Seek(entry.offset, SeekOrigin.Begin);
                         byte[] dates_b = new byte[16];
                         ms.Read(dates_b, 0, 16);
+
                         AppleSingleFileDates dates =
                             Marshal.ByteArrayToStructureBigEndian<AppleSingleFileDates>(dates_b);
+
                         creationTime  = DateHandlers.UnixUnsignedToDateTime(dates.creationDate);
                         lastWriteTime = DateHandlers.UnixUnsignedToDateTime(dates.modificationDate);
+
                         break;
                     case AppleSingleEntryID.FileInfo:
                         ms.Seek(entry.offset, SeekOrigin.Begin);
                         byte[] finfo = new byte[entry.length];
                         ms.Read(finfo, 0, finfo.Length);
+
                         if(MacintoshHome.SequenceEqual(header.homeFilesystem))
                         {
                             AppleSingleMacFileInfo macinfo =
                                 Marshal.ByteArrayToStructureBigEndian<AppleSingleMacFileInfo>(finfo);
+
                             creationTime  = DateHandlers.MacToDateTime(macinfo.creationDate);
                             lastWriteTime = DateHandlers.MacToDateTime(macinfo.modificationDate);
                         }
@@ -233,6 +256,7 @@ namespace Aaru.Filters
                         {
                             AppleSingleProDOSFileInfo prodosinfo =
                                 Marshal.ByteArrayToStructureBigEndian<AppleSingleProDOSFileInfo>(finfo);
+
                             creationTime  = DateHandlers.MacToDateTime(prodosinfo.creationDate);
                             lastWriteTime = DateHandlers.MacToDateTime(prodosinfo.modificationDate);
                         }
@@ -240,6 +264,7 @@ namespace Aaru.Filters
                         {
                             AppleSingleUNIXFileInfo unixinfo =
                                 Marshal.ByteArrayToStructureBigEndian<AppleSingleUNIXFileInfo>(finfo);
+
                             creationTime  = DateHandlers.UnixUnsignedToDateTime(unixinfo.creationDate);
                             lastWriteTime = DateHandlers.UnixUnsignedToDateTime(unixinfo.modificationDate);
                         }
@@ -247,6 +272,7 @@ namespace Aaru.Filters
                         {
                             AppleSingleDOSFileInfo dosinfo =
                                 Marshal.ByteArrayToStructureBigEndian<AppleSingleDOSFileInfo>(finfo);
+
                             lastWriteTime =
                                 DateHandlers.DosToDateTime(dosinfo.modificationDate, dosinfo.modificationTime);
                         }
@@ -254,6 +280,7 @@ namespace Aaru.Filters
                         break;
                     case AppleSingleEntryID.ResourceFork:
                         rsrcFork = entry;
+
                         break;
                 }
 
@@ -272,6 +299,7 @@ namespace Aaru.Filters
             header = Marshal.ByteArrayToStructureBigEndian<AppleSingleHeader>(hdr_b);
 
             AppleSingleEntry[] entries = new AppleSingleEntry[header.entries];
+
             for(int i = 0; i < header.entries; i++)
             {
                 byte[] entry = new byte[12];
@@ -281,29 +309,36 @@ namespace Aaru.Filters
 
             creationTime  = DateTime.UtcNow;
             lastWriteTime = creationTime;
+
             foreach(AppleSingleEntry entry in entries)
                 switch((AppleSingleEntryID)entry.id)
                 {
                     case AppleSingleEntryID.DataFork:
                         dataFork = entry;
+
                         break;
                     case AppleSingleEntryID.FileDates:
                         stream.Seek(entry.offset, SeekOrigin.Begin);
                         byte[] dates_b = new byte[16];
                         stream.Read(dates_b, 0, 16);
+
                         AppleSingleFileDates dates =
                             Marshal.ByteArrayToStructureBigEndian<AppleSingleFileDates>(dates_b);
+
                         creationTime  = DateHandlers.MacToDateTime(dates.creationDate);
                         lastWriteTime = DateHandlers.MacToDateTime(dates.modificationDate);
+
                         break;
                     case AppleSingleEntryID.FileInfo:
                         stream.Seek(entry.offset, SeekOrigin.Begin);
                         byte[] finfo = new byte[entry.length];
                         stream.Read(finfo, 0, finfo.Length);
+
                         if(MacintoshHome.SequenceEqual(header.homeFilesystem))
                         {
                             AppleSingleMacFileInfo macinfo =
                                 Marshal.ByteArrayToStructureBigEndian<AppleSingleMacFileInfo>(finfo);
+
                             creationTime  = DateHandlers.MacToDateTime(macinfo.creationDate);
                             lastWriteTime = DateHandlers.MacToDateTime(macinfo.modificationDate);
                         }
@@ -311,6 +346,7 @@ namespace Aaru.Filters
                         {
                             AppleSingleProDOSFileInfo prodosinfo =
                                 Marshal.ByteArrayToStructureBigEndian<AppleSingleProDOSFileInfo>(finfo);
+
                             creationTime  = DateHandlers.MacToDateTime(prodosinfo.creationDate);
                             lastWriteTime = DateHandlers.MacToDateTime(prodosinfo.modificationDate);
                         }
@@ -318,6 +354,7 @@ namespace Aaru.Filters
                         {
                             AppleSingleUNIXFileInfo unixinfo =
                                 Marshal.ByteArrayToStructureBigEndian<AppleSingleUNIXFileInfo>(finfo);
+
                             creationTime  = DateHandlers.UnixUnsignedToDateTime(unixinfo.creationDate);
                             lastWriteTime = DateHandlers.UnixUnsignedToDateTime(unixinfo.modificationDate);
                         }
@@ -325,6 +362,7 @@ namespace Aaru.Filters
                         {
                             AppleSingleDOSFileInfo dosinfo =
                                 Marshal.ByteArrayToStructureBigEndian<AppleSingleDOSFileInfo>(finfo);
+
                             lastWriteTime =
                                 DateHandlers.DosToDateTime(dosinfo.modificationDate, dosinfo.modificationTime);
                         }
@@ -332,6 +370,7 @@ namespace Aaru.Filters
                         break;
                     case AppleSingleEntryID.ResourceFork:
                         rsrcFork = entry;
+
                         break;
                 }
 
@@ -343,7 +382,7 @@ namespace Aaru.Filters
 
         public void Open(string path)
         {
-            FileStream fs = new FileStream(path, FileMode.Open, FileAccess.Read);
+            var fs = new FileStream(path, FileMode.Open, FileAccess.Read);
             fs.Seek(0, SeekOrigin.Begin);
 
             byte[] hdr_b = new byte[26];
@@ -351,6 +390,7 @@ namespace Aaru.Filters
             header = Marshal.ByteArrayToStructureBigEndian<AppleSingleHeader>(hdr_b);
 
             AppleSingleEntry[] entries = new AppleSingleEntry[header.entries];
+
             for(int i = 0; i < header.entries; i++)
             {
                 byte[] entry = new byte[12];
@@ -360,29 +400,36 @@ namespace Aaru.Filters
 
             creationTime  = DateTime.UtcNow;
             lastWriteTime = creationTime;
+
             foreach(AppleSingleEntry entry in entries)
                 switch((AppleSingleEntryID)entry.id)
                 {
                     case AppleSingleEntryID.DataFork:
                         dataFork = entry;
+
                         break;
                     case AppleSingleEntryID.FileDates:
                         fs.Seek(entry.offset, SeekOrigin.Begin);
                         byte[] dates_b = new byte[16];
                         fs.Read(dates_b, 0, 16);
+
                         AppleSingleFileDates dates =
                             Marshal.ByteArrayToStructureBigEndian<AppleSingleFileDates>(dates_b);
+
                         creationTime  = DateHandlers.MacToDateTime(dates.creationDate);
                         lastWriteTime = DateHandlers.MacToDateTime(dates.modificationDate);
+
                         break;
                     case AppleSingleEntryID.FileInfo:
                         fs.Seek(entry.offset, SeekOrigin.Begin);
                         byte[] finfo = new byte[entry.length];
                         fs.Read(finfo, 0, finfo.Length);
+
                         if(MacintoshHome.SequenceEqual(header.homeFilesystem))
                         {
                             AppleSingleMacFileInfo macinfo =
                                 Marshal.ByteArrayToStructureBigEndian<AppleSingleMacFileInfo>(finfo);
+
                             creationTime  = DateHandlers.MacToDateTime(macinfo.creationDate);
                             lastWriteTime = DateHandlers.MacToDateTime(macinfo.modificationDate);
                         }
@@ -390,6 +437,7 @@ namespace Aaru.Filters
                         {
                             AppleSingleProDOSFileInfo prodosinfo =
                                 Marshal.ByteArrayToStructureBigEndian<AppleSingleProDOSFileInfo>(finfo);
+
                             creationTime  = DateHandlers.MacToDateTime(prodosinfo.creationDate);
                             lastWriteTime = DateHandlers.MacToDateTime(prodosinfo.modificationDate);
                         }
@@ -397,6 +445,7 @@ namespace Aaru.Filters
                         {
                             AppleSingleUNIXFileInfo unixinfo =
                                 Marshal.ByteArrayToStructureBigEndian<AppleSingleUNIXFileInfo>(finfo);
+
                             creationTime  = DateHandlers.UnixUnsignedToDateTime(unixinfo.creationDate);
                             lastWriteTime = DateHandlers.UnixUnsignedToDateTime(unixinfo.modificationDate);
                         }
@@ -404,6 +453,7 @@ namespace Aaru.Filters
                         {
                             AppleSingleDOSFileInfo dosinfo =
                                 Marshal.ByteArrayToStructureBigEndian<AppleSingleDOSFileInfo>(finfo);
+
                             lastWriteTime =
                                 DateHandlers.DosToDateTime(dosinfo.modificationDate, dosinfo.modificationTime);
                         }
@@ -411,6 +461,7 @@ namespace Aaru.Filters
                         break;
                     case AppleSingleEntryID.ResourceFork:
                         rsrcFork = entry;
+
                         break;
                 }
 
@@ -422,85 +473,75 @@ namespace Aaru.Filters
 
         enum AppleSingleEntryID : uint
         {
-            Invalid        = 0,
-            DataFork       = 1,
-            ResourceFork   = 2,
-            RealName       = 3,
-            Comment        = 4,
-            Icon           = 5,
-            ColorIcon      = 6,
-            FileInfo       = 7,
-            FileDates      = 8,
-            FinderInfo     = 9,
-            MacFileInfo    = 10,
-            ProDOSFileInfo = 11,
-            DOSFileInfo    = 12,
-            ShortName      = 13,
-            AFPFileInfo    = 14,
-            DirectoryID    = 15
+            Invalid     = 0, DataFork    = 1, ResourceFork    = 2,
+            RealName    = 3, Comment     = 4, Icon            = 5,
+            ColorIcon   = 6, FileInfo    = 7, FileDates       = 8,
+            FinderInfo  = 9, MacFileInfo = 10, ProDOSFileInfo = 11,
+            DOSFileInfo = 12, ShortName  = 13, AFPFileInfo    = 14,
+            DirectoryID = 15
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct AppleSingleHeader
         {
-            public uint magic;
-            public uint version;
+            public readonly uint magic;
+            public readonly uint version;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public byte[] homeFilesystem;
-            public ushort entries;
+            public readonly byte[] homeFilesystem;
+            public readonly ushort entries;
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct AppleSingleEntry
         {
-            public uint id;
-            public uint offset;
-            public uint length;
+            public readonly uint id;
+            public readonly uint offset;
+            public readonly uint length;
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct AppleSingleFileDates
         {
-            public uint creationDate;
-            public uint modificationDate;
-            public uint backupDate;
-            public uint accessDate;
+            public readonly uint creationDate;
+            public readonly uint modificationDate;
+            public readonly uint backupDate;
+            public readonly uint accessDate;
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct AppleSingleMacFileInfo
         {
-            public uint creationDate;
-            public uint modificationDate;
-            public uint backupDate;
-            public uint accessDate;
+            public readonly uint creationDate;
+            public readonly uint modificationDate;
+            public readonly uint backupDate;
+            public readonly uint accessDate;
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct AppleSingleUNIXFileInfo
         {
-            public uint creationDate;
-            public uint accessDate;
-            public uint modificationDate;
+            public readonly uint creationDate;
+            public readonly uint accessDate;
+            public readonly uint modificationDate;
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct AppleSingleDOSFileInfo
         {
-            public ushort modificationDate;
-            public ushort modificationTime;
-            public ushort attributes;
+            public readonly ushort modificationDate;
+            public readonly ushort modificationTime;
+            public readonly ushort attributes;
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct AppleSingleProDOSFileInfo
         {
-            public uint   creationDate;
-            public uint   modificationDate;
-            public uint   backupDate;
-            public ushort access;
-            public ushort fileType;
-            public uint   auxType;
+            public readonly uint   creationDate;
+            public readonly uint   modificationDate;
+            public readonly uint   backupDate;
+            public readonly ushort access;
+            public readonly ushort fileType;
+            public readonly uint   auxType;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filters/BZip2.cs b/Aaru.Filters/BZip2.cs
index ff64cd08e..5606eac7e 100644
--- a/Aaru.Filters/BZip2.cs
+++ b/Aaru.Filters/BZip2.cs
@@ -38,9 +38,7 @@ using SharpCompress.Compressors.BZip2;
 
 namespace Aaru.Filters
 {
-    /// <summary>
-    ///     Decompress bz2 files while reading
-    /// </summary>
+    /// <summary>Decompress bz2 files while reading</summary>
     public class BZip2 : IFilter
     {
         string   basePath;
@@ -75,10 +73,15 @@ namespace Aaru.Filters
 
         public bool Identify(byte[] buffer)
         {
-            if(buffer[0] != 0x42 || buffer[1] != 0x5A || buffer[2] != 0x68 || buffer[3] < 0x31 ||
-               buffer[3] > 0x39) return false;
+            if(buffer[0] != 0x42 ||
+               buffer[1] != 0x5A ||
+               buffer[2] != 0x68 ||
+               buffer[3] < 0x31  ||
+               buffer[3] > 0x39)
+                return false;
 
-            if(buffer.Length <= 512) return true;
+            if(buffer.Length <= 512)
+                return true;
 
             return buffer[buffer.Length - 512] != 0x6B || buffer[buffer.Length - 511] != 0x6F ||
                    buffer[buffer.Length - 510] != 0x6C || buffer[buffer.Length - 509] != 0x79;
@@ -92,37 +95,50 @@ namespace Aaru.Filters
             stream.Read(buffer, 0, 4);
             stream.Seek(0, SeekOrigin.Begin);
 
-            if(buffer[0] != 0x42 || buffer[1] != 0x5A || buffer[2] != 0x68 || buffer[3] < 0x31 ||
-               buffer[3] > 0x39) return false;
+            if(buffer[0] != 0x42 ||
+               buffer[1] != 0x5A ||
+               buffer[2] != 0x68 ||
+               buffer[3] < 0x31  ||
+               buffer[3] > 0x39)
+                return false;
 
-            if(stream.Length <= 512) return true;
+            if(stream.Length <= 512)
+                return true;
 
             stream.Seek(-512, SeekOrigin.End);
             stream.Read(buffer, 0, 4);
             stream.Seek(0, SeekOrigin.Begin);
+
             // Check it is not an UDIF
             return buffer[0] != 0x6B || buffer[1] != 0x6F || buffer[2] != 0x6C || buffer[3] != 0x79;
         }
 
         public bool Identify(string path)
         {
-            if(!File.Exists(path)) return false;
+            if(!File.Exists(path))
+                return false;
 
-            FileStream stream = new FileStream(path, FileMode.Open, FileAccess.Read);
-            byte[]     buffer = new byte[4];
+            var    stream = new FileStream(path, FileMode.Open, FileAccess.Read);
+            byte[] buffer = new byte[4];
 
             stream.Seek(0, SeekOrigin.Begin);
             stream.Read(buffer, 0, 4);
             stream.Seek(0, SeekOrigin.Begin);
 
-            if(buffer[0] != 0x42 || buffer[1] != 0x5A || buffer[2] != 0x68 || buffer[3] < 0x31 ||
-               buffer[3] > 0x39) return false;
+            if(buffer[0] != 0x42 ||
+               buffer[1] != 0x5A ||
+               buffer[2] != 0x68 ||
+               buffer[3] < 0x31  ||
+               buffer[3] > 0x39)
+                return false;
 
-            if(stream.Length <= 512) return true;
+            if(stream.Length <= 512)
+                return true;
 
             stream.Seek(-512, SeekOrigin.End);
             stream.Read(buffer, 0, 4);
             stream.Seek(0, SeekOrigin.Begin);
+
             // Check it is not an UDIF
             return buffer[0] != 0x6B || buffer[1] != 0x6F || buffer[2] != 0x6C || buffer[3] != 0x79;
         }
@@ -154,7 +170,7 @@ namespace Aaru.Filters
             dataStream = new FileStream(path, FileMode.Open, FileAccess.Read);
             basePath   = Path.GetFullPath(path);
 
-            FileInfo fi = new FileInfo(path);
+            var fi = new FileInfo(path);
             creationTime     = fi.CreationTimeUtc;
             lastWriteTime    = fi.LastWriteTimeUtc;
             innerStream      = new ForcedSeekStream<BZip2Stream>(dataStream, CompressionMode.Decompress, false);
@@ -178,8 +194,7 @@ namespace Aaru.Filters
                 return basePath.Substring(0, basePath.Length - 4);
 
             return basePath?.EndsWith(".bzip2", StringComparison.InvariantCultureIgnoreCase) == true
-                       ? basePath.Substring(0, basePath.Length - 6)
-                       : basePath;
+                       ? basePath.Substring(0, basePath.Length - 6) : basePath;
         }
 
         public string GetParentFolder() => Path.GetDirectoryName(basePath);
diff --git a/Aaru.Filters/ForcedSeekStream.cs b/Aaru.Filters/ForcedSeekStream.cs
index 1485e8c97..fbb4a7b4d 100644
--- a/Aaru.Filters/ForcedSeekStream.cs
+++ b/Aaru.Filters/ForcedSeekStream.cs
@@ -36,20 +36,18 @@ using System.IO;
 namespace Aaru.Filters
 {
     /// <summary>
-    ///     ForcedSeekStream allows to seek a forward-readable stream (like System.IO.Compression streams)
-    ///     by doing the slow and known trick of rewinding and forward reading until arriving the desired position.
+    ///     ForcedSeekStream allows to seek a forward-readable stream (like System.IO.Compression streams) by doing the
+    ///     slow and known trick of rewinding and forward reading until arriving the desired position.
     /// </summary>
     public class ForcedSeekStream<T> : Stream where T : Stream
     {
-        const int  BUFFER_LEN = 1048576;
-        string     backFile;
-        FileStream backStream;
-        T          baseStream;
-        long       streamLength;
+        const    int        BUFFER_LEN = 1048576;
+        readonly string     backFile;
+        readonly FileStream backStream;
+        readonly T          baseStream;
+        long                streamLength;
 
-        /// <summary>
-        ///     Initializes a new instance of the <see cref="T:Aaru.Filters.ForcedSeekStream`1" /> class.
-        /// </summary>
+        /// <summary>Initializes a new instance of the <see cref="T:Aaru.Filters.ForcedSeekStream`1" /> class.</summary>
         /// <param name="length">The real (uncompressed) length of the stream.</param>
         /// <param name="args">Parameters that are used to create the base stream.</param>
         public ForcedSeekStream(long length, params object[] args)
@@ -58,12 +56,12 @@ namespace Aaru.Filters
             baseStream   = (T)Activator.CreateInstance(typeof(T), args);
             backFile     = Path.GetTempFileName();
             backStream   = new FileStream(backFile, FileMode.Open, FileAccess.ReadWrite, FileShare.None);
-            if(length == 0) CalculateLength();
+
+            if(length == 0)
+                CalculateLength();
         }
 
-        /// <summary>
-        ///     Initializes a new instance of the <see cref="T:Aaru.Filters.ForcedSeekStream`1" /> class.
-        /// </summary>
+        /// <summary>Initializes a new instance of the <see cref="T:Aaru.Filters.ForcedSeekStream`1" /> class.</summary>
         /// <param name="args">Parameters that are used to create the base stream.</param>
         public ForcedSeekStream(params object[] args)
         {
@@ -89,21 +87,20 @@ namespace Aaru.Filters
         }
 
         /// <summary>
-        ///     Calculates the real (uncompressed) length of the stream.
-        ///     It basically reads (uncompresses) the whole stream to memory discarding its contents,
-        ///     so it should be used as a last resort.
+        ///     Calculates the real (uncompressed) length of the stream. It basically reads (uncompresses) the whole stream to
+        ///     memory discarding its contents, so it should be used as a last resort.
         /// </summary>
         /// <returns>The length.</returns>
         public void CalculateLength()
         {
             int read;
+
             do
             {
                 byte[] buffer = new byte[BUFFER_LEN];
                 read = baseStream.Read(buffer, 0, BUFFER_LEN);
                 backStream.Write(buffer, 0, read);
-            }
-            while(read == BUFFER_LEN);
+            } while(read == BUFFER_LEN);
 
             streamLength        = backStream.Length;
             backStream.Position = 0;
@@ -111,11 +108,13 @@ namespace Aaru.Filters
 
         void SetPosition(long position)
         {
-            if(position == backStream.Position) return;
+            if(position == backStream.Position)
+                return;
 
             if(position < backStream.Length)
             {
                 backStream.Position = position;
+
                 return;
             }
 
@@ -145,7 +144,8 @@ namespace Aaru.Filters
 
         public override int Read(byte[] buffer, int offset, int count)
         {
-            if(backStream.Position + count <= backStream.Length) return backStream.Read(buffer, offset, count);
+            if(backStream.Position + count <= backStream.Length)
+                return backStream.Read(buffer, offset, count);
 
             SetPosition(backStream.Position + count);
             SetPosition(backStream.Position - count);
@@ -155,7 +155,8 @@ namespace Aaru.Filters
 
         public override int ReadByte()
         {
-            if(backStream.Position + 1 <= backStream.Length) return backStream.ReadByte();
+            if(backStream.Position + 1 <= backStream.Length)
+                return backStream.ReadByte();
 
             SetPosition(backStream.Position + 1);
             SetPosition(backStream.Position - 1);
@@ -168,33 +169,34 @@ namespace Aaru.Filters
             switch(origin)
             {
                 case SeekOrigin.Begin:
-                    if(offset < 0) throw new IOException("Cannot seek before stream start.");
+                    if(offset < 0)
+                        throw new IOException("Cannot seek before stream start.");
 
                     SetPosition(offset);
+
                     break;
                 case SeekOrigin.End:
-                    if(offset > 0) throw new IOException("Cannot seek after stream end.");
+                    if(offset > 0)
+                        throw new IOException("Cannot seek after stream end.");
+
+                    if(streamLength == 0)
+                        CalculateLength();
 
-                    if(streamLength == 0) CalculateLength();
                     SetPosition(streamLength + offset);
+
                     break;
                 default:
                     SetPosition(backStream.Position + offset);
+
                     break;
             }
 
             return backStream.Position;
         }
 
-        public override void SetLength(long value)
-        {
-            throw new NotSupportedException();
-        }
+        public override void SetLength(long value) => throw new NotSupportedException();
 
-        public override void Write(byte[] buffer, int offset, int count)
-        {
-            throw new NotSupportedException();
-        }
+        public override void Write(byte[] buffer, int offset, int count) => throw new NotSupportedException();
 
         public override void Close()
         {
diff --git a/Aaru.Filters/GZip.cs b/Aaru.Filters/GZip.cs
index 5b24df4d1..6a1bc13c0 100644
--- a/Aaru.Filters/GZip.cs
+++ b/Aaru.Filters/GZip.cs
@@ -37,9 +37,7 @@ using Aaru.CommonTypes.Interfaces;
 
 namespace Aaru.Filters
 {
-    /// <summary>
-    ///     Decompress gzip files while reading
-    /// </summary>
+    /// <summary>Decompress gzip files while reading</summary>
     public class GZip : IFilter
     {
         string   basePath;
@@ -87,10 +85,11 @@ namespace Aaru.Filters
 
         public bool Identify(string path)
         {
-            if(!File.Exists(path)) return false;
+            if(!File.Exists(path))
+                return false;
 
-            FileStream stream = new FileStream(path, FileMode.Open, FileAccess.Read);
-            byte[]     buffer = new byte[3];
+            var    stream = new FileStream(path, FileMode.Open, FileAccess.Read);
+            byte[] buffer = new byte[3];
 
             stream.Seek(0, SeekOrigin.Begin);
             stream.Read(buffer, 0, 3);
@@ -119,8 +118,9 @@ namespace Aaru.Filters
             decompressedSize = isize;
             creationTime     = DateHandlers.UnixUnsignedToDateTime(mtime);
             lastWriteTime    = creationTime;
-            zStream =
-                new ForcedSeekStream<GZipStream>(decompressedSize, dataStream, CompressionMode.Decompress);
+
+            zStream = new ForcedSeekStream<GZipStream>(decompressedSize, dataStream, CompressionMode.Decompress);
+
             opened = true;
         }
 
@@ -144,8 +144,9 @@ namespace Aaru.Filters
             decompressedSize = isize;
             creationTime     = DateHandlers.UnixUnsignedToDateTime(mtime);
             lastWriteTime    = creationTime;
-            zStream =
-                new ForcedSeekStream<GZipStream>(decompressedSize, dataStream, CompressionMode.Decompress);
+
+            zStream = new ForcedSeekStream<GZipStream>(decompressedSize, dataStream, CompressionMode.Decompress);
+
             opened = true;
         }
 
@@ -167,7 +168,7 @@ namespace Aaru.Filters
             uint isize = BitConverter.ToUInt32(isize_b, 0);
 
             decompressedSize = isize;
-            FileInfo fi = new FileInfo(path);
+            var fi = new FileInfo(path);
             creationTime  = fi.CreationTimeUtc;
             lastWriteTime = DateHandlers.UnixUnsignedToDateTime(mtime);
             zStream       = new ForcedSeekStream<GZipStream>(decompressedSize, dataStream, CompressionMode.Decompress);
@@ -190,8 +191,7 @@ namespace Aaru.Filters
                 return basePath.Substring(0, basePath.Length - 3);
 
             return basePath?.EndsWith(".gzip", StringComparison.InvariantCultureIgnoreCase) == true
-                       ? basePath.Substring(0, basePath.Length - 5)
-                       : basePath;
+                       ? basePath.Substring(0, basePath.Length - 5) : basePath;
         }
 
         public string GetParentFolder() => Path.GetDirectoryName(basePath);
diff --git a/Aaru.Filters/LZip.cs b/Aaru.Filters/LZip.cs
index 14a44fd05..52619a6e0 100644
--- a/Aaru.Filters/LZip.cs
+++ b/Aaru.Filters/LZip.cs
@@ -38,9 +38,7 @@ using SharpCompress.Compressors.LZMA;
 
 namespace Aaru.Filters
 {
-    /// <summary>
-    ///     Decompress lzip files while reading
-    /// </summary>
+    /// <summary>Decompress lzip files while reading</summary>
     public class LZip : IFilter
     {
         string   basePath;
@@ -73,8 +71,8 @@ namespace Aaru.Filters
 
         public bool HasResourceFork() => false;
 
-        public bool Identify(byte[] buffer) =>
-            buffer[0] == 0x4C && buffer[1] == 0x5A && buffer[2] == 0x49 && buffer[3] == 0x50 && buffer[4] == 0x01;
+        public bool Identify(byte[] buffer) => buffer[0] == 0x4C && buffer[1] == 0x5A && buffer[2] == 0x49 &&
+                                               buffer[3] == 0x50 && buffer[4] == 0x01;
 
         public bool Identify(Stream stream)
         {
@@ -90,10 +88,11 @@ namespace Aaru.Filters
 
         public bool Identify(string path)
         {
-            if(!File.Exists(path)) return false;
+            if(!File.Exists(path))
+                return false;
 
-            FileStream stream = new FileStream(path, FileMode.Open, FileAccess.Read);
-            byte[]     buffer = new byte[5];
+            var    stream = new FileStream(path, FileMode.Open, FileAccess.Read);
+            byte[] buffer = new byte[5];
 
             stream.Seek(0, SeekOrigin.Begin);
             stream.Read(buffer, 0, 5);
@@ -110,8 +109,9 @@ namespace Aaru.Filters
             creationTime     = DateTime.UtcNow;
             lastWriteTime    = creationTime;
             decompressedSize = BitConverter.ToInt64(buffer, buffer.Length - 16);
-            innerStream =
-                new ForcedSeekStream<LZipStream>(decompressedSize, dataStream, CompressionMode.Decompress);
+
+            innerStream = new ForcedSeekStream<LZipStream>(decompressedSize, dataStream, CompressionMode.Decompress);
+
             opened = true;
         }
 
@@ -135,7 +135,7 @@ namespace Aaru.Filters
             dataStream = new FileStream(path, FileMode.Open, FileAccess.Read);
             basePath   = Path.GetFullPath(path);
 
-            FileInfo fi = new FileInfo(path);
+            var fi = new FileInfo(path);
             creationTime  = fi.CreationTimeUtc;
             lastWriteTime = fi.LastWriteTimeUtc;
             byte[] tmp = new byte[8];
@@ -163,8 +163,7 @@ namespace Aaru.Filters
                 return basePath.Substring(0, basePath.Length - 3);
 
             return basePath?.EndsWith(".lzip", StringComparison.InvariantCultureIgnoreCase) == true
-                       ? basePath.Substring(0, basePath.Length - 5)
-                       : basePath;
+                       ? basePath.Substring(0, basePath.Length - 5) : basePath;
         }
 
         public string GetParentFolder() => Path.GetDirectoryName(basePath);
diff --git a/Aaru.Filters/MacBinary.cs b/Aaru.Filters/MacBinary.cs
index bec3509af..603d33242 100644
--- a/Aaru.Filters/MacBinary.cs
+++ b/Aaru.Filters/MacBinary.cs
@@ -40,9 +40,7 @@ using Marshal = Aaru.Helpers.Marshal;
 namespace Aaru.Filters
 {
     // TODO: Interpret fdScript
-    /// <summary>
-    ///     Decodes MacBinary files
-    /// </summary>
+    /// <summary>Decodes MacBinary files</summary>
     public class MacBinary : IFilter
     {
         const uint MACBINARY_MAGIC = 0x6D42494E;
@@ -80,13 +78,18 @@ namespace Aaru.Filters
 
         public Stream GetDataForkStream()
         {
-            if(header.dataLength == 0) return null;
+            if(header.dataLength == 0)
+                return null;
+
+            if(isBytes)
+                return new OffsetStream(bytes, dataForkOff, (dataForkOff + header.dataLength) - 1);
+
+            if(isStream)
+                return new OffsetStream(stream, dataForkOff, (dataForkOff + header.dataLength) - 1);
 
-            if(isBytes) return new OffsetStream(bytes,   dataForkOff, dataForkOff + header.dataLength - 1);
-            if(isStream) return new OffsetStream(stream, dataForkOff, dataForkOff + header.dataLength - 1);
             if(isPath)
                 return new OffsetStream(basePath, FileMode.Open, FileAccess.Read, dataForkOff,
-                                        dataForkOff + header.dataLength - 1);
+                                        (dataForkOff + header.dataLength) - 1);
 
             return null;
         }
@@ -105,13 +108,18 @@ namespace Aaru.Filters
 
         public Stream GetResourceForkStream()
         {
-            if(header.resourceLength == 0) return null;
+            if(header.resourceLength == 0)
+                return null;
+
+            if(isBytes)
+                return new OffsetStream(bytes, rsrcForkOff, (rsrcForkOff + header.resourceLength) - 1);
+
+            if(isStream)
+                return new OffsetStream(stream, rsrcForkOff, (rsrcForkOff + header.resourceLength) - 1);
 
-            if(isBytes) return new OffsetStream(bytes,   rsrcForkOff, rsrcForkOff + header.resourceLength - 1);
-            if(isStream) return new OffsetStream(stream, rsrcForkOff, rsrcForkOff + header.resourceLength - 1);
             if(isPath)
                 return new OffsetStream(basePath, FileMode.Open, FileAccess.Read, rsrcForkOff,
-                                        rsrcForkOff + header.resourceLength - 1);
+                                        (rsrcForkOff + header.resourceLength) - 1);
 
             return null;
         }
@@ -120,54 +128,61 @@ namespace Aaru.Filters
 
         public bool Identify(byte[] buffer)
         {
-            if(buffer == null || buffer.Length < 128) return false;
+            if(buffer        == null ||
+               buffer.Length < 128)
+                return false;
 
             byte[] hdr_b = new byte[128];
             Array.Copy(buffer, 0, hdr_b, 0, 128);
             header = Marshal.ByteArrayToStructureBigEndian<MacBinaryHeader>(hdr_b);
 
-            return header.magic == MACBINARY_MAGIC || header.version == 0 && header.filename[0] > 0  &&
-                   header.filename[0]                                < 64 && header.zero1       == 0 &&
-                   header.zero2                                      == 0 && header.reserved    == 0 &&
-                   (header.dataLength > 0 || header.resourceLength > 0);
+            return header.magic == MACBINARY_MAGIC || (header.version     == 0 && header.filename[0] > 0  &&
+                                                       header.filename[0] < 64 && header.zero1       == 0 &&
+                                                       header.zero2       == 0 && header.reserved    == 0 &&
+                                                       (header.dataLength > 0 || header.resourceLength > 0));
         }
 
         public bool Identify(Stream stream)
         {
-            if(stream == null || stream.Length < 128) return false;
+            if(stream        == null ||
+               stream.Length < 128)
+                return false;
 
             byte[] hdr_b = new byte[128];
             stream.Seek(0, SeekOrigin.Begin);
             stream.Read(hdr_b, 0, 128);
             header = Marshal.ByteArrayToStructureBigEndian<MacBinaryHeader>(hdr_b);
 
-            return header.magic == MACBINARY_MAGIC || header.version == 0 && header.filename[0] > 0  &&
-                   header.filename[0]                                < 64 && header.zero1       == 0 &&
-                   header.zero2                                      == 0 && header.reserved    == 0 &&
-                   (header.dataLength > 0 || header.resourceLength > 0);
+            return header.magic == MACBINARY_MAGIC || (header.version     == 0 && header.filename[0] > 0  &&
+                                                       header.filename[0] < 64 && header.zero1       == 0 &&
+                                                       header.zero2       == 0 && header.reserved    == 0 &&
+                                                       (header.dataLength > 0 || header.resourceLength > 0));
         }
 
         public bool Identify(string path)
         {
-            FileStream fstream = new FileStream(path, FileMode.Open, FileAccess.Read);
-            if(fstream.Length < 128) return false;
+            var fstream = new FileStream(path, FileMode.Open, FileAccess.Read);
+
+            if(fstream.Length < 128)
+                return false;
 
             byte[] hdr_b = new byte[128];
             fstream.Read(hdr_b, 0, 128);
             header = Marshal.ByteArrayToStructureBigEndian<MacBinaryHeader>(hdr_b);
 
             fstream.Close();
-            return header.magic == MACBINARY_MAGIC || header.version == 0 && header.filename[0] > 0  &&
-                   header.filename[0]                                < 64 && header.zero1       == 0 &&
-                   header.zero2                                      == 0 && header.reserved    == 0 &&
-                   (header.dataLength > 0 || header.resourceLength > 0);
+
+            return header.magic == MACBINARY_MAGIC || (header.version     == 0 && header.filename[0] > 0  &&
+                                                       header.filename[0] < 64 && header.zero1       == 0 &&
+                                                       header.zero2       == 0 && header.reserved    == 0 &&
+                                                       (header.dataLength > 0 || header.resourceLength > 0));
         }
 
         public bool IsOpened() => opened;
 
         public void Open(byte[] buffer)
         {
-            MemoryStream ms = new MemoryStream(buffer);
+            var ms = new MemoryStream(buffer);
             ms.Seek(0, SeekOrigin.Begin);
 
             byte[] hdr_b = new byte[128];
@@ -176,11 +191,17 @@ namespace Aaru.Filters
 
             uint blocks = 1;
             blocks += (uint)(header.secondaryHeaderLength / 128);
-            if(header.secondaryHeaderLength  % 128 > 0) blocks++;
+
+            if(header.secondaryHeaderLength % 128 > 0)
+                blocks++;
+
             dataForkOff =  blocks            * 128;
             blocks      += header.dataLength / 128;
-            if(header.dataLength             % 128 > 0) blocks++;
-            rsrcForkOff = blocks             * 128;
+
+            if(header.dataLength % 128 > 0)
+                blocks++;
+
+            rsrcForkOff = blocks * 128;
 
             filename      = StringHandlers.PascalToString(header.filename, Encoding.GetEncoding("macintosh"));
             creationTime  = DateHandlers.MacToDateTime(header.creationTime);
@@ -202,11 +223,17 @@ namespace Aaru.Filters
 
             uint blocks = 1;
             blocks += (uint)(header.secondaryHeaderLength / 128);
-            if(header.secondaryHeaderLength  % 128 > 0) blocks++;
+
+            if(header.secondaryHeaderLength % 128 > 0)
+                blocks++;
+
             dataForkOff =  blocks            * 128;
             blocks      += header.dataLength / 128;
-            if(header.dataLength             % 128 > 0) blocks++;
-            rsrcForkOff = blocks             * 128;
+
+            if(header.dataLength % 128 > 0)
+                blocks++;
+
+            rsrcForkOff = blocks * 128;
 
             filename      = StringHandlers.PascalToString(header.filename, Encoding.GetEncoding("macintosh"));
             creationTime  = DateHandlers.MacToDateTime(header.creationTime);
@@ -220,7 +247,7 @@ namespace Aaru.Filters
 
         public void Open(string path)
         {
-            FileStream fs = new FileStream(path, FileMode.Open, FileAccess.Read);
+            var fs = new FileStream(path, FileMode.Open, FileAccess.Read);
             fs.Seek(0, SeekOrigin.Begin);
 
             byte[] hdr_b = new byte[128];
@@ -229,11 +256,17 @@ namespace Aaru.Filters
 
             uint blocks = 1;
             blocks += (uint)(header.secondaryHeaderLength / 128);
-            if(header.secondaryHeaderLength  % 128 > 0) blocks++;
+
+            if(header.secondaryHeaderLength % 128 > 0)
+                blocks++;
+
             dataForkOff =  blocks            * 128;
             blocks      += header.dataLength / 128;
-            if(header.dataLength             % 128 > 0) blocks++;
-            rsrcForkOff = blocks             * 128;
+
+            if(header.dataLength % 128 > 0)
+                blocks++;
+
+            rsrcForkOff = blocks * 128;
 
             filename      = StringHandlers.PascalToString(header.filename, Encoding.GetEncoding("macintosh"));
             creationTime  = DateHandlers.MacToDateTime(header.creationTime);
@@ -248,123 +281,69 @@ namespace Aaru.Filters
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct MacBinaryHeader
         {
-            /// <summary>
-            ///     0x00, MacBinary version, 0
-            /// </summary>
-            public byte version;
-            /// <summary>
-            ///     0x01, Str63 Pascal filename
-            /// </summary>
+            /// <summary>0x00, MacBinary version, 0</summary>
+            public readonly byte version;
+            /// <summary>0x01, Str63 Pascal filename</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 64)]
-            public byte[] filename;
-            /// <summary>
-            ///     0x41, File type
-            /// </summary>
-            public uint type;
-            /// <summary>
-            ///     0x45, File creator
-            /// </summary>
-            public uint creator;
-            /// <summary>
-            ///     0x49, High byte of Finder flags
-            /// </summary>
-            public byte finderFlags;
-            /// <summary>
-            ///     0x4A, Must be 0
-            /// </summary>
-            public byte zero1;
-            /// <summary>
-            ///     0x4B, File's icon vertical position within its window
-            /// </summary>
-            public ushort verticalPosition;
-            /// <summary>
-            ///     0x4D, File's icon horizontal position within its window
-            /// </summary>
-            public ushort horizontalPosition;
-            /// <summary>
-            ///     0x4F, File's window or folder ID
-            /// </summary>
-            public short windowID;
-            /// <summary>
-            ///     0x51, Protected flag
-            /// </summary>
-            public byte protect;
-            /// <summary>
-            ///     0x52, Must be 0
-            /// </summary>
-            public byte zero2;
-            /// <summary>
-            ///     0x53, Size of data fork
-            /// </summary>
-            public uint dataLength;
-            /// <summary>
-            ///     0x57, Size of resource fork
-            /// </summary>
-            public uint resourceLength;
-            /// <summary>
-            ///     0x5B, File's creation time
-            /// </summary>
-            public uint creationTime;
-            /// <summary>
-            ///     0x5F, File's last modified time
-            /// </summary>
-            public uint modificationTime;
-            /// <summary>
-            ///     0x63, Length of Get Info comment
-            /// </summary>
-            public ushort commentLength;
-            /// <summary>
-            ///     0x65, Low byte of Finder flags
-            /// </summary>
-            public byte finderFlags2;
+            public readonly byte[] filename;
+            /// <summary>0x41, File type</summary>
+            public readonly uint type;
+            /// <summary>0x45, File creator</summary>
+            public readonly uint creator;
+            /// <summary>0x49, High byte of Finder flags</summary>
+            public readonly byte finderFlags;
+            /// <summary>0x4A, Must be 0</summary>
+            public readonly byte zero1;
+            /// <summary>0x4B, File's icon vertical position within its window</summary>
+            public readonly ushort verticalPosition;
+            /// <summary>0x4D, File's icon horizontal position within its window</summary>
+            public readonly ushort horizontalPosition;
+            /// <summary>0x4F, File's window or folder ID</summary>
+            public readonly short windowID;
+            /// <summary>0x51, Protected flag</summary>
+            public readonly byte protect;
+            /// <summary>0x52, Must be 0</summary>
+            public readonly byte zero2;
+            /// <summary>0x53, Size of data fork</summary>
+            public readonly uint dataLength;
+            /// <summary>0x57, Size of resource fork</summary>
+            public readonly uint resourceLength;
+            /// <summary>0x5B, File's creation time</summary>
+            public readonly uint creationTime;
+            /// <summary>0x5F, File's last modified time</summary>
+            public readonly uint modificationTime;
+            /// <summary>0x63, Length of Get Info comment</summary>
+            public readonly ushort commentLength;
+            /// <summary>0x65, Low byte of Finder flags</summary>
+            public readonly byte finderFlags2;
 
             #region MacBinary III
-            /// <summary>
-            ///     0x66, magic identifier, "mBIN"
-            /// </summary>
-            public uint magic;
-            /// <summary>
-            ///     0x6A, fdScript from fxInfo, identifies codepage of filename
-            /// </summary>
-            public byte fdScript;
-            /// <summary>
-            ///     0x6B, fdXFlags from fxInfo, extended Mac OS 8 finder flags
-            /// </summary>
-            public byte fdXFlags;
+            /// <summary>0x66, magic identifier, "mBIN"</summary>
+            public readonly uint magic;
+            /// <summary>0x6A, fdScript from fxInfo, identifies codepage of filename</summary>
+            public readonly byte fdScript;
+            /// <summary>0x6B, fdXFlags from fxInfo, extended Mac OS 8 finder flags</summary>
+            public readonly byte fdXFlags;
             #endregion MacBinary III
 
-            /// <summary>
-            ///     0x6C, unused
-            /// </summary>
-            public ulong reserved;
-            /// <summary>
-            ///     0x74, Total unpacked files
-            /// </summary>
-            public uint totalPackedFiles;
+            /// <summary>0x6C, unused</summary>
+            public readonly ulong reserved;
+            /// <summary>0x74, Total unpacked files</summary>
+            public readonly uint totalPackedFiles;
 
             #region MacBinary II
-            /// <summary>
-            ///     0x78, Length of secondary header
-            /// </summary>
-            public ushort secondaryHeaderLength;
-            /// <summary>
-            ///     0x7A, version number of MacBinary that wrote this file, starts at 129
-            /// </summary>
-            public byte version2;
-            /// <summary>
-            ///     0x7B, version number of MacBinary required to open this file, starts at 129
-            /// </summary>
-            public byte minVersion;
-            /// <summary>
-            ///     0x7C, CRC of previous bytes
-            /// </summary>
-            public short crc;
+            /// <summary>0x78, Length of secondary header</summary>
+            public readonly ushort secondaryHeaderLength;
+            /// <summary>0x7A, version number of MacBinary that wrote this file, starts at 129</summary>
+            public readonly byte version2;
+            /// <summary>0x7B, version number of MacBinary required to open this file, starts at 129</summary>
+            public readonly byte minVersion;
+            /// <summary>0x7C, CRC of previous bytes</summary>
+            public readonly short crc;
             #endregion MacBinary II
 
-            /// <summary>
-            ///     0x7E, Reserved for computer type and OS ID
-            /// </summary>
-            public short computerID;
+            /// <summary>0x7E, Reserved for computer type and OS ID</summary>
+            public readonly short computerID;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filters/OffsetStream.cs b/Aaru.Filters/OffsetStream.cs
index 29f94c034..206526d41 100644
--- a/Aaru.Filters/OffsetStream.cs
+++ b/Aaru.Filters/OffsetStream.cs
@@ -35,14 +35,12 @@ using System.IO;
 using Microsoft.Win32.SafeHandles;
 
 #if !NETSTANDARD2_0
-using System.Security.AccessControl;
+
 #endif
 
 namespace Aaru.Filters
 {
-    /// <summary>
-    ///     Creates a stream that is a subset of another stream.
-    /// </summary>
+    /// <summary>Creates a stream that is a subset of another stream.</summary>
     public class OffsetStream : Stream
     {
         readonly Stream baseStream;
@@ -51,217 +49,262 @@ namespace Aaru.Filters
 
         public OffsetStream(Stream stream, long start, long end)
         {
-            if(start < 0) throw new ArgumentOutOfRangeException(nameof(start), "Start can't be a negative number.");
+            if(start < 0)
+                throw new ArgumentOutOfRangeException(nameof(start), "Start can't be a negative number.");
 
-            if(end < 0) throw new ArgumentOutOfRangeException(nameof(end), "End can't be a negative number.");
+            if(end < 0)
+                throw new ArgumentOutOfRangeException(nameof(end), "End can't be a negative number.");
 
             streamStart = start;
             streamEnd   = end;
 
             baseStream = stream;
 
-            if(end > baseStream.Length) throw new ArgumentOutOfRangeException(nameof(end), "End is after stream end.");
+            if(end > baseStream.Length)
+                throw new ArgumentOutOfRangeException(nameof(end), "End is after stream end.");
         }
 
-        public OffsetStream(string      path,    FileMode mode,  FileAccess access, FileShare share, int bufferSize,
-                            FileOptions options, long     start, long       end)
+        public OffsetStream(string path, FileMode mode, FileAccess access, FileShare share, int bufferSize,
+                            FileOptions options, long start, long end)
         {
-            if(start < 0) throw new ArgumentOutOfRangeException(nameof(start), "Start can't be a negative number.");
+            if(start < 0)
+                throw new ArgumentOutOfRangeException(nameof(start), "Start can't be a negative number.");
 
-            if(end < 0) throw new ArgumentOutOfRangeException(nameof(end), "End can't be a negative number.");
+            if(end < 0)
+                throw new ArgumentOutOfRangeException(nameof(end), "End can't be a negative number.");
 
             streamStart = start;
             streamEnd   = end;
 
             baseStream = new FileStream(path, mode, access, share, bufferSize, options);
 
-            if(end > baseStream.Length) throw new ArgumentOutOfRangeException(nameof(end), "End is after stream end.");
+            if(end > baseStream.Length)
+                throw new ArgumentOutOfRangeException(nameof(end), "End is after stream end.");
         }
 
         public OffsetStream(SafeFileHandle handle, FileAccess access, long start, long end)
         {
-            if(start < 0) throw new ArgumentOutOfRangeException(nameof(start), "Start can't be a negative number.");
+            if(start < 0)
+                throw new ArgumentOutOfRangeException(nameof(start), "Start can't be a negative number.");
 
-            if(end < 0) throw new ArgumentOutOfRangeException(nameof(end), "End can't be a negative number.");
+            if(end < 0)
+                throw new ArgumentOutOfRangeException(nameof(end), "End can't be a negative number.");
 
             streamStart = start;
             streamEnd   = end;
 
             baseStream = new FileStream(handle, access);
 
-            if(end > baseStream.Length) throw new ArgumentOutOfRangeException(nameof(end), "End is after stream end.");
+            if(end > baseStream.Length)
+                throw new ArgumentOutOfRangeException(nameof(end), "End is after stream end.");
         }
 
         public OffsetStream(SafeFileHandle handle, FileAccess access, int bufferSize, long start, long end)
         {
-            if(start < 0) throw new ArgumentOutOfRangeException(nameof(start), "Start can't be a negative number.");
+            if(start < 0)
+                throw new ArgumentOutOfRangeException(nameof(start), "Start can't be a negative number.");
 
-            if(end < 0) throw new ArgumentOutOfRangeException(nameof(end), "End can't be a negative number.");
+            if(end < 0)
+                throw new ArgumentOutOfRangeException(nameof(end), "End can't be a negative number.");
 
             streamStart = start;
             streamEnd   = end;
 
             baseStream = new FileStream(handle, access, bufferSize);
 
-            if(end > baseStream.Length) throw new ArgumentOutOfRangeException(nameof(end), "End is after stream end.");
+            if(end > baseStream.Length)
+                throw new ArgumentOutOfRangeException(nameof(end), "End is after stream end.");
         }
 
         public OffsetStream(SafeFileHandle handle, FileAccess access, int bufferSize, bool isAsync, long start,
-                            long           end)
+                            long end)
         {
-            if(start < 0) throw new ArgumentOutOfRangeException(nameof(start), "Start can't be a negative number.");
+            if(start < 0)
+                throw new ArgumentOutOfRangeException(nameof(start), "Start can't be a negative number.");
 
-            if(end < 0) throw new ArgumentOutOfRangeException(nameof(end), "End can't be a negative number.");
+            if(end < 0)
+                throw new ArgumentOutOfRangeException(nameof(end), "End can't be a negative number.");
 
             streamStart = start;
             streamEnd   = end;
 
             baseStream = new FileStream(handle, access, bufferSize, isAsync);
 
-            if(end > baseStream.Length) throw new ArgumentOutOfRangeException(nameof(end), "End is after stream end.");
+            if(end > baseStream.Length)
+                throw new ArgumentOutOfRangeException(nameof(end), "End is after stream end.");
         }
 
-        public OffsetStream(string path,     FileMode mode,  FileAccess access, FileShare share, int bufferSize,
-                            bool   useAsync, long     start, long       end)
+        public OffsetStream(string path, FileMode mode, FileAccess access, FileShare share, int bufferSize,
+                            bool useAsync, long start, long end)
         {
-            if(start < 0) throw new ArgumentOutOfRangeException(nameof(start), "Start can't be a negative number.");
+            if(start < 0)
+                throw new ArgumentOutOfRangeException(nameof(start), "Start can't be a negative number.");
 
-            if(end < 0) throw new ArgumentOutOfRangeException(nameof(end), "End can't be a negative number.");
+            if(end < 0)
+                throw new ArgumentOutOfRangeException(nameof(end), "End can't be a negative number.");
 
             streamStart = start;
             streamEnd   = end;
 
             baseStream = new FileStream(path, mode, access, share, bufferSize, useAsync);
 
-            if(end > baseStream.Length) throw new ArgumentOutOfRangeException(nameof(end), "End is after stream end.");
+            if(end > baseStream.Length)
+                throw new ArgumentOutOfRangeException(nameof(end), "End is after stream end.");
         }
 
         public OffsetStream(string path, FileMode mode, FileAccess access, FileShare share, int bufferSize, long start,
-                            long   end)
+                            long end)
         {
-            if(start < 0) throw new ArgumentOutOfRangeException(nameof(start), "Start can't be a negative number.");
+            if(start < 0)
+                throw new ArgumentOutOfRangeException(nameof(start), "Start can't be a negative number.");
 
-            if(end < 0) throw new ArgumentOutOfRangeException(nameof(end), "End can't be a negative number.");
+            if(end < 0)
+                throw new ArgumentOutOfRangeException(nameof(end), "End can't be a negative number.");
 
             streamStart = start;
             streamEnd   = end;
 
             baseStream = new FileStream(path, mode, access, share, bufferSize);
 
-            if(end > baseStream.Length) throw new ArgumentOutOfRangeException(nameof(end), "End is after stream end.");
+            if(end > baseStream.Length)
+                throw new ArgumentOutOfRangeException(nameof(end), "End is after stream end.");
         }
 
         public OffsetStream(string path, FileMode mode, FileAccess access, FileShare share, long start, long end)
         {
-            if(start < 0) throw new ArgumentOutOfRangeException(nameof(start), "Start can't be a negative number.");
+            if(start < 0)
+                throw new ArgumentOutOfRangeException(nameof(start), "Start can't be a negative number.");
 
-            if(end < 0) throw new ArgumentOutOfRangeException(nameof(end), "End can't be a negative number.");
+            if(end < 0)
+                throw new ArgumentOutOfRangeException(nameof(end), "End can't be a negative number.");
 
             streamStart = start;
             streamEnd   = end;
 
             baseStream = new FileStream(path, mode, access, share);
 
-            if(end > baseStream.Length) throw new ArgumentOutOfRangeException(nameof(end), "End is after stream end.");
+            if(end > baseStream.Length)
+                throw new ArgumentOutOfRangeException(nameof(end), "End is after stream end.");
         }
 
         public OffsetStream(string path, FileMode mode, FileAccess access, long start, long end)
         {
-            if(start < 0) throw new ArgumentOutOfRangeException(nameof(start), "Start can't be a negative number.");
+            if(start < 0)
+                throw new ArgumentOutOfRangeException(nameof(start), "Start can't be a negative number.");
 
-            if(end < 0) throw new ArgumentOutOfRangeException(nameof(end), "End can't be a negative number.");
+            if(end < 0)
+                throw new ArgumentOutOfRangeException(nameof(end), "End can't be a negative number.");
 
             streamStart = start;
             streamEnd   = end;
 
             baseStream = new FileStream(path, mode, access);
 
-            if(end > baseStream.Length) throw new ArgumentOutOfRangeException(nameof(end), "End is after stream end.");
+            if(end > baseStream.Length)
+                throw new ArgumentOutOfRangeException(nameof(end), "End is after stream end.");
         }
 
         public OffsetStream(string path, FileMode mode, long start, long end)
         {
-            if(start < 0) throw new ArgumentOutOfRangeException(nameof(start), "Start can't be a negative number.");
+            if(start < 0)
+                throw new ArgumentOutOfRangeException(nameof(start), "Start can't be a negative number.");
 
-            if(end < 0) throw new ArgumentOutOfRangeException(nameof(end), "End can't be a negative number.");
+            if(end < 0)
+                throw new ArgumentOutOfRangeException(nameof(end), "End can't be a negative number.");
 
             streamStart = start;
             streamEnd   = end;
 
             baseStream = new FileStream(path, mode);
 
-            if(end > baseStream.Length) throw new ArgumentOutOfRangeException(nameof(end), "End is after stream end.");
+            if(end > baseStream.Length)
+                throw new ArgumentOutOfRangeException(nameof(end), "End is after stream end.");
         }
 
         public OffsetStream(byte[] buffer, int index, int count, bool writable, bool publiclyVisible, long start,
-                            long   end)
+                            long end)
         {
-            if(start < 0) throw new ArgumentOutOfRangeException(nameof(start), "Start can't be a negative number.");
+            if(start < 0)
+                throw new ArgumentOutOfRangeException(nameof(start), "Start can't be a negative number.");
 
-            if(end < 0) throw new ArgumentOutOfRangeException(nameof(end), "End can't be a negative number.");
+            if(end < 0)
+                throw new ArgumentOutOfRangeException(nameof(end), "End can't be a negative number.");
 
             streamStart = start;
             streamEnd   = end;
 
             baseStream = new MemoryStream(buffer, index, count, writable, publiclyVisible);
 
-            if(end > baseStream.Length) throw new ArgumentOutOfRangeException(nameof(end), "End is after stream end.");
+            if(end > baseStream.Length)
+                throw new ArgumentOutOfRangeException(nameof(end), "End is after stream end.");
         }
 
         public OffsetStream(byte[] buffer, int index, int count, bool writable, long start, long end)
         {
-            if(start < 0) throw new ArgumentOutOfRangeException(nameof(start), "Start can't be a negative number.");
+            if(start < 0)
+                throw new ArgumentOutOfRangeException(nameof(start), "Start can't be a negative number.");
 
-            if(end < 0) throw new ArgumentOutOfRangeException(nameof(end), "End can't be a negative number.");
+            if(end < 0)
+                throw new ArgumentOutOfRangeException(nameof(end), "End can't be a negative number.");
 
             streamStart = start;
             streamEnd   = end;
 
             baseStream = new MemoryStream(buffer, index, count, writable);
 
-            if(end > baseStream.Length) throw new ArgumentOutOfRangeException(nameof(end), "End is after stream end.");
+            if(end > baseStream.Length)
+                throw new ArgumentOutOfRangeException(nameof(end), "End is after stream end.");
         }
 
         public OffsetStream(byte[] buffer, int index, int count, long start, long end)
         {
-            if(start < 0) throw new ArgumentOutOfRangeException(nameof(start), "Start can't be a negative number.");
+            if(start < 0)
+                throw new ArgumentOutOfRangeException(nameof(start), "Start can't be a negative number.");
 
-            if(end < 0) throw new ArgumentOutOfRangeException(nameof(end), "End can't be a negative number.");
+            if(end < 0)
+                throw new ArgumentOutOfRangeException(nameof(end), "End can't be a negative number.");
 
             streamStart = start;
             streamEnd   = end;
 
             baseStream = new MemoryStream(buffer, index, count);
 
-            if(end > baseStream.Length) throw new ArgumentOutOfRangeException(nameof(end), "End is after stream end.");
+            if(end > baseStream.Length)
+                throw new ArgumentOutOfRangeException(nameof(end), "End is after stream end.");
         }
 
         public OffsetStream(byte[] buffer, bool writable, long start, long end)
         {
-            if(start < 0) throw new ArgumentOutOfRangeException(nameof(start), "Start can't be a negative number.");
+            if(start < 0)
+                throw new ArgumentOutOfRangeException(nameof(start), "Start can't be a negative number.");
 
-            if(end < 0) throw new ArgumentOutOfRangeException(nameof(end), "End can't be a negative number.");
+            if(end < 0)
+                throw new ArgumentOutOfRangeException(nameof(end), "End can't be a negative number.");
 
             streamStart = start;
             streamEnd   = end;
 
             baseStream = new MemoryStream(buffer, writable);
 
-            if(end > baseStream.Length) throw new ArgumentOutOfRangeException(nameof(end), "End is after stream end.");
+            if(end > baseStream.Length)
+                throw new ArgumentOutOfRangeException(nameof(end), "End is after stream end.");
         }
 
         public OffsetStream(byte[] buffer, long start, long end)
         {
-            if(start < 0) throw new ArgumentOutOfRangeException(nameof(start), "Start can't be a negative number.");
+            if(start < 0)
+                throw new ArgumentOutOfRangeException(nameof(start), "Start can't be a negative number.");
 
-            if(end < 0) throw new ArgumentOutOfRangeException(nameof(end), "End can't be a negative number.");
+            if(end < 0)
+                throw new ArgumentOutOfRangeException(nameof(end), "End can't be a negative number.");
 
             streamStart = start;
             streamEnd   = end;
 
             baseStream = new MemoryStream(buffer);
 
-            if(end > baseStream.Length) throw new ArgumentOutOfRangeException(nameof(end), "End is after stream end.");
+            if(end > baseStream.Length)
+                throw new ArgumentOutOfRangeException(nameof(end), "End is after stream end.");
         }
 
         public override bool CanRead => baseStream.CanRead;
@@ -270,7 +313,7 @@ namespace Aaru.Filters
 
         public override bool CanWrite => baseStream.CanWrite;
 
-        public override long Length => streamEnd - streamStart + 1;
+        public override long Length => (streamEnd - streamStart) + 1;
 
         public override long Position
         {
@@ -278,7 +321,8 @@ namespace Aaru.Filters
 
             set
             {
-                if(value + streamStart > streamEnd) throw new IOException("Cannot set position past stream end.");
+                if(value + streamStart > streamEnd)
+                    throw new IOException("Cannot set position past stream end.");
 
                 baseStream.Position = value;
             }
@@ -293,7 +337,8 @@ namespace Aaru.Filters
         public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback callback,
                                                object state)
         {
-            if(baseStream.Position + count > streamEnd) throw new IOException("Cannot read past stream end.");
+            if(baseStream.Position + count > streamEnd)
+                throw new IOException("Cannot read past stream end.");
 
             return baseStream.BeginRead(buffer, offset, count, callback, state);
         }
@@ -301,15 +346,13 @@ namespace Aaru.Filters
         public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback,
                                                 object state)
         {
-            if(baseStream.Position + count > streamEnd) throw new IOException("Cannot write past stream end.");
+            if(baseStream.Position + count > streamEnd)
+                throw new IOException("Cannot write past stream end.");
 
             return baseStream.BeginWrite(buffer, offset, count, callback, state);
         }
 
-        public override void Close()
-        {
-            baseStream.Close();
-        }
+        public override void Close() => baseStream.Close();
 
         protected new void Dispose()
         {
@@ -319,28 +362,24 @@ namespace Aaru.Filters
 
         public override int EndRead(IAsyncResult asyncResult) => baseStream.EndRead(asyncResult);
 
-        public override void EndWrite(IAsyncResult asyncResult)
-        {
-            baseStream.EndWrite(asyncResult);
-        }
+        public override void EndWrite(IAsyncResult asyncResult) => baseStream.EndWrite(asyncResult);
 
         public override int ReadByte() => baseStream.Position == streamEnd + 1 ? -1 : baseStream.ReadByte();
 
         public override void WriteByte(byte value)
         {
-            if(baseStream.Position + 1 > streamEnd) throw new IOException("Cannot write past stream end.");
+            if(baseStream.Position + 1 > streamEnd)
+                throw new IOException("Cannot write past stream end.");
 
             baseStream.WriteByte(value);
         }
 
-        public override void Flush()
-        {
-            baseStream.Flush();
-        }
+        public override void Flush() => baseStream.Flush();
 
         public override int Read(byte[] buffer, int offset, int count)
         {
-            if(baseStream.Position + count > streamEnd + 1) throw new IOException("Cannot read past stream end.");
+            if(baseStream.Position + count > streamEnd + 1)
+                throw new IOException("Cannot read past stream end.");
 
             return baseStream.Read(buffer, offset, count);
         }
@@ -350,7 +389,8 @@ namespace Aaru.Filters
             switch(origin)
             {
                 case SeekOrigin.Begin:
-                    if(offset + streamStart > streamEnd) throw new IOException("Cannot seek past stream end.");
+                    if(offset + streamStart > streamEnd)
+                        throw new IOException("Cannot seek past stream end.");
 
                     return baseStream.Seek(offset + streamStart, SeekOrigin.Begin) - streamStart;
                 case SeekOrigin.End:
@@ -359,56 +399,22 @@ namespace Aaru.Filters
 
                     return baseStream.Seek(offset - (baseStream.Length - streamEnd), SeekOrigin.End) - streamStart;
                 default:
-                    if(offset + baseStream.Position > streamEnd) throw new IOException("Cannot seek past stream end.");
+                    if(offset + baseStream.Position > streamEnd)
+                        throw new IOException("Cannot seek past stream end.");
 
                     return baseStream.Seek(offset, SeekOrigin.Current) - streamStart;
             }
         }
 
-        public override void SetLength(long value)
-        {
+        public override void SetLength(long value) =>
             throw new NotSupportedException("Growing OffsetStream is not supported.");
-        }
 
         public override void Write(byte[] buffer, int offset, int count)
         {
-            if(baseStream.Position + count > streamEnd) throw new IOException("Cannot write past stream end.");
+            if(baseStream.Position + count > streamEnd)
+                throw new IOException("Cannot write past stream end.");
 
             baseStream.Write(buffer, offset, count);
         }
-
-        #if !NETSTANDARD2_0 && !NETCOREAPP
-        public OffsetStream(string      path, FileMode mode, FileSystemRights rights, FileShare share,
-                            int         bufferSize,
-                            FileOptions options, long start, long end)
-        {
-            if(start < 0) throw new ArgumentOutOfRangeException(nameof(start), "Start can't be a negative number.");
-
-            if(end < 0) throw new ArgumentOutOfRangeException(nameof(end), "End can't be a negative number.");
-
-            streamStart = start;
-            streamEnd = end;
-
-            baseStream = new FileStream(path, mode, rights, share, bufferSize, options);
-
-            if(end > baseStream.Length) throw new ArgumentOutOfRangeException(nameof(end), "End is after stream end.");
-        }
-
-        public OffsetStream(string      path, FileMode mode, FileSystemRights rights, FileShare share,
-                            int         bufferSize,
-                            FileOptions options, FileSecurity fileSecurity, long start, long end)
-        {
-            if(start < 0) throw new ArgumentOutOfRangeException(nameof(start), "Start can't be a negative number.");
-
-            if(end < 0) throw new ArgumentOutOfRangeException(nameof(end), "End can't be a negative number.");
-
-            streamStart = start;
-            streamEnd = end;
-
-            baseStream = new FileStream(path, mode, rights, share, bufferSize, options, fileSecurity);
-
-            if(end > baseStream.Length) throw new ArgumentOutOfRangeException(nameof(end), "End is after stream end.");
-        }
-        #endif
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filters/PCExchange.cs b/Aaru.Filters/PCExchange.cs
index 87f057c41..72c567df2 100644
--- a/Aaru.Filters/PCExchange.cs
+++ b/Aaru.Filters/PCExchange.cs
@@ -40,9 +40,7 @@ using Aaru.CommonTypes.Interfaces;
 
 namespace Aaru.Filters
 {
-    /// <summary>
-    ///     Decodes PCExchange files
-    /// </summary>
+    /// <summary>Decodes PCExchange files</summary>
     public class PCExchange : IFilter
     {
         const string FILE_ID     = "FILEID.DAT";
@@ -62,10 +60,7 @@ namespace Aaru.Filters
         public Guid   Id     => new Guid("9264EB9F-D634-4F9B-BE12-C24CD44988C6");
         public string Author => "Natalia Portillo";
 
-        public void Close()
-        {
-            opened = false;
-        }
+        public void Close() => opened = false;
 
         public string GetBasePath() => basePath;
 
@@ -101,36 +96,44 @@ namespace Aaru.Filters
 
             parentFolder = parentFolder ?? "";
 
-            if(!File.Exists(Path.Combine(parentFolder, FINDER_INFO))) return false;
+            if(!File.Exists(Path.Combine(parentFolder, FINDER_INFO)))
+                return false;
 
-            if(!Directory.Exists(Path.Combine(parentFolder, RESOURCES))) return false;
+            if(!Directory.Exists(Path.Combine(parentFolder, RESOURCES)))
+                return false;
 
             string baseFilename = Path.GetFileName(path);
 
             bool dataFound = false;
             bool rsrcFound = false;
 
-            FileStream finderDatStream =
+            var finderDatStream =
                 new FileStream(Path.Combine(parentFolder, FINDER_INFO), FileMode.Open, FileAccess.Read);
 
             while(finderDatStream.Position + 0x5C <= finderDatStream.Length)
             {
-                PCExchangeEntry datEntry   = new PCExchangeEntry();
-                byte[]          datEntry_b = new byte[Marshal.SizeOf(datEntry)];
+                var    datEntry   = new PCExchangeEntry();
+                byte[] datEntry_b = new byte[Marshal.SizeOf(datEntry)];
                 finderDatStream.Read(datEntry_b, 0, Marshal.SizeOf(datEntry));
-                datEntry = Aaru.Helpers.Marshal.ByteArrayToStructureBigEndian<PCExchangeEntry>(datEntry_b);
+                datEntry = Helpers.Marshal.ByteArrayToStructureBigEndian<PCExchangeEntry>(datEntry_b);
+
                 // TODO: Add support for encoding on filters
-                string macName =
-                    StringHandlers.PascalToString(datEntry.macName, Encoding.GetEncoding("macintosh"));
+                string macName = StringHandlers.PascalToString(datEntry.macName, Encoding.GetEncoding("macintosh"));
+
                 byte[] tmpDosName_b = new byte[8];
                 byte[] tmpDosExt_b  = new byte[3];
                 Array.Copy(datEntry.dosName, 0, tmpDosName_b, 0, 8);
-                Array.Copy(datEntry.dosName, 8, tmpDosExt_b,  0, 3);
+                Array.Copy(datEntry.dosName, 8, tmpDosExt_b, 0, 3);
+
                 string dosName = Encoding.ASCII.GetString(tmpDosName_b).Trim() + "." +
                                  Encoding.ASCII.GetString(tmpDosExt_b).Trim();
+
                 string dosNameLow = dosName.ToLower(CultureInfo.CurrentCulture);
 
-                if(baseFilename != macName && baseFilename != dosName && baseFilename != dosNameLow) continue;
+                if(baseFilename != macName &&
+                   baseFilename != dosName &&
+                   baseFilename != dosNameLow)
+                    continue;
 
                 dataFound |=
                     File.Exists(Path.Combine(parentFolder, macName ?? throw new InvalidOperationException())) ||
@@ -150,15 +153,9 @@ namespace Aaru.Filters
 
         public bool IsOpened() => opened;
 
-        public void Open(byte[] buffer)
-        {
-            throw new NotSupportedException();
-        }
+        public void Open(byte[] buffer) => throw new NotSupportedException();
 
-        public void Open(Stream stream)
-        {
-            throw new NotSupportedException();
-        }
+        public void Open(Stream stream) => throw new NotSupportedException();
 
         public void Open(string path)
         {
@@ -167,40 +164,48 @@ namespace Aaru.Filters
 
             parentFolder = parentFolder ?? "";
 
-            FileStream finderDatStream =
+            var finderDatStream =
                 new FileStream(Path.Combine(parentFolder, FINDER_INFO), FileMode.Open, FileAccess.Read);
 
             while(finderDatStream.Position + 0x5C <= finderDatStream.Length)
             {
-                PCExchangeEntry datEntry   = new PCExchangeEntry();
-                byte[]          datEntry_b = new byte[Marshal.SizeOf(datEntry)];
+                var    datEntry   = new PCExchangeEntry();
+                byte[] datEntry_b = new byte[Marshal.SizeOf(datEntry)];
                 finderDatStream.Read(datEntry_b, 0, Marshal.SizeOf(datEntry));
-                datEntry = Aaru.Helpers.Marshal.ByteArrayToStructureBigEndian<PCExchangeEntry>(datEntry_b);
-                string macName =
-                    StringHandlers.PascalToString(datEntry.macName, Encoding.GetEncoding("macintosh"));
+                datEntry = Helpers.Marshal.ByteArrayToStructureBigEndian<PCExchangeEntry>(datEntry_b);
+
+                string macName = StringHandlers.PascalToString(datEntry.macName, Encoding.GetEncoding("macintosh"));
+
                 byte[] tmpDosName_b = new byte[8];
                 byte[] tmpDosExt_b  = new byte[3];
                 Array.Copy(datEntry.dosName, 0, tmpDosName_b, 0, 8);
-                Array.Copy(datEntry.dosName, 8, tmpDosExt_b,  0, 3);
+                Array.Copy(datEntry.dosName, 8, tmpDosExt_b, 0, 3);
+
                 string dosName = Encoding.ASCII.GetString(tmpDosName_b).Trim() + "." +
                                  Encoding.ASCII.GetString(tmpDosExt_b).Trim();
+
                 string dosNameLow = dosName.ToLower(CultureInfo.CurrentCulture);
 
-                if(baseFilename != macName && baseFilename != dosName && baseFilename != dosNameLow) continue;
+                if(baseFilename != macName &&
+                   baseFilename != dosName &&
+                   baseFilename != dosNameLow)
+                    continue;
 
                 if(File.Exists(Path.Combine(parentFolder, macName ?? throw new InvalidOperationException())))
                     dataPath = Path.Combine(parentFolder, macName);
                 else if(File.Exists(Path.Combine(parentFolder, dosName)))
                     dataPath = Path.Combine(parentFolder, dosName);
                 else if(File.Exists(Path.Combine(parentFolder, dosNameLow)))
-                    dataPath  = Path.Combine(parentFolder, dosNameLow);
-                else dataPath = null;
+                    dataPath = Path.Combine(parentFolder, dosNameLow);
+                else
+                    dataPath = null;
 
                 if(File.Exists(Path.Combine(parentFolder, RESOURCES, dosName)))
                     rsrcPath = Path.Combine(parentFolder, RESOURCES, dosName);
                 else if(File.Exists(Path.Combine(parentFolder, RESOURCES, dosNameLow)))
-                    rsrcPath  = Path.Combine(parentFolder, RESOURCES, dosNameLow);
-                else rsrcPath = null;
+                    rsrcPath = Path.Combine(parentFolder, RESOURCES, dosNameLow);
+                else
+                    rsrcPath = null;
 
                 lastWriteTime = DateHandlers.MacToDateTime(datEntry.modificationDate);
                 creationTime  = DateHandlers.MacToDateTime(datEntry.creationDate);
@@ -221,62 +226,36 @@ namespace Aaru.Filters
         struct PCExchangeEntry
         {
             /// <summary>
-            ///     Name in Macintosh. If PCExchange version supports FAT's LFN they are the same.
-            ///     Illegal characters for FAT get substituted with '_' both here and in FAT's LFN entry.
+            ///     Name in Macintosh. If PCExchange version supports FAT's LFN they are the same. Illegal characters for FAT get
+            ///     substituted with '_' both here and in FAT's LFN entry.
             /// </summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
             public readonly byte[] macName;
-            /// <summary>
-            ///     File type
-            /// </summary>
+            /// <summary>File type</summary>
             public readonly uint type;
-            /// <summary>
-            ///     File creator
-            /// </summary>
+            /// <summary>File creator</summary>
             public readonly uint creator;
-            /// <summary>
-            ///     Finder flags
-            /// </summary>
+            /// <summary>Finder flags</summary>
             public readonly ushort fdFlags;
-            /// <summary>
-            ///     File's icon vertical position within its window
-            /// </summary>
+            /// <summary>File's icon vertical position within its window</summary>
             public readonly ushort verticalPosition;
-            /// <summary>
-            ///     File's icon horizontal position within its window
-            /// </summary>
+            /// <summary>File's icon horizontal position within its window</summary>
             public readonly ushort horizontalPosition;
-            /// <summary>
-            ///     Unknown, all bytes are empty but last, except in volume's label entry
-            /// </summary>
+            /// <summary>Unknown, all bytes are empty but last, except in volume's label entry</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 18)]
             public readonly byte[] unknown1;
-            /// <summary>
-            ///     File's creation date
-            /// </summary>
+            /// <summary>File's creation date</summary>
             public readonly uint creationDate;
-            /// <summary>
-            ///     File's modification date
-            /// </summary>
+            /// <summary>File's modification date</summary>
             public readonly uint modificationDate;
-            /// <summary>
-            ///     File's last backup date
-            /// </summary>
+            /// <summary>File's last backup date</summary>
             public readonly uint backupDate;
-            /// <summary>
-            ///     Unknown, but is unique, starts 0x7FFFFFFF and counts in reverse.
-            ///     Probably file ID for alias look up?
-            /// </summary>
+            /// <summary>Unknown, but is unique, starts 0x7FFFFFFF and counts in reverse. Probably file ID for alias look up?</summary>
             public readonly uint unknown2;
-            /// <summary>
-            ///     Name as in FAT entry (not LFN).
-            ///     Resource fork file is always using this name, never LFN.
-            /// </summary>
+            /// <summary>Name as in FAT entry (not LFN). Resource fork file is always using this name, never LFN.</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 11)]
             public readonly byte[] dosName;
-            /// <summary>
-            ///     Unknown, flags?
-            /// </summary>
+            /// <summary>Unknown, flags?</summary>
             public readonly byte unknown3;
         }
     }
diff --git a/Aaru.Filters/Register.cs b/Aaru.Filters/Register.cs
index 6e993de08..08c962297 100644
--- a/Aaru.Filters/Register.cs
+++ b/Aaru.Filters/Register.cs
@@ -50,11 +50,10 @@ namespace Aaru.Filters
 
         public List<Type> GetAllFilesystemPlugins() => null;
 
-        public List<Type> GetAllFilterPlugins()
-        {
-            return Assembly.GetExecutingAssembly().GetTypes().Where(t => t.GetInterfaces().Contains(typeof(IFilter)))
-                           .Where(t => t.IsClass).ToList();
-        }
+        public List<Type> GetAllFilterPlugins() => Assembly.
+                                                   GetExecutingAssembly().GetTypes().
+                                                   Where(t => t.GetInterfaces().Contains(typeof(IFilter))).
+                                                   Where(t => t.IsClass).ToList();
 
         public List<Type> GetAllFloppyImagePlugins() => null;
 
diff --git a/Aaru.Filters/XZ.cs b/Aaru.Filters/XZ.cs
index 5d358afc1..99dde690d 100644
--- a/Aaru.Filters/XZ.cs
+++ b/Aaru.Filters/XZ.cs
@@ -37,9 +37,7 @@ using SharpCompress.Compressors.Xz;
 
 namespace Aaru.Filters
 {
-    /// <summary>
-    ///     Decompress xz files while reading
-    /// </summary>
+    /// <summary>Decompress xz files while reading</summary>
     public class XZ : IFilter
     {
         string   basePath;
@@ -72,10 +70,11 @@ namespace Aaru.Filters
 
         public bool HasResourceFork() => false;
 
-        public bool Identify(byte[] buffer) =>
-            buffer[0] == 0xFD && buffer[1]                 == 0x37 && buffer[2] == 0x7A &&
-            buffer[3] == 0x58 && buffer[4]                 == 0x5A &&
-            buffer[5] == 0x00 && buffer[buffer.Length - 2] == 0x59 && buffer[buffer.Length - 1] == 0x5A;
+        public bool Identify(byte[] buffer) => buffer[0]                 == 0xFD && buffer[1] == 0x37 &&
+                                               buffer[2]                 == 0x7A &&
+                                               buffer[3]                 == 0x58 && buffer[4] == 0x5A &&
+                                               buffer[5]                 == 0x00 &&
+                                               buffer[buffer.Length - 2] == 0x59 && buffer[buffer.Length - 1] == 0x5A;
 
         public bool Identify(Stream stream)
         {
@@ -94,15 +93,16 @@ namespace Aaru.Filters
 
         public bool Identify(string path)
         {
-            if(!File.Exists(path)) return false;
+            if(!File.Exists(path))
+                return false;
 
-            FileStream stream = new FileStream(path, FileMode.Open, FileAccess.Read);
-            byte[]     buffer = new byte[6];
-            byte[]     footer = new byte[2];
+            var    stream = new FileStream(path, FileMode.Open, FileAccess.Read);
+            byte[] buffer = new byte[6];
+            byte[] footer = new byte[2];
 
             stream.Seek(0, SeekOrigin.Begin);
             stream.Read(buffer, 0, 6);
-            stream.Seek(0,  SeekOrigin.Begin);
+            stream.Seek(0, SeekOrigin.Begin);
             stream.Seek(-2, SeekOrigin.End);
             stream.Read(footer, 0, 2);
             stream.Seek(0, SeekOrigin.Begin);
@@ -138,7 +138,7 @@ namespace Aaru.Filters
             dataStream = new FileStream(path, FileMode.Open, FileAccess.Read);
             basePath   = Path.GetFullPath(path);
 
-            FileInfo fi = new FileInfo(path);
+            var fi = new FileInfo(path);
             creationTime  = fi.CreationTimeUtc;
             lastWriteTime = fi.LastWriteTimeUtc;
             GuessSize();
@@ -162,8 +162,7 @@ namespace Aaru.Filters
                 return basePath.Substring(0, basePath.Length - 3);
 
             return basePath?.EndsWith(".xzip", StringComparison.InvariantCultureIgnoreCase) == true
-                       ? basePath.Substring(0, basePath.Length - 5)
-                       : basePath;
+                       ? basePath.Substring(0, basePath.Length - 5) : basePath;
         }
 
         public string GetParentFolder() => Path.GetDirectoryName(basePath);
@@ -173,11 +172,13 @@ namespace Aaru.Filters
         void GuessSize()
         {
             decompressedSize = 0;
+
             // Seek to footer backwards size field
             dataStream.Seek(-8, SeekOrigin.End);
             byte[] tmp = new byte[4];
             dataStream.Read(tmp, 0, 4);
             uint backwardSize = (BitConverter.ToUInt32(tmp, 0) + 1) * 4;
+
             // Seek to first indexed record
             dataStream.Seek(-12 - (backwardSize - 2), SeekOrigin.End);
 
@@ -199,16 +200,20 @@ namespace Aaru.Filters
 
         int Decode(byte[] buf, int sizeMax, ref ulong num)
         {
-            if(sizeMax == 0) return 0;
+            if(sizeMax == 0)
+                return 0;
 
-            if(sizeMax > 9) sizeMax = 9;
+            if(sizeMax > 9)
+                sizeMax = 9;
 
             num = (ulong)(buf[0] & 0x7F);
             int i = 0;
 
             while((buf[i++] & 0x80) == 0x80)
             {
-                if(i >= sizeMax || buf[i] == 0x00) return 0;
+                if(i      >= sizeMax ||
+                   buf[i] == 0x00)
+                    return 0;
 
                 num |= (ulong)(buf[i] & 0x7F) << (i * 7);
             }
diff --git a/Aaru.Filters/ZZZNoFilter.cs b/Aaru.Filters/ZZZNoFilter.cs
index f7c4612e6..a61d215cb 100644
--- a/Aaru.Filters/ZZZNoFilter.cs
+++ b/Aaru.Filters/ZZZNoFilter.cs
@@ -36,9 +36,7 @@ using Aaru.CommonTypes.Interfaces;
 
 namespace Aaru.Filters
 {
-    /// <summary>
-    ///     No filter for reading files not recognized by any filter
-    /// </summary>
+    /// <summary>No filter for reading files not recognized by any filter</summary>
     public class ZZZNoFilter : IFilter
     {
         string   basePath;
@@ -97,7 +95,7 @@ namespace Aaru.Filters
         {
             dataStream = new FileStream(path, FileMode.Open, FileAccess.Read);
             basePath   = Path.GetFullPath(path);
-            FileInfo fi = new FileInfo(path);
+            var fi = new FileInfo(path);
             creationTime  = fi.CreationTimeUtc;
             lastWriteTime = fi.LastWriteTimeUtc;
             opened        = true;
diff --git a/Aaru.Gtk/Program.cs b/Aaru.Gtk/Program.cs
index 648ccab79..c80ccb8dc 100644
--- a/Aaru.Gtk/Program.cs
+++ b/Aaru.Gtk/Program.cs
@@ -11,7 +11,7 @@ using Microsoft.EntityFrameworkCore;
 
 namespace Aaru.Gtk
 {
-    class Program
+    internal class Program
     {
         internal static bool                                  Verbose;
         internal static bool                                  Debug;
@@ -25,26 +25,30 @@ namespace Aaru.Gtk
             object[] attributes = typeof(Program).Assembly.GetCustomAttributes(typeof(AssemblyTitleAttribute), false);
             AssemblyTitle = ((AssemblyTitleAttribute)attributes[0]).Title;
             attributes    = typeof(Program).Assembly.GetCustomAttributes(typeof(AssemblyCopyrightAttribute), false);
+
             AssemblyVersion =
                 Attribute.GetCustomAttribute(typeof(Program).Assembly, typeof(AssemblyInformationalVersionAttribute)) as
                     AssemblyInformationalVersionAttribute;
+
             AssemblyCopyright = ((AssemblyCopyrightAttribute)attributes[0]).Copyright;
 
             Settings.Settings.LoadSettings();
 
-            DicContext ctx = DicContext.Create(Settings.Settings.LocalDbPath);
+            var ctx = AaruContext.Create(Settings.Settings.LocalDbPath);
             ctx.Database.Migrate();
             ctx.SaveChanges();
 
             // TODO: Update database on GUI
 
-            DicContext mctx = DicContext.Create(Settings.Settings.MasterDbPath);
+            var mctx = AaruContext.Create(Settings.Settings.MasterDbPath);
             mctx.Database.Migrate();
             mctx.SaveChanges();
 
             Statistics.LoadStats();
-            if(Settings.Settings.Current.Stats != null && Settings.Settings.Current.Stats.ShareStats)
-                Task.Run(() => { Statistics.SubmitStats(); });
+
+            if(Settings.Settings.Current.Stats != null &&
+               Settings.Settings.Current.Stats.ShareStats)
+                Task.Run(Statistics.SubmitStats);
 
             foreach(string arg in args)
                 switch(arg.ToLowerInvariant())
@@ -52,10 +56,12 @@ namespace Aaru.Gtk
                     case "-v":
                     case "--verbose":
                         Verbose = true;
+
                         break;
                     case "-d":
                     case "--debug":
                         Debug = true;
+
                         break;
                 }
 
diff --git a/Aaru.Gui.XamMac/Aaru.Gui.XamMac.csproj b/Aaru.Gui.XamMac/Aaru.Gui.XamMac.csproj
index 4e1900ee3..fd9ec838d 100644
--- a/Aaru.Gui.XamMac/Aaru.Gui.XamMac.csproj
+++ b/Aaru.Gui.XamMac/Aaru.Gui.XamMac.csproj
@@ -160,11 +160,4 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Folder>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="..\.github\CODE_OF_CONDUCT.md" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="..\.github\ISSUE_TEMPLATE.md" />
-    <Content Include="..\.github\PULL_REQUEST_TEMPLATE.md" />
-  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Aaru.Gui.XamMac/Program.cs b/Aaru.Gui.XamMac/Program.cs
index b4dab21d9..591d37101 100644
--- a/Aaru.Gui.XamMac/Program.cs
+++ b/Aaru.Gui.XamMac/Program.cs
@@ -29,6 +29,7 @@
 // ----------------------------------------------------------------------------
 // Copyright © 2011-2018 Natalia Portillo
 // ****************************************************************************/
+
 using System;
 using System.Reflection;
 using System.Threading.Tasks;
@@ -41,12 +42,12 @@ using Microsoft.EntityFrameworkCore;
 
 namespace Aaru.XamMac
 {
-    class Program
+    internal class Program
     {
-        internal static bool Verbose;
-        internal static bool Debug;
-        internal static string AssemblyCopyright;
-        internal static string AssemblyTitle;
+        internal static bool                                  Verbose;
+        internal static bool                                  Debug;
+        internal static string                                AssemblyCopyright;
+        internal static string                                AssemblyTitle;
         internal static AssemblyInformationalVersionAttribute AssemblyVersion;
 
         [STAThread]
@@ -54,38 +55,47 @@ namespace Aaru.XamMac
         {
             object[] attributes = typeof(Program).Assembly.GetCustomAttributes(typeof(AssemblyTitleAttribute), false);
             AssemblyTitle = ((AssemblyTitleAttribute)attributes[0]).Title;
-            attributes = typeof(Program).Assembly.GetCustomAttributes(typeof(AssemblyCopyrightAttribute), false);
+            attributes    = typeof(Program).Assembly.GetCustomAttributes(typeof(AssemblyCopyrightAttribute), false);
+
             AssemblyVersion =
                 Attribute.GetCustomAttribute(typeof(Program).Assembly, typeof(AssemblyInformationalVersionAttribute)) as
                     AssemblyInformationalVersionAttribute;
+
             AssemblyCopyright = ((AssemblyCopyrightAttribute)attributes[0]).Copyright;
 
             Settings.Settings.LoadSettings();
 
-            DicContext ctx = DicContext.Create(Settings.Settings.LocalDbPath);
+            var ctx = AaruContext.Create(Settings.Settings.LocalDbPath);
             ctx.Database.Migrate();
             ctx.SaveChanges();
 
             // TODO: Update database on GUI
 
-            DicContext mctx = DicContext.Create(Settings.Settings.MasterDbPath);
+            var mctx = AaruContext.Create(Settings.Settings.MasterDbPath);
             mctx.Database.Migrate();
             mctx.SaveChanges();
 
             Statistics.LoadStats();
-            if (Settings.Settings.Current.Stats != null && Settings.Settings.Current.Stats.ShareStats)
-                Task.Run(() => { Statistics.SubmitStats(); });
 
-            foreach (string arg in args)
-                switch (arg.ToLowerInvariant())
+            if(Settings.Settings.Current.Stats != null &&
+               Settings.Settings.Current.Stats.ShareStats)
+                Task.Run(() =>
+                {
+                    Statistics.SubmitStats();
+                });
+
+            foreach(string arg in args)
+                switch(arg.ToLowerInvariant())
                 {
                     case "-v":
                     case "--verbose":
                         Verbose = true;
+
                         break;
                     case "-d":
                     case "--debug":
                         Debug = true;
+
                         break;
                 }
 
diff --git a/Aaru.Gui/ConsoleHandler.cs b/Aaru.Gui/ConsoleHandler.cs
index f44bd7038..0b04f051f 100644
--- a/Aaru.Gui/ConsoleHandler.cs
+++ b/Aaru.Gui/ConsoleHandler.cs
@@ -37,7 +37,7 @@ using Aaru.Console;
 
 namespace Aaru.Gui
 {
-    static class ConsoleHandler
+    internal static class ConsoleHandler
     {
         static bool _debug;
         static bool _verbose;
@@ -47,25 +47,32 @@ namespace Aaru.Gui
             get => _debug;
             set
             {
-                if(_debug == value) return;
+                if(_debug == value)
+                    return;
 
                 _debug = value;
 
-                if(_debug) AaruConsole.DebugWithModuleWriteLineEvent += OnDebugWriteHandler;
-                else AaruConsole.DebugWithModuleWriteLineEvent       -= OnDebugWriteHandler;
+                if(_debug)
+                    AaruConsole.DebugWithModuleWriteLineEvent += OnDebugWriteHandler;
+                else
+                    AaruConsole.DebugWithModuleWriteLineEvent -= OnDebugWriteHandler;
             }
         }
+
         public static bool Verbose
         {
             get => _verbose;
             set
             {
-                if(_verbose == value) return;
+                if(_verbose == value)
+                    return;
 
                 _verbose = value;
 
-                if(_verbose) AaruConsole.VerboseWriteLineEvent += OnVerboseWriteHandler;
-                else AaruConsole.VerboseWriteLineEvent         -= OnVerboseWriteHandler;
+                if(_verbose)
+                    AaruConsole.VerboseWriteLineEvent += OnVerboseWriteHandler;
+                else
+                    AaruConsole.VerboseWriteLineEvent -= OnVerboseWriteHandler;
             }
         }
 
@@ -79,58 +86,54 @@ namespace Aaru.Gui
 
         static void OnWriteHandler(string format, params object[] arg)
         {
-            if(format == null || arg == null) return;
+            if(format == null ||
+               arg    == null)
+                return;
 
             Entries.Add(new LogEntry
             {
-                Message   = string.Format(format, arg),
-                Module    = null,
-                Timestamp = DateTime.Now,
-                Type      = "Info"
+                Message = string.Format(format, arg), Module = null, Timestamp = DateTime.Now, Type = "Info"
             });
         }
 
         static void OnErrorWriteHandler(string format, params object[] arg)
         {
-            if(format == null || arg == null) return;
+            if(format == null ||
+               arg    == null)
+                return;
 
             Entries.Add(new LogEntry
             {
-                Message   = string.Format(format, arg),
-                Module    = null,
-                Timestamp = DateTime.Now,
-                Type      = "Error"
+                Message = string.Format(format, arg), Module = null, Timestamp = DateTime.Now, Type = "Error"
             });
         }
 
         static void OnVerboseWriteHandler(string format, params object[] arg)
         {
-            if(format == null || arg == null) return;
+            if(format == null ||
+               arg    == null)
+                return;
 
             Entries.Add(new LogEntry
             {
-                Message   = string.Format(format, arg),
-                Module    = null,
-                Timestamp = DateTime.Now,
-                Type      = "Verbose"
+                Message = string.Format(format, arg), Module = null, Timestamp = DateTime.Now, Type = "Verbose"
             });
         }
 
         static void OnDebugWriteHandler(string module, string format, params object[] arg)
         {
-            if(format == null || arg == null) return;
+            if(format == null ||
+               arg    == null)
+                return;
 
             Entries.Add(new LogEntry
             {
-                Message   = string.Format(format, arg),
-                Module    = module,
-                Timestamp = DateTime.Now,
-                Type      = "Debug"
+                Message = string.Format(format, arg), Module = module, Timestamp = DateTime.Now, Type = "Debug"
             });
         }
     }
 
-    class LogEntry
+    internal class LogEntry
     {
         public string   Message   { get; set; }
         public string   Module    { get; set; }
diff --git a/Aaru.Gui/Controls/BlockMap.cs b/Aaru.Gui/Controls/BlockMap.cs
index ef9cba6c7..e7d49c1e7 100644
--- a/Aaru.Gui/Controls/BlockMap.cs
+++ b/Aaru.Gui/Controls/BlockMap.cs
@@ -38,7 +38,9 @@ namespace Aaru.Gui.Controls
             {
                 sectorsToRead = value;
                 blocksToRead  = (uint)(sectorsToRead / SectorsPerBlock);
-                if(sectorsToRead % SectorsPerBlock > 0) blocksToRead++;
+
+                if(sectorsToRead % SectorsPerBlock > 0)
+                    blocksToRead++;
             }
         }
 
@@ -51,10 +53,11 @@ namespace Aaru.Gui.Controls
                 case NotifyCollectionChangedAction.Add:
                     foreach(object item in args.NewItems)
                     {
-                        if(!(item is ColoredBlock block)) continue;
+                        if(!(item is ColoredBlock block))
+                            continue;
 
                         for(ulong i = 0; i < blocksToRead; i++)
-                            ColoredBlocks.Add(new ColoredBlock(block.Block / SectorsPerBlock + i, block.Color));
+                            ColoredBlocks.Add(new ColoredBlock((block.Block / SectorsPerBlock) + i, block.Color));
                     }
 
                     break;
@@ -62,35 +65,39 @@ namespace Aaru.Gui.Controls
                 case NotifyCollectionChangedAction.Remove:
                     foreach(object item in args.OldItems)
                     {
-                        if(!(item is ColoredBlock block)) continue;
+                        if(!(item is ColoredBlock block))
+                            continue;
 
                         for(ulong i = 0; i < blocksToRead; i++)
-                            ColoredBlocks.Remove(ColoredBlocks.FirstOrDefault(t => t.Block == block.Block /
-                                                                                   SectorsPerBlock + i));
+                            ColoredBlocks.Remove(ColoredBlocks.FirstOrDefault(t => t.Block == (block.Block /
+                                                                                               SectorsPerBlock) + i));
                     }
 
                     break;
                 case NotifyCollectionChangedAction.Replace:
                     foreach(object item in args.OldItems)
                     {
-                        if(!(item is ColoredBlock block)) continue;
+                        if(!(item is ColoredBlock block))
+                            continue;
 
                         for(ulong i = 0; i < blocksToRead; i++)
-                            ColoredBlocks.Remove(ColoredBlocks.FirstOrDefault(t => t.Block == block.Block /
-                                                                                   SectorsPerBlock + i));
+                            ColoredBlocks.Remove(ColoredBlocks.FirstOrDefault(t => t.Block == (block.Block /
+                                                                                               SectorsPerBlock) + i));
                     }
 
                     foreach(object item in args.NewItems)
                     {
-                        if(!(item is ColoredBlock block)) continue;
+                        if(!(item is ColoredBlock block))
+                            continue;
 
                         for(ulong i = 0; i < blocksToRead; i++)
-                            ColoredBlocks.Add(new ColoredBlock(block.Block / SectorsPerBlock + i, block.Color));
+                            ColoredBlocks.Add(new ColoredBlock((block.Block / SectorsPerBlock) + i, block.Color));
                     }
 
                     break;
                 case NotifyCollectionChangedAction.Reset:
                     ColoredBlocks.Clear();
+
                     break;
                 default: throw new ArgumentOutOfRangeException();
             }
@@ -101,15 +108,15 @@ namespace Aaru.Gui.Controls
             SectorsPerBlock = Blocks == 0 ? 0 : _sectors / Blocks;
             ColoredBlocks.Clear();
 
-            if(SectorsPerBlock > 0) return;
+            if(SectorsPerBlock > 0)
+                return;
 
             SectorsPerBlock = 1;
-            for(ulong i = Sectors; i < Blocks; i++) ColoredBlocks.Add(new ColoredBlock(i, GridColor));
+
+            for(ulong i = Sectors; i < Blocks; i++)
+                ColoredBlocks.Add(new ColoredBlock(i, GridColor));
         }
 
-        public void Clear()
-        {
-            ColoredSectors.Clear();
-        }
+        public void Clear() => ColoredSectors.Clear();
     }
 }
\ No newline at end of file
diff --git a/Aaru.Gui/Controls/ColoredGrid.cs b/Aaru.Gui/Controls/ColoredGrid.cs
index 460441e4d..21bf4ed66 100644
--- a/Aaru.Gui/Controls/ColoredGrid.cs
+++ b/Aaru.Gui/Controls/ColoredGrid.cs
@@ -4,14 +4,10 @@ using Eto.Forms;
 
 namespace Aaru.Gui.Controls
 {
-    /// <summary>
-    ///     Draws a grid of colored blocks
-    /// </summary>
+    /// <summary>Draws a grid of colored blocks</summary>
     public class ColoredGrid : Drawable
     {
-        /// <summary>
-        ///     Size of the block, including its top and left border, in pixels
-        /// </summary>
+        /// <summary>Size of the block, including its top and left border, in pixels</summary>
         const int BLOCK_SIZE = 5;
 
         Color gridColor;
@@ -24,24 +20,20 @@ namespace Aaru.Gui.Controls
         }
 
         new bool CanFocus => false;
-        /// <summary>
-        ///     How many columns are in the grid
-        /// </summary>
+        /// <summary>How many columns are in the grid</summary>
         public int Columns { get; private set; }
-        /// <summary>
-        ///     How many rows are in the grid
-        /// </summary>
+        /// <summary>How many rows are in the grid</summary>
         public int Rows { get; private set; }
-        /// <summary>
-        ///     How many blocks are in the grid
-        /// </summary>
+        /// <summary>How many blocks are in the grid</summary>
         public ulong Blocks { get; private set; }
+
         public Color GridColor
         {
             get => gridColor;
             set
             {
-                if(gridColor == value) return;
+                if(gridColor == value)
+                    return;
 
                 gridColor = value;
                 Invalidate();
@@ -62,9 +54,11 @@ namespace Aaru.Gui.Controls
             remainder = (int)rect.Height % (BLOCK_SIZE  + 1);
             int height = (int)rect.Height - remainder   - 1;
 
-            for(float i = rect.X; i <= width; i += 5) graphics.DrawLine(gridColor, i, rect.Y, i, height);
+            for(float i = rect.X; i <= width; i += 5)
+                graphics.DrawLine(gridColor, i, rect.Y, i, height);
 
-            for(float i = rect.Y; i <= height; i += 5) graphics.DrawLine(gridColor, rect.X, i, width, i);
+            for(float i = rect.Y; i <= height; i += 5)
+                graphics.DrawLine(gridColor, rect.X, i, width, i);
 
             Columns = width  / BLOCK_SIZE;
             Rows    = height / BLOCK_SIZE;
@@ -76,7 +70,8 @@ namespace Aaru.Gui.Controls
 
         void PaintBlock(Graphics graphics, Color color, ulong block)
         {
-            if(block > Blocks) return;
+            if(block > Blocks)
+                return;
 
             int row = (int)(block / (ulong)Columns);
             int col = (int)(block % (ulong)Columns);
@@ -87,9 +82,7 @@ namespace Aaru.Gui.Controls
         }
     }
 
-    /// <summary>
-    ///     Defines a block that has a corresponding color
-    /// </summary>
+    /// <summary>Defines a block that has a corresponding color</summary>
     public class ColoredBlock
     {
         public readonly ulong Block;
diff --git a/Aaru.Gui/Controls/LineChart.cs b/Aaru.Gui/Controls/LineChart.cs
index 8676078c2..e1a4a2717 100644
--- a/Aaru.Gui/Controls/LineChart.cs
+++ b/Aaru.Gui/Controls/LineChart.cs
@@ -5,9 +5,7 @@ using Eto.Forms;
 
 namespace Aaru.Gui.Controls
 {
-    /// <summary>
-    ///     Draws a line chart
-    /// </summary>
+    /// <summary>Draws a line chart</summary>
     public class LineChart : Drawable
     {
         bool       absoluteMargins;
@@ -58,24 +56,21 @@ namespace Aaru.Gui.Controls
             previousPoint            =  new PointF(0, 0);
         }
 
-        /// <summary>
-        ///     If set the margins would be in absolute pixels, otherwise in relative points
-        /// </summary>
+        /// <summary>If set the margins would be in absolute pixels, otherwise in relative points</summary>
         public bool AbsoluteMargins
         {
             get => absoluteMargins;
             set
             {
-                if(absoluteMargins == value) return;
+                if(absoluteMargins == value)
+                    return;
 
                 absoluteMargins = value;
                 Invalidate();
             }
         }
 
-        /// <summary>
-        ///     Margin between the leftmost border and the Y axis
-        /// </summary>
+        /// <summary>Margin between the leftmost border and the Y axis</summary>
         public float MarginX
         {
             get => marginX;
@@ -86,9 +81,7 @@ namespace Aaru.Gui.Controls
             }
         }
 
-        /// <summary>
-        ///     Margin between the bottommost border and the X axis
-        /// </summary>
+        /// <summary>Margin between the bottommost border and the X axis</summary>
         public float MarginY
         {
             get => marginY;
@@ -99,44 +92,38 @@ namespace Aaru.Gui.Controls
             }
         }
 
-        /// <summary>
-        ///     Contains the relative poitns to be drawn
-        /// </summary>
+        /// <summary>Contains the relative poitns to be drawn</summary>
         public ObservableCollection<PointF> Values { get; }
 
-        /// <summary>
-        ///     If axes borders should be drawn
-        /// </summary>
+        /// <summary>If axes borders should be drawn</summary>
         public bool DrawAxes
         {
             get => drawAxes;
             set
             {
-                if(drawAxes == value) return;
+                if(drawAxes == value)
+                    return;
 
                 drawAxes = value;
                 Invalidate();
             }
         }
 
-        /// <summary>
-        ///     If a grid should be drawn every X step
-        /// </summary>
+        /// <summary>If a grid should be drawn every X step</summary>
         public bool ShowStepsX
         {
             get => showStepsX;
             set
             {
-                if(showStepsX == value) return;
+                if(showStepsX == value)
+                    return;
 
                 showStepsX = value;
                 Invalidate();
             }
         }
 
-        /// <summary>
-        ///     Separation between X grid lines
-        /// </summary>
+        /// <summary>Separation between X grid lines</summary>
         public float StepsX
         {
             get => stepsX;
@@ -147,24 +134,21 @@ namespace Aaru.Gui.Controls
             }
         }
 
-        /// <summary>
-        ///     If a grid should be drawn every Y step
-        /// </summary>
+        /// <summary>If a grid should be drawn every Y step</summary>
         public bool ShowStepsY
         {
             get => showStepsY;
             set
             {
-                if(showStepsY == value) return;
+                if(showStepsY == value)
+                    return;
 
                 showStepsY = value;
                 Invalidate();
             }
         }
 
-        /// <summary>
-        ///     Separation between X grid lines
-        /// </summary>
+        /// <summary>Separation between X grid lines</summary>
         public float StepsY
         {
             get => stepsY;
@@ -175,9 +159,7 @@ namespace Aaru.Gui.Controls
             }
         }
 
-        /// <summary>
-        ///     Relative point that is equal to start of X
-        /// </summary>
+        /// <summary>Relative point that is equal to start of X</summary>
         public float MinX
         {
             get => minX;
@@ -188,9 +170,7 @@ namespace Aaru.Gui.Controls
             }
         }
 
-        /// <summary>
-        ///     Relative point that is equal to start of Y
-        /// </summary>
+        /// <summary>Relative point that is equal to start of Y</summary>
         public float MinY
         {
             get => minY;
@@ -201,9 +181,7 @@ namespace Aaru.Gui.Controls
             }
         }
 
-        /// <summary>
-        ///     Relative point that is equal to end of X
-        /// </summary>
+        /// <summary>Relative point that is equal to end of X</summary>
         public float MaxX
         {
             get => maxX;
@@ -214,9 +192,7 @@ namespace Aaru.Gui.Controls
             }
         }
 
-        /// <summary>
-        ///     Relative point that is equal to end of Y
-        /// </summary>
+        /// <summary>Relative point that is equal to end of Y</summary>
         public float MaxY
         {
             get => maxY;
@@ -227,75 +203,70 @@ namespace Aaru.Gui.Controls
             }
         }
 
-        /// <summary>
-        ///     Color for background
-        /// </summary>
+        /// <summary>Color for background</summary>
         public new Color BackgroundColor
         {
             get => backgroundColor;
             set
             {
-                if(backgroundColor == value) return;
+                if(backgroundColor == value)
+                    return;
 
                 backgroundColor = value;
                 Invalidate();
             }
         }
 
-        /// <summary>
-        ///     Color to draw the axes borders
-        /// </summary>
+        /// <summary>Color to draw the axes borders</summary>
         public Color AxesColor
         {
             get => axesColor;
             set
             {
-                if(axesColor == value) return;
+                if(axesColor == value)
+                    return;
 
                 axesColor = value;
                 Invalidate();
             }
         }
 
-        /// <summary>
-        ///     Color to draw the X grid
-        /// </summary>
+        /// <summary>Color to draw the X grid</summary>
         public Color ColorX
         {
             get => colorX;
             set
             {
-                if(colorX == value) return;
+                if(colorX == value)
+                    return;
 
                 colorX = value;
                 Invalidate();
             }
         }
 
-        /// <summary>
-        ///     Color to draw the Y grid
-        /// </summary>
+        /// <summary>Color to draw the Y grid</summary>
         public Color ColorY
         {
             get => colorY;
             set
             {
-                if(colorY == value) return;
+                if(colorY == value)
+                    return;
 
                 colorY = value;
                 Invalidate();
             }
         }
 
-        /// <summary>
-        ///     Color to draw the line between points
-        /// </summary>
+        /// <summary>Color to draw the line between points</summary>
         public Color LineColor
         {
             get => lineColor;
             set
             {
-                if(lineColor == value) return;
+                if(lineColor == value)
+                    return;
 
                 lineColor = value;
                 Invalidate();
@@ -305,13 +276,20 @@ namespace Aaru.Gui.Controls
         void OnValuesChanged(object sender, NotifyCollectionChangedEventArgs args)
         {
             // If we do not support to drawn on the graphics we will need to redraw it, slowly
-            if(!SupportsCreateGraphics) Invalidate();
+            if(!SupportsCreateGraphics)
+                Invalidate();
 
             Graphics g;
 
             // If the control is not visible (hidden in another tab) this raises an exception
-            try { g = CreateGraphics(); }
-            catch { return; }
+            try
+            {
+                g = CreateGraphics();
+            }
+            catch
+            {
+                return;
+            }
 
             switch(args.Action)
             {
@@ -319,7 +297,8 @@ namespace Aaru.Gui.Controls
                 case NotifyCollectionChangedAction.Add:
                     foreach(object item in args.NewItems)
                     {
-                        if(!(item is PointF nextPoint)) continue;
+                        if(!(item is PointF nextPoint))
+                            continue;
 
                         float prevXrated = previousPoint.X * ratioX;
                         float prevYrated = previousPoint.Y * ratioY;
@@ -327,7 +306,8 @@ namespace Aaru.Gui.Controls
                         float nextXrated = nextPoint.X * ratioX;
                         float nextYrated = nextPoint.Y * ratioY;
 
-                        if(prevYrated <= 0) prevYrated = nextYrated;
+                        if(prevYrated <= 0)
+                            prevYrated = nextYrated;
 
                         g.DrawLine(lineColor, marginXrated + prevXrated, rect.Height - marginYrated - prevYrated,
                                    marginXrated            + nextXrated, rect.Height - marginYrated - nextYrated);
@@ -336,9 +316,11 @@ namespace Aaru.Gui.Controls
                     }
 
                     break;
+
                 // Need to redraw all points
                 default:
                     Invalidate();
+
                     break;
             }
 
@@ -363,13 +345,13 @@ namespace Aaru.Gui.Controls
             if(drawAxes)
             {
                 g.DrawLine(axesColor, marginXrated, 0, marginXrated, rect.Height);
-                g.DrawLine(axesColor, 0, rect.Height - marginYrated, rect.Width,
-                           rect.Height               - marginYrated);
+                g.DrawLine(axesColor, 0, rect.Height - marginYrated, rect.Width, rect.Height - marginYrated);
             }
 
             if(showStepsX)
             {
                 float stepsXraged = stepsX * ratioX;
+
                 for(float x = marginXrated + stepsXraged; x < rect.Width;
                     x += stepsXraged)
                     g.DrawLine(colorX, x, 0, x, rect.Height - marginYrated - 1);
@@ -378,11 +360,13 @@ namespace Aaru.Gui.Controls
             if(showStepsY)
             {
                 float stepsYraged = stepsY * ratioY;
+
                 for(float y = rect.Height - marginYrated - stepsYraged; y > 0; y -= stepsYraged)
                     g.DrawLine(colorY, marginXrated      + 1, y, rect.Width, y);
             }
 
             previousPoint = new PointF(0, 0);
+
             foreach(Point nextPoint in Values)
             {
                 float prevXrated = previousPoint.X * ratioX;
diff --git a/Aaru.Gui/Controls/SvgImageView.cs b/Aaru.Gui/Controls/SvgImageView.cs
index cc31f7ba1..f274df6d6 100644
--- a/Aaru.Gui/Controls/SvgImageView.cs
+++ b/Aaru.Gui/Controls/SvgImageView.cs
@@ -49,7 +49,8 @@ namespace Aaru.Gui.Controls
             get => svgStream;
             set
             {
-                if(svgStream == value) return;
+                if(svgStream == value)
+                    return;
 
                 svgStream = value;
                 Redraw();
@@ -58,7 +59,10 @@ namespace Aaru.Gui.Controls
 
         void Redraw()
         {
-            if(Width == -1 || Height == -1 || svgStream == null) return;
+            if(Width     == -1 ||
+               Height    == -1 ||
+               svgStream == null)
+                return;
 
             svgStream.Position = 0;
 
diff --git a/Aaru.Gui/Dialogs/dlgEncodings.xeto.cs b/Aaru.Gui/Dialogs/dlgEncodings.xeto.cs
index da2eb9239..c0dce208b 100644
--- a/Aaru.Gui/Dialogs/dlgEncodings.xeto.cs
+++ b/Aaru.Gui/Dialogs/dlgEncodings.xeto.cs
@@ -42,7 +42,7 @@ namespace Aaru.Gui.Dialogs
 {
     public class dlgEncodings : Dialog
     {
-        ObservableCollection<CommonEncodingInfo> encodings;
+        readonly ObservableCollection<CommonEncodingInfo> encodings;
 
         public dlgEncodings()
         {
@@ -54,26 +54,25 @@ namespace Aaru.Gui.Dialogs
             encodings = new ObservableCollection<CommonEncodingInfo>();
 
             grdEncodings.DataStore = encodings;
+
             grdEncodings.Columns.Add(new GridColumn
             {
                 DataCell = new TextBoxCell
                 {
                     Binding = Binding.Property<CommonEncodingInfo, string>(r => r.Name)
                 },
-                HeaderText = "Code",
-                Sortable   = true
+                HeaderText = "Code", Sortable = true
             });
+
             grdEncodings.Columns.Add(new GridColumn
             {
                 DataCell = new TextBoxCell
                 {
-                    Binding =
-                        Binding
-                           .Property<CommonEncodingInfo, string>(r => r.DisplayName)
+                    Binding = Binding.Property<CommonEncodingInfo, string>(r => r.DisplayName)
                 },
-                HeaderText = "Name",
-                Sortable   = true
+                HeaderText = "Name", Sortable = true
             });
+
             grdEncodings.AllowMultipleSelection = false;
             grdEncodings.AllowColumnReordering  = true;
         }
@@ -84,26 +83,21 @@ namespace Aaru.Gui.Dialogs
 
             encodings.Clear();
 
-            List<CommonEncodingInfo> _encodings = Encoding
-                                                 .GetEncodings().Select(info => new CommonEncodingInfo
-                                                  {
-                                                      Name = info.Name,
-                                                      DisplayName =
-                                                          info.GetEncoding().EncodingName
-                                                  }).ToList();
-            _encodings.AddRange(Claunia.Encoding.Encoding.GetEncodings()
-                                       .Select(info => new CommonEncodingInfo
-                                        {
-                                            Name = info.Name, DisplayName = info.DisplayName
-                                        }));
+            List<CommonEncodingInfo> _encodings = Encoding.GetEncodings().Select(info => new CommonEncodingInfo
+            {
+                Name = info.Name, DisplayName = info.GetEncoding().EncodingName
+            }).ToList();
 
-            foreach(CommonEncodingInfo encoding in _encodings.OrderBy(t => t.DisplayName)) encodings.Add(encoding);
+            _encodings.AddRange(Claunia.Encoding.Encoding.GetEncodings().Select(info => new CommonEncodingInfo
+            {
+                Name = info.Name, DisplayName = info.DisplayName
+            }));
+
+            foreach(CommonEncodingInfo encoding in _encodings.OrderBy(t => t.DisplayName))
+                encodings.Add(encoding);
         }
 
-        protected void OnBtnClose(object sender, EventArgs e)
-        {
-            Close();
-        }
+        protected void OnBtnClose(object sender, EventArgs e) => Close();
 
         class CommonEncodingInfo
         {
diff --git a/Aaru.Gui/Dialogs/dlgPlugins.xeto.cs b/Aaru.Gui/Dialogs/dlgPlugins.xeto.cs
index 1a60f2416..151e925ad 100644
--- a/Aaru.Gui/Dialogs/dlgPlugins.xeto.cs
+++ b/Aaru.Gui/Dialogs/dlgPlugins.xeto.cs
@@ -43,14 +43,14 @@ namespace Aaru.Gui.Dialogs
 {
     public class dlgPlugins : Dialog
     {
-        ObservableCollection<PluginEntry> filesystems;
-        ObservableCollection<PluginEntry> filters;
-        ObservableCollection<PluginEntry> floppyImages;
-        ObservableCollection<PluginEntry> mediaImages;
-        ObservableCollection<PluginEntry> partitions;
-        ObservableCollection<PluginEntry> readOnlyFilesystems;
-        ObservableCollection<PluginEntry> writableFloppyImages;
-        ObservableCollection<PluginEntry> writableImages;
+        readonly ObservableCollection<PluginEntry> filesystems;
+        readonly ObservableCollection<PluginEntry> filters;
+        readonly ObservableCollection<PluginEntry> floppyImages;
+        readonly ObservableCollection<PluginEntry> mediaImages;
+        readonly ObservableCollection<PluginEntry> partitions;
+        readonly ObservableCollection<PluginEntry> readOnlyFilesystems;
+        readonly ObservableCollection<PluginEntry> writableFloppyImages;
+        readonly ObservableCollection<PluginEntry> writableImages;
 
         public dlgPlugins()
         {
@@ -69,349 +69,330 @@ namespace Aaru.Gui.Dialogs
             writableImages       = new ObservableCollection<PluginEntry>();
 
             grdFilters.DataStore = filters;
+
             grdFilters.Columns.Add(new GridColumn
             {
                 DataCell = new TextBoxCell
                 {
                     Binding = Binding.Property<PluginEntry, string>(r => r.Name)
                 },
-                HeaderText = "Name",
-                Sortable   = true
+                HeaderText = "Name", Sortable = true
             });
+
             grdFilters.Columns.Add(new GridColumn
             {
                 DataCell = new TextBoxCell
                 {
                     Binding = Binding.Property<PluginEntry, string>(r => $"{r.Uuid}")
                 },
-                HeaderText = "UUID",
-                Sortable   = true
+                HeaderText = "UUID", Sortable = true
             });
+
             grdFilters.Columns.Add(new GridColumn
             {
                 DataCell = new TextBoxCell
                 {
                     Binding = Binding.Property<PluginEntry, string>(r => r.Version)
                 },
-                HeaderText = "Version",
-                Sortable   = true
+                HeaderText = "Version", Sortable = true
             });
+
             grdFilters.Columns.Add(new GridColumn
             {
                 DataCell = new TextBoxCell
                 {
                     Binding = Binding.Property<PluginEntry, string>(r => r.Author)
                 },
-                HeaderText = "Author",
-                Sortable   = true
+                HeaderText = "Author", Sortable = true
             });
+
             grdFilters.AllowMultipleSelection = false;
             grdFilters.AllowColumnReordering  = true;
 
             grdReadableMediaImages.DataStore = mediaImages;
+
             grdReadableMediaImages.Columns.Add(new GridColumn
             {
                 DataCell = new TextBoxCell
                 {
-                    Binding =
-                        Binding.Property<PluginEntry, string>(r => r.Name)
+                    Binding = Binding.Property<PluginEntry, string>(r => r.Name)
                 },
-                HeaderText = "Name",
-                Sortable   = true
+                HeaderText = "Name", Sortable = true
             });
+
             grdReadableMediaImages.Columns.Add(new GridColumn
             {
                 DataCell = new TextBoxCell
                 {
-                    Binding =
-                        Binding
-                           .Property<PluginEntry, string>(r => $"{r.Uuid}")
+                    Binding = Binding.Property<PluginEntry, string>(r => $"{r.Uuid}")
                 },
-                HeaderText = "UUID",
-                Sortable   = true
+                HeaderText = "UUID", Sortable = true
             });
+
             grdReadableMediaImages.Columns.Add(new GridColumn
             {
                 DataCell = new TextBoxCell
                 {
-                    Binding =
-                        Binding.Property<PluginEntry, string>(r => r.Version)
+                    Binding = Binding.Property<PluginEntry, string>(r => r.Version)
                 },
-                HeaderText = "Version",
-                Sortable   = true
+                HeaderText = "Version", Sortable = true
             });
+
             grdReadableMediaImages.Columns.Add(new GridColumn
             {
                 DataCell = new TextBoxCell
                 {
-                    Binding =
-                        Binding.Property<PluginEntry, string>(r => r.Author)
+                    Binding = Binding.Property<PluginEntry, string>(r => r.Author)
                 },
-                HeaderText = "Author",
-                Sortable   = true
+                HeaderText = "Author", Sortable = true
             });
+
             grdReadableMediaImages.AllowMultipleSelection = false;
             grdReadableMediaImages.AllowColumnReordering  = true;
 
             grdPartitions.DataStore = partitions;
+
             grdPartitions.Columns.Add(new GridColumn
             {
                 DataCell = new TextBoxCell
                 {
                     Binding = Binding.Property<PluginEntry, string>(r => r.Name)
                 },
-                HeaderText = "Name",
-                Sortable   = true
+                HeaderText = "Name", Sortable = true
             });
+
             grdPartitions.Columns.Add(new GridColumn
             {
                 DataCell = new TextBoxCell
                 {
                     Binding = Binding.Property<PluginEntry, string>(r => $"{r.Uuid}")
                 },
-                HeaderText = "UUID",
-                Sortable   = true
+                HeaderText = "UUID", Sortable = true
             });
+
             grdPartitions.Columns.Add(new GridColumn
             {
                 DataCell = new TextBoxCell
                 {
                     Binding = Binding.Property<PluginEntry, string>(r => r.Version)
                 },
-                HeaderText = "Version",
-                Sortable   = true
+                HeaderText = "Version", Sortable = true
             });
+
             grdPartitions.Columns.Add(new GridColumn
             {
                 DataCell = new TextBoxCell
                 {
                     Binding = Binding.Property<PluginEntry, string>(r => r.Author)
                 },
-                HeaderText = "Author",
-                Sortable   = true
+                HeaderText = "Author", Sortable = true
             });
+
             grdPartitions.AllowMultipleSelection = false;
             grdPartitions.AllowColumnReordering  = true;
 
             grdFilesystem.DataStore = filesystems;
+
             grdFilesystem.Columns.Add(new GridColumn
             {
                 DataCell = new TextBoxCell
                 {
                     Binding = Binding.Property<PluginEntry, string>(r => r.Name)
                 },
-                HeaderText = "Name",
-                Sortable   = true
+                HeaderText = "Name", Sortable = true
             });
+
             grdFilesystem.Columns.Add(new GridColumn
             {
                 DataCell = new TextBoxCell
                 {
                     Binding = Binding.Property<PluginEntry, string>(r => $"{r.Uuid}")
                 },
-                HeaderText = "UUID",
-                Sortable   = true
+                HeaderText = "UUID", Sortable = true
             });
+
             grdFilesystem.Columns.Add(new GridColumn
             {
                 DataCell = new TextBoxCell
                 {
                     Binding = Binding.Property<PluginEntry, string>(r => r.Version)
                 },
-                HeaderText = "Version",
-                Sortable   = true
+                HeaderText = "Version", Sortable = true
             });
+
             grdFilesystem.Columns.Add(new GridColumn
             {
                 DataCell = new TextBoxCell
                 {
                     Binding = Binding.Property<PluginEntry, string>(r => r.Author)
                 },
-                HeaderText = "Author",
-                Sortable   = true
+                HeaderText = "Author", Sortable = true
             });
+
             grdFilesystem.AllowMultipleSelection = false;
             grdFilesystem.AllowColumnReordering  = true;
 
             grdReadOnlyFilesystem.DataStore = readOnlyFilesystems;
+
             grdReadOnlyFilesystem.Columns.Add(new GridColumn
             {
                 DataCell = new TextBoxCell
                 {
-                    Binding =
-                        Binding.Property<PluginEntry, string>(r => r.Name)
+                    Binding = Binding.Property<PluginEntry, string>(r => r.Name)
                 },
-                HeaderText = "Name",
-                Sortable   = true
+                HeaderText = "Name", Sortable = true
             });
+
             grdReadOnlyFilesystem.Columns.Add(new GridColumn
             {
                 DataCell = new TextBoxCell
                 {
-                    Binding =
-                        Binding
-                           .Property<PluginEntry, string>(r => $"{r.Uuid}")
+                    Binding = Binding.Property<PluginEntry, string>(r => $"{r.Uuid}")
                 },
-                HeaderText = "UUID",
-                Sortable   = true
+                HeaderText = "UUID", Sortable = true
             });
+
             grdReadOnlyFilesystem.Columns.Add(new GridColumn
             {
                 DataCell = new TextBoxCell
                 {
-                    Binding =
-                        Binding.Property<PluginEntry, string>(r => r.Version)
+                    Binding = Binding.Property<PluginEntry, string>(r => r.Version)
                 },
-                HeaderText = "Version",
-                Sortable   = true
+                HeaderText = "Version", Sortable = true
             });
+
             grdReadOnlyFilesystem.Columns.Add(new GridColumn
             {
                 DataCell = new TextBoxCell
                 {
-                    Binding =
-                        Binding.Property<PluginEntry, string>(r => r.Author)
+                    Binding = Binding.Property<PluginEntry, string>(r => r.Author)
                 },
-                HeaderText = "Author",
-                Sortable   = true
+                HeaderText = "Author", Sortable = true
             });
+
             grdReadOnlyFilesystem.AllowMultipleSelection = false;
             grdReadOnlyFilesystem.AllowColumnReordering  = true;
 
             grdReadableFloppyImages.DataStore = floppyImages;
+
             grdReadableFloppyImages.Columns.Add(new GridColumn
             {
                 DataCell = new TextBoxCell
                 {
-                    Binding =
-                        Binding.Property<PluginEntry, string>(r => r.Name)
+                    Binding = Binding.Property<PluginEntry, string>(r => r.Name)
                 },
-                HeaderText = "Name",
-                Sortable   = true
+                HeaderText = "Name", Sortable = true
             });
+
             grdReadableFloppyImages.Columns.Add(new GridColumn
             {
                 DataCell = new TextBoxCell
                 {
-                    Binding =
-                        Binding
-                           .Property<PluginEntry, string>(r => $"{r.Uuid}")
+                    Binding = Binding.Property<PluginEntry, string>(r => $"{r.Uuid}")
                 },
-                HeaderText = "UUID",
-                Sortable   = true
+                HeaderText = "UUID", Sortable = true
             });
+
             grdReadableFloppyImages.Columns.Add(new GridColumn
             {
                 DataCell = new TextBoxCell
                 {
-                    Binding =
-                        Binding
-                           .Property<PluginEntry, string>(r => r.Version)
+                    Binding = Binding.Property<PluginEntry, string>(r => r.Version)
                 },
-                HeaderText = "Version",
-                Sortable   = true
+                HeaderText = "Version", Sortable = true
             });
+
             grdReadableFloppyImages.Columns.Add(new GridColumn
             {
                 DataCell = new TextBoxCell
                 {
-                    Binding =
-                        Binding.Property<PluginEntry, string>(r => r.Author)
+                    Binding = Binding.Property<PluginEntry, string>(r => r.Author)
                 },
-                HeaderText = "Author",
-                Sortable   = true
+                HeaderText = "Author", Sortable = true
             });
+
             grdReadableFloppyImages.AllowMultipleSelection = false;
             grdReadableFloppyImages.AllowColumnReordering  = true;
 
             grdWritableFloppyImages.DataStore = writableFloppyImages;
+
             grdWritableFloppyImages.Columns.Add(new GridColumn
             {
                 DataCell = new TextBoxCell
                 {
-                    Binding =
-                        Binding.Property<PluginEntry, string>(r => r.Name)
+                    Binding = Binding.Property<PluginEntry, string>(r => r.Name)
                 },
-                HeaderText = "Name",
-                Sortable   = true
+                HeaderText = "Name", Sortable = true
             });
+
             grdWritableFloppyImages.Columns.Add(new GridColumn
             {
                 DataCell = new TextBoxCell
                 {
-                    Binding =
-                        Binding
-                           .Property<PluginEntry, string>(r => $"{r.Uuid}")
+                    Binding = Binding.Property<PluginEntry, string>(r => $"{r.Uuid}")
                 },
-                HeaderText = "UUID",
-                Sortable   = true
+                HeaderText = "UUID", Sortable = true
             });
+
             grdWritableFloppyImages.Columns.Add(new GridColumn
             {
                 DataCell = new TextBoxCell
                 {
-                    Binding =
-                        Binding
-                           .Property<PluginEntry, string>(r => r.Version)
+                    Binding = Binding.Property<PluginEntry, string>(r => r.Version)
                 },
-                HeaderText = "Version",
-                Sortable   = true
+                HeaderText = "Version", Sortable = true
             });
+
             grdWritableFloppyImages.Columns.Add(new GridColumn
             {
                 DataCell = new TextBoxCell
                 {
-                    Binding =
-                        Binding.Property<PluginEntry, string>(r => r.Author)
+                    Binding = Binding.Property<PluginEntry, string>(r => r.Author)
                 },
-                HeaderText = "Author",
-                Sortable   = true
+                HeaderText = "Author", Sortable = true
             });
+
             grdWritableFloppyImages.AllowMultipleSelection = false;
             grdWritableFloppyImages.AllowColumnReordering  = true;
 
             grdWritableMediaImages.DataStore = writableImages;
+
             grdWritableMediaImages.Columns.Add(new GridColumn
             {
                 DataCell = new TextBoxCell
                 {
-                    Binding =
-                        Binding.Property<PluginEntry, string>(r => r.Name)
+                    Binding = Binding.Property<PluginEntry, string>(r => r.Name)
                 },
-                HeaderText = "Name",
-                Sortable   = true
+                HeaderText = "Name", Sortable = true
             });
+
             grdWritableMediaImages.Columns.Add(new GridColumn
             {
                 DataCell = new TextBoxCell
                 {
-                    Binding =
-                        Binding
-                           .Property<PluginEntry, string>(r => $"{r.Uuid}")
+                    Binding = Binding.Property<PluginEntry, string>(r => $"{r.Uuid}")
                 },
-                HeaderText = "UUID",
-                Sortable   = true
+                HeaderText = "UUID", Sortable = true
             });
+
             grdWritableMediaImages.Columns.Add(new GridColumn
             {
                 DataCell = new TextBoxCell
                 {
-                    Binding =
-                        Binding.Property<PluginEntry, string>(r => r.Version)
+                    Binding = Binding.Property<PluginEntry, string>(r => r.Version)
                 },
-                HeaderText = "Version",
-                Sortable   = true
+                HeaderText = "Version", Sortable = true
             });
+
             grdWritableMediaImages.Columns.Add(new GridColumn
             {
                 DataCell = new TextBoxCell
                 {
-                    Binding =
-                        Binding.Property<PluginEntry, string>(r => r.Author)
+                    Binding = Binding.Property<PluginEntry, string>(r => r.Author)
                 },
-                HeaderText = "Author",
-                Sortable   = true
+                HeaderText = "Author", Sortable = true
             });
+
             grdWritableMediaImages.AllowMultipleSelection = false;
             grdWritableMediaImages.AllowColumnReordering  = true;
         }
@@ -432,8 +413,7 @@ namespace Aaru.Gui.Dialogs
             foreach(IFilter filter in GetPluginBase.Instance.Filters.Values)
                 filters.Add(new PluginEntry
                 {
-                    Name    = filter.Name,
-                    Uuid    = filter.Id,
+                    Name    = filter.Name, Uuid = filter.Id,
                     Version = Assembly.GetAssembly(filter.GetType())?.GetName().Version.ToString(),
                     Author  = filter.Author
                 });
@@ -441,80 +421,61 @@ namespace Aaru.Gui.Dialogs
             foreach(IFloppyImage floppyImage in GetPluginBase.Instance.FloppyImages.Values)
                 floppyImages.Add(new PluginEntry
                 {
-                    Name = floppyImage.Name,
-                    Uuid = floppyImage.Id,
-                    Version = Assembly
-                             .GetAssembly(floppyImage.GetType())?.GetName().Version.ToString(),
-                    Author = floppyImage.Author
+                    Name    = floppyImage.Name, Uuid = floppyImage.Id,
+                    Version = Assembly.GetAssembly(floppyImage.GetType())?.GetName().Version.ToString(),
+                    Author  = floppyImage.Author
                 });
 
             foreach(IMediaImage mediaImage in GetPluginBase.Instance.ImagePluginsList.Values)
                 mediaImages.Add(new PluginEntry
                 {
-                    Name = mediaImage.Name,
-                    Uuid = mediaImage.Id,
-                    Version = Assembly
-                             .GetAssembly(mediaImage.GetType())?.GetName().Version.ToString(),
-                    Author = mediaImage.Author
+                    Name    = mediaImage.Name, Uuid = mediaImage.Id,
+                    Version = Assembly.GetAssembly(mediaImage.GetType())?.GetName().Version.ToString(),
+                    Author  = mediaImage.Author
                 });
 
             foreach(IPartition partition in GetPluginBase.Instance.PartPluginsList.Values)
                 partitions.Add(new PluginEntry
                 {
-                    Name = partition.Name,
-                    Uuid = partition.Id,
-                    Version =
-                        Assembly.GetAssembly(partition.GetType())?.GetName().Version.ToString(),
-                    Author = partition.Author
+                    Name    = partition.Name, Uuid = partition.Id,
+                    Version = Assembly.GetAssembly(partition.GetType())?.GetName().Version.ToString(),
+                    Author  = partition.Author
                 });
 
             foreach(IFilesystem filesystem in GetPluginBase.Instance.PluginsList.Values)
                 filesystems.Add(new PluginEntry
                 {
-                    Name = filesystem.Name,
-                    Uuid = filesystem.Id,
-                    Version = Assembly
-                             .GetAssembly(filesystem.GetType())?.GetName().Version.ToString(),
-                    Author = filesystem.Author
+                    Name    = filesystem.Name, Uuid = filesystem.Id,
+                    Version = Assembly.GetAssembly(filesystem.GetType())?.GetName().Version.ToString(),
+                    Author  = filesystem.Author
                 });
 
             foreach(IReadOnlyFilesystem readOnlyFilesystem in GetPluginBase.Instance.ReadOnlyFilesystems.Values)
                 readOnlyFilesystems.Add(new PluginEntry
                 {
-                    Name = readOnlyFilesystem.Name,
-                    Uuid = readOnlyFilesystem.Id,
-                    Version = Assembly
-                             .GetAssembly(readOnlyFilesystem.GetType())?.GetName().Version
-                             .ToString(),
-                    Author = readOnlyFilesystem.Author
+                    Name    = readOnlyFilesystem.Name, Uuid = readOnlyFilesystem.Id,
+                    Version = Assembly.GetAssembly(readOnlyFilesystem.GetType())?.GetName().Version.ToString(),
+                    Author  = readOnlyFilesystem.Author
                 });
 
             foreach(IWritableFloppyImage writableFloppyImage in GetPluginBase.Instance.WritableFloppyImages.Values)
                 writableFloppyImages.Add(new PluginEntry
                 {
-                    Name = writableFloppyImage.Name,
-                    Uuid = writableFloppyImage.Id,
-                    Version = Assembly
-                             .GetAssembly(writableFloppyImage.GetType())?.GetName().Version
-                             .ToString(),
-                    Author = writableFloppyImage.Author
+                    Name    = writableFloppyImage.Name, Uuid = writableFloppyImage.Id,
+                    Version = Assembly.GetAssembly(writableFloppyImage.GetType())?.GetName().Version.ToString(),
+                    Author  = writableFloppyImage.Author
                 });
 
             foreach(IWritableImage writableImage in GetPluginBase.Instance.WritableImages.Values)
                 writableImages.Add(new PluginEntry
                 {
-                    Name = writableImage.Name,
-                    Uuid = writableImage.Id,
-                    Version = Assembly
-                             .GetAssembly(writableImage.GetType())?.GetName().Version.ToString(),
-                    Author = writableImage.Author
+                    Name    = writableImage.Name, Uuid = writableImage.Id,
+                    Version = Assembly.GetAssembly(writableImage.GetType())?.GetName().Version.ToString(),
+                    Author  = writableImage.Author
                 });
         }
 
-        protected void OnBtnClose(object sender, EventArgs e)
-        {
-            Close();
-        }
+        protected void OnBtnClose(object sender, EventArgs e) => Close();
 
         class PluginEntry
         {
diff --git a/Aaru.Gui/Dialogs/dlgSettings.xeto.cs b/Aaru.Gui/Dialogs/dlgSettings.xeto.cs
index 6e53ecf15..a92acdbd7 100644
--- a/Aaru.Gui/Dialogs/dlgSettings.xeto.cs
+++ b/Aaru.Gui/Dialogs/dlgSettings.xeto.cs
@@ -44,13 +44,13 @@ namespace Aaru.Gui.Dialogs
             XamlReader.Load(this);
 
             lblGdpr1.Text =
-                "In compliance with the European Union General Data Protection Regulation 2016/679 (GDPR),\n"    +
-                "we must give you the following information about Aaru and ask if you want to opt-in\n" +
+                "In compliance with the European Union General Data Protection Regulation 2016/679 (GDPR),\n" +
+                "we must give you the following information about Aaru and ask if you want to opt-in\n"       +
                 "in some information sharing.";
 
             lblGdpr2.Text =
-                "Disclaimer: Because Aaru is an open source software this information, and therefore,\n" +
-                "compliance with GDPR only holds true if you obtained a certificated copy from its original\n"    +
+                "Disclaimer: Because Aaru is an open source software this information, and therefore,\n"       +
+                "compliance with GDPR only holds true if you obtained a certificated copy from its original\n" +
                 "authors. In case of doubt, close Aaru now and ask in our IRC support channel.";
 
             lblGdpr3.Text =
@@ -62,7 +62,7 @@ namespace Aaru.Gui.Dialogs
 
             #region Device reports
             lblSaveReportsGlobally.Text =
-                "With the 'device-report' command, Aaru creates a report of a device, that includes its\n"       +
+                "With the 'device-report' command, Aaru creates a report of a device, that includes its\n"                +
                 "manufacturer, model, firmware revision and/or version, attached bus, size, and supported commands.\n"    +
                 "The serial number of the device is not stored in the report. If used with the debug parameter,\n"        +
                 "extra information about the device will be stored in the report. This information is known to contain\n" +
@@ -73,66 +73,64 @@ namespace Aaru.Gui.Dialogs
             chkSaveReportsGlobally.Text =
                 "Do you want to save device reports in shared folder of your computer? (Y/N): ";
 
-            chkSaveReportsGlobally.Checked = Aaru.Settings.Settings.Current.SaveReportsGlobally;
+            chkSaveReportsGlobally.Checked = Settings.Settings.Current.SaveReportsGlobally;
 
             lblShareReports.Text =
-                "Sharing a report with us will send it to our server, that's in the european union territory, where it\n"      +
-                "will be manually analized by an european union citizen to remove any trace of personal identification\n"      +
-                "from it. Once that is done, it will be shared in our stats website, https://www.aaru.app\n"          +
-                "These report will be used to improve Aaru support, and in some cases, to provide emulation of the\n" +
+                "Sharing a report with us will send it to our server, that's in the european union territory, where it\n" +
+                "will be manually analized by an european union citizen to remove any trace of personal identification\n" +
+                "from it. Once that is done, it will be shared in our stats website, https://www.aaru.app\n"              +
+                "These report will be used to improve Aaru support, and in some cases, to provide emulation of the\n"     +
                 "devices to other open-source projects. In any case, no information linking the report to you will be stored.";
 
             chkShareReports.Text    = "Do you want to share your device reports with us? (Y/N): ";
-            chkShareReports.Checked = Aaru.Settings.Settings.Current.ShareReports;
+            chkShareReports.Checked = Settings.Settings.Current.ShareReports;
             #endregion Device reports
 
             #region Statistics
             lblStatistics.Text =
-                "Aaru can store some usage statistics. These statistics are limited to the number of times a\n"        +
+                "Aaru can store some usage statistics. These statistics are limited to the number of times a\n"                 +
                 "command is executed, a filesystem, partition, or device is used, the operating system version, and other.\n"   +
                 "In no case, any information besides pure statistical usage numbers is stored, and they're just joint to the\n" +
                 "pool with no way of using them to identify you.";
 
             chkSaveStats.Text = "Do you want to save stats about your Aaru usage? (Y/N): ";
 
-            if(Aaru.Settings.Settings.Current.Stats != null)
+            if(Settings.Settings.Current.Stats != null)
             {
                 chkSaveStats.Checked  = true;
                 stkStatistics.Visible = true;
 
                 chkShareStats.Text    = "Do you want to share your stats anonymously? (Y/N): ";
-                chkShareStats.Checked = Aaru.Settings.Settings.Current.Stats.ShareStats;
+                chkShareStats.Checked = Settings.Settings.Current.Stats.ShareStats;
 
                 chkCommandStats.Text    = "Do you want to gather statistics about command usage? (Y/N): ";
-                chkCommandStats.Checked = Aaru.Settings.Settings.Current.Stats.CommandStats;
+                chkCommandStats.Checked = Settings.Settings.Current.Stats.CommandStats;
 
                 chkDeviceStats.Text    = "Do you want to gather statistics about found devices? (Y/N): ";
-                chkDeviceStats.Checked = Aaru.Settings.Settings.Current.Stats.DeviceStats;
+                chkDeviceStats.Checked = Settings.Settings.Current.Stats.DeviceStats;
 
                 chkFilesystemStats.Text    = "Do you want to gather statistics about found filesystems? (Y/N): ";
-                chkFilesystemStats.Checked = Aaru.Settings.Settings.Current.Stats.FilesystemStats;
+                chkFilesystemStats.Checked = Settings.Settings.Current.Stats.FilesystemStats;
 
                 chkFilterStats.Text    = "Do you want to gather statistics about found file filters? (Y/N): ";
-                chkFilterStats.Checked = Aaru.Settings.Settings.Current.Stats.FilterStats;
+                chkFilterStats.Checked = Settings.Settings.Current.Stats.FilterStats;
 
-                chkMediaImageStats.Text =
-                    "Do you want to gather statistics about found media image formats? (Y/N): ";
+                chkMediaImageStats.Text = "Do you want to gather statistics about found media image formats? (Y/N): ";
 
-                chkMediaImageStats.Checked = Aaru.Settings.Settings.Current.Stats.MediaImageStats;
+                chkMediaImageStats.Checked = Settings.Settings.Current.Stats.MediaImageStats;
 
                 chkMediaScanStats.Text    = "Do you want to gather statistics about scanned media? (Y/N): ";
-                chkMediaScanStats.Checked = Aaru.Settings.Settings.Current.Stats.MediaScanStats;
+                chkMediaScanStats.Checked = Settings.Settings.Current.Stats.MediaScanStats;
 
-                chkPartitionStats.Text =
-                    "Do you want to gather statistics about found partitioning schemes? (Y/N): ";
+                chkPartitionStats.Text = "Do you want to gather statistics about found partitioning schemes? (Y/N): ";
 
-                chkPartitionStats.Checked = Aaru.Settings.Settings.Current.Stats.PartitionStats;
+                chkPartitionStats.Checked = Settings.Settings.Current.Stats.PartitionStats;
 
                 chkMediaStats.Text    = "Do you want to gather statistics about media types? (Y/N): ";
-                chkMediaStats.Checked = Aaru.Settings.Settings.Current.Stats.MediaStats;
+                chkMediaStats.Checked = Settings.Settings.Current.Stats.MediaStats;
 
                 chkVerifyStats.Text    = "Do you want to gather statistics about media image verifications? (Y/N): ";
-                chkVerifyStats.Checked = Aaru.Settings.Settings.Current.Stats.VerifyStats;
+                chkVerifyStats.Checked = Settings.Settings.Current.Stats.VerifyStats;
             }
             else
             {
@@ -146,11 +144,11 @@ namespace Aaru.Gui.Dialogs
 
         protected void OnBtnSave(object sender, EventArgs e)
         {
-            Aaru.Settings.Settings.Current.SaveReportsGlobally = chkSaveReportsGlobally.Checked == true;
-            Aaru.Settings.Settings.Current.ShareReports        = chkShareReports.Checked        == true;
+            Settings.Settings.Current.SaveReportsGlobally = chkSaveReportsGlobally.Checked == true;
+            Settings.Settings.Current.ShareReports        = chkShareReports.Checked        == true;
 
             if(chkSaveStats.Checked == true)
-                Aaru.Settings.Settings.Current.Stats = new StatsSettings
+                Settings.Settings.Current.Stats = new StatsSettings
                 {
                     ShareStats      = chkShareStats.Checked      == true,
                     CommandStats    = chkCommandStats.Checked    == true,
@@ -163,10 +161,10 @@ namespace Aaru.Gui.Dialogs
                     VerifyStats     = chkVerifyStats.Checked     == true
                 };
             else
-                Aaru.Settings.Settings.Current.Stats = null;
+                Settings.Settings.Current.Stats = null;
 
-            Aaru.Settings.Settings.Current.GdprCompliance = DicSettings.GdprLevel;
-            Aaru.Settings.Settings.SaveSettings();
+            Settings.Settings.Current.GdprCompliance = DicSettings.GdprLevel;
+            Settings.Settings.SaveSettings();
             Close();
         }
 
diff --git a/Aaru.Gui/Dialogs/dlgStatistics.xeto.cs b/Aaru.Gui/Dialogs/dlgStatistics.xeto.cs
index 8849a3be3..006e50e29 100644
--- a/Aaru.Gui/Dialogs/dlgStatistics.xeto.cs
+++ b/Aaru.Gui/Dialogs/dlgStatistics.xeto.cs
@@ -45,7 +45,7 @@ namespace Aaru.Gui.Dialogs
         {
             XamlReader.Load(this);
 
-            var ctx = AaruContext.Create(Aaru.Settings.Settings.LocalDbPath);
+            var ctx = AaruContext.Create(Settings.Settings.LocalDbPath);
 
             if(ctx.Commands.Any())
             {
diff --git a/Aaru.Gui/Forms/frmConsole.xeto.cs b/Aaru.Gui/Forms/frmConsole.xeto.cs
index a74a70ccb..e7a1f330e 100644
--- a/Aaru.Gui/Forms/frmConsole.xeto.cs
+++ b/Aaru.Gui/Forms/frmConsole.xeto.cs
@@ -52,118 +52,134 @@ namespace Aaru.Gui.Forms
             XamlReader.Load(this);
 
             grdMessages.DataStore = ConsoleHandler.Entries;
+
             grdMessages.Columns.Add(new GridColumn
             {
                 DataCell = new TextBoxCell
                 {
                     Binding = Binding.Property<LogEntry, string>(r => $"{r.Timestamp}")
                 },
-                HeaderText = "Time",
-                Sortable   = true
+                HeaderText = "Time", Sortable = true
             });
+
             grdMessages.Columns.Add(new GridColumn
             {
                 DataCell = new TextBoxCell
                 {
                     Binding = Binding.Property<LogEntry, string>(r => r.Type)
                 },
-                HeaderText = "Type",
-                Sortable   = true
+                HeaderText = "Type", Sortable = true
             });
+
             grdMessages.Columns.Add(new GridColumn
             {
                 DataCell = new TextBoxCell
                 {
                     Binding = Binding.Property<LogEntry, string>(r => r.Module)
                 },
-                HeaderText = "Module",
-                Sortable   = true
+                HeaderText = "Module", Sortable = true
             });
+
             grdMessages.Columns.Add(new GridColumn
             {
                 DataCell = new TextBoxCell
                 {
                     Binding = Binding.Property<LogEntry, string>(r => r.Message)
                 },
-                HeaderText = "Message",
-                Sortable   = true
+                HeaderText = "Message", Sortable = true
             });
 
             grdMessages.AllowMultipleSelection = false;
+
             grdMessages.CellFormatting += (sender, e) =>
             {
-                if(((LogEntry)e.Item).Type.ToLower() != "error") return;
+                if(((LogEntry)e.Item).Type.ToLower() != "error")
+                    return;
 
                 e.BackgroundColor = Colors.Red;
                 e.ForegroundColor = Colors.Black;
             };
+
             grdMessages.AllowColumnReordering = true;
 
             chkDebug.Checked =  ConsoleHandler.Debug;
             Closing          += OnClosing;
         }
 
-        void OnClosing(object sender, CancelEventArgs e)
-        {
-            // Otherwise if this closes it does not stop hearing events from collection, preventing console to keep working.
-            grdMessages.DataStore = null;
-        }
+        // Otherwise if this closes it does not stop hearing events from collection, preventing console to keep working.
+        void OnClosing(object sender, CancelEventArgs e) => grdMessages.DataStore = null;
 
-        protected void OnChkDebugChecked(object sender, EventArgs e)
-        {
-            ConsoleHandler.Debug = chkDebug.Checked.Value;
-        }
+        protected void OnChkDebugChecked(object sender, EventArgs e) => ConsoleHandler.Debug = chkDebug.Checked.Value;
 
-        protected void OnBtnClearClicked(object sender, EventArgs e)
-        {
-            ConsoleHandler.Entries.Clear();
-        }
+        protected void OnBtnClearClicked(object sender, EventArgs e) => ConsoleHandler.Entries.Clear();
 
         protected void OnBtnSaveClicked(object sender, EventArgs e)
         {
-            SaveFileDialog dlgSave = new SaveFileDialog {CheckFileExists = true};
-            dlgSave.Filters.Add(new FileFilter {Extensions               = new[] {"log"}, Name = "Log files"});
+            var dlgSave = new SaveFileDialog
+            {
+                CheckFileExists = true
+            };
+
+            dlgSave.Filters.Add(new FileFilter
+            {
+                Extensions = new[]
+                {
+                    "log"
+                },
+                Name = "Log files"
+            });
+
             DialogResult result = dlgSave.ShowDialog(this);
-            if(result != DialogResult.Ok) return;
+
+            if(result != DialogResult.Ok)
+                return;
 
             try
             {
-                FileStream   logFs = new FileStream(dlgSave.FileName, FileMode.Create, FileAccess.ReadWrite);
-                StreamWriter logSw = new StreamWriter(logFs);
+                var logFs = new FileStream(dlgSave.FileName, FileMode.Create, FileAccess.ReadWrite);
+                var logSw = new StreamWriter(logFs);
 
                 logSw.WriteLine("Log saved at {0}", DateTime.Now);
 
                 PlatformID platId  = DetectOS.GetRealPlatformID();
                 string     platVer = DetectOS.GetVersion();
-                AssemblyInformationalVersionAttribute assemblyVersion =
+
+                var assemblyVersion =
                     Attribute.GetCustomAttribute(typeof(AaruConsole).Assembly,
                                                  typeof(AssemblyInformationalVersionAttribute)) as
                         AssemblyInformationalVersionAttribute;
 
                 logSw.WriteLine("################# System information #################");
+
                 logSw.WriteLine("{0} {1} ({2}-bit)", DetectOS.GetPlatformName(platId, platVer), platVer,
                                 Environment.Is64BitOperatingSystem ? 64 : 32);
-                if(DetectOS.IsMono) logSw.WriteLine("Mono {0}",              Version.GetMonoVersion());
-                else if(DetectOS.IsNetCore) logSw.WriteLine(".NET Core {0}", Version.GetNetCoreVersion());
-                else logSw.WriteLine(RuntimeInformation.FrameworkDescription);
+
+                if(DetectOS.IsMono)
+                    logSw.WriteLine("Mono {0}", Version.GetMonoVersion());
+                else if(DetectOS.IsNetCore)
+                    logSw.WriteLine(".NET Core {0}", Version.GetNetCoreVersion());
+                else
+                    logSw.WriteLine(RuntimeInformation.FrameworkDescription);
 
                 logSw.WriteLine();
 
                 logSw.WriteLine("################# Program information ################");
-                logSw.WriteLine("Aaru {0}",          assemblyVersion?.InformationalVersion);
-                logSw.WriteLine("Running in {0}-bit",         Environment.Is64BitProcess ? 64 : 32);
+                logSw.WriteLine("Aaru {0}", assemblyVersion?.InformationalVersion);
+                logSw.WriteLine("Running in {0}-bit", Environment.Is64BitProcess ? 64 : 32);
                 logSw.WriteLine("Running GUI mode using {0}", Application.Instance.Platform.ID);
-                #if DEBUG
+            #if DEBUG
                 logSw.WriteLine("DEBUG version");
-                #endif
+            #endif
                 logSw.WriteLine("Command line: {0}", Environment.CommandLine);
                 logSw.WriteLine();
 
                 logSw.WriteLine("################# Console ################");
+
                 foreach(LogEntry entry in ConsoleHandler.Entries)
                     if(entry.Type != "Info")
                         logSw.WriteLine("{0}: ({1}) {2}", entry.Timestamp, entry.Type.ToLower(), entry.Message);
-                    else logSw.WriteLine("{0}: {1}",      entry.Timestamp, entry.Message);
+                    else
+                        logSw.WriteLine("{0}: {1}", entry.Timestamp, entry.Message);
 
                 logSw.Close();
                 logFs.Close();
@@ -172,6 +188,7 @@ namespace Aaru.Gui.Forms
             {
                 MessageBox.Show("Exception {0} trying to save logfile, details has been sent to console.",
                                 exception.Message);
+
                 AaruConsole.ErrorWriteLine("Console", exception.Message);
                 AaruConsole.ErrorWriteLine("Console", exception.StackTrace);
             }
diff --git a/Aaru.Gui/Forms/frmDecodeMediaTags.xeto.cs b/Aaru.Gui/Forms/frmDecodeMediaTags.xeto.cs
index 87192a26a..2ae189b0c 100644
--- a/Aaru.Gui/Forms/frmDecodeMediaTags.xeto.cs
+++ b/Aaru.Gui/Forms/frmDecodeMediaTags.xeto.cs
@@ -58,9 +58,9 @@ namespace Aaru.Gui.Forms
     // TODO: Panel with string representation of contents
     public class frmDecodeMediaTags : Form
     {
-        const int                              HEX_COLUMNS = 32;
-        IMediaImage                            inputFormat;
-        ObservableCollection<MediaTagWithData> lstTags;
+        const    int                                    HEX_COLUMNS = 32;
+        readonly IMediaImage                            inputFormat;
+        readonly ObservableCollection<MediaTagWithData> lstTags;
 
         public frmDecodeMediaTags(IMediaImage inputFormat)
         {
@@ -82,7 +82,11 @@ namespace Aaru.Gui.Forms
                 try
                 {
                     byte[] data = inputFormat.ReadDiskTag(tag);
-                    lstTags.Add(new MediaTagWithData {Tag = tag, Data = data});
+
+                    lstTags.Add(new MediaTagWithData
+                    {
+                        Tag = tag, Data = data
+                    });
                 }
                 catch
                 {
@@ -93,99 +97,128 @@ namespace Aaru.Gui.Forms
         // TODO: More graphically aware decoders
         void OnCmbTagSelectedIndexChanged(object sender, EventArgs e)
         {
-            if(!(cmbTag.SelectedValue is MediaTagWithData tagWithData)) return;
+            if(!(cmbTag.SelectedValue is MediaTagWithData tagWithData))
+                return;
 
             // TODO: Decoders should be able to handle tags with/without length header
             txtPrintHex.Text   = PrintHex.ByteArrayToHexArrayString(tagWithData.Data, HEX_COLUMNS);
             tabDecoded.Visible = true;
+
             switch(tagWithData.Tag)
             {
                 case MediaTagType.CD_TOC:
                     txtDecoded.Text = TOC.Prettify(tagWithData.Data);
+
                     break;
                 case MediaTagType.CD_SessionInfo:
                     txtDecoded.Text = Session.Prettify(tagWithData.Data);
+
                     break;
                 case MediaTagType.CD_FullTOC:
                     txtDecoded.Text = FullTOC.Prettify(tagWithData.Data);
+
                     break;
                 case MediaTagType.CD_PMA:
                     txtDecoded.Text = PMA.Prettify(tagWithData.Data);
+
                     break;
                 case MediaTagType.CD_ATIP:
                     txtDecoded.Text = ATIP.Prettify(tagWithData.Data);
+
                     break;
                 case MediaTagType.CD_TEXT:
                     txtDecoded.Text = CDTextOnLeadIn.Prettify(tagWithData.Data);
+
                     break;
                 case MediaTagType.CD_MCN:
                     txtDecoded.Text = Encoding.ASCII.GetString(tagWithData.Data);
+
                     break;
                 case MediaTagType.DVD_PFI:
                     txtDecoded.Text = PFI.Prettify(tagWithData.Data);
+
                     break;
                 case MediaTagType.DVD_CMI:
                     txtDecoded.Text = CSS_CPRM.PrettifyLeadInCopyright(tagWithData.Data);
+
                     break;
                 case MediaTagType.DVDRAM_DDS:
                     txtDecoded.Text = DDS.Prettify(tagWithData.Data);
+
                     break;
                 case MediaTagType.DVDRAM_SpareArea:
                     txtDecoded.Text = Spare.Prettify(tagWithData.Data);
+
                     break;
                 case MediaTagType.DVDR_PFI:
                     txtDecoded.Text = PFI.Prettify(tagWithData.Data);
+
                     break;
                 case MediaTagType.HDDVD_MediumStatus:
                     txtDecoded.Text = PFI.Prettify(tagWithData.Data);
+
                     break;
                 case MediaTagType.BD_DI:
                     txtDecoded.Text = DI.Prettify(tagWithData.Data);
+
                     break;
                 case MediaTagType.BD_BCA:
                     txtDecoded.Text = BCA.Prettify(tagWithData.Data);
+
                     break;
                 case MediaTagType.BD_DDS:
                     txtDecoded.Text = Decoders.Bluray.DDS.Prettify(tagWithData.Data);
+
                     break;
                 case MediaTagType.BD_CartridgeStatus:
                     txtDecoded.Text = Cartridge.Prettify(tagWithData.Data);
+
                     break;
                 case MediaTagType.BD_SpareArea:
                     txtDecoded.Text = Decoders.Bluray.Spare.Prettify(tagWithData.Data);
+
                     break;
                 case MediaTagType.MMC_WriteProtection:
                     txtDecoded.Text = WriteProtect.PrettifyWriteProtectionStatus(tagWithData.Data);
+
                     break;
                 case MediaTagType.MMC_DiscInformation:
                     txtDecoded.Text = DiscInformation.Prettify(tagWithData.Data);
+
                     break;
                 case MediaTagType.SCSI_INQUIRY:
                     txtDecoded.Text = Inquiry.Prettify(tagWithData.Data);
+
                     break;
                 case MediaTagType.SCSI_MODEPAGE_2A:
                     txtDecoded.Text = Modes.PrettifyModePage_2A(tagWithData.Data);
+
                     break;
                 case MediaTagType.ATA_IDENTIFY:
                 case MediaTagType.ATAPI_IDENTIFY:
                     txtDecoded.Text = Identify.Prettify(tagWithData.Data);
+
                     break;
                 case MediaTagType.Xbox_SecuritySector:
                     txtDecoded.Text = SS.Prettify(tagWithData.Data);
+
                     break;
                 case MediaTagType.SCSI_MODESENSE_6:
                     txtDecoded.Text = Modes.PrettifyModeHeader6(tagWithData.Data, PeripheralDeviceTypes.DirectAccess);
+
                     break;
                 case MediaTagType.SCSI_MODESENSE_10:
                     txtDecoded.Text = Modes.PrettifyModeHeader10(tagWithData.Data, PeripheralDeviceTypes.DirectAccess);
+
                     break;
                 case MediaTagType.Xbox_DMI:
-                    txtDecoded.Text = DMI.IsXbox360(tagWithData.Data)
-                                          ? DMI.PrettifyXbox360(tagWithData.Data)
+                    txtDecoded.Text = DMI.IsXbox360(tagWithData.Data) ? DMI.PrettifyXbox360(tagWithData.Data)
                                           : DMI.PrettifyXbox(tagWithData.Data);
+
                     break;
                 default:
                     tabDecoded.Visible = false;
+
                     break;
             }
         }
diff --git a/Aaru.Gui/Forms/frmDump.xeto.cs b/Aaru.Gui/Forms/frmDump.xeto.cs
index c04e74d88..a8f3a1ceb 100644
--- a/Aaru.Gui/Forms/frmDump.xeto.cs
+++ b/Aaru.Gui/Forms/frmDump.xeto.cs
@@ -226,7 +226,7 @@ namespace Aaru.Gui.Forms
             foreach((string name, Type type, string description, object @default) option in plugin.SupportedOptions)
                 switch(option.type.ToString())
                 {
-                    case"System.Boolean":
+                    case "System.Boolean":
                         var optBoolean = new CheckBox();
                         optBoolean.ID      = "opt" + option.name;
                         optBoolean.Text    = option.description;
@@ -234,10 +234,10 @@ namespace Aaru.Gui.Forms
                         stkOptions.Items.Add(optBoolean);
 
                         break;
-                    case"System.SByte":
-                    case"System.Int16":
-                    case"System.Int32":
-                    case"System.Int64":
+                    case "System.SByte":
+                    case "System.Int16":
+                    case "System.Int32":
+                    case "System.Int64":
                         var stkNumber = new StackLayout();
                         stkNumber.Orientation = Orientation.Horizontal;
                         var optNumber = new NumericStepper();
@@ -250,10 +250,10 @@ namespace Aaru.Gui.Forms
                         stkOptions.Items.Add(stkNumber);
 
                         break;
-                    case"System.Byte":
-                    case"System.UInt16":
-                    case"System.UInt32":
-                    case"System.UInt64":
+                    case "System.Byte":
+                    case "System.UInt16":
+                    case "System.UInt32":
+                    case "System.UInt64":
                         var stkUnsigned = new StackLayout();
                         stkUnsigned.Orientation = Orientation.Horizontal;
                         var optUnsigned = new NumericStepper();
@@ -267,8 +267,8 @@ namespace Aaru.Gui.Forms
                         stkOptions.Items.Add(stkUnsigned);
 
                         break;
-                    case"System.Single":
-                    case"System.Double":
+                    case "System.Single":
+                    case "System.Double":
                         var stkFloat = new StackLayout();
                         stkFloat.Orientation = Orientation.Horizontal;
                         var optFloat = new NumericStepper();
@@ -282,10 +282,10 @@ namespace Aaru.Gui.Forms
                         stkOptions.Items.Add(stkFloat);
 
                         break;
-                    case"System.Guid":
+                    case "System.Guid":
                         // TODO
                         break;
-                    case"System.String":
+                    case "System.String":
                         var stkString = new StackLayout();
                         stkString.Orientation = Orientation.Horizontal;
                         var lblString = new Label();
diff --git a/Aaru.Gui/Forms/frmImageChecksum.xeto.cs b/Aaru.Gui/Forms/frmImageChecksum.xeto.cs
index 5548aa770..099be362b 100644
--- a/Aaru.Gui/Forms/frmImageChecksum.xeto.cs
+++ b/Aaru.Gui/Forms/frmImageChecksum.xeto.cs
@@ -45,17 +45,24 @@ namespace Aaru.Gui.Forms
     public class frmImageChecksum : Form
     {
         // How many sectors to read at once
-        const uint  SECTORS_TO_READ = 256;
-        bool        cancel;
-        IMediaImage inputFormat;
+        const    uint        SECTORS_TO_READ = 256;
+        readonly IMediaImage inputFormat;
+        bool                 cancel;
 
         public frmImageChecksum(IMediaImage inputFormat)
         {
             this.inputFormat = inputFormat;
             XamlReader.Load(this);
             cancel = false;
-            try { chkChecksumTracks.Visible = (inputFormat as IOpticalMediaImage)?.Tracks?.Count > 0; }
-            catch { chkChecksumTracks.Visible = false; }
+
+            try
+            {
+                chkChecksumTracks.Visible = (inputFormat as IOpticalMediaImage)?.Tracks?.Count > 0;
+            }
+            catch
+            {
+                chkChecksumTracks.Visible = false;
+            }
 
             chkChecksumTracks.Checked = chkChecksumTracks.Visible;
             chkChecksumMedia.Visible  = chkChecksumTracks.Visible;
@@ -88,12 +95,18 @@ namespace Aaru.Gui.Forms
 
         void DoWork()
         {
-            IOpticalMediaImage opticalMediaImage = inputFormat as IOpticalMediaImage;
-            bool               formatHasTracks   = false;
+            var  opticalMediaImage = inputFormat as IOpticalMediaImage;
+            bool formatHasTracks   = false;
 
             if(opticalMediaImage != null)
-                try { formatHasTracks = opticalMediaImage.Tracks?.Count > 0; }
-                catch { formatHasTracks = false; }
+                try
+                {
+                    formatHasTracks = opticalMediaImage.Tracks?.Count > 0;
+                }
+                catch
+                {
+                    formatHasTracks = false;
+                }
 
             // Setup progress bars
             Application.Instance.Invoke(() =>
@@ -102,7 +115,9 @@ namespace Aaru.Gui.Forms
                 prgProgress.MaxValue  = 1;
                 prgProgress2.MaxValue = (int)(inputFormat.Info.Sectors / SECTORS_TO_READ);
 
-                if(formatHasTracks && chkChecksumTracks.Checked == true && opticalMediaImage != null)
+                if(formatHasTracks                   &&
+                   chkChecksumTracks.Checked == true &&
+                   opticalMediaImage         != null)
                     prgProgress.MaxValue += opticalMediaImage.Tracks.Count;
                 else
                 {
@@ -112,32 +127,56 @@ namespace Aaru.Gui.Forms
                 }
             });
 
-            EnableChecksum enabledChecksums = new EnableChecksum();
+            var enabledChecksums = new EnableChecksum();
 
-            if(chkAdler32.Checked == true) enabledChecksums |= EnableChecksum.Adler32;
-            if(chkCrc16.Checked   == true) enabledChecksums |= EnableChecksum.Crc16;
-            if(chkCrc32.Checked   == true) enabledChecksums |= EnableChecksum.Crc32;
-            if(chkCrc64.Checked   == true) enabledChecksums |= EnableChecksum.Crc64;
-            if(chkMd5.Checked     == true) enabledChecksums |= EnableChecksum.Md5;
-            if(chkSha1.Checked       == true) enabledChecksums |= EnableChecksum.Sha1;
-            if(chkSha256.Checked     == true) enabledChecksums |= EnableChecksum.Sha256;
-            if(chkSha384.Checked     == true) enabledChecksums |= EnableChecksum.Sha384;
-            if(chkSha512.Checked     == true) enabledChecksums |= EnableChecksum.Sha512;
-            if(chkSpamsum.Checked    == true) enabledChecksums |= EnableChecksum.SpamSum;
-            if(chkFletcher16.Checked == true) enabledChecksums |= EnableChecksum.Fletcher16;
-            if(chkFletcher32.Checked == true) enabledChecksums |= EnableChecksum.Fletcher32;
+            if(chkAdler32.Checked == true)
+                enabledChecksums |= EnableChecksum.Adler32;
+
+            if(chkCrc16.Checked == true)
+                enabledChecksums |= EnableChecksum.Crc16;
+
+            if(chkCrc32.Checked == true)
+                enabledChecksums |= EnableChecksum.Crc32;
+
+            if(chkCrc64.Checked == true)
+                enabledChecksums |= EnableChecksum.Crc64;
+
+            if(chkMd5.Checked == true)
+                enabledChecksums |= EnableChecksum.Md5;
+
+            if(chkSha1.Checked == true)
+                enabledChecksums |= EnableChecksum.Sha1;
+
+            if(chkSha256.Checked == true)
+                enabledChecksums |= EnableChecksum.Sha256;
+
+            if(chkSha384.Checked == true)
+                enabledChecksums |= EnableChecksum.Sha384;
+
+            if(chkSha512.Checked == true)
+                enabledChecksums |= EnableChecksum.Sha512;
+
+            if(chkSpamsum.Checked == true)
+                enabledChecksums |= EnableChecksum.SpamSum;
+
+            if(chkFletcher16.Checked == true)
+                enabledChecksums |= EnableChecksum.Fletcher16;
+
+            if(chkFletcher32.Checked == true)
+                enabledChecksums |= EnableChecksum.Fletcher32;
 
             Checksum mediaChecksum = null;
 
-            TreeGridItemCollection trackHashes = new TreeGridItemCollection();
-            TreeGridItemCollection mediaHashes = new TreeGridItemCollection();
+            var trackHashes = new TreeGridItemCollection();
+            var mediaHashes = new TreeGridItemCollection();
 
             if(opticalMediaImage != null)
                 try
                 {
                     Checksum trackChecksum = null;
 
-                    if(chkChecksumMedia.Checked == true) mediaChecksum = new Checksum(enabledChecksums);
+                    if(chkChecksumMedia.Checked == true)
+                        mediaChecksum = new Checksum(enabledChecksums);
 
                     ulong previousTrackEnd = 0;
 
@@ -147,13 +186,16 @@ namespace Aaru.Gui.Forms
                         {
                             lblProgress.Text =
                                 $"Hashing track {currentTrack.TrackSequence} of {opticalMediaImage.Tracks.Count}";
+
                             prgProgress.Value++;
                         });
 
-                        if(currentTrack.TrackStartSector - previousTrackEnd != 0 && chkChecksumMedia.Checked == true)
+                        if(currentTrack.TrackStartSector - previousTrackEnd != 0 &&
+                           chkChecksumMedia.Checked                         == true)
                             for(ulong i = previousTrackEnd + 1; i < currentTrack.TrackStartSector; i++)
                             {
                                 ulong sector = i;
+
                                 Application.Instance.Invoke(() =>
                                 {
                                     prgProgress2.Value = (int)(sector / SECTORS_TO_READ);
@@ -166,13 +208,14 @@ namespace Aaru.Gui.Forms
                             }
 
                         AaruConsole.DebugWriteLine("Checksum command",
-                                                  "Track {0} starts at sector {1} and ends at sector {2}",
-                                                  currentTrack.TrackSequence, currentTrack.TrackStartSector,
-                                                  currentTrack.TrackEndSector);
+                                                   "Track {0} starts at sector {1} and ends at sector {2}",
+                                                   currentTrack.TrackSequence, currentTrack.TrackStartSector,
+                                                   currentTrack.TrackEndSector);
 
-                        if(chkChecksumTracks.Checked == true) trackChecksum = new Checksum(enabledChecksums);
+                        if(chkChecksumTracks.Checked == true)
+                            trackChecksum = new Checksum(enabledChecksums);
 
-                        ulong sectors     = currentTrack.TrackEndSector - currentTrack.TrackStartSector + 1;
+                        ulong sectors     = (currentTrack.TrackEndSector - currentTrack.TrackStartSector) + 1;
                         ulong doneSectors = 0;
 
                         while(doneSectors < sectors)
@@ -185,6 +228,7 @@ namespace Aaru.Gui.Forms
                                     btnStart.Visible = false;
                                     btnStop.Visible  = false;
                                 });
+
                                 return;
                             }
 
@@ -196,9 +240,11 @@ namespace Aaru.Gui.Forms
                                                                        currentTrack.TrackSequence);
 
                                 ulong doneSectorsToInvoke = doneSectors;
+
                                 Application.Instance.Invoke(() =>
                                 {
                                     prgProgress2.Value = (int)(doneSectorsToInvoke / SECTORS_TO_READ);
+
                                     lblProgress2.Text =
                                         $"Hashings sectors {doneSectorsToInvoke} to {doneSectorsToInvoke + SECTORS_TO_READ} of track {currentTrack.TrackSequence}";
                                 });
@@ -211,9 +257,11 @@ namespace Aaru.Gui.Forms
                                                                        currentTrack.TrackSequence);
 
                                 ulong doneSectorsToInvoke = doneSectors;
+
                                 Application.Instance.Invoke(() =>
                                 {
                                     prgProgress2.Value = (int)(doneSectorsToInvoke / SECTORS_TO_READ);
+
                                     lblProgress2.Text =
                                         $"Hashings sectors {doneSectorsToInvoke} to {doneSectorsToInvoke + (sectors - doneSectorsToInvoke)} of track {currentTrack.TrackSequence}";
                                 });
@@ -221,9 +269,11 @@ namespace Aaru.Gui.Forms
                                 doneSectors += sectors - doneSectors;
                             }
 
-                            if(chkChecksumMedia.Checked == true) mediaChecksum?.Update(sector);
+                            if(chkChecksumMedia.Checked == true)
+                                mediaChecksum?.Update(sector);
 
-                            if(chkChecksumTracks.Checked == true) trackChecksum?.Update(sector);
+                            if(chkChecksumTracks.Checked == true)
+                                trackChecksum?.Update(sector);
                         }
 
                         if(chkChecksumTracks.Checked == true)
@@ -240,10 +290,12 @@ namespace Aaru.Gui.Forms
                         previousTrackEnd = currentTrack.TrackEndSector;
                     }
 
-                    if(opticalMediaImage.Info.Sectors - previousTrackEnd != 0 && chkChecksumMedia.Checked == true)
+                    if(opticalMediaImage.Info.Sectors - previousTrackEnd != 0 &&
+                       chkChecksumMedia.Checked                          == true)
                         for(ulong i = previousTrackEnd + 1; i < opticalMediaImage.Info.Sectors; i++)
                         {
                             ulong sector = i;
+
                             Application.Instance.Invoke(() =>
                             {
                                 prgProgress2.Value = (int)(sector / SECTORS_TO_READ);
@@ -257,7 +309,13 @@ namespace Aaru.Gui.Forms
                     if(chkChecksumMedia.Checked == true)
                         if(mediaChecksum != null)
                             foreach(ChecksumType chk in mediaChecksum.End())
-                                mediaHashes.Add(new TreeGridItem {Values = new object[] {chk.type, chk.Value}});
+                                mediaHashes.Add(new TreeGridItem
+                                {
+                                    Values = new object[]
+                                    {
+                                        chk.type, chk.Value
+                                    }
+                                });
                 }
                 catch(Exception ex)
                 {
@@ -266,7 +324,11 @@ namespace Aaru.Gui.Forms
                 }
             else
             {
-                Application.Instance.Invoke(() => { stkProgress1.Visible = false; });
+                Application.Instance.Invoke(() =>
+                {
+                    stkProgress1.Visible = false;
+                });
+
                 mediaChecksum = new Checksum(enabledChecksums);
 
                 ulong doneSectors = 0;
@@ -281,6 +343,7 @@ namespace Aaru.Gui.Forms
                             btnStart.Visible = false;
                             btnStop.Visible  = false;
                         });
+
                         return;
                     }
 
@@ -291,24 +354,30 @@ namespace Aaru.Gui.Forms
                         sector = inputFormat.ReadSectors(doneSectors, SECTORS_TO_READ);
 
                         ulong doneSectorsToInvoke = doneSectors;
+
                         Application.Instance.Invoke(() =>
                         {
                             prgProgress2.Value = (int)(doneSectorsToInvoke / SECTORS_TO_READ);
+
                             lblProgress2.Text =
                                 $"Hashings sectors {doneSectorsToInvoke} to {doneSectorsToInvoke + SECTORS_TO_READ}";
                         });
+
                         doneSectors += SECTORS_TO_READ;
                     }
                     else
                     {
                         sector = inputFormat.ReadSectors(doneSectors, (uint)(inputFormat.Info.Sectors - doneSectors));
                         ulong doneSectorsToInvoke = doneSectors;
+
                         Application.Instance.Invoke(() =>
                         {
                             prgProgress2.Value = (int)(doneSectorsToInvoke / SECTORS_TO_READ);
+
                             lblProgress2.Text =
                                 $"Hashings sectors {doneSectorsToInvoke} to {doneSectorsToInvoke + (inputFormat.Info.Sectors - doneSectorsToInvoke)}";
                         });
+
                         doneSectors += inputFormat.Info.Sectors - doneSectors;
                     }
 
@@ -316,7 +385,13 @@ namespace Aaru.Gui.Forms
                 }
 
                 foreach(ChecksumType chk in mediaChecksum.End())
-                    mediaHashes.Add(new TreeGridItem {Values = new object[] {chk.type, chk.Value}});
+                    mediaHashes.Add(new TreeGridItem
+                    {
+                        Values = new object[]
+                        {
+                            chk.type, chk.Value
+                        }
+                    });
             }
 
             if(chkChecksumTracks.Checked == true)
@@ -329,11 +404,16 @@ namespace Aaru.Gui.Forms
                     {
                         HeaderText = "Track", DataCell = new TextBoxCell(0)
                     });
+
                     treeTrackChecksums.Columns.Add(new GridColumn
                     {
                         HeaderText = "Algorithm", DataCell = new TextBoxCell(1)
                     });
-                    treeTrackChecksums.Columns.Add(new GridColumn {HeaderText = "Hash", DataCell = new TextBoxCell(2)});
+
+                    treeTrackChecksums.Columns.Add(new GridColumn
+                    {
+                        HeaderText = "Hash", DataCell = new TextBoxCell(2)
+                    });
 
                     treeTrackChecksums.AllowMultipleSelection = false;
                     treeTrackChecksums.ShowHeader             = true;
@@ -350,7 +430,11 @@ namespace Aaru.Gui.Forms
                     {
                         HeaderText = "Algorithm", DataCell = new TextBoxCell(0)
                     });
-                    treeMediaChecksums.Columns.Add(new GridColumn {HeaderText = "Hash", DataCell = new TextBoxCell(1)});
+
+                    treeMediaChecksums.Columns.Add(new GridColumn
+                    {
+                        HeaderText = "Hash", DataCell = new TextBoxCell(1)
+                    });
 
                     treeMediaChecksums.AllowMultipleSelection = false;
                     treeMediaChecksums.ShowHeader             = true;
@@ -370,10 +454,7 @@ namespace Aaru.Gui.Forms
             });
         }
 
-        protected void OnBtnClose(object sender, EventArgs e)
-        {
-            Close();
-        }
+        protected void OnBtnClose(object sender, EventArgs e) => Close();
 
         protected void OnBtnStop(object sender, EventArgs e)
         {
diff --git a/Aaru.Gui/Forms/frmImageConvert.xeto.cs b/Aaru.Gui/Forms/frmImageConvert.xeto.cs
index 9404d0184..c3a5c9e37 100644
--- a/Aaru.Gui/Forms/frmImageConvert.xeto.cs
+++ b/Aaru.Gui/Forms/frmImageConvert.xeto.cs
@@ -55,10 +55,10 @@ namespace Aaru.Gui.Forms
 {
     public class frmImageConvert : Form
     {
+        readonly IMediaImage   inputFormat;
         bool                   cancel;
         CICMMetadataType       cicmMetadata;
         List<DumpHardwareType> dumpHardware;
-        IMediaImage            inputFormat;
 
         public frmImageConvert(IMediaImage inputFormat, string imageSource)
         {
@@ -75,10 +75,12 @@ namespace Aaru.Gui.Forms
             btnMediaSerialNumber.Visible = !string.IsNullOrWhiteSpace(inputFormat.Info.MediaSerialNumber);
             btnMediaBarcode.Visible      = !string.IsNullOrWhiteSpace(inputFormat.Info.MediaBarcode);
             btnMediaPartNumber.Visible   = !string.IsNullOrWhiteSpace(inputFormat.Info.MediaPartNumber);
-            btnMediaSequence.Visible =
-                inputFormat.Info.MediaSequence != 0 && inputFormat.Info.LastMediaSequence != 0;
+
+            btnMediaSequence.Visible = inputFormat.Info.MediaSequence != 0 && inputFormat.Info.LastMediaSequence != 0;
+
             btnLastMediaSequence.Visible =
                 inputFormat.Info.MediaSequence != 0 && inputFormat.Info.LastMediaSequence != 0;
+
             btnDriveManufacturer.Visible     = !string.IsNullOrWhiteSpace(inputFormat.Info.DriveManufacturer);
             btnDriveModel.Visible            = !string.IsNullOrWhiteSpace(inputFormat.Info.DriveModel);
             btnDriveSerialNumber.Visible     = !string.IsNullOrWhiteSpace(inputFormat.Info.DriveSerialNumber);
@@ -86,9 +88,11 @@ namespace Aaru.Gui.Forms
 
             ObservableCollection<IWritableImage> lstPlugins = new ObservableCollection<IWritableImage>();
             PluginBase                           plugins    = GetPluginBase.Instance;
+
             foreach(IWritableImage plugin in
                 plugins.WritableImages.Values.Where(p => p.SupportedMediaTypes.Contains(inputFormat.Info.MediaType)))
                 lstPlugins.Add(plugin);
+
             cmbFormat.ItemTextBinding = Binding.Property((IWritableImage p) => p.Name);
             cmbFormat.ItemKeyBinding  = Binding.Property((IWritableImage p) => p.Id.ToString());
             cmbFormat.DataStore       = lstPlugins;
@@ -96,8 +100,8 @@ namespace Aaru.Gui.Forms
             btnCicmXmlFromImage.Visible    = inputFormat.CicmMetadata != null;
             btnResumeFileFromImage.Visible = inputFormat.DumpHardware != null && inputFormat.DumpHardware.Any();
             cicmMetadata                   = inputFormat.CicmMetadata;
-            dumpHardware = inputFormat.DumpHardware != null && inputFormat.DumpHardware.Any()
-                               ? inputFormat.DumpHardware
+
+            dumpHardware = inputFormat.DumpHardware != null && inputFormat.DumpHardware.Any() ? inputFormat.DumpHardware
                                : null;
 
             txtCicmXml.Text    = cicmMetadata == null ? "" : "<From image>";
@@ -109,6 +113,7 @@ namespace Aaru.Gui.Forms
             if(!(cmbFormat.SelectedValue is IWritableImage plugin))
             {
                 MessageBox.Show("Error trying to find selected plugin", MessageBoxType.Error);
+
                 return;
             }
 
@@ -118,19 +123,27 @@ namespace Aaru.Gui.Forms
         void DoWork(object plugin)
         {
             bool warning = false;
+
             if(!(plugin is IWritableImage outputFormat))
             {
                 MessageBox.Show("Error trying to find selected plugin", MessageBoxType.Error);
+
                 return;
             }
 
-            IOpticalMediaImage    inputOptical  = inputFormat as IOpticalMediaImage;
-            IWritableOpticalImage outputOptical = outputFormat as IWritableOpticalImage;
+            var inputOptical  = inputFormat as IOpticalMediaImage;
+            var outputOptical = outputFormat as IWritableOpticalImage;
 
             List<Track> tracks;
 
-            try { tracks = inputOptical?.Tracks; }
-            catch(Exception) { tracks = null; }
+            try
+            {
+                tracks = inputOptical?.Tracks;
+            }
+            catch(Exception)
+            {
+                tracks = null;
+            }
 
             // Prepare UI
             Application.Instance.Invoke(() =>
@@ -148,7 +161,8 @@ namespace Aaru.Gui.Forms
                 prgProgress.MaxValue += inputFormat.Info.ReadableMediaTags.Count;
                 prgProgress.MaxValue++;
 
-                if(tracks != null) prgProgress.MaxValue++;
+                if(tracks != null)
+                    prgProgress.MaxValue++;
 
                 if(tracks == null)
                 {
@@ -170,7 +184,9 @@ namespace Aaru.Gui.Forms
                                 continue;
                         }
 
-                        if(chkForce.Checked == true && !outputFormat.SupportedSectorTags.Contains(tag)) continue;
+                        if(chkForce.Checked == true &&
+                           !outputFormat.SupportedSectorTags.Contains(tag))
+                            continue;
 
                         prgProgress.MaxValue++;
                     }
@@ -195,27 +211,33 @@ namespace Aaru.Gui.Forms
                                 continue;
                         }
 
-                        if(chkForce.Checked == true && !outputFormat.SupportedSectorTags.Contains(tag)) continue;
+                        if(chkForce.Checked == true &&
+                           !outputFormat.SupportedSectorTags.Contains(tag))
+                            continue;
 
                         prgProgress.MaxValue += tracks.Count;
                     }
                 }
 
-                if(dumpHardware != null) prgProgress.MaxValue++;
-                if(cicmMetadata != null) prgProgress.MaxValue++;
+                if(dumpHardware != null)
+                    prgProgress.MaxValue++;
+
+                if(cicmMetadata != null)
+                    prgProgress.MaxValue++;
 
                 prgProgress.MaxValue++;
             });
 
             foreach(MediaTagType mediaTag in inputFormat.Info.ReadableMediaTags)
             {
-                if(outputFormat.SupportedMediaTags.Contains(mediaTag) || chkForce.Checked == true) continue;
+                if(outputFormat.SupportedMediaTags.Contains(mediaTag) ||
+                   chkForce.Checked == true)
+                    continue;
 
                 Application.Instance.Invoke(() =>
                 {
-                    MessageBox
-                       .Show($"Converting image will lose media tag {mediaTag}, not continuing...",
-                             MessageBoxType.Error);
+                    MessageBox.Show($"Converting image will lose media tag {mediaTag}, not continuing...",
+                                    MessageBoxType.Error);
                 });
 
                 return;
@@ -225,21 +247,25 @@ namespace Aaru.Gui.Forms
 
             foreach(SectorTagType sectorTag in inputFormat.Info.ReadableSectorTags)
             {
-                if(outputFormat.SupportedSectorTags.Contains(sectorTag)) continue;
+                if(outputFormat.SupportedSectorTags.Contains(sectorTag))
+                    continue;
 
                 if(chkForce.Checked == true)
                 {
-                    if(sectorTag != SectorTagType.CdTrackFlags && sectorTag != SectorTagType.CdTrackIsrc &&
-                       sectorTag != SectorTagType.CdSectorSubchannel) useLong = false;
+                    if(sectorTag != SectorTagType.CdTrackFlags &&
+                       sectorTag != SectorTagType.CdTrackIsrc  &&
+                       sectorTag != SectorTagType.CdSectorSubchannel)
+                        useLong = false;
+
                     continue;
                 }
 
                 Application.Instance.Invoke(() =>
                 {
-                    MessageBox
-                       .Show($"Converting image will lose sector tag {sectorTag}, not continuing...",
-                             MessageBoxType.Error);
+                    MessageBox.Show($"Converting image will lose sector tag {sectorTag}, not continuing...",
+                                    MessageBoxType.Error);
                 });
+
                 return;
             }
 
@@ -248,7 +274,8 @@ namespace Aaru.Gui.Forms
             if(grpOptions.Content is StackLayout stkImageOptions)
                 foreach(Control option in stkImageOptions.Children)
                 {
-                    if(cancel) break;
+                    if(cancel)
+                        break;
 
                     string value;
 
@@ -256,12 +283,15 @@ namespace Aaru.Gui.Forms
                     {
                         case CheckBox optBoolean:
                             value = optBoolean.Checked?.ToString();
+
                             break;
                         case NumericStepper optNumber:
                             value = optNumber.Value.ToString(CultureInfo.CurrentCulture);
+
                             break;
                         case TextBox optString:
                             value = optString.Text;
+
                             break;
                         default: continue;
                     }
@@ -283,12 +313,11 @@ namespace Aaru.Gui.Forms
             {
                 Application.Instance.Invoke(() =>
                 {
-                    MessageBox
-                       .Show($"Error {outputFormat.ErrorMessage} creating output image.",
-                             MessageBoxType.Error);
+                    MessageBox.Show($"Error {outputFormat.ErrorMessage} creating output image.", MessageBoxType.Error);
                 });
 
                 AaruConsole.ErrorWriteLine("Error {0} creating output image.", outputFormat.ErrorMessage);
+
                 return;
             }
 
@@ -300,40 +329,34 @@ namespace Aaru.Gui.Forms
                 prgProgress2.Indeterminate = true;
             });
 
-            ImageInfo metadata = new ImageInfo
+            var metadata = new ImageInfo
             {
-                Application           = "Aaru",
-                ApplicationVersion    = Version.GetVersion(),
-                Comments              = txtComments.Text,
-                Creator               = txtCreator.Text,
-                DriveFirmwareRevision = txtDriveFirmwareRevision.Text,
-                DriveManufacturer     = txtDriveManufacturer.Text,
-                DriveModel            = txtDriveModel.Text,
-                DriveSerialNumber     = txtDriveSerialNumber.Text,
-                LastMediaSequence     = (int)numLastMediaSequence.Value,
-                MediaBarcode          = txtMediaBarcode.Text,
-                MediaManufacturer     = txtMediaManufacturer.Text,
-                MediaModel            = txtMediaModel.Text,
-                MediaPartNumber       = txtMediaPartNumber.Text,
-                MediaSequence         = (int)numMediaSequence.Value,
-                MediaSerialNumber     = txtMediaSerialNumber.Text,
-                MediaTitle            = txtMediaTitle.Text
+                Application       = "Aaru", ApplicationVersion = Version.GetVersion(),
+                Comments          = txtComments.Text,
+                Creator           = txtCreator.Text, DriveFirmwareRevision         = txtDriveFirmwareRevision.Text,
+                DriveManufacturer = txtDriveManufacturer.Text, DriveModel          = txtDriveModel.Text,
+                DriveSerialNumber = txtDriveSerialNumber.Text, LastMediaSequence   = (int)numLastMediaSequence.Value,
+                MediaBarcode      = txtMediaBarcode.Text, MediaManufacturer        = txtMediaManufacturer.Text,
+                MediaModel        = txtMediaModel.Text, MediaPartNumber            = txtMediaPartNumber.Text,
+                MediaSequence     = (int)numMediaSequence.Value, MediaSerialNumber = txtMediaSerialNumber.Text,
+                MediaTitle        = txtMediaTitle.Text
             };
 
             if(!cancel)
                 if(!outputFormat.SetMetadata(metadata))
                 {
                     AaruConsole.ErrorWrite("Error {0} setting metadata, ", outputFormat.ErrorMessage);
+
                     if(chkForce.Checked != true)
                     {
                         Application.Instance.Invoke(() =>
                         {
-                            MessageBox
-                               .Show($"Error {outputFormat.ErrorMessage} setting metadata, not continuing...",
-                                     MessageBoxType.Error);
+                            MessageBox.Show($"Error {outputFormat.ErrorMessage} setting metadata, not continuing...",
+                                            MessageBoxType.Error);
                         });
 
                         AaruConsole.ErrorWriteLine("not continuing...");
+
                         return;
                     }
 
@@ -341,7 +364,9 @@ namespace Aaru.Gui.Forms
                     AaruConsole.ErrorWriteLine("continuing...");
                 }
 
-            if(tracks != null && !cancel && outputOptical != null)
+            if(tracks != null &&
+               !cancel        &&
+               outputOptical != null)
             {
                 Application.Instance.Invoke(() =>
                 {
@@ -355,20 +380,21 @@ namespace Aaru.Gui.Forms
                 {
                     Application.Instance.Invoke(() =>
                     {
-                        MessageBox
-                           .Show($"Error {outputFormat.ErrorMessage} sending tracks list to output image.",
-                                 MessageBoxType.Error);
+                        MessageBox.Show($"Error {outputFormat.ErrorMessage} sending tracks list to output image.",
+                                        MessageBoxType.Error);
                     });
 
                     AaruConsole.ErrorWriteLine("Error {0} sending tracks list to output image.",
-                                              outputFormat.ErrorMessage);
+                                               outputFormat.ErrorMessage);
+
                     return;
                 }
             }
 
             foreach(MediaTagType mediaTag in inputFormat.Info.ReadableMediaTags)
             {
-                if(cancel) break;
+                if(cancel)
+                    break;
 
                 Application.Instance.Invoke(() =>
                 {
@@ -378,10 +404,14 @@ namespace Aaru.Gui.Forms
                     prgProgress2.Indeterminate = true;
                 });
 
-                if(chkForce.Checked == true && !outputFormat.SupportedMediaTags.Contains(mediaTag)) continue;
+                if(chkForce.Checked == true &&
+                   !outputFormat.SupportedMediaTags.Contains(mediaTag))
+                    continue;
 
                 byte[] tag = inputFormat.ReadDiskTag(mediaTag);
-                if(outputFormat.WriteMediaTag(tag, mediaTag)) continue;
+
+                if(outputFormat.WriteMediaTag(tag, mediaTag))
+                    continue;
 
                 if(chkForce.Checked == true)
                 {
@@ -392,25 +422,27 @@ namespace Aaru.Gui.Forms
                 {
                     Application.Instance.Invoke(() =>
                     {
-                        MessageBox
-                           .Show($"Error {outputFormat.ErrorMessage} writing media tag, not continuing...",
-                                 MessageBoxType.Error);
+                        MessageBox.Show($"Error {outputFormat.ErrorMessage} writing media tag, not continuing...",
+                                        MessageBoxType.Error);
                     });
 
                     AaruConsole.ErrorWriteLine("Error {0} writing media tag, not continuing...",
-                                              outputFormat.ErrorMessage);
+                                               outputFormat.ErrorMessage);
+
                     return;
                 }
             }
 
             ulong doneSectors = 0;
 
-            if(tracks == null && !cancel)
+            if(tracks == null &&
+               !cancel)
             {
                 Application.Instance.Invoke(() =>
                 {
                     lblProgress.Text =
                         $"Setting geometry to {inputFormat.Info.Cylinders} cylinders, {inputFormat.Info.Heads} heads and {inputFormat.Info.SectorsPerTrack} sectors per track";
+
                     prgProgress.Value++;
                     lblProgress2.Text          = "";
                     prgProgress2.Indeterminate = true;
@@ -420,8 +452,9 @@ namespace Aaru.Gui.Forms
                                              inputFormat.Info.SectorsPerTrack))
                 {
                     warning = true;
+
                     AaruConsole.ErrorWriteLine("Error {0} setting geometry, image may be incorrect, continuing...",
-                                              outputFormat.ErrorMessage);
+                                               outputFormat.ErrorMessage);
                 }
 
                 Application.Instance.Invoke(() =>
@@ -435,25 +468,31 @@ namespace Aaru.Gui.Forms
 
                 while(doneSectors < inputFormat.Info.Sectors)
                 {
-                    if(cancel) break;
+                    if(cancel)
+                        break;
 
                     byte[] sector;
 
                     uint sectorsToDo;
+
                     if(inputFormat.Info.Sectors - doneSectors >= (ulong)numCount.Value)
-                        sectorsToDo  = (uint)numCount.Value;
-                    else sectorsToDo = (uint)(inputFormat.Info.Sectors - doneSectors);
+                        sectorsToDo = (uint)numCount.Value;
+                    else
+                        sectorsToDo = (uint)(inputFormat.Info.Sectors - doneSectors);
 
                     ulong sectors = doneSectors;
+
                     Application.Instance.Invoke(() =>
                     {
                         lblProgress2.Text =
                             $"Converting sectors {sectors} to {sectors + sectorsToDo} ({sectors / (double)inputFormat.Info.Sectors:P2} done)";
+
                         ;
                         prgProgress2.Value = (int)(sectors / numCount.Value);
                     });
 
                     bool result;
+
                     if(useLong)
                         if(sectorsToDo == 1)
                         {
@@ -483,20 +522,22 @@ namespace Aaru.Gui.Forms
                         if(chkForce.Checked == true)
                         {
                             warning = true;
+
                             AaruConsole.ErrorWriteLine("Error {0} writing sector {1}, continuing...",
-                                                      outputFormat.ErrorMessage, doneSectors);
+                                                       outputFormat.ErrorMessage, doneSectors);
                         }
                         else
                         {
                             Application.Instance.Invoke(() =>
                             {
-                                MessageBox
-                                   .Show($"Error {outputFormat.ErrorMessage} writing sector {doneSectors}, not continuing...",
+                                MessageBox.
+                                    Show($"Error {outputFormat.ErrorMessage} writing sector {doneSectors}, not continuing...",
                                          MessageBoxType.Error);
                             });
 
                             AaruConsole.ErrorWriteLine("Error {0} writing sector {1}, not continuing...",
-                                                      outputFormat.ErrorMessage, doneSectors);
+                                                       outputFormat.ErrorMessage, doneSectors);
+
                             return;
                         }
 
@@ -507,13 +548,15 @@ namespace Aaru.Gui.Forms
                 {
                     lblProgress2.Text =
                         $"Converting sectors {inputFormat.Info.Sectors} to {inputFormat.Info.Sectors} ({1.0:P2} done)";
+
                     ;
                     prgProgress2.Value = prgProgress2.MaxValue;
                 });
 
                 foreach(SectorTagType tag in inputFormat.Info.ReadableSectorTags)
                 {
-                    if(!useLong || cancel) break;
+                    if(!useLong || cancel)
+                        break;
 
                     switch(tag)
                     {
@@ -529,7 +572,9 @@ namespace Aaru.Gui.Forms
                             continue;
                     }
 
-                    if(chkForce.Checked == true && !outputFormat.SupportedSectorTags.Contains(tag)) continue;
+                    if(chkForce.Checked == true &&
+                       !outputFormat.SupportedSectorTags.Contains(tag))
+                        continue;
 
                     Application.Instance.Invoke(() =>
                     {
@@ -541,26 +586,33 @@ namespace Aaru.Gui.Forms
                     });
 
                     doneSectors = 0;
+
                     while(doneSectors < inputFormat.Info.Sectors)
                     {
-                        if(cancel) break;
+                        if(cancel)
+                            break;
 
                         byte[] sector;
 
                         uint sectorsToDo;
+
                         if(inputFormat.Info.Sectors - doneSectors >= (ulong)numCount.Value)
-                            sectorsToDo  = (uint)numCount.Value;
-                        else sectorsToDo = (uint)(inputFormat.Info.Sectors - doneSectors);
+                            sectorsToDo = (uint)numCount.Value;
+                        else
+                            sectorsToDo = (uint)(inputFormat.Info.Sectors - doneSectors);
 
                         ulong sectors = doneSectors;
+
                         Application.Instance.Invoke(() =>
                         {
                             lblProgress2.Text =
                                 $"Converting tag {sectors / (double)inputFormat.Info.Sectors} for sectors {sectors} to {sectors + sectorsToDo} ({sectors / (double)inputFormat.Info.Sectors:P2} done)";
+
                             prgProgress2.Value = (int)(sectors / numCount.Value);
                         });
 
                         bool result;
+
                         if(sectorsToDo == 1)
                         {
                             sector = inputFormat.ReadSectorTag(doneSectors, tag);
@@ -576,20 +628,22 @@ namespace Aaru.Gui.Forms
                             if(chkForce.Checked == true)
                             {
                                 warning = true;
+
                                 AaruConsole.ErrorWriteLine("Error {0} writing sector {1}, continuing...",
-                                                          outputFormat.ErrorMessage, doneSectors);
+                                                           outputFormat.ErrorMessage, doneSectors);
                             }
                             else
                             {
                                 Application.Instance.Invoke(() =>
                                 {
-                                    MessageBox
-                                       .Show($"Error {outputFormat.ErrorMessage} writing sector {doneSectors}, not continuing...",
+                                    MessageBox.
+                                        Show($"Error {outputFormat.ErrorMessage} writing sector {doneSectors}, not continuing...",
                                              MessageBoxType.Error);
                                 });
 
                                 AaruConsole.ErrorWriteLine("Error {0} writing sector {1}, not continuing...",
-                                                          outputFormat.ErrorMessage, doneSectors);
+                                                           outputFormat.ErrorMessage, doneSectors);
+
                                 return;
                             }
 
@@ -600,6 +654,7 @@ namespace Aaru.Gui.Forms
                     {
                         lblProgress2.Text =
                             $"Converting tag {tag} for sectors {inputFormat.Info.Sectors} to {inputFormat.Info.Sectors} ({1.0:P2} done)";
+
                         prgProgress2.Value = prgProgress2.MaxValue;
                     });
                 }
@@ -608,10 +663,11 @@ namespace Aaru.Gui.Forms
             {
                 foreach(Track track in tracks)
                 {
-                    if(cancel) break;
+                    if(cancel)
+                        break;
 
                     doneSectors = 0;
-                    ulong trackSectors = track.TrackEndSector - track.TrackStartSector + 1;
+                    ulong trackSectors = (track.TrackEndSector - track.TrackStartSector) + 1;
 
                     Application.Instance.Invoke(() =>
                     {
@@ -624,25 +680,30 @@ namespace Aaru.Gui.Forms
 
                     while(doneSectors < trackSectors)
                     {
-                        if(cancel) break;
+                        if(cancel)
+                            break;
 
                         byte[] sector;
 
                         uint sectorsToDo;
-                        if(trackSectors - doneSectors >= (ulong)numCount.Value) sectorsToDo = (uint)numCount.Value;
+
+                        if(trackSectors - doneSectors >= (ulong)numCount.Value)
+                            sectorsToDo = (uint)numCount.Value;
                         else
-                            sectorsToDo =
-                                (uint)(trackSectors - doneSectors);
+                            sectorsToDo = (uint)(trackSectors - doneSectors);
 
                         ulong sectors = doneSectors;
+
                         Application.Instance.Invoke(() =>
                         {
                             lblProgress2.Text =
                                 $"Converting sectors {sectors + track.TrackStartSector} to {sectors + sectorsToDo + track.TrackStartSector} in track {track.TrackSequence} ({(sectors + track.TrackStartSector) / (double)inputFormat.Info.Sectors:P2} done)";
+
                             prgProgress2.Value = (int)(sectors / numCount.Value);
                         });
 
                         bool result;
+
                         if(useLong)
                             if(sectorsToDo == 1)
                             {
@@ -652,6 +713,7 @@ namespace Aaru.Gui.Forms
                             else
                             {
                                 sector = inputFormat.ReadSectorsLong(doneSectors + track.TrackStartSector, sectorsToDo);
+
                                 result = outputFormat.WriteSectorsLong(sector, doneSectors + track.TrackStartSector,
                                                                        sectorsToDo);
                             }
@@ -665,6 +727,7 @@ namespace Aaru.Gui.Forms
                             else
                             {
                                 sector = inputFormat.ReadSectors(doneSectors + track.TrackStartSector, sectorsToDo);
+
                                 result = outputFormat.WriteSectors(sector, doneSectors + track.TrackStartSector,
                                                                    sectorsToDo);
                             }
@@ -674,15 +737,16 @@ namespace Aaru.Gui.Forms
                             if(chkForce.Checked == true)
                             {
                                 warning = true;
+
                                 AaruConsole.ErrorWriteLine("Error {0} writing sector {1}, continuing...",
-                                                          outputFormat.ErrorMessage, doneSectors);
+                                                           outputFormat.ErrorMessage, doneSectors);
                             }
                             else
                             {
                                 Application.Instance.Invoke(() =>
                                 {
-                                    MessageBox
-                                       .Show($"Error {outputFormat.ErrorMessage} writing sector {doneSectors}, not continuing...",
+                                    MessageBox.
+                                        Show($"Error {outputFormat.ErrorMessage} writing sector {doneSectors}, not continuing...",
                                              MessageBoxType.Error);
                                 });
 
@@ -697,12 +761,14 @@ namespace Aaru.Gui.Forms
                 {
                     lblProgress2.Text =
                         $"Converting sectors {inputFormat.Info.Sectors} to {inputFormat.Info.Sectors} in track {tracks.Count} ({1.0:P2} done)";
+
                     prgProgress2.Value = prgProgress2.MaxValue;
                 });
 
                 foreach(SectorTagType tag in inputFormat.Info.ReadableSectorTags.OrderBy(t => t))
                 {
-                    if(!useLong || cancel) break;
+                    if(!useLong || cancel)
+                        break;
 
                     switch(tag)
                     {
@@ -718,14 +784,17 @@ namespace Aaru.Gui.Forms
                             continue;
                     }
 
-                    if(chkForce.Checked == true && !outputFormat.SupportedSectorTags.Contains(tag)) continue;
+                    if(chkForce.Checked == true &&
+                       !outputFormat.SupportedSectorTags.Contains(tag))
+                        continue;
 
                     foreach(Track track in tracks)
                     {
-                        if(cancel) break;
+                        if(cancel)
+                            break;
 
                         doneSectors = 0;
-                        ulong  trackSectors = track.TrackEndSector - track.TrackStartSector + 1;
+                        ulong  trackSectors = (track.TrackEndSector - track.TrackStartSector) + 1;
                         byte[] sector;
                         bool   result;
 
@@ -745,19 +814,21 @@ namespace Aaru.Gui.Forms
 
                                 sector = inputFormat.ReadSectorTag(track.TrackStartSector, tag);
                                 result = outputFormat.WriteSectorTag(sector, track.TrackStartSector, tag);
+
                                 if(!result)
                                     if(chkForce.Checked == true)
                                     {
                                         warning = true;
+
                                         AaruConsole.ErrorWriteLine("Error {0} writing tag, continuing...",
-                                                                  outputFormat.ErrorMessage);
+                                                                   outputFormat.ErrorMessage);
                                     }
                                     else
                                     {
                                         Application.Instance.Invoke(() =>
                                         {
-                                            MessageBox
-                                               .Show($"Error {outputFormat.ErrorMessage} writing tag, not continuing...",
+                                            MessageBox.
+                                                Show($"Error {outputFormat.ErrorMessage} writing tag, not continuing...",
                                                      MessageBoxType.Error);
                                         });
 
@@ -769,19 +840,23 @@ namespace Aaru.Gui.Forms
 
                         while(doneSectors < trackSectors)
                         {
-                            if(cancel) break;
+                            if(cancel)
+                                break;
 
                             uint sectorsToDo;
-                            if(trackSectors - doneSectors >= (ulong)numCount.Value) sectorsToDo = (uint)numCount.Value;
+
+                            if(trackSectors - doneSectors >= (ulong)numCount.Value)
+                                sectorsToDo = (uint)numCount.Value;
                             else
-                                sectorsToDo =
-                                    (uint)(trackSectors - doneSectors);
+                                sectorsToDo = (uint)(trackSectors - doneSectors);
 
                             ulong sectors = doneSectors;
+
                             Application.Instance.Invoke(() =>
                             {
                                 lblProgress2.Text =
                                     $"Converting tag {tag} for sectors {sectors + track.TrackStartSector} to {sectors + sectorsToDo + track.TrackStartSector} in track {track.TrackSequence} ({(sectors + track.TrackStartSector) / (double)inputFormat.Info.Sectors:P2} done)";
+
                                 prgProgress2.Value = (int)(sectors / numCount.Value);
                             });
 
@@ -794,6 +869,7 @@ namespace Aaru.Gui.Forms
                             {
                                 sector = inputFormat.ReadSectorsTag(doneSectors + track.TrackStartSector, sectorsToDo,
                                                                     tag);
+
                                 result = outputFormat.WriteSectorsTag(sector, doneSectors + track.TrackStartSector,
                                                                       sectorsToDo, tag);
                             }
@@ -802,15 +878,16 @@ namespace Aaru.Gui.Forms
                                 if(chkForce.Checked == true)
                                 {
                                     warning = true;
+
                                     AaruConsole.ErrorWriteLine("Error {0} writing tag for sector {1}, continuing...",
-                                                              outputFormat.ErrorMessage, doneSectors);
+                                                               outputFormat.ErrorMessage, doneSectors);
                                 }
                                 else
                                 {
                                     Application.Instance.Invoke(() =>
                                     {
-                                        MessageBox
-                                           .Show($"Error {outputFormat.ErrorMessage} writing tag for sector {doneSectors}, not continuing...",
+                                        MessageBox.
+                                            Show($"Error {outputFormat.ErrorMessage} writing tag for sector {doneSectors}, not continuing...",
                                                  MessageBoxType.Error);
                                     });
 
@@ -830,7 +907,9 @@ namespace Aaru.Gui.Forms
             });
 
             bool ret = false;
-            if(dumpHardware != null && !cancel)
+
+            if(dumpHardware != null &&
+               !cancel)
             {
                 Application.Instance.Invoke(() =>
                 {
@@ -839,13 +918,16 @@ namespace Aaru.Gui.Forms
                 });
 
                 ret = outputFormat.SetDumpHardware(dumpHardware);
+
                 if(!ret)
                     AaruConsole.WriteLine("Error {0} writing dump hardware list to output image.",
-                                         outputFormat.ErrorMessage);
+                                          outputFormat.ErrorMessage);
             }
 
             ret = false;
-            if(cicmMetadata != null && !cancel)
+
+            if(cicmMetadata != null &&
+               !cancel)
             {
                 Application.Instance.Invoke(() =>
                 {
@@ -854,9 +936,10 @@ namespace Aaru.Gui.Forms
                 });
 
                 outputFormat.SetCicmMetadata(cicmMetadata);
+
                 if(!ret)
                     AaruConsole.WriteLine("Error {0} writing CICM XML metadata to output image.",
-                                         outputFormat.ErrorMessage);
+                                          outputFormat.ErrorMessage);
             }
 
             Application.Instance.Invoke(() =>
@@ -882,8 +965,8 @@ namespace Aaru.Gui.Forms
             {
                 Application.Instance.Invoke(() =>
                 {
-                    MessageBox
-                       .Show($"Error {outputFormat.ErrorMessage} closing output image... Contents are not correct.",
+                    MessageBox.
+                        Show($"Error {outputFormat.ErrorMessage} closing output image... Contents are not correct.",
                              MessageBoxType.Error);
                 });
 
@@ -904,10 +987,7 @@ namespace Aaru.Gui.Forms
             Statistics.AddCommand("convert-image");
         }
 
-        protected void OnBtnClose(object sender, EventArgs e)
-        {
-            Close();
-        }
+        protected void OnBtnClose(object sender, EventArgs e) => Close();
 
         protected void OnBtnStop(object sender, EventArgs e)
         {
@@ -923,6 +1003,7 @@ namespace Aaru.Gui.Forms
             {
                 grpOptions.Visible     = false;
                 btnDestination.Enabled = false;
+
                 return;
             }
 
@@ -932,101 +1013,115 @@ namespace Aaru.Gui.Forms
             {
                 grpOptions.Content = null;
                 grpOptions.Visible = false;
+
                 return;
             }
 
             chkForce.Visible = false;
+
             foreach(MediaTagType mediaTag in inputFormat.Info.ReadableMediaTags)
             {
-                if(plugin.SupportedMediaTags.Contains(mediaTag)) continue;
+                if(plugin.SupportedMediaTags.Contains(mediaTag))
+                    continue;
 
                 chkForce.Visible = true;
                 chkForce.Checked = true;
+
                 break;
             }
 
             foreach(SectorTagType sectorTag in inputFormat.Info.ReadableSectorTags)
             {
-                if(plugin.SupportedSectorTags.Contains(sectorTag)) continue;
+                if(plugin.SupportedSectorTags.Contains(sectorTag))
+                    continue;
 
                 chkForce.Visible = true;
                 chkForce.Checked = true;
+
                 break;
             }
 
             grpOptions.Visible = true;
 
-            StackLayout stkImageOptions = new StackLayout {Orientation = Orientation.Vertical};
+            var stkImageOptions = new StackLayout
+            {
+                Orientation = Orientation.Vertical
+            };
 
             foreach((string name, Type type, string description, object @default) option in plugin.SupportedOptions)
                 switch(option.type.ToString())
                 {
                     case "System.Boolean":
-                        CheckBox optBoolean = new CheckBox();
+                        var optBoolean = new CheckBox();
                         optBoolean.ID      = "opt" + option.name;
                         optBoolean.Text    = option.description;
                         optBoolean.Checked = (bool)option.@default;
                         stkImageOptions.Items.Add(optBoolean);
+
                         break;
                     case "System.SByte":
                     case "System.Int16":
                     case "System.Int32":
                     case "System.Int64":
-                        StackLayout stkNumber = new StackLayout();
+                        var stkNumber = new StackLayout();
                         stkNumber.Orientation = Orientation.Horizontal;
-                        NumericStepper optNumber = new NumericStepper();
+                        var optNumber = new NumericStepper();
                         optNumber.ID    = "opt" + option.name;
                         optNumber.Value = Convert.ToDouble(option.@default);
                         stkNumber.Items.Add(optNumber);
-                        Label lblNumber = new Label();
+                        var lblNumber = new Label();
                         lblNumber.Text = option.description;
                         stkNumber.Items.Add(lblNumber);
                         stkImageOptions.Items.Add(stkNumber);
+
                         break;
                     case "System.Byte":
                     case "System.UInt16":
                     case "System.UInt32":
                     case "System.UInt64":
-                        StackLayout stkUnsigned = new StackLayout();
+                        var stkUnsigned = new StackLayout();
                         stkUnsigned.Orientation = Orientation.Horizontal;
-                        NumericStepper optUnsigned = new NumericStepper();
+                        var optUnsigned = new NumericStepper();
                         optUnsigned.ID       = "opt" + option.name;
                         optUnsigned.MinValue = 0;
                         optUnsigned.Value    = Convert.ToDouble(option.@default);
                         stkUnsigned.Items.Add(optUnsigned);
-                        Label lblUnsigned = new Label();
+                        var lblUnsigned = new Label();
                         lblUnsigned.Text = option.description;
                         stkUnsigned.Items.Add(lblUnsigned);
                         stkImageOptions.Items.Add(stkUnsigned);
+
                         break;
                     case "System.Single":
                     case "System.Double":
-                        StackLayout stkFloat = new StackLayout();
+                        var stkFloat = new StackLayout();
                         stkFloat.Orientation = Orientation.Horizontal;
-                        NumericStepper optFloat = new NumericStepper();
+                        var optFloat = new NumericStepper();
                         optFloat.ID            = "opt" + option.name;
                         optFloat.DecimalPlaces = 2;
                         optFloat.Value         = Convert.ToDouble(option.@default);
                         stkFloat.Items.Add(optFloat);
-                        Label lblFloat = new Label();
+                        var lblFloat = new Label();
                         lblFloat.Text = option.description;
                         stkFloat.Items.Add(lblFloat);
                         stkImageOptions.Items.Add(stkFloat);
+
                         break;
                     case "System.Guid":
                         // TODO
                         break;
                     case "System.String":
-                        StackLayout stkString = new StackLayout();
+                        var stkString = new StackLayout();
                         stkString.Orientation = Orientation.Horizontal;
-                        Label lblString = new Label();
+                        var lblString = new Label();
                         lblString.Text = option.description;
                         stkString.Items.Add(lblString);
-                        TextBox optString = new TextBox();
+                        var optString = new TextBox();
                         optString.ID   = "opt" + option.name;
                         optString.Text = (string)option.@default;
                         stkString.Items.Add(optString);
                         stkImageOptions.Items.Add(stkString);
+
                         break;
                 }
 
@@ -1035,9 +1130,14 @@ namespace Aaru.Gui.Forms
 
         void OnBtnDestinationClick(object sender, EventArgs e)
         {
-            if(!(cmbFormat.SelectedValue is IWritableImage plugin)) return;
+            if(!(cmbFormat.SelectedValue is IWritableImage plugin))
+                return;
+
+            var dlgDestination = new SaveFileDialog
+            {
+                Title = "Choose destination file"
+            };
 
-            SaveFileDialog dlgDestination = new SaveFileDialog {Title = "Choose destination file"};
             dlgDestination.Filters.Add(new FileFilter(plugin.Name, plugin.KnownExtensions.ToArray()));
 
             DialogResult result = dlgDestination.ShowDialog(this);
@@ -1045,6 +1145,7 @@ namespace Aaru.Gui.Forms
             if(result != DialogResult.Ok)
             {
                 txtDestination.Text = "";
+
                 return;
             }
 
@@ -1054,75 +1155,40 @@ namespace Aaru.Gui.Forms
             txtDestination.Text = dlgDestination.FileName;
         }
 
-        void OnBtnCreator(object sender, EventArgs e)
-        {
-            txtCreator.Text = inputFormat.Info.Creator;
-        }
+        void OnBtnCreator(object sender, EventArgs e) => txtCreator.Text = inputFormat.Info.Creator;
 
-        void OnBtnMediaTitle(object sender, EventArgs e)
-        {
-            txtMediaTitle.Text = inputFormat.Info.MediaTitle;
-        }
+        void OnBtnMediaTitle(object sender, EventArgs e) => txtMediaTitle.Text = inputFormat.Info.MediaTitle;
 
-        void OnBtnComments(object sender, EventArgs e)
-        {
-            txtComments.Text = inputFormat.Info.Comments;
-        }
+        void OnBtnComments(object sender, EventArgs e) => txtComments.Text = inputFormat.Info.Comments;
 
-        void OnBtnMediaManufacturer(object sender, EventArgs e)
-        {
+        void OnBtnMediaManufacturer(object sender, EventArgs e) =>
             txtMediaManufacturer.Text = inputFormat.Info.MediaManufacturer;
-        }
 
-        void OnBtnMediaModel(object sender, EventArgs e)
-        {
-            txtMediaModel.Text = inputFormat.Info.MediaModel;
-        }
+        void OnBtnMediaModel(object sender, EventArgs e) => txtMediaModel.Text = inputFormat.Info.MediaModel;
 
-        void OnBtnMediaSerialNumber(object sender, EventArgs e)
-        {
+        void OnBtnMediaSerialNumber(object sender, EventArgs e) =>
             txtMediaSerialNumber.Text = inputFormat.Info.MediaSerialNumber;
-        }
 
-        void OnBtnMediaBarcode(object sender, EventArgs e)
-        {
-            txtMediaBarcode.Text = inputFormat.Info.MediaBarcode;
-        }
+        void OnBtnMediaBarcode(object sender, EventArgs e) => txtMediaBarcode.Text = inputFormat.Info.MediaBarcode;
 
-        void OnBtnMediaPartNumber(object sender, EventArgs e)
-        {
+        void OnBtnMediaPartNumber(object sender, EventArgs e) =>
             txtMediaPartNumber.Text = inputFormat.Info.MediaPartNumber;
-        }
 
-        void OnBtnMediaSequence(object sender, EventArgs e)
-        {
-            numMediaSequence.Value = inputFormat.Info.MediaSequence;
-        }
+        void OnBtnMediaSequence(object sender, EventArgs e) => numMediaSequence.Value = inputFormat.Info.MediaSequence;
 
-        void OnBtnLastMediaSequence(object sender, EventArgs e)
-        {
+        void OnBtnLastMediaSequence(object sender, EventArgs e) =>
             numLastMediaSequence.Value = inputFormat.Info.LastMediaSequence;
-        }
 
-        void OnBtnDriveManufacturer(object sender, EventArgs e)
-        {
+        void OnBtnDriveManufacturer(object sender, EventArgs e) =>
             txtDriveManufacturer.Text = inputFormat.Info.DriveManufacturer;
-        }
 
-        void OnBtnDriveModel(object sender, EventArgs e)
-        {
-            txtDriveModel.Text = inputFormat.Info.DriveModel;
-        }
+        void OnBtnDriveModel(object sender, EventArgs e) => txtDriveModel.Text = inputFormat.Info.DriveModel;
 
-        void OnBtnDriveSerialNumber(object sender, EventArgs e)
-        {
+        void OnBtnDriveSerialNumber(object sender, EventArgs e) =>
             txtDriveSerialNumber.Text = inputFormat.Info.DriveSerialNumber;
-        }
 
-        void OnBtnDriveFirmwareRevision(object sender, EventArgs e)
-        {
+        void OnBtnDriveFirmwareRevision(object sender, EventArgs e) =>
             txtDriveFirmwareRevision.Text = inputFormat.Info.DriveFirmwareRevision;
-        }
 
         void OnBtnCicmXmlFromImageClick(object sender, EventArgs e)
         {
@@ -1134,23 +1200,32 @@ namespace Aaru.Gui.Forms
         {
             cicmMetadata    = null;
             txtCicmXml.Text = "";
-            OpenFileDialog dlgMetadata =
-                new OpenFileDialog {Title = "Choose existing metadata sidecar", CheckFileExists = true};
+
+            var dlgMetadata = new OpenFileDialog
+            {
+                Title = "Choose existing metadata sidecar", CheckFileExists = true
+            };
+
             dlgMetadata.Filters.Add(new FileFilter("CICM XML metadata", ".xml"));
 
             DialogResult result = dlgMetadata.ShowDialog(this);
 
-            if(result != DialogResult.Ok) return;
+            if(result != DialogResult.Ok)
+                return;
+
+            var sidecarXs = new XmlSerializer(typeof(CICMMetadataType));
 
-            XmlSerializer sidecarXs = new XmlSerializer(typeof(CICMMetadataType));
             try
             {
-                StreamReader sr = new StreamReader(dlgMetadata.FileName);
+                var sr = new StreamReader(dlgMetadata.FileName);
                 cicmMetadata = (CICMMetadataType)sidecarXs.Deserialize(sr);
                 sr.Close();
                 txtCicmXml.Text = dlgMetadata.FileName;
             }
-            catch { MessageBox.Show("Incorrect metadata sidecar file...", MessageBoxType.Error); }
+            catch
+            {
+                MessageBox.Show("Incorrect metadata sidecar file...", MessageBoxType.Error);
+            }
         }
 
         void OnBtnResumeFileFromImageClick(object sender, EventArgs e)
@@ -1163,30 +1238,41 @@ namespace Aaru.Gui.Forms
         {
             dumpHardware       = null;
             txtResumeFile.Text = "";
-            OpenFileDialog dlgMetadata =
-                new OpenFileDialog {Title = "Choose existing resume file", CheckFileExists = true};
+
+            var dlgMetadata = new OpenFileDialog
+            {
+                Title = "Choose existing resume file", CheckFileExists = true
+            };
+
             dlgMetadata.Filters.Add(new FileFilter("CICM XML metadata", ".xml"));
 
             DialogResult result = dlgMetadata.ShowDialog(this);
 
-            if(result != DialogResult.Ok) return;
+            if(result != DialogResult.Ok)
+                return;
+
+            var sidecarXs = new XmlSerializer(typeof(Resume));
 
-            XmlSerializer sidecarXs = new XmlSerializer(typeof(Resume));
             try
             {
-                StreamReader sr     = new StreamReader(dlgMetadata.FileName);
-                Resume       resume = (Resume)sidecarXs.Deserialize(sr);
+                var sr     = new StreamReader(dlgMetadata.FileName);
+                var resume = (Resume)sidecarXs.Deserialize(sr);
 
-                if(resume.Tries != null && !resume.Tries.Any())
+                if(resume.Tries != null &&
+                   !resume.Tries.Any())
                 {
                     dumpHardware       = resume.Tries;
                     txtResumeFile.Text = dlgMetadata.FileName;
                 }
-                else MessageBox.Show("Resume file does not contain dump hardware information...", MessageBoxType.Error);
+                else
+                    MessageBox.Show("Resume file does not contain dump hardware information...", MessageBoxType.Error);
 
                 sr.Close();
             }
-            catch { MessageBox.Show("Incorrect resume file...", MessageBoxType.Error); }
+            catch
+            {
+                MessageBox.Show("Incorrect resume file...", MessageBoxType.Error);
+            }
         }
 
         #region XAML IDs
diff --git a/Aaru.Gui/Forms/frmImageEntropy.xeto.cs b/Aaru.Gui/Forms/frmImageEntropy.xeto.cs
index 282c126d5..dc8f47102 100644
--- a/Aaru.Gui/Forms/frmImageEntropy.xeto.cs
+++ b/Aaru.Gui/Forms/frmImageEntropy.xeto.cs
@@ -42,18 +42,19 @@ namespace Aaru.Gui.Forms
 {
     public class frmImageEntropy : Form
     {
-        EntropyResults   entropy;
-        IMediaImage      inputFormat;
-        EntropyResults[] tracksEntropy;
+        readonly IMediaImage inputFormat;
+        EntropyResults       entropy;
+        EntropyResults[]     tracksEntropy;
 
         public frmImageEntropy(IMediaImage inputFormat)
         {
             this.inputFormat = inputFormat;
             XamlReader.Load(this);
 
-            IOpticalMediaImage inputOptical = inputFormat as IOpticalMediaImage;
+            var inputOptical = inputFormat as IOpticalMediaImage;
 
-            if(inputOptical?.Tracks != null && inputOptical?.Tracks.Count > 0)
+            if(inputOptical?.Tracks       != null &&
+               inputOptical?.Tracks.Count > 0)
             {
                 chkSeparatedTracks.Visible = true;
                 chkWholeDisc.Visible       = true;
@@ -67,7 +68,7 @@ namespace Aaru.Gui.Forms
 
         protected void OnBtnStart(object sender, EventArgs e)
         {
-            Entropy entropyCalculator = new Entropy(false, false, inputFormat);
+            var entropyCalculator = new Entropy(false, false, inputFormat);
             entropyCalculator.InitProgressEvent    += InitProgress;
             entropyCalculator.InitProgress2Event   += InitProgress2;
             entropyCalculator.UpdateProgressEvent  += UpdateProgress;
@@ -82,23 +83,26 @@ namespace Aaru.Gui.Forms
             btnStop.Visible                        =  false;
             stkProgress.Visible                    =  true;
 
-            Thread thread = new Thread(() =>
+            var thread = new Thread(() =>
             {
                 if(chkSeparatedTracks.Checked == true)
                 {
                     tracksEntropy = entropyCalculator.CalculateTracksEntropy(chkDuplicatedSectors.Checked == true);
+
                     foreach(EntropyResults trackEntropy in tracksEntropy)
                     {
                         AaruConsole.WriteLine("Entropy for track {0} is {1:F4}.", trackEntropy.Track,
-                                             trackEntropy.Entropy);
+                                              trackEntropy.Entropy);
+
                         if(trackEntropy.UniqueSectors != null)
                             AaruConsole.WriteLine("Track {0} has {1} unique sectors ({2:P3})", trackEntropy.Track,
-                                                 trackEntropy.UniqueSectors,
-                                                 (double)trackEntropy.UniqueSectors / (double)trackEntropy.Sectors);
+                                                  trackEntropy.UniqueSectors,
+                                                  (double)trackEntropy.UniqueSectors / (double)trackEntropy.Sectors);
                     }
                 }
 
-                if(chkWholeDisc.Checked != true) return;
+                if(chkWholeDisc.Checked != true)
+                    return;
 
                 entropy = entropyCalculator.CalculateMediaEntropy(chkDuplicatedSectors.Checked == true);
 
@@ -119,10 +123,18 @@ namespace Aaru.Gui.Forms
 
             if(chkSeparatedTracks.Checked == true)
             {
-                TreeGridItemCollection entropyList = new TreeGridItemCollection();
+                var entropyList = new TreeGridItemCollection();
+
+                treeTrackEntropy.Columns.Add(new GridColumn
+                {
+                    HeaderText = "Track", DataCell = new TextBoxCell(0)
+                });
+
+                treeTrackEntropy.Columns.Add(new GridColumn
+                {
+                    HeaderText = "Entropy", DataCell = new TextBoxCell(1)
+                });
 
-                treeTrackEntropy.Columns.Add(new GridColumn {HeaderText = "Track", DataCell   = new TextBoxCell(0)});
-                treeTrackEntropy.Columns.Add(new GridColumn {HeaderText = "Entropy", DataCell = new TextBoxCell(1)});
                 if(chkDuplicatedSectors.Checked == true)
                     treeTrackEntropy.Columns.Add(new GridColumn
                     {
@@ -146,60 +158,40 @@ namespace Aaru.Gui.Forms
                 grpTrackEntropy.Visible = true;
             }
 
-            if(chkWholeDisc.Checked != true) return;
+            if(chkWholeDisc.Checked != true)
+                return;
 
             lblMediaEntropy.Text    = $"Entropy for disk is {entropy.Entropy:F4}.";
             lblMediaEntropy.Visible = true;
 
-            if(entropy.UniqueSectors == null) return;
+            if(entropy.UniqueSectors == null)
+                return;
 
             lblMediaUniqueSectors.Text =
                 $"Disk has {entropy.UniqueSectors} unique sectors ({(double)entropy.UniqueSectors / (double)entropy.Sectors:P3})";
+
             lblMediaUniqueSectors.Visible = true;
         }
 
-        protected void OnBtnClose(object sender, EventArgs e)
-        {
-            Close();
-        }
+        protected void OnBtnClose(object sender, EventArgs e) => Close();
 
-        protected void OnBtnStop(object sender, EventArgs e)
-        {
-            throw new NotImplementedException();
-        }
+        protected void OnBtnStop(object sender, EventArgs e) => throw new NotImplementedException();
 
-        void InitProgress()
-        {
-            stkProgress1.Visible = true;
-        }
+        void InitProgress() => stkProgress1.Visible = true;
 
-        void EndProgress()
-        {
-            stkProgress1.Visible = false;
-        }
+        void EndProgress() => stkProgress1.Visible = false;
 
-        void InitProgress2()
-        {
-            stkProgress2.Visible = true;
-        }
+        void InitProgress2() => stkProgress2.Visible = true;
 
-        void EndProgress2()
-        {
-            stkProgress2.Visible = false;
-        }
+        void EndProgress2() => stkProgress2.Visible = false;
 
-        void UpdateProgress(string text, long current, long maximum)
-        {
+        void UpdateProgress(string text, long current, long maximum) =>
             UpdateProgress(text, current, maximum, lblProgress, prgProgress);
-        }
 
-        void UpdateProgress2(string text, long current, long maximum)
-        {
+        void UpdateProgress2(string text, long current, long maximum) =>
             UpdateProgress(text, current, maximum, lblProgress2, prgProgress2);
-        }
 
-        void UpdateProgress(string text, long current, long maximum, Label label, ProgressBar progressBar)
-        {
+        void UpdateProgress(string text, long current, long maximum, Label label, ProgressBar progressBar) =>
             Application.Instance.Invoke(() =>
             {
                 label.Text = text;
@@ -207,12 +199,15 @@ namespace Aaru.Gui.Forms
                 if(maximum == 0)
                 {
                     progressBar.Indeterminate = true;
+
                     return;
                 }
 
-                if(progressBar.Indeterminate) progressBar.Indeterminate = false;
+                if(progressBar.Indeterminate)
+                    progressBar.Indeterminate = false;
 
-                if(maximum > int.MaxValue || current > int.MaxValue)
+                if(maximum > int.MaxValue ||
+                   current > int.MaxValue)
                 {
                     progressBar.MaxValue = (int)(maximum / int.MaxValue);
                     progressBar.Value    = (int)(current / int.MaxValue);
@@ -223,7 +218,6 @@ namespace Aaru.Gui.Forms
                     progressBar.Value    = (int)current;
                 }
             });
-        }
 
         #region XAML IDs
         StackLayout  stkOptions;
diff --git a/Aaru.Gui/Forms/frmImageSidecar.xeto.cs b/Aaru.Gui/Forms/frmImageSidecar.xeto.cs
index b2abe9021..8df78baca 100644
--- a/Aaru.Gui/Forms/frmImageSidecar.xeto.cs
+++ b/Aaru.Gui/Forms/frmImageSidecar.xeto.cs
@@ -34,10 +34,10 @@ using System;
 using System.IO;
 using System.Threading;
 using System.Xml.Serialization;
-using Claunia.Encoding;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
 using Aaru.Core;
+using Claunia.Encoding;
 using Eto.Forms;
 using Eto.Serialization.Xaml;
 using Schemas;
@@ -65,10 +65,7 @@ namespace Aaru.Gui.Forms
                                                Path.GetFileNameWithoutExtension(imageSource) + ".cicm.xml");
         }
 
-        protected void OnBtnStart(object sender, EventArgs e)
-        {
-            new Thread(DoWork).Start();
-        }
+        protected void OnBtnStart(object sender, EventArgs e) => new Thread(DoWork).Start();
 
         void DoWork()
         {
@@ -96,9 +93,9 @@ namespace Aaru.Gui.Forms
 
             AaruConsole.WriteLine("Writing metadata sidecar");
 
-            FileStream xmlFs = new FileStream(txtDestination.Text, FileMode.Create);
+            var xmlFs = new FileStream(txtDestination.Text, FileMode.Create);
 
-            XmlSerializer xmlSer = new XmlSerializer(typeof(CICMMetadataType));
+            var xmlSer = new XmlSerializer(typeof(CICMMetadataType));
             xmlSer.Serialize(xmlFs, sidecar);
             xmlFs.Close();
 
@@ -113,75 +110,68 @@ namespace Aaru.Gui.Forms
             Statistics.AddCommand("create-sidecar");
         }
 
-        void EndProgress2()
+        void EndProgress2() => Application.Instance.Invoke(() =>
         {
-            Application.Instance.Invoke(() => { stkProgress2.Visible = false; });
-        }
+            stkProgress2.Visible = false;
+        });
 
-        void UpdateProgress2(string text, long current, long maximum)
+        void UpdateProgress2(string text, long current, long maximum) => Application.Instance.Invoke(() =>
         {
-            Application.Instance.Invoke(() =>
+            lblProgress2.Text          = text;
+            prgProgress2.Indeterminate = false;
+            prgProgress2.MinValue      = 0;
+
+            if(maximum > int.MaxValue)
             {
-                lblProgress2.Text          = text;
-                prgProgress2.Indeterminate = false;
-                prgProgress2.MinValue      = 0;
-                if(maximum > int.MaxValue)
-                {
-                    prgProgress2.MaxValue = (int)(maximum / int.MaxValue);
-                    prgProgress2.Value    = (int)(current / int.MaxValue);
-                }
-                else
-                {
-                    prgProgress2.MaxValue = (int)maximum;
-                    prgProgress2.Value    = (int)current;
-                }
-            });
-        }
-
-        void InitProgress2()
-        {
-            Application.Instance.Invoke(() => { stkProgress2.Visible = true; });
-        }
-
-        void EndProgress()
-        {
-            Application.Instance.Invoke(() => { stkProgress1.Visible = false; });
-        }
-
-        void UpdateProgress(string text, long current, long maximum)
-        {
-            Application.Instance.Invoke(() =>
+                prgProgress2.MaxValue = (int)(maximum / int.MaxValue);
+                prgProgress2.Value    = (int)(current / int.MaxValue);
+            }
+            else
             {
-                lblProgress.Text          = text;
-                prgProgress.Indeterminate = false;
-                prgProgress.MinValue      = 0;
-                if(maximum > int.MaxValue)
-                {
-                    prgProgress.MaxValue = (int)(maximum / int.MaxValue);
-                    prgProgress.Value    = (int)(current / int.MaxValue);
-                }
-                else
-                {
-                    prgProgress.MaxValue = (int)maximum;
-                    prgProgress.Value    = (int)current;
-                }
-            });
-        }
+                prgProgress2.MaxValue = (int)maximum;
+                prgProgress2.Value    = (int)current;
+            }
+        });
 
-        void InitProgress()
+        void InitProgress2() => Application.Instance.Invoke(() =>
         {
-            Application.Instance.Invoke(() => { stkProgress1.Visible = true; });
-        }
+            stkProgress2.Visible = true;
+        });
 
-        void UpdateStatus(string text)
+        void EndProgress() => Application.Instance.Invoke(() =>
         {
-            Application.Instance.Invoke(() => { lblStatus.Text = text; });
-        }
+            stkProgress1.Visible = false;
+        });
 
-        protected void OnBtnClose(object sender, EventArgs e)
+        void UpdateProgress(string text, long current, long maximum) => Application.Instance.Invoke(() =>
         {
-            Close();
-        }
+            lblProgress.Text          = text;
+            prgProgress.Indeterminate = false;
+            prgProgress.MinValue      = 0;
+
+            if(maximum > int.MaxValue)
+            {
+                prgProgress.MaxValue = (int)(maximum / int.MaxValue);
+                prgProgress.Value    = (int)(current / int.MaxValue);
+            }
+            else
+            {
+                prgProgress.MaxValue = (int)maximum;
+                prgProgress.Value    = (int)current;
+            }
+        });
+
+        void InitProgress() => Application.Instance.Invoke(() =>
+        {
+            stkProgress1.Visible = true;
+        });
+
+        void UpdateStatus(string text) => Application.Instance.Invoke(() =>
+        {
+            lblStatus.Text = text;
+        });
+
+        protected void OnBtnClose(object sender, EventArgs e) => Close();
 
         protected void OnBtnStop(object sender, EventArgs e)
         {
@@ -192,7 +182,11 @@ namespace Aaru.Gui.Forms
 
         void OnBtnDestinationClick(object sender, EventArgs e)
         {
-            SaveFileDialog dlgDestination = new SaveFileDialog {Title = "Choose destination file"};
+            var dlgDestination = new SaveFileDialog
+            {
+                Title = "Choose destination file"
+            };
+
             dlgDestination.Filters.Add(new FileFilter("CICM XML metadata", "*.xml"));
 
             DialogResult result = dlgDestination.ShowDialog(this);
@@ -200,10 +194,12 @@ namespace Aaru.Gui.Forms
             if(result != DialogResult.Ok)
             {
                 txtDestination.Text = "";
+
                 return;
             }
 
-            if(string.IsNullOrEmpty(Path.GetExtension(dlgDestination.FileName))) dlgDestination.FileName += ".xml";
+            if(string.IsNullOrEmpty(Path.GetExtension(dlgDestination.FileName)))
+                dlgDestination.FileName += ".xml";
 
             txtDestination.Text = dlgDestination.FileName;
         }
diff --git a/Aaru.Gui/Forms/frmImageVerify.xeto.cs b/Aaru.Gui/Forms/frmImageVerify.xeto.cs
index 351924b08..4f1f358b6 100644
--- a/Aaru.Gui/Forms/frmImageVerify.xeto.cs
+++ b/Aaru.Gui/Forms/frmImageVerify.xeto.cs
@@ -44,8 +44,8 @@ namespace Aaru.Gui.Forms
 {
     public class frmImageVerify : Form
     {
-        bool        cancel;
-        IMediaImage inputFormat;
+        readonly IMediaImage inputFormat;
+        bool                 cancel;
 
         public frmImageVerify(IMediaImage inputFormat)
         {
@@ -81,11 +81,17 @@ namespace Aaru.Gui.Forms
             long  unknownSectors = 0;
             bool  formatHasTracks;
 
-            IOpticalMediaImage      inputOptical           = inputFormat as IOpticalMediaImage;
-            IVerifiableSectorsImage verifiableSectorsImage = inputFormat as IVerifiableSectorsImage;
+            var inputOptical           = inputFormat as IOpticalMediaImage;
+            var verifiableSectorsImage = inputFormat as IVerifiableSectorsImage;
 
-            try { formatHasTracks = inputOptical?.Tracks?.Count > 0; }
-            catch { formatHasTracks = false; }
+            try
+            {
+                formatHasTracks = inputOptical?.Tracks?.Count > 0;
+            }
+            catch
+            {
+                formatHasTracks = false;
+            }
 
             // Setup progress bars
             Application.Instance.Invoke(() =>
@@ -93,9 +99,12 @@ namespace Aaru.Gui.Forms
                 stkProgress.Visible  = true;
                 prgProgress.MaxValue = 0;
 
-                if(chkVerifyImage.Checked == true || chkVerifySectors.Checked == true) prgProgress.MaxValue = 1;
+                if(chkVerifyImage.Checked   == true ||
+                   chkVerifySectors.Checked == true)
+                    prgProgress.MaxValue = 1;
 
-                if(formatHasTracks && inputOptical != null) prgProgress.MaxValue += inputOptical.Tracks.Count;
+                if(formatHasTracks && inputOptical != null)
+                    prgProgress.MaxValue += inputOptical.Tracks.Count;
                 else
                 {
                     if(chkVerifySectors.Checked == true)
@@ -127,8 +136,11 @@ namespace Aaru.Gui.Forms
                     Application.Instance.Invoke(() =>
                     {
                         lblProgress.Text = "Checking media image...";
-                        if(chkVerifySectors.Checked == true) prgProgress.Value = 1;
-                        else prgProgress.Indeterminate                         = true;
+
+                        if(chkVerifySectors.Checked == true)
+                            prgProgress.Value = 1;
+                        else
+                            prgProgress.Indeterminate = true;
 
                         prgProgress2.Indeterminate = true;
                     });
@@ -142,23 +154,28 @@ namespace Aaru.Gui.Forms
                     Application.Instance.Invoke(() =>
                     {
                         lblImageResult.Visible = true;
+
                         switch(discCheckStatus)
                         {
                             case true:
                                 lblImageResult.Text = "Disc image checksums are correct";
+
                                 break;
                             case false:
                                 lblImageResult.Text = "Disc image checksums are incorrect";
+
                                 break;
                             case null:
                                 lblImageResult.Text = "Disc image does not contain checksums";
+
                                 break;
                         }
                     });
 
                     correctDisc = discCheckStatus;
+
                     AaruConsole.VerboseWriteLine("Checking disc image checksums took {0} seconds",
-                                                checkTime.TotalSeconds);
+                                                 checkTime.TotalSeconds);
                 }
             }
 
@@ -183,12 +200,14 @@ namespace Aaru.Gui.Forms
                     ulong       currentSectorAll = 0;
 
                     startCheck = DateTime.UtcNow;
+
                     foreach(Track currentTrack in inputOptical.Tracks)
                     {
                         Application.Instance.Invoke(() =>
                         {
                             lblProgress.Text =
                                 $"Verifying track {currentTrack.TrackSequence} of {inputOptical?.Tracks.Count}";
+
                             prgProgress.Value++;
                         });
 
@@ -205,13 +224,16 @@ namespace Aaru.Gui.Forms
                                     btnStart.Visible = false;
                                     btnStop.Visible  = false;
                                 });
+
                                 return;
                             }
 
                             ulong all = currentSectorAll;
+
                             Application.Instance.Invoke(() =>
                             {
                                 prgProgress2.Value = (int)(all / 512);
+
                                 lblProgress2.Text =
                                     $"Checking sector {all} of {inputFormat.Info.Sectors}, on track {currentTrack.TrackSequence}";
                             });
@@ -254,6 +276,7 @@ namespace Aaru.Gui.Forms
                     ulong currentSector    = 0;
 
                     startCheck = DateTime.UtcNow;
+
                     while(remainingSectors > 0)
                     {
                         if(cancel)
@@ -264,10 +287,12 @@ namespace Aaru.Gui.Forms
                                 btnStart.Visible = false;
                                 btnStop.Visible  = false;
                             });
+
                             return;
                         }
 
                         ulong sector = currentSector;
+
                         Application.Instance.Invoke(() =>
                         {
                             prgProgress2.Value = (int)(sector / 512);
@@ -321,7 +346,7 @@ namespace Aaru.Gui.Forms
                             grpSectorErrors.Text    = "LBAs with error:";
                             grpSectorErrors.Visible = true;
 
-                            TreeGridItemCollection errorList = new TreeGridItemCollection();
+                            var errorList = new TreeGridItemCollection();
 
                             treeSectorErrors.Columns.Add(new GridColumn
                             {
@@ -332,7 +357,14 @@ namespace Aaru.Gui.Forms
                             treeSectorErrors.ShowHeader             = false;
                             treeSectorErrors.DataStore              = errorList;
 
-                            foreach(ulong t in failingLbas) errorList.Add(new TreeGridItem {Values = new object[] {t}});
+                            foreach(ulong t in failingLbas)
+                                errorList.Add(new TreeGridItem
+                                {
+                                    Values = new object[]
+                                    {
+                                        t
+                                    }
+                                });
                         }
                     }
 
@@ -348,7 +380,7 @@ namespace Aaru.Gui.Forms
                             grpSectorsUnknowns.Text    = "LBAs with error:";
                             grpSectorsUnknowns.Visible = true;
 
-                            TreeGridItemCollection unknownList = new TreeGridItemCollection();
+                            var unknownList = new TreeGridItemCollection();
 
                             treeSectorsUnknowns.Columns.Add(new GridColumn
                             {
@@ -360,7 +392,13 @@ namespace Aaru.Gui.Forms
                             treeSectorsUnknowns.DataStore              = unknownList;
 
                             foreach(ulong t in unknownLbas)
-                                unknownList.Add(new TreeGridItem {Values = new object[] {t}});
+                                unknownList.Add(new TreeGridItem
+                                {
+                                    Values = new object[]
+                                    {
+                                        t
+                                    }
+                                });
                         }
                     }
 
@@ -368,6 +406,7 @@ namespace Aaru.Gui.Forms
                     lblTotalSectors.Text        = $"Total sectors........... {inputFormat.Info.Sectors}";
                     lblTotalSectorErrors.Text   = $"Total errors............ {failingLbas.Count}";
                     lblTotalSectorUnknowns.Text = $"Total unknowns.......... {unknownLbas.Count}";
+
                     lblTotalSectorErrorsUnknowns.Text =
                         $"Total errors+unknowns... {failingLbas.Count + unknownLbas.Count}";
                 });
@@ -391,10 +430,7 @@ namespace Aaru.Gui.Forms
             });
         }
 
-        protected void OnBtnClose(object sender, EventArgs e)
-        {
-            Close();
-        }
+        protected void OnBtnClose(object sender, EventArgs e) => Close();
 
         protected void OnBtnStop(object sender, EventArgs e)
         {
diff --git a/Aaru.Gui/Forms/frmMain.xeto.cs b/Aaru.Gui/Forms/frmMain.xeto.cs
index b9fa23adb..17360c307 100644
--- a/Aaru.Gui/Forms/frmMain.xeto.cs
+++ b/Aaru.Gui/Forms/frmMain.xeto.cs
@@ -35,8 +35,6 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.IO;
 using System.Linq;
-using Aaru.Gui.Dialogs;
-using Aaru.Gui.Panels;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
@@ -46,8 +44,9 @@ using Aaru.Console;
 using Aaru.Core;
 using Aaru.Core.Media.Info;
 using Aaru.Database;
-using Aaru.Decoders.SCSI;
 using Aaru.Devices;
+using Aaru.Gui.Dialogs;
+using Aaru.Gui.Panels;
 using Aaru.Settings;
 using Eto.Drawing;
 using Eto.Forms;
@@ -107,16 +106,13 @@ namespace Aaru.Gui.Forms
                                GetResourceStream("Aaru.Gui.Assets.Icons.oxygen._32x32.inode-directory.png"));
 
             devicesIcon =
-                new Bitmap(ResourceHandler.
-                               GetResourceStream("Aaru.Gui.Assets.Icons.oxygen._32x32.computer.png"));
+                new Bitmap(ResourceHandler.GetResourceStream("Aaru.Gui.Assets.Icons.oxygen._32x32.computer.png"));
 
             hardDiskIcon =
-                new Bitmap(ResourceHandler.
-                               GetResourceStream("Aaru.Gui.Assets.Icons.oxygen._32x32.drive-harddisk.png"));
+                new Bitmap(ResourceHandler.GetResourceStream("Aaru.Gui.Assets.Icons.oxygen._32x32.drive-harddisk.png"));
 
             opticalIcon =
-                new Bitmap(ResourceHandler.
-                               GetResourceStream("Aaru.Gui.Assets.Icons.oxygen._32x32.drive-optical.png"));
+                new Bitmap(ResourceHandler.GetResourceStream("Aaru.Gui.Assets.Icons.oxygen._32x32.drive-optical.png"));
 
             usbIcon =
                 new Bitmap(ResourceHandler.
@@ -131,12 +127,10 @@ namespace Aaru.Gui.Forms
                                GetResourceStream("Aaru.Gui.Assets.Icons.oxygen._32x32.media-flash-sd-mmc.png"));
 
             tapeIcon =
-                new Bitmap(ResourceHandler.
-                               GetResourceStream("Aaru.Gui.Assets.Icons.oxygen._32x32.media-tape.png"));
+                new Bitmap(ResourceHandler.GetResourceStream("Aaru.Gui.Assets.Icons.oxygen._32x32.media-tape.png"));
 
             ejectIcon =
-                new Bitmap(ResourceHandler.
-                               GetResourceStream("Aaru.Gui.Assets.Icons.oxygen._32x32.media-eject.png"));
+                new Bitmap(ResourceHandler.GetResourceStream("Aaru.Gui.Assets.Icons.oxygen._32x32.media-eject.png"));
 
             imagesRoot = new TreeGridItem
             {
@@ -305,7 +299,7 @@ namespace Aaru.Gui.Forms
         {
             base.OnLoad(e);
 
-            if(Aaru.Settings.Settings.Current.GdprCompliance < DicSettings.GdprLevel)
+            if(Settings.Settings.Current.GdprCompliance < DicSettings.GdprLevel)
                 new dlgSettings(true).ShowModal(this);
         }
 
@@ -425,7 +419,7 @@ namespace Aaru.Gui.Forms
 
                                 AaruConsole.WriteLine("Identifying filesystem on partition");
 
-                                Aaru.Core.Filesystems.Identify(imageFormat, out idPlugins, partition);
+                                Core.Filesystems.Identify(imageFormat, out idPlugins, partition);
 
                                 if(idPlugins.Count == 0)
                                     AaruConsole.WriteLine("Filesystem not identified");
@@ -487,7 +481,7 @@ namespace Aaru.Gui.Forms
                             Size = imageFormat.Info.Sectors * imageFormat.Info.SectorSize
                         };
 
-                        Aaru.Core.Filesystems.Identify(imageFormat, out idPlugins, wholePart);
+                        Core.Filesystems.Identify(imageFormat, out idPlugins, wholePart);
 
                         if(idPlugins.Count == 0)
                             AaruConsole.WriteLine("Filesystem not identified");
@@ -608,8 +602,8 @@ namespace Aaru.Gui.Forms
                                                     ThenBy(d => d.Model))
                 {
                     AaruConsole.DebugWriteLine("Main window",
-                                              "Found supported device model {0} by manufacturer {1} on bus {2} and path {3}",
-                                              device.Model, device.Vendor, device.Bus, device.Path);
+                                               "Found supported device model {0} by manufacturer {1} on bus {2} and path {3}",
+                                               device.Model, device.Vendor, device.Bus, device.Path);
 
                     var devItem = new TreeGridItem
                     {
@@ -696,7 +690,7 @@ namespace Aaru.Gui.Forms
 
         protected void OnMenuStatistics(object sender, EventArgs e)
         {
-            var ctx = AaruContext.Create(Aaru.Settings.Settings.LocalDbPath);
+            var ctx = AaruContext.Create(Settings.Settings.LocalDbPath);
 
             if(!ctx.Commands.Any()     &&
                !ctx.Filesystems.Any()  &&
@@ -885,8 +879,7 @@ namespace Aaru.Gui.Forms
                     {
                         // TODO: SVG
                         Stream logo =
-                            ResourceHandler.
-                                GetResourceStream($"Aaru.Gui.Assets.Logos.Media.{scsiInfo.MediaType}.png");
+                            ResourceHandler.GetResourceStream($"Aaru.Gui.Assets.Logos.Media.{scsiInfo.MediaType}.png");
 
                         deviceItem.Children.Add(new TreeGridItem
                         {
diff --git a/Aaru.Gui/Forms/frmMediaScan.xeto.cs b/Aaru.Gui/Forms/frmMediaScan.xeto.cs
index c1e2667ea..df2efa66f 100644
--- a/Aaru.Gui/Forms/frmMediaScan.xeto.cs
+++ b/Aaru.Gui/Forms/frmMediaScan.xeto.cs
@@ -32,11 +32,11 @@
 
 using System;
 using System.Threading;
-using Aaru.Gui.Controls;
 using Aaru.Core;
 using Aaru.Core.Devices.Scanning;
 using Aaru.Core.Media.Info;
 using Aaru.Devices;
+using Aaru.Gui.Controls;
 using Eto.Drawing;
 using Eto.Forms;
 using Eto.Serialization.Xaml;
diff --git a/Aaru.Gui/Forms/frmPrintHex.xeto.cs b/Aaru.Gui/Forms/frmPrintHex.xeto.cs
index 2ecdabc09..f0031f5c2 100644
--- a/Aaru.Gui/Forms/frmPrintHex.xeto.cs
+++ b/Aaru.Gui/Forms/frmPrintHex.xeto.cs
@@ -41,8 +41,8 @@ namespace Aaru.Gui.Forms
     // TODO: Panel with string representation of contents
     public class frmPrintHex : Form
     {
-        const int   HEX_COLUMNS = 32;
-        IMediaImage inputFormat;
+        const    int         HEX_COLUMNS = 32;
+        readonly IMediaImage inputFormat;
 
         public frmPrintHex(IMediaImage inputFormat)
         {
@@ -59,20 +59,20 @@ namespace Aaru.Gui.Forms
                 inputFormat.ReadSectorLong(0);
                 chkLongSector.Checked = true;
             }
-            catch { chkLongSector.Visible = false; }
+            catch
+            {
+                chkLongSector.Visible = false;
+            }
 
             lblSectors.Text = $"of {inputFormat.Info.Sectors}";
             nmuSector.Value = 0;
             OnNmuSectorValueChanged(nmuSector, e);
         }
 
-        void OnNmuSectorValueChanged(object sender, EventArgs e)
-        {
-            txtPrintHex.Text =
-                PrintHex
-                   .ByteArrayToHexArrayString(chkLongSector.Checked == true ? inputFormat.ReadSectorLong((ulong)nmuSector.Value) : inputFormat.ReadSector((ulong)nmuSector.Value),
-                                              HEX_COLUMNS);
-        }
+        void OnNmuSectorValueChanged(object sender, EventArgs e) => txtPrintHex.Text =
+                                                                        PrintHex.
+                                                                            ByteArrayToHexArrayString(chkLongSector.Checked == true ? inputFormat.ReadSectorLong((ulong)nmuSector.Value) : inputFormat.ReadSector((ulong)nmuSector.Value),
+                                                                                                      HEX_COLUMNS);
 
         #region XAML IDs
         Label          lblSector;
diff --git a/Aaru.Gui/Panels/pnlDeviceInfo.xeto.cs b/Aaru.Gui/Panels/pnlDeviceInfo.xeto.cs
index b8918048f..d901b348d 100644
--- a/Aaru.Gui/Panels/pnlDeviceInfo.xeto.cs
+++ b/Aaru.Gui/Panels/pnlDeviceInfo.xeto.cs
@@ -32,9 +32,9 @@
 
 using System;
 using System.IO;
-using Aaru.Gui.Tabs;
 using Aaru.Decoders.SCSI.SSC;
 using Aaru.Devices;
+using Aaru.Gui.Tabs;
 using Eto.Forms;
 using Eto.Serialization.Xaml;
 using DeviceInfo = Aaru.Core.Devices.Info.DeviceInfo;
@@ -155,8 +155,7 @@ namespace Aaru.Gui.Panels
                             {
                                 stkPlextorPoweRecSelected.Visible = true;
 
-                                txtPlextorPoweRecSelected.Text =
-                                    $"{devInfo.PlextorFeatures.PoweRecSelected} Kb/sec.";
+                                txtPlextorPoweRecSelected.Text = $"{devInfo.PlextorFeatures.PoweRecSelected} Kb/sec.";
                             }
 
                             if(devInfo.PlextorFeatures.PoweRecMax > 0)
diff --git a/Aaru.Gui/Panels/pnlFilesystem.xeto.cs b/Aaru.Gui/Panels/pnlFilesystem.xeto.cs
index 2af3e9667..1e53dc214 100644
--- a/Aaru.Gui/Panels/pnlFilesystem.xeto.cs
+++ b/Aaru.Gui/Panels/pnlFilesystem.xeto.cs
@@ -55,10 +55,13 @@ namespace Aaru.Gui.Panels
             lblModificationDate.Text       = $"Volume last modified on {xmlFsType.ModificationDate:F}";
             lblExpirationDate.Text         = $"Volume expired on {xmlFsType.ExpirationDate:F}";
             lblBackupDate.Text             = $"Volume last backed up on {xmlFsType.BackupDate:F}";
+
             lblClusters.Text =
                 $"Volume has {xmlFsType.Clusters} clusters of {xmlFsType.ClusterSize} bytes each (total of {xmlFsType.Clusters * xmlFsType.ClusterSize} bytes)";
+
             lblFreeClusters.Text =
                 $"Volume has {xmlFsType.FreeClusters} {xmlFsType.FreeClusters / xmlFsType.Clusters:P}";
+
             lblFiles.Text       = $"Volume contains {xmlFsType.Files} files";
             chkBootable.Checked = xmlFsType.Bootable;
             chkDirty.Checked    = xmlFsType.Dirty;
diff --git a/Aaru.Gui/Panels/pnlImageInfo.xeto.cs b/Aaru.Gui/Panels/pnlImageInfo.xeto.cs
index 49b25ac8c..a25b45362 100644
--- a/Aaru.Gui/Panels/pnlImageInfo.xeto.cs
+++ b/Aaru.Gui/Panels/pnlImageInfo.xeto.cs
@@ -34,9 +34,6 @@ using System;
 using System.IO;
 using System.Linq;
 using System.Text;
-using Aaru.Gui.Controls;
-using Aaru.Gui.Forms;
-using Aaru.Gui.Tabs;
 using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
@@ -45,11 +42,14 @@ using Aaru.Decoders.CD;
 using Aaru.Decoders.DVD;
 using Aaru.Decoders.SCSI;
 using Aaru.Decoders.Xbox;
+using Aaru.Gui.Controls;
+using Aaru.Gui.Forms;
+using Aaru.Gui.Tabs;
 using Eto.Drawing;
 using Eto.Forms;
 using Eto.Serialization.Xaml;
 using Schemas;
-using Inquiry = Aaru.Decoders.SCSI.Inquiry;
+using Inquiry = Aaru.CommonTypes.Structs.Devices.SCSI.Inquiry;
 using Session = Aaru.CommonTypes.Structs.Session;
 
 namespace Aaru.Gui.Panels
@@ -57,6 +57,8 @@ namespace Aaru.Gui.Panels
     public class pnlImageInfo : Panel
     {
         readonly IFilter     filter;
+        readonly IMediaImage imageFormat;
+        readonly string      imagePath;
         frmDecodeMediaTags   frmDecodeMediaTags;
         frmImageChecksum     frmImageChecksum;
         frmImageConvert      frmImageConvert;
@@ -64,8 +66,6 @@ namespace Aaru.Gui.Panels
         frmImageSidecar      frmImageSidecar;
         frmImageVerify       frmImageVerify;
         frmPrintHex          frmPrintHex;
-        readonly IMediaImage imageFormat;
-        readonly string      imagePath;
 
         public pnlImageInfo(string imagePath, IFilter filter, IMediaImage imageFormat)
         {
@@ -75,8 +75,8 @@ namespace Aaru.Gui.Panels
             XamlReader.Load(this);
 
             Stream logo =
-                ResourceHandler
-                   .GetResourceStream($"Aaru.Gui.Assets.Logos.Media.{imageFormat.Info.MediaType}.svg");
+                ResourceHandler.GetResourceStream($"Aaru.Gui.Assets.Logos.Media.{imageFormat.Info.MediaType}.svg");
+
             /*            if(logo != null)
                         {
                             svgMediaLogo.SvgStream = logo;
@@ -84,33 +84,39 @@ namespace Aaru.Gui.Panels
                         }
                         else
                         {*/
-            logo =
-                ResourceHandler
-                   .GetResourceStream($"Aaru.Gui.Assets.Logos.Media.{imageFormat.Info.MediaType}.png");
+            logo = ResourceHandler.GetResourceStream($"Aaru.Gui.Assets.Logos.Media.{imageFormat.Info.MediaType}.png");
+
             if(logo != null)
             {
                 imgMediaLogo.Image   = new Bitmap(logo);
                 imgMediaLogo.Visible = true;
             }
+
             //}
 
             lblImagePath.Text   = $"Path: {imagePath}";
             lblFilter.Text      = $"Filter: {filter.Name}";
             lblImageFormat.Text = $"Image format identified by {imageFormat.Name} ({imageFormat.Id}).";
+
             lblImageFormat.Text = !string.IsNullOrWhiteSpace(imageFormat.Info.Version)
                                       ? $"Format: {imageFormat.Format} version {imageFormat.Info.Version}"
                                       : $"Format: {imageFormat.Format}";
+
             lblImageSize.Text = $"Image without headers is {imageFormat.Info.ImageSize} bytes long";
+
             lblSectors.Text =
                 $"Contains a media of {imageFormat.Info.Sectors} sectors with a maximum sector size of {imageFormat.Info.SectorSize} bytes (if all sectors are of the same size this would be {imageFormat.Info.Sectors * imageFormat.Info.SectorSize} bytes)";
+
             lblMediaType.Text =
                 $"Contains a media of type {imageFormat.Info.MediaType} and XML type {imageFormat.Info.XmlMediaType}";
+
             lblHasPartitions.Text = $"{(imageFormat.Info.HasPartitions ? "Has" : "Doesn't have")} partitions";
             lblHasSessions.Text   = $"{(imageFormat.Info.HasSessions ? "Has" : "Doesn't have")} sessions";
 
             if(!string.IsNullOrWhiteSpace(imageFormat.Info.Application))
             {
                 lblApplication.Visible = true;
+
                 lblApplication.Text = !string.IsNullOrWhiteSpace(imageFormat.Info.ApplicationVersion)
                                           ? $"Was created with {imageFormat.Info.Application} version {imageFormat.Info.ApplicationVersion}"
                                           : $"Was created with {imageFormat.Info.Application}";
@@ -140,9 +146,11 @@ namespace Aaru.Gui.Panels
                 txtComments.Text    = imageFormat.Info.Comments;
             }
 
-            if(imageFormat.Info.MediaSequence != 0 && imageFormat.Info.LastMediaSequence != 0)
+            if(imageFormat.Info.MediaSequence     != 0 &&
+               imageFormat.Info.LastMediaSequence != 0)
             {
                 lblMediaSequence.Visible = true;
+
                 lblMediaSequence.Text =
                     $"Media is number {imageFormat.Info.MediaSequence} on a set of {imageFormat.Info.LastMediaSequence} medias";
             }
@@ -207,12 +215,14 @@ namespace Aaru.Gui.Panels
                 lblDriveFirmwareRevision.Text    = $"Drive firmware info: {imageFormat.Info.DriveFirmwareRevision}";
             }
 
-            if(imageFormat.Info.Cylinders       > 0                         && imageFormat.Info.Heads > 0 &&
+            if(imageFormat.Info.Cylinders       > 0                         &&
+               imageFormat.Info.Heads           > 0                         &&
                imageFormat.Info.SectorsPerTrack > 0                         &&
                imageFormat.Info.XmlMediaType    != XmlMediaType.OpticalDisc &&
                (!(imageFormat is ITapeImage tapeImage) || !tapeImage.IsTape))
             {
                 lblMediaGeometry.Visible = true;
+
                 lblMediaGeometry.Text =
                     $"Media geometry: {imageFormat.Info.Cylinders} cylinders, {imageFormat.Info.Heads} heads, {imageFormat.Info.SectorsPerTrack} sectors per track";
             }
@@ -222,45 +232,66 @@ namespace Aaru.Gui.Panels
                                    lblMediaModel.Visible        || lblMediaSerialNumber.Visible ||
                                    lblMediaBarcode.Visible      ||
                                    lblMediaPartNumber.Visible;
+
             grpDriveInfo.Visible = lblDriveManufacturer.Visible || lblDriveModel.Visible            ||
                                    lblDriveSerialNumber.Visible || lblDriveFirmwareRevision.Visible ||
                                    lblMediaGeometry.Visible;
 
-            if(imageFormat.Info.ReadableMediaTags != null && imageFormat.Info.ReadableMediaTags.Count > 0)
+            if(imageFormat.Info.ReadableMediaTags       != null &&
+               imageFormat.Info.ReadableMediaTags.Count > 0)
             {
-                TreeGridItemCollection mediaTagList = new TreeGridItemCollection();
+                var mediaTagList = new TreeGridItemCollection();
 
-                treeMediaTags.Columns.Add(new GridColumn {HeaderText = "Tag", DataCell = new TextBoxCell(0)});
+                treeMediaTags.Columns.Add(new GridColumn
+                {
+                    HeaderText = "Tag", DataCell = new TextBoxCell(0)
+                });
 
                 treeMediaTags.AllowMultipleSelection = false;
                 treeMediaTags.ShowHeader             = false;
                 treeMediaTags.DataStore              = mediaTagList;
 
                 foreach(MediaTagType tag in imageFormat.Info.ReadableMediaTags.OrderBy(t => t))
-                    mediaTagList.Add(new TreeGridItem {Values = new object[] {tag.ToString()}});
+                    mediaTagList.Add(new TreeGridItem
+                    {
+                        Values = new object[]
+                        {
+                            tag.ToString()
+                        }
+                    });
 
                 grpMediaTags.Visible = true;
             }
 
-            if(imageFormat.Info.ReadableSectorTags != null && imageFormat.Info.ReadableSectorTags.Count > 0)
+            if(imageFormat.Info.ReadableSectorTags       != null &&
+               imageFormat.Info.ReadableSectorTags.Count > 0)
             {
-                TreeGridItemCollection sectorTagList = new TreeGridItemCollection();
+                var sectorTagList = new TreeGridItemCollection();
 
-                treeSectorTags.Columns.Add(new GridColumn {HeaderText = "Tag", DataCell = new TextBoxCell(0)});
+                treeSectorTags.Columns.Add(new GridColumn
+                {
+                    HeaderText = "Tag", DataCell = new TextBoxCell(0)
+                });
 
                 treeSectorTags.AllowMultipleSelection = false;
                 treeSectorTags.ShowHeader             = false;
                 treeSectorTags.DataStore              = sectorTagList;
 
                 foreach(SectorTagType tag in imageFormat.Info.ReadableSectorTags.OrderBy(t => t))
-                    sectorTagList.Add(new TreeGridItem {Values = new object[] {tag.ToString()}});
+                    sectorTagList.Add(new TreeGridItem
+                    {
+                        Values = new object[]
+                        {
+                            tag.ToString()
+                        }
+                    });
 
                 grpSectorTags.Visible = true;
             }
 
             PeripheralDeviceTypes scsiDeviceType  = PeripheralDeviceTypes.DirectAccess;
             byte[]                scsiInquiryData = null;
-            CommonTypes.Structs.Devices.SCSI.Inquiry?  scsiInquiry     = null;
+            Inquiry?              scsiInquiry     = null;
             Modes.DecodedMode?    scsiMode        = null;
             byte[]                scsiModeSense6  = null;
             byte[]                scsiModeSense10 = null;
@@ -272,7 +303,7 @@ namespace Aaru.Gui.Panels
 
                 scsiDeviceType = (PeripheralDeviceTypes)(scsiInquiryData[0] & 0x1F);
 
-                scsiInquiry = CommonTypes.Structs.Devices.SCSI.Inquiry.Decode(scsiInquiryData);
+                scsiInquiry = Inquiry.Decode(scsiInquiryData);
             }
 
             if(imageFormat.Info.ReadableMediaTags != null &&
@@ -289,9 +320,11 @@ namespace Aaru.Gui.Panels
                 scsiMode        = Modes.DecodeMode10(scsiModeSense10, scsiDeviceType);
             }
 
-            tabScsiInfo tabScsiInfo = new tabScsiInfo();
+            var tabScsiInfo = new tabScsiInfo();
+
             tabScsiInfo.LoadData(scsiInquiryData, scsiInquiry, null, scsiMode, scsiDeviceType, scsiModeSense6,
                                  scsiModeSense10, null);
+
             tabInfos.Pages.Add(tabScsiInfo);
 
             byte[] ataIdentify   = null;
@@ -305,7 +338,7 @@ namespace Aaru.Gui.Panels
                imageFormat.Info.ReadableMediaTags.Contains(MediaTagType.ATAPI_IDENTIFY))
                 atapiIdentify = imageFormat.ReadDiskTag(MediaTagType.ATAPI_IDENTIFY);
 
-            tabAtaInfo tabAtaInfo = new tabAtaInfo();
+            var tabAtaInfo = new tabAtaInfo();
             tabAtaInfo.LoadData(ataIdentify, atapiIdentify, null);
             tabInfos.Pages.Add(tabAtaInfo);
 
@@ -328,6 +361,7 @@ namespace Aaru.Gui.Panels
                 if(toc.Length > 0)
                 {
                     ushort dataLen = Swapping.Swap(BitConverter.ToUInt16(toc, 0));
+
                     if(dataLen + 2 != toc.Length)
                     {
                         byte[] tmp = new byte[toc.Length + 2];
@@ -349,6 +383,7 @@ namespace Aaru.Gui.Panels
                 if(fullToc.Length > 0)
                 {
                     ushort dataLen = Swapping.Swap(BitConverter.ToUInt16(fullToc, 0));
+
                     if(dataLen + 2 != fullToc.Length)
                     {
                         byte[] tmp = new byte[fullToc.Length + 2];
@@ -370,6 +405,7 @@ namespace Aaru.Gui.Panels
                 if(pma.Length > 0)
                 {
                     ushort dataLen = Swapping.Swap(BitConverter.ToUInt16(pma, 0));
+
                     if(dataLen + 2 != pma.Length)
                     {
                         byte[] tmp = new byte[pma.Length + 2];
@@ -387,6 +423,7 @@ namespace Aaru.Gui.Panels
                 atip = imageFormat.ReadDiskTag(MediaTagType.CD_ATIP);
 
                 uint dataLen = Swapping.Swap(BitConverter.ToUInt32(atip, 0));
+
                 if(dataLen + 4 != atip.Length)
                 {
                     byte[] tmp = new byte[atip.Length + 4];
@@ -407,6 +444,7 @@ namespace Aaru.Gui.Panels
                 cdtext = imageFormat.ReadDiskTag(MediaTagType.CD_TEXT);
 
                 uint dataLen = Swapping.Swap(BitConverter.ToUInt32(cdtext, 0));
+
                 if(dataLen + 4 != cdtext.Length)
                 {
                     byte[] tmp = new byte[cdtext.Length + 4];
@@ -429,9 +467,11 @@ namespace Aaru.Gui.Panels
                 mediaCatalogueNumber = Encoding.UTF8.GetString(mcn);
             }
 
-            tabCompactDiscInfo tabCompactDiscInfo = new tabCompactDiscInfo();
+            var tabCompactDiscInfo = new tabCompactDiscInfo();
+
             tabCompactDiscInfo.LoadData(toc, atip, null, null, fullToc, pma, cdtext, decodedToc, decodedAtip, null,
                                         decodedFullToc, decodedCdText, null, mediaCatalogueNumber, null);
+
             tabInfos.Pages.Add(tabCompactDiscInfo);
 
             byte[]                         dvdPfi                    = null;
@@ -464,9 +504,11 @@ namespace Aaru.Gui.Panels
                imageFormat.Info.ReadableMediaTags.Contains(MediaTagType.DVD_BCA))
                 dvdBca = imageFormat.ReadDiskTag(MediaTagType.DVD_BCA);
 
-            tabDvdInfo tabDvdInfo = new tabDvdInfo();
+            var tabDvdInfo = new tabDvdInfo();
+
             tabDvdInfo.LoadData(imageFormat.Info.MediaType, dvdPfi, dvdDmi, dvdCmi, hddvdCopyrightInformation, dvdBca,
                                 null, decodedPfi);
+
             tabInfos.Pages.Add(tabDvdInfo);
 
             byte[] dvdRamDds                     = null;
@@ -540,12 +582,14 @@ namespace Aaru.Gui.Panels
                imageFormat.Info.ReadableMediaTags.Contains(MediaTagType.DCB))
                 dvdPlusDcb = imageFormat.ReadDiskTag(MediaTagType.DCB);
 
-            tabDvdWritableInfo tabDvdWritableInfo = new tabDvdWritableInfo();
+            var tabDvdWritableInfo = new tabDvdWritableInfo();
+
             tabDvdWritableInfo.LoadData(imageFormat.Info.MediaType, dvdRamDds, dvdRamCartridgeStatus, dvdRamSpareArea,
                                         lastBorderOutRmd, dvdPreRecordedInfo, dvdrMediaIdentifier,
                                         dvdrPhysicalInformation, hddvdrMediumStatus, null, dvdrLayerCapacity,
                                         dvdrDlMiddleZoneStart, dvdrDlJumpIntervalSize, dvdrDlManualLayerJumpStartLba,
                                         null, dvdPlusAdip, dvdPlusDcb);
+
             tabInfos.Pages.Add(tabDvdWritableInfo);
 
             byte[] blurayBurstCuttingArea     = null;
@@ -584,9 +628,11 @@ namespace Aaru.Gui.Panels
                imageFormat.Info.ReadableMediaTags.Contains(MediaTagType.MMC_TrackResourcesInformation))
                 bluraySpareAreaInformation = imageFormat.ReadDiskTag(MediaTagType.MMC_TrackResourcesInformation);
 
-            tabBlurayInfo tabBlurayInfo = new tabBlurayInfo();
+            var tabBlurayInfo = new tabBlurayInfo();
+
             tabBlurayInfo.LoadData(blurayDiscInformation, blurayBurstCuttingArea, blurayDds, blurayCartridgeStatus,
                                    bluraySpareAreaInformation, blurayPowResources, blurayTrackResources, null, null);
+
             tabInfos.Pages.Add(tabBlurayInfo);
 
             byte[]             xboxDmi                   = null;
@@ -604,7 +650,7 @@ namespace Aaru.Gui.Panels
                 decodedXboxSecuritySector = SS.Decode(xboxSecuritySector);
             }
 
-            tabXboxInfo tabXboxInfo = new tabXboxInfo();
+            var tabXboxInfo = new tabXboxInfo();
             tabXboxInfo.LoadData(null, xboxDmi, xboxSecuritySector, decodedXboxSecuritySector);
             tabInfos.Pages.Add(tabXboxInfo);
 
@@ -614,7 +660,7 @@ namespace Aaru.Gui.Panels
                imageFormat.Info.ReadableMediaTags.Contains(MediaTagType.PCMCIA_CIS))
                 pcmciaCis = imageFormat.ReadDiskTag(MediaTagType.PCMCIA_CIS);
 
-            tabPcmciaInfo tabPcmciaInfo = new tabPcmciaInfo();
+            var tabPcmciaInfo = new tabPcmciaInfo();
             tabPcmciaInfo.LoadData(pcmciaCis);
             tabInfos.Pages.Add(tabPcmciaInfo);
 
@@ -681,7 +727,7 @@ namespace Aaru.Gui.Panels
                 deviceType  = DeviceType.MMC;
             }
 
-            tabSdMmcInfo tabSdMmcInfo = new tabSdMmcInfo();
+            var tabSdMmcInfo = new tabSdMmcInfo();
             tabSdMmcInfo.LoadData(deviceType, cid, csd, ocr, extendedCsd, scr);
             tabInfos.Pages.Add(tabSdMmcInfo);
 
@@ -689,24 +735,35 @@ namespace Aaru.Gui.Panels
             {
                 try
                 {
-                    if(opticalMediaImage.Sessions != null && opticalMediaImage.Sessions.Count > 0)
+                    if(opticalMediaImage.Sessions       != null &&
+                       opticalMediaImage.Sessions.Count > 0)
                     {
-                        TreeGridItemCollection sessionList = new TreeGridItemCollection();
+                        var sessionList = new TreeGridItemCollection();
 
                         treeSessions.Columns.Add(new GridColumn
                         {
                             HeaderText = "Session", DataCell = new TextBoxCell(0)
                         });
+
                         treeSessions.Columns.Add(new GridColumn
                         {
                             HeaderText = "First track", DataCell = new TextBoxCell(1)
                         });
+
                         treeSessions.Columns.Add(new GridColumn
                         {
                             HeaderText = "Last track", DataCell = new TextBoxCell(2)
                         });
-                        treeSessions.Columns.Add(new GridColumn {HeaderText = "Start", DataCell = new TextBoxCell(3)});
-                        treeSessions.Columns.Add(new GridColumn {HeaderText = "End", DataCell   = new TextBoxCell(4)});
+
+                        treeSessions.Columns.Add(new GridColumn
+                        {
+                            HeaderText = "Start", DataCell = new TextBoxCell(3)
+                        });
+
+                        treeSessions.Columns.Add(new GridColumn
+                        {
+                            HeaderText = "End", DataCell = new TextBoxCell(4)
+                        });
 
                         treeSessions.AllowMultipleSelection = false;
                         treeSessions.ShowHeader             = true;
@@ -717,8 +774,8 @@ namespace Aaru.Gui.Panels
                             {
                                 Values = new object[]
                                 {
-                                    session.SessionSequence, session.StartTrack,
-                                    session.EndTrack, session.StartSector, session.EndSector
+                                    session.SessionSequence, session.StartTrack, session.EndTrack, session.StartSector,
+                                    session.EndSector
                                 }
                             });
 
@@ -732,21 +789,50 @@ namespace Aaru.Gui.Panels
 
                 try
                 {
-                    if(opticalMediaImage.Tracks != null && opticalMediaImage.Tracks.Count > 0)
+                    if(opticalMediaImage.Tracks       != null &&
+                       opticalMediaImage.Tracks.Count > 0)
                     {
-                        TreeGridItemCollection tracksList = new TreeGridItemCollection();
+                        var tracksList = new TreeGridItemCollection();
+
+                        treeTracks.Columns.Add(new GridColumn
+                        {
+                            HeaderText = "Track", DataCell = new TextBoxCell(0)
+                        });
+
+                        treeTracks.Columns.Add(new GridColumn
+                        {
+                            HeaderText = "Type", DataCell = new TextBoxCell(1)
+                        });
+
+                        treeTracks.Columns.Add(new GridColumn
+                        {
+                            HeaderText = "Bps", DataCell = new TextBoxCell(2)
+                        });
+
+                        treeTracks.Columns.Add(new GridColumn
+                        {
+                            HeaderText = "Raw bps", DataCell = new TextBoxCell(3)
+                        });
 
-                        treeTracks.Columns.Add(new GridColumn {HeaderText = "Track", DataCell   = new TextBoxCell(0)});
-                        treeTracks.Columns.Add(new GridColumn {HeaderText = "Type", DataCell    = new TextBoxCell(1)});
-                        treeTracks.Columns.Add(new GridColumn {HeaderText = "Bps", DataCell     = new TextBoxCell(2)});
-                        treeTracks.Columns.Add(new GridColumn {HeaderText = "Raw bps", DataCell = new TextBoxCell(3)});
                         treeTracks.Columns.Add(new GridColumn
                         {
                             HeaderText = "Subchannel", DataCell = new TextBoxCell(4)
                         });
-                        treeTracks.Columns.Add(new GridColumn {HeaderText = "Pregap", DataCell = new TextBoxCell(5)});
-                        treeTracks.Columns.Add(new GridColumn {HeaderText = "Start", DataCell  = new TextBoxCell(6)});
-                        treeTracks.Columns.Add(new GridColumn {HeaderText = "End", DataCell    = new TextBoxCell(7)});
+
+                        treeTracks.Columns.Add(new GridColumn
+                        {
+                            HeaderText = "Pregap", DataCell = new TextBoxCell(5)
+                        });
+
+                        treeTracks.Columns.Add(new GridColumn
+                        {
+                            HeaderText = "Start", DataCell = new TextBoxCell(6)
+                        });
+
+                        treeTracks.Columns.Add(new GridColumn
+                        {
+                            HeaderText = "End", DataCell = new TextBoxCell(7)
+                        });
 
                         treeTracks.AllowMultipleSelection = false;
                         treeTracks.ShowHeader             = true;
@@ -757,9 +843,8 @@ namespace Aaru.Gui.Panels
                             {
                                 Values = new object[]
                                 {
-                                    track.TrackSequence, track.TrackType,
-                                    track.TrackBytesPerSector, track.TrackRawBytesPerSector,
-                                    track.TrackSubchannelType, track.TrackPregap,
+                                    track.TrackSequence, track.TrackType, track.TrackBytesPerSector,
+                                    track.TrackRawBytesPerSector, track.TrackSubchannelType, track.TrackPregap,
                                     track.TrackStartSector, track.TrackEndSector
                                 }
                             });
@@ -773,21 +858,50 @@ namespace Aaru.Gui.Panels
                 }
             }
 
-            if(imageFormat.DumpHardware == null) return;
+            if(imageFormat.DumpHardware == null)
+                return;
 
-            TreeGridItemCollection dumpHardwareList = new TreeGridItemCollection();
+            var dumpHardwareList = new TreeGridItemCollection();
+
+            treeDumpHardware.Columns.Add(new GridColumn
+            {
+                HeaderText = "Manufacturer", DataCell = new TextBoxCell(0)
+            });
+
+            treeDumpHardware.Columns.Add(new GridColumn
+            {
+                HeaderText = "Model", DataCell = new TextBoxCell(1)
+            });
+
+            treeDumpHardware.Columns.Add(new GridColumn
+            {
+                HeaderText = "Serial", DataCell = new TextBoxCell(2)
+            });
+
+            treeDumpHardware.Columns.Add(new GridColumn
+            {
+                HeaderText = "Software", DataCell = new TextBoxCell(3)
+            });
+
+            treeDumpHardware.Columns.Add(new GridColumn
+            {
+                HeaderText = "Version", DataCell = new TextBoxCell(4)
+            });
 
-            treeDumpHardware.Columns.Add(new GridColumn {HeaderText = "Manufacturer", DataCell = new TextBoxCell(0)});
-            treeDumpHardware.Columns.Add(new GridColumn {HeaderText = "Model", DataCell        = new TextBoxCell(1)});
-            treeDumpHardware.Columns.Add(new GridColumn {HeaderText = "Serial", DataCell       = new TextBoxCell(2)});
-            treeDumpHardware.Columns.Add(new GridColumn {HeaderText = "Software", DataCell     = new TextBoxCell(3)});
-            treeDumpHardware.Columns.Add(new GridColumn {HeaderText = "Version", DataCell      = new TextBoxCell(4)});
             treeDumpHardware.Columns.Add(new GridColumn
             {
                 HeaderText = "Operating system", DataCell = new TextBoxCell(5)
             });
-            treeDumpHardware.Columns.Add(new GridColumn {HeaderText = "Start", DataCell = new TextBoxCell(6)});
-            treeDumpHardware.Columns.Add(new GridColumn {HeaderText = "End", DataCell   = new TextBoxCell(7)});
+
+            treeDumpHardware.Columns.Add(new GridColumn
+            {
+                HeaderText = "Start", DataCell = new TextBoxCell(6)
+            });
+
+            treeDumpHardware.Columns.Add(new GridColumn
+            {
+                HeaderText = "End", DataCell = new TextBoxCell(7)
+            });
 
             treeDumpHardware.AllowMultipleSelection = false;
             treeDumpHardware.ShowHeader             = true;
@@ -800,9 +914,8 @@ namespace Aaru.Gui.Panels
                     {
                         Values = new object[]
                         {
-                            dump.Manufacturer, dump.Model, dump.Serial, dump.Software.Name,
-                            dump.Software.Version, dump.Software.OperatingSystem,
-                            extent.Start, extent.End
+                            dump.Manufacturer, dump.Model, dump.Serial, dump.Software.Name, dump.Software.Version,
+                            dump.Software.OperatingSystem, extent.Start, extent.End
                         }
                     });
             }
@@ -815,11 +928,17 @@ namespace Aaru.Gui.Panels
             if(frmImageEntropy != null)
             {
                 frmImageEntropy.Show();
+
                 return;
             }
 
-            frmImageEntropy        =  new frmImageEntropy(imageFormat);
-            frmImageEntropy.Closed += (s, ea) => { frmImageEntropy = null; };
+            frmImageEntropy = new frmImageEntropy(imageFormat);
+
+            frmImageEntropy.Closed += (s, ea) =>
+            {
+                frmImageEntropy = null;
+            };
+
             frmImageEntropy.Show();
         }
 
@@ -828,11 +947,17 @@ namespace Aaru.Gui.Panels
             if(frmImageVerify != null)
             {
                 frmImageVerify.Show();
+
                 return;
             }
 
-            frmImageVerify        =  new frmImageVerify(imageFormat);
-            frmImageVerify.Closed += (s, ea) => { frmImageVerify = null; };
+            frmImageVerify = new frmImageVerify(imageFormat);
+
+            frmImageVerify.Closed += (s, ea) =>
+            {
+                frmImageVerify = null;
+            };
+
             frmImageVerify.Show();
         }
 
@@ -841,11 +966,17 @@ namespace Aaru.Gui.Panels
             if(frmImageChecksum != null)
             {
                 frmImageChecksum.Show();
+
                 return;
             }
 
-            frmImageChecksum        =  new frmImageChecksum(imageFormat);
-            frmImageChecksum.Closed += (s, ea) => { frmImageChecksum = null; };
+            frmImageChecksum = new frmImageChecksum(imageFormat);
+
+            frmImageChecksum.Closed += (s, ea) =>
+            {
+                frmImageChecksum = null;
+            };
+
             frmImageChecksum.Show();
         }
 
@@ -854,11 +985,17 @@ namespace Aaru.Gui.Panels
             if(frmImageConvert != null)
             {
                 frmImageConvert.Show();
+
                 return;
             }
 
-            frmImageConvert        =  new frmImageConvert(imageFormat, imagePath);
-            frmImageConvert.Closed += (s, ea) => { frmImageConvert = null; };
+            frmImageConvert = new frmImageConvert(imageFormat, imagePath);
+
+            frmImageConvert.Closed += (s, ea) =>
+            {
+                frmImageConvert = null;
+            };
+
             frmImageConvert.Show();
         }
 
@@ -867,12 +1004,18 @@ namespace Aaru.Gui.Panels
             if(frmImageSidecar != null)
             {
                 frmImageSidecar.Show();
+
                 return;
             }
 
             // TODO: Pass thru chosen default encoding
-            frmImageSidecar        =  new frmImageSidecar(imageFormat, imagePath, filter.Id, null);
-            frmImageSidecar.Closed += (s, ea) => { frmImageSidecar = null; };
+            frmImageSidecar = new frmImageSidecar(imageFormat, imagePath, filter.Id, null);
+
+            frmImageSidecar.Closed += (s, ea) =>
+            {
+                frmImageSidecar = null;
+            };
+
             frmImageSidecar.Show();
         }
 
@@ -881,11 +1024,17 @@ namespace Aaru.Gui.Panels
             if(frmPrintHex != null)
             {
                 frmPrintHex.Show();
+
                 return;
             }
 
-            frmPrintHex        =  new frmPrintHex(imageFormat);
-            frmPrintHex.Closed += (s, ea) => { frmPrintHex = null; };
+            frmPrintHex = new frmPrintHex(imageFormat);
+
+            frmPrintHex.Closed += (s, ea) =>
+            {
+                frmPrintHex = null;
+            };
+
             frmPrintHex.Show();
         }
 
@@ -894,11 +1043,17 @@ namespace Aaru.Gui.Panels
             if(frmDecodeMediaTags != null)
             {
                 frmDecodeMediaTags.Show();
+
                 return;
             }
 
-            frmDecodeMediaTags        =  new frmDecodeMediaTags(imageFormat);
-            frmDecodeMediaTags.Closed += (s, ea) => { frmDecodeMediaTags = null; };
+            frmDecodeMediaTags = new frmDecodeMediaTags(imageFormat);
+
+            frmDecodeMediaTags.Closed += (s, ea) =>
+            {
+                frmDecodeMediaTags = null;
+            };
+
             frmDecodeMediaTags.Show();
         }
 
diff --git a/Aaru.Gui/Panels/pnlListFiles.xeto.cs b/Aaru.Gui/Panels/pnlListFiles.xeto.cs
index f249a4b03..c7c760289 100644
--- a/Aaru.Gui/Panels/pnlListFiles.xeto.cs
+++ b/Aaru.Gui/Panels/pnlListFiles.xeto.cs
@@ -50,7 +50,6 @@ namespace Aaru.Gui.Panels
     public class pnlListFiles : Panel
     {
         readonly GridColumn                         accessColumn;
-        bool                                        ascendingSort;
         readonly GridColumn                         attributesColumn;
         readonly GridColumn                         backupColumn;
         readonly GridColumn                         changedColumn;
@@ -59,6 +58,16 @@ namespace Aaru.Gui.Panels
         readonly IReadOnlyFilesystem                filesystem;
         readonly GridColumn                         gidColumn;
 
+        readonly GridColumn     inodeColumn;
+        readonly GridColumn     linksColumn;
+        readonly GridColumn     modeColumn;
+        readonly GridColumn     nameColumn;
+        readonly ButtonMenuItem saveFilesMenuItem;
+        readonly GridColumn     sizeColumn;
+        readonly GridColumn     uidColumn;
+        readonly GridColumn     writeColumn;
+        bool                    ascendingSort;
+
         #region XAML controls
         #pragma warning disable 169
         #pragma warning disable 649
@@ -66,16 +75,7 @@ namespace Aaru.Gui.Panels
         #pragma warning restore 169
         #pragma warning restore 649
         #endregion
-
-        readonly GridColumn     inodeColumn;
-        readonly GridColumn     linksColumn;
-        readonly GridColumn     modeColumn;
-        readonly GridColumn     nameColumn;
-        readonly ButtonMenuItem saveFilesMenuItem;
-        readonly GridColumn     sizeColumn;
-        GridColumn              sortedColumn;
-        readonly GridColumn     uidColumn;
-        readonly GridColumn     writeColumn;
+        GridColumn sortedColumn;
 
         public pnlListFiles(IReadOnlyFilesystem filesystem, Dictionary<string, FileEntryInfo> files, string parentPath)
         {
@@ -86,122 +86,124 @@ namespace Aaru.Gui.Panels
 
             nameColumn = new GridColumn
             {
-                DataCell   = new TextBoxCell {Binding = Binding.Property<EntryForGrid, string>(r => r.Name)},
-                HeaderText = "Name",
-                Sortable   = true
+                DataCell = new TextBoxCell
+                {
+                    Binding = Binding.Property<EntryForGrid, string>(r => r.Name)
+                },
+                HeaderText = "Name", Sortable = true
             };
+
             sizeColumn = new GridColumn
             {
                 DataCell = new TextBoxCell
                 {
                     Binding = Binding.Property<EntryForGrid, string>(r => $"{r.Stat.Length}")
                 },
-                HeaderText = "Size",
-                Sortable   = true
+                HeaderText = "Size", Sortable = true
             };
+
             createdColumn = new GridColumn
             {
                 DataCell = new TextBoxCell
                 {
-                    Binding =
-                        Binding.Property<EntryForGrid, string>(r => r.Stat.CreationTime == default(DateTime)
-                                                                        ? ""
-                                                                        : $"{r.Stat.CreationTime:G}")
+                    Binding = Binding.Property<EntryForGrid, string>(r => r.Stat.CreationTime == default(DateTime) ? ""
+                                                                              : $"{r.Stat.CreationTime:G}")
                 },
-                HeaderText = "Created",
-                Sortable   = true
+                HeaderText = "Created", Sortable = true
             };
+
             accessColumn = new GridColumn
             {
                 DataCell = new TextBoxCell
                 {
-                    Binding = Binding.Property<EntryForGrid, string>(r => r.Stat.AccessTime == default(DateTime)
-                                                                              ? ""
+                    Binding = Binding.Property<EntryForGrid, string>(r => r.Stat.AccessTime == default(DateTime) ? ""
                                                                               : $"{r.Stat.AccessTime:G}")
                 },
-                HeaderText = "Last access",
-                Sortable   = true
+                HeaderText = "Last access", Sortable = true
             };
+
             changedColumn = new GridColumn
             {
                 DataCell = new TextBoxCell
                 {
-                    Binding =
-                        Binding.Property<EntryForGrid, string>(r => r.Stat.StatusChangeTime == default(DateTime)
-                                                                        ? ""
-                                                                        : $"{r.Stat.StatusChangeTime:G}")
+                    Binding = Binding.Property<EntryForGrid, string>(r => r.Stat.StatusChangeTime == default(DateTime)
+                                                                              ? "" : $"{r.Stat.StatusChangeTime:G}")
                 },
-                HeaderText = "Changed",
-                Sortable   = true
+                HeaderText = "Changed", Sortable = true
             };
+
             backupColumn = new GridColumn
             {
                 DataCell = new TextBoxCell
                 {
-                    Binding = Binding.Property<EntryForGrid, string>(r => r.Stat.BackupTime == default(DateTime)
-                                                                              ? ""
+                    Binding = Binding.Property<EntryForGrid, string>(r => r.Stat.BackupTime == default(DateTime) ? ""
                                                                               : $"{r.Stat.BackupTime:G}")
                 },
-                HeaderText = "Last backup",
-                Sortable   = true
+                HeaderText = "Last backup", Sortable = true
             };
+
             writeColumn = new GridColumn
             {
                 DataCell = new TextBoxCell
                 {
-                    Binding =
-                        Binding.Property<EntryForGrid, string>(r => r.Stat.LastWriteTime == default(DateTime)
-                                                                        ? ""
-                                                                        : $"{r.Stat.LastWriteTime:G}")
+                    Binding = Binding.Property<EntryForGrid, string>(r => r.Stat.LastWriteTime == default(DateTime) ? ""
+                                                                              : $"{r.Stat.LastWriteTime:G}")
                 },
-                HeaderText = "Last write",
-                Sortable   = true
+                HeaderText = "Last write", Sortable = true
             };
+
             attributesColumn = new GridColumn
             {
                 DataCell = new TextBoxCell
                 {
                     Binding = Binding.Property<EntryForGrid, string>(r => $"{r.Stat.Attributes}")
                 },
-                HeaderText = "Attributes",
-                Sortable   = true
+                HeaderText = "Attributes", Sortable = true
             };
+
             gidColumn = new GridColumn
             {
-                DataCell   = new TextBoxCell {Binding = Binding.Property<EntryForGrid, string>(r => $"{r.Stat.GID}")},
-                HeaderText = "GID",
-                Sortable   = true
+                DataCell = new TextBoxCell
+                {
+                    Binding = Binding.Property<EntryForGrid, string>(r => $"{r.Stat.GID}")
+                },
+                HeaderText = "GID", Sortable = true
             };
+
             uidColumn = new GridColumn
             {
-                DataCell   = new TextBoxCell {Binding = Binding.Property<EntryForGrid, string>(r => $"{r.Stat.UID}")},
-                HeaderText = "UID",
-                Sortable   = true
+                DataCell = new TextBoxCell
+                {
+                    Binding = Binding.Property<EntryForGrid, string>(r => $"{r.Stat.UID}")
+                },
+                HeaderText = "UID", Sortable = true
             };
+
             inodeColumn = new GridColumn
             {
                 DataCell = new TextBoxCell
                 {
                     Binding = Binding.Property<EntryForGrid, string>(r => $"{r.Stat.Inode}")
                 },
-                HeaderText = "Inode",
-                Sortable   = true
+                HeaderText = "Inode", Sortable = true
             };
+
             linksColumn = new GridColumn
             {
                 DataCell = new TextBoxCell
                 {
                     Binding = Binding.Property<EntryForGrid, string>(r => $"{r.Stat.Links}")
                 },
-                HeaderText = "Links",
-                Sortable   = true
+                HeaderText = "Links", Sortable = true
             };
+
             modeColumn = new GridColumn
             {
-                DataCell =
-                    new TextBoxCell {Binding = Binding.Property<EntryForGrid, string>(r => $"{r.Stat.Mode}")},
-                HeaderText = "Mode",
-                Sortable   = true
+                DataCell = new TextBoxCell
+                {
+                    Binding = Binding.Property<EntryForGrid, string>(r => $"{r.Stat.Mode}")
+                },
+                HeaderText = "Mode", Sortable = true
             };
 
             grdFiles.Columns.Add(nameColumn);
@@ -224,15 +226,23 @@ namespace Aaru.Gui.Panels
             grdFiles.ShowHeader             = true;
 
             foreach(KeyValuePair<string, FileEntryInfo> file in files)
-                entries.Add(new EntryForGrid {Name = file.Key, Stat = file.Value, ParentPath = parentPath});
+                entries.Add(new EntryForGrid
+                {
+                    Name = file.Key, Stat = file.Value, ParentPath = parentPath
+                });
 
             grdFiles.DataStore         =  entries;
             sortedColumn               =  null;
             grdFiles.ColumnHeaderClick += OnGrdFilesOnColumnHeaderClick;
             ascendingSort              =  true;
 
-            grdFiles.ContextMenu    =  new ContextMenu();
-            saveFilesMenuItem       =  new ButtonMenuItem {Text = "Extract to...", Enabled = false};
+            grdFiles.ContextMenu = new ContextMenu();
+
+            saveFilesMenuItem = new ButtonMenuItem
+            {
+                Text = "Extract to...", Enabled = false
+            };
+
             saveFilesMenuItem.Click += OnSaveFilesMenuItemClick;
 
             grdFiles.ContextMenu.Items.Add(saveFilesMenuItem);
@@ -240,20 +250,23 @@ namespace Aaru.Gui.Panels
             grdFiles.SelectionChanged += OnGrdFilesSelectionChanged;
         }
 
-        void OnGrdFilesSelectionChanged(object sender, EventArgs e)
-        {
+        void OnGrdFilesSelectionChanged(object sender, EventArgs e) =>
             saveFilesMenuItem.Enabled = grdFiles.SelectedItems.Any();
-        }
 
         void OnSaveFilesMenuItemClick(object sender, EventArgs e)
         {
-            if(!grdFiles.SelectedItems.Any()) return;
+            if(!grdFiles.SelectedItems.Any())
+                return;
 
-            SelectFolderDialog saveFilesFolderDialog = new SelectFolderDialog {Title = "Choose destination folder..."};
+            var saveFilesFolderDialog = new SelectFolderDialog
+            {
+                Title = "Choose destination folder..."
+            };
 
             DialogResult result = saveFilesFolderDialog.ShowDialog(this);
 
-            if(result != DialogResult.Ok) return;
+            if(result != DialogResult.Ok)
+                return;
 
             Statistics.AddCommand("extract-files");
 
@@ -264,28 +277,46 @@ namespace Aaru.Gui.Panels
                 string filename = file.Name;
 
                 if(DetectOS.IsWindows)
-                    if(filename.Contains('<')                || filename.Contains('>') ||
+                    if(filename.Contains('<')                ||
+                       filename.Contains('>')                ||
                        filename.Contains(':')                ||
-                       filename.Contains('\\')               || filename.Contains('/') ||
+                       filename.Contains('\\')               ||
+                       filename.Contains('/')                ||
                        filename.Contains('|')                ||
-                       filename.Contains('?')                || filename.Contains('*') ||
+                       filename.Contains('?')                ||
+                       filename.Contains('*')                ||
                        filename.Any(c => c < 32)             ||
-                       filename.ToUpperInvariant() == "CON"  || filename.ToUpperInvariant() == "PRN"  ||
-                       filename.ToUpperInvariant() == "AUX"  || filename.ToUpperInvariant() == "COM1" ||
-                       filename.ToUpperInvariant() == "COM2" || filename.ToUpperInvariant() == "COM3" ||
-                       filename.ToUpperInvariant() == "COM4" || filename.ToUpperInvariant() == "COM5" ||
-                       filename.ToUpperInvariant() == "COM6" || filename.ToUpperInvariant() == "COM7" ||
-                       filename.ToUpperInvariant() == "COM8" || filename.ToUpperInvariant() == "COM9" ||
-                       filename.ToUpperInvariant() == "LPT1" || filename.ToUpperInvariant() == "LPT2" ||
-                       filename.ToUpperInvariant() == "LPT3" || filename.ToUpperInvariant() == "LPT4" ||
-                       filename.ToUpperInvariant() == "LPT5" || filename.ToUpperInvariant() == "LPT6" ||
-                       filename.ToUpperInvariant() == "LPT7" || filename.ToUpperInvariant() == "LPT8" ||
-                       filename.ToUpperInvariant() == "LPT9" || filename.Last()             == '.'    ||
+                       filename.ToUpperInvariant() == "CON"  ||
+                       filename.ToUpperInvariant() == "PRN"  ||
+                       filename.ToUpperInvariant() == "AUX"  ||
+                       filename.ToUpperInvariant() == "COM1" ||
+                       filename.ToUpperInvariant() == "COM2" ||
+                       filename.ToUpperInvariant() == "COM3" ||
+                       filename.ToUpperInvariant() == "COM4" ||
+                       filename.ToUpperInvariant() == "COM5" ||
+                       filename.ToUpperInvariant() == "COM6" ||
+                       filename.ToUpperInvariant() == "COM7" ||
+                       filename.ToUpperInvariant() == "COM8" ||
+                       filename.ToUpperInvariant() == "COM9" ||
+                       filename.ToUpperInvariant() == "LPT1" ||
+                       filename.ToUpperInvariant() == "LPT2" ||
+                       filename.ToUpperInvariant() == "LPT3" ||
+                       filename.ToUpperInvariant() == "LPT4" ||
+                       filename.ToUpperInvariant() == "LPT5" ||
+                       filename.ToUpperInvariant() == "LPT6" ||
+                       filename.ToUpperInvariant() == "LPT7" ||
+                       filename.ToUpperInvariant() == "LPT8" ||
+                       filename.ToUpperInvariant() == "LPT9" ||
+                       filename.Last()             == '.'    ||
                        filename.Last()             == ' ')
                     {
                         char[] chars;
-                        if(filename.Last() == '.' || filename.Last() == ' ') chars = new char[filename.Length - 1];
-                        else chars                                                 = new char[filename.Length];
+
+                        if(filename.Last() == '.' ||
+                           filename.Last() == ' ')
+                            chars = new char[filename.Length - 1];
+                        else
+                            chars = new char[filename.Length];
 
                         for(int ci = 0; ci < chars.Length; ci++)
                             switch(filename[ci])
@@ -331,9 +362,11 @@ namespace Aaru.Gui.Panels
                                 case '\u001E':
                                 case '\u001F':
                                     chars[ci] = '_';
+
                                     break;
                                 default:
                                     chars[ci] = filename[ci];
+
                                     break;
                             }
 
@@ -354,9 +387,11 @@ namespace Aaru.Gui.Panels
                                                  $"The file name {filename} is not supported on this platform.\nDo you want to rename it to {corrected}?",
                                                  MessageBoxButtons.YesNoCancel, MessageBoxType.Warning);
 
-                        if(result == DialogResult.Cancel) return;
+                        if(result == DialogResult.Cancel)
+                            return;
 
-                        if(result == DialogResult.No) continue;
+                        if(result == DialogResult.No)
+                            continue;
 
                         filename = corrected;
                     }
@@ -369,17 +404,24 @@ namespace Aaru.Gui.Panels
                                              $"A file named {filename} already exists on the destination folder.\nDo you want to overwrite it?",
                                              MessageBoxButtons.YesNoCancel, MessageBoxType.Question);
 
-                    if(result == DialogResult.Cancel) return;
+                    if(result == DialogResult.Cancel)
+                        return;
 
-                    if(result == DialogResult.No) continue;
+                    if(result == DialogResult.No)
+                        continue;
 
-                    try { File.Delete(outputPath); }
+                    try
+                    {
+                        File.Delete(outputPath);
+                    }
                     catch(IOException)
                     {
                         result = MessageBox.Show(this, "Cannot delete",
                                                  "Could not delete existing file.\nDo you want to continue?",
                                                  MessageBoxButtons.YesNo, MessageBoxType.Warning);
-                        if(result == DialogResult.No) return;
+
+                        if(result == DialogResult.No)
+                            return;
                     }
                 }
 
@@ -394,21 +436,23 @@ namespace Aaru.Gui.Panels
                         result = MessageBox.Show(this, "Error reading file",
                                                  $"Error {error} reading file.\nDo you want to continue?",
                                                  MessageBoxButtons.YesNo, MessageBoxType.Warning);
-                        if(result == DialogResult.No) return;
+
+                        if(result == DialogResult.No)
+                            return;
 
                         continue;
                     }
 
-                    FileStream fs =
-                        new FileStream(outputPath, FileMode.CreateNew, FileAccess.ReadWrite, FileShare.None);
+                    var fs = new FileStream(outputPath, FileMode.CreateNew, FileAccess.ReadWrite, FileShare.None);
 
                     fs.Write(outBuf, 0, outBuf.Length);
                     fs.Close();
-                    FileInfo fi = new FileInfo(outputPath);
+                    var fi = new FileInfo(outputPath);
                     #pragma warning disable RECS0022 // A catch clause that catches System.Exception and has an empty body
                     try
                     {
-                        if(file.Stat.CreationTimeUtc.HasValue) fi.CreationTimeUtc = file.Stat.CreationTimeUtc.Value;
+                        if(file.Stat.CreationTimeUtc.HasValue)
+                            fi.CreationTimeUtc = file.Stat.CreationTimeUtc.Value;
                     }
                     catch
                     {
@@ -417,7 +461,8 @@ namespace Aaru.Gui.Panels
 
                     try
                     {
-                        if(file.Stat.LastWriteTimeUtc.HasValue) fi.LastWriteTimeUtc = file.Stat.LastWriteTimeUtc.Value;
+                        if(file.Stat.LastWriteTimeUtc.HasValue)
+                            fi.LastWriteTimeUtc = file.Stat.LastWriteTimeUtc.Value;
                     }
                     catch
                     {
@@ -426,7 +471,8 @@ namespace Aaru.Gui.Panels
 
                     try
                     {
-                        if(file.Stat.AccessTimeUtc.HasValue) fi.LastAccessTimeUtc = file.Stat.AccessTimeUtc.Value;
+                        if(file.Stat.AccessTimeUtc.HasValue)
+                            fi.LastAccessTimeUtc = file.Stat.AccessTimeUtc.Value;
                     }
                     catch
                     {
@@ -439,68 +485,60 @@ namespace Aaru.Gui.Panels
                     result = MessageBox.Show(this, "Cannot create file",
                                              "Could not create destination file.\nDo you want to continue?",
                                              MessageBoxButtons.YesNo, MessageBoxType.Warning);
-                    if(result == DialogResult.No) return;
+
+                    if(result == DialogResult.No)
+                        return;
                 }
             }
         }
 
         void OnGrdFilesOnColumnHeaderClick(object sender, GridColumnEventArgs gridColumnEventArgs)
         {
-            if(sortedColumn == gridColumnEventArgs.Column) ascendingSort = !ascendingSort;
-            else ascendingSort                                           = true;
+            if(sortedColumn == gridColumnEventArgs.Column)
+                ascendingSort = !ascendingSort;
+            else
+                ascendingSort = true;
 
             sortedColumn = gridColumnEventArgs.Column;
 
             if(sortedColumn == nameColumn)
-                grdFiles.DataStore =
-                    ascendingSort ? entries.OrderBy(t => t.Name) : entries.OrderByDescending(t => t.Name);
+                grdFiles.DataStore = ascendingSort ? entries.OrderBy(t => t.Name)
+                                         : entries.OrderByDescending(t => t.Name);
             else if(sortedColumn == sizeColumn)
-                grdFiles.DataStore = ascendingSort
-                                         ? entries.OrderBy(t => t.Stat.Length)
+                grdFiles.DataStore = ascendingSort ? entries.OrderBy(t => t.Stat.Length)
                                          : entries.OrderByDescending(t => t.Stat.Length);
             else if(sortedColumn == createdColumn)
-                grdFiles.DataStore = ascendingSort
-                                         ? entries.OrderBy(t => t.Stat.CreationTime)
+                grdFiles.DataStore = ascendingSort ? entries.OrderBy(t => t.Stat.CreationTime)
                                          : entries.OrderByDescending(t => t.Stat.CreationTime);
             else if(sortedColumn == accessColumn)
-                grdFiles.DataStore = ascendingSort
-                                         ? entries.OrderBy(t => t.Stat.AccessTime)
+                grdFiles.DataStore = ascendingSort ? entries.OrderBy(t => t.Stat.AccessTime)
                                          : entries.OrderByDescending(t => t.Stat.AccessTime);
             else if(sortedColumn == changedColumn)
-                grdFiles.DataStore = ascendingSort
-                                         ? entries.OrderBy(t => t.Stat.StatusChangeTime)
+                grdFiles.DataStore = ascendingSort ? entries.OrderBy(t => t.Stat.StatusChangeTime)
                                          : entries.OrderByDescending(t => t.Stat.StatusChangeTime);
             else if(sortedColumn == backupColumn)
-                grdFiles.DataStore = ascendingSort
-                                         ? entries.OrderBy(t => t.Stat.BackupTime)
+                grdFiles.DataStore = ascendingSort ? entries.OrderBy(t => t.Stat.BackupTime)
                                          : entries.OrderByDescending(t => t.Stat.BackupTime);
             else if(sortedColumn == writeColumn)
-                grdFiles.DataStore = ascendingSort
-                                         ? entries.OrderBy(t => t.Stat.LastWriteTime)
+                grdFiles.DataStore = ascendingSort ? entries.OrderBy(t => t.Stat.LastWriteTime)
                                          : entries.OrderByDescending(t => t.Stat.LastWriteTime);
             else if(sortedColumn == attributesColumn)
-                grdFiles.DataStore = ascendingSort
-                                         ? entries.OrderBy(t => t.Stat.Attributes)
+                grdFiles.DataStore = ascendingSort ? entries.OrderBy(t => t.Stat.Attributes)
                                          : entries.OrderByDescending(t => t.Stat.Attributes);
             else if(sortedColumn == gidColumn)
-                grdFiles.DataStore = ascendingSort
-                                         ? entries.OrderBy(t => t.Stat.GID)
+                grdFiles.DataStore = ascendingSort ? entries.OrderBy(t => t.Stat.GID)
                                          : entries.OrderByDescending(t => t.Stat.GID);
             else if(sortedColumn == uidColumn)
-                grdFiles.DataStore = ascendingSort
-                                         ? entries.OrderBy(t => t.Stat.UID)
+                grdFiles.DataStore = ascendingSort ? entries.OrderBy(t => t.Stat.UID)
                                          : entries.OrderByDescending(t => t.Stat.UID);
             else if(sortedColumn == inodeColumn)
-                grdFiles.DataStore = ascendingSort
-                                         ? entries.OrderBy(t => t.Stat.Inode)
+                grdFiles.DataStore = ascendingSort ? entries.OrderBy(t => t.Stat.Inode)
                                          : entries.OrderByDescending(t => t.Stat.Inode);
             else if(sortedColumn == linksColumn)
-                grdFiles.DataStore = ascendingSort
-                                         ? entries.OrderBy(t => t.Stat.Links)
+                grdFiles.DataStore = ascendingSort ? entries.OrderBy(t => t.Stat.Links)
                                          : entries.OrderByDescending(t => t.Stat.Links);
             else if(sortedColumn == modeColumn)
-                grdFiles.DataStore = ascendingSort
-                                         ? entries.OrderBy(t => t.Stat.Mode)
+                grdFiles.DataStore = ascendingSort ? entries.OrderBy(t => t.Stat.Mode)
                                          : entries.OrderByDescending(t => t.Stat.Mode);
         }
 
diff --git a/Aaru.Gui/Panels/pnlScsiInfo.xeto.cs b/Aaru.Gui/Panels/pnlScsiInfo.xeto.cs
index 9ed1888da..cf284caeb 100644
--- a/Aaru.Gui/Panels/pnlScsiInfo.xeto.cs
+++ b/Aaru.Gui/Panels/pnlScsiInfo.xeto.cs
@@ -33,12 +33,12 @@
 using System;
 using System.IO;
 using System.Text;
-using Aaru.Gui.Controls;
-using Aaru.Gui.Forms;
-using Aaru.Gui.Tabs;
 using Aaru.CommonTypes;
 using Aaru.Core.Media.Info;
 using Aaru.Decoders.SCSI.SSC;
+using Aaru.Gui.Controls;
+using Aaru.Gui.Forms;
+using Aaru.Gui.Tabs;
 using Eto.Drawing;
 using Eto.Forms;
 using Eto.Serialization.Xaml;
@@ -47,8 +47,8 @@ namespace Aaru.Gui.Panels
 {
     public class pnlScsiInfo : Panel
     {
-        string   devicePath;
-        ScsiInfo scsiInfo;
+        readonly string   devicePath;
+        readonly ScsiInfo scsiInfo;
 
         public pnlScsiInfo(ScsiInfo scsiInfo, string devicePath)
         {
@@ -56,8 +56,7 @@ namespace Aaru.Gui.Panels
 
             this.scsiInfo = scsiInfo;
 
-            Stream logo =
-                ResourceHandler.GetResourceStream($"Aaru.Gui.Assets.Logos.Media.{scsiInfo.MediaType}.svg");
+            Stream logo = ResourceHandler.GetResourceStream($"Aaru.Gui.Assets.Logos.Media.{scsiInfo.MediaType}.svg");
             /*            if(logo != null)
                         {
                             svgMediaLogo.SvgStream = logo;
@@ -66,22 +65,27 @@ namespace Aaru.Gui.Panels
                         else
                         {*/
             logo = ResourceHandler.GetResourceStream($"Aaru.Gui.Assets.Logos.Media.{scsiInfo.MediaType}.png");
+
             if(logo != null)
             {
                 imgMediaLogo.Image   = new Bitmap(logo);
                 imgMediaLogo.Visible = true;
             }
+
             //}
 
             txtType.Text = scsiInfo.MediaType.ToString();
+
             lblMediaSize.Text =
                 $"Media has {scsiInfo.Blocks} blocks of {scsiInfo.BlockSize} bytes/each. (for a total of {scsiInfo.Blocks * scsiInfo.BlockSize} bytes)";
+
             lblMediaSize.Visible = scsiInfo.Blocks != 0 && scsiInfo.BlockSize != 0;
 
             if(scsiInfo.MediaSerialNumber != null)
             {
                 stkMediaSerial.Visible = true;
-                StringBuilder sbSerial = new StringBuilder();
+                var sbSerial = new StringBuilder();
+
                 for(int i = 4; i < scsiInfo.MediaSerialNumber.Length; i++)
                     sbSerial.AppendFormat("{0:X2}", scsiInfo.MediaSerialNumber[i]);
 
@@ -95,6 +99,7 @@ namespace Aaru.Gui.Panels
             btnSaveGetConfiguration.Visible       = this.scsiInfo.MmcConfiguration       != null;
             btnSaveRecognizedFormatLayers.Visible = this.scsiInfo.RecognizedFormatLayers != null;
             btnSaveWriteProtectionStatus.Visible  = this.scsiInfo.WriteProtectionStatus  != null;
+
             tabMmc.Visible = btnSaveGetConfiguration.Visible || btnSaveRecognizedFormatLayers.Visible ||
                              btnSaveWriteProtectionStatus.Visible;
 
@@ -112,30 +117,38 @@ namespace Aaru.Gui.Panels
 
             btnSaveDensitySupport.Visible = scsiInfo.DensitySupport   != null;
             btnSaveMediumSupport.Visible  = scsiInfo.MediaTypeSupport != null;
+
             tabSsc.Visible = grpDensitySupport.Visible || grpMediumSupport.Visible || btnSaveDensitySupport.Visible ||
                              btnSaveMediumSupport.Visible;
 
-            tabCompactDiscInfo tabCompactDiscInfo = new tabCompactDiscInfo();
+            var tabCompactDiscInfo = new tabCompactDiscInfo();
+
             tabCompactDiscInfo.LoadData(scsiInfo.Toc, scsiInfo.Atip, scsiInfo.CompactDiscInformation, scsiInfo.Session,
                                         scsiInfo.RawToc, this.scsiInfo.Pma, this.scsiInfo.CdTextLeadIn,
                                         this.scsiInfo.DecodedToc, this.scsiInfo.DecodedAtip,
                                         this.scsiInfo.DecodedSession, this.scsiInfo.FullToc,
                                         this.scsiInfo.DecodedCdTextLeadIn, this.scsiInfo.DecodedCompactDiscInformation,
                                         this.scsiInfo.Mcn, this.scsiInfo.Isrcs);
+
             tabInfos.Pages.Add(tabCompactDiscInfo);
 
-            tabDvdInfo tabDvdInfo = new tabDvdInfo();
+            var tabDvdInfo = new tabDvdInfo();
+
             tabDvdInfo.LoadData(scsiInfo.MediaType, scsiInfo.DvdPfi, scsiInfo.DvdDmi, scsiInfo.DvdCmi,
                                 scsiInfo.HddvdCopyrightInformation, scsiInfo.DvdBca, scsiInfo.DvdAacs,
                                 this.scsiInfo.DecodedPfi);
+
             tabInfos.Pages.Add(tabDvdInfo);
 
-            tabXboxInfo tabXboxInfo = new tabXboxInfo();
+            var tabXboxInfo = new tabXboxInfo();
+
             tabXboxInfo.LoadData(scsiInfo.XgdInfo, scsiInfo.DvdDmi, scsiInfo.XboxSecuritySector,
                                  scsiInfo.DecodedXboxSecuritySector);
+
             tabInfos.Pages.Add(tabXboxInfo);
 
-            tabDvdWritableInfo tabDvdWritableInfo = new tabDvdWritableInfo();
+            var tabDvdWritableInfo = new tabDvdWritableInfo();
+
             tabDvdWritableInfo.LoadData(scsiInfo.MediaType, scsiInfo.DvdRamDds, scsiInfo.DvdRamCartridgeStatus,
                                         scsiInfo.DvdRamSpareArea, scsiInfo.LastBorderOutRmd,
                                         scsiInfo.DvdPreRecordedInfo, scsiInfo.DvdrMediaIdentifier,
@@ -144,13 +157,16 @@ namespace Aaru.Gui.Panels
                                         scsiInfo.DvdrDlMiddleZoneStart, scsiInfo.DvdrDlJumpIntervalSize,
                                         scsiInfo.DvdrDlManualLayerJumpStartLba, scsiInfo.DvdrDlRemapAnchorPoint,
                                         scsiInfo.DvdPlusAdip, scsiInfo.DvdPlusDcb);
+
             tabInfos.Pages.Add(tabDvdWritableInfo);
 
-            tabBlurayInfo tabBlurayInfo = new tabBlurayInfo();
+            var tabBlurayInfo = new tabBlurayInfo();
+
             tabBlurayInfo.LoadData(scsiInfo.BlurayDiscInformation, scsiInfo.BlurayBurstCuttingArea, scsiInfo.BlurayDds,
                                    scsiInfo.BlurayCartridgeStatus, scsiInfo.BluraySpareAreaInformation,
                                    scsiInfo.BlurayPowResources, scsiInfo.BlurayTrackResources, scsiInfo.BlurayRawDfl,
                                    scsiInfo.BlurayPac);
+
             tabInfos.Pages.Add(tabBlurayInfo);
 
             this.devicePath = devicePath;
@@ -158,68 +174,58 @@ namespace Aaru.Gui.Panels
 
         void SaveElement(byte[] data)
         {
-            SaveFileDialog dlgSaveBinary = new SaveFileDialog();
-            dlgSaveBinary.Filters.Add(new FileFilter {Extensions = new[] {"*.bin"}, Name = "Binary"});
+            var dlgSaveBinary = new SaveFileDialog();
+
+            dlgSaveBinary.Filters.Add(new FileFilter
+            {
+                Extensions = new[]
+                {
+                    "*.bin"
+                },
+                Name = "Binary"
+            });
+
             DialogResult result = dlgSaveBinary.ShowDialog(this);
 
-            if(result != DialogResult.Ok) return;
+            if(result != DialogResult.Ok)
+                return;
 
-            FileStream saveFs = new FileStream(dlgSaveBinary.FileName, FileMode.Create);
+            var saveFs = new FileStream(dlgSaveBinary.FileName, FileMode.Create);
             saveFs.Write(data, 0, data.Length);
 
             saveFs.Close();
         }
 
-        protected void OnBtnSaveReadMediaSerialClick(object sender, EventArgs e)
-        {
+        protected void OnBtnSaveReadMediaSerialClick(object sender, EventArgs e) =>
             SaveElement(scsiInfo.MediaSerialNumber);
-        }
 
-        protected void OnBtnSaveReadCapacityClick(object sender, EventArgs e)
-        {
-            SaveElement(scsiInfo.ReadCapacity);
-        }
+        protected void OnBtnSaveReadCapacityClick(object sender, EventArgs e) => SaveElement(scsiInfo.ReadCapacity);
 
-        protected void OnBtnSaveReadCapacity16Click(object sender, EventArgs e)
-        {
-            SaveElement(scsiInfo.ReadCapacity16);
-        }
+        protected void OnBtnSaveReadCapacity16Click(object sender, EventArgs e) => SaveElement(scsiInfo.ReadCapacity16);
 
-        protected void OnBtnSaveGetConfigurationClick(object sender, EventArgs e)
-        {
+        protected void OnBtnSaveGetConfigurationClick(object sender, EventArgs e) =>
             SaveElement(scsiInfo.MmcConfiguration);
-        }
 
-        protected void OnBtnSaveRecognizedFormatLayersClick(object sender, EventArgs e)
-        {
+        protected void OnBtnSaveRecognizedFormatLayersClick(object sender, EventArgs e) =>
             SaveElement(scsiInfo.RecognizedFormatLayers);
-        }
 
-        protected void OnBtnSaveWriteProtectionStatusClick(object sender, EventArgs e)
-        {
+        protected void OnBtnSaveWriteProtectionStatusClick(object sender, EventArgs e) =>
             SaveElement(scsiInfo.WriteProtectionStatus);
-        }
 
-        protected void OnBtnSaveDensitySupportClick(object sender, EventArgs e)
-        {
-            SaveElement(scsiInfo.DensitySupport);
-        }
+        protected void OnBtnSaveDensitySupportClick(object sender, EventArgs e) => SaveElement(scsiInfo.DensitySupport);
 
-        protected void OnBtnSaveMediumSupportClick(object sender, EventArgs e)
-        {
+        protected void OnBtnSaveMediumSupportClick(object sender, EventArgs e) =>
             SaveElement(scsiInfo.MediaTypeSupport);
-        }
 
-        protected void OnBtnSaveXboxSsClick(object sender, EventArgs e)
-        {
-            SaveElement(scsiInfo.XboxSecuritySector);
-        }
+        protected void OnBtnSaveXboxSsClick(object sender, EventArgs e) => SaveElement(scsiInfo.XboxSecuritySector);
 
         protected void OnBtnDumpClick(object sender, EventArgs e)
         {
-            if(scsiInfo.MediaType == MediaType.GDR || scsiInfo.MediaType == MediaType.GDROM)
+            if(scsiInfo.MediaType == MediaType.GDR ||
+               scsiInfo.MediaType == MediaType.GDROM)
             {
                 MessageBox.Show("GD-ROM dump support is not yet implemented.", MessageBoxType.Error);
+
                 return;
             }
 
@@ -228,23 +234,26 @@ namespace Aaru.Gui.Panels
                scsiInfo.DeviceInfo.ScsiInquiry?.KreonPresent != true)
                 MessageBox.Show("Dumping Xbox discs require a Kreon drive.", MessageBoxType.Error);
 
-            frmDump dumpForm = new frmDump(devicePath, scsiInfo.DeviceInfo, scsiInfo);
+            var dumpForm = new frmDump(devicePath, scsiInfo.DeviceInfo, scsiInfo);
             dumpForm.Show();
         }
 
         protected void OnBtnScanClick(object sender, EventArgs e)
         {
-            if(scsiInfo.MediaType == MediaType.GDR || scsiInfo.MediaType == MediaType.GDROM)
+            if(scsiInfo.MediaType == MediaType.GDR ||
+               scsiInfo.MediaType == MediaType.GDROM)
             {
                 MessageBox.Show("GD-ROM scan support is not yet implemented.", MessageBoxType.Error);
+
                 return;
             }
 
-            if(scsiInfo.MediaType == MediaType.XGD || scsiInfo.MediaType == MediaType.XGD2 ||
+            if(scsiInfo.MediaType == MediaType.XGD  ||
+               scsiInfo.MediaType == MediaType.XGD2 ||
                scsiInfo.MediaType == MediaType.XGD3)
                 MessageBox.Show("Scanning Xbox discs is not yet supported.", MessageBoxType.Error);
 
-            frmMediaScan scanForm = new frmMediaScan(devicePath, scsiInfo.DeviceInfo, scsiInfo);
+            var scanForm = new frmMediaScan(devicePath, scsiInfo.DeviceInfo, scsiInfo);
             scanForm.Show();
         }
 
diff --git a/Aaru.Gui/ResourceHandler.cs b/Aaru.Gui/ResourceHandler.cs
index 1112c7268..6105014eb 100644
--- a/Aaru.Gui/ResourceHandler.cs
+++ b/Aaru.Gui/ResourceHandler.cs
@@ -35,7 +35,7 @@ using System.Reflection;
 
 namespace Aaru.Gui
 {
-    static class ResourceHandler
+    internal static class ResourceHandler
     {
         internal static Stream GetResourceStream(string resourcePath) =>
             Assembly.GetExecutingAssembly().GetManifestResourceStream(resourcePath);
diff --git a/Aaru.Gui/Tabs/tabAtaInfo.xeto.cs b/Aaru.Gui/Tabs/tabAtaInfo.xeto.cs
index 1b154ffbf..e4ce9f41f 100644
--- a/Aaru.Gui/Tabs/tabAtaInfo.xeto.cs
+++ b/Aaru.Gui/Tabs/tabAtaInfo.xeto.cs
@@ -43,17 +43,16 @@ namespace Aaru.Gui.Tabs
         byte[] ata;
         byte[] atapi;
 
-        public tabAtaInfo()
-        {
-            XamlReader.Load(this);
-        }
+        public tabAtaInfo() => XamlReader.Load(this);
 
         internal void LoadData(byte[] ataIdentify, byte[] atapiIdentify, AtaErrorRegistersChs? ataMcptError)
         {
             ata   = ataIdentify;
             atapi = atapiIdentify;
 
-            if(ataIdentify == null && atapiIdentify == null) return;
+            if(ataIdentify   == null &&
+               atapiIdentify == null)
+                return;
 
             Visible = true;
 
@@ -70,29 +69,36 @@ namespace Aaru.Gui.Tabs
                     {
                         case 0:
                             lblAtaMcpt.Text = "Device reports incorrect media card type";
+
                             break;
                         case 1:
                             lblAtaMcpt.Text = "Device contains a Secure Digital card";
+
                             break;
                         case 2:
                             lblAtaMcpt.Text = "Device contains a MultiMediaCard ";
+
                             break;
                         case 3:
                             lblAtaMcpt.Text = "Device contains a Secure Digital I/O card";
+
                             break;
                         case 4:
                             lblAtaMcpt.Text = "Device contains a Smart Media card";
+
                             break;
                         default:
                             lblAtaMcpt.Text =
                                 $"Device contains unknown media card type {ataMcptError.Value.DeviceHead & 0x07}";
+
                             break;
                     }
 
                     chkAtaMcptWriteProtection.Checked = (ataMcptError.Value.DeviceHead & 0x08) == 0x08;
 
-                    ushort specificData = (ushort)(ataMcptError.Value.CylinderHigh * 0x100 +
+                    ushort specificData = (ushort)((ataMcptError.Value.CylinderHigh * 0x100) +
                                                    ataMcptError.Value.CylinderLow);
+
                     if(specificData != 0)
                     {
                         lblAtaMcptSpecificData.Visible = true;
@@ -114,29 +120,52 @@ namespace Aaru.Gui.Tabs
 
         protected void OnBtnSaveAtaBinary(object sender, EventArgs e)
         {
-            SaveFileDialog dlgSaveBinary = new SaveFileDialog();
-            dlgSaveBinary.Filters.Add(new FileFilter {Extensions = new[] {"*.bin"}, Name = "Binary"});
+            var dlgSaveBinary = new SaveFileDialog();
+
+            dlgSaveBinary.Filters.Add(new FileFilter
+            {
+                Extensions = new[]
+                {
+                    "*.bin"
+                },
+                Name = "Binary"
+            });
+
             DialogResult result = dlgSaveBinary.ShowDialog(this);
 
-            if(result != DialogResult.Ok) return;
+            if(result != DialogResult.Ok)
+                return;
 
-            FileStream saveFs = new FileStream(dlgSaveBinary.FileName, FileMode.Create);
-            if(ata        != null) saveFs.Write(ata,   0, ata.Length);
-            else if(atapi != null) saveFs.Write(atapi, 0, atapi.Length);
+            var saveFs = new FileStream(dlgSaveBinary.FileName, FileMode.Create);
+
+            if(ata != null)
+                saveFs.Write(ata, 0, ata.Length);
+            else if(atapi != null)
+                saveFs.Write(atapi, 0, atapi.Length);
 
             saveFs.Close();
         }
 
         protected void OnBtnSaveAtaText(object sender, EventArgs e)
         {
-            SaveFileDialog dlgSaveText = new SaveFileDialog();
-            dlgSaveText.Filters.Add(new FileFilter {Extensions = new[] {"*.txt"}, Name = "Text"});
+            var dlgSaveText = new SaveFileDialog();
+
+            dlgSaveText.Filters.Add(new FileFilter
+            {
+                Extensions = new[]
+                {
+                    "*.txt"
+                },
+                Name = "Text"
+            });
+
             DialogResult result = dlgSaveText.ShowDialog(this);
 
-            if(result != DialogResult.Ok) return;
+            if(result != DialogResult.Ok)
+                return;
 
-            FileStream   saveFs = new FileStream(dlgSaveText.FileName, FileMode.Create);
-            StreamWriter saveSw = new StreamWriter(saveFs);
+            var saveFs = new FileStream(dlgSaveText.FileName, FileMode.Create);
+            var saveSw = new StreamWriter(saveFs);
             saveSw.Write(txtAtaIdentify.Text);
             saveFs.Close();
         }
diff --git a/Aaru.Gui/Tabs/tabBlurayInfo.xeto.cs b/Aaru.Gui/Tabs/tabBlurayInfo.xeto.cs
index e0220a93e..a6d73e7f8 100644
--- a/Aaru.Gui/Tabs/tabBlurayInfo.xeto.cs
+++ b/Aaru.Gui/Tabs/tabBlurayInfo.xeto.cs
@@ -50,14 +50,11 @@ namespace Aaru.Gui.Tabs
         byte[] SpareAreaInformation;
         byte[] TrackResources;
 
-        public tabBlurayInfo()
-        {
-            XamlReader.Load(this);
-        }
+        public tabBlurayInfo() => XamlReader.Load(this);
 
         internal void LoadData(byte[] blurayDiscInformation, byte[] blurayBurstCuttingArea, byte[] blurayDds,
                                byte[] blurayCartridgeStatus, byte[] bluraySpareAreaInformation,
-                               byte[] blurayPowResources,    byte[] blurayTrackResources, byte[] blurayRawDfl,
+                               byte[] blurayPowResources, byte[] blurayTrackResources, byte[] blurayRawDfl,
                                byte[] blurayPac)
         {
             DiscInformation      = blurayDiscInformation;
@@ -132,62 +129,47 @@ namespace Aaru.Gui.Tabs
 
         void SaveElement(byte[] data)
         {
-            SaveFileDialog dlgSaveBinary = new SaveFileDialog();
-            dlgSaveBinary.Filters.Add(new FileFilter {Extensions = new[] {"*.bin"}, Name = "Binary"});
+            var dlgSaveBinary = new SaveFileDialog();
+
+            dlgSaveBinary.Filters.Add(new FileFilter
+            {
+                Extensions = new[]
+                {
+                    "*.bin"
+                },
+                Name = "Binary"
+            });
+
             DialogResult result = dlgSaveBinary.ShowDialog(this);
 
-            if(result != DialogResult.Ok) return;
+            if(result != DialogResult.Ok)
+                return;
 
-            FileStream saveFs = new FileStream(dlgSaveBinary.FileName, FileMode.Create);
+            var saveFs = new FileStream(dlgSaveBinary.FileName, FileMode.Create);
             saveFs.Write(data, 0, data.Length);
 
             saveFs.Close();
         }
 
-        protected void OnBtnSaveBlurayDiscInformationClick(object sender, EventArgs e)
-        {
-            SaveElement(DiscInformation);
-        }
+        protected void OnBtnSaveBlurayDiscInformationClick(object sender, EventArgs e) => SaveElement(DiscInformation);
 
-        protected void OnBtnSaveBlurayBurstCuttingAreaClick(object sender, EventArgs e)
-        {
+        protected void OnBtnSaveBlurayBurstCuttingAreaClick(object sender, EventArgs e) =>
             SaveElement(BurstCuttingArea);
-        }
 
-        protected void OnBtnSaveBlurayDdsClick(object sender, EventArgs e)
-        {
-            SaveElement(Dds);
-        }
+        protected void OnBtnSaveBlurayDdsClick(object sender, EventArgs e) => SaveElement(Dds);
 
-        protected void OnBtnSaveBlurayCartridgeStatusClick(object sender, EventArgs e)
-        {
-            SaveElement(CartridgeStatus);
-        }
+        protected void OnBtnSaveBlurayCartridgeStatusClick(object sender, EventArgs e) => SaveElement(CartridgeStatus);
 
-        protected void OnBtnSaveBluraySpareAreaInformationClick(object sender, EventArgs e)
-        {
+        protected void OnBtnSaveBluraySpareAreaInformationClick(object sender, EventArgs e) =>
             SaveElement(SpareAreaInformation);
-        }
 
-        protected void OnBtnSaveBlurayPowResourcesClick(object sender, EventArgs e)
-        {
-            SaveElement(PowResources);
-        }
+        protected void OnBtnSaveBlurayPowResourcesClick(object sender, EventArgs e) => SaveElement(PowResources);
 
-        protected void OnBtnSaveBlurayTrackResourcesClick(object sender, EventArgs e)
-        {
-            SaveElement(TrackResources);
-        }
+        protected void OnBtnSaveBlurayTrackResourcesClick(object sender, EventArgs e) => SaveElement(TrackResources);
 
-        protected void OnBtnSaveBlurayRawDflClick(object sender, EventArgs e)
-        {
-            SaveElement(RawDfl);
-        }
+        protected void OnBtnSaveBlurayRawDflClick(object sender, EventArgs e) => SaveElement(RawDfl);
 
-        protected void OnBtnSaveBlurayPacClick(object sender, EventArgs e)
-        {
-            SaveElement(Pac);
-        }
+        protected void OnBtnSaveBlurayPacClick(object sender, EventArgs e) => SaveElement(Pac);
 
         #region XAML controls
         #pragma warning disable 169
diff --git a/Aaru.Gui/Tabs/tabCompactDiscInfo.xeto.cs b/Aaru.Gui/Tabs/tabCompactDiscInfo.xeto.cs
index 420b3e886..d7b4801f0 100644
--- a/Aaru.Gui/Tabs/tabCompactDiscInfo.xeto.cs
+++ b/Aaru.Gui/Tabs/tabCompactDiscInfo.xeto.cs
@@ -50,19 +50,14 @@ namespace Aaru.Gui.Tabs
         byte[] sessionData;
         byte[] tocData;
 
-        public tabCompactDiscInfo()
-        {
-            XamlReader.Load(this);
-        }
+        public tabCompactDiscInfo() => XamlReader.Load(this);
 
-        internal void LoadData(byte[]                                   toc,                    byte[]             atip,
-                               byte[]                                   compactDiscInformation, byte[]             session, byte[] rawToc,
-                               byte[]                                   pma,                    byte[]             cdTextLeadIn,
-                               TOC.CDTOC?                               decodedToc,             ATIP.CDATIP?       decodedAtip,
-                               Session.CDSessionInfo?                   decodedSession,         FullTOC.CDFullTOC? fullToc,
-                               CDTextOnLeadIn.CDText?                   decodedCdTextLeadIn,
+        internal void LoadData(byte[] toc, byte[] atip, byte[] compactDiscInformation, byte[] session, byte[] rawToc,
+                               byte[] pma, byte[] cdTextLeadIn, TOC.CDTOC? decodedToc, ATIP.CDATIP? decodedAtip,
+                               Session.CDSessionInfo? decodedSession, FullTOC.CDFullTOC? fullToc,
+                               CDTextOnLeadIn.CDText? decodedCdTextLeadIn,
                                DiscInformation.StandardDiscInformation? decodedCompactDiscInformation, string mcn,
-                               Dictionary<byte, string>                 isrcs)
+                               Dictionary<byte, string> isrcs)
         {
             tocData                    = toc;
             atipData                   = atip;
@@ -120,21 +115,35 @@ namespace Aaru.Gui.Tabs
                 txtMcn.Text    = mcn;
             }
 
-            if(isrcs != null && isrcs.Count > 0)
+            if(isrcs       != null &&
+               isrcs.Count > 0)
             {
                 grpIsrcs.Visible = true;
 
-                TreeGridItemCollection isrcsItems = new TreeGridItemCollection();
+                var isrcsItems = new TreeGridItemCollection();
 
-                grdIsrcs.Columns.Add(new GridColumn {HeaderText = "ISRC", DataCell  = new TextBoxCell(0)});
-                grdIsrcs.Columns.Add(new GridColumn {HeaderText = "Track", DataCell = new TextBoxCell(0)});
+                grdIsrcs.Columns.Add(new GridColumn
+                {
+                    HeaderText = "ISRC", DataCell = new TextBoxCell(0)
+                });
+
+                grdIsrcs.Columns.Add(new GridColumn
+                {
+                    HeaderText = "Track", DataCell = new TextBoxCell(0)
+                });
 
                 grdIsrcs.AllowMultipleSelection = false;
                 grdIsrcs.ShowHeader             = true;
                 grdIsrcs.DataStore              = isrcsItems;
 
                 foreach(KeyValuePair<byte, string> isrc in isrcs)
-                    isrcsItems.Add(new TreeGridItem {Values = new object[] {isrc.Key.ToString(), isrc.Value}});
+                    isrcsItems.Add(new TreeGridItem
+                    {
+                        Values = new object[]
+                        {
+                            isrc.Key.ToString(), isrc.Value
+                        }
+                    });
             }
 
             btnCdPma.Visible = pma != null;
@@ -148,52 +157,41 @@ namespace Aaru.Gui.Tabs
 
         void SaveElement(byte[] data)
         {
-            SaveFileDialog dlgSaveBinary = new SaveFileDialog();
-            dlgSaveBinary.Filters.Add(new FileFilter {Extensions = new[] {"*.bin"}, Name = "Binary"});
+            var dlgSaveBinary = new SaveFileDialog();
+
+            dlgSaveBinary.Filters.Add(new FileFilter
+            {
+                Extensions = new[]
+                {
+                    "*.bin"
+                },
+                Name = "Binary"
+            });
+
             DialogResult result = dlgSaveBinary.ShowDialog(this);
 
-            if(result != DialogResult.Ok) return;
+            if(result != DialogResult.Ok)
+                return;
 
-            FileStream saveFs = new FileStream(dlgSaveBinary.FileName, FileMode.Create);
+            var saveFs = new FileStream(dlgSaveBinary.FileName, FileMode.Create);
             saveFs.Write(data, 0, data.Length);
 
             saveFs.Close();
         }
 
-        protected void OnBtnCdInformationClick(object sender, EventArgs e)
-        {
-            SaveElement(compactDiscInformationData);
-        }
+        protected void OnBtnCdInformationClick(object sender, EventArgs e) => SaveElement(compactDiscInformationData);
 
-        protected void OnBtnCdTocClick(object sender, EventArgs e)
-        {
-            SaveElement(tocData);
-        }
+        protected void OnBtnCdTocClick(object sender, EventArgs e) => SaveElement(tocData);
 
-        protected void OnBtnCdFullTocClick(object sender, EventArgs e)
-        {
-            SaveElement(rawTocData);
-        }
+        protected void OnBtnCdFullTocClick(object sender, EventArgs e) => SaveElement(rawTocData);
 
-        protected void OnBtnCdSessionClick(object sender, EventArgs e)
-        {
-            SaveElement(sessionData);
-        }
+        protected void OnBtnCdSessionClick(object sender, EventArgs e) => SaveElement(sessionData);
 
-        protected void OnBtnCdTextClick(object sender, EventArgs e)
-        {
-            SaveElement(cdTextLeadInData);
-        }
+        protected void OnBtnCdTextClick(object sender, EventArgs e) => SaveElement(cdTextLeadInData);
 
-        protected void OnBtnCdAtipClick(object sender, EventArgs e)
-        {
-            SaveElement(atipData);
-        }
+        protected void OnBtnCdAtipClick(object sender, EventArgs e) => SaveElement(atipData);
 
-        protected void OnBtnCdPmaClick(object sender, EventArgs e)
-        {
-            SaveElement(pmaData);
-        }
+        protected void OnBtnCdPmaClick(object sender, EventArgs e) => SaveElement(pmaData);
 
         #region XAML controls
         #pragma warning disable 169
diff --git a/Aaru.Gui/Tabs/tabDvdInfo.xeto.cs b/Aaru.Gui/Tabs/tabDvdInfo.xeto.cs
index 09bc06941..02602594b 100644
--- a/Aaru.Gui/Tabs/tabDvdInfo.xeto.cs
+++ b/Aaru.Gui/Tabs/tabDvdInfo.xeto.cs
@@ -48,14 +48,10 @@ namespace Aaru.Gui.Tabs
         byte[] DvdPfi;
         byte[] HddvdCopyrightInformation;
 
-        public tabDvdInfo()
-        {
-            XamlReader.Load(this);
-        }
+        public tabDvdInfo() => XamlReader.Load(this);
 
-        internal void LoadData(MediaType mediaType, byte[] pfi, byte[] dmi, byte[] cmi,
-                               byte[]    hdCopyrightInformation,
-                               byte[]    bca, byte[] aacs, PFI.PhysicalFormatInformation? decodedPfi)
+        internal void LoadData(MediaType mediaType, byte[] pfi, byte[] dmi, byte[] cmi, byte[] hdCopyrightInformation,
+                               byte[] bca, byte[] aacs, PFI.PhysicalFormatInformation? decodedPfi)
         {
             DvdPfi                    = pfi;
             DvdDmi                    = dmi;
@@ -73,9 +69,11 @@ namespace Aaru.Gui.Tabs
                 case MediaType.HDDVDRDL:
                 case MediaType.HDDVDRWDL:
                     Text = "HD DVD";
+
                     break;
                 default:
                     Text = "DVD";
+
                     break;
             }
 
@@ -107,47 +105,39 @@ namespace Aaru.Gui.Tabs
 
         void SaveElement(byte[] data)
         {
-            SaveFileDialog dlgSaveBinary = new SaveFileDialog();
-            dlgSaveBinary.Filters.Add(new FileFilter {Extensions = new[] {"*.bin"}, Name = "Binary"});
+            var dlgSaveBinary = new SaveFileDialog();
+
+            dlgSaveBinary.Filters.Add(new FileFilter
+            {
+                Extensions = new[]
+                {
+                    "*.bin"
+                },
+                Name = "Binary"
+            });
+
             DialogResult result = dlgSaveBinary.ShowDialog(this);
 
-            if(result != DialogResult.Ok) return;
+            if(result != DialogResult.Ok)
+                return;
 
-            FileStream saveFs = new FileStream(dlgSaveBinary.FileName, FileMode.Create);
+            var saveFs = new FileStream(dlgSaveBinary.FileName, FileMode.Create);
             saveFs.Write(data, 0, data.Length);
 
             saveFs.Close();
         }
 
-        protected void OnBtnSaveDvdPfiClick(object sender, EventArgs e)
-        {
-            SaveElement(DvdPfi);
-        }
+        protected void OnBtnSaveDvdPfiClick(object sender, EventArgs e) => SaveElement(DvdPfi);
 
-        protected void OnBtnSaveDvdDmiClick(object sender, EventArgs e)
-        {
-            SaveElement(DvdDmi);
-        }
+        protected void OnBtnSaveDvdDmiClick(object sender, EventArgs e) => SaveElement(DvdDmi);
 
-        protected void OnBtnSaveDvdCmiClick(object sender, EventArgs e)
-        {
-            SaveElement(DvdCmi);
-        }
+        protected void OnBtnSaveDvdCmiClick(object sender, EventArgs e) => SaveElement(DvdCmi);
 
-        protected void OnBtnSaveHdDvdCmiClick(object sender, EventArgs e)
-        {
-            SaveElement(HddvdCopyrightInformation);
-        }
+        protected void OnBtnSaveHdDvdCmiClick(object sender, EventArgs e) => SaveElement(HddvdCopyrightInformation);
 
-        protected void OnBtnSaveDvdBcaClick(object sender, EventArgs e)
-        {
-            SaveElement(DvdBca);
-        }
+        protected void OnBtnSaveDvdBcaClick(object sender, EventArgs e) => SaveElement(DvdBca);
 
-        protected void OnBtnSaveDvdAacsClick(object sender, EventArgs e)
-        {
-            SaveElement(DvdAacs);
-        }
+        protected void OnBtnSaveDvdAacsClick(object sender, EventArgs e) => SaveElement(DvdAacs);
 
         #region XAML controls
         #pragma warning disable 169
diff --git a/Aaru.Gui/Tabs/tabDvdWritableInfo.xeto.cs b/Aaru.Gui/Tabs/tabDvdWritableInfo.xeto.cs
index 47dbd5583..c757f5a77 100644
--- a/Aaru.Gui/Tabs/tabDvdWritableInfo.xeto.cs
+++ b/Aaru.Gui/Tabs/tabDvdWritableInfo.xeto.cs
@@ -58,18 +58,13 @@ namespace Aaru.Gui.Tabs
         byte[] hddvdrLastRmd;
         byte[] hddvdrMediumStatus;
 
-        public tabDvdWritableInfo()
-        {
-            XamlReader.Load(this);
-        }
+        public tabDvdWritableInfo() => XamlReader.Load(this);
 
-        internal void LoadData(MediaType mediaType, byte[] dds, byte[] cartridgeStatus,
-                               byte[]    spareArea,
-                               byte[]    lastBorderOutRmd,    byte[] preRecordedInfo, byte[] mediaIdentifier,
-                               byte[]    physicalInformation, byte[] mediumStatus,    byte[] hdLastRmd,
-                               byte[]    layerCapacity,
-                               byte[]    middleZoneStart,  byte[] jumpIntervalSize, byte[] manualLayerJumpStartLba,
-                               byte[]    remapAnchorPoint, byte[] adip,             byte[] dcb)
+        internal void LoadData(MediaType mediaType, byte[] dds, byte[] cartridgeStatus, byte[] spareArea,
+                               byte[] lastBorderOutRmd, byte[] preRecordedInfo, byte[] mediaIdentifier,
+                               byte[] physicalInformation, byte[] mediumStatus, byte[] hdLastRmd, byte[] layerCapacity,
+                               byte[] middleZoneStart, byte[] jumpIntervalSize, byte[] manualLayerJumpStartLba,
+                               byte[] remapAnchorPoint, byte[] adip, byte[] dcb)
         {
             dvdRamDds                     = dds;
             dvdRamCartridgeStatus         = cartridgeStatus;
@@ -87,49 +82,64 @@ namespace Aaru.Gui.Tabs
             dvdrDlRemapAnchorPoint        = remapAnchorPoint;
             dvdPlusAdip                   = adip;
             dvdPlusDcb                    = dcb;
+
             switch(mediaType)
             {
                 case MediaType.DVDR:
                     Text = "DVD-R";
+
                     break;
                 case MediaType.DVDRW:
                     Text = "DVD-RW";
+
                     break;
                 case MediaType.DVDPR:
                     Text = "DVD+R";
+
                     break;
                 case MediaType.DVDPRW:
                     Text = "DVD+RW";
+
                     break;
                 case MediaType.DVDPRWDL:
                     Text = "DVD+RW DL";
+
                     break;
                 case MediaType.DVDRDL:
                     Text = "DVD-R DL";
+
                     break;
                 case MediaType.DVDPRDL:
                     Text = "DVD+R DL";
+
                     break;
                 case MediaType.DVDRAM:
                     Text = "DVD-RAM";
+
                     break;
                 case MediaType.DVDRWDL:
                     Text = "DVD-RW DL";
+
                     break;
                 case MediaType.HDDVDRAM:
                     Text = "HD DVD-RAM";
+
                     break;
                 case MediaType.HDDVDR:
                     Text = "HD DVD-R";
+
                     break;
                 case MediaType.HDDVDRW:
                     Text = "HD DVD-RW";
+
                     break;
                 case MediaType.HDDVDRDL:
                     Text = "HD DVD-R DL";
+
                     break;
                 case MediaType.HDDVDRWDL:
                     Text = "HD DVD-RW DL";
+
                     break;
             }
 
@@ -185,97 +195,67 @@ namespace Aaru.Gui.Tabs
 
         void SaveElement(byte[] data)
         {
-            SaveFileDialog dlgSaveBinary = new SaveFileDialog();
-            dlgSaveBinary.Filters.Add(new FileFilter {Extensions = new[] {"*.bin"}, Name = "Binary"});
+            var dlgSaveBinary = new SaveFileDialog();
+
+            dlgSaveBinary.Filters.Add(new FileFilter
+            {
+                Extensions = new[]
+                {
+                    "*.bin"
+                },
+                Name = "Binary"
+            });
+
             DialogResult result = dlgSaveBinary.ShowDialog(this);
 
-            if(result != DialogResult.Ok) return;
+            if(result != DialogResult.Ok)
+                return;
 
-            FileStream saveFs = new FileStream(dlgSaveBinary.FileName, FileMode.Create);
+            var saveFs = new FileStream(dlgSaveBinary.FileName, FileMode.Create);
             saveFs.Write(data, 0, data.Length);
 
             saveFs.Close();
         }
 
-        protected void OnBtnSaveDvdRamDdsClick(object sender, EventArgs e)
-        {
-            SaveElement(dvdRamDds);
-        }
+        protected void OnBtnSaveDvdRamDdsClick(object sender, EventArgs e) => SaveElement(dvdRamDds);
 
-        protected void OnBtnSaveDvdRamCartridgeStatusClick(object sender, EventArgs e)
-        {
+        protected void OnBtnSaveDvdRamCartridgeStatusClick(object sender, EventArgs e) =>
             SaveElement(dvdRamCartridgeStatus);
-        }
 
-        protected void OnBtnSaveDvdRamSpareAreaInformationClick(object sender, EventArgs e)
-        {
+        protected void OnBtnSaveDvdRamSpareAreaInformationClick(object sender, EventArgs e) =>
             SaveElement(dvdRamSpareArea);
-        }
 
-        protected void OnBtnSaveLastBorderOutRmdClick(object sender, EventArgs e)
-        {
-            SaveElement(dvdLastBorderOutRmd);
-        }
+        protected void OnBtnSaveLastBorderOutRmdClick(object sender, EventArgs e) => SaveElement(dvdLastBorderOutRmd);
 
-        protected void OnBtnSaveDvdPreRecordedInfoClick(object sender, EventArgs e)
-        {
-            SaveElement(dvdPreRecordedInfo);
-        }
+        protected void OnBtnSaveDvdPreRecordedInfoClick(object sender, EventArgs e) => SaveElement(dvdPreRecordedInfo);
 
-        protected void OnBtnSaveDvdrMediaIdentifierClick(object sender, EventArgs e)
-        {
+        protected void OnBtnSaveDvdrMediaIdentifierClick(object sender, EventArgs e) =>
             SaveElement(dvdrMediaIdentifier);
-        }
 
-        protected void OnBtnSaveDvdrPhysicalInformationClick(object sender, EventArgs e)
-        {
+        protected void OnBtnSaveDvdrPhysicalInformationClick(object sender, EventArgs e) =>
             SaveElement(dvdrPhysicalInformation);
-        }
 
-        protected void OnBtnSaveHddvdrMediumStatusClick(object sender, EventArgs e)
-        {
-            SaveElement(hddvdrMediumStatus);
-        }
+        protected void OnBtnSaveHddvdrMediumStatusClick(object sender, EventArgs e) => SaveElement(hddvdrMediumStatus);
 
-        protected void OnBtnSaveHddvdrLastRmdClick(object sender, EventArgs e)
-        {
-            SaveElement(hddvdrLastRmd);
-        }
+        protected void OnBtnSaveHddvdrLastRmdClick(object sender, EventArgs e) => SaveElement(hddvdrLastRmd);
 
-        protected void OnBtnSaveDvdrLayerCapacityClick(object sender, EventArgs e)
-        {
-            SaveElement(dvdrLayerCapacity);
-        }
+        protected void OnBtnSaveDvdrLayerCapacityClick(object sender, EventArgs e) => SaveElement(dvdrLayerCapacity);
 
-        protected void OnBtnSaveDvdrDlMiddleZoneStartClick(object sender, EventArgs e)
-        {
+        protected void OnBtnSaveDvdrDlMiddleZoneStartClick(object sender, EventArgs e) =>
             SaveElement(dvdrDlMiddleZoneStart);
-        }
 
-        protected void OnBtnSaveDvdrDlJumpIntervalSizeClick(object sender, EventArgs e)
-        {
+        protected void OnBtnSaveDvdrDlJumpIntervalSizeClick(object sender, EventArgs e) =>
             SaveElement(dvdrDlJumpIntervalSize);
-        }
 
-        protected void OnBtnSaveDvdrDlManualLayerJumpStartLbaClick(object sender, EventArgs e)
-        {
+        protected void OnBtnSaveDvdrDlManualLayerJumpStartLbaClick(object sender, EventArgs e) =>
             SaveElement(dvdrDlManualLayerJumpStartLba);
-        }
 
-        protected void OnBtnSaveDvdrDlRemapAnchorPointClick(object sender, EventArgs e)
-        {
+        protected void OnBtnSaveDvdrDlRemapAnchorPointClick(object sender, EventArgs e) =>
             SaveElement(dvdrDlRemapAnchorPoint);
-        }
 
-        protected void OnBtnSaveDvdPlusAdipClick(object sender, EventArgs e)
-        {
-            SaveElement(dvdPlusAdip);
-        }
+        protected void OnBtnSaveDvdPlusAdipClick(object sender, EventArgs e) => SaveElement(dvdPlusAdip);
 
-        protected void OnBtnSaveDvdPlusDcbClick(object sender, EventArgs e)
-        {
-            SaveElement(dvdPlusDcb);
-        }
+        protected void OnBtnSaveDvdPlusDcbClick(object sender, EventArgs e) => SaveElement(dvdPlusDcb);
 
         #region XAML controls
         #pragma warning disable 169
diff --git a/Aaru.Gui/Tabs/tabPcmciaInfo.xeto.cs b/Aaru.Gui/Tabs/tabPcmciaInfo.xeto.cs
index 8d83fb4f2..22f99f886 100644
--- a/Aaru.Gui/Tabs/tabPcmciaInfo.xeto.cs
+++ b/Aaru.Gui/Tabs/tabPcmciaInfo.xeto.cs
@@ -44,27 +44,29 @@ namespace Aaru.Gui.Tabs
     {
         byte[] cis;
 
-        public tabPcmciaInfo()
-        {
-            XamlReader.Load(this);
-        }
+        public tabPcmciaInfo() => XamlReader.Load(this);
 
         internal void LoadData(byte[] pcmciaCis)
         {
-            if(pcmciaCis == null) return;
+            if(pcmciaCis == null)
+                return;
 
             cis     = pcmciaCis;
             Visible = true;
 
-            TreeGridItemCollection cisList = new TreeGridItemCollection();
+            var cisList = new TreeGridItemCollection();
 
-            treePcmcia.Columns.Add(new GridColumn {HeaderText = "CIS", DataCell = new TextBoxCell(0)});
+            treePcmcia.Columns.Add(new GridColumn
+            {
+                HeaderText = "CIS", DataCell = new TextBoxCell(0)
+            });
 
             treePcmcia.AllowMultipleSelection = false;
             treePcmcia.ShowHeader             = false;
             treePcmcia.DataStore              = cisList;
 
             Tuple[] tuples = CIS.GetTuples(cis);
+
             if(tuples != null)
                 foreach(Tuple tuple in tuples)
                 {
@@ -79,14 +81,17 @@ namespace Aaru.Gui.Tabs
                         case TupleCodes.CISTPL_DEVICEGEO_A:
                             tupleCode        = "Device Geometry Tuples";
                             tupleDescription = CIS.PrettifyDeviceGeometryTuple(tuple);
+
                             break;
                         case TupleCodes.CISTPL_MANFID:
                             tupleCode        = "Manufacturer Identification Tuple";
                             tupleDescription = CIS.PrettifyManufacturerIdentificationTuple(tuple);
+
                             break;
                         case TupleCodes.CISTPL_VERS_1:
                             tupleCode        = "Level 1 Version / Product Information Tuple";
                             tupleDescription = CIS.PrettifyLevel1VersionTuple(tuple);
+
                             break;
                         case TupleCodes.CISTPL_ALTSTR:
                         case TupleCodes.CISTPL_BAR:
@@ -124,34 +129,54 @@ namespace Aaru.Gui.Tabs
                         case TupleCodes.CISTPL_VERS_2:
                             tupleCode        = $"Undecoded tuple ID {tuple.Code}";
                             tupleDescription = $"Undecoded tuple ID {tuple.Code}";
+
                             break;
                         default:
                             tupleCode        = $"0x{(byte)tuple.Code:X2}";
                             tupleDescription = $"Found unknown tuple ID 0x{(byte)tuple.Code:X2}";
+
                             break;
                     }
 
-                    cisList.Add(new TreeGridItem {Values = new object[] {tupleCode, tupleDescription}});
+                    cisList.Add(new TreeGridItem
+                    {
+                        Values = new object[]
+                        {
+                            tupleCode, tupleDescription
+                        }
+                    });
                 }
-            else AaruConsole.DebugWriteLine("Device-Info command", "PCMCIA CIS returned no tuples");
+            else
+                AaruConsole.DebugWriteLine("Device-Info command", "PCMCIA CIS returned no tuples");
         }
 
         protected void OnTreePcmciaSelectedItemChanged(object sender, EventArgs e)
         {
-            if(!(treePcmcia.SelectedItem is TreeGridItem item)) return;
+            if(!(treePcmcia.SelectedItem is TreeGridItem item))
+                return;
 
             txtPcmciaCis.Text = item.Values[1] as string;
         }
 
         protected void OnBtnSavePcmciaCis(object sender, EventArgs e)
         {
-            SaveFileDialog dlgSaveBinary = new SaveFileDialog();
-            dlgSaveBinary.Filters.Add(new FileFilter {Extensions = new[] {"*.bin"}, Name = "Binary"});
+            var dlgSaveBinary = new SaveFileDialog();
+
+            dlgSaveBinary.Filters.Add(new FileFilter
+            {
+                Extensions = new[]
+                {
+                    "*.bin"
+                },
+                Name = "Binary"
+            });
+
             DialogResult result = dlgSaveBinary.ShowDialog(this);
 
-            if(result != DialogResult.Ok) return;
+            if(result != DialogResult.Ok)
+                return;
 
-            FileStream saveFs = new FileStream(dlgSaveBinary.FileName, FileMode.Create);
+            var saveFs = new FileStream(dlgSaveBinary.FileName, FileMode.Create);
             saveFs.Write(cis, 0, cis.Length);
 
             saveFs.Close();
diff --git a/Aaru.Gui/Tabs/tabScsiInfo.xeto.cs b/Aaru.Gui/Tabs/tabScsiInfo.xeto.cs
index 385acd817..5a25070ef 100644
--- a/Aaru.Gui/Tabs/tabScsiInfo.xeto.cs
+++ b/Aaru.Gui/Tabs/tabScsiInfo.xeto.cs
@@ -40,57 +40,57 @@ using Aaru.Decoders.SCSI;
 using Aaru.Decoders.SCSI.MMC;
 using Eto.Forms;
 using Eto.Serialization.Xaml;
-using Inquiry = Aaru.Decoders.SCSI.Inquiry;
+using Inquiry = Aaru.CommonTypes.Structs.Devices.SCSI.Inquiry;
 
 namespace Aaru.Gui.Tabs
 {
     public class tabScsiInfo : TabPage
     {
-        private byte[] configuration;
-        private Dictionary<byte, byte[]> evpdPages;
-        private CommonTypes.Structs.Devices.SCSI.Inquiry? inquiry;
-        private byte[] inquiryData;
-        private Modes.DecodedMode? mode;
-        private byte[] modeSense10;
-        private byte[] modeSense6;
-        private PeripheralDeviceTypes type;
+        byte[]                   configuration;
+        Dictionary<byte, byte[]> evpdPages;
+        Inquiry?                 inquiry;
+        byte[]                   inquiryData;
+        Modes.DecodedMode?       mode;
+        byte[]                   modeSense10;
+        byte[]                   modeSense6;
+        PeripheralDeviceTypes    type;
 
-        public tabScsiInfo()
-        {
-            XamlReader.Load(this);
-        }
+        public tabScsiInfo() => XamlReader.Load(this);
 
-        internal void LoadData(byte[] scsiInquiryData, CommonTypes.Structs.Devices.SCSI.Inquiry? scsiInquiry,
-            Dictionary<byte, byte[]> scsiEvpdPages, Modes.DecodedMode? scsiMode,
-            PeripheralDeviceTypes scsiType, byte[] scsiModeSense6,
-            byte[] scsiModeSense10,
-            byte[] mmcConfiguration)
+        internal void LoadData(byte[] scsiInquiryData, Inquiry? scsiInquiry, Dictionary<byte, byte[]> scsiEvpdPages,
+                               Modes.DecodedMode? scsiMode, PeripheralDeviceTypes scsiType, byte[] scsiModeSense6,
+                               byte[] scsiModeSense10, byte[] mmcConfiguration)
         {
-            inquiryData = scsiInquiryData;
-            inquiry = scsiInquiry;
-            evpdPages = scsiEvpdPages;
-            mode = scsiMode;
-            type = scsiType;
-            modeSense6 = scsiModeSense6;
-            modeSense10 = scsiModeSense10;
+            inquiryData   = scsiInquiryData;
+            inquiry       = scsiInquiry;
+            evpdPages     = scsiEvpdPages;
+            mode          = scsiMode;
+            type          = scsiType;
+            modeSense6    = scsiModeSense6;
+            modeSense10   = scsiModeSense10;
             configuration = mmcConfiguration;
 
-            if (inquiryData == null || !inquiry.HasValue) return;
+            if(inquiryData == null ||
+               !inquiry.HasValue)
+                return;
 
-            Visible = true;
-            txtScsiInquiry.Text = Inquiry.Prettify(inquiry);
+            Visible             = true;
+            txtScsiInquiry.Text = Decoders.SCSI.Inquiry.Prettify(inquiry);
 
-            if (mode.HasValue)
+            if(mode.HasValue)
             {
                 tabScsiModeSense.Visible = true;
 
                 var modePagesList = new TreeGridItemCollection();
 
-                treeModeSensePages.Columns.Add(new GridColumn {HeaderText = "Page", DataCell = new TextBoxCell(0)});
+                treeModeSensePages.Columns.Add(new GridColumn
+                {
+                    HeaderText = "Page", DataCell = new TextBoxCell(0)
+                });
 
                 treeModeSensePages.AllowMultipleSelection = false;
-                treeModeSensePages.ShowHeader = false;
-                treeModeSensePages.DataStore = modePagesList;
+                treeModeSensePages.ShowHeader             = false;
+                treeModeSensePages.DataStore              = modePagesList;
 
                 modePagesList.Add(new TreeGridItem
                 {
@@ -100,137 +100,166 @@ namespace Aaru.Gui.Tabs
                     }
                 });
 
-                if (mode.Value.Pages != null)
-                    foreach (var page in mode.Value.Pages.OrderBy(t => t.Page).ThenBy(t => t.Subpage))
+                if(mode.Value.Pages != null)
+                    foreach(Modes.ModePage page in mode.Value.Pages.OrderBy(t => t.Page).ThenBy(t => t.Subpage))
                     {
-                        var pageNumberText = page.Subpage == 0
-                            ? $"MODE {page.Page:X2}h"
-                            : $"MODE {page.Page:X2} Subpage {page.Subpage:X2}";
+                        string pageNumberText = page.Subpage == 0 ? $"MODE {page.Page:X2}h"
+                                                    : $"MODE {page.Page:X2} Subpage {page.Subpage:X2}";
+
                         string decodedText;
 
-                        switch (page.Page)
+                        switch(page.Page)
                         {
                             case 0x00:
                             {
-                                if (type == PeripheralDeviceTypes.MultiMediaDevice && page.Subpage == 0)
+                                if(type         == PeripheralDeviceTypes.MultiMediaDevice &&
+                                   page.Subpage == 0)
                                     decodedText = Modes.PrettifyModePage_00_SFF(page.PageResponse);
-                                else decodedText = "Undecoded";
+                                else
+                                    decodedText = "Undecoded";
 
                                 break;
                             }
                             case 0x01:
                             {
-                                if (page.Subpage == 0)
+                                if(page.Subpage == 0)
                                     decodedText = type == PeripheralDeviceTypes.MultiMediaDevice
-                                        ? Modes.PrettifyModePage_01_MMC(page.PageResponse)
-                                        : Modes.PrettifyModePage_01(page.PageResponse);
-                                else goto default;
+                                                      ? Modes.PrettifyModePage_01_MMC(page.PageResponse)
+                                                      : Modes.PrettifyModePage_01(page.PageResponse);
+                                else
+                                    goto default;
 
                                 break;
                             }
                             case 0x02:
                             {
-                                if (page.Subpage == 0) decodedText = Modes.PrettifyModePage_02(page.PageResponse);
-                                else goto default;
+                                if(page.Subpage == 0)
+                                    decodedText = Modes.PrettifyModePage_02(page.PageResponse);
+                                else
+                                    goto default;
 
                                 break;
                             }
                             case 0x03:
                             {
-                                if (page.Subpage == 0) decodedText = Modes.PrettifyModePage_03(page.PageResponse);
-                                else goto default;
+                                if(page.Subpage == 0)
+                                    decodedText = Modes.PrettifyModePage_03(page.PageResponse);
+                                else
+                                    goto default;
 
                                 break;
                             }
                             case 0x04:
                             {
-                                if (page.Subpage == 0) decodedText = Modes.PrettifyModePage_04(page.PageResponse);
-                                else goto default;
+                                if(page.Subpage == 0)
+                                    decodedText = Modes.PrettifyModePage_04(page.PageResponse);
+                                else
+                                    goto default;
 
                                 break;
                             }
                             case 0x05:
                             {
-                                if (page.Subpage == 0) decodedText = Modes.PrettifyModePage_05(page.PageResponse);
-                                else goto default;
+                                if(page.Subpage == 0)
+                                    decodedText = Modes.PrettifyModePage_05(page.PageResponse);
+                                else
+                                    goto default;
 
                                 break;
                             }
                             case 0x06:
                             {
-                                if (page.Subpage == 0) decodedText = Modes.PrettifyModePage_06(page.PageResponse);
-                                else goto default;
+                                if(page.Subpage == 0)
+                                    decodedText = Modes.PrettifyModePage_06(page.PageResponse);
+                                else
+                                    goto default;
 
                                 break;
                             }
                             case 0x07:
                             {
-                                if (page.Subpage == 0)
+                                if(page.Subpage == 0)
                                     decodedText = type == PeripheralDeviceTypes.MultiMediaDevice
-                                        ? Modes.PrettifyModePage_07_MMC(page.PageResponse)
-                                        : Modes.PrettifyModePage_07(page.PageResponse);
-                                else goto default;
+                                                      ? Modes.PrettifyModePage_07_MMC(page.PageResponse)
+                                                      : Modes.PrettifyModePage_07(page.PageResponse);
+                                else
+                                    goto default;
 
                                 break;
                             }
                             case 0x08:
                             {
-                                if (page.Subpage == 0) decodedText = Modes.PrettifyModePage_08(page.PageResponse);
-                                else goto default;
+                                if(page.Subpage == 0)
+                                    decodedText = Modes.PrettifyModePage_08(page.PageResponse);
+                                else
+                                    goto default;
 
                                 break;
                             }
                             case 0x0A:
                             {
-                                if (page.Subpage == 0) decodedText = Modes.PrettifyModePage_0A(page.PageResponse);
-                                else if (page.Subpage == 1)
+                                if(page.Subpage == 0)
+                                    decodedText = Modes.PrettifyModePage_0A(page.PageResponse);
+                                else if(page.Subpage == 1)
                                     decodedText = Modes.PrettifyModePage_0A_S01(page.PageResponse);
-                                else goto default;
+                                else
+                                    goto default;
 
                                 break;
                             }
                             case 0x0B:
                             {
-                                if (page.Subpage == 0) decodedText = Modes.PrettifyModePage_0B(page.PageResponse);
-                                else goto default;
+                                if(page.Subpage == 0)
+                                    decodedText = Modes.PrettifyModePage_0B(page.PageResponse);
+                                else
+                                    goto default;
 
                                 break;
                             }
                             case 0x0D:
                             {
-                                if (page.Subpage == 0) decodedText = Modes.PrettifyModePage_0D(page.PageResponse);
-                                else goto default;
+                                if(page.Subpage == 0)
+                                    decodedText = Modes.PrettifyModePage_0D(page.PageResponse);
+                                else
+                                    goto default;
 
                                 break;
                             }
                             case 0x0E:
                             {
-                                if (page.Subpage == 0) decodedText = Modes.PrettifyModePage_0E(page.PageResponse);
-                                else goto default;
+                                if(page.Subpage == 0)
+                                    decodedText = Modes.PrettifyModePage_0E(page.PageResponse);
+                                else
+                                    goto default;
 
                                 break;
                             }
                             case 0x0F:
                             {
-                                if (page.Subpage == 0) decodedText = Modes.PrettifyModePage_0F(page.PageResponse);
-                                else goto default;
+                                if(page.Subpage == 0)
+                                    decodedText = Modes.PrettifyModePage_0F(page.PageResponse);
+                                else
+                                    goto default;
 
                                 break;
                             }
                             case 0x10:
                             {
-                                if (page.Subpage == 0)
+                                if(page.Subpage == 0)
                                     decodedText = type == PeripheralDeviceTypes.SequentialAccess
-                                        ? Modes.PrettifyModePage_10_SSC(page.PageResponse)
-                                        : Modes.PrettifyModePage_10(page.PageResponse);
-                                else goto default;
+                                                      ? Modes.PrettifyModePage_10_SSC(page.PageResponse)
+                                                      : Modes.PrettifyModePage_10(page.PageResponse);
+                                else
+                                    goto default;
 
                                 break;
                             }
                             case 0x11:
                             {
-                                if (page.Subpage == 0) decodedText = Modes.PrettifyModePage_11(page.PageResponse);
-                                else goto default;
+                                if(page.Subpage == 0)
+                                    decodedText = Modes.PrettifyModePage_11(page.PageResponse);
+                                else
+                                    goto default;
 
                                 break;
                             }
@@ -238,554 +267,674 @@ namespace Aaru.Gui.Tabs
                             case 0x13:
                             case 0x14:
                             {
-                                if (page.Subpage == 0) decodedText = Modes.PrettifyModePage_12_13_14(page.PageResponse);
-                                else goto default;
+                                if(page.Subpage == 0)
+                                    decodedText = Modes.PrettifyModePage_12_13_14(page.PageResponse);
+                                else
+                                    goto default;
 
                                 break;
                             }
                             case 0x1A:
                             {
-                                if (page.Subpage == 0) decodedText = Modes.PrettifyModePage_1A(page.PageResponse);
-                                else if (page.Subpage == 1)
+                                if(page.Subpage == 0)
+                                    decodedText = Modes.PrettifyModePage_1A(page.PageResponse);
+                                else if(page.Subpage == 1)
                                     decodedText = Modes.PrettifyModePage_1A_S01(page.PageResponse);
-                                else goto default;
+                                else
+                                    goto default;
 
                                 break;
                             }
                             case 0x1B:
                             {
-                                if (page.Subpage == 0) decodedText = Modes.PrettifyModePage_1B(page.PageResponse);
-                                else goto default;
+                                if(page.Subpage == 0)
+                                    decodedText = Modes.PrettifyModePage_1B(page.PageResponse);
+                                else
+                                    goto default;
 
                                 break;
                             }
                             case 0x1C:
                             {
-                                if (page.Subpage == 0)
+                                if(page.Subpage == 0)
                                     decodedText = type == PeripheralDeviceTypes.MultiMediaDevice
-                                        ? Modes.PrettifyModePage_1C_SFF(page.PageResponse)
-                                        : Modes.PrettifyModePage_1C(page.PageResponse);
-                                else if (page.Subpage == 1)
+                                                      ? Modes.PrettifyModePage_1C_SFF(page.PageResponse)
+                                                      : Modes.PrettifyModePage_1C(page.PageResponse);
+                                else if(page.Subpage == 1)
                                     decodedText = Modes.PrettifyModePage_1C_S01(page.PageResponse);
-                                else goto default;
+                                else
+                                    goto default;
 
                                 break;
                             }
                             case 0x1D:
                             {
-                                if (page.Subpage == 0) decodedText = Modes.PrettifyModePage_1D(page.PageResponse);
-                                else goto default;
+                                if(page.Subpage == 0)
+                                    decodedText = Modes.PrettifyModePage_1D(page.PageResponse);
+                                else
+                                    goto default;
 
                                 break;
                             }
                             case 0x21:
                             {
-                                if (StringHandlers.CToString(inquiry?.VendorIdentification).Trim() == "CERTANCE")
+                                if(StringHandlers.CToString(inquiry?.VendorIdentification).Trim() == "CERTANCE")
                                     decodedText = Modes.PrettifyCertanceModePage_21(page.PageResponse);
-                                else goto default;
+                                else
+                                    goto default;
 
                                 break;
                             }
                             case 0x22:
                             {
-                                if (StringHandlers.CToString(inquiry?.VendorIdentification).Trim() == "CERTANCE")
+                                if(StringHandlers.CToString(inquiry?.VendorIdentification).Trim() == "CERTANCE")
                                     decodedText = Modes.PrettifyCertanceModePage_22(page.PageResponse);
-                                else goto default;
+                                else
+                                    goto default;
 
                                 break;
                             }
                             case 0x24:
                             {
-                                if (StringHandlers.CToString(inquiry?.VendorIdentification).Trim() == "IBM")
+                                if(StringHandlers.CToString(inquiry?.VendorIdentification).Trim() == "IBM")
                                     decodedText = Modes.PrettifyIBMModePage_24(page.PageResponse);
-                                else goto default;
+                                else
+                                    goto default;
 
                                 break;
                             }
                             case 0x2A:
                             {
-                                if (page.Subpage == 0) decodedText = Modes.PrettifyModePage_2A(page.PageResponse);
-                                else goto default;
+                                if(page.Subpage == 0)
+                                    decodedText = Modes.PrettifyModePage_2A(page.PageResponse);
+                                else
+                                    goto default;
 
                                 break;
                             }
                             case 0x2F:
                             {
-                                if (StringHandlers.CToString(inquiry?.VendorIdentification).Trim() == "IBM")
+                                if(StringHandlers.CToString(inquiry?.VendorIdentification).Trim() == "IBM")
                                     decodedText = Modes.PrettifyIBMModePage_2F(page.PageResponse);
-                                else goto default;
+                                else
+                                    goto default;
 
                                 break;
                             }
                             case 0x30:
                             {
-                                if (Modes.IsAppleModePage_30(page.PageResponse))
+                                if(Modes.IsAppleModePage_30(page.PageResponse))
                                     decodedText = "Drive identifies as Apple OEM drive";
-                                else goto default;
+                                else
+                                    goto default;
 
                                 break;
                             }
                             case 0x3B:
                             {
-                                if (StringHandlers.CToString(inquiry?.VendorIdentification).Trim() == "HP")
+                                if(StringHandlers.CToString(inquiry?.VendorIdentification).Trim() == "HP")
                                     decodedText = Modes.PrettifyHPModePage_3B(page.PageResponse);
-                                else goto default;
+                                else
+                                    goto default;
 
                                 break;
                             }
                             case 0x3C:
                             {
-                                if (StringHandlers.CToString(inquiry?.VendorIdentification).Trim() == "HP")
+                                if(StringHandlers.CToString(inquiry?.VendorIdentification).Trim() == "HP")
                                     decodedText = Modes.PrettifyHPModePage_3C(page.PageResponse);
-                                else goto default;
+                                else
+                                    goto default;
 
                                 break;
                             }
                             case 0x3D:
                             {
-                                if (StringHandlers.CToString(inquiry?.VendorIdentification).Trim() == "IBM")
+                                if(StringHandlers.CToString(inquiry?.VendorIdentification).Trim() == "IBM")
                                     decodedText = Modes.PrettifyIBMModePage_3D(page.PageResponse);
-                                else if (StringHandlers.CToString(inquiry?.VendorIdentification).Trim() == "HP")
+                                else if(StringHandlers.CToString(inquiry?.VendorIdentification).Trim() == "HP")
                                     decodedText = Modes.PrettifyHPModePage_3D(page.PageResponse);
-                                else goto default;
+                                else
+                                    goto default;
 
                                 break;
                             }
                             case 0x3E:
                             {
-                                if (StringHandlers.CToString(inquiry?.VendorIdentification).Trim() == "FUJITSU")
+                                if(StringHandlers.CToString(inquiry?.VendorIdentification).Trim() == "FUJITSU")
                                     decodedText = Modes.PrettifyFujitsuModePage_3E(page.PageResponse);
-                                else if (StringHandlers.CToString(inquiry?.VendorIdentification).Trim() == "HP")
+                                else if(StringHandlers.CToString(inquiry?.VendorIdentification).Trim() == "HP")
                                     decodedText = Modes.PrettifyHPModePage_3E(page.PageResponse);
-                                else goto default;
+                                else
+                                    goto default;
 
                                 break;
                             }
                             default:
                             {
                                 decodedText = "Undecoded";
+
                                 break;
                             }
                         }
 
                         // TODO: Automatic error reporting
-                        if (decodedText == null) decodedText = "Error decoding page, please open an issue.";
-                        modePagesList.Add(new TreeGridItem {Values = new object[] {pageNumberText, decodedText}});
+                        if(decodedText == null)
+                            decodedText = "Error decoding page, please open an issue.";
+
+                        modePagesList.Add(new TreeGridItem
+                        {
+                            Values = new object[]
+                            {
+                                pageNumberText, decodedText
+                            }
+                        });
                     }
             }
 
-            if (evpdPages != null)
+            if(evpdPages != null)
             {
-                tabScsiEvpd.Visible = true;
+                tabScsiEvpd.Visible      = true;
                 treeEvpdPages.ShowHeader = false;
 
                 var evpdPagesList = new TreeGridItemCollection();
 
-                treeEvpdPages.Columns.Add(new GridColumn {HeaderText = "Page", DataCell = new TextBoxCell(0)});
+                treeEvpdPages.Columns.Add(new GridColumn
+                {
+                    HeaderText = "Page", DataCell = new TextBoxCell(0)
+                });
 
                 treeEvpdPages.AllowMultipleSelection = false;
-                treeEvpdPages.ShowHeader = false;
-                treeEvpdPages.DataStore = evpdPagesList;
+                treeEvpdPages.ShowHeader             = false;
+                treeEvpdPages.DataStore              = evpdPagesList;
 
-                foreach (var page in evpdPages.OrderBy(t => t.Key))
+                foreach(KeyValuePair<byte, byte[]> page in evpdPages.OrderBy(t => t.Key))
                 {
-                    var evpdPageTitle = "";
-                    var evpdDecodedPage = "";
-                    if (page.Key >= 0x01 && page.Key <= 0x7F)
+                    string evpdPageTitle   = "";
+                    string evpdDecodedPage = "";
+
+                    if(page.Key >= 0x01 &&
+                       page.Key <= 0x7F)
                     {
-                        evpdPageTitle = $"ASCII Page {page.Key:X2}h";
+                        evpdPageTitle   = $"ASCII Page {page.Key:X2}h";
                         evpdDecodedPage = EVPD.DecodeASCIIPage(page.Value);
                     }
-                    else if (page.Key == 0x80)
+                    else if(page.Key == 0x80)
                     {
-                        evpdPageTitle = "Unit Serial Number";
+                        evpdPageTitle   = "Unit Serial Number";
                         evpdDecodedPage = EVPD.DecodePage80(page.Value);
                     }
-                    else if (page.Key == 0x81)
+                    else if(page.Key == 0x81)
                     {
-                        evpdPageTitle = "SCSI Implemented operating definitions";
+                        evpdPageTitle   = "SCSI Implemented operating definitions";
                         evpdDecodedPage = EVPD.PrettifyPage_81(page.Value);
                     }
-                    else if (page.Key == 0x82)
+                    else if(page.Key == 0x82)
                     {
-                        evpdPageTitle = "ASCII implemented operating definitions";
+                        evpdPageTitle   = "ASCII implemented operating definitions";
                         evpdDecodedPage = EVPD.DecodePage82(page.Value);
                     }
-                    else if (page.Key == 0x83)
+                    else if(page.Key == 0x83)
                     {
-                        evpdPageTitle = "SCSI Device identification";
+                        evpdPageTitle   = "SCSI Device identification";
                         evpdDecodedPage = EVPD.PrettifyPage_83(page.Value);
                     }
-                    else if (page.Key == 0x84)
+                    else if(page.Key == 0x84)
                     {
-                        evpdPageTitle = "SCSI Software Interface Identifiers";
+                        evpdPageTitle   = "SCSI Software Interface Identifiers";
                         evpdDecodedPage = EVPD.PrettifyPage_84(page.Value);
                     }
-                    else if (page.Key == 0x85)
+                    else if(page.Key == 0x85)
                     {
-                        evpdPageTitle = "SCSI Management Network Addresses";
+                        evpdPageTitle   = "SCSI Management Network Addresses";
                         evpdDecodedPage = EVPD.PrettifyPage_85(page.Value);
                     }
-                    else if (page.Key == 0x86)
+                    else if(page.Key == 0x86)
                     {
-                        evpdPageTitle = "SCSI Extended INQUIRY Data";
+                        evpdPageTitle   = "SCSI Extended INQUIRY Data";
                         evpdDecodedPage = EVPD.PrettifyPage_86(page.Value);
                     }
-                    else if (page.Key == 0x89)
+                    else if(page.Key == 0x89)
                     {
-                        evpdPageTitle = "SCSI to ATA Translation Layer Data";
+                        evpdPageTitle   = "SCSI to ATA Translation Layer Data";
                         evpdDecodedPage = EVPD.PrettifyPage_89(page.Value);
                     }
-                    else if (page.Key == 0xB0)
+                    else if(page.Key == 0xB0)
                     {
-                        evpdPageTitle = "SCSI Sequential-access Device Capabilities";
+                        evpdPageTitle   = "SCSI Sequential-access Device Capabilities";
                         evpdDecodedPage = EVPD.PrettifyPage_B0(page.Value);
                     }
-                    else if (page.Key == 0xB1)
+                    else if(page.Key == 0xB1)
                     {
-                        evpdPageTitle = "Manufacturer-assigned Serial Number";
+                        evpdPageTitle   = "Manufacturer-assigned Serial Number";
                         evpdDecodedPage = EVPD.DecodePageB1(page.Value);
                     }
-                    else if (page.Key == 0xB2)
+                    else if(page.Key == 0xB2)
                     {
-                        evpdPageTitle = "TapeAlert Supported Flags Bitmap";
+                        evpdPageTitle   = "TapeAlert Supported Flags Bitmap";
                         evpdDecodedPage = $"0x{EVPD.DecodePageB2(page.Value):X16}";
                     }
-                    else if (page.Key == 0xB3)
+                    else if(page.Key == 0xB3)
                     {
-                        evpdPageTitle = "Automation Device Serial Number";
+                        evpdPageTitle   = "Automation Device Serial Number";
                         evpdDecodedPage = EVPD.DecodePageB3(page.Value);
                     }
-                    else if (page.Key == 0xB4)
+                    else if(page.Key == 0xB4)
                     {
-                        evpdPageTitle = "Data Transfer Device Element Address";
+                        evpdPageTitle   = "Data Transfer Device Element Address";
                         evpdDecodedPage = EVPD.DecodePageB4(page.Value);
                     }
-                    else if (page.Key == 0xC0 &&
-                             StringHandlers.CToString(inquiry.Value.VendorIdentification).ToLowerInvariant().Trim() ==
-                             "quantum")
+                    else if(page.Key == 0xC0 &&
+                            StringHandlers.CToString(inquiry.Value.VendorIdentification).ToLowerInvariant().Trim() ==
+                            "quantum")
                     {
-                        evpdPageTitle = "Quantum Firmware Build Information page";
+                        evpdPageTitle   = "Quantum Firmware Build Information page";
                         evpdDecodedPage = EVPD.PrettifyPage_C0_Quantum(page.Value);
                     }
-                    else if (page.Key == 0xC0 &&
-                             StringHandlers.CToString(inquiry.Value.VendorIdentification).ToLowerInvariant().Trim() ==
-                             "seagate")
+                    else if(page.Key == 0xC0 &&
+                            StringHandlers.CToString(inquiry.Value.VendorIdentification).ToLowerInvariant().Trim() ==
+                            "seagate")
                     {
-                        evpdPageTitle = "Seagate Firmware Numbers page";
+                        evpdPageTitle   = "Seagate Firmware Numbers page";
                         evpdDecodedPage = EVPD.PrettifyPage_C0_Seagate(page.Value);
                     }
-                    else if (page.Key == 0xC0 &&
-                             StringHandlers.CToString(inquiry.Value.VendorIdentification).ToLowerInvariant().Trim() ==
-                             "ibm")
+                    else if(page.Key == 0xC0 &&
+                            StringHandlers.CToString(inquiry.Value.VendorIdentification).ToLowerInvariant().Trim() ==
+                            "ibm")
                     {
-                        evpdPageTitle = "IBM Drive Component Revision Levels page";
+                        evpdPageTitle   = "IBM Drive Component Revision Levels page";
                         evpdDecodedPage = EVPD.PrettifyPage_C0_IBM(page.Value);
                     }
-                    else if (page.Key == 0xC1 &&
-                             StringHandlers.CToString(inquiry.Value.VendorIdentification).ToLowerInvariant().Trim() ==
-                             "ibm")
+                    else if(page.Key == 0xC1 &&
+                            StringHandlers.CToString(inquiry.Value.VendorIdentification).ToLowerInvariant().Trim() ==
+                            "ibm")
                     {
-                        evpdPageTitle = "IBM Drive Serial Numbers page";
+                        evpdPageTitle   = "IBM Drive Serial Numbers page";
                         evpdDecodedPage = EVPD.PrettifyPage_C1_IBM(page.Value);
                     }
-                    else if ((page.Key == 0xC0 || page.Key == 0xC1) &&
-                             StringHandlers.CToString(inquiry.Value.VendorIdentification).ToLowerInvariant().Trim() ==
-                             "certance")
+                    else if((page.Key == 0xC0 || page.Key == 0xC1) &&
+                            StringHandlers.CToString(inquiry.Value.VendorIdentification).ToLowerInvariant().Trim() ==
+                            "certance")
                     {
-                        evpdPageTitle = "Certance Drive Component Revision Levels page";
+                        evpdPageTitle   = "Certance Drive Component Revision Levels page";
                         evpdDecodedPage = EVPD.PrettifyPage_C0_C1_Certance(page.Value);
                     }
-                    else if ((page.Key == 0xC2 || page.Key == 0xC3 || page.Key == 0xC4 || page.Key == 0xC5 ||
-                              page.Key == 0xC6) &&
-                             StringHandlers.CToString(inquiry.Value.VendorIdentification).ToLowerInvariant().Trim() ==
-                             "certance")
+                    else if((page.Key == 0xC2 || page.Key == 0xC3 || page.Key == 0xC4 || page.Key == 0xC5 ||
+                             page.Key == 0xC6) &&
+                            StringHandlers.CToString(inquiry.Value.VendorIdentification).ToLowerInvariant().Trim() ==
+                            "certance")
                     {
-                        switch (page.Key)
+                        switch(page.Key)
                         {
                             case 0xC2:
                                 evpdPageTitle = "Head Assembly Serial Number";
+
                                 break;
                             case 0xC3:
                                 evpdPageTitle = "Reel Motor 1 Serial Number";
+
                                 break;
                             case 0xC4:
                                 evpdPageTitle = "Reel Motor 2 Serial Number";
+
                                 break;
                             case 0xC5:
                                 evpdPageTitle = "Board Serial Number";
+
                                 break;
                             case 0xC6:
                                 evpdPageTitle = "Base Mechanical Serial Number";
+
                                 break;
                         }
 
                         evpdDecodedPage = EVPD.PrettifyPage_C2_C3_C4_C5_C6_Certance(page.Value);
                     }
-                    else if ((page.Key == 0xC0 || page.Key == 0xC1 || page.Key == 0xC2 || page.Key == 0xC3 ||
-                              page.Key == 0xC4 || page.Key == 0xC5) && StringHandlers
-                                 .CToString(inquiry.Value.VendorIdentification)
-                                 .ToLowerInvariant().Trim() == "hp")
+                    else if((page.Key == 0xC0 || page.Key == 0xC1 || page.Key == 0xC2 || page.Key == 0xC3 ||
+                             page.Key == 0xC4 || page.Key == 0xC5) &&
+                            StringHandlers.CToString(inquiry.Value.VendorIdentification).ToLowerInvariant().Trim() ==
+                            "hp")
                     {
-                        switch (page.Key)
+                        switch(page.Key)
                         {
                             case 0xC0:
                                 evpdPageTitle = "HP Drive Firmware Revision Levels page:";
+
                                 break;
                             case 0xC1:
                                 evpdPageTitle = "HP Drive Hardware Revision Levels page:";
+
                                 break;
                             case 0xC2:
                                 evpdPageTitle = "HP Drive PCA Revision Levels page:";
+
                                 break;
                             case 0xC3:
                                 evpdPageTitle = "HP Drive Mechanism Revision Levels page:";
+
                                 break;
                             case 0xC4:
                                 evpdPageTitle = "HP Drive Head Assembly Revision Levels page:";
+
                                 break;
                             case 0xC5:
                                 evpdPageTitle = "HP Drive ACI Revision Levels page:";
+
                                 break;
                         }
 
                         evpdDecodedPage = EVPD.PrettifyPage_C0_to_C5_HP(page.Value);
                     }
-                    else if (page.Key == 0xDF &&
-                             StringHandlers.CToString(inquiry.Value.VendorIdentification).ToLowerInvariant().Trim() ==
-                             "certance")
+                    else if(page.Key == 0xDF &&
+                            StringHandlers.CToString(inquiry.Value.VendorIdentification).ToLowerInvariant().Trim() ==
+                            "certance")
                     {
-                        evpdPageTitle = "Certance drive status page";
+                        evpdPageTitle   = "Certance drive status page";
                         evpdDecodedPage = EVPD.PrettifyPage_DF_Certance(page.Value);
                     }
                     else
                     {
-                        if (page.Key == 0x00) continue;
+                        if(page.Key == 0x00)
+                            continue;
 
-                        evpdPageTitle = $"Page {page.Key:X2}h";
+                        evpdPageTitle   = $"Page {page.Key:X2}h";
                         evpdDecodedPage = "Undecoded";
+
                         AaruConsole.DebugWriteLine("Device-Info command", "Found undecoded SCSI VPD page 0x{0:X2}",
-                            page.Key);
+                                                   page.Key);
                     }
 
                     evpdPagesList.Add(new TreeGridItem
                     {
-                        Values = new object[] {evpdPageTitle, evpdDecodedPage, page.Value}
+                        Values = new object[]
+                        {
+                            evpdPageTitle, evpdDecodedPage, page.Value
+                        }
                     });
                 }
             }
 
-            if (configuration != null)
+            if(configuration != null)
             {
                 tabMmcFeatures.Visible = true;
 
                 var featuresList = new TreeGridItemCollection();
 
-                treeMmcFeatures.Columns.Add(new GridColumn {HeaderText = "Feature", DataCell = new TextBoxCell(0)});
+                treeMmcFeatures.Columns.Add(new GridColumn
+                {
+                    HeaderText = "Feature", DataCell = new TextBoxCell(0)
+                });
 
                 treeMmcFeatures.AllowMultipleSelection = false;
-                treeMmcFeatures.ShowHeader = false;
-                treeMmcFeatures.DataStore = featuresList;
+                treeMmcFeatures.ShowHeader             = false;
+                treeMmcFeatures.DataStore              = featuresList;
 
-                var ftr = Features.Separate(configuration);
+                Features.SeparatedFeatures ftr = Features.Separate(configuration);
 
                 AaruConsole.DebugWriteLine("Device-Info command", "GET CONFIGURATION length is {0} bytes",
-                    ftr.DataLength);
+                                           ftr.DataLength);
+
                 AaruConsole.DebugWriteLine("Device-Info command", "GET CONFIGURATION current profile is {0:X4}h",
-                    ftr.CurrentProfile);
-                if (ftr.Descriptors != null)
-                    foreach (var desc in ftr.Descriptors)
+                                           ftr.CurrentProfile);
+
+                if(ftr.Descriptors != null)
+                    foreach(Features.FeatureDescriptor desc in ftr.Descriptors)
                     {
-                        var featureNumber = $"Feature {desc.Code:X4}h";
+                        string featureNumber = $"Feature {desc.Code:X4}h";
                         string featureDescription;
                         AaruConsole.DebugWriteLine("Device-Info command", "Feature {0:X4}h", desc.Code);
 
-                        switch (desc.Code)
+                        switch(desc.Code)
                         {
                             case 0x0000:
                                 featureDescription = Features.Prettify_0000(desc.Data);
+
                                 break;
                             case 0x0001:
                                 featureDescription = Features.Prettify_0001(desc.Data);
+
                                 break;
                             case 0x0002:
                                 featureDescription = Features.Prettify_0002(desc.Data);
+
                                 break;
                             case 0x0003:
                                 featureDescription = Features.Prettify_0003(desc.Data);
+
                                 break;
                             case 0x0004:
                                 featureDescription = Features.Prettify_0004(desc.Data);
+
                                 break;
                             case 0x0010:
                                 featureDescription = Features.Prettify_0010(desc.Data);
+
                                 break;
                             case 0x001D:
                                 featureDescription = Features.Prettify_001D(desc.Data);
+
                                 break;
                             case 0x001E:
                                 featureDescription = Features.Prettify_001E(desc.Data);
+
                                 break;
                             case 0x001F:
                                 featureDescription = Features.Prettify_001F(desc.Data);
+
                                 break;
                             case 0x0020:
                                 featureDescription = Features.Prettify_0020(desc.Data);
+
                                 break;
                             case 0x0021:
                                 featureDescription = Features.Prettify_0021(desc.Data);
+
                                 break;
                             case 0x0022:
                                 featureDescription = Features.Prettify_0022(desc.Data);
+
                                 break;
                             case 0x0023:
                                 featureDescription = Features.Prettify_0023(desc.Data);
+
                                 break;
                             case 0x0024:
                                 featureDescription = Features.Prettify_0024(desc.Data);
+
                                 break;
                             case 0x0025:
                                 featureDescription = Features.Prettify_0025(desc.Data);
+
                                 break;
                             case 0x0026:
                                 featureDescription = Features.Prettify_0026(desc.Data);
+
                                 break;
                             case 0x0027:
                                 featureDescription = Features.Prettify_0027(desc.Data);
+
                                 break;
                             case 0x0028:
                                 featureDescription = Features.Prettify_0028(desc.Data);
+
                                 break;
                             case 0x0029:
                                 featureDescription = Features.Prettify_0029(desc.Data);
+
                                 break;
                             case 0x002A:
                                 featureDescription = Features.Prettify_002A(desc.Data);
+
                                 break;
                             case 0x002B:
                                 featureDescription = Features.Prettify_002B(desc.Data);
+
                                 break;
                             case 0x002C:
                                 featureDescription = Features.Prettify_002C(desc.Data);
+
                                 break;
                             case 0x002D:
                                 featureDescription = Features.Prettify_002D(desc.Data);
+
                                 break;
                             case 0x002E:
                                 featureDescription = Features.Prettify_002E(desc.Data);
+
                                 break;
                             case 0x002F:
                                 featureDescription = Features.Prettify_002F(desc.Data);
+
                                 break;
                             case 0x0030:
                                 featureDescription = Features.Prettify_0030(desc.Data);
+
                                 break;
                             case 0x0031:
                                 featureDescription = Features.Prettify_0031(desc.Data);
+
                                 break;
                             case 0x0032:
                                 featureDescription = Features.Prettify_0032(desc.Data);
+
                                 break;
                             case 0x0033:
                                 featureDescription = Features.Prettify_0033(desc.Data);
+
                                 break;
                             case 0x0035:
                                 featureDescription = Features.Prettify_0035(desc.Data);
+
                                 break;
                             case 0x0037:
                                 featureDescription = Features.Prettify_0037(desc.Data);
+
                                 break;
                             case 0x0038:
                                 featureDescription = Features.Prettify_0038(desc.Data);
+
                                 break;
                             case 0x003A:
                                 featureDescription = Features.Prettify_003A(desc.Data);
+
                                 break;
                             case 0x003B:
                                 featureDescription = Features.Prettify_003B(desc.Data);
+
                                 break;
                             case 0x0040:
                                 featureDescription = Features.Prettify_0040(desc.Data);
+
                                 break;
                             case 0x0041:
                                 featureDescription = Features.Prettify_0041(desc.Data);
+
                                 break;
                             case 0x0042:
                                 featureDescription = Features.Prettify_0042(desc.Data);
+
                                 break;
                             case 0x0050:
                                 featureDescription = Features.Prettify_0050(desc.Data);
+
                                 break;
                             case 0x0051:
                                 featureDescription = Features.Prettify_0051(desc.Data);
+
                                 break;
                             case 0x0080:
                                 featureDescription = Features.Prettify_0080(desc.Data);
+
                                 break;
                             case 0x0100:
                                 featureDescription = Features.Prettify_0100(desc.Data);
+
                                 break;
                             case 0x0101:
                                 featureDescription = Features.Prettify_0101(desc.Data);
+
                                 break;
                             case 0x0102:
                                 featureDescription = Features.Prettify_0102(desc.Data);
+
                                 break;
                             case 0x0103:
                                 featureDescription = Features.Prettify_0103(desc.Data);
+
                                 break;
                             case 0x0104:
                                 featureDescription = Features.Prettify_0104(desc.Data);
+
                                 break;
                             case 0x0105:
                                 featureDescription = Features.Prettify_0105(desc.Data);
+
                                 break;
                             case 0x0106:
                                 featureDescription = Features.Prettify_0106(desc.Data);
+
                                 break;
                             case 0x0107:
                                 featureDescription = Features.Prettify_0107(desc.Data);
+
                                 break;
                             case 0x0108:
                                 featureDescription = Features.Prettify_0108(desc.Data);
+
                                 break;
                             case 0x0109:
                                 featureDescription = Features.Prettify_0109(desc.Data);
+
                                 break;
                             case 0x010A:
                                 featureDescription = Features.Prettify_010A(desc.Data);
+
                                 break;
                             case 0x010B:
                                 featureDescription = Features.Prettify_010B(desc.Data);
+
                                 break;
                             case 0x010C:
                                 featureDescription = Features.Prettify_010C(desc.Data);
+
                                 break;
                             case 0x010D:
                                 featureDescription = Features.Prettify_010D(desc.Data);
+
                                 break;
                             case 0x010E:
                                 featureDescription = Features.Prettify_010E(desc.Data);
+
                                 break;
                             case 0x0110:
                                 featureDescription = Features.Prettify_0110(desc.Data);
+
                                 break;
                             case 0x0113:
                                 featureDescription = Features.Prettify_0113(desc.Data);
+
                                 break;
                             case 0x0142:
                                 featureDescription = Features.Prettify_0142(desc.Data);
+
                                 break;
                             default:
                                 featureDescription = "Unknown feature";
+
                                 break;
                         }
 
-                        featuresList.Add(new TreeGridItem {Values = new object[] {featureNumber, featureDescription}});
+                        featuresList.Add(new TreeGridItem
+                        {
+                            Values = new object[]
+                            {
+                                featureNumber, featureDescription
+                            }
+                        });
                     }
                 else
                     AaruConsole.DebugWriteLine("Device-Info command",
-                        "GET CONFIGURATION returned no feature descriptors");
+                                               "GET CONFIGURATION returned no feature descriptors");
             }
 
             Invalidate();
@@ -794,10 +943,20 @@ namespace Aaru.Gui.Tabs
         protected void OnBtnSaveInquiryBinary(object sender, EventArgs e)
         {
             var dlgSaveBinary = new SaveFileDialog();
-            dlgSaveBinary.Filters.Add(new FileFilter {Extensions = new[] {"*.bin"}, Name = "Binary"});
-            var result = dlgSaveBinary.ShowDialog(this);
 
-            if (result != DialogResult.Ok) return;
+            dlgSaveBinary.Filters.Add(new FileFilter
+            {
+                Extensions = new[]
+                {
+                    "*.bin"
+                },
+                Name = "Binary"
+            });
+
+            DialogResult result = dlgSaveBinary.ShowDialog(this);
+
+            if(result != DialogResult.Ok)
+                return;
 
             var saveFs = new FileStream(dlgSaveBinary.FileName, FileMode.Create);
             saveFs.Write(inquiryData, 0, inquiryData.Length);
@@ -808,10 +967,20 @@ namespace Aaru.Gui.Tabs
         protected void OnBtnSaveInquiryText(object sender, EventArgs e)
         {
             var dlgSaveText = new SaveFileDialog();
-            dlgSaveText.Filters.Add(new FileFilter {Extensions = new[] {"*.txt"}, Name = "Text"});
-            var result = dlgSaveText.ShowDialog(this);
 
-            if (result != DialogResult.Ok) return;
+            dlgSaveText.Filters.Add(new FileFilter
+            {
+                Extensions = new[]
+                {
+                    "*.txt"
+                },
+                Name = "Text"
+            });
+
+            DialogResult result = dlgSaveText.ShowDialog(this);
+
+            if(result != DialogResult.Ok)
+                return;
 
             var saveFs = new FileStream(dlgSaveText.FileName, FileMode.Create);
             var saveSw = new StreamWriter(saveFs);
@@ -822,10 +991,20 @@ namespace Aaru.Gui.Tabs
         protected void OnBtnSaveMode6(object sender, EventArgs e)
         {
             var dlgSaveBinary = new SaveFileDialog();
-            dlgSaveBinary.Filters.Add(new FileFilter {Extensions = new[] {"*.bin"}, Name = "Binary"});
-            var result = dlgSaveBinary.ShowDialog(this);
 
-            if (result != DialogResult.Ok) return;
+            dlgSaveBinary.Filters.Add(new FileFilter
+            {
+                Extensions = new[]
+                {
+                    "*.bin"
+                },
+                Name = "Binary"
+            });
+
+            DialogResult result = dlgSaveBinary.ShowDialog(this);
+
+            if(result != DialogResult.Ok)
+                return;
 
             var saveFs = new FileStream(dlgSaveBinary.FileName, FileMode.Create);
             saveFs.Write(modeSense6, 0, modeSense6.Length);
@@ -836,10 +1015,20 @@ namespace Aaru.Gui.Tabs
         protected void OnBtnSaveMode10(object sender, EventArgs e)
         {
             var dlgSaveBinary = new SaveFileDialog();
-            dlgSaveBinary.Filters.Add(new FileFilter {Extensions = new[] {"*.bin"}, Name = "Binary"});
-            var result = dlgSaveBinary.ShowDialog(this);
 
-            if (result != DialogResult.Ok) return;
+            dlgSaveBinary.Filters.Add(new FileFilter
+            {
+                Extensions = new[]
+                {
+                    "*.bin"
+                },
+                Name = "Binary"
+            });
+
+            DialogResult result = dlgSaveBinary.ShowDialog(this);
+
+            if(result != DialogResult.Ok)
+                return;
 
             var saveFs = new FileStream(dlgSaveBinary.FileName, FileMode.Create);
             saveFs.Write(modeSense10, 0, modeSense10.Length);
@@ -849,28 +1038,43 @@ namespace Aaru.Gui.Tabs
 
         protected void OnTreeModePagesSelectedItemChanged(object sender, EventArgs e)
         {
-            if (!(treeModeSensePages.SelectedItem is TreeGridItem item)) return;
+            if(!(treeModeSensePages.SelectedItem is TreeGridItem item))
+                return;
 
             txtModeSensePage.Text = item.Values[1] as string;
         }
 
         protected void OnTreeEvpdPagesSelectedItemChanged(object sender, EventArgs e)
         {
-            if (!(treeEvpdPages.SelectedItem is TreeGridItem item)) return;
+            if(!(treeEvpdPages.SelectedItem is TreeGridItem item))
+                return;
 
             txtEvpdPage.Text = item.Values[1] as string;
         }
 
         protected void OnBtnSaveEvpd(object sender, EventArgs e)
         {
-            if (!(treeModeSensePages.SelectedItem is TreeGridItem item)) return;
-            if (!(item.Values[2] is byte[] data)) return;
+            if(!(treeModeSensePages.SelectedItem is TreeGridItem item))
+                return;
+
+            if(!(item.Values[2] is byte[] data))
+                return;
 
             var dlgSaveBinary = new SaveFileDialog();
-            dlgSaveBinary.Filters.Add(new FileFilter {Extensions = new[] {"*.bin"}, Name = "Binary"});
-            var result = dlgSaveBinary.ShowDialog(this);
 
-            if (result != DialogResult.Ok) return;
+            dlgSaveBinary.Filters.Add(new FileFilter
+            {
+                Extensions = new[]
+                {
+                    "*.bin"
+                },
+                Name = "Binary"
+            });
+
+            DialogResult result = dlgSaveBinary.ShowDialog(this);
+
+            if(result != DialogResult.Ok)
+                return;
 
             var saveFs = new FileStream(dlgSaveBinary.FileName, FileMode.Create);
             saveFs.Write(data, 0, data.Length);
@@ -880,7 +1084,8 @@ namespace Aaru.Gui.Tabs
 
         protected void OnTreeMmcFeaturesSelectedItemChanged(object sender, EventArgs e)
         {
-            if (!(treeMmcFeatures.SelectedItem is TreeGridItem item)) return;
+            if(!(treeMmcFeatures.SelectedItem is TreeGridItem item))
+                return;
 
             txtMmcFeature.Text = item.Values[1] as string;
         }
@@ -888,10 +1093,20 @@ namespace Aaru.Gui.Tabs
         protected void OnBtnSaveMmcFeatures(object sender, EventArgs e)
         {
             var dlgSaveBinary = new SaveFileDialog();
-            dlgSaveBinary.Filters.Add(new FileFilter {Extensions = new[] {"*.bin"}, Name = "Binary"});
-            var result = dlgSaveBinary.ShowDialog(this);
 
-            if (result != DialogResult.Ok) return;
+            dlgSaveBinary.Filters.Add(new FileFilter
+            {
+                Extensions = new[]
+                {
+                    "*.bin"
+                },
+                Name = "Binary"
+            });
+
+            DialogResult result = dlgSaveBinary.ShowDialog(this);
+
+            if(result != DialogResult.Ok)
+                return;
 
             var saveFs = new FileStream(dlgSaveBinary.FileName, FileMode.Create);
             saveFs.Write(configuration, 0, configuration.Length);
@@ -900,30 +1115,28 @@ namespace Aaru.Gui.Tabs
         }
 
         #region XAML controls
-
-#pragma warning disable 169
-#pragma warning disable 649
-        private TabPage tabScsiInquiry;
-        private Label lblScsiInquiry;
-        private TextArea txtScsiInquiry;
-        private Button btnSaveInquiryBinary;
-        private Button btnSaveInquiryText;
-        private TabPage tabScsiModeSense;
-        private TreeGridView treeModeSensePages;
-        private TextArea txtModeSensePage;
-        private Button btnSaveMode6;
-        private Button btnSaveMode10;
-        private TabPage tabScsiEvpd;
-        private TreeGridView treeEvpdPages;
-        private TextArea txtEvpdPage;
-        private Button btnSaveEvpd;
-        private TabPage tabMmcFeatures;
-        private TreeGridView treeMmcFeatures;
-        private TextArea txtMmcFeature;
-        private Button btnSaveMmcFeatures;
-#pragma warning restore 169
-#pragma warning restore 649
-
+        #pragma warning disable 169
+        #pragma warning disable 649
+        TabPage      tabScsiInquiry;
+        Label        lblScsiInquiry;
+        TextArea     txtScsiInquiry;
+        Button       btnSaveInquiryBinary;
+        Button       btnSaveInquiryText;
+        TabPage      tabScsiModeSense;
+        TreeGridView treeModeSensePages;
+        TextArea     txtModeSensePage;
+        Button       btnSaveMode6;
+        Button       btnSaveMode10;
+        TabPage      tabScsiEvpd;
+        TreeGridView treeEvpdPages;
+        TextArea     txtEvpdPage;
+        Button       btnSaveEvpd;
+        TabPage      tabMmcFeatures;
+        TreeGridView treeMmcFeatures;
+        TextArea     txtMmcFeature;
+        Button       btnSaveMmcFeatures;
+        #pragma warning restore 169
+        #pragma warning restore 649
         #endregion
     }
 }
\ No newline at end of file
diff --git a/Aaru.Gui/Tabs/tabSdMmcInfo.xeto.cs b/Aaru.Gui/Tabs/tabSdMmcInfo.xeto.cs
index 18e6068dd..fa2b70df8 100644
--- a/Aaru.Gui/Tabs/tabSdMmcInfo.xeto.cs
+++ b/Aaru.Gui/Tabs/tabSdMmcInfo.xeto.cs
@@ -31,7 +31,6 @@
 // ****************************************************************************/
 
 using Aaru.CommonTypes.Enums;
-using Aaru.Decoders.MMC;
 using Eto.Forms;
 using Eto.Serialization.Xaml;
 
@@ -39,47 +38,47 @@ namespace Aaru.Gui.Tabs
 {
     public class tabSdMmcInfo : TabPage
     {
-        public tabSdMmcInfo()
-        {
-            XamlReader.Load(this);
-        }
+        public tabSdMmcInfo() => XamlReader.Load(this);
 
         internal void LoadData(DeviceType deviceType, byte[] cid, byte[] csd, byte[] ocr, byte[] extendedCsd,
-                               byte[]     scr)
+                               byte[] scr)
         {
             switch(deviceType)
             {
                 case DeviceType.MMC:
                 {
                     Text = "MultiMediaCard";
+
                     if(cid != null)
                     {
                         tabCid.Visible = true;
-                        txtCid.Text    = Aaru.Decoders.MMC.Decoders.PrettifyCID(cid);
+                        txtCid.Text    = Decoders.MMC.Decoders.PrettifyCID(cid);
                     }
 
                     if(csd != null)
                     {
                         tabCsd.Visible = true;
-                        txtCid.Text    = Aaru.Decoders.MMC.Decoders.PrettifyCSD(csd);
+                        txtCid.Text    = Decoders.MMC.Decoders.PrettifyCSD(csd);
                     }
 
                     if(ocr != null)
                     {
                         tabOcr.Visible = true;
-                        txtCid.Text    = Aaru.Decoders.MMC.Decoders.PrettifyOCR(ocr);
+                        txtCid.Text    = Decoders.MMC.Decoders.PrettifyOCR(ocr);
                     }
 
                     if(extendedCsd != null)
                     {
                         tabExtendedCsd.Visible = true;
-                        txtCid.Text            = Aaru.Decoders.MMC.Decoders.PrettifyExtendedCSD(extendedCsd);
+                        txtCid.Text            = Decoders.MMC.Decoders.PrettifyExtendedCSD(extendedCsd);
                     }
                 }
+
                     break;
                 case DeviceType.SecureDigital:
                 {
                     Text = "SecureDigital";
+
                     if(cid != null)
                     {
                         tabCid.Visible = true;
@@ -106,6 +105,7 @@ namespace Aaru.Gui.Tabs
                         txtCid.Text    = Decoders.SecureDigital.Decoders.PrettifySCR(scr);
                     }
                 }
+
                     break;
             }
 
diff --git a/Aaru.Gui/Tabs/tabXboxInfo.xeto.cs b/Aaru.Gui/Tabs/tabXboxInfo.xeto.cs
index 3885880d3..09f3bdc12 100644
--- a/Aaru.Gui/Tabs/tabXboxInfo.xeto.cs
+++ b/Aaru.Gui/Tabs/tabXboxInfo.xeto.cs
@@ -43,12 +43,9 @@ namespace Aaru.Gui.Tabs
     {
         byte[] xboxSecuritySector;
 
-        public tabXboxInfo()
-        {
-            XamlReader.Load(this);
-        }
+        public tabXboxInfo() => XamlReader.Load(this);
 
-        internal void LoadData(XgdInfo            xgdInfo, byte[] dmi, byte[] securitySector,
+        internal void LoadData(XgdInfo xgdInfo, byte[] dmi, byte[] securitySector,
                                SS.SecuritySector? decodedSecuritySector)
         {
             xboxSecuritySector = securitySector;
@@ -85,28 +82,35 @@ namespace Aaru.Gui.Tabs
             }
 
             btnSaveXboxSs.Visible = securitySector != null;
-            Visible = stkXboxInformation.Visible || grpXboxDmi.Visible || grpXboxSs.Visible ||
-                                    btnSaveXboxSs.Visible;
+
+            Visible = stkXboxInformation.Visible || grpXboxDmi.Visible || grpXboxSs.Visible || btnSaveXboxSs.Visible;
         }
 
         void SaveElement(byte[] data)
         {
-            SaveFileDialog dlgSaveBinary = new SaveFileDialog();
-            dlgSaveBinary.Filters.Add(new FileFilter {Extensions = new[] {"*.bin"}, Name = "Binary"});
+            var dlgSaveBinary = new SaveFileDialog();
+
+            dlgSaveBinary.Filters.Add(new FileFilter
+            {
+                Extensions = new[]
+                {
+                    "*.bin"
+                },
+                Name = "Binary"
+            });
+
             DialogResult result = dlgSaveBinary.ShowDialog(this);
 
-            if(result != DialogResult.Ok) return;
+            if(result != DialogResult.Ok)
+                return;
 
-            FileStream saveFs = new FileStream(dlgSaveBinary.FileName, FileMode.Create);
+            var saveFs = new FileStream(dlgSaveBinary.FileName, FileMode.Create);
             saveFs.Write(data, 0, data.Length);
 
             saveFs.Close();
         }
 
-        protected void OnBtnSaveXboxSsClick(object sender, EventArgs e)
-        {
-            SaveElement(xboxSecuritySector);
-        }
+        protected void OnBtnSaveXboxSsClick(object sender, EventArgs e) => SaveElement(xboxSecuritySector);
 
         #region XAML controls
         #pragma warning disable 169
diff --git a/Aaru.Helpers b/Aaru.Helpers
index ad4bfdc0b..0bc3b5c1f 160000
--- a/Aaru.Helpers
+++ b/Aaru.Helpers
@@ -1 +1 @@
-Subproject commit ad4bfdc0b5b678b819512dc1ce537859cc096b3c
+Subproject commit 0bc3b5c1fe21fe6cdad3d8a23b7db34f09aa8a2a
diff --git a/Aaru.Images/AaruFormat/AaruFormat.cs b/Aaru.Images/AaruFormat/AaruFormat.cs
index 71c37c57b..9b6e04bec 100644
--- a/Aaru.Images/AaruFormat/AaruFormat.cs
+++ b/Aaru.Images/AaruFormat/AaruFormat.cs
@@ -72,11 +72,11 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Security.Cryptography;
-using CUETools.Codecs.FLAKE;
 using Aaru.Checksums;
 using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
+using CUETools.Codecs.FLAKE;
 using SharpCompress.Compressors.LZMA;
 
 namespace Aaru.DiscImages
@@ -164,31 +164,18 @@ namespace Aaru.DiscImages
         bool  writingLong;
         ulong writtenSectors;
 
-        public AaruFormat()
+        public AaruFormat() => imageInfo = new ImageInfo
         {
-            imageInfo = new ImageInfo
-            {
-                ReadableSectorTags    = new List<SectorTagType>(),
-                ReadableMediaTags     = new List<MediaTagType>(),
-                HasPartitions         = false,
-                HasSessions           = false,
-                Version               = null,
-                Application           = "Aaru",
-                ApplicationVersion    = null,
-                Creator               = null,
-                Comments              = null,
-                MediaManufacturer     = null,
-                MediaModel            = null,
-                MediaSerialNumber     = null,
-                MediaBarcode          = null,
-                MediaPartNumber       = null,
-                MediaSequence         = 0,
-                LastMediaSequence     = 0,
-                DriveManufacturer     = null,
-                DriveModel            = null,
-                DriveSerialNumber     = null,
-                DriveFirmwareRevision = null
-            };
-        }
+            ReadableSectorTags = new List<SectorTagType>(), ReadableMediaTags = new List<MediaTagType>(),
+            HasPartitions      = false, HasSessions                           = false, Version = null,
+            Application        = "Aaru",
+            ApplicationVersion = null, Creator = null, Comments = null,
+            MediaManufacturer  = null,
+            MediaModel         = null, MediaSerialNumber = null, MediaBarcode = null,
+            MediaPartNumber    = null,
+            MediaSequence      = 0, LastMediaSequence = 0, DriveManufacturer = null,
+            DriveModel         = null,
+            DriveSerialNumber  = null, DriveFirmwareRevision = null
+        };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/AaruFormat/CdEcc.cs b/Aaru.Images/AaruFormat/CdEcc.cs
index 824f9eb2f..6ec9c9ff2 100644
--- a/Aaru.Images/AaruFormat/CdEcc.cs
+++ b/Aaru.Images/AaruFormat/CdEcc.cs
@@ -45,7 +45,8 @@ namespace Aaru.DiscImages
 
         void EccInit()
         {
-            if(initedEdc) return;
+            if(initedEdc)
+                return;
 
             eccFTable = new byte[256];
             eccBTable = new byte[256];
@@ -57,7 +58,10 @@ namespace Aaru.DiscImages
                 uint j   = (uint)((i << 1) ^ ((i & 0x80) == 0x80 ? 0x11D : 0));
                 eccFTable[i]     = (byte)j;
                 eccBTable[i ^ j] = (byte)i;
-                for(j = 0; j < 8; j++) edc = (edc >> 1) ^ ((edc & 1) > 0 ? 0xD8018001 : 0);
+
+                for(j = 0; j < 8; j++)
+                    edc = (edc >> 1) ^ ((edc & 1) > 0 ? 0xD8018001 : 0);
+
                 edcTable[i] = edc;
             }
 
@@ -66,96 +70,129 @@ namespace Aaru.DiscImages
 
         bool SuffixIsCorrect(byte[] sector)
         {
-            if(!initedEdc) EccInit();
+            if(!initedEdc)
+                EccInit();
 
             if(sector[0x814] != 0x00 || // reserved (8 bytes)
-               sector[0x815] != 0x00 || sector[0x816] != 0x00 || sector[0x817] != 0x00 || sector[0x818] != 0x00 ||
-               sector[0x819] != 0x00 || sector[0x81A] != 0x00 || sector[0x81B] != 0x00) return false;
+               sector[0x815] != 0x00 ||
+               sector[0x816] != 0x00 ||
+               sector[0x817] != 0x00 ||
+               sector[0x818] != 0x00 ||
+               sector[0x819] != 0x00 ||
+               sector[0x81A] != 0x00 ||
+               sector[0x81B] != 0x00)
+                return false;
 
             bool correctEccP = CheckEcc(sector, sector, 86, 24, 2, 86, sector, 0xC, 0x10, 0x81C);
-            if(!correctEccP) return false;
+
+            if(!correctEccP)
+                return false;
 
             bool correctEccQ = CheckEcc(sector, sector, 52, 43, 86, 88, sector, 0xC, 0x10, 0x81C + 0xAC);
-            if(!correctEccQ) return false;
 
-            uint storedEdc              = BitConverter.ToUInt32(sector, 0x810);
-            uint edc                    = 0;
-            int  size                   = 0x810;
-            int  pos                    = 0;
-            for(; size > 0; size--) edc = (edc >> 8) ^ edcTable[(edc ^ sector[pos++]) & 0xFF];
-            uint calculatedEdc          = edc;
+            if(!correctEccQ)
+                return false;
+
+            uint storedEdc = BitConverter.ToUInt32(sector, 0x810);
+            uint edc       = 0;
+            int  size      = 0x810;
+            int  pos       = 0;
+
+            for(; size > 0; size--)
+                edc = (edc >> 8) ^ edcTable[(edc ^ sector[pos++]) & 0xFF];
+
+            uint calculatedEdc = edc;
 
             return calculatedEdc == storedEdc;
         }
 
         bool SuffixIsCorrectMode2(byte[] sector)
         {
-            if(!initedEdc) EccInit();
+            if(!initedEdc)
+                EccInit();
 
             byte[] zeroaddress = new byte[4];
 
             bool correctEccP = CheckEcc(zeroaddress, sector, 86, 24, 2, 86, sector, 0, 0x10, 0x81C);
-            if(!correctEccP) return false;
+
+            if(!correctEccP)
+                return false;
 
             bool correctEccQ = CheckEcc(zeroaddress, sector, 52, 43, 86, 88, sector, 0, 0x10, 0x81C + 0xAC);
-            if(!correctEccQ) return false;
 
-            uint storedEdc              = BitConverter.ToUInt32(sector, 0x818);
-            uint edc                    = 0;
-            int  size                   = 0x808;
-            int  pos                    = 0x10;
-            for(; size > 0; size--) edc = (edc >> 8) ^ edcTable[(edc ^ sector[pos++]) & 0xFF];
-            uint calculatedEdc          = edc;
+            if(!correctEccQ)
+                return false;
+
+            uint storedEdc = BitConverter.ToUInt32(sector, 0x818);
+            uint edc       = 0;
+            int  size      = 0x808;
+            int  pos       = 0x10;
+
+            for(; size > 0; size--)
+                edc = (edc >> 8) ^ edcTable[(edc ^ sector[pos++]) & 0xFF];
+
+            uint calculatedEdc = edc;
 
             return calculatedEdc == storedEdc;
         }
 
-        bool CheckEcc(byte[] address, byte[] data, uint majorCount, uint minorCount, uint majorMult,
-                      uint   minorInc,
+        bool CheckEcc(byte[] address, byte[] data, uint majorCount, uint minorCount, uint majorMult, uint minorInc,
                       byte[] ecc, int addressOffset, int dataOffset, int eccOffset)
         {
             uint size = majorCount * minorCount;
             uint major;
+
             for(major = 0; major < majorCount; major++)
             {
-                uint idx  = (major >> 1) * majorMult + (major & 1);
+                uint idx  = ((major >> 1) * majorMult) + (major & 1);
                 byte eccA = 0;
                 byte eccB = 0;
                 uint minor;
+
                 for(minor = 0; minor < minorCount; minor++)
                 {
-                    byte temp = idx < 4 ? address[idx + addressOffset] : data[idx + dataOffset - 4];
+                    byte temp = idx < 4 ? address[idx + addressOffset] : data[(idx + dataOffset) - 4];
                     idx += minorInc;
-                    if(idx >= size) idx -= size;
+
+                    if(idx >= size)
+                        idx -= size;
+
                     eccA ^= temp;
                     eccB ^= temp;
                     eccA =  eccFTable[eccA];
                 }
 
                 eccA = eccBTable[eccFTable[eccA] ^ eccB];
-                if(ecc[major + eccOffset] != eccA || ecc[major + majorCount + eccOffset] != (eccA ^ eccB)) return false;
+
+                if(ecc[major              + eccOffset] != eccA ||
+                   ecc[major + majorCount + eccOffset] != (eccA ^ eccB))
+                    return false;
             }
 
             return true;
         }
 
-        void WriteEcc(byte[]     address, byte[] data, uint majorCount, uint minorCount, uint majorMult,
-                      uint       minorInc,
+        void WriteEcc(byte[] address, byte[] data, uint majorCount, uint minorCount, uint majorMult, uint minorInc,
                       ref byte[] ecc, int addressOffset, int dataOffset, int eccOffset)
         {
             uint size = majorCount * minorCount;
             uint major;
+
             for(major = 0; major < majorCount; major++)
             {
-                uint idx  = (major >> 1) * majorMult + (major & 1);
+                uint idx  = ((major >> 1) * majorMult) + (major & 1);
                 byte eccA = 0;
                 byte eccB = 0;
                 uint minor;
+
                 for(minor = 0; minor < minorCount; minor++)
                 {
-                    byte temp = idx < 4 ? address[idx + addressOffset] : data[idx + dataOffset - 4];
+                    byte temp = idx < 4 ? address[idx + addressOffset] : data[(idx + dataOffset) - 4];
                     idx += minorInc;
-                    if(idx >= size) idx -= size;
+
+                    if(idx >= size)
+                        idx -= size;
+
                     eccA ^= temp;
                     eccB ^= temp;
                     eccA =  eccFTable[eccA];
@@ -168,17 +205,17 @@ namespace Aaru.DiscImages
         }
 
         void EccWriteSector(byte[] address, byte[] data, ref byte[] ecc, int addressOffset, int dataOffset,
-                            int    eccOffset)
+                            int eccOffset)
         {
-            WriteEcc(address, data, 86, 24, 2,  86, ref ecc, addressOffset, dataOffset, eccOffset);        // P
+            WriteEcc(address, data, 86, 24, 2, 86, ref ecc, addressOffset, dataOffset, eccOffset);         // P
             WriteEcc(address, data, 52, 43, 86, 88, ref ecc, addressOffset, dataOffset, eccOffset + 0xAC); // Q
         }
 
         static (byte minute, byte second, byte frame) LbaToMsf(long pos) =>
-            ((byte)((pos + 150) / 75 / 60), (byte)((pos + 150) / 75 % 60), (byte)((pos + 150) % 75));
+            ((byte)((pos + 150) / 75 / 60), (byte)(((pos + 150) / 75) % 60), (byte)((pos + 150) % 75));
 
         void ReconstructPrefix(ref byte[] sector, // must point to a full 2352-byte sector
-                               TrackType  type,   long lba)
+                               TrackType type, long lba)
         {
             //
             // Sync
@@ -198,9 +235,9 @@ namespace Aaru.DiscImages
 
             (byte minute, byte second, byte frame) msf = LbaToMsf(lba);
 
-            sector[0x00C] = (byte)(((msf.minute / 10) << 4) + msf.minute % 10);
-            sector[0x00D] = (byte)(((msf.second / 10) << 4) + msf.second % 10);
-            sector[0x00E] = (byte)(((msf.frame  / 10) << 4) + msf.frame  % 10);
+            sector[0x00C] = (byte)(((msf.minute / 10) << 4) + (msf.minute % 10));
+            sector[0x00D] = (byte)(((msf.second / 10) << 4) + (msf.second % 10));
+            sector[0x00E] = (byte)(((msf.frame  / 10) << 4) + (msf.frame  % 10));
 
             switch(type)
             {
@@ -209,6 +246,7 @@ namespace Aaru.DiscImages
                     // Mode
                     //
                     sector[0x00F] = 0x01;
+
                     break;
                 case TrackType.CdMode2Form1:
                 case TrackType.CdMode2Form2:
@@ -217,6 +255,7 @@ namespace Aaru.DiscImages
                     // Mode
                     //
                     sector[0x00F] = 0x02;
+
                     //
                     // Flags
                     //
@@ -224,16 +263,19 @@ namespace Aaru.DiscImages
                     sector[0x011] = sector[0x015];
                     sector[0x012] = sector[0x016];
                     sector[0x013] = sector[0x017];
+
                     break;
                 default: return;
             }
         }
 
         void ReconstructEcc(ref byte[] sector, // must point to a full 2352-byte sector
-                            TrackType  type)
+                            TrackType type)
         {
             byte[] computedEdc;
-            if(!initedEdc) EccInit();
+
+            if(!initedEdc)
+                EccInit();
 
             switch(type)
             {
@@ -246,6 +288,7 @@ namespace Aaru.DiscImages
                     sector[0x811] = computedEdc[1];
                     sector[0x812] = computedEdc[2];
                     sector[0x813] = computedEdc[3];
+
                     break;
                 case TrackType.CdMode2Form1:
                     computedEdc   = BitConverter.GetBytes(ComputeEdc(0, sector, 0x808, 0x10));
@@ -253,6 +296,7 @@ namespace Aaru.DiscImages
                     sector[0x819] = computedEdc[1];
                     sector[0x81A] = computedEdc[2];
                     sector[0x81B] = computedEdc[3];
+
                     break;
                 case TrackType.CdMode2Form2:
                     computedEdc   = BitConverter.GetBytes(ComputeEdc(0, sector, 0x91C, 0x10));
@@ -260,6 +304,7 @@ namespace Aaru.DiscImages
                     sector[0x92D] = computedEdc[1];
                     sector[0x92E] = computedEdc[2];
                     sector[0x92F] = computedEdc[3];
+
                     break;
                 default: return;
             }
@@ -284,9 +329,11 @@ namespace Aaru.DiscImages
                     sector[0x81A] = 0x00;
                     sector[0x81B] = 0x00;
                     EccWriteSector(sector, sector, ref sector, 0xC, 0x10, 0x81C);
+
                     break;
                 case TrackType.CdMode2Form1:
                     EccWriteSector(zeroaddress, sector, ref sector, 0, 0x10, 0x81C);
+
                     break;
                 default: return;
             }
@@ -298,9 +345,13 @@ namespace Aaru.DiscImages
 
         uint ComputeEdc(uint edc, byte[] src, int size, int srcOffset = 0)
         {
-            if(!initedEdc) EccInit();
-            int pos                     = srcOffset;
-            for(; size > 0; size--) edc = (edc >> 8) ^ edcTable[(edc ^ src[pos++]) & 0xFF];
+            if(!initedEdc)
+                EccInit();
+
+            int pos = srcOffset;
+
+            for(; size > 0; size--)
+                edc = (edc >> 8) ^ edcTable[(edc ^ src[pos++]) & 0xFF];
 
             return edc;
         }
diff --git a/Aaru.Images/AaruFormat/ClauniaSubchannelTransform.cs b/Aaru.Images/AaruFormat/ClauniaSubchannelTransform.cs
index 7b424baf8..2d15e7526 100644
--- a/Aaru.Images/AaruFormat/ClauniaSubchannelTransform.cs
+++ b/Aaru.Images/AaruFormat/ClauniaSubchannelTransform.cs
@@ -39,7 +39,8 @@ namespace Aaru.DiscImages
     {
         static byte[] ClauniaSubchannelTransform(byte[] interleaved)
         {
-            if(interleaved == null) return null;
+            if(interleaved == null)
+                return null;
 
             int[] p = new int[interleaved.Length / 8];
             int[] q = new int[interleaved.Length / 8];
@@ -51,6 +52,7 @@ namespace Aaru.DiscImages
             int[] w = new int[interleaved.Length / 8];
 
             DateTime start = DateTime.UtcNow;
+
             for(int i = 0; i < interleaved.Length; i += 8)
             {
                 p[i / 8] =  interleaved[i] & 0x80;
@@ -156,18 +158,21 @@ namespace Aaru.DiscImages
             TimeSpan sequentialize = end - start;
 
             AaruConsole.DebugWriteLine("Aaru Format plugin", "Took {0}ms to deinterleave subchannel.",
-                                      deinterleave.TotalMilliseconds);
+                                       deinterleave.TotalMilliseconds);
+
             AaruConsole.DebugWriteLine("Aaru Format plugin", "Took {0}ms to sequentialize subchannel.",
-                                      sequentialize.TotalMilliseconds);
+                                       sequentialize.TotalMilliseconds);
+
             AaruConsole.DebugWriteLine("Aaru Format plugin", "Took {0}ms to transform subchannel.",
-                                      deinterleave.TotalMilliseconds + sequentialize.TotalMilliseconds);
+                                       deinterleave.TotalMilliseconds + sequentialize.TotalMilliseconds);
 
             return sequential;
         }
 
         static byte[] ClauniaSubchannelUntransform(byte[] sequential)
         {
-            if(sequential == null) return null;
+            if(sequential == null)
+                return null;
 
             int[] p = new int[sequential.Length / 8];
             int[] q = new int[sequential.Length / 8];
@@ -205,6 +210,7 @@ namespace Aaru.DiscImages
 
             byte[] interleaved = new byte[sequential.Length];
             start = DateTime.UtcNow;
+
             for(int i = 0; i < interleaved.Length; i += 8)
             {
                 interleaved[i]     =  (byte)((p[i / 8] & 0x80) == 0x80 ? 0x80 : 0);
@@ -284,11 +290,13 @@ namespace Aaru.DiscImages
             TimeSpan interleave = end - start;
 
             AaruConsole.DebugWriteLine("Aaru Format plugin", "Took {0}ms to de-sequentialize subchannel.",
-                                      desequentialize.TotalMilliseconds);
+                                       desequentialize.TotalMilliseconds);
+
             AaruConsole.DebugWriteLine("Aaru Format plugin", "Took {0}ms to interleave subchannel.",
-                                      interleave.TotalMilliseconds);
+                                       interleave.TotalMilliseconds);
+
             AaruConsole.DebugWriteLine("Aaru Format plugin", "Took {0}ms to untransform subchannel.",
-                                      interleave.TotalMilliseconds + desequentialize.TotalMilliseconds);
+                                       interleave.TotalMilliseconds + desequentialize.TotalMilliseconds);
 
             return interleaved;
         }
diff --git a/Aaru.Images/AaruFormat/Constants.cs b/Aaru.Images/AaruFormat/Constants.cs
index f4e8e2f3b..778b575cd 100644
--- a/Aaru.Images/AaruFormat/Constants.cs
+++ b/Aaru.Images/AaruFormat/Constants.cs
@@ -39,8 +39,8 @@ namespace Aaru.DiscImages
         /// <summary>Magic identidier = "AARUFRMT".</summary>
         const ulong AARU_MAGIC = 0x544D524655524141;
         /// <summary>
-        ///     Image format version. A change in this number indicates an incompatible change to the format that
-        ///     prevents older implementations from reading it correctly, if at all.
+        ///     Image format version. A change in this number indicates an incompatible change to the format that prevents
+        ///     older implementations from reading it correctly, if at all.
         /// </summary>
         const byte AARUFMT_VERSION = 1;
         /// <summary>Maximum read cache size, 256MiB.</summary>
diff --git a/Aaru.Images/AaruFormat/Enums.cs b/Aaru.Images/AaruFormat/Enums.cs
index 6c00f148a..d6599c0ab 100644
--- a/Aaru.Images/AaruFormat/Enums.cs
+++ b/Aaru.Images/AaruFormat/Enums.cs
@@ -247,20 +247,14 @@ namespace Aaru.DiscImages
 
         enum ChecksumAlgorithm : byte
         {
-            Invalid = 0,
-            Md5     = 1,
-            Sha1    = 2,
-            Sha256  = 3,
-            SpamSum = 4
+            Invalid = 0, Md5     = 1, Sha1 = 2,
+            Sha256  = 3, SpamSum = 4
         }
 
         enum CdFixFlags : uint
         {
-            NotDumped       = 0x10000000,
-            Correct         = 0x20000000,
-            Mode2Form1Ok    = 0x30000000,
-            Mode2Form2Ok    = 0x40000000,
-            Mode2Form2NoCrc = 0x50000000
+            NotDumped    = 0x10000000, Correct         = 0x20000000, Mode2Form1Ok = 0x30000000,
+            Mode2Form2Ok = 0x40000000, Mode2Form2NoCrc = 0x50000000
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/AaruFormat/Helpers.cs b/Aaru.Images/AaruFormat/Helpers.cs
index 2ddfdf113..72915ac9d 100644
--- a/Aaru.Images/AaruFormat/Helpers.cs
+++ b/Aaru.Images/AaruFormat/Helpers.cs
@@ -48,7 +48,7 @@ namespace Aaru.DiscImages
             // Search for SecureDigital CID
             if(mediaTags.TryGetValue(MediaTagType.SD_CID, out byte[] sdCid))
             {
-                CID decoded = Aaru.Decoders.SecureDigital.Decoders.DecodeCID(sdCid);
+                CID decoded = Decoders.SecureDigital.Decoders.DecodeCID(sdCid);
 
                 if(string.IsNullOrWhiteSpace(imageInfo.DriveManufacturer))
                     imageInfo.DriveManufacturer = VendorString.Prettify(decoded.Manufacturer);
@@ -67,10 +67,10 @@ namespace Aaru.DiscImages
             // Search for MultiMediaCard CID
             if(mediaTags.TryGetValue(MediaTagType.MMC_CID, out byte[] mmcCid))
             {
-                global::Aaru.Decoders.MMC.CID decoded = global::Aaru.Decoders.MMC.Decoders.DecodeCID(mmcCid);
+                Decoders.MMC.CID decoded = Decoders.MMC.Decoders.DecodeCID(mmcCid);
 
                 if(string.IsNullOrWhiteSpace(imageInfo.DriveManufacturer))
-                    imageInfo.DriveManufacturer = global::Aaru.Decoders.MMC.VendorString.Prettify(decoded.Manufacturer);
+                    imageInfo.DriveManufacturer = Decoders.MMC.VendorString.Prettify(decoded.Manufacturer);
 
                 if(string.IsNullOrWhiteSpace(imageInfo.DriveModel))
                     imageInfo.DriveModel = decoded.ProductName;
@@ -109,7 +109,7 @@ namespace Aaru.DiscImages
                !mediaTags.TryGetValue(MediaTagType.ATAPI_IDENTIFY, out ataIdentify))
                 return;
 
-            Identify.IdentifyDevice? nullableIdentify = global::Aaru.CommonTypes.Structs.Devices.ATA.Identify.Decode(ataIdentify);
+            Identify.IdentifyDevice? nullableIdentify = CommonTypes.Structs.Devices.ATA.Identify.Decode(ataIdentify);
 
             if(!nullableIdentify.HasValue)
                 return;
diff --git a/Aaru.Images/AaruFormat/Identify.cs b/Aaru.Images/AaruFormat/Identify.cs
index 7aeda1fd2..9fc7d34e2 100644
--- a/Aaru.Images/AaruFormat/Identify.cs
+++ b/Aaru.Images/AaruFormat/Identify.cs
@@ -43,13 +43,15 @@ namespace Aaru.DiscImages
             imageStream = imageFilter.GetDataForkStream();
             imageStream.Seek(0, SeekOrigin.Begin);
 
-            if(imageStream.Length < Marshal.SizeOf<AaruHeader>()) return false;
+            if(imageStream.Length < Marshal.SizeOf<AaruHeader>())
+                return false;
 
             structureBytes = new byte[Marshal.SizeOf<AaruHeader>()];
             imageStream.Read(structureBytes, 0, structureBytes.Length);
             header = Marshal.ByteArrayToStructureLittleEndian<AaruHeader>(structureBytes);
 
-            return (header.identifier == DIC_MAGIC || header.identifier == AARU_MAGIC) && header.imageMajorVersion <= AARUFMT_VERSION;
+            return (header.identifier == DIC_MAGIC || header.identifier == AARU_MAGIC) &&
+                   header.imageMajorVersion <= AARUFMT_VERSION;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/AaruFormat/Properties.cs b/Aaru.Images/AaruFormat/Properties.cs
index 54723b4af..95a9c281a 100644
--- a/Aaru.Images/AaruFormat/Properties.cs
+++ b/Aaru.Images/AaruFormat/Properties.cs
@@ -57,27 +57,28 @@ namespace Aaru.DiscImages
         public IEnumerable<SectorTagType> SupportedSectorTags =>
             Enum.GetValues(typeof(SectorTagType)).Cast<SectorTagType>();
         public IEnumerable<MediaType> SupportedMediaTypes => Enum.GetValues(typeof(MediaType)).Cast<MediaType>();
-        public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
-            new[]
-            {
-                ("sectors_per_block", typeof(uint),
-                 "How many sectors to store per block (will be rounded to next power of two)", 4096U),
-                ("dictionary", typeof(uint), "Size, in bytes, of the LZMA dictionary", (uint)(1 << 25)),
-                ("max_ddt_size", typeof(uint),
-                 "Maximum size, in mebibytes, for in-memory DDT. If image needs a bigger one, it will be on-disk",
-                 256U),
-                ("md5", typeof(bool), "Calculate and store MD5 of image's user data", (object)false),
-                ("sha1", typeof(bool), "Calculate and store SHA1 of image's user data", (object)false),
-                ("sha256", typeof(bool), "Calculate and store SHA256 of image's user data", (object)false),
-                ("spamsum", typeof(bool), "Calculate and store SpamSum of image's user data", (object)false),
-                ("deduplicate", typeof(bool),
-                 "Store only unique sectors. This consumes more memory and is slower, but it's enabled by default",
-                 (object)true),
-                ("nocompress", typeof(bool),
-                 "Don't compress user data blocks. Other blocks will still be compressed", (object)false)
-            };
-        public IEnumerable<string> KnownExtensions => new[] {".dicf",".aaru",".aaruformat",".aaruf"};
-        public bool                IsWriting       { get; private set; }
-        public string              ErrorMessage    { get; private set; }
+        public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions => new[]
+        {
+            ("sectors_per_block", typeof(uint),
+             "How many sectors to store per block (will be rounded to next power of two)", 4096U),
+            ("dictionary", typeof(uint), "Size, in bytes, of the LZMA dictionary", (uint)(1 << 25)),
+            ("max_ddt_size", typeof(uint),
+             "Maximum size, in mebibytes, for in-memory DDT. If image needs a bigger one, it will be on-disk", 256U),
+            ("md5", typeof(bool), "Calculate and store MD5 of image's user data", (object)false),
+            ("sha1", typeof(bool), "Calculate and store SHA1 of image's user data", (object)false),
+            ("sha256", typeof(bool), "Calculate and store SHA256 of image's user data", (object)false),
+            ("spamsum", typeof(bool), "Calculate and store SpamSum of image's user data", (object)false),
+            ("deduplicate", typeof(bool),
+             "Store only unique sectors. This consumes more memory and is slower, but it's enabled by default",
+             (object)true),
+            ("nocompress", typeof(bool), "Don't compress user data blocks. Other blocks will still be compressed",
+             (object)false)
+        };
+        public IEnumerable<string> KnownExtensions => new[]
+        {
+            ".dicf", ".aaru", ".aaruformat", ".aaruf"
+        };
+        public bool   IsWriting    { get; private set; }
+        public string ErrorMessage { get; private set; }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/AaruFormat/Read.cs b/Aaru.Images/AaruFormat/Read.cs
index aff77285f..e601802d2 100644
--- a/Aaru.Images/AaruFormat/Read.cs
+++ b/Aaru.Images/AaruFormat/Read.cs
@@ -38,8 +38,6 @@ using System.Runtime.InteropServices;
 using System.Text;
 using System.Xml;
 using System.Xml.Serialization;
-using CUETools.Codecs;
-using CUETools.Codecs.FLAKE;
 using Aaru.Checksums;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Enums;
@@ -47,6 +45,8 @@ using Aaru.CommonTypes.Exceptions;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 using Aaru.Console;
+using CUETools.Codecs;
+using CUETools.Codecs.FLAKE;
 using Schemas;
 using SharpCompress.Compressors.LZMA;
 using Marshal = Aaru.Helpers.Marshal;
@@ -58,8 +58,7 @@ namespace Aaru.DiscImages
     {
         public bool Open(IFilter imageFilter)
         {
-            AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
-                                      GC.GetTotalMemory(false));
+            AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes", GC.GetTotalMemory(false));
 
             imageStream = imageFilter.GetDataForkStream();
             imageStream.Seek(0, SeekOrigin.Begin);
@@ -79,8 +78,7 @@ namespace Aaru.DiscImages
             imageInfo.Version            = $"{header.imageMajorVersion}.{header.imageMinorVersion}";
             imageInfo.MediaType          = header.mediaType;
 
-            AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
-                                      GC.GetTotalMemory(false));
+            AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes", GC.GetTotalMemory(false));
 
             // Read the index header
             imageStream.Position = (long)header.indexOffset;
@@ -91,11 +89,10 @@ namespace Aaru.DiscImages
             if(idxHeader.identifier != BlockType.Index)
                 throw new FeatureUnsupportedImageException("Index not found!");
 
-            AaruConsole.DebugWriteLine("Aaru Format plugin", "Index at {0} contains {1} entries",
-                                      header.indexOffset, idxHeader.entries);
+            AaruConsole.DebugWriteLine("Aaru Format plugin", "Index at {0} contains {1} entries", header.indexOffset,
+                                       idxHeader.entries);
 
-            AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
-                                      GC.GetTotalMemory(false));
+            AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes", GC.GetTotalMemory(false));
 
             // Fill in-memory index
             index = new List<IndexEntry>();
@@ -107,14 +104,13 @@ namespace Aaru.DiscImages
                 IndexEntry entry = Marshal.SpanToStructureLittleEndian<IndexEntry>(structureBytes);
 
                 AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                          "Block type {0} with data type {1} is indexed to be at {2}", entry.blockType,
-                                          entry.dataType, entry.offset);
+                                           "Block type {0} with data type {1} is indexed to be at {2}", entry.blockType,
+                                           entry.dataType, entry.offset);
 
                 index.Add(entry);
             }
 
-            AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
-                                      GC.GetTotalMemory(false));
+            AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes", GC.GetTotalMemory(false));
 
             imageInfo.ImageSize = 0;
 
@@ -151,8 +147,8 @@ namespace Aaru.DiscImages
                         if(blockHeader.identifier != entry.blockType)
                         {
                             AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                      "Incorrect identifier for data block at position {0}",
-                                                      entry.offset);
+                                                       "Incorrect identifier for data block at position {0}",
+                                                       entry.offset);
 
                             break;
                         }
@@ -160,20 +156,19 @@ namespace Aaru.DiscImages
                         if(blockHeader.type != entry.dataType)
                         {
                             AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                      "Expected block with data type {0} at position {1} but found data type {2}",
-                                                      entry.dataType, entry.offset, blockHeader.type);
+                                                       "Expected block with data type {0} at position {1} but found data type {2}",
+                                                       entry.dataType, entry.offset, blockHeader.type);
 
                             break;
                         }
 
                         byte[] data;
 
-                        AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                  "Found data block type {0} at position {1}", entry.dataType,
-                                                  entry.offset);
+                        AaruConsole.DebugWriteLine("Aaru Format plugin", "Found data block type {0} at position {1}",
+                                                   entry.dataType, entry.offset);
 
                         AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
-                                                  GC.GetTotalMemory(false));
+                                                   GC.GetTotalMemory(false));
 
                         // Decompress media tag
                         if(blockHeader.compression == CompressionType.Lzma ||
@@ -183,8 +178,8 @@ namespace Aaru.DiscImages
                                entry.dataType          != DataType.CdSectorSubchannel)
                             {
                                 AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                          "Invalid compression type {0} for block with data type {1}, continuing...",
-                                                          blockHeader.compression, entry.dataType);
+                                                           "Invalid compression type {0} for block with data type {1}, continuing...",
+                                                           blockHeader.compression, entry.dataType);
 
                                 break;
                             }
@@ -206,12 +201,11 @@ namespace Aaru.DiscImages
 
                             DateTime endDecompress = DateTime.Now;
 
-                            AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                      "Took {0} seconds to decompress block",
-                                                      (endDecompress - startDecompress).TotalSeconds);
+                            AaruConsole.DebugWriteLine("Aaru Format plugin", "Took {0} seconds to decompress block",
+                                                       (endDecompress - startDecompress).TotalSeconds);
 
                             AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
-                                                      GC.GetTotalMemory(false));
+                                                       GC.GetTotalMemory(false));
                         }
                         else if(blockHeader.compression == CompressionType.None)
                         {
@@ -219,13 +213,13 @@ namespace Aaru.DiscImages
                             imageStream.Read(data, 0, (int)blockHeader.length);
 
                             AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
-                                                      GC.GetTotalMemory(false));
+                                                       GC.GetTotalMemory(false));
                         }
                         else
                         {
                             AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                      "Found unknown compression type {0}, continuing...",
-                                                      (ushort)blockHeader.compression);
+                                                       "Found unknown compression type {0}, continuing...",
+                                                       (ushort)blockHeader.compression);
 
                             break;
                         }
@@ -236,8 +230,8 @@ namespace Aaru.DiscImages
                         if(BitConverter.ToUInt64(blockCrc, 0) != blockHeader.crc64)
                         {
                             AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                      "Incorrect CRC found: 0x{0:X16} found, expected 0x{1:X16}, continuing...",
-                                                      BitConverter.ToUInt64(blockCrc, 0), blockHeader.crc64);
+                                                       "Incorrect CRC found: 0x{0:X16} found, expected 0x{1:X16}, continuing...",
+                                                       BitConverter.ToUInt64(blockCrc, 0), blockHeader.crc64);
 
                             break;
                         }
@@ -262,7 +256,7 @@ namespace Aaru.DiscImages
                                     imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorHeader);
 
                                 AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
-                                                          GC.GetTotalMemory(false));
+                                                           GC.GetTotalMemory(false));
 
                                 break;
                             case DataType.CdSectorSuffix:
@@ -291,7 +285,7 @@ namespace Aaru.DiscImages
                                     imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEdc);
 
                                 AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
-                                                          GC.GetTotalMemory(false));
+                                                           GC.GetTotalMemory(false));
 
                                 break;
                             case DataType.CdSectorSubchannel:
@@ -301,7 +295,7 @@ namespace Aaru.DiscImages
                                     imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubchannel);
 
                                 AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
-                                                          GC.GetTotalMemory(false));
+                                                           GC.GetTotalMemory(false));
 
                                 break;
                             case DataType.AppleProfileTag:
@@ -313,14 +307,14 @@ namespace Aaru.DiscImages
                                     imageInfo.ReadableSectorTags.Add(SectorTagType.AppleSectorTag);
 
                                 AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
-                                                          GC.GetTotalMemory(false));
+                                                           GC.GetTotalMemory(false));
 
                                 break;
                             case DataType.CompactDiscMode2Subheader:
                                 mode2Subheaders = data;
 
                                 AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
-                                                          GC.GetTotalMemory(false));
+                                                           GC.GetTotalMemory(false));
 
                                 break;
                             default:
@@ -329,8 +323,8 @@ namespace Aaru.DiscImages
                                 if(mediaTags.ContainsKey(mediaTagType))
                                 {
                                     AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                              "Media tag type {0} duplicated, removing previous entry...",
-                                                              mediaTagType);
+                                                               "Media tag type {0} duplicated, removing previous entry...",
+                                                               mediaTagType);
 
                                     mediaTags.Remove(mediaTagType);
                                 }
@@ -338,7 +332,7 @@ namespace Aaru.DiscImages
                                 mediaTags.Add(mediaTagType, data);
 
                                 AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
-                                                          GC.GetTotalMemory(false));
+                                                           GC.GetTotalMemory(false));
 
                                 break;
                         }
@@ -359,7 +353,7 @@ namespace Aaru.DiscImages
                             shift             = ddtHeader.shift;
 
                             AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
-                                                      GC.GetTotalMemory(false));
+                                                       GC.GetTotalMemory(false));
 
                             // Check for DDT compression
                             switch(ddtHeader.compression)
@@ -382,19 +376,19 @@ namespace Aaru.DiscImages
                                     inMemoryDdt = true;
 
                                     AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                              "Took {0} seconds to decompress DDT",
-                                                              (ddtEnd - ddtStart).TotalSeconds);
+                                                               "Took {0} seconds to decompress DDT",
+                                                               (ddtEnd - ddtStart).TotalSeconds);
 
-                                    AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                              "Memory snapshot: {0} bytes", GC.GetTotalMemory(false));
+                                    AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
+                                                               GC.GetTotalMemory(false));
 
                                     break;
                                 case CompressionType.None:
                                     inMemoryDdt          = false;
                                     outMemoryDdtPosition = (long)entry.offset;
 
-                                    AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                              "Memory snapshot: {0} bytes", GC.GetTotalMemory(false));
+                                    AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
+                                                               GC.GetTotalMemory(false));
 
                                     break;
                                 default:
@@ -411,7 +405,7 @@ namespace Aaru.DiscImages
                             byte[] decompressedDdt = new byte[ddtHeader.length];
 
                             AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
-                                                      GC.GetTotalMemory(false));
+                                                       GC.GetTotalMemory(false));
 
                             // Check for DDT compression
                             switch(ddtHeader.compression)
@@ -431,18 +425,18 @@ namespace Aaru.DiscImages
                                     DateTime ddtEnd = DateTime.UtcNow;
 
                                     AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                              "Took {0} seconds to decompress DDT",
-                                                              (ddtEnd - ddtStart).TotalSeconds);
+                                                               "Took {0} seconds to decompress DDT",
+                                                               (ddtEnd - ddtStart).TotalSeconds);
 
-                                    AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                              "Memory snapshot: {0} bytes", GC.GetTotalMemory(false));
+                                    AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
+                                                               GC.GetTotalMemory(false));
 
                                     break;
                                 case CompressionType.None:
                                     imageStream.Read(decompressedDdt, 0, decompressedDdt.Length);
 
-                                    AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                              "Memory snapshot: {0} bytes", GC.GetTotalMemory(false));
+                                    AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
+                                                               GC.GetTotalMemory(false));
 
                                     break;
                                 default:
@@ -458,7 +452,7 @@ namespace Aaru.DiscImages
                                 sectorSuffixDdt = cdDdt;
 
                             AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
-                                                      GC.GetTotalMemory(false));
+                                                       GC.GetTotalMemory(false));
                         }
 
                         break;
@@ -472,16 +466,16 @@ namespace Aaru.DiscImages
                         if(geometryBlock.identifier == BlockType.GeometryBlock)
                         {
                             AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                      "Geometry set to {0} cylinders {1} heads {2} sectors per track",
-                                                      geometryBlock.cylinders, geometryBlock.heads,
-                                                      geometryBlock.sectorsPerTrack);
+                                                       "Geometry set to {0} cylinders {1} heads {2} sectors per track",
+                                                       geometryBlock.cylinders, geometryBlock.heads,
+                                                       geometryBlock.sectorsPerTrack);
 
                             imageInfo.Cylinders       = geometryBlock.cylinders;
                             imageInfo.Heads           = geometryBlock.heads;
                             imageInfo.SectorsPerTrack = geometryBlock.sectorsPerTrack;
 
                             AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
-                                                      GC.GetTotalMemory(false));
+                                                       GC.GetTotalMemory(false));
                         }
 
                         break;
@@ -497,14 +491,14 @@ namespace Aaru.DiscImages
                         if(metadataBlock.identifier != entry.blockType)
                         {
                             AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                      "Incorrect identifier for data block at position {0}",
-                                                      entry.offset);
+                                                       "Incorrect identifier for data block at position {0}",
+                                                       entry.offset);
 
                             break;
                         }
 
                         AaruConsole.DebugWriteLine("Aaru Format plugin", "Found metadata block at position {0}",
-                                                  entry.offset);
+                                                   entry.offset);
 
                         byte[] metadata = new byte[metadataBlock.blockSize];
                         imageStream.Position = (long)entry.offset;
@@ -516,9 +510,8 @@ namespace Aaru.DiscImages
                             imageInfo.MediaSequence     = metadataBlock.mediaSequence;
                             imageInfo.LastMediaSequence = metadataBlock.lastMediaSequence;
 
-                            AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                      "Setting media sequence as {0} of {1}", imageInfo.MediaSequence,
-                                                      imageInfo.LastMediaSequence);
+                            AaruConsole.DebugWriteLine("Aaru Format plugin", "Setting media sequence as {0} of {1}",
+                                                       imageInfo.MediaSequence, imageInfo.LastMediaSequence);
                         }
 
                         if(metadataBlock.creatorLength                               > 0 &&
@@ -527,8 +520,7 @@ namespace Aaru.DiscImages
                             imageInfo.Creator = Encoding.Unicode.GetString(metadata, (int)metadataBlock.creatorOffset,
                                                                            (int)(metadataBlock.creatorLength - 2));
 
-                            AaruConsole.DebugWriteLine("Aaru Format plugin", "Setting creator: {0}",
-                                                      imageInfo.Creator);
+                            AaruConsole.DebugWriteLine("Aaru Format plugin", "Setting creator: {0}", imageInfo.Creator);
                         }
 
                         if(metadataBlock.commentsOffset                                > 0 &&
@@ -539,7 +531,7 @@ namespace Aaru.DiscImages
                                                            (int)(metadataBlock.commentsLength - 2));
 
                             AaruConsole.DebugWriteLine("Aaru Format plugin", "Setting comments: {0}",
-                                                      imageInfo.Comments);
+                                                       imageInfo.Comments);
                         }
 
                         if(metadataBlock.mediaTitleOffset                                  > 0 &&
@@ -550,7 +542,7 @@ namespace Aaru.DiscImages
                                                            (int)(metadataBlock.mediaTitleLength - 2));
 
                             AaruConsole.DebugWriteLine("Aaru Format plugin", "Setting media title: {0}",
-                                                      imageInfo.MediaTitle);
+                                                       imageInfo.MediaTitle);
                         }
 
                         if(metadataBlock.mediaManufacturerOffset > 0 &&
@@ -562,7 +554,7 @@ namespace Aaru.DiscImages
                                                            (int)(metadataBlock.mediaManufacturerLength - 2));
 
                             AaruConsole.DebugWriteLine("Aaru Format plugin", "Setting media manufacturer: {0}",
-                                                      imageInfo.MediaManufacturer);
+                                                       imageInfo.MediaManufacturer);
                         }
 
                         if(metadataBlock.mediaModelOffset                                  > 0 &&
@@ -573,7 +565,7 @@ namespace Aaru.DiscImages
                                                            (int)(metadataBlock.mediaModelLength - 2));
 
                             AaruConsole.DebugWriteLine("Aaru Format plugin", "Setting media model: {0}",
-                                                      imageInfo.MediaModel);
+                                                       imageInfo.MediaModel);
                         }
 
                         if(metadataBlock.mediaSerialNumberOffset > 0 &&
@@ -585,7 +577,7 @@ namespace Aaru.DiscImages
                                                            (int)(metadataBlock.mediaSerialNumberLength - 2));
 
                             AaruConsole.DebugWriteLine("Aaru Format plugin", "Setting media serial number: {0}",
-                                                      imageInfo.MediaSerialNumber);
+                                                       imageInfo.MediaSerialNumber);
                         }
 
                         if(metadataBlock.mediaBarcodeOffset                                    > 0 &&
@@ -596,7 +588,7 @@ namespace Aaru.DiscImages
                                                            (int)(metadataBlock.mediaBarcodeLength - 2));
 
                             AaruConsole.DebugWriteLine("Aaru Format plugin", "Setting media barcode: {0}",
-                                                      imageInfo.MediaBarcode);
+                                                       imageInfo.MediaBarcode);
                         }
 
                         if(metadataBlock.mediaPartNumberOffset                                       > 0 &&
@@ -607,7 +599,7 @@ namespace Aaru.DiscImages
                                                            (int)(metadataBlock.mediaPartNumberLength - 2));
 
                             AaruConsole.DebugWriteLine("Aaru Format plugin", "Setting media part number: {0}",
-                                                      imageInfo.MediaPartNumber);
+                                                       imageInfo.MediaPartNumber);
                         }
 
                         if(metadataBlock.driveManufacturerOffset > 0 &&
@@ -619,7 +611,7 @@ namespace Aaru.DiscImages
                                                            (int)(metadataBlock.driveManufacturerLength - 2));
 
                             AaruConsole.DebugWriteLine("Aaru Format plugin", "Setting drive manufacturer: {0}",
-                                                      imageInfo.DriveManufacturer);
+                                                       imageInfo.DriveManufacturer);
                         }
 
                         if(metadataBlock.driveModelOffset                                  > 0 &&
@@ -630,7 +622,7 @@ namespace Aaru.DiscImages
                                                            (int)(metadataBlock.driveModelLength - 2));
 
                             AaruConsole.DebugWriteLine("Aaru Format plugin", "Setting drive model: {0}",
-                                                      imageInfo.DriveModel);
+                                                       imageInfo.DriveModel);
                         }
 
                         if(metadataBlock.driveSerialNumberOffset > 0 &&
@@ -642,7 +634,7 @@ namespace Aaru.DiscImages
                                                            (int)(metadataBlock.driveSerialNumberLength - 2));
 
                             AaruConsole.DebugWriteLine("Aaru Format plugin", "Setting drive serial number: {0}",
-                                                      imageInfo.DriveSerialNumber);
+                                                       imageInfo.DriveSerialNumber);
                         }
 
                         if(metadataBlock.driveFirmwareRevisionOffset > 0 &&
@@ -653,13 +645,12 @@ namespace Aaru.DiscImages
                                 Encoding.Unicode.GetString(metadata, (int)metadataBlock.driveFirmwareRevisionOffset,
                                                            (int)(metadataBlock.driveFirmwareRevisionLength - 2));
 
-                            AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                      "Setting drive firmware revision: {0}",
-                                                      imageInfo.DriveFirmwareRevision);
+                            AaruConsole.DebugWriteLine("Aaru Format plugin", "Setting drive firmware revision: {0}",
+                                                       imageInfo.DriveFirmwareRevision);
                         }
 
                         AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
-                                                  GC.GetTotalMemory(false));
+                                                   GC.GetTotalMemory(false));
 
                         break;
 
@@ -672,8 +663,8 @@ namespace Aaru.DiscImages
                         if(tracksHeader.identifier != BlockType.TracksBlock)
                         {
                             AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                      "Incorrect identifier for tracks block at position {0}",
-                                                      entry.offset);
+                                                       "Incorrect identifier for tracks block at position {0}",
+                                                       entry.offset);
 
                             break;
                         }
@@ -685,8 +676,8 @@ namespace Aaru.DiscImages
                         if(BitConverter.ToUInt64(trksCrc, 0) != tracksHeader.crc64)
                         {
                             AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                      "Incorrect CRC found: 0x{0:X16} found, expected 0x{1:X16}, continuing...",
-                                                      BitConverter.ToUInt64(trksCrc, 0), tracksHeader.crc64);
+                                                       "Incorrect CRC found: 0x{0:X16} found, expected 0x{1:X16}, continuing...",
+                                                       BitConverter.ToUInt64(trksCrc, 0), tracksHeader.crc64);
 
                             break;
                         }
@@ -698,7 +689,7 @@ namespace Aaru.DiscImages
                         trackIsrcs = new Dictionary<byte, string>();
 
                         AaruConsole.DebugWriteLine("Aaru Format plugin", "Found {0} tracks at position {0}",
-                                                  tracksHeader.entries, entry.offset);
+                                                   tracksHeader.entries, entry.offset);
 
                         for(ushort i = 0; i < tracksHeader.entries; i++)
                         {
@@ -725,7 +716,7 @@ namespace Aaru.DiscImages
                         imageInfo.HasSessions   = true;
 
                         AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
-                                                  GC.GetTotalMemory(false));
+                                                   GC.GetTotalMemory(false));
 
                         break;
 
@@ -741,10 +732,10 @@ namespace Aaru.DiscImages
                             break;
 
                         AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                  "Found CICM XML metadata block at position {0}", entry.offset);
+                                                   "Found CICM XML metadata block at position {0}", entry.offset);
 
                         AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
-                                                  GC.GetTotalMemory(false));
+                                                   GC.GetTotalMemory(false));
 
                         byte[] cicmBytes = new byte[cicmBlock.length];
                         imageStream.Read(cicmBytes, 0, cicmBytes.Length);
@@ -760,13 +751,13 @@ namespace Aaru.DiscImages
                         catch(XmlException ex)
                         {
                             AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                      "Exception {0} processing CICM XML metadata block", ex.Message);
+                                                       "Exception {0} processing CICM XML metadata block", ex.Message);
 
                             CicmMetadata = null;
                         }
 
                         AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
-                                                  GC.GetTotalMemory(false));
+                                                   GC.GetTotalMemory(false));
 
                         break;
 
@@ -781,11 +772,11 @@ namespace Aaru.DiscImages
                         if(dumpBlock.identifier != BlockType.DumpHardwareBlock)
                             break;
 
-                        AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                  "Found dump hardware block at position {0}", entry.offset);
+                        AaruConsole.DebugWriteLine("Aaru Format plugin", "Found dump hardware block at position {0}",
+                                                   entry.offset);
 
                         AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
-                                                  GC.GetTotalMemory(false));
+                                                   GC.GetTotalMemory(false));
 
                         structureBytes = new byte[dumpBlock.length];
                         imageStream.Read(structureBytes, 0, structureBytes.Length);
@@ -794,8 +785,8 @@ namespace Aaru.DiscImages
                         if(BitConverter.ToUInt64(dumpCrc, 0) != dumpBlock.crc64)
                         {
                             AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                      "Incorrect CRC found: 0x{0:X16} found, expected 0x{1:X16}, continuing...",
-                                                      BitConverter.ToUInt64(dumpCrc, 0), dumpBlock.crc64);
+                                                       "Incorrect CRC found: 0x{0:X16} found, expected 0x{1:X16}, continuing...",
+                                                       BitConverter.ToUInt64(dumpCrc, 0), dumpBlock.crc64);
 
                             break;
                         }
@@ -905,7 +896,7 @@ namespace Aaru.DiscImages
                             DumpHardware = null;
 
                         AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
-                                                  GC.GetTotalMemory(false));
+                                                   GC.GetTotalMemory(false));
 
                         break;
 
@@ -920,8 +911,8 @@ namespace Aaru.DiscImages
                         if(partitionHeader.identifier != BlockType.TapePartitionBlock)
                             break;
 
-                        AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                  "Found tape partition block at position {0}", entry.offset);
+                        AaruConsole.DebugWriteLine("Aaru Format plugin", "Found tape partition block at position {0}",
+                                                   entry.offset);
 
                         byte[] tapePartitionBytes = new byte[partitionHeader.length];
                         imageStream.Read(tapePartitionBytes, 0, tapePartitionBytes.Length);
@@ -951,8 +942,8 @@ namespace Aaru.DiscImages
                         if(fileHeader.identifier != BlockType.TapeFileBlock)
                             break;
 
-                        AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                  "Found tape file block at position {0}", entry.offset);
+                        AaruConsole.DebugWriteLine("Aaru Format plugin", "Found tape file block at position {0}",
+                                                   entry.offset);
 
                         byte[] tapeFileBytes = new byte[fileHeader.length];
                         imageStream.Read(tapeFileBytes, 0, tapeFileBytes.Length);
@@ -980,7 +971,7 @@ namespace Aaru.DiscImages
             imageInfo.LastModificationTime = DateTime.FromFileTimeUtc(header.lastWrittenTime);
 
             AaruConsole.DebugWriteLine("Aaru Format plugin", "Image last written on {0}",
-                                      imageInfo.LastModificationTime);
+                                       imageInfo.LastModificationTime);
 
             imageInfo.XmlMediaType = GetXmlMediaType(header.mediaType);
 
@@ -994,8 +985,7 @@ namespace Aaru.DiscImages
 
             imageInfo.ReadableMediaTags.AddRange(mediaTags.Keys);
 
-            AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
-                                      GC.GetTotalMemory(false));
+            AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes", GC.GetTotalMemory(false));
 
             // Initialize caches
             blockCache       = new Dictionary<ulong, byte[]>();
@@ -1005,14 +995,13 @@ namespace Aaru.DiscImages
             if(!inMemoryDdt)
                 ddtEntryCache = new Dictionary<ulong, ulong>();
 
-            AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
-                                      GC.GetTotalMemory(false));
+            AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes", GC.GetTotalMemory(false));
 
             // Initialize tracks, sessions and partitions
             if(imageInfo.XmlMediaType == XmlMediaType.OpticalDisc)
             {
                 AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
-                                          GC.GetTotalMemory(false));
+                                           GC.GetTotalMemory(false));
 
                 if(Tracks       == null ||
                    Tracks.Count == 0)
@@ -1043,7 +1032,7 @@ namespace Aaru.DiscImages
                 }
 
                 AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
-                                          GC.GetTotalMemory(false));
+                                           GC.GetTotalMemory(false));
 
                 Sessions = new List<Session>();
 
@@ -1058,7 +1047,7 @@ namespace Aaru.DiscImages
                     });
 
                 AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
-                                          GC.GetTotalMemory(false));
+                                           GC.GetTotalMemory(false));
 
                 ulong currentTrackOffset = 0;
                 Partitions = new List<Partition>();
@@ -1081,7 +1070,7 @@ namespace Aaru.DiscImages
                 }
 
                 AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
-                                          GC.GetTotalMemory(false));
+                                           GC.GetTotalMemory(false));
 
                 Track[] tracks = Tracks.ToArray();
 
@@ -1103,12 +1092,12 @@ namespace Aaru.DiscImages
                 }
 
                 AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
-                                          GC.GetTotalMemory(false));
+                                           GC.GetTotalMemory(false));
 
                 Tracks = tracks.ToList();
 
                 AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
-                                          GC.GetTotalMemory(false));
+                                           GC.GetTotalMemory(false));
             }
             else
             {
@@ -1122,8 +1111,7 @@ namespace Aaru.DiscImages
             if(sectorSuffixDdt != null)
                 EccInit();
 
-            AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
-                                      GC.GetTotalMemory(false));
+            AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes", GC.GetTotalMemory(false));
 
             return true;
         }
@@ -1170,8 +1158,7 @@ namespace Aaru.DiscImages
             blockHeader = Marshal.SpanToStructureLittleEndian<BlockHeader>(structureBytes);
 
             // Decompress block
-            AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
-                                      GC.GetTotalMemory(false));
+            AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes", GC.GetTotalMemory(false));
 
             switch(blockHeader.compression)
             {
@@ -1180,7 +1167,7 @@ namespace Aaru.DiscImages
                     imageStream.Read(block, 0, (int)blockHeader.length);
 
                     AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
-                                              GC.GetTotalMemory(false));
+                                               GC.GetTotalMemory(false));
 
                     break;
                 case CompressionType.Lzma:
@@ -1196,7 +1183,7 @@ namespace Aaru.DiscImages
                     compressedBlockMs.Close();
 
                     AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
-                                              GC.GetTotalMemory(false));
+                                               GC.GetTotalMemory(false));
 
                     break;
                 case CompressionType.Flac:
@@ -1212,7 +1199,7 @@ namespace Aaru.DiscImages
                     flacMs.Close();
 
                     AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
-                                              GC.GetTotalMemory(false));
+                                               GC.GetTotalMemory(false));
 
                     break;
                 default:
@@ -1236,8 +1223,7 @@ namespace Aaru.DiscImages
             sector = new byte[blockHeader.sectorSize];
             Array.Copy(block, (long)(offset * blockHeader.sectorSize), sector, 0, blockHeader.sectorSize);
 
-            AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
-                                      GC.GetTotalMemory(false));
+            AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes", GC.GetTotalMemory(false));
 
             return sector;
         }
diff --git a/Aaru.Images/AaruFormat/Structs.cs b/Aaru.Images/AaruFormat/Structs.cs
index 466da5da7..c3caf7fa6 100644
--- a/Aaru.Images/AaruFormat/Structs.cs
+++ b/Aaru.Images/AaruFormat/Structs.cs
@@ -315,9 +315,7 @@ namespace Aaru.DiscImages
             public uint length;
         }
 
-        /// <summary>
-        ///     Tape file block, contains a list of all files in a tape
-        /// </summary>
+        /// <summary>Tape file block, contains a list of all files in a tape</summary>
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct TapeFileHeader
         {
@@ -331,33 +329,21 @@ namespace Aaru.DiscImages
             public ulong crc64;
         }
 
-        /// <summary>
-        ///     Tape file entry
-        /// </summary>
+        /// <summary>Tape file entry</summary>
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct TapeFileEntry
         {
-            /// <summary>
-            ///     File number
-            /// </summary>
+            /// <summary>File number</summary>
             public uint File;
-            /// <summary>
-            ///     Partition number
-            /// </summary>
+            /// <summary>Partition number</summary>
             public readonly byte Partition;
-            /// <summary>
-            ///     First block, inclusive, of the file
-            /// </summary>
+            /// <summary>First block, inclusive, of the file</summary>
             public ulong FirstBlock;
-            /// <summary>
-            ///     Last block, inclusive, of the file
-            /// </summary>
+            /// <summary>Last block, inclusive, of the file</summary>
             public ulong LastBlock;
         }
 
-        /// <summary>
-        ///     Tape partition block, contains a list of all partitions in a tape
-        /// </summary>
+        /// <summary>Tape partition block, contains a list of all partitions in a tape</summary>
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct TapePartitionHeader
         {
@@ -371,23 +357,15 @@ namespace Aaru.DiscImages
             public ulong crc64;
         }
 
-        /// <summary>
-        ///     Tape partition entry
-        /// </summary>
+        /// <summary>Tape partition entry</summary>
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         public struct TapePartitionEntry
         {
-            /// <summary>
-            ///     Partition number
-            /// </summary>
+            /// <summary>Partition number</summary>
             public byte Number;
-            /// <summary>
-            ///     First block, inclusive, of the partition
-            /// </summary>
+            /// <summary>First block, inclusive, of the partition</summary>
             public ulong FirstBlock;
-            /// <summary>
-            ///     Last block, inclusive, of the partition
-            /// </summary>
+            /// <summary>Last block, inclusive, of the partition</summary>
             public ulong LastBlock;
         }
     }
diff --git a/Aaru.Images/AaruFormat/Tape.cs b/Aaru.Images/AaruFormat/Tape.cs
index 9f0b4aff0..136f4ae22 100644
--- a/Aaru.Images/AaruFormat/Tape.cs
+++ b/Aaru.Images/AaruFormat/Tape.cs
@@ -51,6 +51,7 @@ namespace Aaru.DiscImages
             }
 
             Files.Add(file);
+
             return true;
         }
 
@@ -63,6 +64,7 @@ namespace Aaru.DiscImages
             }
 
             TapePartitions.Add(partition);
+
             return true;
         }
 
@@ -70,6 +72,7 @@ namespace Aaru.DiscImages
         {
             Files          = new List<TapeFile>();
             TapePartitions = new List<TapePartition>();
+
             return IsTape = true;
         }
     }
diff --git a/Aaru.Images/AaruFormat/Verify.cs b/Aaru.Images/AaruFormat/Verify.cs
index 7639f2e32..7409228e3 100644
--- a/Aaru.Images/AaruFormat/Verify.cs
+++ b/Aaru.Images/AaruFormat/Verify.cs
@@ -44,8 +44,7 @@ namespace Aaru.DiscImages
         public bool? VerifyMediaImage()
         {
             // This will traverse all blocks and check their CRC64 without uncompressing them
-            AaruConsole.DebugWriteLine("Aaru Format plugin", "Checking index integrity at {0}",
-                                      header.indexOffset);
+            AaruConsole.DebugWriteLine("Aaru Format plugin", "Checking index integrity at {0}", header.indexOffset);
             imageStream.Position = (long)header.indexOffset;
 
             structureBytes = new byte[Marshal.SizeOf<IndexHeader>()];
@@ -55,11 +54,12 @@ namespace Aaru.DiscImages
             if(idxHeader.identifier != BlockType.Index)
             {
                 AaruConsole.DebugWriteLine("Aaru Format plugin", "Incorrect index identifier");
+
                 return false;
             }
 
-            AaruConsole.DebugWriteLine("Aaru Format plugin", "Index at {0} contains {1} entries",
-                                      header.indexOffset, idxHeader.entries);
+            AaruConsole.DebugWriteLine("Aaru Format plugin", "Index at {0} contains {1} entries", header.indexOffset,
+                                       idxHeader.entries);
 
             structureBytes = new byte[Marshal.SizeOf<IndexEntry>() * idxHeader.entries];
             imageStream.Read(structureBytes, 0, structureBytes.Length);
@@ -68,21 +68,25 @@ namespace Aaru.DiscImages
             if(BitConverter.ToUInt64(verifyCrc, 0) != idxHeader.crc64)
             {
                 AaruConsole.DebugWriteLine("Aaru Format plugin", "Expected index CRC {0:X16} but got {1:X16}",
-                                          idxHeader.crc64, BitConverter.ToUInt64(verifyCrc, 0));
+                                           idxHeader.crc64, BitConverter.ToUInt64(verifyCrc, 0));
+
                 return false;
             }
 
             imageStream.Position -= structureBytes.Length;
 
             List<IndexEntry> vrIndex = new List<IndexEntry>();
+
             for(ushort i = 0; i < idxHeader.entries; i++)
             {
                 structureBytes = new byte[Marshal.SizeOf<IndexEntry>()];
                 imageStream.Read(structureBytes, 0, structureBytes.Length);
                 IndexEntry entry = Marshal.SpanToStructureLittleEndian<IndexEntry>(structureBytes);
+
                 AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                          "Block type {0} with data type {1} is indexed to be at {2}", entry.blockType,
-                                          entry.dataType, entry.offset);
+                                           "Block type {0} with data type {1} is indexed to be at {2}", entry.blockType,
+                                           entry.dataType, entry.offset);
+
                 vrIndex.Add(entry);
             }
 
@@ -107,8 +111,8 @@ namespace Aaru.DiscImages
                         readBytes = 0;
 
                         AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                  "Verifying data block type {0} at position {1}", entry.dataType,
-                                                  entry.offset);
+                                                   "Verifying data block type {0} at position {1}", entry.dataType,
+                                                   entry.offset);
 
                         while(readBytes + VERIFY_SIZE < blockHeader.cmpLength)
                         {
@@ -127,8 +131,9 @@ namespace Aaru.DiscImages
                         if(BitConverter.ToUInt64(verifyCrc, 0) != blockHeader.cmpCrc64)
                         {
                             AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                      "Expected block CRC {0:X16} but got {1:X16}",
-                                                      blockHeader.cmpCrc64, BitConverter.ToUInt64(verifyCrc, 0));
+                                                       "Expected block CRC {0:X16} but got {1:X16}",
+                                                       blockHeader.cmpCrc64, BitConverter.ToUInt64(verifyCrc, 0));
+
                             return false;
                         }
 
@@ -142,8 +147,8 @@ namespace Aaru.DiscImages
                         readBytes = 0;
 
                         AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                  "Verifying deduplication table type {0} at position {1}",
-                                                  entry.dataType, entry.offset);
+                                                   "Verifying deduplication table type {0} at position {1}",
+                                                   entry.dataType, entry.offset);
 
                         while(readBytes + VERIFY_SIZE < ddtHeader.cmpLength)
                         {
@@ -161,9 +166,9 @@ namespace Aaru.DiscImages
 
                         if(BitConverter.ToUInt64(verifyCrc, 0) != ddtHeader.cmpCrc64)
                         {
-                            AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                      "Expected DDT CRC {0:X16} but got {1:X16}", ddtHeader.cmpCrc64,
-                                                      BitConverter.ToUInt64(verifyCrc, 0));
+                            AaruConsole.DebugWriteLine("Aaru Format plugin", "Expected DDT CRC {0:X16} but got {1:X16}",
+                                                       ddtHeader.cmpCrc64, BitConverter.ToUInt64(verifyCrc, 0));
+
                             return false;
                         }
 
@@ -173,9 +178,8 @@ namespace Aaru.DiscImages
                         imageStream.Read(structureBytes, 0, structureBytes.Length);
                         TracksHeader trkHeader = Marshal.SpanToStructureLittleEndian<TracksHeader>(structureBytes);
 
-                        AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                  "Track block at {0} contains {1} entries", header.indexOffset,
-                                                  trkHeader.entries);
+                        AaruConsole.DebugWriteLine("Aaru Format plugin", "Track block at {0} contains {1} entries",
+                                                   header.indexOffset, trkHeader.entries);
 
                         structureBytes = new byte[Marshal.SizeOf<TrackEntry>() * trkHeader.entries];
                         imageStream.Read(structureBytes, 0, structureBytes.Length);
@@ -184,15 +188,16 @@ namespace Aaru.DiscImages
                         if(BitConverter.ToUInt64(verifyCrc, 0) != trkHeader.crc64)
                         {
                             AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                      "Expected index CRC {0:X16} but got {1:X16}", trkHeader.crc64,
-                                                      BitConverter.ToUInt64(verifyCrc, 0));
+                                                       "Expected index CRC {0:X16} but got {1:X16}", trkHeader.crc64,
+                                                       BitConverter.ToUInt64(verifyCrc, 0));
+
                             return false;
                         }
 
                         break;
                     default:
-                        AaruConsole.DebugWriteLine("Aaru Format plugin", "Ignored field type {0}",
-                                                  entry.blockType);
+                        AaruConsole.DebugWriteLine("Aaru Format plugin", "Ignored field type {0}", entry.blockType);
+
                         break;
                 }
             }
@@ -202,13 +207,15 @@ namespace Aaru.DiscImages
 
         public bool? VerifySector(ulong sectorAddress)
         {
-            if(imageInfo.XmlMediaType != XmlMediaType.OpticalDisc) return null;
+            if(imageInfo.XmlMediaType != XmlMediaType.OpticalDisc)
+                return null;
 
             byte[] buffer = ReadSectorLong(sectorAddress);
+
             return CdChecksums.CheckCdSector(buffer);
         }
 
-        public bool? VerifySectors(ulong           sectorAddress, uint length, out List<ulong> failingLbas,
+        public bool? VerifySectors(ulong sectorAddress, uint length, out List<ulong> failingLbas,
                                    out List<ulong> unknownLbas)
         {
             failingLbas = new List<ulong>();
@@ -217,7 +224,8 @@ namespace Aaru.DiscImages
             // Right now only CompactDisc sectors are verifyable
             if(imageInfo.XmlMediaType != XmlMediaType.OpticalDisc)
             {
-                for(ulong i = sectorAddress; i < sectorAddress + length; i++) unknownLbas.Add(i);
+                for(ulong i = sectorAddress; i < sectorAddress + length; i++)
+                    unknownLbas.Add(i);
 
                 return null;
             }
@@ -237,19 +245,22 @@ namespace Aaru.DiscImages
                 {
                     case null:
                         unknownLbas.Add((ulong)i + sectorAddress);
+
                         break;
                     case false:
                         failingLbas.Add((ulong)i + sectorAddress);
+
                         break;
                 }
             }
 
-            if(unknownLbas.Count > 0) return null;
+            if(unknownLbas.Count > 0)
+                return null;
 
             return failingLbas.Count <= 0;
         }
 
-        public bool? VerifySectors(ulong           sectorAddress, uint length, uint track, out List<ulong> failingLbas,
+        public bool? VerifySectors(ulong sectorAddress, uint length, uint track, out List<ulong> failingLbas,
                                    out List<ulong> unknownLbas)
         {
             // Right now only CompactDisc sectors are verifyable
@@ -258,7 +269,8 @@ namespace Aaru.DiscImages
                 failingLbas = new List<ulong>();
                 unknownLbas = new List<ulong>();
 
-                for(ulong i = sectorAddress; i < sectorAddress + length; i++) unknownLbas.Add(i);
+                for(ulong i = sectorAddress; i < sectorAddress + length; i++)
+                    unknownLbas.Add(i);
 
                 return null;
             }
@@ -278,23 +290,28 @@ namespace Aaru.DiscImages
                 {
                     case null:
                         unknownLbas.Add((ulong)i + sectorAddress);
+
                         break;
                     case false:
                         failingLbas.Add((ulong)i + sectorAddress);
+
                         break;
                 }
             }
 
-            if(unknownLbas.Count > 0) return null;
+            if(unknownLbas.Count > 0)
+                return null;
 
             return failingLbas.Count <= 0;
         }
 
         public bool? VerifySector(ulong sectorAddress, uint track)
         {
-            if(imageInfo.XmlMediaType != XmlMediaType.OpticalDisc) return null;
+            if(imageInfo.XmlMediaType != XmlMediaType.OpticalDisc)
+                return null;
 
             byte[] buffer = ReadSectorLong(sectorAddress, track);
+
             return CdChecksums.CheckCdSector(buffer);
         }
     }
diff --git a/Aaru.Images/AaruFormat/Write.cs b/Aaru.Images/AaruFormat/Write.cs
index e6072610d..6810444ec 100644
--- a/Aaru.Images/AaruFormat/Write.cs
+++ b/Aaru.Images/AaruFormat/Write.cs
@@ -39,8 +39,6 @@ using System.Security.Cryptography;
 using System.Text;
 using System.Xml;
 using System.Xml.Serialization;
-using CUETools.Codecs;
-using CUETools.Codecs.FLAKE;
 using Aaru.Checksums;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Enums;
@@ -48,6 +46,8 @@ using Aaru.CommonTypes.Exceptions;
 using Aaru.CommonTypes.Structs;
 using Aaru.Console;
 using Aaru.Decoders;
+using CUETools.Codecs;
+using CUETools.Codecs.FLAKE;
 using Schemas;
 using SharpCompress.Compressors.LZMA;
 using Marshal = Aaru.Helpers.Marshal;
@@ -209,8 +209,8 @@ namespace Aaru.DiscImages
                 shift++;
             }
 
-            AaruConsole.DebugWriteLine("Aaru Format plugin", "Got a shift of {0} for {1} sectors per block",
-                                      shift, oldSectorsPerBlock);
+            AaruConsole.DebugWriteLine("Aaru Format plugin", "Got a shift of {0} for {1} sectors per block", shift,
+                                       oldSectorsPerBlock);
 
             imageInfo = new ImageInfo
             {
@@ -236,7 +236,8 @@ namespace Aaru.DiscImages
                 imageStream.Read(structureBytes, 0, structureBytes.Length);
                 header = Marshal.ByteArrayToStructureLittleEndian<AaruHeader>(structureBytes);
 
-                if(header.identifier != DIC_MAGIC && header.identifier != AARU_MAGIC)
+                if(header.identifier != DIC_MAGIC &&
+                   header.identifier != AARU_MAGIC)
                 {
                     ErrorMessage = "Cannot append to a non Aaru Format image";
 
@@ -298,7 +299,7 @@ namespace Aaru.DiscImages
                 }
 
                 AaruConsole.DebugWriteLine("Aaru Format plugin", "Index at {0} contains {1} entries",
-                                          header.indexOffset, idxHeader.entries);
+                                           header.indexOffset, idxHeader.entries);
 
                 for(ushort i = 0; i < idxHeader.entries; i++)
                 {
@@ -307,8 +308,8 @@ namespace Aaru.DiscImages
                     IndexEntry entry = Marshal.SpanToStructureLittleEndian<IndexEntry>(structureBytes);
 
                     AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                              "Block type {0} with data type {1} is indexed to be at {2}",
-                                              entry.blockType, entry.dataType, entry.offset);
+                                               "Block type {0} with data type {1} is indexed to be at {2}",
+                                               entry.blockType, entry.dataType, entry.offset);
 
                     index.Add(entry);
                 }
@@ -346,8 +347,8 @@ namespace Aaru.DiscImages
                             if(blockHeader.identifier != entry.blockType)
                             {
                                 AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                          "Incorrect identifier for data block at position {0}",
-                                                          entry.offset);
+                                                           "Incorrect identifier for data block at position {0}",
+                                                           entry.offset);
 
                                 break;
                             }
@@ -355,8 +356,8 @@ namespace Aaru.DiscImages
                             if(blockHeader.type != entry.dataType)
                             {
                                 AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                          "Expected block with data type {0} at position {1} but found data type {2}",
-                                                          entry.dataType, entry.offset, blockHeader.type);
+                                                           "Expected block with data type {0} at position {1} but found data type {2}",
+                                                           entry.dataType, entry.offset, blockHeader.type);
 
                                 break;
                             }
@@ -364,8 +365,8 @@ namespace Aaru.DiscImages
                             byte[] data;
 
                             AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                      "Found data block type {0} at position {1}", entry.dataType,
-                                                      entry.offset);
+                                                       "Found data block type {0} at position {1}", entry.dataType,
+                                                       entry.offset);
 
                             if(blockHeader.compression == CompressionType.Lzma)
                             {
@@ -388,8 +389,8 @@ namespace Aaru.DiscImages
                             else
                             {
                                 AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                          "Found unknown compression type {0}, continuing...",
-                                                          (ushort)blockHeader.compression);
+                                                           "Found unknown compression type {0}, continuing...",
+                                                           (ushort)blockHeader.compression);
 
                                 break;
                             }
@@ -400,8 +401,8 @@ namespace Aaru.DiscImages
                             if(BitConverter.ToUInt64(blockCrc, 0) != blockHeader.crc64)
                             {
                                 AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                          "Incorrect CRC found: 0x{0:X16} found, expected 0x{1:X16}, continuing...",
-                                                          BitConverter.ToUInt64(blockCrc, 0), blockHeader.crc64);
+                                                           "Incorrect CRC found: 0x{0:X16} found, expected 0x{1:X16}, continuing...",
+                                                           BitConverter.ToUInt64(blockCrc, 0), blockHeader.crc64);
 
                                 break;
                             }
@@ -463,8 +464,7 @@ namespace Aaru.DiscImages
                                 switch(ddtHeader.compression)
                                 {
                                     case CompressionType.Lzma:
-                                        AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                                  "Decompressing DDT...");
+                                        AaruConsole.DebugWriteLine("Aaru Format plugin", "Decompressing DDT...");
 
                                         DateTime ddtStart = DateTime.UtcNow;
 
@@ -484,8 +484,8 @@ namespace Aaru.DiscImages
                                         inMemoryDdt = true;
 
                                         AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                                  "Took {0} seconds to decompress DDT",
-                                                                  (ddtEnd - ddtStart).TotalSeconds);
+                                                                   "Took {0} seconds to decompress DDT",
+                                                                   (ddtEnd - ddtStart).TotalSeconds);
 
                                         break;
                                     case CompressionType.None:
@@ -535,8 +535,7 @@ namespace Aaru.DiscImages
                                 switch(ddtHeader.compression)
                                 {
                                     case CompressionType.Lzma:
-                                        AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                                  "Decompressing DDT...");
+                                        AaruConsole.DebugWriteLine("Aaru Format plugin", "Decompressing DDT...");
 
                                         DateTime ddtStart = DateTime.UtcNow;
 
@@ -553,8 +552,8 @@ namespace Aaru.DiscImages
                                         DateTime ddtEnd = DateTime.UtcNow;
 
                                         AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                                  "Took {0} seconds to decompress DDT",
-                                                                  (ddtEnd - ddtStart).TotalSeconds);
+                                                                   "Took {0} seconds to decompress DDT",
+                                                                   (ddtEnd - ddtStart).TotalSeconds);
 
                                         break;
                                     case CompressionType.None:
@@ -595,7 +594,7 @@ namespace Aaru.DiscImages
                                 break;
 
                             AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                      "Found CICM XML metadata block at position {0}", entry.offset);
+                                                       "Found CICM XML metadata block at position {0}", entry.offset);
 
                             byte[] cicmBytes = new byte[cicmBlock.length];
                             imageStream.Read(cicmBytes, 0, cicmBytes.Length);
@@ -611,8 +610,8 @@ namespace Aaru.DiscImages
                             catch(XmlException ex)
                             {
                                 AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                          "Exception {0} processing CICM XML metadata block",
-                                                          ex.Message);
+                                                           "Exception {0} processing CICM XML metadata block",
+                                                           ex.Message);
 
                                 CicmMetadata = null;
                             }
@@ -631,7 +630,7 @@ namespace Aaru.DiscImages
                                 break;
 
                             AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                      "Found dump hardware block at position {0}", entry.offset);
+                                                       "Found dump hardware block at position {0}", entry.offset);
 
                             structureBytes = new byte[dumpBlock.length];
                             imageStream.Read(structureBytes, 0, structureBytes.Length);
@@ -640,8 +639,8 @@ namespace Aaru.DiscImages
                             if(BitConverter.ToUInt64(dumpCrc, 0) != dumpBlock.crc64)
                             {
                                 AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                          "Incorrect CRC found: 0x{0:X16} found, expected 0x{1:X16}, continuing...",
-                                                          BitConverter.ToUInt64(dumpCrc, 0), dumpBlock.crc64);
+                                                           "Incorrect CRC found: 0x{0:X16} found, expected 0x{1:X16}, continuing...",
+                                                           BitConverter.ToUInt64(dumpCrc, 0), dumpBlock.crc64);
 
                                 break;
                             }
@@ -764,7 +763,7 @@ namespace Aaru.DiscImages
                                 break;
 
                             AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                      "Found tape partition block at position {0}", entry.offset);
+                                                       "Found tape partition block at position {0}", entry.offset);
 
                             byte[] tapePartitionBytes = new byte[partitionHeader.length];
                             imageStream.Read(tapePartitionBytes, 0, tapePartitionBytes.Length);
@@ -796,8 +795,8 @@ namespace Aaru.DiscImages
                             if(fileHeader.identifier != BlockType.TapeFileBlock)
                                 break;
 
-                            AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                      "Found tape file block at position {0}", entry.offset);
+                            AaruConsole.DebugWriteLine("Aaru Format plugin", "Found tape file block at position {0}",
+                                                       entry.offset);
 
                             byte[] tapeFileBytes = new byte[fileHeader.length];
                             imageStream.Read(tapeFileBytes, 0, tapeFileBytes.Length);
@@ -1873,9 +1872,9 @@ namespace Aaru.DiscImages
             }
 
             if(deduplicate)
-                AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                          "Of {0} sectors written, {1} are unique ({2:P})", writtenSectors,
-                                          deduplicationTable.Count, (double)deduplicationTable.Count / writtenSectors);
+                AaruConsole.DebugWriteLine("Aaru Format plugin", "Of {0} sectors written, {1} are unique ({2:P})",
+                                           writtenSectors, deduplicationTable.Count,
+                                           (double)deduplicationTable.Count / writtenSectors);
 
             IndexEntry idxEntry;
 
@@ -1896,8 +1895,8 @@ namespace Aaru.DiscImages
                     blockType = BlockType.DataBlock, dataType = dataType, offset = (ulong)imageStream.Position
                 };
 
-                AaruConsole.DebugWriteLine("Aaru Format plugin", "Writing tag type {0} to position {1}",
-                                          mediaTag.Key, idxEntry.offset);
+                AaruConsole.DebugWriteLine("Aaru Format plugin", "Writing tag type {0} to position {1}", mediaTag.Key,
+                                           idxEntry.offset);
 
                 Crc64Context.Data(mediaTag.Value, out byte[] tagCrc);
 
@@ -1961,7 +1960,7 @@ namespace Aaru.DiscImages
                 };
 
                 AaruConsole.DebugWriteLine("Aaru Format plugin", "Writing geometry block to position {0}",
-                                          idxEntry.offset);
+                                           idxEntry.offset);
 
                 structureBytes = new byte[Marshal.SizeOf<GeometryBlock>()];
                 MemoryMarshal.Write(structureBytes, ref geometryBlock);
@@ -2094,7 +2093,7 @@ namespace Aaru.DiscImages
                 };
 
                 AaruConsole.DebugWriteLine("Aaru Format plugin", "Writing dump hardware block to position {0}",
-                                          idxEntry.offset);
+                                           idxEntry.offset);
 
                 Crc64Context.Data(dumpMs.ToArray(), out byte[] dumpCrc);
 
@@ -2127,7 +2126,7 @@ namespace Aaru.DiscImages
                 };
 
                 AaruConsole.DebugWriteLine("Aaru Format plugin", "Writing CICM XML block to position {0}",
-                                          idxEntry.offset);
+                                           idxEntry.offset);
 
                 var cicmBlock = new CicmMetadataBlock
                 {
@@ -2232,7 +2231,7 @@ namespace Aaru.DiscImages
                     };
 
                     AaruConsole.DebugWriteLine("Aaru Format plugin", "Writing checksum block to position {0}",
-                                              idxEntry.offset);
+                                               idxEntry.offset);
 
                     structureBytes = new byte[Marshal.SizeOf<ChecksumHeader>()];
                     MemoryMarshal.Write(structureBytes, ref chkHeader);
@@ -2264,7 +2263,7 @@ namespace Aaru.DiscImages
                 };
 
                 AaruConsole.DebugWriteLine("Aaru Format plugin", "Writing tape partitions to position {0}",
-                                          idxEntry.offset);
+                                           idxEntry.offset);
 
                 TapePartitionEntry[] tapePartitionEntries = new TapePartitionEntry[TapePartitions.Count];
 
@@ -2303,8 +2302,7 @@ namespace Aaru.DiscImages
                     offset    = (ulong)imageStream.Position
                 };
 
-                AaruConsole.DebugWriteLine("Aaru Format plugin", "Writing tape files to position {0}",
-                                          idxEntry.offset);
+                AaruConsole.DebugWriteLine("Aaru Format plugin", "Writing tape files to position {0}", idxEntry.offset);
 
                 TapeFileEntry[] tapeFileEntries = new TapeFileEntry[Files.Count];
 
@@ -2346,7 +2344,7 @@ namespace Aaru.DiscImages
                 };
 
                 AaruConsole.DebugWriteLine("Aaru Format plugin", "Writing user data DDT to position {0}",
-                                          idxEntry.offset);
+                                           idxEntry.offset);
 
                 var ddtHeader = new DdtHeader
                 {
@@ -2405,7 +2403,7 @@ namespace Aaru.DiscImages
                         };
 
                         AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                  "Writing CD sector prefix block to position {0}", idxEntry.offset);
+                                                   "Writing CD sector prefix block to position {0}", idxEntry.offset);
 
                         Crc64Context.Data(sectorPrefix, out byte[] blockCrc);
 
@@ -2443,9 +2441,8 @@ namespace Aaru.DiscImages
 
                             endCompress = DateTime.Now;
 
-                            AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                      "Took {0} seconds to compress prefix",
-                                                      (endCompress - startCompress).TotalSeconds);
+                            AaruConsole.DebugWriteLine("Aaru Format plugin", "Took {0} seconds to compress prefix",
+                                                       (endCompress - startCompress).TotalSeconds);
                         }
 
                         structureBytes = new byte[Marshal.SizeOf<BlockHeader>()];
@@ -2471,7 +2468,7 @@ namespace Aaru.DiscImages
                         };
 
                         AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                  "Writing CD sector suffix block to position {0}", idxEntry.offset);
+                                                   "Writing CD sector suffix block to position {0}", idxEntry.offset);
 
                         Crc64Context.Data(sectorSuffix, out blockCrc);
 
@@ -2507,9 +2504,8 @@ namespace Aaru.DiscImages
 
                             endCompress = DateTime.Now;
 
-                            AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                      "Took {0} seconds to compress suffix",
-                                                      (endCompress - startCompress).TotalSeconds);
+                            AaruConsole.DebugWriteLine("Aaru Format plugin", "Took {0} seconds to compress suffix",
+                                                       (endCompress - startCompress).TotalSeconds);
                         }
 
                         structureBytes = new byte[Marshal.SizeOf<BlockHeader>()];
@@ -2567,22 +2563,22 @@ namespace Aaru.DiscImages
                                 writtenSuffixes++;
 
                         AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                  "{0} ({1:P}% prefixes are correct, {2} ({3:P}%) prefixes have not been dumped, {4} ({5:P}%) prefixes have been written to image",
-                                                  correctPrefixes, correctPrefixes     / imageInfo.Sectors,
-                                                  notDumpedPrefixes, notDumpedPrefixes / imageInfo.Sectors,
-                                                  writtenPrefixes, writtenPrefixes     / imageInfo.Sectors);
+                                                   "{0} ({1:P}% prefixes are correct, {2} ({3:P}%) prefixes have not been dumped, {4} ({5:P}%) prefixes have been written to image",
+                                                   correctPrefixes, correctPrefixes     / imageInfo.Sectors,
+                                                   notDumpedPrefixes, notDumpedPrefixes / imageInfo.Sectors,
+                                                   writtenPrefixes, writtenPrefixes     / imageInfo.Sectors);
 
                         AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                  "{0} ({1:P}% suffixes are correct, {2} ({3:P}%) suffixes have not been dumped, {4} ({5:P}%) suffixes have been written to image",
-                                                  correctSuffixes, correctSuffixes     / imageInfo.Sectors,
-                                                  notDumpedSuffixes, notDumpedSuffixes / imageInfo.Sectors,
-                                                  writtenSuffixes, writtenSuffixes     / imageInfo.Sectors);
+                                                   "{0} ({1:P}% suffixes are correct, {2} ({3:P}%) suffixes have not been dumped, {4} ({5:P}%) suffixes have been written to image",
+                                                   correctSuffixes, correctSuffixes     / imageInfo.Sectors,
+                                                   notDumpedSuffixes, notDumpedSuffixes / imageInfo.Sectors,
+                                                   writtenSuffixes, writtenSuffixes     / imageInfo.Sectors);
 
                         AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                  "{0} ({1:P}% MODE 2 Form 1 are correct, {2} ({3:P}%) MODE 2 Form 2 are correct, {4} ({5:P}%) MODE 2 Form 2 have empty CRC",
-                                                  correctMode2Form1, correctMode2Form1 / imageInfo.Sectors,
-                                                  correctMode2Form2, correctMode2Form2 / imageInfo.Sectors,
-                                                  emptyMode2Form1, emptyMode2Form1     / imageInfo.Sectors);
+                                                   "{0} ({1:P}% MODE 2 Form 1 are correct, {2} ({3:P}%) MODE 2 Form 2 are correct, {4} ({5:P}%) MODE 2 Form 2 have empty CRC",
+                                                   correctMode2Form1, correctMode2Form1 / imageInfo.Sectors,
+                                                   correctMode2Form2, correctMode2Form2 / imageInfo.Sectors,
+                                                   emptyMode2Form1, emptyMode2Form1     / imageInfo.Sectors);
                     #endif
 
                         idxEntry = new IndexEntry
@@ -2592,8 +2588,8 @@ namespace Aaru.DiscImages
                         };
 
                         AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                  "Writing CompactDisc sector prefix DDT to position {0}",
-                                                  idxEntry.offset);
+                                                   "Writing CompactDisc sector prefix DDT to position {0}",
+                                                   idxEntry.offset);
 
                         var ddtHeader = new DdtHeader
                         {
@@ -2641,8 +2637,8 @@ namespace Aaru.DiscImages
                         };
 
                         AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                  "Writing CompactDisc sector suffix DDT to position {0}",
-                                                  idxEntry.offset);
+                                                   "Writing CompactDisc sector suffix DDT to position {0}",
+                                                   idxEntry.offset);
 
                         ddtHeader = new DdtHeader
                         {
@@ -2689,8 +2685,8 @@ namespace Aaru.DiscImages
                         };
 
                         AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                  "Writing CD sector corrected prefix block to position {0}",
-                                                  idxEntry.offset);
+                                                   "Writing CD sector corrected prefix block to position {0}",
+                                                   idxEntry.offset);
 
                         Crc64Context.Data(sectorPrefixMs.GetBuffer(), (uint)sectorPrefixMs.Length, out byte[] blockCrc);
 
@@ -2729,9 +2725,8 @@ namespace Aaru.DiscImages
 
                             endCompress = DateTime.Now;
 
-                            AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                      "Took {0} seconds to compress prefix",
-                                                      (endCompress - startCompress).TotalSeconds);
+                            AaruConsole.DebugWriteLine("Aaru Format plugin", "Took {0} seconds to compress prefix",
+                                                       (endCompress - startCompress).TotalSeconds);
                         }
 
                         structureBytes = new byte[Marshal.SizeOf<BlockHeader>()];
@@ -2757,8 +2752,8 @@ namespace Aaru.DiscImages
                         };
 
                         AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                  "Writing CD sector corrected suffix block to position {0}",
-                                                  idxEntry.offset);
+                                                   "Writing CD sector corrected suffix block to position {0}",
+                                                   idxEntry.offset);
 
                         Crc64Context.Data(sectorSuffixMs.GetBuffer(), (uint)sectorSuffixMs.Length, out blockCrc);
 
@@ -2797,9 +2792,8 @@ namespace Aaru.DiscImages
 
                             endCompress = DateTime.Now;
 
-                            AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                      "Took {0} seconds to compress suffix",
-                                                      (endCompress - startCompress).TotalSeconds);
+                            AaruConsole.DebugWriteLine("Aaru Format plugin", "Took {0} seconds to compress suffix",
+                                                       (endCompress - startCompress).TotalSeconds);
                         }
 
                         structureBytes = new byte[Marshal.SizeOf<BlockHeader>()];
@@ -2828,7 +2822,8 @@ namespace Aaru.DiscImages
                         };
 
                         AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                  "Writing CD MODE2 subheaders block to position {0}", idxEntry.offset);
+                                                   "Writing CD MODE2 subheaders block to position {0}",
+                                                   idxEntry.offset);
 
                         Crc64Context.Data(mode2Subheaders, out byte[] blockCrc);
 
@@ -2868,8 +2863,8 @@ namespace Aaru.DiscImages
                             endCompress = DateTime.Now;
 
                             AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                      "Took {0} seconds to compress MODE2 subheaders",
-                                                      (endCompress - startCompress).TotalSeconds);
+                                                       "Took {0} seconds to compress MODE2 subheaders",
+                                                       (endCompress - startCompress).TotalSeconds);
                         }
 
                         structureBytes = new byte[Marshal.SizeOf<BlockHeader>()];
@@ -2897,8 +2892,8 @@ namespace Aaru.DiscImages
                             offset    = (ulong)imageStream.Position
                         };
 
-                        AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                  "Writing CD subchannel block to position {0}", idxEntry.offset);
+                        AaruConsole.DebugWriteLine("Aaru Format plugin", "Writing CD subchannel block to position {0}",
+                                                   idxEntry.offset);
 
                         Crc64Context.Data(sectorSubchannel, out byte[] blockCrc);
 
@@ -2938,9 +2933,8 @@ namespace Aaru.DiscImages
 
                             endCompress = DateTime.Now;
 
-                            AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                      "Took {0} seconds to compress subchannel",
-                                                      (endCompress - startCompress).TotalSeconds);
+                            AaruConsole.DebugWriteLine("Aaru Format plugin", "Took {0} seconds to compress subchannel",
+                                                       (endCompress - startCompress).TotalSeconds);
                         }
 
                         structureBytes = new byte[Marshal.SizeOf<BlockHeader>()];
@@ -3010,7 +3004,7 @@ namespace Aaru.DiscImages
                         };
 
                         AaruConsole.DebugWriteLine("Aaru Format plugin", "Writing tracks to position {0}",
-                                                  imageStream.Position);
+                                                   imageStream.Position);
 
                         index.RemoveAll(t => t.blockType == BlockType.TracksBlock && t.dataType == DataType.NoData);
 
@@ -3065,7 +3059,7 @@ namespace Aaru.DiscImages
                         };
 
                         AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                  "Writing apple sector tag block to position {0}", idxEntry.offset);
+                                                   "Writing apple sector tag block to position {0}", idxEntry.offset);
 
                         Crc64Context.Data(sectorSubchannel, out byte[] blockCrc);
 
@@ -3326,7 +3320,7 @@ namespace Aaru.DiscImages
             if(metadataBlock.identifier == BlockType.MetadataBlock)
             {
                 AaruConsole.DebugWriteLine("Aaru Format plugin", "Writing metadata to position {0}",
-                                          imageStream.Position);
+                                           imageStream.Position);
 
                 metadataBlock.blockSize = (uint)blockStream.Length;
                 structureBytes          = new byte[Marshal.SizeOf<MetadataBlock>()];
@@ -3348,8 +3342,7 @@ namespace Aaru.DiscImages
 
             header.indexOffset = (ulong)imageStream.Position;
 
-            AaruConsole.DebugWriteLine("Aaru Format plugin", "Writing index to position {0}",
-                                      header.indexOffset);
+            AaruConsole.DebugWriteLine("Aaru Format plugin", "Writing index to position {0}", header.indexOffset);
 
             blockStream = new MemoryStream();
 
diff --git a/Aaru.Images/Alcohol120/Alcohol120.cs b/Aaru.Images/Alcohol120/Alcohol120.cs
index 938980db0..82fd3fec9 100644
--- a/Aaru.Images/Alcohol120/Alcohol120.cs
+++ b/Aaru.Images/Alcohol120/Alcohol120.cs
@@ -58,31 +58,18 @@ namespace Aaru.DiscImages
         Dictionary<byte, byte>                         trackFlags;
         List<Track>                                    writingTracks;
 
-        public Alcohol120()
+        public Alcohol120() => imageInfo = new ImageInfo
         {
-            imageInfo = new ImageInfo
-            {
-                ReadableSectorTags    = new List<SectorTagType>(),
-                ReadableMediaTags     = new List<MediaTagType>(),
-                HasPartitions         = true,
-                HasSessions           = true,
-                Version               = null,
-                Application           = null,
-                ApplicationVersion    = null,
-                Creator               = null,
-                Comments              = null,
-                MediaManufacturer     = null,
-                MediaModel            = null,
-                MediaSerialNumber     = null,
-                MediaBarcode          = null,
-                MediaPartNumber       = null,
-                MediaSequence         = 0,
-                LastMediaSequence     = 0,
-                DriveManufacturer     = null,
-                DriveModel            = null,
-                DriveSerialNumber     = null,
-                DriveFirmwareRevision = null
-            };
-        }
+            ReadableSectorTags = new List<SectorTagType>(), ReadableMediaTags = new List<MediaTagType>(),
+            HasPartitions      = true, HasSessions                            = true, Version = null,
+            Application        = null,
+            ApplicationVersion = null, Creator = null, Comments = null,
+            MediaManufacturer  = null,
+            MediaModel         = null, MediaSerialNumber = null, MediaBarcode = null,
+            MediaPartNumber    = null,
+            MediaSequence      = 0, LastMediaSequence = 0, DriveManufacturer = null,
+            DriveModel         = null,
+            DriveSerialNumber  = null, DriveFirmwareRevision = null
+        };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/Alcohol120/Enums.cs b/Aaru.Images/Alcohol120/Enums.cs
index 9965c3f1e..77f292c56 100644
--- a/Aaru.Images/Alcohol120/Enums.cs
+++ b/Aaru.Images/Alcohol120/Enums.cs
@@ -39,31 +39,21 @@ namespace Aaru.DiscImages
         [SuppressMessage("ReSharper", "InconsistentNaming")]
         enum AlcoholMediumType : ushort
         {
-            CD   = 0x00,
-            CDR  = 0x01,
-            CDRW = 0x02,
-            DVD  = 0x10,
-            DVDR = 0x12
+            CD  = 0x00, CDR  = 0x01, CDRW = 0x02,
+            DVD = 0x10, DVDR = 0x12
         }
 
         [SuppressMessage("ReSharper", "InconsistentNaming")]
         enum AlcoholTrackMode : byte
         {
-            NoData     = 0x00,
-            DVD        = 0x02,
-            Audio      = 0xA9,
-            Mode1      = 0xAA,
-            Mode2      = 0xAB,
-            Mode2F1    = 0xEC,
-            Mode2F2    = 0xED,
-            Mode2F1Alt = 0xAC,
-            Mode2F2Alt = 0xAD
+            NoData  = 0x00, DVD        = 0x02, Audio      = 0xA9,
+            Mode1   = 0xAA, Mode2      = 0xAB, Mode2F1    = 0xEC,
+            Mode2F2 = 0xED, Mode2F1Alt = 0xAC, Mode2F2Alt = 0xAD
         }
 
         enum AlcoholSubchannelMode : byte
         {
-            None        = 0x00,
-            Interleaved = 0x08
+            None = 0x00, Interleaved = 0x08
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/Alcohol120/Helpers.cs b/Aaru.Images/Alcohol120/Helpers.cs
index 02dd8a953..da305e192 100644
--- a/Aaru.Images/Alcohol120/Helpers.cs
+++ b/Aaru.Images/Alcohol120/Helpers.cs
@@ -162,6 +162,6 @@ namespace Aaru.DiscImages
         }
 
         static (byte minute, byte second, byte frame) LbaToMsf(ulong sector) =>
-            ((byte)((sector + 150) / 75 / 60), (byte)((sector + 150) / 75 % 60), (byte)((sector + 150) % 75));
+            ((byte)((sector + 150) / 75 / 60), (byte)(((sector + 150) / 75) % 60), (byte)((sector + 150) % 75));
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/Alcohol120/Identify.cs b/Aaru.Images/Alcohol120/Identify.cs
index 5805aa79f..053bd9ef4 100644
--- a/Aaru.Images/Alcohol120/Identify.cs
+++ b/Aaru.Images/Alcohol120/Identify.cs
@@ -43,7 +43,9 @@ namespace Aaru.DiscImages
         {
             Stream stream = imageFilter.GetDataForkStream();
             stream.Seek(0, SeekOrigin.Begin);
-            if(stream.Length < 88) return false;
+
+            if(stream.Length < 88)
+                return false;
 
             byte[] hdr = new byte[88];
             stream.Read(hdr, 0, 88);
diff --git a/Aaru.Images/Alcohol120/Properties.cs b/Aaru.Images/Alcohol120/Properties.cs
index 52c8d832f..327aad408 100644
--- a/Aaru.Images/Alcohol120/Properties.cs
+++ b/Aaru.Images/Alcohol120/Properties.cs
@@ -64,18 +64,21 @@ namespace Aaru.DiscImages
                          where alcTrack.point >= session.StartTrack || alcTrack.point <= session.EndTrack
                          select session.SessionSequence).FirstOrDefault();
 
-                    if(!alcTrackExtras.TryGetValue(alcTrack.point, out AlcoholTrackExtra alcExtra)) continue;
+                    if(!alcTrackExtras.TryGetValue(alcTrack.point, out AlcoholTrackExtra alcExtra))
+                        continue;
 
-                    Track aaruTrack = new Track
+                    var aaruTrack = new Track
                     {
-                        Indexes                = new Dictionary<int, ulong> {{1, alcTrack.startLba}},
+                        Indexes = new Dictionary<int, ulong>
+                        {
+                            {
+                                1, alcTrack.startLba
+                            }
+                        },
                         TrackStartSector       = alcTrack.startLba,
-                        TrackEndSector         = alcTrack.startLba + alcExtra.sectors - 1,
-                        TrackPregap            = alcExtra.pregap,
-                        TrackSession           = sessionNo,
-                        TrackSequence          = alcTrack.point,
-                        TrackType              = AlcoholTrackTypeToTrackType(alcTrack.mode),
-                        TrackFilter            = alcImage,
+                        TrackEndSector         = (alcTrack.startLba + alcExtra.sectors) - 1, TrackPregap = alcExtra.pregap,
+                        TrackSession           = sessionNo, TrackSequence                                = alcTrack.point,
+                        TrackType              = AlcoholTrackTypeToTrackType(alcTrack.mode), TrackFilter = alcImage,
                         TrackFile              = alcImage.GetFilename(),
                         TrackFileOffset        = alcTrack.startOffset,
                         TrackFileType          = "BINARY",
@@ -90,9 +93,11 @@ namespace Aaru.DiscImages
                             aaruTrack.TrackSubchannelFile   = alcImage.GetFilename();
                             aaruTrack.TrackSubchannelOffset = alcTrack.startOffset;
                             aaruTrack.TrackSubchannelType   = TrackSubchannelType.RawInterleaved;
+
                             break;
                         case AlcoholSubchannelMode.None:
                             aaruTrack.TrackSubchannelType = TrackSubchannelType.None;
+
                             break;
                     }
 
@@ -108,38 +113,40 @@ namespace Aaru.DiscImages
         public List<DumpHardwareType> DumpHardware => null;
         public CICMMetadataType       CicmMetadata => null;
 
-        public IEnumerable<MediaTagType> SupportedMediaTags =>
-            new[] {MediaTagType.CD_FullTOC, MediaTagType.DVD_BCA, MediaTagType.DVD_DMI, MediaTagType.DVD_PFI};
-        public IEnumerable<SectorTagType> SupportedSectorTags =>
-            new[]
-            {
-                SectorTagType.CdSectorEcc, SectorTagType.CdSectorEccP, SectorTagType.CdSectorEccQ,
-                SectorTagType.CdSectorEdc, SectorTagType.CdSectorHeader, SectorTagType.CdSectorSubHeader,
-                SectorTagType.CdSectorSync, SectorTagType.CdTrackFlags, SectorTagType.CdSectorSubchannel
-            };
-        public IEnumerable<MediaType> SupportedMediaTypes =>
-            new[]
-            {
-                MediaType.BDR, MediaType.BDRE, MediaType.BDREXL, MediaType.BDROM, MediaType.BDRXL, MediaType.CBHD,
-                MediaType.CD, MediaType.CDDA, MediaType.CDEG, MediaType.CDG, MediaType.CDI, MediaType.CDMIDI,
-                MediaType.CDMRW, MediaType.CDPLUS, MediaType.CDR, MediaType.CDROM, MediaType.CDROMXA,
-                MediaType.CDRW, MediaType.CDV, MediaType.DVDDownload, MediaType.DVDPR, MediaType.DVDPRDL,
-                MediaType.DVDPRW, MediaType.DVDPRWDL, MediaType.DVDR, MediaType.DVDRAM, MediaType.DVDRDL,
-                MediaType.DVDROM, MediaType.DVDRW, MediaType.DVDRWDL, MediaType.EVD, MediaType.FDDVD,
-                MediaType.DTSCD, MediaType.FVD, MediaType.HDDVDR, MediaType.HDDVDRAM, MediaType.HDDVDRDL,
-                MediaType.HDDVDROM, MediaType.HDDVDRW, MediaType.HDDVDRWDL, MediaType.HDVMD, MediaType.HVD,
-                MediaType.JaguarCD, MediaType.MEGACD, MediaType.PS1CD, MediaType.PS2CD, MediaType.PS2DVD,
-                MediaType.PS3BD, MediaType.PS3DVD, MediaType.PS4BD, MediaType.SuperCDROM2, MediaType.SVCD,
-                MediaType.SVOD, MediaType.SATURNCD, MediaType.ThreeDO, MediaType.UDO, MediaType.UDO2,
-                MediaType.UDO2_WORM, MediaType.UMD, MediaType.VCD, MediaType.VCDHD, MediaType.NeoGeoCD,
-                MediaType.PCFX, MediaType.CDTV, MediaType.CD32, MediaType.Nuon, MediaType.Playdia, MediaType.Pippin,
-                MediaType.FMTOWNS, MediaType.MilCD, MediaType.VideoNow, MediaType.VideoNowColor,
-                MediaType.VideoNowXp
-            };
+        public IEnumerable<MediaTagType> SupportedMediaTags => new[]
+        {
+            MediaTagType.CD_FullTOC, MediaTagType.DVD_BCA, MediaTagType.DVD_DMI, MediaTagType.DVD_PFI
+        };
+        public IEnumerable<SectorTagType> SupportedSectorTags => new[]
+        {
+            SectorTagType.CdSectorEcc, SectorTagType.CdSectorEccP, SectorTagType.CdSectorEccQ,
+            SectorTagType.CdSectorEdc, SectorTagType.CdSectorHeader, SectorTagType.CdSectorSubHeader,
+            SectorTagType.CdSectorSync, SectorTagType.CdTrackFlags, SectorTagType.CdSectorSubchannel
+        };
+        public IEnumerable<MediaType> SupportedMediaTypes => new[]
+        {
+            MediaType.BDR, MediaType.BDRE, MediaType.BDREXL, MediaType.BDROM, MediaType.BDRXL, MediaType.CBHD,
+            MediaType.CD, MediaType.CDDA, MediaType.CDEG, MediaType.CDG, MediaType.CDI, MediaType.CDMIDI,
+            MediaType.CDMRW, MediaType.CDPLUS, MediaType.CDR, MediaType.CDROM, MediaType.CDROMXA, MediaType.CDRW,
+            MediaType.CDV, MediaType.DVDDownload, MediaType.DVDPR, MediaType.DVDPRDL, MediaType.DVDPRW,
+            MediaType.DVDPRWDL, MediaType.DVDR, MediaType.DVDRAM, MediaType.DVDRDL, MediaType.DVDROM, MediaType.DVDRW,
+            MediaType.DVDRWDL, MediaType.EVD, MediaType.FDDVD, MediaType.DTSCD, MediaType.FVD, MediaType.HDDVDR,
+            MediaType.HDDVDRAM, MediaType.HDDVDRDL, MediaType.HDDVDROM, MediaType.HDDVDRW, MediaType.HDDVDRWDL,
+            MediaType.HDVMD, MediaType.HVD, MediaType.JaguarCD, MediaType.MEGACD, MediaType.PS1CD, MediaType.PS2CD,
+            MediaType.PS2DVD, MediaType.PS3BD, MediaType.PS3DVD, MediaType.PS4BD, MediaType.SuperCDROM2, MediaType.SVCD,
+            MediaType.SVOD, MediaType.SATURNCD, MediaType.ThreeDO, MediaType.UDO, MediaType.UDO2, MediaType.UDO2_WORM,
+            MediaType.UMD, MediaType.VCD, MediaType.VCDHD, MediaType.NeoGeoCD, MediaType.PCFX, MediaType.CDTV,
+            MediaType.CD32, MediaType.Nuon, MediaType.Playdia, MediaType.Pippin, MediaType.FMTOWNS, MediaType.MilCD,
+            MediaType.VideoNow, MediaType.VideoNowColor, MediaType.VideoNowXp
+        };
         public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
-            new (string name, Type type, string description, object @default)[] { };
-        public IEnumerable<string> KnownExtensions => new[] {".mds"};
-        public bool                IsWriting       { get; private set; }
-        public string              ErrorMessage    { get; private set; }
+            new (string name, Type type, string description, object @default)[]
+                {};
+        public IEnumerable<string> KnownExtensions => new[]
+        {
+            ".mds"
+        };
+        public bool   IsWriting    { get; private set; }
+        public string ErrorMessage { get; private set; }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/Alcohol120/Read.cs b/Aaru.Images/Alcohol120/Read.cs
index 9136e06df..9604ade43 100644
--- a/Aaru.Images/Alcohol120/Read.cs
+++ b/Aaru.Images/Alcohol120/Read.cs
@@ -65,35 +65,35 @@ namespace Aaru.DiscImages
             AlcoholHeader header = Marshal.ByteArrayToStructureLittleEndian<AlcoholHeader>(hdr);
 
             AaruConsole.DebugWriteLine("Alcohol 120% plugin", "header.signature = {0}",
-                                      Encoding.ASCII.GetString(header.signature));
+                                       Encoding.ASCII.GetString(header.signature));
 
             AaruConsole.DebugWriteLine("Alcohol 120% plugin", "header.version = {0}.{1}", header.version[0],
-                                      header.version[1]);
+                                       header.version[1]);
 
             AaruConsole.DebugWriteLine("Alcohol 120% plugin", "header.type = {0}", header.type);
             AaruConsole.DebugWriteLine("Alcohol 120% plugin", "header.sessions = {0}", header.sessions);
 
             for(int i = 0; i < header.unknown1.Length; i++)
                 AaruConsole.DebugWriteLine("Alcohol 120% plugin", "header.unknown1[{1}] = 0x{0:X4}", header.unknown1[i],
-                                          i);
+                                           i);
 
             AaruConsole.DebugWriteLine("Alcohol 120% plugin", "header.bcaLength = {0}", header.bcaLength);
 
             for(int i = 0; i < header.unknown2.Length; i++)
                 AaruConsole.DebugWriteLine("Alcohol 120% plugin", "header.unknown2[{1}] = 0x{0:X8}", header.unknown2[i],
-                                          i);
+                                           i);
 
             AaruConsole.DebugWriteLine("Alcohol 120% plugin", "header.bcaOffset = {0}", header.bcaOffset);
 
             for(int i = 0; i < header.unknown3.Length; i++)
                 AaruConsole.DebugWriteLine("Alcohol 120% plugin", "header.unknown3[{1}] = 0x{0:X8}", header.unknown3[i],
-                                          i);
+                                           i);
 
             AaruConsole.DebugWriteLine("Alcohol 120% plugin", "header.structuresOffset = {0}", header.structuresOffset);
 
             for(int i = 0; i < header.unknown4.Length; i++)
                 AaruConsole.DebugWriteLine("Alcohol 120% plugin", "header.unknown4[{1}] = 0x{0:X8}", header.unknown4[i],
-                                          i);
+                                           i);
 
             AaruConsole.DebugWriteLine("Alcohol 120% plugin", "header.sessionOffset = {0}", header.sessionOffset);
             AaruConsole.DebugWriteLine("Alcohol 120% plugin", "header.dpmOffset = {0}", header.dpmOffset);
@@ -108,27 +108,29 @@ namespace Aaru.DiscImages
                 AlcoholSession session = Marshal.SpanToStructureLittleEndian<AlcoholSession>(sesHdr);
 
                 AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{1}].sessionStart = {0}",
-                                          session.sessionStart, i);
+                                           session.sessionStart, i);
 
                 AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{1}].sessionEnd = {0}", session.sessionEnd,
-                                          i);
+                                           i);
 
                 AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{1}].sessionSequence = {0}",
-                                          session.sessionSequence, i);
+                                           session.sessionSequence, i);
 
                 AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{1}].allBlocks = {0}", session.allBlocks, i);
 
                 AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{1}].nonTrackBlocks = {0}",
-                                          session.nonTrackBlocks, i);
+                                           session.nonTrackBlocks, i);
 
                 AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{1}].firstTrack = {0}", session.firstTrack,
-                                          i);
+                                           i);
 
                 AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{1}].lastTrack = {0}", session.lastTrack, i);
-                AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{1}].unknown = 0x{0:X8}", session.unknown, i);
+
+                AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{1}].unknown = 0x{0:X8}", session.unknown,
+                                           i);
 
                 AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{1}].trackOffset = {0}", session.trackOffset,
-                                          i);
+                                           i);
 
                 alcSessions.Add(session.sessionSequence, session);
             }
@@ -163,60 +165,60 @@ namespace Aaru.DiscImages
                     }
 
                     AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].mode = {0}", track.mode,
-                                              track.point, session.sessionSequence);
+                                               track.point, session.sessionSequence);
 
                     AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].subMode = {0}",
-                                              track.subMode, track.point, session.sessionSequence);
+                                               track.subMode, track.point, session.sessionSequence);
 
                     AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].adrCtl = {0}",
-                                              track.adrCtl, track.point, session.sessionSequence);
+                                               track.adrCtl, track.point, session.sessionSequence);
 
                     AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].tno = {0}", track.tno,
-                                              track.point, session.sessionSequence);
+                                               track.point, session.sessionSequence);
 
                     AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].point = {0:X2}",
-                                              track.point, track.point, session.sessionSequence);
+                                               track.point, track.point, session.sessionSequence);
 
                     AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].min = {0}", track.min,
-                                              track.point, session.sessionSequence);
+                                               track.point, session.sessionSequence);
 
                     AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].sec = {0}", track.sec,
-                                              track.point, session.sessionSequence);
+                                               track.point, session.sessionSequence);
 
-                    AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].frame = {0}", track.frame,
-                                              track.point, session.sessionSequence);
+                    AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].frame = {0}",
+                                               track.frame, track.point, session.sessionSequence);
 
                     AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].zero = {0}", track.zero,
-                                              track.point, session.sessionSequence);
+                                               track.point, session.sessionSequence);
 
                     AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].pmin = {0}", track.pmin,
-                                              track.point, session.sessionSequence);
+                                               track.point, session.sessionSequence);
 
                     AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].psec = {0}", track.psec,
-                                              track.point, session.sessionSequence);
+                                               track.point, session.sessionSequence);
 
                     AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].pframe = {0}",
-                                              track.pframe, track.point, session.sessionSequence);
+                                               track.pframe, track.point, session.sessionSequence);
 
                     AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].extraOffset = {0}",
-                                              track.extraOffset, track.point, session.sessionSequence);
+                                               track.extraOffset, track.point, session.sessionSequence);
 
                     AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].sectorSize = {0}",
-                                              track.sectorSize, track.point, session.sessionSequence);
+                                               track.sectorSize, track.point, session.sessionSequence);
 
                     //for(int j = 0; j < track.unknown.Length; j++)
                     //    AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].unknown[{2}] = {0}", track.unknown[j], i, j, session.sessionSequence);
                     AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].startLba = {0}",
-                                              track.startLba, track.point, session.sessionSequence);
+                                               track.startLba, track.point, session.sessionSequence);
 
                     AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].startOffset = {0}",
-                                              track.startOffset, track.point, session.sessionSequence);
+                                               track.startOffset, track.point, session.sessionSequence);
 
-                    AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].files = {0}", track.files,
-                                              track.point, session.sessionSequence);
+                    AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].files = {0}",
+                                               track.files, track.point, session.sessionSequence);
 
                     AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].footerOffset = {0}",
-                                              track.footerOffset, track.point, session.sessionSequence);
+                                               track.footerOffset, track.point, session.sessionSequence);
 
                     //for(int j = 0; j < track.unknown2.Length; j++)
                     //    AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].unknown2[{2}] = {0}", track.unknown2[j], i, j, session.sessionSequence);
@@ -251,10 +253,10 @@ namespace Aaru.DiscImages
                     AlcoholTrackExtra extra = Marshal.SpanToStructureLittleEndian<AlcoholTrackExtra>(extHdr);
 
                     AaruConsole.DebugWriteLine("Alcohol 120% plugin", "track[{1}].extra.pregap = {0}", extra.pregap,
-                                              track.point);
+                                               track.point);
 
                     AaruConsole.DebugWriteLine("Alcohol 120% plugin", "track[{1}].extra.sectors = {0}", extra.sectors,
-                                              track.point);
+                                               track.point);
 
                     alcTrackExtras.Add(track.point, extra);
                 }
@@ -276,7 +278,7 @@ namespace Aaru.DiscImages
                 alcFooter = Marshal.SpanToStructureLittleEndian<AlcoholFooter>(footer);
 
                 AaruConsole.DebugWriteLine("Alcohol 120% plugin", "footer.filenameOffset = {0}",
-                                          alcFooter.filenameOffset);
+                                           alcFooter.filenameOffset);
 
                 AaruConsole.DebugWriteLine("Alcohol 120% plugin", "footer.widechar = {0}", alcFooter.widechar);
                 AaruConsole.DebugWriteLine("Alcohol 120% plugin", "footer.unknown1 = 0x{0:X8}", alcFooter.unknown1);
@@ -603,7 +605,10 @@ namespace Aaru.DiscImages
             {
                 AaruConsole.DebugWriteLine("Alcohol 120% plugin", "Partition sequence: {0}", partition.Sequence);
                 AaruConsole.DebugWriteLine("Alcohol 120% plugin", "\tPartition name: {0}", partition.Name);
-                AaruConsole.DebugWriteLine("Alcohol 120% plugin", "\tPartition description: {0}", partition.Description);
+
+                AaruConsole.DebugWriteLine("Alcohol 120% plugin", "\tPartition description: {0}",
+                                           partition.Description);
+
                 AaruConsole.DebugWriteLine("Alcohol 120% plugin", "\tPartition type: {0}", partition.Type);
                 AaruConsole.DebugWriteLine("Alcohol 120% plugin", "\tPartition starting sector: {0}", partition.Start);
                 AaruConsole.DebugWriteLine("Alcohol 120% plugin", "\tPartition sectors: {0}", partition.Length);
@@ -692,7 +697,8 @@ namespace Aaru.DiscImages
             AaruConsole.VerboseWriteLine("Alcohol 120% image describes a disc of type {0}", imageInfo.MediaType);
 
             if(oldIncorrectImage)
-                AaruConsole.WriteLine("Incorrect Alcohol 120% image created by an old version of Aaru. Convert image to correct it.");
+                AaruConsole.
+                    WriteLine("Incorrect Alcohol 120% image created by an old version of Aaru. Convert image to correct it.");
 
             return true;
         }
@@ -704,7 +710,7 @@ namespace Aaru.DiscImages
                 case MediaTagType.DVD_BCA:
                 {
                     if(bca != null)
-                        return(byte[])bca.Clone();
+                        return (byte[])bca.Clone();
 
                     throw new FeatureNotPresentImageException("Image does not contain BCA information.");
                 }
@@ -712,7 +718,7 @@ namespace Aaru.DiscImages
                 case MediaTagType.DVD_PFI:
                 {
                     if(pfi != null)
-                        return(byte[])pfi.Clone();
+                        return (byte[])pfi.Clone();
 
                     throw new FeatureNotPresentImageException("Image does not contain PFI.");
                 }
@@ -720,7 +726,7 @@ namespace Aaru.DiscImages
                 case MediaTagType.DVD_DMI:
                 {
                     if(dmi != null)
-                        return(byte[])dmi.Clone();
+                        return (byte[])dmi.Clone();
 
                     throw new FeatureNotPresentImageException("Image does not contain DMI.");
                 }
@@ -728,7 +734,7 @@ namespace Aaru.DiscImages
                 case MediaTagType.CD_FullTOC:
                 {
                     if(fullToc != null)
-                        return(byte[])fullToc.Clone();
+                        return (byte[])fullToc.Clone();
 
                     throw new FeatureNotPresentImageException("Image does not contain TOC information.");
                 }
diff --git a/Aaru.Images/Alcohol120/Structs.cs b/Aaru.Images/Alcohol120/Structs.cs
index 61661715b..b93a57497 100644
--- a/Aaru.Images/Alcohol120/Structs.cs
+++ b/Aaru.Images/Alcohol120/Structs.cs
@@ -47,7 +47,7 @@ namespace Aaru.DiscImages
             public ushort            sessions;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
             public ushort[] unknown1;
-            public ushort bcaLength;
+            public readonly ushort bcaLength;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
             public uint[] unknown2;
             public uint bcaOffset;
@@ -56,22 +56,22 @@ namespace Aaru.DiscImages
             public uint structuresOffset;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
             public uint[] unknown4;
-            public uint sessionOffset;
-            public uint dpmOffset;
+            public          uint sessionOffset;
+            public readonly uint dpmOffset;
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct AlcoholSession
         {
-            public int    sessionStart;
-            public int    sessionEnd;
-            public ushort sessionSequence;
-            public byte   allBlocks;
-            public byte   nonTrackBlocks;
-            public ushort firstTrack;
-            public ushort lastTrack;
-            public uint   unknown;
-            public uint   trackOffset;
+            public          int    sessionStart;
+            public          int    sessionEnd;
+            public          ushort sessionSequence;
+            public          byte   allBlocks;
+            public          byte   nonTrackBlocks;
+            public          ushort firstTrack;
+            public          ushort lastTrack;
+            public readonly uint   unknown;
+            public          uint   trackOffset;
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
@@ -111,10 +111,10 @@ namespace Aaru.DiscImages
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct AlcoholFooter
         {
-            public uint filenameOffset;
-            public uint widechar;
-            public uint unknown1;
-            public uint unknown2;
+            public          uint filenameOffset;
+            public          uint widechar;
+            public readonly uint unknown1;
+            public readonly uint unknown2;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/Alcohol120/Verify.cs b/Aaru.Images/Alcohol120/Verify.cs
index 465df90a5..a03233a67 100644
--- a/Aaru.Images/Alcohol120/Verify.cs
+++ b/Aaru.Images/Alcohol120/Verify.cs
@@ -41,10 +41,11 @@ namespace Aaru.DiscImages
         public bool? VerifySector(ulong sectorAddress)
         {
             byte[] buffer = ReadSectorLong(sectorAddress);
+
             return CdChecksums.CheckCdSector(buffer);
         }
 
-        public bool? VerifySectors(ulong           sectorAddress, uint length, out List<ulong> failingLbas,
+        public bool? VerifySectors(ulong sectorAddress, uint length, out List<ulong> failingLbas,
                                    out List<ulong> unknownLbas)
         {
             byte[] buffer = ReadSectorsLong(sectorAddress, length);
@@ -62,19 +63,22 @@ namespace Aaru.DiscImages
                 {
                     case null:
                         unknownLbas.Add((ulong)i + sectorAddress);
+
                         break;
                     case false:
                         failingLbas.Add((ulong)i + sectorAddress);
+
                         break;
                 }
             }
 
-            if(unknownLbas.Count > 0) return null;
+            if(unknownLbas.Count > 0)
+                return null;
 
             return failingLbas.Count <= 0;
         }
 
-        public bool? VerifySectors(ulong           sectorAddress, uint length, uint track, out List<ulong> failingLbas,
+        public bool? VerifySectors(ulong sectorAddress, uint length, uint track, out List<ulong> failingLbas,
                                    out List<ulong> unknownLbas)
         {
             byte[] buffer = ReadSectorsLong(sectorAddress, length, track);
@@ -92,14 +96,17 @@ namespace Aaru.DiscImages
                 {
                     case null:
                         unknownLbas.Add((ulong)i + sectorAddress);
+
                         break;
                     case false:
                         failingLbas.Add((ulong)i + sectorAddress);
+
                         break;
                 }
             }
 
-            if(unknownLbas.Count > 0) return null;
+            if(unknownLbas.Count > 0)
+                return null;
 
             return failingLbas.Count <= 0;
         }
@@ -107,6 +114,7 @@ namespace Aaru.DiscImages
         public bool? VerifySector(ulong sectorAddress, uint track)
         {
             byte[] buffer = ReadSectorLong(sectorAddress, track);
+
             return CdChecksums.CheckCdSector(buffer);
         }
     }
diff --git a/Aaru.Images/Alcohol120/Write.cs b/Aaru.Images/Alcohol120/Write.cs
index 57907a325..8f2d550c7 100644
--- a/Aaru.Images/Alcohol120/Write.cs
+++ b/Aaru.Images/Alcohol120/Write.cs
@@ -48,19 +48,24 @@ namespace Aaru.DiscImages
     public partial class Alcohol120
     {
         public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
-                           uint   sectorSize)
+                           uint sectorSize)
         {
             if(!SupportedMediaTypes.Contains(mediaType))
             {
                 ErrorMessage = $"Unsupport media format {mediaType}";
+
                 return false;
             }
 
-            imageInfo = new ImageInfo {MediaType = mediaType, SectorSize = sectorSize, Sectors = sectors};
+            imageInfo = new ImageInfo
+            {
+                MediaType = mediaType, SectorSize = sectorSize, Sectors = sectors
+            };
 
             try
             {
                 descriptorStream = new FileStream(path, FileMode.Create, FileAccess.ReadWrite, FileShare.None);
+
                 imageStream =
                     new
                         FileStream(Path.Combine(Path.GetDirectoryName(path), Path.GetFileNameWithoutExtension(path)) + ".mdf",
@@ -69,6 +74,7 @@ namespace Aaru.DiscImages
             catch(IOException e)
             {
                 ErrorMessage = $"Could not create new image file, exception {e.Message}";
+
                 return false;
             }
 
@@ -113,9 +119,11 @@ namespace Aaru.DiscImages
                 case MediaType.VideoNowColor:
                 case MediaType.VideoNowXp:
                     isDvd = false;
+
                     break;
                 default:
                     isDvd = true;
+
                     break;
             }
 
@@ -123,6 +131,7 @@ namespace Aaru.DiscImages
 
             IsWriting    = true;
             ErrorMessage = null;
+
             return true;
         }
 
@@ -131,6 +140,7 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Tried to write on a non-writable image";
+
                 return false;
             }
 
@@ -140,6 +150,7 @@ namespace Aaru.DiscImages
                     if(isDvd)
                     {
                         ErrorMessage = $"Unsupported media tag {tag} for medium type {imageInfo.MediaType}";
+
                         return false;
                     }
 
@@ -148,36 +159,44 @@ namespace Aaru.DiscImages
                     Array.Copy(data, 0, fullToc, 2, data.Length);
                     fullToc[0] = fullTocSize[0];
                     fullToc[1] = fullTocSize[1];
+
                     return true;
                 case MediaTagType.DVD_PFI:
                     if(!isDvd)
                     {
                         ErrorMessage = $"Unsupported media tag {tag} for medium type {imageInfo.MediaType}";
+
                         return false;
                     }
 
                     pfi = data;
+
                     return true;
                 case MediaTagType.DVD_DMI:
                     if(!isDvd)
                     {
                         ErrorMessage = $"Unsupported media tag {tag} for medium type {imageInfo.MediaType}";
+
                         return false;
                     }
 
                     dmi = data;
+
                     return true;
                 case MediaTagType.DVD_BCA:
                     if(!isDvd)
                     {
                         ErrorMessage = $"Unsupported media tag {tag} for medium type {imageInfo.MediaType}";
+
                         return false;
                     }
 
                     bca = data;
+
                     return true;
                 default:
                     ErrorMessage = $"Unsupported media tag {tag}";
+
                     return false;
             }
         }
@@ -187,6 +206,7 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Tried to write on a non-writable image";
+
                 return false;
             }
 
@@ -197,24 +217,30 @@ namespace Aaru.DiscImages
             if(track.TrackSequence == 0)
             {
                 ErrorMessage = $"Can't found track containing {sectorAddress}";
+
                 return false;
             }
 
             if(track.TrackBytesPerSector != track.TrackRawBytesPerSector)
             {
                 ErrorMessage = "Invalid write mode for this sector";
+
                 return false;
             }
 
             if(data.Length != track.TrackRawBytesPerSector)
             {
                 ErrorMessage = "Incorrect data size";
+
                 return false;
             }
 
-            imageStream.Seek((long)(track.TrackFileOffset + (sectorAddress - track.TrackStartSector) * (ulong)track.TrackRawBytesPerSector),
-                             SeekOrigin.Begin);
+            imageStream.
+                Seek((long)(track.TrackFileOffset + ((sectorAddress - track.TrackStartSector) * (ulong)track.TrackRawBytesPerSector)),
+                     SeekOrigin.Begin);
+
             imageStream.Write(data, 0, data.Length);
+
             return true;
         }
 
@@ -223,6 +249,7 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Tried to write on a non-writable image";
+
                 return false;
             }
 
@@ -233,42 +260,49 @@ namespace Aaru.DiscImages
             if(track.TrackSequence == 0)
             {
                 ErrorMessage = $"Can't found track containing {sectorAddress}";
+
                 return false;
             }
 
             if(track.TrackBytesPerSector != track.TrackRawBytesPerSector)
             {
                 ErrorMessage = "Invalid write mode for this sector";
+
                 return false;
             }
 
             if(sectorAddress + length > track.TrackEndSector + 1)
             {
                 ErrorMessage = "Can't cross tracks";
+
                 return false;
             }
 
             if(data.Length % track.TrackRawBytesPerSector != 0)
             {
                 ErrorMessage = "Incorrect data size";
+
                 return false;
             }
 
             switch(track.TrackSubchannelType)
             {
                 case TrackSubchannelType.None:
-                    imageStream
-                       .Seek((long)(track.TrackFileOffset + (sectorAddress - track.TrackStartSector) * (ulong)track.TrackRawBytesPerSector),
+                    imageStream.
+                        Seek((long)(track.TrackFileOffset + ((sectorAddress - track.TrackStartSector) * (ulong)track.TrackRawBytesPerSector)),
                              SeekOrigin.Begin);
+
                     imageStream.Write(data, 0, data.Length);
 
                     ErrorMessage = "";
+
                     return true;
                 case TrackSubchannelType.Raw:
                 case TrackSubchannelType.RawInterleaved:
-                    imageStream
-                       .Seek((long)(track.TrackFileOffset + (sectorAddress - track.TrackStartSector) * (ulong)(track.TrackRawBytesPerSector + 96)),
+                    imageStream.
+                        Seek((long)(track.TrackFileOffset + ((sectorAddress - track.TrackStartSector) * (ulong)(track.TrackRawBytesPerSector + 96))),
                              SeekOrigin.Begin);
+
                     for(uint i = 0; i < length; i++)
                     {
                         imageStream.Write(data, (int)(i * track.TrackRawBytesPerSector), track.TrackRawBytesPerSector);
@@ -276,9 +310,11 @@ namespace Aaru.DiscImages
                     }
 
                     ErrorMessage = "";
+
                     return true;
                 default:
                     ErrorMessage = "Invalid subchannel mode for this sector";
+
                     return false;
             }
         }
@@ -288,6 +324,7 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Tried to write on a non-writable image";
+
                 return false;
             }
 
@@ -298,19 +335,23 @@ namespace Aaru.DiscImages
             if(track.TrackSequence == 0)
             {
                 ErrorMessage = $"Can't found track containing {sectorAddress}";
+
                 return false;
             }
 
             if(data.Length != track.TrackRawBytesPerSector)
             {
                 ErrorMessage = "Incorrect data size";
+
                 return false;
             }
 
             uint subchannelSize = (uint)(track.TrackSubchannelType != TrackSubchannelType.None ? 96 : 0);
 
-            imageStream.Seek((long)(track.TrackFileOffset + (sectorAddress - track.TrackStartSector) * (ulong)(track.TrackRawBytesPerSector + subchannelSize)),
-                             SeekOrigin.Begin);
+            imageStream.
+                Seek((long)(track.TrackFileOffset + ((sectorAddress - track.TrackStartSector) * (ulong)(track.TrackRawBytesPerSector + subchannelSize))),
+                     SeekOrigin.Begin);
+
             imageStream.Write(data, 0, data.Length);
 
             return true;
@@ -321,6 +362,7 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Tried to write on a non-writable image";
+
                 return false;
             }
 
@@ -331,18 +373,21 @@ namespace Aaru.DiscImages
             if(track.TrackSequence == 0)
             {
                 ErrorMessage = $"Can't found track containing {sectorAddress}";
+
                 return false;
             }
 
             if(sectorAddress + length > track.TrackEndSector + 1)
             {
                 ErrorMessage = "Can't cross tracks";
+
                 return false;
             }
 
             if(data.Length % track.TrackRawBytesPerSector != 0)
             {
                 ErrorMessage = "Incorrect data size";
+
                 return false;
             }
 
@@ -350,8 +395,10 @@ namespace Aaru.DiscImages
 
             for(uint i = 0; i < length; i++)
             {
-                imageStream.Seek((long)(track.TrackFileOffset + (i + sectorAddress - track.TrackStartSector) * (ulong)(track.TrackRawBytesPerSector + subchannelSize)),
-                                 SeekOrigin.Begin);
+                imageStream.
+                    Seek((long)(track.TrackFileOffset + (((i + sectorAddress) - track.TrackStartSector) * (ulong)(track.TrackRawBytesPerSector + subchannelSize))),
+                         SeekOrigin.Begin);
+
                 imageStream.Write(data, (int)(i * track.TrackRawBytesPerSector), track.TrackRawBytesPerSector);
             }
 
@@ -363,28 +410,33 @@ namespace Aaru.DiscImages
             ulong currentDataOffset = 0;
 
             writingTracks = new List<Track>();
+
             foreach(Track track in tracks.OrderBy(t => t.TrackSequence))
             {
                 Track newTrack = track;
                 uint  subchannelSize;
+
                 switch(track.TrackSubchannelType)
                 {
                     case TrackSubchannelType.None:
                         subchannelSize = 0;
+
                         break;
                     case TrackSubchannelType.Raw:
                     case TrackSubchannelType.RawInterleaved:
                         subchannelSize = 96;
+
                         break;
                     default:
                         ErrorMessage = $"Unsupported subchannel type {track.TrackSubchannelType}";
+
                         return false;
                 }
 
                 newTrack.TrackFileOffset = currentDataOffset;
 
                 currentDataOffset += (ulong)(newTrack.TrackRawBytesPerSector + subchannelSize) *
-                                     (newTrack.TrackEndSector                - newTrack.TrackStartSector + 1);
+                                     ((newTrack.TrackEndSector - newTrack.TrackStartSector) + 1);
 
                 writingTracks.Add(newTrack);
             }
@@ -397,6 +449,7 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Image is not opened for writing";
+
                 return false;
             }
 
@@ -406,19 +459,18 @@ namespace Aaru.DiscImages
                 if(t.TrackSession > byte.MinValue)
                     sessions = (byte)t.TrackSession;
 
-            AlcoholHeader header = new AlcoholHeader
+            var header = new AlcoholHeader
             {
-                signature        = alcoholSignature,
-                version          = new byte[] {1, 5},
-                type             = MediaTypeToAlcohol(imageInfo.MediaType),
-                sessions         = sessions,
-                structuresOffset = (uint)(pfi == null ? 0 : 96),
-                sessionOffset    = (uint)(pfi == null ? 96 : 4196),
-                unknown1         = new ushort[2],
-                unknown2         = new uint[2],
-                unknown3         = new uint[6],
-                unknown4         = new uint[3]
+                signature = alcoholSignature, version = new byte[]
+                {
+                    1, 5
+                },
+                type             = MediaTypeToAlcohol(imageInfo.MediaType), sessions = sessions,
+                structuresOffset = (uint)(pfi == null ? 0 : 96), sessionOffset       = (uint)(pfi == null ? 96 : 4196),
+                unknown1         = new ushort[2], unknown2                           = new uint[2],
+                unknown3         = new uint[6], unknown4                             = new uint[3]
             };
+
             // Alcohol sets this always, Daemon Tool expects this
             header.unknown1[0] = 2;
 
@@ -427,11 +479,12 @@ namespace Aaru.DiscImages
             alcToc         = new Dictionary<int, Dictionary<int, AlcoholTrack>>();
             writingTracks  = writingTracks.OrderBy(t => t.TrackSession).ThenBy(t => t.TrackSequence).ToList();
             alcTrackExtras = new Dictionary<int, AlcoholTrackExtra>();
-            long currentTrackOffset = header.sessionOffset + Marshal.SizeOf<AlcoholSession>() * sessions;
+            long currentTrackOffset = header.sessionOffset + (Marshal.SizeOf<AlcoholSession>() * sessions);
 
             FullTOC.CDFullTOC? decodedToc = FullTOC.Decode(fullToc);
 
             long currentExtraOffset = currentTrackOffset;
+
             for(int i = 1; i <= sessions; i++)
                 if(decodedToc.HasValue)
                     currentExtraOffset += Marshal.SizeOf<AlcoholTrack>() *
@@ -439,12 +492,16 @@ namespace Aaru.DiscImages
                 else
                 {
                     currentExtraOffset += Marshal.SizeOf<AlcoholTrack>() * 3;
+
                     currentExtraOffset += Marshal.SizeOf<AlcoholTrack>() *
                                           writingTracks.Count(t => t.TrackSession == i);
-                    if(i < sessions) currentExtraOffset += Marshal.SizeOf<AlcoholTrack>() * 2;
+
+                    if(i < sessions)
+                        currentExtraOffset += Marshal.SizeOf<AlcoholTrack>() * 2;
                 }
 
-            long footerOffset = currentExtraOffset + Marshal.SizeOf<AlcoholTrackExtra>() * writingTracks.Count;
+            long footerOffset = currentExtraOffset + (Marshal.SizeOf<AlcoholTrackExtra>() * writingTracks.Count);
+
             if(bca != null)
             {
                 header.bcaOffset =  (uint)footerOffset;
@@ -453,38 +510,25 @@ namespace Aaru.DiscImages
 
             if(isDvd)
             {
-                alcSessions.Add(1,
-                                new AlcoholSession
-                                {
-                                    sessionEnd =
-                                        (int)(writingTracks[0].TrackEndSector - writingTracks[0].TrackStartSector +
-                                              1),
-                                    sessionSequence = 1,
-                                    allBlocks       = 1,
-                                    nonTrackBlocks  = 3,
-                                    firstTrack      = 1,
-                                    lastTrack       = 1,
-                                    trackOffset     = 4220
-                                });
+                alcSessions.Add(1, new AlcoholSession
+                {
+                    sessionEnd      = (int)((writingTracks[0].TrackEndSector - writingTracks[0].TrackStartSector) + 1),
+                    sessionSequence = 1, allBlocks   = 1, nonTrackBlocks = 3, firstTrack = 1,
+                    lastTrack       = 1, trackOffset = 4220
+                });
 
                 footerOffset = 4300;
-                if(bca != null) footerOffset += bca.Length;
 
-                alcTracks.Add(1,
-                              new AlcoholTrack
-                              {
-                                  mode   = AlcoholTrackMode.DVD,
-                                  adrCtl = 20,
-                                  point  = 1,
-                                  extraOffset =
-                                      (uint)(writingTracks[0].TrackEndSector - writingTracks[0].TrackStartSector +
-                                             1),
-                                  sectorSize   = 2048,
-                                  files        = 1,
-                                  footerOffset = (uint)footerOffset,
-                                  unknown      = new byte[18],
-                                  unknown2     = new byte[24]
-                              });
+                if(bca != null)
+                    footerOffset += bca.Length;
+
+                alcTracks.Add(1, new AlcoholTrack
+                {
+                    mode        = AlcoholTrackMode.DVD, adrCtl = 20, point = 1,
+                    extraOffset = (uint)((writingTracks[0].TrackEndSector - writingTracks[0].TrackStartSector) + 1),
+                    sectorSize  = 2048, files = 1, footerOffset = (uint)footerOffset, unknown = new byte[18],
+                    unknown2    = new byte[24]
+                });
 
                 alcToc.Add(1, alcTracks);
             }
@@ -494,32 +538,31 @@ namespace Aaru.DiscImages
                     Track firstTrack = writingTracks.First(t => t.TrackSession == i);
                     Track lastTrack  = writingTracks.Last(t => t.TrackSession  == i);
 
-                    alcSessions.Add(i,
-                                    new AlcoholSession
-                                    {
-                                        sessionStart    = (int)firstTrack.TrackStartSector - 150,
-                                        sessionEnd      = (int)lastTrack.TrackEndSector    + 1,
-                                        sessionSequence = (ushort)i,
-                                        allBlocks =
-                                            (byte)(decodedToc?.TrackDescriptors.Count(t => t.SessionNumber == i) ??
-                                                   writingTracks.Count(t => t.TrackSession == i) + 3),
-                                        nonTrackBlocks =
-                                            (byte)(decodedToc?.TrackDescriptors.Count(t => t.SessionNumber == i    &&
-                                                                                           t.POINT         >= 0xA0 &&
-                                                                                           t.POINT         <= 0xAF) ??
-                                                   3),
-                                        firstTrack  = (ushort)firstTrack.TrackSequence,
-                                        lastTrack   = (ushort)lastTrack.TrackSequence,
-                                        trackOffset = (uint)currentTrackOffset
-                                    });
+                    alcSessions.Add(i, new AlcoholSession
+                    {
+                        sessionStart = (int)firstTrack.TrackStartSector - 150,
+                        sessionEnd   = (int)lastTrack.TrackEndSector    + 1, sessionSequence = (ushort)i,
+                        allBlocks = (byte)(decodedToc?.TrackDescriptors.Count(t => t.SessionNumber == i) ??
+                                           writingTracks.Count(t => t.TrackSession == i) + 3),
+                        nonTrackBlocks =
+                            (byte)(decodedToc?.TrackDescriptors.Count(t => t.SessionNumber == i && t.POINT >= 0xA0 &&
+                                                                           t.POINT         <= 0xAF) ?? 3),
+                        firstTrack  = (ushort)firstTrack.TrackSequence, lastTrack = (ushort)lastTrack.TrackSequence,
+                        trackOffset = (uint)currentTrackOffset
+                    });
 
                     Dictionary<int, AlcoholTrack> thisSessionTracks = new Dictionary<int, AlcoholTrack>();
                     trackFlags.TryGetValue((byte)firstTrack.TrackSequence, out byte firstTrackControl);
-                    trackFlags.TryGetValue((byte)lastTrack.TrackSequence,  out byte lastTrackControl);
-                    if(firstTrackControl == 0 && firstTrack.TrackType != TrackType.Audio)
+                    trackFlags.TryGetValue((byte)lastTrack.TrackSequence, out byte lastTrackControl);
+
+                    if(firstTrackControl    == 0 &&
+                       firstTrack.TrackType != TrackType.Audio)
                         firstTrackControl = (byte)CdFlags.DataTrack;
-                    if(lastTrackControl == 0 && lastTrack.TrackType != TrackType.Audio)
+
+                    if(lastTrackControl    == 0 &&
+                       lastTrack.TrackType != TrackType.Audio)
                         lastTrackControl = (byte)CdFlags.DataTrack;
+
                     (byte minute, byte second, byte frame) leadinPmsf = LbaToMsf(lastTrack.TrackEndSector + 1);
 
                     if(decodedToc.HasValue &&
@@ -529,74 +572,63 @@ namespace Aaru.DiscImages
                             decodedToc.Value.TrackDescriptors.Where(t => t.SessionNumber == i && t.POINT >= 0xA0 &&
                                                                          t.POINT         <= 0xAF))
                         {
-                            thisSessionTracks.Add(tocTrk.POINT,
-                                                  new AlcoholTrack
-                                                  {
-                                                      adrCtl   = (byte)((tocTrk.ADR << 4) + tocTrk.CONTROL),
-                                                      tno      = tocTrk.TNO,
-                                                      point    = tocTrk.POINT,
-                                                      min      = tocTrk.Min,
-                                                      sec      = tocTrk.Sec,
-                                                      frame    = tocTrk.Frame,
-                                                      zero     = tocTrk.Zero,
-                                                      pmin     = tocTrk.PMIN,
-                                                      psec     = tocTrk.PSEC,
-                                                      pframe   = tocTrk.PFRAME,
-                                                      mode     = AlcoholTrackMode.NoData,
-                                                      unknown  = new byte[18],
-                                                      unknown2 = new byte[24]
-                                                  });
+                            thisSessionTracks.Add(tocTrk.POINT, new AlcoholTrack
+                            {
+                                adrCtl   = (byte)((tocTrk.ADR << 4) + tocTrk.CONTROL), tno = tocTrk.TNO,
+                                point    = tocTrk.POINT, min                               = tocTrk.Min,
+                                sec      = tocTrk.Sec, frame                               = tocTrk.Frame,
+                                zero     = tocTrk.Zero, pmin                               = tocTrk.PMIN,
+                                psec     = tocTrk.PSEC, pframe                             = tocTrk.PFRAME,
+                                mode     = AlcoholTrackMode.NoData, unknown                = new byte[18],
+                                unknown2 = new byte[24]
+                            });
+
                             currentTrackOffset += Marshal.SizeOf<AlcoholTrack>();
                         }
                     else
                     {
                         thisSessionTracks.Add(0xA0, new AlcoholTrack
                         {
-                            adrCtl   = (byte)((1 << 4) + firstTrackControl),
-                            pmin     = (byte)firstTrack.TrackSequence,
-                            mode     = AlcoholTrackMode.NoData,
-                            point    = 0xA0,
-                            unknown  = new byte[18],
-                            unknown2 = new byte[24],
-                            psec = (byte)(imageInfo.MediaType == MediaType.CDI
-                                              ? 0x10
-                                              : writingTracks.Any(t => t.TrackType == TrackType.CdMode2Form1 ||
-                                                                       t.TrackType == TrackType.CdMode2Form2 ||
-                                                                       t.TrackType == TrackType.CdMode2Formless)
-                                                  ? 0x20
-                                                  : 0)
+                            adrCtl   = (byte)((1 << 4) + firstTrackControl), pmin = (byte)firstTrack.TrackSequence,
+                            mode     = AlcoholTrackMode.NoData, point             = 0xA0, unknown = new byte[18],
+                            unknown2 = new byte[24], psec = (byte)(imageInfo.MediaType == MediaType.CDI
+                                                                       ? 0x10
+                                                                       : writingTracks.Any(t => t.TrackType ==
+                                                                                                TrackType.
+                                                                                                    CdMode2Form1 ||
+                                                                                                t.TrackType ==
+                                                                                                TrackType.
+                                                                                                    CdMode2Form2 ||
+                                                                                                t.TrackType ==
+                                                                                                TrackType.
+                                                                                                    CdMode2Formless)
+                                                                           ? 0x20
+                                                                           : 0)
                         });
 
-                        thisSessionTracks.Add(0xA1,
-                                              new AlcoholTrack
-                                              {
-                                                  adrCtl   = (byte)((1 << 4) + lastTrackControl),
-                                                  pmin     = (byte)lastTrack.TrackSequence,
-                                                  mode     = AlcoholTrackMode.NoData,
-                                                  point    = 0xA1,
-                                                  unknown  = new byte[18],
-                                                  unknown2 = new byte[24]
-                                              });
+                        thisSessionTracks.Add(0xA1, new AlcoholTrack
+                        {
+                            adrCtl   = (byte)((1 << 4) + lastTrackControl), pmin = (byte)lastTrack.TrackSequence,
+                            mode     = AlcoholTrackMode.NoData, point            = 0xA1, unknown = new byte[18],
+                            unknown2 = new byte[24]
+                        });
+
+                        thisSessionTracks.Add(0xA2, new AlcoholTrack
+                        {
+                            adrCtl = (byte)((1 << 4) + firstTrackControl), zero = 0,
+                            pmin   = leadinPmsf.minute,
+                            psec   = leadinPmsf.second, pframe = leadinPmsf.frame,
+                            mode   = AlcoholTrackMode.NoData,
+                            point  = 0xA2, unknown = new byte[18], unknown2 = new byte[24]
+                        });
 
-                        thisSessionTracks.Add(0xA2,
-                                              new AlcoholTrack
-                                              {
-                                                  adrCtl   = (byte)((1 << 4) + firstTrackControl),
-                                                  zero     = 0,
-                                                  pmin     = leadinPmsf.minute,
-                                                  psec     = leadinPmsf.second,
-                                                  pframe   = leadinPmsf.frame,
-                                                  mode     = AlcoholTrackMode.NoData,
-                                                  point    = 0xA2,
-                                                  unknown  = new byte[18],
-                                                  unknown2 = new byte[24]
-                                              });
                         currentTrackOffset += Marshal.SizeOf<AlcoholTrack>() * 3;
                     }
 
                     foreach(Track track in writingTracks.Where(t => t.TrackSession == i).OrderBy(t => t.TrackSequence))
                     {
-                        AlcoholTrack alcTrk = new AlcoholTrack();
+                        var alcTrk = new AlcoholTrack();
+
                         if(decodedToc.HasValue &&
                            decodedToc.Value.TrackDescriptors.Any(t => t.SessionNumber == i &&
                                                                       t.POINT         == track.TrackSequence))
@@ -620,7 +652,9 @@ namespace Aaru.DiscImages
                         {
                             (byte minute, byte second, byte frame) msf = LbaToMsf(track.TrackStartSector);
                             trackFlags.TryGetValue((byte)track.TrackSequence, out byte trackControl);
-                            if(trackControl == 0 && track.TrackType != TrackType.Audio)
+
+                            if(trackControl    == 0 &&
+                               track.TrackType != TrackType.Audio)
                                 trackControl = (byte)CdFlags.DataTrack;
 
                             alcTrk.adrCtl = (byte)((1 << 4) + trackControl);
@@ -632,23 +666,27 @@ namespace Aaru.DiscImages
                         }
 
                         alcTrk.mode = TrackTypeToAlcohol(track.TrackType);
+
                         alcTrk.subMode = track.TrackSubchannelType != TrackSubchannelType.None
-                                             ? AlcoholSubchannelMode.Interleaved
-                                             : AlcoholSubchannelMode.None;
+                                             ? AlcoholSubchannelMode.Interleaved : AlcoholSubchannelMode.None;
+
                         alcTrk.sectorSize = (ushort)(track.TrackRawBytesPerSector +
                                                      (track.TrackSubchannelType != TrackSubchannelType.None ? 96 : 0));
+
                         alcTrk.startLba     = (uint)track.TrackStartSector;
                         alcTrk.startOffset  = track.TrackFileOffset;
                         alcTrk.files        = 1;
                         alcTrk.extraOffset  = (uint)currentExtraOffset;
                         alcTrk.footerOffset = (uint)footerOffset;
+
                         // Alcohol seems to set that for all CD tracks
                         // Daemon Tools expect it to be like this
                         alcTrk.unknown = new byte[]
                         {
-                            0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                            0x00, 0x00, 0x00, 0x00
+                            0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                            0x00, 0x00, 0x00
                         };
+
                         alcTrk.unknown2 = new byte[24];
 
                         thisSessionTracks.Add((int)track.TrackSequence, alcTrk);
@@ -656,13 +694,14 @@ namespace Aaru.DiscImages
                         currentTrackOffset += Marshal.SizeOf<AlcoholTrack>();
                         currentExtraOffset += Marshal.SizeOf<AlcoholTrackExtra>();
 
-                        AlcoholTrackExtra trkExtra = new AlcoholTrackExtra
+                        var trkExtra = new AlcoholTrackExtra
                         {
-                            sectors = (uint)(track.TrackEndSector - track.TrackStartSector + 1)
+                            sectors = (uint)((track.TrackEndSector - track.TrackStartSector) + 1)
                         };
 
                         // When track mode changes there's a mandatory gap, Alcohol needs it
-                        if(track.TrackSequence == firstTrack.TrackSequence) trkExtra.pregap = 150;
+                        if(track.TrackSequence == firstTrack.TrackSequence)
+                            trkExtra.pregap = 150;
                         else if(thisSessionTracks.TryGetValue((int)(track.TrackSequence - 1),
                                                               out AlcoholTrack previousTrack) &&
                                 alcTrackExtras.TryGetValue((int)(track.TrackSequence - 1),
@@ -674,7 +713,8 @@ namespace Aaru.DiscImages
                             alcTrackExtras.Remove((int)(track.TrackSequence - 1));
                             alcTrackExtras.Add((int)(track.TrackSequence    - 1), previousExtra);
                         }
-                        else trkExtra.pregap = 0;
+                        else
+                            trkExtra.pregap = 0;
 
                         alcTrackExtras.Add((int)track.TrackSequence, trkExtra);
                     }
@@ -684,58 +724,41 @@ namespace Aaru.DiscImages
                         foreach(FullTOC.TrackDataDescriptor tocTrk in
                             decodedToc.Value.TrackDescriptors.Where(t => t.SessionNumber == i && t.POINT >= 0xB0))
                         {
-                            thisSessionTracks.Add(tocTrk.POINT,
-                                                  new AlcoholTrack
-                                                  {
-                                                      adrCtl   = (byte)((tocTrk.ADR << 4) + tocTrk.CONTROL),
-                                                      tno      = tocTrk.TNO,
-                                                      point    = tocTrk.POINT,
-                                                      min      = tocTrk.Min,
-                                                      sec      = tocTrk.Sec,
-                                                      frame    = tocTrk.Frame,
-                                                      zero     = tocTrk.Zero,
-                                                      pmin     = tocTrk.PMIN,
-                                                      psec     = tocTrk.PSEC,
-                                                      pframe   = tocTrk.PFRAME,
-                                                      mode     = AlcoholTrackMode.NoData,
-                                                      unknown  = new byte[18],
-                                                      unknown2 = new byte[24]
-                                                  });
+                            thisSessionTracks.Add(tocTrk.POINT, new AlcoholTrack
+                            {
+                                adrCtl   = (byte)((tocTrk.ADR << 4) + tocTrk.CONTROL), tno = tocTrk.TNO,
+                                point    = tocTrk.POINT, min                               = tocTrk.Min,
+                                sec      = tocTrk.Sec, frame                               = tocTrk.Frame,
+                                zero     = tocTrk.Zero, pmin                               = tocTrk.PMIN,
+                                psec     = tocTrk.PSEC, pframe                             = tocTrk.PFRAME,
+                                mode     = AlcoholTrackMode.NoData, unknown                = new byte[18],
+                                unknown2 = new byte[24]
+                            });
+
                             currentTrackOffset += Marshal.SizeOf<AlcoholTrack>();
                         }
                     else if(i < sessions)
                     {
                         (byte minute, byte second, byte frame) leadoutAmsf =
                             LbaToMsf(writingTracks.First(t => t.TrackSession == i + 1).TrackStartSector - 150);
-                        (byte minute, byte second, byte frame) leadoutPmsf =
-                            LbaToMsf(writingTracks.OrderBy(t => t.TrackSession).ThenBy(t => t.TrackSequence).Last()
-                                                  .TrackStartSector);
 
-                        thisSessionTracks.Add(0xB0,
-                                              new AlcoholTrack
-                                              {
-                                                  point    = 0xB0,
-                                                  adrCtl   = 0x50,
-                                                  zero     = 0,
-                                                  min      = leadoutAmsf.minute,
-                                                  sec      = leadoutAmsf.second,
-                                                  frame    = leadoutAmsf.frame,
-                                                  pmin     = leadoutPmsf.minute,
-                                                  psec     = leadoutPmsf.second,
-                                                  pframe   = leadoutPmsf.frame,
-                                                  unknown  = new byte[18],
-                                                  unknown2 = new byte[24]
-                                              });
+                        (byte minute, byte second, byte frame) leadoutPmsf =
+                            LbaToMsf(writingTracks.OrderBy(t => t.TrackSession).ThenBy(t => t.TrackSequence).Last().
+                                                   TrackStartSector);
+
+                        thisSessionTracks.Add(0xB0, new AlcoholTrack
+                        {
+                            point    = 0xB0, adrCtl = 0x50, zero = 0,
+                            min      = leadoutAmsf.minute,
+                            sec      = leadoutAmsf.second, frame  = leadoutAmsf.frame, pmin    = leadoutPmsf.minute,
+                            psec     = leadoutPmsf.second, pframe = leadoutPmsf.frame, unknown = new byte[18],
+                            unknown2 = new byte[24]
+                        });
 
                         thisSessionTracks.Add(0xC0, new AlcoholTrack
                         {
-                            point    = 0xC0,
-                            adrCtl   = 0x50,
-                            min      = 128,
-                            pmin     = 97,
-                            psec     = 25,
-                            unknown  = new byte[18],
-                            unknown2 = new byte[24]
+                            point = 0xC0, adrCtl = 0x50, min              = 128, pmin = 97,
+                            psec  = 25, unknown  = new byte[18], unknown2 = new byte[24]
                         });
 
                         currentTrackOffset += Marshal.SizeOf<AlcoholTrack>() * 2;
@@ -768,11 +791,17 @@ namespace Aaru.DiscImages
                 if(dmi != null)
                 {
                     descriptorStream.Seek(header.structuresOffset, SeekOrigin.Begin);
-                    if(dmi.Length      == 2052) descriptorStream.Write(dmi, 0, 2052);
+
+                    if(dmi.Length == 2052)
+                        descriptorStream.Write(dmi, 0, 2052);
                     else if(dmi.Length == 2048)
                     {
-                        descriptorStream.Write(new byte[] {0x08, 0x02, 0x00, 0x00}, 0, 4);
-                        descriptorStream.Write(dmi,                                 0, 2048);
+                        descriptorStream.Write(new byte[]
+                        {
+                            0x08, 0x02, 0x00, 0x00
+                        }, 0, 4);
+
+                        descriptorStream.Write(dmi, 0, 2048);
                     }
                 }
 
@@ -786,6 +815,7 @@ namespace Aaru.DiscImages
 
             // Write sessions
             descriptorStream.Seek(header.sessionOffset, SeekOrigin.Begin);
+
             foreach(AlcoholSession session in alcSessions.Values)
             {
                 block    = new byte[Marshal.SizeOf<AlcoholSession>()];
@@ -800,6 +830,7 @@ namespace Aaru.DiscImages
             foreach(KeyValuePair<int, Dictionary<int, AlcoholTrack>> kvp in alcToc)
             {
                 descriptorStream.Seek(alcSessions.First(t => t.Key == kvp.Key).Value.trackOffset, SeekOrigin.Begin);
+
                 foreach(AlcoholTrack track in kvp.Value.Values)
                 {
                     block    = new byte[Marshal.SizeOf<AlcoholTrack>()];
@@ -809,16 +840,20 @@ namespace Aaru.DiscImages
                     System.Runtime.InteropServices.Marshal.FreeHGlobal(blockPtr);
                     descriptorStream.Write(block, 0, block.Length);
 
-                    if(isDvd) continue;
+                    if(isDvd)
+                        continue;
 
                     // Write extra
                     long position = descriptorStream.Position;
                     descriptorStream.Seek(track.extraOffset, SeekOrigin.Begin);
+
                     if(alcTrackExtras.TryGetValue(track.point, out AlcoholTrackExtra extra))
                     {
                         block = new byte[Marshal.SizeOf<AlcoholTrackExtra>()];
+
                         blockPtr =
                             System.Runtime.InteropServices.Marshal.AllocHGlobal(Marshal.SizeOf<AlcoholTrackExtra>());
+
                         System.Runtime.InteropServices.Marshal.StructureToPtr(extra, blockPtr, true);
                         System.Runtime.InteropServices.Marshal.Copy(blockPtr, block, 0, block.Length);
                         System.Runtime.InteropServices.Marshal.FreeHGlobal(blockPtr);
@@ -847,8 +882,12 @@ namespace Aaru.DiscImages
 
             // Write filename
             descriptorStream.Write(filename, 0, filename.Length);
+
             // Write filename null termination
-            descriptorStream.Write(new byte[] {0, 0}, 0, 2);
+            descriptorStream.Write(new byte[]
+            {
+                0, 0
+            }, 0, 2);
 
             descriptorStream.Flush();
             descriptorStream.Close();
@@ -857,6 +896,7 @@ namespace Aaru.DiscImages
 
             IsWriting    = false;
             ErrorMessage = "";
+
             return true;
         }
 
@@ -865,6 +905,7 @@ namespace Aaru.DiscImages
         public bool SetGeometry(uint cylinders, uint heads, uint sectorsPerTrack)
         {
             ErrorMessage = "Unsupported feature";
+
             return false;
         }
 
@@ -873,6 +914,7 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Tried to write on a non-writable image";
+
                 return false;
             }
 
@@ -883,6 +925,7 @@ namespace Aaru.DiscImages
             if(track.TrackSequence == 0)
             {
                 ErrorMessage = $"Can't found track containing {sectorAddress}";
+
                 return false;
             }
 
@@ -893,6 +936,7 @@ namespace Aaru.DiscImages
                     if(data.Length != 1)
                     {
                         ErrorMessage = "Incorrect data size for track flags";
+
                         return false;
                     }
 
@@ -906,24 +950,28 @@ namespace Aaru.DiscImages
                     {
                         ErrorMessage =
                             $"Trying to write subchannel to track {track.TrackSequence}, that does not have subchannel";
+
                         return false;
                     }
 
                     if(data.Length != 96)
                     {
                         ErrorMessage = "Incorrect data size for subchannel";
+
                         return false;
                     }
 
-                    imageStream
-                       .Seek((long)(track.TrackFileOffset + (sectorAddress - track.TrackStartSector) * (ulong)(track.TrackRawBytesPerSector + 96)) + track.TrackRawBytesPerSector,
+                    imageStream.
+                        Seek((long)(track.TrackFileOffset + ((sectorAddress - track.TrackStartSector) * (ulong)(track.TrackRawBytesPerSector + 96))) + track.TrackRawBytesPerSector,
                              SeekOrigin.Begin);
+
                     imageStream.Write(data, 0, data.Length);
 
                     return true;
                 }
                 default:
                     ErrorMessage = $"Unsupported tag type {tag}";
+
                     return false;
             }
         }
@@ -933,6 +981,7 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Tried to write on a non-writable image";
+
                 return false;
             }
 
@@ -943,6 +992,7 @@ namespace Aaru.DiscImages
             if(track.TrackSequence == 0)
             {
                 ErrorMessage = $"Can't found track containing {sectorAddress}";
+
                 return false;
             }
 
@@ -955,20 +1005,23 @@ namespace Aaru.DiscImages
                     {
                         ErrorMessage =
                             $"Trying to write subchannel to track {track.TrackSequence}, that does not have subchannel";
+
                         return false;
                     }
 
                     if(data.Length % 96 != 0)
                     {
                         ErrorMessage = "Incorrect data size for subchannel";
+
                         return false;
                     }
 
                     for(uint i = 0; i < length; i++)
                     {
-                        imageStream
-                           .Seek((long)(track.TrackFileOffset + (i + sectorAddress - track.TrackStartSector) * (ulong)(track.TrackRawBytesPerSector + 96)) + track.TrackRawBytesPerSector,
+                        imageStream.
+                            Seek((long)(track.TrackFileOffset + (((i + sectorAddress) - track.TrackStartSector) * (ulong)(track.TrackRawBytesPerSector + 96))) + track.TrackRawBytesPerSector,
                                  SeekOrigin.Begin);
+
                         imageStream.Write(data, (int)(i * 96), 96);
                     }
 
@@ -976,6 +1029,7 @@ namespace Aaru.DiscImages
                 }
                 default:
                     ErrorMessage = $"Unsupported tag type {tag}";
+
                     return false;
             }
         }
diff --git a/Aaru.Images/Anex86/Anex86.cs b/Aaru.Images/Anex86/Anex86.cs
index 8601c7585..9bee1f8bc 100644
--- a/Aaru.Images/Anex86/Anex86.cs
+++ b/Aaru.Images/Anex86/Anex86.cs
@@ -45,31 +45,18 @@ namespace Aaru.DiscImages
         ImageInfo    imageInfo;
         FileStream   writingStream;
 
-        public Anex86()
+        public Anex86() => imageInfo = new ImageInfo
         {
-            imageInfo = new ImageInfo
-            {
-                ReadableSectorTags    = new List<SectorTagType>(),
-                ReadableMediaTags     = new List<MediaTagType>(),
-                HasPartitions         = false,
-                HasSessions           = false,
-                Version               = null,
-                Application           = null,
-                ApplicationVersion    = null,
-                Creator               = null,
-                Comments              = null,
-                MediaManufacturer     = null,
-                MediaModel            = null,
-                MediaSerialNumber     = null,
-                MediaBarcode          = null,
-                MediaPartNumber       = null,
-                MediaSequence         = 0,
-                LastMediaSequence     = 0,
-                DriveManufacturer     = null,
-                DriveModel            = null,
-                DriveSerialNumber     = null,
-                DriveFirmwareRevision = null
-            };
-        }
+            ReadableSectorTags = new List<SectorTagType>(), ReadableMediaTags = new List<MediaTagType>(),
+            HasPartitions      = false, HasSessions                           = false, Version = null,
+            Application        = null,
+            ApplicationVersion = null, Creator = null, Comments = null,
+            MediaManufacturer  = null,
+            MediaModel         = null, MediaSerialNumber = null, MediaBarcode = null,
+            MediaPartNumber    = null,
+            MediaSequence      = 0, LastMediaSequence = 0, DriveManufacturer = null,
+            DriveModel         = null,
+            DriveSerialNumber  = null, DriveFirmwareRevision = null
+        };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/Anex86/Identify.cs b/Aaru.Images/Anex86/Identify.cs
index 29f3a548a..67f0e28bc 100644
--- a/Aaru.Images/Anex86/Identify.cs
+++ b/Aaru.Images/Anex86/Identify.cs
@@ -44,20 +44,21 @@ namespace Aaru.DiscImages
             Stream stream = imageFilter.GetDataForkStream();
             stream.Seek(0, SeekOrigin.Begin);
 
-            if(stream.Length < Marshal.SizeOf<Anex86Header>()) return false;
+            if(stream.Length < Marshal.SizeOf<Anex86Header>())
+                return false;
 
             byte[] hdrB = new byte[Marshal.SizeOf<Anex86Header>()];
             stream.Read(hdrB, 0, hdrB.Length);
 
             fdihdr = Marshal.SpanToStructureLittleEndian<Anex86Header>(hdrB);
 
-            AaruConsole.DebugWriteLine("Anex86 plugin", "fdihdr.unknown = {0}",   fdihdr.unknown);
-            AaruConsole.DebugWriteLine("Anex86 plugin", "fdihdr.hddtype = {0}",   fdihdr.hddtype);
-            AaruConsole.DebugWriteLine("Anex86 plugin", "fdihdr.hdrSize = {0}",   fdihdr.hdrSize);
-            AaruConsole.DebugWriteLine("Anex86 plugin", "fdihdr.dskSize = {0}",   fdihdr.dskSize);
-            AaruConsole.DebugWriteLine("Anex86 plugin", "fdihdr.bps = {0}",       fdihdr.bps);
-            AaruConsole.DebugWriteLine("Anex86 plugin", "fdihdr.spt = {0}",       fdihdr.spt);
-            AaruConsole.DebugWriteLine("Anex86 plugin", "fdihdr.heads = {0}",     fdihdr.heads);
+            AaruConsole.DebugWriteLine("Anex86 plugin", "fdihdr.unknown = {0}", fdihdr.unknown);
+            AaruConsole.DebugWriteLine("Anex86 plugin", "fdihdr.hddtype = {0}", fdihdr.hddtype);
+            AaruConsole.DebugWriteLine("Anex86 plugin", "fdihdr.hdrSize = {0}", fdihdr.hdrSize);
+            AaruConsole.DebugWriteLine("Anex86 plugin", "fdihdr.dskSize = {0}", fdihdr.dskSize);
+            AaruConsole.DebugWriteLine("Anex86 plugin", "fdihdr.bps = {0}", fdihdr.bps);
+            AaruConsole.DebugWriteLine("Anex86 plugin", "fdihdr.spt = {0}", fdihdr.spt);
+            AaruConsole.DebugWriteLine("Anex86 plugin", "fdihdr.heads = {0}", fdihdr.heads);
             AaruConsole.DebugWriteLine("Anex86 plugin", "fdihdr.cylinders = {0}", fdihdr.cylinders);
 
             return stream.Length  == fdihdr.hdrSize + fdihdr.dskSize &&
diff --git a/Aaru.Images/Anex86/Properties.cs b/Aaru.Images/Anex86/Properties.cs
index b9b142f4f..bc90b284c 100644
--- a/Aaru.Images/Anex86/Properties.cs
+++ b/Aaru.Images/Anex86/Properties.cs
@@ -51,29 +51,34 @@ namespace Aaru.DiscImages
         public List<DumpHardwareType> DumpHardware => null;
         public CICMMetadataType       CicmMetadata => null;
 
-        public IEnumerable<MediaTagType>  SupportedMediaTags  => new MediaTagType[] { };
-        public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[] { };
+        public IEnumerable<MediaTagType> SupportedMediaTags => new MediaTagType[]
+            {};
+        public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[]
+            {};
+
         // TODO: Test with real hardware to see real supported media
-        public IEnumerable<MediaType> SupportedMediaTypes =>
-            new[]
-            {
-                MediaType.IBM23FD, MediaType.ECMA_66, MediaType.DOS_525_SS_DD_8, MediaType.DOS_525_SS_DD_9,
-                MediaType.ACORN_525_SS_SD_40, MediaType.ACORN_525_SS_DD_40, MediaType.ATARI_525_SD,
-                MediaType.ATARI_525_DD, MediaType.ATARI_525_ED, MediaType.DOS_525_DS_DD_8,
-                MediaType.DOS_525_DS_DD_9, MediaType.ECMA_70, MediaType.Apricot_35, MediaType.RX01, MediaType.RX02,
-                MediaType.NEC_525_HD, MediaType.ECMA_99_15, MediaType.NEC_8_SD, MediaType.RX03,
-                MediaType.DOS_35_SS_DD_8, MediaType.DOS_35_SS_DD_9, MediaType.ACORN_525_SS_SD_80, MediaType.RX50,
-                MediaType.ATARI_35_SS_DD_11, MediaType.ACORN_525_SS_DD_80, MediaType.ACORN_35_DS_DD,
-                MediaType.DOS_35_DS_DD_8, MediaType.DOS_35_DS_DD_9, MediaType.ACORN_35_DS_HD, MediaType.DOS_525_HD,
-                MediaType.ACORN_525_DS_DD, MediaType.DOS_35_HD, MediaType.XDF_525, MediaType.DMF, MediaType.XDF_35,
-                MediaType.DOS_35_ED, MediaType.FDFORMAT_35_DD, MediaType.FDFORMAT_525_HD, MediaType.FDFORMAT_35_HD,
-                MediaType.NEC_35_TD, MediaType.Unknown, MediaType.GENERIC_HDD, MediaType.FlashDrive,
-                MediaType.CompactFlash, MediaType.CompactFlashType2, MediaType.PCCardTypeI, MediaType.PCCardTypeII,
-                MediaType.PCCardTypeIII, MediaType.PCCardTypeIV
-            };
+        public IEnumerable<MediaType> SupportedMediaTypes => new[]
+        {
+            MediaType.IBM23FD, MediaType.ECMA_66, MediaType.DOS_525_SS_DD_8, MediaType.DOS_525_SS_DD_9,
+            MediaType.ACORN_525_SS_SD_40, MediaType.ACORN_525_SS_DD_40, MediaType.ATARI_525_SD, MediaType.ATARI_525_DD,
+            MediaType.ATARI_525_ED, MediaType.DOS_525_DS_DD_8, MediaType.DOS_525_DS_DD_9, MediaType.ECMA_70,
+            MediaType.Apricot_35, MediaType.RX01, MediaType.RX02, MediaType.NEC_525_HD, MediaType.ECMA_99_15,
+            MediaType.NEC_8_SD, MediaType.RX03, MediaType.DOS_35_SS_DD_8, MediaType.DOS_35_SS_DD_9,
+            MediaType.ACORN_525_SS_SD_80, MediaType.RX50, MediaType.ATARI_35_SS_DD_11, MediaType.ACORN_525_SS_DD_80,
+            MediaType.ACORN_35_DS_DD, MediaType.DOS_35_DS_DD_8, MediaType.DOS_35_DS_DD_9, MediaType.ACORN_35_DS_HD,
+            MediaType.DOS_525_HD, MediaType.ACORN_525_DS_DD, MediaType.DOS_35_HD, MediaType.XDF_525, MediaType.DMF,
+            MediaType.XDF_35, MediaType.DOS_35_ED, MediaType.FDFORMAT_35_DD, MediaType.FDFORMAT_525_HD,
+            MediaType.FDFORMAT_35_HD, MediaType.NEC_35_TD, MediaType.Unknown, MediaType.GENERIC_HDD,
+            MediaType.FlashDrive, MediaType.CompactFlash, MediaType.CompactFlashType2, MediaType.PCCardTypeI,
+            MediaType.PCCardTypeII, MediaType.PCCardTypeIII, MediaType.PCCardTypeIV
+        };
         public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
-            new (string name, Type type, string description, object @default)[] { };
-        public IEnumerable<string> KnownExtensions => new[] {".fdi", ".hdi"};
+            new (string name, Type type, string description, object @default)[]
+                {};
+        public IEnumerable<string> KnownExtensions => new[]
+        {
+            ".fdi", ".hdi"
+        };
 
         public bool   IsWriting    { get; private set; }
         public string ErrorMessage { get; private set; }
diff --git a/Aaru.Images/Anex86/Read.cs b/Aaru.Images/Anex86/Read.cs
index 9bf44cae9..bfb1c5d5d 100644
--- a/Aaru.Images/Anex86/Read.cs
+++ b/Aaru.Images/Anex86/Read.cs
@@ -47,7 +47,8 @@ namespace Aaru.DiscImages
             Stream stream = imageFilter.GetDataForkStream();
             stream.Seek(0, SeekOrigin.Begin);
 
-            if(stream.Length < Marshal.SizeOf<Anex86Header>()) return false;
+            if(stream.Length < Marshal.SizeOf<Anex86Header>())
+                return false;
 
             byte[] hdrB = new byte[Marshal.SizeOf<Anex86Header>()];
             stream.Read(hdrB, 0, hdrB.Length);
@@ -57,7 +58,9 @@ namespace Aaru.DiscImages
             imageInfo.MediaType = Geometry.GetMediaType(((ushort)fdihdr.cylinders, (byte)fdihdr.heads,
                                                          (ushort)fdihdr.spt, (uint)fdihdr.bps, MediaEncoding.MFM,
                                                          false));
-            if(imageInfo.MediaType == MediaType.Unknown) imageInfo.MediaType = MediaType.GENERIC_HDD;
+
+            if(imageInfo.MediaType == MediaType.Unknown)
+                imageInfo.MediaType = MediaType.GENERIC_HDD;
 
             AaruConsole.DebugWriteLine("Anex86 plugin", "MediaType: {0}", imageInfo.MediaType);
 
@@ -91,7 +94,7 @@ namespace Aaru.DiscImages
 
             Stream stream = anexImageFilter.GetDataForkStream();
 
-            stream.Seek((long)((ulong)fdihdr.hdrSize + sectorAddress * imageInfo.SectorSize), SeekOrigin.Begin);
+            stream.Seek((long)((ulong)fdihdr.hdrSize + (sectorAddress * imageInfo.SectorSize)), SeekOrigin.Begin);
 
             stream.Read(buffer, 0, (int)(length * imageInfo.SectorSize));
 
diff --git a/Aaru.Images/Anex86/Structs.cs b/Aaru.Images/Anex86/Structs.cs
index 4af42f99c..14e993425 100644
--- a/Aaru.Images/Anex86/Structs.cs
+++ b/Aaru.Images/Anex86/Structs.cs
@@ -39,14 +39,14 @@ namespace Aaru.DiscImages
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct Anex86Header
         {
-            public int unknown;
-            public int hddtype;
-            public int hdrSize;
-            public int dskSize;
-            public int bps;
-            public int spt;
-            public int heads;
-            public int cylinders;
+            public readonly int unknown;
+            public readonly int hddtype;
+            public          int hdrSize;
+            public          int dskSize;
+            public          int bps;
+            public          int spt;
+            public          int heads;
+            public          int cylinders;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/Anex86/Write.cs b/Aaru.Images/Anex86/Write.cs
index 256359d13..3d9ac2ff6 100644
--- a/Aaru.Images/Anex86/Write.cs
+++ b/Aaru.Images/Anex86/Write.cs
@@ -45,45 +45,61 @@ namespace Aaru.DiscImages
     public partial class Anex86
     {
         public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
-                           uint   sectorSize)
+                           uint sectorSize)
         {
             if(sectorSize == 0)
             {
                 ErrorMessage = "Unsupported sector size";
+
                 return false;
             }
 
-            if(sectors * sectorSize > int.MaxValue || sectors > (long)int.MaxValue * 8 * 33)
+            if(sectors * sectorSize > int.MaxValue ||
+               sectors              > (long)int.MaxValue * 8 * 33)
             {
                 ErrorMessage = "Too many sectors";
+
                 return false;
             }
 
             if(!SupportedMediaTypes.Contains(mediaType))
             {
                 ErrorMessage = $"Unsupport media format {mediaType}";
+
                 return false;
             }
 
-            imageInfo = new ImageInfo {MediaType = mediaType, SectorSize = sectorSize, Sectors = sectors};
+            imageInfo = new ImageInfo
+            {
+                MediaType = mediaType, SectorSize = sectorSize, Sectors = sectors
+            };
 
-            try { writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None); }
+            try
+            {
+                writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
+            }
             catch(IOException e)
             {
                 ErrorMessage = $"Could not create new image file, exception {e.Message}";
+
                 return false;
             }
 
-            fdihdr = new Anex86Header {hdrSize = 4096, dskSize = (int)(sectors * sectorSize), bps = (int)sectorSize};
+            fdihdr = new Anex86Header
+            {
+                hdrSize = 4096, dskSize = (int)(sectors * sectorSize), bps = (int)sectorSize
+            };
 
             IsWriting    = true;
             ErrorMessage = null;
+
             return true;
         }
 
         public bool WriteMediaTag(byte[] data, MediaTagType tag)
         {
             ErrorMessage = "Writing media tags is not supported.";
+
             return false;
         }
 
@@ -92,25 +108,29 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Tried to write on a non-writable image";
+
                 return false;
             }
 
             if(data.Length != imageInfo.SectorSize)
             {
                 ErrorMessage = "Incorrect data size";
+
                 return false;
             }
 
             if(sectorAddress >= imageInfo.Sectors)
             {
                 ErrorMessage = "Tried to write past image size";
+
                 return false;
             }
 
-            writingStream.Seek((long)(4096 + sectorAddress * imageInfo.SectorSize), SeekOrigin.Begin);
+            writingStream.Seek((long)(4096 + (sectorAddress * imageInfo.SectorSize)), SeekOrigin.Begin);
             writingStream.Write(data, 0, data.Length);
 
             ErrorMessage = "";
+
             return true;
         }
 
@@ -119,37 +139,43 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Tried to write on a non-writable image";
+
                 return false;
             }
 
             if(data.Length % imageInfo.SectorSize != 0)
             {
                 ErrorMessage = "Incorrect data size";
+
                 return false;
             }
 
             if(sectorAddress + length > imageInfo.Sectors)
             {
                 ErrorMessage = "Tried to write past image size";
+
                 return false;
             }
 
-            writingStream.Seek((long)(4096 + sectorAddress * imageInfo.SectorSize), SeekOrigin.Begin);
+            writingStream.Seek((long)(4096 + (sectorAddress * imageInfo.SectorSize)), SeekOrigin.Begin);
             writingStream.Write(data, 0, data.Length);
 
             ErrorMessage = "";
+
             return true;
         }
 
         public bool WriteSectorLong(byte[] data, ulong sectorAddress)
         {
             ErrorMessage = "Writing sectors with tags is not supported.";
+
             return false;
         }
 
         public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
         {
             ErrorMessage = "Writing sectors with tags is not supported.";
+
             return false;
         }
 
@@ -158,6 +184,7 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Image is not opened for writing";
+
                 return false;
             }
 
@@ -165,7 +192,8 @@ namespace Aaru.DiscImages
                 imageInfo.MediaType == MediaType.FlashDrive        || imageInfo.MediaType == MediaType.CompactFlash  ||
                 imageInfo.MediaType == MediaType.CompactFlashType2 || imageInfo.MediaType == MediaType.PCCardTypeI   ||
                 imageInfo.MediaType == MediaType.PCCardTypeII      || imageInfo.MediaType == MediaType.PCCardTypeIII ||
-                imageInfo.MediaType == MediaType.PCCardTypeIV) && fdihdr.cylinders == 0)
+                imageInfo.MediaType == MediaType.PCCardTypeIV) &&
+               fdihdr.cylinders == 0)
             {
                 fdihdr.cylinders = (int)(imageInfo.Sectors / 8 / 33);
                 fdihdr.heads     = 8;
@@ -183,7 +211,10 @@ namespace Aaru.DiscImages
 
                     fdihdr.cylinders = (int)imageInfo.Sectors / fdihdr.heads / fdihdr.spt;
 
-                    if(fdihdr.cylinders == 0 && fdihdr.heads == 0 && fdihdr.spt == 0) break;
+                    if(fdihdr.cylinders == 0 &&
+                       fdihdr.heads     == 0 &&
+                       fdihdr.spt       == 0)
+                        break;
                 }
             }
 
@@ -198,6 +229,7 @@ namespace Aaru.DiscImages
 
             IsWriting    = false;
             ErrorMessage = "";
+
             return true;
         }
 
@@ -208,18 +240,21 @@ namespace Aaru.DiscImages
             if(cylinders > int.MaxValue)
             {
                 ErrorMessage = "Too many cylinders.";
+
                 return false;
             }
 
             if(heads > int.MaxValue)
             {
                 ErrorMessage = "Too many heads.";
+
                 return false;
             }
 
             if(sectorsPerTrack > int.MaxValue)
             {
                 ErrorMessage = "Too many sectors per track.";
+
                 return false;
             }
 
@@ -233,12 +268,14 @@ namespace Aaru.DiscImages
         public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
         {
             ErrorMessage = "Unsupported feature";
+
             return false;
         }
 
         public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
         {
             ErrorMessage = "Unsupported feature";
+
             return false;
         }
 
diff --git a/Aaru.Images/Apple2MG/Apple2MG.cs b/Aaru.Images/Apple2MG/Apple2MG.cs
index 2ef0a33ce..1b05c3560 100644
--- a/Aaru.Images/Apple2MG/Apple2MG.cs
+++ b/Aaru.Images/Apple2MG/Apple2MG.cs
@@ -46,31 +46,18 @@ namespace Aaru.DiscImages
         ImageInfo   imageInfo;
         FileStream  writingStream;
 
-        public Apple2Mg()
+        public Apple2Mg() => imageInfo = new ImageInfo
         {
-            imageInfo = new ImageInfo
-            {
-                ReadableSectorTags    = new List<SectorTagType>(),
-                ReadableMediaTags     = new List<MediaTagType>(),
-                HasPartitions         = false,
-                HasSessions           = false,
-                Version               = null,
-                Application           = null,
-                ApplicationVersion    = null,
-                Creator               = null,
-                Comments              = null,
-                MediaManufacturer     = null,
-                MediaModel            = null,
-                MediaSerialNumber     = null,
-                MediaBarcode          = null,
-                MediaPartNumber       = null,
-                MediaSequence         = 0,
-                LastMediaSequence     = 0,
-                DriveManufacturer     = null,
-                DriveModel            = null,
-                DriveSerialNumber     = null,
-                DriveFirmwareRevision = null
-            };
-        }
+            ReadableSectorTags = new List<SectorTagType>(), ReadableMediaTags = new List<MediaTagType>(),
+            HasPartitions      = false, HasSessions                           = false, Version = null,
+            Application        = null,
+            ApplicationVersion = null, Creator = null, Comments = null,
+            MediaManufacturer  = null,
+            MediaModel         = null, MediaSerialNumber = null, MediaBarcode = null,
+            MediaPartNumber    = null,
+            MediaSequence      = 0, LastMediaSequence = 0, DriveManufacturer = null,
+            DriveModel         = null,
+            DriveSerialNumber  = null, DriveFirmwareRevision = null
+        };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/Apple2MG/Constants.cs b/Aaru.Images/Apple2MG/Constants.cs
index d149d8fac..709aa571d 100644
--- a/Aaru.Images/Apple2MG/Constants.cs
+++ b/Aaru.Images/Apple2MG/Constants.cs
@@ -34,51 +34,37 @@ namespace Aaru.DiscImages
 {
     public partial class Apple2Mg
     {
-        /// <summary>
-        ///     Magic number, "2IMG"
-        /// </summary>
+        /// <summary>Magic number, "2IMG"</summary>
         const uint MAGIC = 0x474D4932;
-        /// <summary>
-        ///     Disk image created by ASIMOV2, "!nfc"
-        /// </summary>
+        /// <summary>Disk image created by ASIMOV2, "!nfc"</summary>
         const uint CREATOR_ASIMOV = 0x63666E21;
-        /// <summary>
-        ///     Disk image created by Bernie ][ the Rescue, "B2TR"
-        /// </summary>
+        /// <summary>Disk image created by Bernie ][ the Rescue, "B2TR"</summary>
         const uint CREATOR_BERNIE = 0x52543242;
-        /// <summary>
-        ///     Disk image created by Catakig, "CTKG"
-        /// </summary>
+        /// <summary>Disk image created by Catakig, "CTKG"</summary>
         const uint CREATOR_CATAKIG = 0x474B5443;
-        /// <summary>
-        ///     Disk image created by Sheppy's ImageMaker, "ShIm"
-        /// </summary>
+        /// <summary>Disk image created by Sheppy's ImageMaker, "ShIm"</summary>
         const uint CREATOR_SHEPPY = 0x6D496853;
-        /// <summary>
-        ///     Disk image created by Sweet16, "WOOF"
-        /// </summary>
+        /// <summary>Disk image created by Sweet16, "WOOF"</summary>
         const uint CREATOR_SWEET = 0x464F4F57;
-        /// <summary>
-        ///     Disk image created by XGS, "XGS!"
-        /// </summary>
+        /// <summary>Disk image created by XGS, "XGS!"</summary>
         const uint CREATOR_XGS = 0x21534758;
-        /// <summary>
-        ///     Disk image created by CiderPress, "CdrP"
-        /// </summary>
+        /// <summary>Disk image created by CiderPress, "CdrP"</summary>
         const uint CREATOR_CIDER = 0x50726443;
-        /// <summary>
-        ///     Disk image created by DiscImageChef, "dic "
-        /// </summary>
+        /// <summary>Disk image created by DiscImageChef, "dic "</summary>
         const uint CREATOR_DIC = 0x20636964;
-        /// <summary>
-        ///     Disk image created by Aaru, "aaru"
-        /// </summary>
+        /// <summary>Disk image created by Aaru, "aaru"</summary>
         const uint CREATOR_AARU = 0x75726161;
 
-        const    uint  LOCKED_DISK         = 0x80000000;
-        const    uint  VALID_VOLUME_NUMBER = 0x00000100;
-        const    uint  VOLUME_NUMBER_MASK  = 0x000000FF;
-        readonly int[] deinterleave        = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15};
-        readonly int[] interleave          = {0, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 15};
+        const uint LOCKED_DISK         = 0x80000000;
+        const uint VALID_VOLUME_NUMBER = 0x00000100;
+        const uint VOLUME_NUMBER_MASK  = 0x000000FF;
+        readonly int[] deinterleave =
+        {
+            0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
+        };
+        readonly int[] interleave =
+        {
+            0, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 15
+        };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/Apple2MG/Enums.cs b/Aaru.Images/Apple2MG/Enums.cs
index 1a7578591..d65884042 100644
--- a/Aaru.Images/Apple2MG/Enums.cs
+++ b/Aaru.Images/Apple2MG/Enums.cs
@@ -36,9 +36,7 @@ namespace Aaru.DiscImages
     {
         enum SectorOrder : uint
         {
-            Dos     = 0,
-            ProDos  = 1,
-            Nibbles = 2
+            Dos = 0, ProDos = 1, Nibbles = 2
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/Apple2MG/Identify.cs b/Aaru.Images/Apple2MG/Identify.cs
index 849e9437e..6aa59144e 100644
--- a/Aaru.Images/Apple2MG/Identify.cs
+++ b/Aaru.Images/Apple2MG/Identify.cs
@@ -43,26 +43,35 @@ namespace Aaru.DiscImages
             Stream stream = imageFilter.GetDataForkStream();
             stream.Seek(0, SeekOrigin.Begin);
 
-            if(stream.Length < 65) return false;
+            if(stream.Length < 65)
+                return false;
 
             byte[] header = new byte[64];
             stream.Read(header, 0, 64);
 
             A2ImgHeader hdr = Marshal.SpanToStructureLittleEndian<A2ImgHeader>(header);
 
-            if(hdr.Magic != MAGIC) return false;
+            if(hdr.Magic != MAGIC)
+                return false;
 
-            if(hdr.DataOffset > stream.Length) return false;
+            if(hdr.DataOffset > stream.Length)
+                return false;
 
             // There seems to be incorrect endian in some images on the wild
-            if(hdr.DataSize                  == 0x00800C00) hdr.DataSize = 0x000C8000;
-            if(hdr.DataOffset + hdr.DataSize > stream.Length) return false;
+            if(hdr.DataSize == 0x00800C00)
+                hdr.DataSize = 0x000C8000;
 
-            if(hdr.CommentOffset > stream.Length) return false;
+            if(hdr.DataOffset + hdr.DataSize > stream.Length)
+                return false;
 
-            if(hdr.CommentOffset + hdr.CommentSize > stream.Length) return false;
+            if(hdr.CommentOffset > stream.Length)
+                return false;
 
-            if(hdr.CreatorSpecificOffset > stream.Length) return false;
+            if(hdr.CommentOffset + hdr.CommentSize > stream.Length)
+                return false;
+
+            if(hdr.CreatorSpecificOffset > stream.Length)
+                return false;
 
             return hdr.CreatorSpecificOffset + hdr.CreatorSpecificSize <= stream.Length;
         }
diff --git a/Aaru.Images/Apple2MG/Properties.cs b/Aaru.Images/Apple2MG/Properties.cs
index 7e7143726..33b49b84d 100644
--- a/Aaru.Images/Apple2MG/Properties.cs
+++ b/Aaru.Images/Apple2MG/Properties.cs
@@ -51,20 +51,25 @@ namespace Aaru.DiscImages
         public List<DumpHardwareType> DumpHardware => null;
         public CICMMetadataType       CicmMetadata => null;
 
-        public IEnumerable<MediaTagType>  SupportedMediaTags  => new MediaTagType[] { };
-        public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[] { };
-        public IEnumerable<MediaType> SupportedMediaTypes =>
-            new[]
-            {
-                MediaType.Apple32SS, MediaType.Apple33SS, MediaType.AppleSonySS, MediaType.AppleSonyDS,
-                MediaType.DOS_35_HD, MediaType.Unknown, MediaType.GENERIC_HDD, MediaType.FlashDrive,
-                MediaType.CompactFlash, MediaType.CompactFlashType2, MediaType.PCCardTypeI, MediaType.PCCardTypeII,
-                MediaType.PCCardTypeIII, MediaType.PCCardTypeIV
-            };
+        public IEnumerable<MediaTagType> SupportedMediaTags => new MediaTagType[]
+            {};
+        public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[]
+            {};
+        public IEnumerable<MediaType> SupportedMediaTypes => new[]
+        {
+            MediaType.Apple32SS, MediaType.Apple33SS, MediaType.AppleSonySS, MediaType.AppleSonyDS, MediaType.DOS_35_HD,
+            MediaType.Unknown, MediaType.GENERIC_HDD, MediaType.FlashDrive, MediaType.CompactFlash,
+            MediaType.CompactFlashType2, MediaType.PCCardTypeI, MediaType.PCCardTypeII, MediaType.PCCardTypeIII,
+            MediaType.PCCardTypeIV
+        };
         public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
-            new (string name, Type type, string description, object @default)[] { };
-        public IEnumerable<string> KnownExtensions => new[] {".2mg"};
-        public bool                IsWriting       { get; private set; }
-        public string              ErrorMessage    { get; private set; }
+            new (string name, Type type, string description, object @default)[]
+                {};
+        public IEnumerable<string> KnownExtensions => new[]
+        {
+            ".2mg"
+        };
+        public bool   IsWriting    { get; private set; }
+        public string ErrorMessage { get; private set; }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/Apple2MG/Read.cs b/Aaru.Images/Apple2MG/Read.cs
index 6464e4107..5024bb33e 100644
--- a/Aaru.Images/Apple2MG/Read.cs
+++ b/Aaru.Images/Apple2MG/Read.cs
@@ -56,7 +56,7 @@ namespace Aaru.DiscImages
             byte[] magic   = new byte[4];
             byte[] creator = new byte[4];
 
-            Array.Copy(header, 0, magic,   0, 4);
+            Array.Copy(header, 0, magic, 0, 4);
             Array.Copy(header, 4, creator, 0, 4);
 
             imageHeader = Marshal.SpanToStructureLittleEndian<A2ImgHeader>(header);
@@ -67,30 +67,36 @@ namespace Aaru.DiscImages
                 AaruConsole.DebugWriteLine("2MG plugin", "Detected incorrect endian on data size field, correcting.");
             }
 
-            AaruConsole.DebugWriteLine("2MG plugin", "ImageHeader.magic = \"{0}\"",
-                                      Encoding.ASCII.GetString(magic));
+            AaruConsole.DebugWriteLine("2MG plugin", "ImageHeader.magic = \"{0}\"", Encoding.ASCII.GetString(magic));
+
             AaruConsole.DebugWriteLine("2MG plugin", "ImageHeader.creator = \"{0}\"",
-                                      Encoding.ASCII.GetString(creator));
-            AaruConsole.DebugWriteLine("2MG plugin", "ImageHeader.headerSize = {0}",         imageHeader.HeaderSize);
-            AaruConsole.DebugWriteLine("2MG plugin", "ImageHeader.version = {0}",            imageHeader.Version);
-            AaruConsole.DebugWriteLine("2MG plugin", "ImageHeader.imageFormat = {0}",        imageHeader.ImageFormat);
-            AaruConsole.DebugWriteLine("2MG plugin", "ImageHeader.flags = 0x{0:X8}",         imageHeader.Flags);
-            AaruConsole.DebugWriteLine("2MG plugin", "ImageHeader.blocks = {0}",             imageHeader.Blocks);
-            AaruConsole.DebugWriteLine("2MG plugin", "ImageHeader.dataOffset = 0x{0:X8}",    imageHeader.DataOffset);
-            AaruConsole.DebugWriteLine("2MG plugin", "ImageHeader.dataSize = {0}",           imageHeader.DataSize);
+                                       Encoding.ASCII.GetString(creator));
+
+            AaruConsole.DebugWriteLine("2MG plugin", "ImageHeader.headerSize = {0}", imageHeader.HeaderSize);
+            AaruConsole.DebugWriteLine("2MG plugin", "ImageHeader.version = {0}", imageHeader.Version);
+            AaruConsole.DebugWriteLine("2MG plugin", "ImageHeader.imageFormat = {0}", imageHeader.ImageFormat);
+            AaruConsole.DebugWriteLine("2MG plugin", "ImageHeader.flags = 0x{0:X8}", imageHeader.Flags);
+            AaruConsole.DebugWriteLine("2MG plugin", "ImageHeader.blocks = {0}", imageHeader.Blocks);
+            AaruConsole.DebugWriteLine("2MG plugin", "ImageHeader.dataOffset = 0x{0:X8}", imageHeader.DataOffset);
+            AaruConsole.DebugWriteLine("2MG plugin", "ImageHeader.dataSize = {0}", imageHeader.DataSize);
             AaruConsole.DebugWriteLine("2MG plugin", "ImageHeader.commentOffset = 0x{0:X8}", imageHeader.CommentOffset);
-            AaruConsole.DebugWriteLine("2MG plugin", "ImageHeader.commentSize = {0}",        imageHeader.CommentSize);
+            AaruConsole.DebugWriteLine("2MG plugin", "ImageHeader.commentSize = {0}", imageHeader.CommentSize);
+
             AaruConsole.DebugWriteLine("2MG plugin", "ImageHeader.creatorSpecificOffset = 0x{0:X8}",
-                                      imageHeader.CreatorSpecificOffset);
+                                       imageHeader.CreatorSpecificOffset);
+
             AaruConsole.DebugWriteLine("2MG plugin", "ImageHeader.creatorSpecificSize = {0}",
-                                      imageHeader.CreatorSpecificSize);
+                                       imageHeader.CreatorSpecificSize);
+
             AaruConsole.DebugWriteLine("2MG plugin", "ImageHeader.reserved1 = 0x{0:X8}", imageHeader.Reserved1);
             AaruConsole.DebugWriteLine("2MG plugin", "ImageHeader.reserved2 = 0x{0:X8}", imageHeader.Reserved2);
             AaruConsole.DebugWriteLine("2MG plugin", "ImageHeader.reserved3 = 0x{0:X8}", imageHeader.Reserved3);
             AaruConsole.DebugWriteLine("2MG plugin", "ImageHeader.reserved4 = 0x{0:X8}", imageHeader.Reserved4);
 
-            if(imageHeader.DataSize    == 0 && imageHeader.Blocks == 0 &&
-               imageHeader.ImageFormat != SectorOrder.ProDos) return false;
+            if(imageHeader.DataSize    == 0 &&
+               imageHeader.Blocks      == 0 &&
+               imageHeader.ImageFormat != SectorOrder.ProDos)
+                return false;
 
             byte[] tmp;
             int[]  offsets;
@@ -101,22 +107,26 @@ namespace Aaru.DiscImages
                     tmp = new byte[imageHeader.DataSize];
                     stream.Seek(imageHeader.DataOffset, SeekOrigin.Begin);
                     stream.Read(tmp, 0, tmp.Length);
-                    AppleNib    nibPlugin = new AppleNib();
-                    ZZZNoFilter noFilter  = new ZZZNoFilter();
+                    var nibPlugin = new AppleNib();
+                    var noFilter  = new ZZZNoFilter();
                     noFilter.Open(tmp);
                     nibPlugin.Open(noFilter);
                     decodedImage         = nibPlugin.ReadSectors(0, (uint)nibPlugin.Info.Sectors);
                     imageInfo.Sectors    = nibPlugin.Info.Sectors;
                     imageInfo.SectorSize = nibPlugin.Info.SectorSize;
+
                     break;
                 case SectorOrder.Dos when imageHeader.DataSize    == 143360:
                 case SectorOrder.ProDos when imageHeader.DataSize == 143360:
                     stream.Seek(imageHeader.DataOffset, SeekOrigin.Begin);
                     tmp = new byte[imageHeader.DataSize];
                     stream.Read(tmp, 0, tmp.Length);
+
                     bool isDos = tmp[0x11001] == 17 && tmp[0x11002] < 16 && tmp[0x11027] <= 122 && tmp[0x11034] == 35 &&
                                  tmp[0x11035] == 16 && tmp[0x11036] == 0 && tmp[0x11037] == 1;
+
                     decodedImage = new byte[imageHeader.DataSize];
+
                     offsets = imageHeader.ImageFormat == SectorOrder.Dos
                                   ? isDos
                                         ? deinterleave
@@ -124,14 +134,17 @@ namespace Aaru.DiscImages
                                   : isDos
                                       ? interleave
                                       : deinterleave;
+
                     for(int t = 0; t < 35; t++)
                     {
                         for(int s = 0; s < 16; s++)
-                            Array.Copy(tmp, t * 16 * 256 + s * 256, decodedImage, t * 16 * 256 + offsets[s] * 256, 256);
+                            Array.Copy(tmp, (t * 16 * 256) + (s          * 256), decodedImage,
+                                       (t * 16      * 256) + (offsets[s] * 256), 256);
                     }
 
                     imageInfo.Sectors    = 560;
                     imageInfo.SectorSize = 256;
+
                     break;
                 case SectorOrder.Dos when imageHeader.DataSize == 819200:
                     stream.Seek(imageHeader.DataOffset, SeekOrigin.Begin);
@@ -139,19 +152,23 @@ namespace Aaru.DiscImages
                     stream.Read(tmp, 0, tmp.Length);
                     decodedImage = new byte[imageHeader.DataSize];
                     offsets      = interleave;
+
                     for(int t = 0; t < 200; t++)
                     {
                         for(int s = 0; s < 16; s++)
-                            Array.Copy(tmp, t * 16 * 256 + s * 256, decodedImage, t * 16 * 256 + offsets[s] * 256, 256);
+                            Array.Copy(tmp, (t * 16 * 256) + (s          * 256), decodedImage,
+                                       (t * 16      * 256) + (offsets[s] * 256), 256);
                     }
 
                     imageInfo.Sectors    = 1600;
                     imageInfo.SectorSize = 512;
+
                     break;
                 default:
                     decodedImage         = null;
                     imageInfo.SectorSize = 512;
                     imageInfo.Sectors    = imageHeader.DataSize / 512;
+
                     break;
             }
 
@@ -161,39 +178,50 @@ namespace Aaru.DiscImages
             {
                 case CREATOR_ASIMOV:
                     imageInfo.Application = "ASIMOV2";
+
                     break;
                 case CREATOR_BERNIE:
                     imageInfo.Application = "Bernie ][ the Rescue";
+
                     break;
                 case CREATOR_CATAKIG:
                     imageInfo.Application = "Catakig";
+
                     break;
                 case CREATOR_SHEPPY:
                     imageInfo.Application = "Sheppy's ImageMaker";
+
                     break;
                 case CREATOR_SWEET:
                     imageInfo.Application = "Sweet16";
+
                     break;
                 case CREATOR_XGS:
                     imageInfo.Application = "XGS";
+
                     break;
                 case CREATOR_CIDER:
                     imageInfo.Application = "CiderPress";
+
                     break;
                 case CREATOR_DIC:
                     imageInfo.Application = "DiscImageChef";
+
                     break;
                 case CREATOR_AARU:
                     imageInfo.Application = "Aaru";
+
                     break;
                 default:
                     imageInfo.Application = $"Unknown creator code \"{Encoding.ASCII.GetString(creator)}\"";
+
                     break;
             }
 
             imageInfo.Version = imageHeader.Version.ToString();
 
-            if(imageHeader.CommentOffset != 0 && imageHeader.CommentSize != 0)
+            if(imageHeader.CommentOffset != 0 &&
+               imageHeader.CommentSize   != 0)
             {
                 stream.Seek(imageHeader.CommentOffset, SeekOrigin.Begin);
 
@@ -212,6 +240,7 @@ namespace Aaru.DiscImages
             imageInfo.XmlMediaType = XmlMediaType.BlockMedia;
 
             AaruConsole.VerboseWriteLine("2MG image contains a disk of type {0}", imageInfo.MediaType);
+
             if(!string.IsNullOrEmpty(imageInfo.Comments))
                 AaruConsole.VerboseWriteLine("2MG comments: {0}", imageInfo.Comments);
 
@@ -221,38 +250,47 @@ namespace Aaru.DiscImages
                     imageInfo.Cylinders       = 35;
                     imageInfo.Heads           = 1;
                     imageInfo.SectorsPerTrack = 13;
+
                     break;
                 case MediaType.Apple32DS:
                     imageInfo.Cylinders       = 35;
                     imageInfo.Heads           = 2;
                     imageInfo.SectorsPerTrack = 13;
+
                     break;
                 case MediaType.Apple33SS:
                     imageInfo.Cylinders       = 35;
                     imageInfo.Heads           = 1;
                     imageInfo.SectorsPerTrack = 16;
+
                     break;
                 case MediaType.Apple33DS:
                     imageInfo.Cylinders       = 35;
                     imageInfo.Heads           = 2;
                     imageInfo.SectorsPerTrack = 16;
+
                     break;
                 case MediaType.AppleSonySS:
                     imageInfo.Cylinders = 80;
                     imageInfo.Heads     = 1;
+
                     // Variable sectors per track, this suffices
                     imageInfo.SectorsPerTrack = 10;
+
                     break;
                 case MediaType.AppleSonyDS:
                     imageInfo.Cylinders = 80;
                     imageInfo.Heads     = 2;
+
                     // Variable sectors per track, this suffices
                     imageInfo.SectorsPerTrack = 10;
+
                     break;
                 case MediaType.DOS_35_HD:
                     imageInfo.Cylinders       = 80;
                     imageInfo.Heads           = 2;
                     imageInfo.SectorsPerTrack = 18;
+
                     break;
             }
 
@@ -277,7 +315,7 @@ namespace Aaru.DiscImages
             else
             {
                 Stream stream = a2MgImageFilter.GetDataForkStream();
-                stream.Seek((long)(imageHeader.DataOffset + sectorAddress * imageInfo.SectorSize), SeekOrigin.Begin);
+                stream.Seek((long)(imageHeader.DataOffset + (sectorAddress * imageInfo.SectorSize)), SeekOrigin.Begin);
                 stream.Read(buffer, 0, (int)(length * imageInfo.SectorSize));
             }
 
diff --git a/Aaru.Images/Apple2MG/Structs.cs b/Aaru.Images/Apple2MG/Structs.cs
index d50d1944d..4a55d85db 100644
--- a/Aaru.Images/Apple2MG/Structs.cs
+++ b/Aaru.Images/Apple2MG/Structs.cs
@@ -37,78 +37,43 @@ namespace Aaru.DiscImages
 {
     public partial class Apple2Mg
     {
-        [SuppressMessage("ReSharper", "NotAccessedField.Local")]
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
+        [SuppressMessage("ReSharper", "NotAccessedField.Local"), StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct A2ImgHeader
         {
-            /// <summary>
-            ///     Offset 0x00, magic
-            /// </summary>
+            /// <summary>Offset 0x00, magic</summary>
             public uint Magic;
-            /// <summary>
-            ///     Offset 0x04, disk image creator ID
-            /// </summary>
+            /// <summary>Offset 0x04, disk image creator ID</summary>
             public uint Creator;
-            /// <summary>
-            ///     Offset 0x08, header size, constant 0x0040
-            /// </summary>
+            /// <summary>Offset 0x08, header size, constant 0x0040</summary>
             public ushort HeaderSize;
-            /// <summary>
-            ///     Offset 0x0A, disk image version
-            /// </summary>
+            /// <summary>Offset 0x0A, disk image version</summary>
             public ushort Version;
-            /// <summary>
-            ///     Offset 0x0C, disk image format
-            /// </summary>
+            /// <summary>Offset 0x0C, disk image format</summary>
             public SectorOrder ImageFormat;
-            /// <summary>
-            ///     Offset 0x10, flags and volume number
-            /// </summary>
+            /// <summary>Offset 0x10, flags and volume number</summary>
             public uint Flags;
-            /// <summary>
-            ///     Offset 0x14, blocks for ProDOS, 0 otherwise
-            /// </summary>
+            /// <summary>Offset 0x14, blocks for ProDOS, 0 otherwise</summary>
             public uint Blocks;
-            /// <summary>
-            ///     Offset 0x18, offset to data
-            /// </summary>
+            /// <summary>Offset 0x18, offset to data</summary>
             public uint DataOffset;
-            /// <summary>
-            ///     Offset 0x1C, data size in bytes
-            /// </summary>
+            /// <summary>Offset 0x1C, data size in bytes</summary>
             public uint DataSize;
-            /// <summary>
-            ///     Offset 0x20, offset to optional comment
-            /// </summary>
+            /// <summary>Offset 0x20, offset to optional comment</summary>
             public uint CommentOffset;
-            /// <summary>
-            ///     Offset 0x24, length of optional comment
-            /// </summary>
+            /// <summary>Offset 0x24, length of optional comment</summary>
             public uint CommentSize;
-            /// <summary>
-            ///     Offset 0x28, offset to creator specific chunk
-            /// </summary>
-            public uint CreatorSpecificOffset;
-            /// <summary>
-            ///     Offset 0x2C, creator specific chunk size
-            /// </summary>
-            public uint CreatorSpecificSize;
-            /// <summary>
-            ///     Offset 0x30, reserved, should be zero
-            /// </summary>
-            public uint Reserved1;
-            /// <summary>
-            ///     Offset 0x34, reserved, should be zero
-            /// </summary>
-            public uint Reserved2;
-            /// <summary>
-            ///     Offset 0x38, reserved, should be zero
-            /// </summary>
-            public uint Reserved3;
-            /// <summary>
-            ///     Offset 0x3C, reserved, should be zero
-            /// </summary>
-            public uint Reserved4;
+            /// <summary>Offset 0x28, offset to creator specific chunk</summary>
+            public readonly uint CreatorSpecificOffset;
+            /// <summary>Offset 0x2C, creator specific chunk size</summary>
+            public readonly uint CreatorSpecificSize;
+            /// <summary>Offset 0x30, reserved, should be zero</summary>
+            public readonly uint Reserved1;
+            /// <summary>Offset 0x34, reserved, should be zero</summary>
+            public readonly uint Reserved2;
+            /// <summary>Offset 0x38, reserved, should be zero</summary>
+            public readonly uint Reserved3;
+            /// <summary>Offset 0x3C, reserved, should be zero</summary>
+            public readonly uint Reserved4;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/Apple2MG/Write.cs b/Aaru.Images/Apple2MG/Write.cs
index 5a8262664..32ca9b279 100644
--- a/Aaru.Images/Apple2MG/Write.cs
+++ b/Aaru.Images/Apple2MG/Write.cs
@@ -46,44 +46,57 @@ namespace Aaru.DiscImages
     public partial class Apple2Mg
     {
         public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
-                           uint   sectorSize)
+                           uint sectorSize)
         {
             if(sectorSize != 512)
-                if(sectorSize != 256 || mediaType != MediaType.Apple32SS && mediaType != MediaType.Apple33SS)
+                if(sectorSize != 256 ||
+                   (mediaType != MediaType.Apple32SS && mediaType != MediaType.Apple33SS))
                 {
                     ErrorMessage = "Unsupported sector size";
+
                     return false;
                 }
 
             if(!SupportedMediaTypes.Contains(mediaType))
             {
                 ErrorMessage = $"Unsupport media format {mediaType}";
+
                 return false;
             }
 
             if(sectors > uint.MaxValue)
             {
                 ErrorMessage = "Too many sectors";
+
                 return false;
             }
 
-            imageInfo = new ImageInfo {MediaType = mediaType, SectorSize = sectorSize, Sectors = sectors};
+            imageInfo = new ImageInfo
+            {
+                MediaType = mediaType, SectorSize = sectorSize, Sectors = sectors
+            };
 
-            try { writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None); }
+            try
+            {
+                writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
+            }
             catch(IOException e)
             {
                 ErrorMessage = $"Could not create new image file, exception {e.Message}";
+
                 return false;
             }
 
             IsWriting    = true;
             ErrorMessage = null;
+
             return true;
         }
 
         public bool WriteMediaTag(byte[] data, MediaTagType tag)
         {
             ErrorMessage = "Unsupported feature";
+
             return false;
         }
 
@@ -92,25 +105,29 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Tried to write on a non-writable image";
+
                 return false;
             }
 
             if(data.Length != imageInfo.SectorSize)
             {
                 ErrorMessage = "Incorrect data size";
+
                 return false;
             }
 
             if(sectorAddress >= imageInfo.Sectors)
             {
                 ErrorMessage = "Tried to write past image size";
+
                 return false;
             }
 
-            writingStream.Seek((long)(0x40 + sectorAddress * imageInfo.SectorSize), SeekOrigin.Begin);
+            writingStream.Seek((long)(0x40 + (sectorAddress * imageInfo.SectorSize)), SeekOrigin.Begin);
             writingStream.Write(data, 0, data.Length);
 
             ErrorMessage = "";
+
             return true;
         }
 
@@ -119,37 +136,43 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Tried to write on a non-writable image";
+
                 return false;
             }
 
             if(data.Length % imageInfo.SectorSize != 0)
             {
                 ErrorMessage = "Incorrect data size";
+
                 return false;
             }
 
             if(sectorAddress + length > imageInfo.Sectors)
             {
                 ErrorMessage = "Tried to write past image size";
+
                 return false;
             }
 
-            writingStream.Seek((long)(0x40 + sectorAddress * imageInfo.SectorSize), SeekOrigin.Begin);
+            writingStream.Seek((long)(0x40 + (sectorAddress * imageInfo.SectorSize)), SeekOrigin.Begin);
             writingStream.Write(data, 0, data.Length);
 
             ErrorMessage = "";
+
             return true;
         }
 
         public bool WriteSectorLong(byte[] data, ulong sectorAddress)
         {
             ErrorMessage = "Writing sectors with tags is not supported.";
+
             return false;
         }
 
         public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
         {
             ErrorMessage = "Writing sectors with tags is not supported.";
+
             return false;
         }
 
@@ -158,29 +181,27 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Image is not opened for writing";
+
                 return false;
             }
 
-            writingStream.Seek(0x40 + 17 * 16 * 256, SeekOrigin.Begin);
+            writingStream.Seek(0x40 + (17 * 16 * 256), SeekOrigin.Begin);
             byte[] tmp = new byte[256];
             writingStream.Read(tmp, 0, tmp.Length);
+
             bool isDos = tmp[0x01] == 17 && tmp[0x02] < 16 && tmp[0x27] <= 122 && tmp[0x34] == 35 && tmp[0x35] == 16 &&
                          tmp[0x36] == 0  && tmp[0x37] == 1;
 
             imageHeader = new A2ImgHeader
             {
-                Blocks     = (uint)(imageInfo.Sectors * imageInfo.SectorSize) / 512,
-                Creator    = CREATOR_AARU,
+                Blocks     = (uint)(imageInfo.Sectors * imageInfo.SectorSize) / 512, Creator = CREATOR_AARU,
                 DataOffset = 0x40,
-                DataSize   = (uint)(imageInfo.Sectors * imageInfo.SectorSize),
-                Flags =
-                    (uint)(imageInfo.LastMediaSequence != 0
-                               ? VALID_VOLUME_NUMBER + (imageInfo.MediaSequence & 0xFF)
-                               : 0),
-                HeaderSize  = 0x40,
-                ImageFormat = isDos ? SectorOrder.Dos : SectorOrder.ProDos,
-                Magic       = MAGIC,
-                Version     = 1
+                DataSize =
+                    (uint)(imageInfo.Sectors * imageInfo.SectorSize),
+                Flags = (uint)(imageInfo.LastMediaSequence != 0 ? VALID_VOLUME_NUMBER + (imageInfo.MediaSequence & 0xFF)
+                                   : 0),
+                HeaderSize = 0x40, ImageFormat = isDos ? SectorOrder.Dos : SectorOrder.ProDos, Magic = MAGIC,
+                Version    = 1
             };
 
             if(!string.IsNullOrEmpty(imageInfo.Comments))
@@ -207,6 +228,7 @@ namespace Aaru.DiscImages
 
             IsWriting    = false;
             ErrorMessage = "";
+
             return true;
         }
 
@@ -215,6 +237,7 @@ namespace Aaru.DiscImages
             imageInfo.Comments          = metadata.Comments;
             imageInfo.LastMediaSequence = metadata.LastMediaSequence;
             imageInfo.MediaSequence     = metadata.MediaSequence;
+
             return true;
         }
 
@@ -223,12 +246,14 @@ namespace Aaru.DiscImages
         public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
         {
             ErrorMessage = "Writing sectors with tags is not supported.";
+
             return false;
         }
 
         public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
         {
             ErrorMessage = "Writing sectors with tags is not supported.";
+
             return false;
         }
 
diff --git a/Aaru.Images/AppleDOS/AppleDOS.cs b/Aaru.Images/AppleDOS/AppleDOS.cs
index 20e27b7cb..27bb9f34b 100644
--- a/Aaru.Images/AppleDOS/AppleDOS.cs
+++ b/Aaru.Images/AppleDOS/AppleDOS.cs
@@ -45,31 +45,18 @@ namespace Aaru.DiscImages
         ImageInfo  imageInfo;
         FileStream writingStream;
 
-        public AppleDos()
+        public AppleDos() => imageInfo = new ImageInfo
         {
-            imageInfo = new ImageInfo
-            {
-                ReadableSectorTags    = new List<SectorTagType>(),
-                ReadableMediaTags     = new List<MediaTagType>(),
-                HasPartitions         = false,
-                HasSessions           = false,
-                Version               = null,
-                Application           = null,
-                ApplicationVersion    = null,
-                Creator               = null,
-                Comments              = null,
-                MediaManufacturer     = null,
-                MediaModel            = null,
-                MediaSerialNumber     = null,
-                MediaBarcode          = null,
-                MediaPartNumber       = null,
-                MediaSequence         = 0,
-                LastMediaSequence     = 0,
-                DriveManufacturer     = null,
-                DriveModel            = null,
-                DriveSerialNumber     = null,
-                DriveFirmwareRevision = null
-            };
-        }
+            ReadableSectorTags = new List<SectorTagType>(), ReadableMediaTags = new List<MediaTagType>(),
+            HasPartitions      = false, HasSessions                           = false, Version = null,
+            Application        = null,
+            ApplicationVersion = null, Creator = null, Comments = null,
+            MediaManufacturer  = null,
+            MediaModel         = null, MediaSerialNumber = null, MediaBarcode = null,
+            MediaPartNumber    = null,
+            MediaSequence      = 0, LastMediaSequence = 0, DriveManufacturer = null,
+            DriveModel         = null,
+            DriveSerialNumber  = null, DriveFirmwareRevision = null
+        };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/AppleDOS/Constants.cs b/Aaru.Images/AppleDOS/Constants.cs
index 12ae981b5..eddf04cdb 100644
--- a/Aaru.Images/AppleDOS/Constants.cs
+++ b/Aaru.Images/AppleDOS/Constants.cs
@@ -34,7 +34,13 @@ namespace Aaru.DiscImages
 {
     public partial class AppleDos
     {
-        readonly int[] deinterleave = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15};
-        readonly int[] interleave   = {0, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 15};
+        readonly int[] deinterleave =
+        {
+            0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
+        };
+        readonly int[] interleave =
+        {
+            0, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 15
+        };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/AppleDOS/Properties.cs b/Aaru.Images/AppleDOS/Properties.cs
index 3c49a0d19..48a40069d 100644
--- a/Aaru.Images/AppleDOS/Properties.cs
+++ b/Aaru.Images/AppleDOS/Properties.cs
@@ -46,20 +46,27 @@ namespace Aaru.DiscImages
         public string Name   => "Apple ][ Interleaved Disk Image";
         public Guid   Id     => new Guid("A5828AC0-62C9-4304-81D4-EFD4AAE47360");
         public string Author => "Natalia Portillo";
-        public string Format =>
-            extension == ".po"
-                ? "Apple ][ Interleaved Disk Image (ProDOS order)"
-                : "Apple ][ Interleaved Disk Image (DOS order)";
+        public string Format => extension == ".po" ? "Apple ][ Interleaved Disk Image (ProDOS order)"
+                                    : "Apple ][ Interleaved Disk Image (DOS order)";
 
-        public List<DumpHardwareType>     DumpHardware        => null;
-        public CICMMetadataType           CicmMetadata        => null;
-        public IEnumerable<MediaTagType>  SupportedMediaTags  => new MediaTagType[] { };
-        public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[] { };
-        public IEnumerable<MediaType>     SupportedMediaTypes => new[] {MediaType.Apple33SS};
+        public List<DumpHardwareType> DumpHardware => null;
+        public CICMMetadataType       CicmMetadata => null;
+        public IEnumerable<MediaTagType> SupportedMediaTags => new MediaTagType[]
+            {};
+        public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[]
+            {};
+        public IEnumerable<MediaType> SupportedMediaTypes => new[]
+        {
+            MediaType.Apple33SS
+        };
         public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
-            new (string name, Type type, string description, object @default)[] { };
-        public IEnumerable<string> KnownExtensions => new[] {".do", ".po"};
-        public bool                IsWriting       { get; private set; }
-        public string              ErrorMessage    { get; private set; }
+            new (string name, Type type, string description, object @default)[]
+                {};
+        public IEnumerable<string> KnownExtensions => new[]
+        {
+            ".do", ".po"
+        };
+        public bool   IsWriting    { get; private set; }
+        public string ErrorMessage { get; private set; }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/AppleDOS/Read.cs b/Aaru.Images/AppleDOS/Read.cs
index 19212a5f5..351de6c08 100644
--- a/Aaru.Images/AppleDOS/Read.cs
+++ b/Aaru.Images/AppleDOS/Read.cs
@@ -66,7 +66,8 @@ namespace Aaru.DiscImages
             for(int t = 0; t < 35; t++)
             {
                 for(int s = 0; s < 16; s++)
-                    Array.Copy(tmp, t * 16 * 256 + s * 256, deinterleaved, t * 16 * 256 + offsets[s] * 256, 256);
+                    Array.Copy(tmp, (t * 16 * 256) + (s * 256), deinterleaved, (t * 16 * 256) + (offsets[s] * 256),
+                               256);
             }
 
             imageInfo.SectorSize           = 256;
diff --git a/Aaru.Images/AppleDOS/Write.cs b/Aaru.Images/AppleDOS/Write.cs
index a3ae6c325..5e27cce44 100644
--- a/Aaru.Images/AppleDOS/Write.cs
+++ b/Aaru.Images/AppleDOS/Write.cs
@@ -43,32 +43,42 @@ namespace Aaru.DiscImages
     public partial class AppleDos
     {
         public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
-                           uint   sectorSize)
+                           uint sectorSize)
         {
             if(sectorSize != 256)
             {
                 ErrorMessage = "Unsupported sector size";
+
                 return false;
             }
 
             if(mediaType != MediaType.Apple33SS)
             {
                 ErrorMessage = $"Unsupport media format {mediaType}";
+
                 return false;
             }
 
             if(sectors > uint.MaxValue)
             {
                 ErrorMessage = "Too many sectors";
+
                 return false;
             }
 
-            imageInfo = new ImageInfo {MediaType = mediaType, SectorSize = sectorSize, Sectors = sectors};
+            imageInfo = new ImageInfo
+            {
+                MediaType = mediaType, SectorSize = sectorSize, Sectors = sectors
+            };
 
-            try { writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None); }
+            try
+            {
+                writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
+            }
             catch(IOException e)
             {
                 ErrorMessage = $"Could not create new image file, exception {e.Message}";
+
                 return false;
             }
 
@@ -77,12 +87,14 @@ namespace Aaru.DiscImages
 
             IsWriting    = true;
             ErrorMessage = null;
+
             return true;
         }
 
         public bool WriteMediaTag(byte[] data, MediaTagType tag)
         {
             ErrorMessage = "Unsupported feature";
+
             return false;
         }
 
@@ -93,36 +105,42 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Tried to write on a non-writable image";
+
                 return false;
             }
 
             if(data.Length % imageInfo.SectorSize != 0)
             {
                 ErrorMessage = "Incorrect data size";
+
                 return false;
             }
 
             if(sectorAddress + length > imageInfo.Sectors)
             {
                 ErrorMessage = "Tried to write past image size";
+
                 return false;
             }
 
             Array.Copy(data, 0, deinterleaved, (int)(sectorAddress * imageInfo.SectorSize), data.Length);
 
             ErrorMessage = "";
+
             return true;
         }
 
         public bool WriteSectorLong(byte[] data, ulong sectorAddress)
         {
             ErrorMessage = "Writing sectors with tags is not supported.";
+
             return false;
         }
 
         public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
         {
             ErrorMessage = "Writing sectors with tags is not supported.";
+
             return false;
         }
 
@@ -131,6 +149,7 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Image is not opened for writing";
+
                 return false;
             }
 
@@ -153,7 +172,8 @@ namespace Aaru.DiscImages
             for(int t = 0; t < 35; t++)
             {
                 for(int s = 0; s < 16; s++)
-                    Array.Copy(deinterleaved, t * 16 * 256 + offsets[s] * 256, tmp, t * 16 * 256 + s * 256, 256);
+                    Array.Copy(deinterleaved, (t * 16 * 256) + (offsets[s] * 256), tmp, (t * 16 * 256) + (s * 256),
+                               256);
             }
 
             writingStream.Seek(0, SeekOrigin.Begin);
@@ -164,6 +184,7 @@ namespace Aaru.DiscImages
 
             IsWriting    = false;
             ErrorMessage = "";
+
             return true;
         }
 
@@ -174,12 +195,14 @@ namespace Aaru.DiscImages
         public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
         {
             ErrorMessage = "Writing sectors with tags is not supported.";
+
             return false;
         }
 
         public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
         {
             ErrorMessage = "Writing sectors with tags is not supported.";
+
             return false;
         }
 
diff --git a/Aaru.Images/AppleNIB/AppleNIB.cs b/Aaru.Images/AppleNIB/AppleNIB.cs
index f3001cf33..aec6e2f9e 100644
--- a/Aaru.Images/AppleNIB/AppleNIB.cs
+++ b/Aaru.Images/AppleNIB/AppleNIB.cs
@@ -45,31 +45,18 @@ namespace Aaru.DiscImages
         ImageInfo                 imageInfo;
         Dictionary<ulong, byte[]> longSectors;
 
-        public AppleNib()
+        public AppleNib() => imageInfo = new ImageInfo
         {
-            imageInfo = new ImageInfo
-            {
-                ReadableSectorTags    = new List<SectorTagType>(),
-                ReadableMediaTags     = new List<MediaTagType>(),
-                HasPartitions         = false,
-                HasSessions           = false,
-                Version               = null,
-                Application           = null,
-                ApplicationVersion    = null,
-                Creator               = null,
-                Comments              = null,
-                MediaManufacturer     = null,
-                MediaModel            = null,
-                MediaSerialNumber     = null,
-                MediaBarcode          = null,
-                MediaPartNumber       = null,
-                MediaSequence         = 0,
-                LastMediaSequence     = 0,
-                DriveManufacturer     = null,
-                DriveModel            = null,
-                DriveSerialNumber     = null,
-                DriveFirmwareRevision = null
-            };
-        }
+            ReadableSectorTags = new List<SectorTagType>(), ReadableMediaTags = new List<MediaTagType>(),
+            HasPartitions      = false, HasSessions                           = false, Version = null,
+            Application        = null,
+            ApplicationVersion = null, Creator = null, Comments = null,
+            MediaManufacturer  = null,
+            MediaModel         = null, MediaSerialNumber = null, MediaBarcode = null,
+            MediaPartNumber    = null,
+            MediaSequence      = 0, LastMediaSequence = 0, DriveManufacturer = null,
+            DriveModel         = null,
+            DriveSerialNumber  = null, DriveFirmwareRevision = null
+        };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/AppleNIB/Constants.cs b/Aaru.Images/AppleNIB/Constants.cs
index 1a1800e76..8d06b2fb2 100644
--- a/Aaru.Images/AppleNIB/Constants.cs
+++ b/Aaru.Images/AppleNIB/Constants.cs
@@ -34,21 +34,50 @@ namespace Aaru.DiscImages
 {
     public partial class AppleNib
     {
-        readonly byte[]  apple3_sign = {0x8D, 0xD0, 0x03, 0x4C, 0xC7, 0xA4};
-        readonly byte[]  cpm_sign    = {0xA2, 0x55, 0xA9, 0x00, 0x9D, 0x00, 0x0D, 0xCA};
-        readonly byte[]  dos_sign    = {0xA2, 0x02, 0x8E, 0x52};
-        readonly ulong[] dosSkewing  = {0, 7, 14, 6, 13, 5, 12, 4, 11, 3, 10, 2, 9, 1, 8, 15};
+        readonly byte[] apple3_sign =
+        {
+            0x8D, 0xD0, 0x03, 0x4C, 0xC7, 0xA4
+        };
+        readonly byte[] cpm_sign =
+        {
+            0xA2, 0x55, 0xA9, 0x00, 0x9D, 0x00, 0x0D, 0xCA
+        };
+        readonly byte[] dos_sign =
+        {
+            0xA2, 0x02, 0x8E, 0x52
+        };
+        readonly ulong[] dosSkewing =
+        {
+            0, 7, 14, 6, 13, 5, 12, 4, 11, 3, 10, 2, 9, 1, 8, 15
+        };
         readonly byte[] dri_string =
         {
-            0x43, 0x4F, 0x50, 0x59, 0x52, 0x49, 0x47, 0x48, 0x54, 0x20, 0x28, 0x43, 0x29, 0x20, 0x31, 0x39, 0x37,
-            0x39, 0x2C, 0x20, 0x44, 0x49, 0x47, 0x49, 0x54, 0x41, 0x4C, 0x20, 0x52, 0x45, 0x53, 0x45, 0x41, 0x52,
-            0x43, 0x48
+            0x43, 0x4F, 0x50, 0x59, 0x52, 0x49, 0x47, 0x48, 0x54, 0x20, 0x28, 0x43, 0x29, 0x20, 0x31, 0x39, 0x37, 0x39,
+            0x2C, 0x20, 0x44, 0x49, 0x47, 0x49, 0x54, 0x41, 0x4C, 0x20, 0x52, 0x45, 0x53, 0x45, 0x41, 0x52, 0x43, 0x48
+        };
+        readonly byte[] pascal_sign =
+        {
+            0x08, 0xA5, 0x0F, 0x29
+        };
+        readonly byte[] pascal_string =
+        {
+            0x53, 0x59, 0x53, 0x54, 0x45, 0x2E, 0x41, 0x50, 0x50, 0x4C, 0x45
+        };
+        readonly byte[] pascal2_sign =
+        {
+            0xFF, 0xA2, 0x00, 0x8E
+        };
+        readonly byte[] prodos_string =
+        {
+            0x50, 0x52, 0x4F, 0x44, 0x4F, 0x53
+        };
+        readonly ulong[] proDosSkewing =
+        {
+            0, 8, 1, 9, 2, 10, 3, 11, 4, 12, 5, 13, 6, 14, 7, 15
+        };
+        readonly byte[] sos_sign =
+        {
+            0xC9, 0x20, 0xF0, 0x3E
         };
-        readonly byte[]  pascal_sign   = {0x08, 0xA5, 0x0F, 0x29};
-        readonly byte[]  pascal_string = {0x53, 0x59, 0x53, 0x54, 0x45, 0x2E, 0x41, 0x50, 0x50, 0x4C, 0x45};
-        readonly byte[]  pascal2_sign  = {0xFF, 0xA2, 0x00, 0x8E};
-        readonly byte[]  prodos_string = {0x50, 0x52, 0x4F, 0x44, 0x4F, 0x53};
-        readonly ulong[] proDosSkewing = {0, 8, 1, 9, 2, 10, 3, 11, 4, 12, 5, 13, 6, 14, 7, 15};
-        readonly byte[]  sos_sign      = {0xC9, 0x20, 0xF0, 0x3E};
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/AppleNIB/Identify.cs b/Aaru.Images/AppleNIB/Identify.cs
index 35f08d6ae..5883e4d83 100644
--- a/Aaru.Images/AppleNIB/Identify.cs
+++ b/Aaru.Images/AppleNIB/Identify.cs
@@ -43,7 +43,8 @@ namespace Aaru.DiscImages
             Stream stream = imageFilter.GetDataForkStream();
             stream.Seek(0, SeekOrigin.Begin);
 
-            if(stream.Length < 512) return false;
+            if(stream.Length < 512)
+                return false;
 
             byte[] test = new byte[512];
             stream.Read(test, 0, 512);
diff --git a/Aaru.Images/AppleNIB/Read.cs b/Aaru.Images/AppleNIB/Read.cs
index 0ced06f37..82aaadca7 100644
--- a/Aaru.Images/AppleNIB/Read.cs
+++ b/Aaru.Images/AppleNIB/Read.cs
@@ -50,7 +50,8 @@ namespace Aaru.DiscImages
             Stream stream = imageFilter.GetDataForkStream();
             stream.Seek(0, SeekOrigin.Begin);
 
-            if(stream.Length < 512) return false;
+            if(stream.Length < 512)
+                return false;
 
             byte[] buffer = new byte[stream.Length];
             stream.Read(buffer, 0, buffer.Length);
@@ -63,10 +64,12 @@ namespace Aaru.DiscImages
 
             int  spt            = 0;
             bool allTracksEqual = true;
+
             for(int i = 1; i < tracks.Count; i++)
                 allTracksEqual &= tracks[i - 1].sectors.Length == tracks[i].sectors.Length;
 
-            if(allTracksEqual) spt = tracks[0].sectors.Length;
+            if(allTracksEqual)
+                spt = tracks[0].sectors.Length;
 
             bool    skewed  = spt == 16;
             ulong[] skewing = proDosSkewing;
@@ -75,20 +78,26 @@ namespace Aaru.DiscImages
             if(skewed)
                 foreach(Apple2.RawSector sector in tracks[17].sectors)
                 {
-                    if(!sector.addressField.sector.SequenceEqual(new byte[] {170, 170})) continue;
+                    if(!sector.addressField.sector.SequenceEqual(new byte[]
+                    {
+                        170, 170
+                    }))
+                        continue;
 
                     byte[] sector0 = Apple2.DecodeSector(sector);
 
-                    if(sector0 == null) continue;
+                    if(sector0 == null)
+                        continue;
 
                     bool isDos = sector0[0x01] == 17 && sector0[0x02] < 16  && sector0[0x27] <= 122 &&
                                  sector0[0x34] == 35 && sector0[0x35] == 16 && sector0[0x36] == 0   &&
                                  sector0[0x37] == 1;
 
-                    if(isDos) skewing = dosSkewing;
+                    if(isDos)
+                        skewing = dosSkewing;
 
                     AaruConsole.DebugWriteLine("Apple NIB Plugin", "Using {0}DOS skewing",
-                                              skewing.SequenceEqual(dosSkewing) ? "" : "Pro");
+                                               skewing.SequenceEqual(dosSkewing) ? "" : "Pro");
                 }
 
             for(int i = 0; i < tracks.Count; i++)
@@ -97,9 +106,11 @@ namespace Aaru.DiscImages
                     {
                         ulong sectorNo = (ulong)((((sector.addressField.sector[0] & 0x55) << 1) |
                                                   (sector.addressField.sector[1] & 0x55)) & 0xFF);
+
                         AaruConsole.DebugWriteLine("Apple NIB Plugin",
-                                                  "Hardware sector {0} of track {1} goes to logical sector {2}",
-                                                  sectorNo, i, skewing[sectorNo] + (ulong)(i * spt));
+                                                   "Hardware sector {0} of track {1} goes to logical sector {2}",
+                                                   sectorNo, i, skewing[sectorNo] + (ulong)(i * spt));
+
                         rawSectors.Add(skewing[sectorNo] + (ulong)(i * spt), sector);
                         imageInfo.Sectors++;
                     }
@@ -131,23 +142,31 @@ namespace Aaru.DiscImages
             imageInfo.CreationTime         = imageFilter.GetCreationTime();
             imageInfo.LastModificationTime = imageFilter.GetLastWriteTime();
             imageInfo.MediaTitle           = Path.GetFileNameWithoutExtension(imageFilter.GetFilename());
-            if(imageInfo.Sectors      == 455) imageInfo.MediaType = MediaType.Apple32SS;
-            else if(imageInfo.Sectors == 560) imageInfo.MediaType = MediaType.Apple33SS;
-            else imageInfo.MediaType                              = MediaType.Unknown;
+
+            if(imageInfo.Sectors == 455)
+                imageInfo.MediaType = MediaType.Apple32SS;
+            else if(imageInfo.Sectors == 560)
+                imageInfo.MediaType = MediaType.Apple33SS;
+            else
+                imageInfo.MediaType = MediaType.Unknown;
+
             imageInfo.SectorSize   = 256;
             imageInfo.XmlMediaType = XmlMediaType.BlockMedia;
             imageInfo.ReadableSectorTags.Add(SectorTagType.FloppyAddressMark);
+
             switch(imageInfo.MediaType)
             {
                 case MediaType.Apple32SS:
                     imageInfo.Cylinders       = 35;
                     imageInfo.Heads           = 1;
                     imageInfo.SectorsPerTrack = 13;
+
                     break;
                 case MediaType.Apple33SS:
                     imageInfo.Cylinders       = 35;
                     imageInfo.Heads           = 1;
                     imageInfo.SectorsPerTrack = 16;
+
                     break;
             }
 
@@ -161,6 +180,7 @@ namespace Aaru.DiscImages
                                                       $"Sector address {sectorAddress} not found");
 
             cookedSectors.TryGetValue(sectorAddress, out byte[] temp);
+
             return temp;
         }
 
@@ -173,7 +193,7 @@ namespace Aaru.DiscImages
             if(sectorAddress + length > imageInfo.Sectors)
                 throw new ArgumentOutOfRangeException(nameof(length), "Requested more sectors than available");
 
-            MemoryStream ms = new MemoryStream();
+            var ms = new MemoryStream();
 
             for(uint i = 0; i < length; i++)
             {
@@ -194,6 +214,7 @@ namespace Aaru.DiscImages
                 throw new FeatureUnsupportedImageException($"Tag {tag} not supported by image format");
 
             addressFields.TryGetValue(sectorAddress, out byte[] temp);
+
             return temp;
         }
 
@@ -209,7 +230,7 @@ namespace Aaru.DiscImages
             if(tag != SectorTagType.FloppyAddressMark)
                 throw new FeatureUnsupportedImageException($"Tag {tag} not supported by image format");
 
-            MemoryStream ms = new MemoryStream();
+            var ms = new MemoryStream();
 
             for(uint i = 0; i < length; i++)
             {
@@ -227,6 +248,7 @@ namespace Aaru.DiscImages
                                                       $"Sector address {sectorAddress} not found");
 
             longSectors.TryGetValue(sectorAddress, out byte[] temp);
+
             return temp;
         }
 
@@ -239,7 +261,7 @@ namespace Aaru.DiscImages
             if(sectorAddress + length > imageInfo.Sectors)
                 throw new ArgumentOutOfRangeException(nameof(length), "Requested more sectors than available");
 
-            MemoryStream ms = new MemoryStream();
+            var ms = new MemoryStream();
 
             for(uint i = 0; i < length; i++)
             {
diff --git a/Aaru.Images/Apridisk/Apridisk.cs b/Aaru.Images/Apridisk/Apridisk.cs
index 807451c6d..602f06d5d 100644
--- a/Aaru.Images/Apridisk/Apridisk.cs
+++ b/Aaru.Images/Apridisk/Apridisk.cs
@@ -47,31 +47,18 @@ namespace Aaru.DiscImages
         byte[][][][] sectorsData;
         FileStream   writingStream;
 
-        public Apridisk()
+        public Apridisk() => imageInfo = new ImageInfo
         {
-            imageInfo = new ImageInfo
-            {
-                ReadableSectorTags    = new List<SectorTagType>(),
-                ReadableMediaTags     = new List<MediaTagType>(),
-                HasPartitions         = false,
-                HasSessions           = false,
-                Version               = null,
-                Application           = null,
-                ApplicationVersion    = null,
-                Creator               = null,
-                Comments              = null,
-                MediaManufacturer     = null,
-                MediaModel            = null,
-                MediaSerialNumber     = null,
-                MediaBarcode          = null,
-                MediaPartNumber       = null,
-                MediaSequence         = 0,
-                LastMediaSequence     = 0,
-                DriveManufacturer     = null,
-                DriveModel            = null,
-                DriveSerialNumber     = null,
-                DriveFirmwareRevision = null
-            };
-        }
+            ReadableSectorTags = new List<SectorTagType>(), ReadableMediaTags = new List<MediaTagType>(),
+            HasPartitions      = false, HasSessions                           = false, Version = null,
+            Application        = null,
+            ApplicationVersion = null, Creator = null, Comments = null,
+            MediaManufacturer  = null,
+            MediaModel         = null, MediaSerialNumber = null, MediaBarcode = null,
+            MediaPartNumber    = null,
+            MediaSequence      = 0, LastMediaSequence = 0, DriveManufacturer = null,
+            DriveModel         = null,
+            DriveSerialNumber  = null, DriveFirmwareRevision = null
+        };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/Apridisk/Compression.cs b/Aaru.Images/Apridisk/Compression.cs
index e32822283..d4fc977b3 100644
--- a/Aaru.Images/Apridisk/Compression.cs
+++ b/Aaru.Images/Apridisk/Compression.cs
@@ -39,9 +39,9 @@ namespace Aaru.DiscImages
     {
         static uint Decompress(byte[] compressed, out byte[] decompressed)
         {
-            int          readp  = 0;
-            int          cLen   = compressed.Length;
-            MemoryStream buffer = new MemoryStream();
+            int readp  = 0;
+            int cLen   = compressed.Length;
+            var buffer = new MemoryStream();
 
             uint uLen = 0;
 
@@ -50,7 +50,8 @@ namespace Aaru.DiscImages
                 ushort blklen = BitConverter.ToUInt16(compressed, readp);
                 readp += 2;
 
-                for(int i = 0; i < blklen; i++) buffer.WriteByte(compressed[readp]);
+                for(int i = 0; i < blklen; i++)
+                    buffer.WriteByte(compressed[readp]);
 
                 uLen += blklen;
                 readp++;
@@ -58,6 +59,7 @@ namespace Aaru.DiscImages
             }
 
             decompressed = buffer.ToArray();
+
             return uLen;
         }
     }
diff --git a/Aaru.Images/Apridisk/Constants.cs b/Aaru.Images/Apridisk/Constants.cs
index 7f996ffec..2ee87f556 100644
--- a/Aaru.Images/Apridisk/Constants.cs
+++ b/Aaru.Images/Apridisk/Constants.cs
@@ -36,14 +36,14 @@ namespace Aaru.DiscImages
     {
         readonly byte[] signature =
         {
-            0x41, 0x43, 0x54, 0x20, 0x41, 0x70, 0x72, 0x69, 0x63, 0x6F, 0x74, 0x20, 0x64, 0x69, 0x73, 0x6B, 0x20,
-            0x69, 0x6D, 0x61, 0x67, 0x65, 0x1A, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+            0x41, 0x43, 0x54, 0x20, 0x41, 0x70, 0x72, 0x69, 0x63, 0x6F, 0x74, 0x20, 0x64, 0x69, 0x73, 0x6B, 0x20, 0x69,
+            0x6D, 0x61, 0x67, 0x65, 0x1A, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00
         };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/Apridisk/Enums.cs b/Aaru.Images/Apridisk/Enums.cs
index fa6b4811b..ff14b0db8 100644
--- a/Aaru.Images/Apridisk/Enums.cs
+++ b/Aaru.Images/Apridisk/Enums.cs
@@ -36,16 +36,13 @@ namespace Aaru.DiscImages
     {
         enum RecordType : uint
         {
-            Deleted = 0xE31D0000,
-            Sector  = 0xE31D0001,
-            Comment = 0xE31D0002,
+            Deleted = 0xE31D0000, Sector = 0xE31D0001, Comment = 0xE31D0002,
             Creator = 0xE31D0003
         }
 
         enum CompressType : ushort
         {
-            Uncompresed = 0x9E90,
-            Compressed  = 0x3E5A
+            Uncompresed = 0x9E90, Compressed = 0x3E5A
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/Apridisk/Helpers.cs b/Aaru.Images/Apridisk/Helpers.cs
index 0435c30d9..8d6c14b2d 100644
--- a/Aaru.Images/Apridisk/Helpers.cs
+++ b/Aaru.Images/Apridisk/Helpers.cs
@@ -36,9 +36,9 @@ namespace Aaru.DiscImages
     {
         (ushort cylinder, byte head, byte sector) LbaToChs(ulong lba)
         {
-            ushort cylinder = (ushort)(lba                           / (imageInfo.Heads * imageInfo.SectorsPerTrack));
-            byte   head     = (byte)(lba / imageInfo.SectorsPerTrack % imageInfo.Heads);
-            byte   sector   = (byte)(lba % imageInfo.SectorsPerTrack + 1);
+            ushort cylinder = (ushort)(lba / (imageInfo.Heads * imageInfo.SectorsPerTrack));
+            byte   head     = (byte)((lba                     / imageInfo.SectorsPerTrack) % imageInfo.Heads);
+            byte   sector   = (byte)((lba                     % imageInfo.SectorsPerTrack) + 1);
 
             return (cylinder, head, sector);
         }
diff --git a/Aaru.Images/Apridisk/Identify.cs b/Aaru.Images/Apridisk/Identify.cs
index 097880151..9b31e3d57 100644
--- a/Aaru.Images/Apridisk/Identify.cs
+++ b/Aaru.Images/Apridisk/Identify.cs
@@ -43,7 +43,8 @@ namespace Aaru.DiscImages
             Stream stream = imageFilter.GetDataForkStream();
             stream.Seek(0, SeekOrigin.Begin);
 
-            if(stream.Length < signature.Length) return false;
+            if(stream.Length < signature.Length)
+                return false;
 
             byte[] sigB = new byte[signature.Length];
             stream.Read(sigB, 0, signature.Length);
diff --git a/Aaru.Images/Apridisk/Properties.cs b/Aaru.Images/Apridisk/Properties.cs
index beb94b71f..036758d0e 100644
--- a/Aaru.Images/Apridisk/Properties.cs
+++ b/Aaru.Images/Apridisk/Properties.cs
@@ -51,25 +51,31 @@ namespace Aaru.DiscImages
         public List<DumpHardwareType> DumpHardware => null;
         public CICMMetadataType       CicmMetadata => null;
 
-        public IEnumerable<MediaTagType>  SupportedMediaTags  => new MediaTagType[] { };
-        public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[] { };
+        public IEnumerable<MediaTagType> SupportedMediaTags => new MediaTagType[]
+            {};
+        public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[]
+            {};
+
         // TODO: Test with real hardware to see real supported media
-        public IEnumerable<MediaType> SupportedMediaTypes =>
-            new[]
-            {
-                MediaType.ACORN_35_DS_DD, MediaType.ACORN_35_DS_HD, MediaType.Apricot_35, MediaType.ATARI_35_DS_DD,
-                MediaType.ATARI_35_DS_DD_11, MediaType.ATARI_35_SS_DD, MediaType.ATARI_35_SS_DD_11, MediaType.DMF,
-                MediaType.DMF_82, MediaType.DOS_35_DS_DD_8, MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_ED,
-                MediaType.DOS_35_HD, MediaType.DOS_35_SS_DD_8, MediaType.DOS_35_SS_DD_9, MediaType.DOS_525_DS_DD_8,
-                MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_HD, MediaType.DOS_525_SS_DD_8,
-                MediaType.DOS_525_SS_DD_9, MediaType.FDFORMAT_35_DD, MediaType.FDFORMAT_35_HD,
-                MediaType.FDFORMAT_525_DD, MediaType.FDFORMAT_525_HD, MediaType.RX50, MediaType.XDF_35,
-                MediaType.XDF_525
-            };
-        public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
-            new[] {("compress", typeof(bool), "Enable Apridisk compression.", (object)false)};
-        public IEnumerable<string> KnownExtensions => new[] {".dsk"};
-        public bool                IsWriting       { get; private set; }
-        public string              ErrorMessage    { get; private set; }
+        public IEnumerable<MediaType> SupportedMediaTypes => new[]
+        {
+            MediaType.ACORN_35_DS_DD, MediaType.ACORN_35_DS_HD, MediaType.Apricot_35, MediaType.ATARI_35_DS_DD,
+            MediaType.ATARI_35_DS_DD_11, MediaType.ATARI_35_SS_DD, MediaType.ATARI_35_SS_DD_11, MediaType.DMF,
+            MediaType.DMF_82, MediaType.DOS_35_DS_DD_8, MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_ED,
+            MediaType.DOS_35_HD, MediaType.DOS_35_SS_DD_8, MediaType.DOS_35_SS_DD_9, MediaType.DOS_525_DS_DD_8,
+            MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_HD, MediaType.DOS_525_SS_DD_8, MediaType.DOS_525_SS_DD_9,
+            MediaType.FDFORMAT_35_DD, MediaType.FDFORMAT_35_HD, MediaType.FDFORMAT_525_DD, MediaType.FDFORMAT_525_HD,
+            MediaType.RX50, MediaType.XDF_35, MediaType.XDF_525
+        };
+        public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions => new[]
+        {
+            ("compress", typeof(bool), "Enable Apridisk compression.", (object)false)
+        };
+        public IEnumerable<string> KnownExtensions => new[]
+        {
+            ".dsk"
+        };
+        public bool   IsWriting    { get; private set; }
+        public string ErrorMessage { get; private set; }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/Apridisk/Read.cs b/Aaru.Images/Apridisk/Read.cs
index 4b22abe5e..65e785aca 100644
--- a/Aaru.Images/Apridisk/Read.cs
+++ b/Aaru.Images/Apridisk/Read.cs
@@ -69,7 +69,8 @@ namespace Aaru.DiscImages
                     // Deleted record, just skip it
                     case RecordType.Deleted:
                         AaruConsole.DebugWriteLine("Apridisk plugin", "Found deleted record at {0}", stream.Position);
-                        stream.Seek(record.headerSize - recordSize + record.dataSize, SeekOrigin.Current);
+                        stream.Seek((record.headerSize - recordSize) + record.dataSize, SeekOrigin.Current);
+
                         break;
                     case RecordType.Comment:
                         AaruConsole.DebugWriteLine("Apridisk plugin", "Found comment record at {0}", stream.Position);
@@ -78,6 +79,7 @@ namespace Aaru.DiscImages
                         stream.Read(commentB, 0, commentB.Length);
                         imageInfo.Comments = StringHandlers.CToString(commentB);
                         AaruConsole.DebugWriteLine("Apridisk plugin", "Comment: \"{0}\"", imageInfo.Comments);
+
                         break;
                     case RecordType.Creator:
                         AaruConsole.DebugWriteLine("Apridisk plugin", "Found creator record at {0}", stream.Position);
@@ -86,6 +88,7 @@ namespace Aaru.DiscImages
                         stream.Read(creatorB, 0, creatorB.Length);
                         imageInfo.Creator = StringHandlers.CToString(creatorB);
                         AaruConsole.DebugWriteLine("Apridisk plugin", "Creator: \"{0}\"", imageInfo.Creator);
+
                         break;
                     case RecordType.Sector:
                         if(record.compression != CompressType.Compressed &&
@@ -94,17 +97,22 @@ namespace Aaru.DiscImages
                                 ImageNotSupportedException($"Found record with unknown compression type 0x{(ushort)record.compression:X4} at {stream.Position}");
 
                         AaruConsole.DebugWriteLine("Apridisk plugin",
-                                                  "Found {4} sector record at {0} for cylinder {1} head {2} sector {3}",
-                                                  stream.Position, record.cylinder, record.head, record.sector,
-                                                  record.compression == CompressType.Compressed
-                                                      ? "compressed"
-                                                      : "uncompressed");
+                                                   "Found {4} sector record at {0} for cylinder {1} head {2} sector {3}",
+                                                   stream.Position, record.cylinder, record.head, record.sector,
+                                                   record.compression == CompressType.Compressed ? "compressed"
+                                                       : "uncompressed");
 
-                        if(record.cylinder > totalCylinders) totalCylinders = record.cylinder;
-                        if(record.head     > totalHeads) totalHeads         = record.head;
-                        if(record.sector   > maxSector) maxSector           = record.sector;
+                        if(record.cylinder > totalCylinders)
+                            totalCylinders = record.cylinder;
+
+                        if(record.head > totalHeads)
+                            totalHeads = record.head;
+
+                        if(record.sector > maxSector)
+                            maxSector = record.sector;
+
+                        stream.Seek((record.headerSize - recordSize) + record.dataSize, SeekOrigin.Current);
 
-                        stream.Seek(record.headerSize - recordSize + record.dataSize, SeekOrigin.Current);
                         break;
                     default:
                         throw new
@@ -115,10 +123,12 @@ namespace Aaru.DiscImages
             totalCylinders++;
             totalHeads++;
 
-            if(totalCylinders <= 0 || totalHeads <= 0)
+            if(totalCylinders <= 0 ||
+               totalHeads     <= 0)
                 throw new ImageNotSupportedException("No cylinders or heads found");
 
             sectorsData = new byte[totalCylinders][][][];
+
             // Total sectors per track
             uint[][] spts = new uint[totalCylinders][];
 
@@ -126,8 +136,8 @@ namespace Aaru.DiscImages
             imageInfo.Heads     = (byte)totalHeads;
 
             AaruConsole.DebugWriteLine("Apridisk plugin",
-                                      "Found {0} cylinders and {1} heads with a maximum sector number of {2}",
-                                      totalCylinders, totalHeads, maxSector);
+                                       "Found {0} cylinders and {1} heads with a maximum sector number of {2}",
+                                       totalCylinders, totalHeads, maxSector);
 
             // Create heads
             for(int i = 0; i < totalCylinders; i++)
@@ -135,7 +145,8 @@ namespace Aaru.DiscImages
                 sectorsData[i] = new byte[totalHeads][][];
                 spts[i]        = new uint[totalHeads];
 
-                for(int j = 0; j < totalHeads; j++) sectorsData[i][j] = new byte[maxSector + 1][];
+                for(int j = 0; j < totalHeads; j++)
+                    sectorsData[i][j] = new byte[maxSector + 1][];
             }
 
             imageInfo.SectorSize = uint.MaxValue;
@@ -144,6 +155,7 @@ namespace Aaru.DiscImages
 
             // Read sectors
             stream.Seek(signature.Length, SeekOrigin.Begin);
+
             while(stream.Position < stream.Length)
             {
                 byte[] recB = new byte[recordSize];
@@ -157,8 +169,9 @@ namespace Aaru.DiscImages
                     case RecordType.Deleted:
                     case RecordType.Comment:
                     case RecordType.Creator:
-                        stream.Seek(record.headerSize - recordSize + record.dataSize, SeekOrigin.Current);
+                        stream.Seek((record.headerSize - recordSize) + record.dataSize, SeekOrigin.Current);
                         headersizes += record.headerSize + record.dataSize;
+
                         break;
                     case RecordType.Sector:
                         stream.Seek(record.headerSize - recordSize, SeekOrigin.Current);
@@ -170,11 +183,12 @@ namespace Aaru.DiscImages
                         uint realLength = record.dataSize;
 
                         if(record.compression == CompressType.Compressed)
-                            realLength =
-                                Decompress(data, out sectorsData[record.cylinder][record.head][record.sector]);
-                        else sectorsData[record.cylinder][record.head][record.sector] = data;
+                            realLength = Decompress(data, out sectorsData[record.cylinder][record.head][record.sector]);
+                        else
+                            sectorsData[record.cylinder][record.head][record.sector] = data;
 
-                        if(realLength < imageInfo.SectorSize) imageInfo.SectorSize = realLength;
+                        if(realLength < imageInfo.SectorSize)
+                            imageInfo.SectorSize = realLength;
 
                         headersizes += record.headerSize + record.dataSize;
 
@@ -183,10 +197,11 @@ namespace Aaru.DiscImages
             }
 
             AaruConsole.DebugWriteLine("Apridisk plugin", "Found a minimum of {0} bytes per sector",
-                                      imageInfo.SectorSize);
+                                       imageInfo.SectorSize);
 
             // Count sectors per track
             uint spt = uint.MaxValue;
+
             for(ushort cyl = 0; cyl < imageInfo.Cylinders; cyl++)
             {
                 for(ushort head = 0; head < imageInfo.Heads; head++)
@@ -197,7 +212,7 @@ namespace Aaru.DiscImages
             imageInfo.SectorsPerTrack = spt;
 
             AaruConsole.DebugWriteLine("Apridisk plugin", "Found a minimum of {0} sectors per track",
-                                      imageInfo.SectorsPerTrack);
+                                       imageInfo.SectorsPerTrack);
 
             imageInfo.MediaType = Geometry.GetMediaType(((ushort)imageInfo.Cylinders, (byte)imageInfo.Heads,
                                                          (ushort)imageInfo.SectorsPerTrack, 512, MediaEncoding.MFM,
@@ -237,7 +252,8 @@ namespace Aaru.DiscImages
             if(sectorAddress + length > imageInfo.Sectors)
                 throw new ArgumentOutOfRangeException(nameof(length), "Requested more sectors than available");
 
-            MemoryStream buffer = new MemoryStream();
+            var buffer = new MemoryStream();
+
             for(uint i = 0; i < length; i++)
             {
                 byte[] sector = ReadSector(sectorAddress + i);
diff --git a/Aaru.Images/Apridisk/Write.cs b/Aaru.Images/Apridisk/Write.cs
index 6fccaf28a..0fef0017a 100644
--- a/Aaru.Images/Apridisk/Write.cs
+++ b/Aaru.Images/Apridisk/Write.cs
@@ -46,31 +46,41 @@ namespace Aaru.DiscImages
     public partial class Apridisk
     {
         public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
-                           uint   sectorSize)
+                           uint sectorSize)
         {
             if(!SupportedMediaTypes.Contains(mediaType))
             {
                 ErrorMessage = $"Unsupport media format {mediaType}";
+
                 return false;
             }
 
-            imageInfo = new ImageInfo {MediaType = mediaType, SectorSize = sectorSize, Sectors = sectors};
+            imageInfo = new ImageInfo
+            {
+                MediaType = mediaType, SectorSize = sectorSize, Sectors = sectors
+            };
 
-            try { writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None); }
+            try
+            {
+                writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
+            }
             catch(IOException e)
             {
                 ErrorMessage = $"Could not create new image file, exception {e.Message}";
+
                 return false;
             }
 
             IsWriting    = true;
             ErrorMessage = null;
+
             return true;
         }
 
         public bool WriteMediaTag(byte[] data, MediaTagType tag)
         {
             ErrorMessage = "Writing media tags is not supported.";
+
             return false;
         }
 
@@ -81,18 +91,21 @@ namespace Aaru.DiscImages
             if(cylinder >= sectorsData.Length)
             {
                 ErrorMessage = "Sector address not found";
+
                 return false;
             }
 
             if(head >= sectorsData[cylinder].Length)
             {
                 ErrorMessage = "Sector address not found";
+
                 return false;
             }
 
             if(sector > sectorsData[cylinder][head].Length)
             {
                 ErrorMessage = "Sector address not found";
+
                 return false;
             }
 
@@ -110,18 +123,21 @@ namespace Aaru.DiscImages
                 if(cylinder >= sectorsData.Length)
                 {
                     ErrorMessage = "Sector address not found";
+
                     return false;
                 }
 
                 if(head >= sectorsData[cylinder].Length)
                 {
                     ErrorMessage = "Sector address not found";
+
                     return false;
                 }
 
                 if(sector > sectorsData[cylinder][head].Length)
                 {
                     ErrorMessage = "Sector address not found";
+
                     return false;
                 }
 
@@ -134,12 +150,14 @@ namespace Aaru.DiscImages
         public bool WriteSectorLong(byte[] data, ulong sectorAddress)
         {
             ErrorMessage = "Writing sectors with tags is not supported.";
+
             return false;
         }
 
         public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
         {
             ErrorMessage = "Writing sectors with tags is not supported.";
+
             return false;
         }
 
@@ -157,22 +175,20 @@ namespace Aaru.DiscImages
                 {
                     for(byte s = 0; s < imageInfo.SectorsPerTrack; s++)
                     {
-                        if(sectorsData[c][h][s] == null || sectorsData[c][h][s].Length == 0) continue;
+                        if(sectorsData[c][h][s]        == null ||
+                           sectorsData[c][h][s].Length == 0)
+                            continue;
 
-                        ApridiskRecord record = new ApridiskRecord
+                        var record = new ApridiskRecord
                         {
-                            type        = RecordType.Sector,
-                            compression = CompressType.Uncompresed,
-                            headerSize  = (ushort)Marshal.SizeOf<ApridiskRecord>(),
-                            dataSize    = (uint)sectorsData[c][h][s].Length,
-                            head        = h,
-                            sector      = s,
-                            cylinder    = c
+                            type       = RecordType.Sector, compression = CompressType.Uncompresed,
+                            headerSize = (ushort)Marshal.SizeOf<ApridiskRecord>(),
+                            dataSize   = (uint)sectorsData[c][h][s].Length, head = h, sector = s, cylinder = c
                         };
 
                         MemoryMarshal.Write(hdr, ref record);
 
-                        writingStream.Write(hdr,                  0, hdr.Length);
+                        writingStream.Write(hdr, 0, hdr.Length);
                         writingStream.Write(sectorsData[c][h][s], 0, sectorsData[c][h][s].Length);
                     }
                 }
@@ -181,20 +197,17 @@ namespace Aaru.DiscImages
             if(!string.IsNullOrEmpty(imageInfo.Creator))
             {
                 byte[] creatorBytes = Encoding.UTF8.GetBytes(imageInfo.Creator);
-                ApridiskRecord creatorRecord = new ApridiskRecord
+
+                var creatorRecord = new ApridiskRecord
                 {
-                    type        = RecordType.Creator,
-                    compression = CompressType.Uncompresed,
-                    headerSize  = (ushort)Marshal.SizeOf<ApridiskRecord>(),
-                    dataSize    = (uint)creatorBytes.Length + 1,
-                    head        = 0,
-                    sector      = 0,
-                    cylinder    = 0
+                    type       = RecordType.Creator, compression                    = CompressType.Uncompresed,
+                    headerSize = (ushort)Marshal.SizeOf<ApridiskRecord>(), dataSize = (uint)creatorBytes.Length + 1,
+                    head       = 0, sector                                          = 0, cylinder = 0
                 };
 
                 MemoryMarshal.Write(hdr, ref creatorRecord);
 
-                writingStream.Write(hdr,          0, hdr.Length);
+                writingStream.Write(hdr, 0, hdr.Length);
                 writingStream.Write(creatorBytes, 0, creatorBytes.Length);
                 writingStream.WriteByte(0); // Termination
             }
@@ -202,20 +215,17 @@ namespace Aaru.DiscImages
             if(!string.IsNullOrEmpty(imageInfo.Comments))
             {
                 byte[] commentBytes = Encoding.UTF8.GetBytes(imageInfo.Comments);
-                ApridiskRecord commentRecord = new ApridiskRecord
+
+                var commentRecord = new ApridiskRecord
                 {
-                    type        = RecordType.Comment,
-                    compression = CompressType.Uncompresed,
-                    headerSize  = (ushort)Marshal.SizeOf<ApridiskRecord>(),
-                    dataSize    = (uint)commentBytes.Length + 1,
-                    head        = 0,
-                    sector      = 0,
-                    cylinder    = 0
+                    type       = RecordType.Comment, compression                    = CompressType.Uncompresed,
+                    headerSize = (ushort)Marshal.SizeOf<ApridiskRecord>(), dataSize = (uint)commentBytes.Length + 1,
+                    head       = 0, sector                                          = 0, cylinder = 0
                 };
 
                 MemoryMarshal.Write(hdr, ref commentRecord);
 
-                writingStream.Write(hdr,          0, hdr.Length);
+                writingStream.Write(hdr, 0, hdr.Length);
                 writingStream.Write(commentBytes, 0, commentBytes.Length);
                 writingStream.WriteByte(0); // Termination
             }
@@ -225,6 +235,7 @@ namespace Aaru.DiscImages
 
             IsWriting    = false;
             ErrorMessage = "";
+
             return true;
         }
 
@@ -232,6 +243,7 @@ namespace Aaru.DiscImages
         {
             imageInfo.Comments = metadata.Comments;
             imageInfo.Creator  = metadata.Creator;
+
             return true;
         }
 
@@ -240,26 +252,32 @@ namespace Aaru.DiscImages
             if(cylinders > ushort.MaxValue)
             {
                 ErrorMessage = "Too many cylinders";
+
                 return false;
             }
 
             if(heads > byte.MaxValue)
             {
                 ErrorMessage = "Too many heads";
+
                 return false;
             }
 
             if(sectorsPerTrack > byte.MaxValue)
             {
                 ErrorMessage = "Too many sectors per track";
+
                 return false;
             }
 
             sectorsData = new byte[cylinders][][][];
+
             for(ushort c = 0; c < cylinders; c++)
             {
                 sectorsData[c] = new byte[heads][][];
-                for(byte h = 0; h < heads; h++) sectorsData[c][h] = new byte[sectorsPerTrack][];
+
+                for(byte h = 0; h < heads; h++)
+                    sectorsData[c][h] = new byte[sectorsPerTrack][];
             }
 
             imageInfo.Cylinders       = cylinders;
@@ -272,12 +290,14 @@ namespace Aaru.DiscImages
         public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
         {
             ErrorMessage = "Unsupported feature";
+
             return false;
         }
 
         public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
         {
             ErrorMessage = "Unsupported feature";
+
             return false;
         }
 
diff --git a/Aaru.Images/BLU/BLU.cs b/Aaru.Images/BLU/BLU.cs
index a76544286..0184834eb 100644
--- a/Aaru.Images/BLU/BLU.cs
+++ b/Aaru.Images/BLU/BLU.cs
@@ -46,32 +46,19 @@ namespace Aaru.DiscImages
         ImageInfo  imageInfo;
         FileStream writingStream;
 
-        public Blu()
+        public Blu() => imageInfo = new ImageInfo
         {
-            imageInfo = new ImageInfo
-            {
-                ReadableSectorTags    = new List<SectorTagType>(),
-                ReadableMediaTags     = new List<MediaTagType>(),
-                HasPartitions         = false,
-                HasSessions           = false,
-                Version               = null,
-                Application           = null,
-                ApplicationVersion    = null,
-                Creator               = null,
-                Comments              = null,
-                MediaManufacturer     = null,
-                MediaModel            = null,
-                MediaSerialNumber     = null,
-                MediaBarcode          = null,
-                MediaPartNumber       = null,
-                MediaSequence         = 0,
-                LastMediaSequence     = 0,
-                DriveManufacturer     = null,
-                DriveModel            = null,
-                DriveSerialNumber     = null,
-                DriveFirmwareRevision = null
-            };
-        }
+            ReadableSectorTags = new List<SectorTagType>(), ReadableMediaTags = new List<MediaTagType>(),
+            HasPartitions      = false, HasSessions                           = false, Version = null,
+            Application        = null,
+            ApplicationVersion = null, Creator = null, Comments = null,
+            MediaManufacturer  = null,
+            MediaModel         = null, MediaSerialNumber = null, MediaBarcode = null,
+            MediaPartNumber    = null,
+            MediaSequence      = 0, LastMediaSequence = 0, DriveManufacturer = null,
+            DriveModel         = null,
+            DriveSerialNumber  = null, DriveFirmwareRevision = null
+        };
 
         struct BluHeader
         {
diff --git a/Aaru.Images/BLU/Identify.cs b/Aaru.Images/BLU/Identify.cs
index 2916cb24c..e1a947bac 100644
--- a/Aaru.Images/BLU/Identify.cs
+++ b/Aaru.Images/BLU/Identify.cs
@@ -43,12 +43,16 @@ namespace Aaru.DiscImages
             Stream stream = imageFilter.GetDataForkStream();
             stream.Seek(0, SeekOrigin.Begin);
 
-            if(stream.Length < 0x200) return false;
+            if(stream.Length < 0x200)
+                return false;
 
             byte[] header = new byte[0x17];
             stream.Read(header, 0, 0x17);
 
-            BluHeader tmpHdr = new BluHeader {DeviceName = new byte[0x0D]};
+            var tmpHdr = new BluHeader
+            {
+                DeviceName = new byte[0x0D]
+            };
 
             Array.Copy(header, 0, tmpHdr.DeviceName, 0, 0x0D);
             tmpHdr.DeviceType    = BigEndianBitConverter.ToUInt32(header, 0x0C) & 0x00FFFFFF;
diff --git a/Aaru.Images/BLU/Properties.cs b/Aaru.Images/BLU/Properties.cs
index 7fb0f73d5..08249ff63 100644
--- a/Aaru.Images/BLU/Properties.cs
+++ b/Aaru.Images/BLU/Properties.cs
@@ -41,26 +41,33 @@ namespace Aaru.DiscImages
 {
     public partial class Blu
     {
-        public ImageInfo                  Info                => imageInfo;
-        public string                     Name                => "Basic Lisa Utility";
-        public Guid                       Id                  => new Guid("A153E2F8-4235-432D-9A7F-20807B0BCD74");
-        public string                     Author              => "Natalia Portillo";
-        public string                     Format              => "Basic Lisa Utility";
-        public List<DumpHardwareType>     DumpHardware        => null;
-        public CICMMetadataType           CicmMetadata        => null;
-        public IEnumerable<MediaTagType>  SupportedMediaTags  => new MediaTagType[] { };
-        public IEnumerable<SectorTagType> SupportedSectorTags => new[] {SectorTagType.AppleSectorTag};
-        public IEnumerable<MediaType> SupportedMediaTypes =>
-            new[]
-            {
-                MediaType.AppleProfile, MediaType.AppleWidget, MediaType.PriamDataTower, MediaType.GENERIC_HDD,
-                MediaType.Unknown, MediaType.FlashDrive, MediaType.CompactFlash, MediaType.CompactFlashType2,
-                MediaType.PCCardTypeI, MediaType.PCCardTypeII, MediaType.PCCardTypeIII, MediaType.PCCardTypeIV
-            };
+        public ImageInfo              Info         => imageInfo;
+        public string                 Name         => "Basic Lisa Utility";
+        public Guid                   Id           => new Guid("A153E2F8-4235-432D-9A7F-20807B0BCD74");
+        public string                 Author       => "Natalia Portillo";
+        public string                 Format       => "Basic Lisa Utility";
+        public List<DumpHardwareType> DumpHardware => null;
+        public CICMMetadataType       CicmMetadata => null;
+        public IEnumerable<MediaTagType> SupportedMediaTags => new MediaTagType[]
+            {};
+        public IEnumerable<SectorTagType> SupportedSectorTags => new[]
+        {
+            SectorTagType.AppleSectorTag
+        };
+        public IEnumerable<MediaType> SupportedMediaTypes => new[]
+        {
+            MediaType.AppleProfile, MediaType.AppleWidget, MediaType.PriamDataTower, MediaType.GENERIC_HDD,
+            MediaType.Unknown, MediaType.FlashDrive, MediaType.CompactFlash, MediaType.CompactFlashType2,
+            MediaType.PCCardTypeI, MediaType.PCCardTypeII, MediaType.PCCardTypeIII, MediaType.PCCardTypeIV
+        };
         public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
-            new (string name, Type type, string description, object @default)[] { };
-        public IEnumerable<string> KnownExtensions => new[] {".blu"}; // Just invented
-        public bool                IsWriting       { get; private set; }
-        public string              ErrorMessage    { get; private set; }
+            new (string name, Type type, string description, object @default)[]
+                {};
+        public IEnumerable<string> KnownExtensions => new[]
+        {
+            ".blu"
+        }; // Just invented
+        public bool   IsWriting    { get; private set; }
+        public string ErrorMessage { get; private set; }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/BLU/Read.cs b/Aaru.Images/BLU/Read.cs
index 191c082ad..aa6bbcc9a 100644
--- a/Aaru.Images/BLU/Read.cs
+++ b/Aaru.Images/BLU/Read.cs
@@ -47,7 +47,10 @@ namespace Aaru.DiscImages
             Stream stream = imageFilter.GetDataForkStream();
             stream.Seek(0, SeekOrigin.Begin);
 
-            imageHeader = new BluHeader {DeviceName = new byte[0x0D]};
+            imageHeader = new BluHeader
+            {
+                DeviceName = new byte[0x0D]
+            };
 
             byte[] header = new byte[0x17];
             stream.Read(header, 0, 0x17);
@@ -57,16 +60,18 @@ namespace Aaru.DiscImages
             imageHeader.BytesPerBlock = BigEndianBitConverter.ToUInt16(header, 0x15);
 
             AaruConsole.DebugWriteLine("BLU plugin", "ImageHeader.deviceName = \"{0}\"",
-                                      StringHandlers.CToString(imageHeader.DeviceName));
-            AaruConsole.DebugWriteLine("BLU plugin", "ImageHeader.deviceType = {0}",    imageHeader.DeviceType);
-            AaruConsole.DebugWriteLine("BLU plugin", "ImageHeader.deviceBlock = {0}",   imageHeader.DeviceBlocks);
+                                       StringHandlers.CToString(imageHeader.DeviceName));
+
+            AaruConsole.DebugWriteLine("BLU plugin", "ImageHeader.deviceType = {0}", imageHeader.DeviceType);
+            AaruConsole.DebugWriteLine("BLU plugin", "ImageHeader.deviceBlock = {0}", imageHeader.DeviceBlocks);
             AaruConsole.DebugWriteLine("BLU plugin", "ImageHeader.bytesPerBlock = {0}", imageHeader.BytesPerBlock);
 
             for(int i = 0; i < 0xD; i++)
                 if(imageHeader.DeviceName[i] < 0x20)
                     return false;
 
-            if((imageHeader.BytesPerBlock & 0xFE00) != 0x200) return false;
+            if((imageHeader.BytesPerBlock & 0xFE00) != 0x200)
+                return false;
 
             stream.Seek(0, SeekOrigin.Begin);
             header = new byte[imageHeader.BytesPerBlock];
@@ -83,39 +88,45 @@ namespace Aaru.DiscImages
             switch(StringHandlers.CToString(imageHeader.DeviceName))
             {
                 case PROFILE_NAME:
-                    imageInfo.MediaType =
-                        imageInfo.Sectors == 0x2600 ? MediaType.AppleProfile : MediaType.GENERIC_HDD;
+                    imageInfo.MediaType = imageInfo.Sectors == 0x2600 ? MediaType.AppleProfile : MediaType.GENERIC_HDD;
+
                     imageInfo.Cylinders       = 152;
                     imageInfo.Heads           = 4;
                     imageInfo.SectorsPerTrack = 16;
+
                     break;
                 case PROFILE10_NAME:
-                    imageInfo.MediaType =
-                        imageInfo.Sectors == 0x4C00 ? MediaType.AppleProfile : MediaType.GENERIC_HDD;
+                    imageInfo.MediaType = imageInfo.Sectors == 0x4C00 ? MediaType.AppleProfile : MediaType.GENERIC_HDD;
+
                     imageInfo.Cylinders       = 304;
                     imageInfo.Heads           = 4;
                     imageInfo.SectorsPerTrack = 16;
+
                     break;
                 case WIDGET_NAME:
-                    imageInfo.MediaType =
-                        imageInfo.Sectors == 0x4C00 ? MediaType.AppleWidget : MediaType.GENERIC_HDD;
+                    imageInfo.MediaType = imageInfo.Sectors == 0x4C00 ? MediaType.AppleWidget : MediaType.GENERIC_HDD;
+
                     imageInfo.Cylinders       = 304;
                     imageInfo.Heads           = 4;
                     imageInfo.SectorsPerTrack = 16;
+
                     break;
                 case PRIAM_NAME:
                     imageInfo.MediaType =
                         imageInfo.Sectors == 0x022C7C ? MediaType.PriamDataTower : MediaType.GENERIC_HDD;
+
                     // This values are invented...
                     imageInfo.Cylinders       = 419;
                     imageInfo.Heads           = 4;
                     imageInfo.SectorsPerTrack = 85;
+
                     break;
                 default:
                     imageInfo.MediaType       = MediaType.GENERIC_HDD;
                     imageInfo.Cylinders       = (uint)(imageInfo.Sectors / 16 / 63);
                     imageInfo.Heads           = 16;
                     imageInfo.SectorsPerTrack = 63;
+
                     break;
             }
 
@@ -129,7 +140,8 @@ namespace Aaru.DiscImages
 
             imageInfo.XmlMediaType = XmlMediaType.BlockMedia;
 
-            if(bptag > 0) imageInfo.ReadableSectorTags.Add(SectorTagType.AppleSectorTag);
+            if(bptag > 0)
+                imageInfo.ReadableSectorTags.Add(SectorTagType.AppleSectorTag);
 
             AaruConsole.VerboseWriteLine("BLU image contains a disk of type {0}", imageInfo.MediaType);
 
@@ -148,10 +160,10 @@ namespace Aaru.DiscImages
             if(sectorAddress + length > imageInfo.Sectors)
                 throw new ArgumentOutOfRangeException(nameof(length), "Requested more sectors than available");
 
-            MemoryStream buffer = new MemoryStream();
-            int          seek   = 0;
-            int          read   = 0x200;
-            int          skip   = bptag;
+            var buffer = new MemoryStream();
+            int seek   = 0;
+            int read   = 0x200;
+            int skip   = bptag;
 
             Stream stream = bluImageFilter.GetDataForkStream();
             stream.Seek((long)((sectorAddress + 1) * imageHeader.BytesPerBlock), SeekOrigin.Begin);
@@ -173,7 +185,8 @@ namespace Aaru.DiscImages
             if(tag != SectorTagType.AppleSectorTag)
                 throw new FeatureUnsupportedImageException($"Tag {tag} not supported by image format");
 
-            if(bptag == 0) throw new FeatureNotPresentImageException("Disk image does not have tags");
+            if(bptag == 0)
+                throw new FeatureNotPresentImageException("Disk image does not have tags");
 
             if(sectorAddress > imageInfo.Sectors - 1)
                 throw new ArgumentOutOfRangeException(nameof(sectorAddress), "Sector address not found");
@@ -181,10 +194,10 @@ namespace Aaru.DiscImages
             if(sectorAddress + length > imageInfo.Sectors)
                 throw new ArgumentOutOfRangeException(nameof(length), "Requested more sectors than available");
 
-            MemoryStream buffer = new MemoryStream();
-            int          seek   = 0x200;
-            int          read   = bptag;
-            int          skip   = 0;
+            var buffer = new MemoryStream();
+            int seek   = 0x200;
+            int read   = bptag;
+            int skip   = 0;
 
             Stream stream = bluImageFilter.GetDataForkStream();
             stream.Seek((long)((sectorAddress + 1) * imageHeader.BytesPerBlock), SeekOrigin.Begin);
diff --git a/Aaru.Images/BLU/Verify.cs b/Aaru.Images/BLU/Verify.cs
index fa48c3118..b15dd2fcd 100644
--- a/Aaru.Images/BLU/Verify.cs
+++ b/Aaru.Images/BLU/Verify.cs
@@ -39,13 +39,14 @@ namespace Aaru.DiscImages
         // TODO: Check tag checkums
         public bool? VerifySector(ulong sectorAddress) => null;
 
-        public bool? VerifySectors(ulong           sectorAddress, uint length, out List<ulong> failingLbas,
+        public bool? VerifySectors(ulong sectorAddress, uint length, out List<ulong> failingLbas,
                                    out List<ulong> unknownLbas)
         {
             failingLbas = new List<ulong>();
             unknownLbas = new List<ulong>();
 
-            for(ulong i = sectorAddress; i < sectorAddress + length; i++) unknownLbas.Add(i);
+            for(ulong i = sectorAddress; i < sectorAddress + length; i++)
+                unknownLbas.Add(i);
 
             return null;
         }
diff --git a/Aaru.Images/BLU/Write.cs b/Aaru.Images/BLU/Write.cs
index db99765fd..b0e787a49 100644
--- a/Aaru.Images/BLU/Write.cs
+++ b/Aaru.Images/BLU/Write.cs
@@ -47,43 +47,55 @@ namespace Aaru.DiscImages
     public partial class Blu
     {
         public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
-                           uint   sectorSize)
+                           uint sectorSize)
         {
             if(sectorSize != 512)
             {
                 ErrorMessage = "Unsupported sector size";
+
                 return false;
             }
 
             if(sectors > 0xFFFFFF)
             {
                 ErrorMessage = "Too many sectors";
+
                 return false;
             }
 
             if(!SupportedMediaTypes.Contains(mediaType))
             {
                 ErrorMessage = $"Unsupport media format {mediaType}";
+
                 return false;
             }
 
-            imageInfo = new ImageInfo {MediaType = mediaType, SectorSize = sectorSize, Sectors = sectors};
+            imageInfo = new ImageInfo
+            {
+                MediaType = mediaType, SectorSize = sectorSize, Sectors = sectors
+            };
 
-            try { writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None); }
+            try
+            {
+                writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
+            }
             catch(IOException e)
             {
                 ErrorMessage = $"Could not create new image file, exception {e.Message}";
+
                 return false;
             }
 
             IsWriting    = true;
             ErrorMessage = null;
+
             return true;
         }
 
         public bool WriteMediaTag(byte[] data, MediaTagType tag)
         {
             ErrorMessage = "Writing media tags is not supported.";
+
             return false;
         }
 
@@ -94,25 +106,29 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Tried to write on a non-writable image";
+
                 return false;
             }
 
             if(data.Length != 512)
             {
                 ErrorMessage = "Incorrect data size";
+
                 return false;
             }
 
             if(sectorAddress >= imageInfo.Sectors)
             {
                 ErrorMessage = "Tried to write past image size";
+
                 return false;
             }
 
-            writingStream.Seek(longSectorSize + (long)sectorAddress * longSectorSize, SeekOrigin.Begin);
+            writingStream.Seek(longSectorSize + ((long)sectorAddress * longSectorSize), SeekOrigin.Begin);
             writingStream.Write(data, 0, data.Length);
 
             ErrorMessage = "";
+
             return true;
         }
 
@@ -123,25 +139,29 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Tried to write on a non-writable image";
+
                 return false;
             }
 
             if(data.Length % 512 != 0)
             {
                 ErrorMessage = "Incorrect data size";
+
                 return false;
             }
 
             if(sectorAddress + length > imageInfo.Sectors)
             {
                 ErrorMessage = "Tried to write past image size";
+
                 return false;
             }
 
-            writingStream.Seek(longSectorSize + (long)sectorAddress * longSectorSize, SeekOrigin.Begin);
+            writingStream.Seek(longSectorSize + ((long)sectorAddress * longSectorSize), SeekOrigin.Begin);
             writingStream.Write(data, 0, data.Length);
 
             ErrorMessage = "";
+
             return true;
         }
 
@@ -150,12 +170,14 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Tried to write on a non-writable image";
+
                 return false;
             }
 
             if(sectorAddress >= imageInfo.Sectors)
             {
                 ErrorMessage = "Tried to write past image size";
+
                 return false;
             }
 
@@ -171,50 +193,65 @@ namespace Aaru.DiscImages
                     oldTag = new byte[12];
                     Array.Copy(data, 512, oldTag, 0, 12);
                     newTag = LisaTag.DecodeSonyTag(oldTag)?.ToProfile().GetBytes();
+
                     break;
+
                 // Sony tag, convert to Priam
                 case 12 when longSectorSize == 536:
                     oldTag = new byte[12];
                     Array.Copy(data, 512, oldTag, 0, 12);
                     newTag = LisaTag.DecodeSonyTag(oldTag)?.ToPriam().GetBytes();
+
                     break;
+
                 // Profile tag, copy to Profile
                 case 20 when longSectorSize == 532:
                     newTag = new byte[20];
                     Array.Copy(data, 512, newTag, 0, 20);
+
                     break;
+
                 // Profile tag, convert to Priam
                 case 20 when longSectorSize == 536:
                     oldTag = new byte[20];
                     Array.Copy(data, 512, oldTag, 0, 20);
                     newTag = LisaTag.DecodeProfileTag(oldTag)?.ToPriam().GetBytes();
+
                     break;
+
                 // Priam tag, convert to Profile
                 case 24 when longSectorSize == 532:
                     oldTag = new byte[24];
                     Array.Copy(data, 512, oldTag, 0, 24);
                     newTag = LisaTag.DecodePriamTag(oldTag)?.ToProfile().GetBytes();
+
                     break;
+
                 // Priam tag, copy to Priam
                 case 12 when longSectorSize == 536:
                     newTag = new byte[24];
                     Array.Copy(data, 512, newTag, 0, 24);
+
                     break;
                 case 0:
                     newTag = null;
+
                     break;
                 default:
                     ErrorMessage = "Incorrect data size";
+
                     return false;
             }
 
-            if(newTag == null) newTag = new byte[longSectorSize - 512];
+            if(newTag == null)
+                newTag = new byte[longSectorSize - 512];
 
-            writingStream.Seek(longSectorSize + (long)sectorAddress * longSectorSize, SeekOrigin.Begin);
-            writingStream.Write(data,   0, 512);
+            writingStream.Seek(longSectorSize + ((long)sectorAddress * longSectorSize), SeekOrigin.Begin);
+            writingStream.Write(data, 0, 512);
             writingStream.Write(newTag, 0, newTag.Length);
 
             ErrorMessage = "";
+
             return true;
         }
 
@@ -223,12 +260,14 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Tried to write on a non-writable image";
+
                 return false;
             }
 
             if(sectorAddress + length > imageInfo.Sectors)
             {
                 ErrorMessage = "Tried to write past image size";
+
                 return false;
             }
 
@@ -243,6 +282,7 @@ namespace Aaru.DiscImages
                 case 512: break;
                 default:
                     ErrorMessage = "Incorrect data size";
+
                     return false;
             }
 
@@ -256,53 +296,68 @@ namespace Aaru.DiscImages
                     // Sony tag, convert to Profile
                     case 12 when longSectorSize == 532:
                         oldTag = new byte[12];
-                        Array.Copy(data, givenSectorSize * i + 512, oldTag, 0, 12);
+                        Array.Copy(data, (givenSectorSize * i) + 512, oldTag, 0, 12);
                         newTag = LisaTag.DecodeSonyTag(oldTag)?.ToProfile().GetBytes();
+
                         break;
+
                     // Sony tag, convert to Priam
                     case 12 when longSectorSize == 536:
                         oldTag = new byte[12];
-                        Array.Copy(data, givenSectorSize * i + 512, oldTag, 0, 12);
+                        Array.Copy(data, (givenSectorSize * i) + 512, oldTag, 0, 12);
                         newTag = LisaTag.DecodeSonyTag(oldTag)?.ToPriam().GetBytes();
+
                         break;
+
                     // Profile tag, copy to Profile
                     case 20 when longSectorSize == 532:
                         newTag = new byte[20];
-                        Array.Copy(data, givenSectorSize * i + 512, newTag, 0, 20);
+                        Array.Copy(data, (givenSectorSize * i) + 512, newTag, 0, 20);
+
                         break;
+
                     // Profile tag, convert to Priam
                     case 20 when longSectorSize == 536:
                         oldTag = new byte[20];
-                        Array.Copy(data, givenSectorSize * i + 512, oldTag, 0, 20);
+                        Array.Copy(data, (givenSectorSize * i) + 512, oldTag, 0, 20);
                         newTag = LisaTag.DecodeProfileTag(oldTag)?.ToPriam().GetBytes();
+
                         break;
+
                     // Priam tag, convert to Profile
                     case 24 when longSectorSize == 532:
                         oldTag = new byte[24];
-                        Array.Copy(data, givenSectorSize * i + 512, oldTag, 0, 24);
+                        Array.Copy(data, (givenSectorSize * i) + 512, oldTag, 0, 24);
                         newTag = LisaTag.DecodePriamTag(oldTag)?.ToProfile().GetBytes();
+
                         break;
+
                     // Priam tag, copy to Priam
                     case 12 when longSectorSize == 536:
                         newTag = new byte[24];
-                        Array.Copy(data, givenSectorSize * i + 512, newTag, 0, 24);
+                        Array.Copy(data, (givenSectorSize * i) + 512, newTag, 0, 24);
+
                         break;
                     case 0:
                         newTag = null;
+
                         break;
                     default:
                         ErrorMessage = "Incorrect data size";
+
                         return false;
                 }
 
-                if(newTag == null) newTag = new byte[longSectorSize - 512];
+                if(newTag == null)
+                    newTag = new byte[longSectorSize - 512];
 
-                writingStream.Seek(longSectorSize + (long)sectorAddress * longSectorSize, SeekOrigin.Begin);
-                writingStream.Write(data,   (int)(givenSectorSize * i), 512);
-                writingStream.Write(newTag, 0,                          newTag.Length);
+                writingStream.Seek(longSectorSize + ((long)sectorAddress * longSectorSize), SeekOrigin.Begin);
+                writingStream.Write(data, (int)(givenSectorSize          * i), 512);
+                writingStream.Write(newTag, 0, newTag.Length);
             }
 
             ErrorMessage = "";
+
             return true;
         }
 
@@ -311,6 +366,7 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Image is not opened for writing";
+
                 return false;
             }
 
@@ -325,17 +381,21 @@ namespace Aaru.DiscImages
             {
                 case MediaType.AppleProfile when imageInfo.Sectors == 0x4C00:
                     driveName = Encoding.ASCII.GetBytes(PROFILE10_NAME);
+
                     break;
                 case MediaType.AppleWidget when imageInfo.Sectors == 0x4C00:
                     driveType[1] = 0x01;
                     driveName    = Encoding.ASCII.GetBytes(PROFILE10_NAME);
+
                     break;
                 case MediaType.PriamDataTower when imageInfo.Sectors == 0x22C7C:
                     driveType[1] = 0xFF;
                     driveName    = Encoding.ASCII.GetBytes(PRIAM_NAME);
+
                     break;
                 default:
                     driveName = Encoding.ASCII.GetBytes(PROFILE_NAME);
+
                     break;
             }
 
@@ -348,6 +408,7 @@ namespace Aaru.DiscImages
             writingStream.Seek(0x15, SeekOrigin.Begin);
             writingStream.Write(blockSize, 1, 2);
             writingStream.Seek(512, SeekOrigin.Begin);
+
             writingStream.Write(markerTag, 0,
                                 markerTag.Length >= longSectorSize - 512 ? longSectorSize - 512 : markerTag.Length);
 
@@ -356,6 +417,7 @@ namespace Aaru.DiscImages
 
             IsWriting    = false;
             ErrorMessage = "";
+
             return true;
         }
 
@@ -366,12 +428,14 @@ namespace Aaru.DiscImages
         public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
         {
             ErrorMessage = "Unsupported feature";
+
             return false;
         }
 
         public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
         {
             ErrorMessage = "Unsupported feature";
+
             return false;
         }
 
diff --git a/Aaru.Images/BlindWrite4/BlindWrite4.cs b/Aaru.Images/BlindWrite4/BlindWrite4.cs
index 3317aa893..3ddbe0fab 100644
--- a/Aaru.Images/BlindWrite4/BlindWrite4.cs
+++ b/Aaru.Images/BlindWrite4/BlindWrite4.cs
@@ -50,28 +50,16 @@ namespace Aaru.DiscImages
         Dictionary<uint, ulong> offsetmap;
         Dictionary<uint, byte>  trackFlags;
 
-        public BlindWrite4()
+        public BlindWrite4() => imageInfo = new ImageInfo
         {
-            imageInfo = new ImageInfo
-            {
-                ReadableSectorTags    = new List<SectorTagType>(),
-                ReadableMediaTags     = new List<MediaTagType>(),
-                HasPartitions         = true,
-                HasSessions           = true,
-                Version               = null,
-                ApplicationVersion    = null,
-                MediaTitle            = null,
-                Creator               = null,
-                MediaManufacturer     = null,
-                MediaModel            = null,
-                MediaPartNumber       = null,
-                MediaSequence         = 0,
-                LastMediaSequence     = 0,
-                DriveManufacturer     = null,
-                DriveModel            = null,
-                DriveSerialNumber     = null,
-                DriveFirmwareRevision = null
-            };
-        }
+            ReadableSectorTags = new List<SectorTagType>(), ReadableMediaTags = new List<MediaTagType>(),
+            HasPartitions      = true, HasSessions                            = true, Version = null,
+            ApplicationVersion = null,
+            MediaTitle         = null, Creator = null, MediaManufacturer = null,
+            MediaModel         = null,
+            MediaPartNumber    = null, MediaSequence = 0, LastMediaSequence = 0,
+            DriveManufacturer  = null,
+            DriveModel         = null, DriveSerialNumber = null, DriveFirmwareRevision = null
+        };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/BlindWrite4/Constants.cs b/Aaru.Images/BlindWrite4/Constants.cs
index f0b0ad54e..099d212cb 100644
--- a/Aaru.Images/BlindWrite4/Constants.cs
+++ b/Aaru.Images/BlindWrite4/Constants.cs
@@ -37,8 +37,8 @@ namespace Aaru.DiscImages
         /// <summary>"BLINDWRITE TOC FILE"</summary>
         readonly byte[] bw4Signature =
         {
-            0x42, 0x4C, 0x49, 0x4E, 0x44, 0x57, 0x52, 0x49, 0x54, 0x45, 0x20, 0x54, 0x4F, 0x43, 0x20, 0x46, 0x49,
-            0x4C, 0x45
+            0x42, 0x4C, 0x49, 0x4E, 0x44, 0x57, 0x52, 0x49, 0x54, 0x45, 0x20, 0x54, 0x4F, 0x43, 0x20, 0x46, 0x49, 0x4C,
+            0x45
         };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/BlindWrite4/Enums.cs b/Aaru.Images/BlindWrite4/Enums.cs
index 35db5a5b6..c1881fb7d 100644
--- a/Aaru.Images/BlindWrite4/Enums.cs
+++ b/Aaru.Images/BlindWrite4/Enums.cs
@@ -36,9 +36,7 @@ namespace Aaru.DiscImages
     {
         enum Bw4TrackType : byte
         {
-            Audio = 0,
-            Mode1 = 1,
-            Mode2 = 2
+            Audio = 0, Mode1 = 1, Mode2 = 2
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/BlindWrite4/Identify.cs b/Aaru.Images/BlindWrite4/Identify.cs
index a60b506d4..cd706a6f7 100644
--- a/Aaru.Images/BlindWrite4/Identify.cs
+++ b/Aaru.Images/BlindWrite4/Identify.cs
@@ -42,7 +42,9 @@ namespace Aaru.DiscImages
         {
             Stream stream = imageFilter.GetDataForkStream();
             stream.Seek(0, SeekOrigin.Begin);
-            if(stream.Length < 19) return false;
+
+            if(stream.Length < 19)
+                return false;
 
             byte[] signature = new byte[19];
             stream.Read(signature, 0, 19);
diff --git a/Aaru.Images/BlindWrite4/Read.cs b/Aaru.Images/BlindWrite4/Read.cs
index eb70b13b7..06e8d4343 100644
--- a/Aaru.Images/BlindWrite4/Read.cs
+++ b/Aaru.Images/BlindWrite4/Read.cs
@@ -126,7 +126,7 @@ namespace Aaru.DiscImages
             header.Unknown4 = tmpArray;
 
             AaruConsole.DebugWriteLine("BlindWrite4 plugin", "header.signature = {0}",
-                                      StringHandlers.CToString(header.Signature));
+                                       StringHandlers.CToString(header.Signature));
 
             AaruConsole.DebugWriteLine("BlindWrite4 plugin", "header.unknown1 = {0}", header.Unknown1);
             AaruConsole.DebugWriteLine("BlindWrite4 plugin", "header.timestamp = {0}", header.Timestamp);
@@ -142,7 +142,7 @@ namespace Aaru.DiscImages
             AaruConsole.DebugWriteLine("BlindWrite4 plugin", "header.dataFile = {0}", header.DataFile);
 
             AaruConsole.DebugWriteLine("BlindWrite4 plugin", "header.subchannelFileLength = {0}",
-                                      header.SubchannelFileLength);
+                                       header.SubchannelFileLength);
 
             AaruConsole.DebugWriteLine("BlindWrite4 plugin", "header.subchannelFilter = {0}", header.SubchannelFilter);
             AaruConsole.DebugWriteLine("BlindWrite4 plugin", "header.subchannelFile = {0}", header.SubchannelFile);
@@ -323,8 +323,8 @@ namespace Aaru.DiscImages
                 AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.subchannel = {0}", track.subchannel);
 
                 for(int j = 0; j < track.unknown1.Length; j++)
-                    AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unknown1[{1}] = 0x{0:X8}", track.unknown1[j],
-                                              j);
+                    AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unknown1[{1}] = 0x{0:X8}",
+                                               track.unknown1[j], j);
 
                 AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unknown2 = {0}", track.unknown2);
                 AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unknown3 = {0}", track.unknown3);
@@ -347,7 +347,7 @@ namespace Aaru.DiscImages
 
                 for(int j = 0; j < track.unknown13.Length; j++)
                     AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unknown13[{1}] = 0x{0:X8}",
-                                              track.unknown13[j], j);
+                                               track.unknown13[j], j);
 
                 AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.titleLen = {0}", track.titleLen);
                 AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.title = {0}", track.title);
diff --git a/Aaru.Images/BlindWrite4/Verify.cs b/Aaru.Images/BlindWrite4/Verify.cs
index bf7c21750..424786ff2 100644
--- a/Aaru.Images/BlindWrite4/Verify.cs
+++ b/Aaru.Images/BlindWrite4/Verify.cs
@@ -41,10 +41,11 @@ namespace Aaru.DiscImages
         public bool? VerifySector(ulong sectorAddress)
         {
             byte[] buffer = ReadSectorLong(sectorAddress);
+
             return CdChecksums.CheckCdSector(buffer);
         }
 
-        public bool? VerifySectors(ulong           sectorAddress, uint length, out List<ulong> failingLbas,
+        public bool? VerifySectors(ulong sectorAddress, uint length, out List<ulong> failingLbas,
                                    out List<ulong> unknownLbas)
         {
             byte[] buffer = ReadSectorsLong(sectorAddress, length);
@@ -62,19 +63,22 @@ namespace Aaru.DiscImages
                 {
                     case null:
                         unknownLbas.Add((ulong)i + sectorAddress);
+
                         break;
                     case false:
                         failingLbas.Add((ulong)i + sectorAddress);
+
                         break;
                 }
             }
 
-            if(unknownLbas.Count > 0) return null;
+            if(unknownLbas.Count > 0)
+                return null;
 
             return failingLbas.Count <= 0;
         }
 
-        public bool? VerifySectors(ulong           sectorAddress, uint length, uint track, out List<ulong> failingLbas,
+        public bool? VerifySectors(ulong sectorAddress, uint length, uint track, out List<ulong> failingLbas,
                                    out List<ulong> unknownLbas)
         {
             byte[] buffer = ReadSectorsLong(sectorAddress, length, track);
@@ -92,14 +96,17 @@ namespace Aaru.DiscImages
                 {
                     case null:
                         unknownLbas.Add((ulong)i + sectorAddress);
+
                         break;
                     case false:
                         failingLbas.Add((ulong)i + sectorAddress);
+
                         break;
                 }
             }
 
-            if(unknownLbas.Count > 0) return null;
+            if(unknownLbas.Count > 0)
+                return null;
 
             return failingLbas.Count <= 0;
         }
@@ -107,6 +114,7 @@ namespace Aaru.DiscImages
         public bool? VerifySector(ulong sectorAddress, uint track)
         {
             byte[] buffer = ReadSectorLong(sectorAddress, track);
+
             return CdChecksums.CheckCdSector(buffer);
         }
     }
diff --git a/Aaru.Images/BlindWrite5/BlindWrite5.cs b/Aaru.Images/BlindWrite5/BlindWrite5.cs
index e39dafc45..d6f993046 100644
--- a/Aaru.Images/BlindWrite5/BlindWrite5.cs
+++ b/Aaru.Images/BlindWrite5/BlindWrite5.cs
@@ -63,28 +63,16 @@ namespace Aaru.DiscImages
         Dictionary<uint, byte>  trackFlags;
         byte[]                  unkBlock;
 
-        public BlindWrite5()
+        public BlindWrite5() => imageInfo = new ImageInfo
         {
-            imageInfo = new ImageInfo
-            {
-                ReadableSectorTags    = new List<SectorTagType>(),
-                ReadableMediaTags     = new List<MediaTagType>(),
-                HasPartitions         = true,
-                HasSessions           = true,
-                Version               = null,
-                ApplicationVersion    = null,
-                MediaTitle            = null,
-                Creator               = null,
-                MediaManufacturer     = null,
-                MediaModel            = null,
-                MediaPartNumber       = null,
-                MediaSequence         = 0,
-                LastMediaSequence     = 0,
-                DriveManufacturer     = null,
-                DriveModel            = null,
-                DriveSerialNumber     = null,
-                DriveFirmwareRevision = null
-            };
-        }
+            ReadableSectorTags = new List<SectorTagType>(), ReadableMediaTags = new List<MediaTagType>(),
+            HasPartitions      = true, HasSessions                            = true, Version = null,
+            ApplicationVersion = null,
+            MediaTitle         = null, Creator = null, MediaManufacturer = null,
+            MediaModel         = null,
+            MediaPartNumber    = null, MediaSequence = 0, LastMediaSequence = 0,
+            DriveManufacturer  = null,
+            DriveModel         = null, DriveSerialNumber = null, DriveFirmwareRevision = null
+        };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/BlindWrite5/Enums.cs b/Aaru.Images/BlindWrite5/Enums.cs
index 4aef907a7..a4a102e26 100644
--- a/Aaru.Images/BlindWrite5/Enums.cs
+++ b/Aaru.Images/BlindWrite5/Enums.cs
@@ -36,20 +36,14 @@ namespace Aaru.DiscImages
     {
         enum Bw5TrackType : byte
         {
-            NotData = 0,
-            Audio   = 1,
-            Mode1   = 2,
-            Mode2   = 3,
-            Mode2F1 = 4,
-            Mode2F2 = 5,
+            NotData = 0, Audio   = 1, Mode1   = 2,
+            Mode2   = 3, Mode2F1 = 4, Mode2F2 = 5,
             Dvd     = 6
         }
 
         enum Bw5TrackSubchannel : byte
         {
-            None   = 0,
-            Q16    = 2,
-            Linear = 4
+            None = 0, Q16 = 2, Linear = 4
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/BlindWrite5/Identify.cs b/Aaru.Images/BlindWrite5/Identify.cs
index b73ed3ece..d06b13792 100644
--- a/Aaru.Images/BlindWrite5/Identify.cs
+++ b/Aaru.Images/BlindWrite5/Identify.cs
@@ -42,7 +42,9 @@ namespace Aaru.DiscImages
         {
             Stream stream = imageFilter.GetDataForkStream();
             stream.Seek(0, SeekOrigin.Begin);
-            if(stream.Length < 276) return false;
+
+            if(stream.Length < 276)
+                return false;
 
             byte[] signature = new byte[16];
             stream.Read(signature, 0, 16);
diff --git a/Aaru.Images/BlindWrite5/Read.cs b/Aaru.Images/BlindWrite5/Read.cs
index d60f3c9dc..c06d85e97 100644
--- a/Aaru.Images/BlindWrite5/Read.cs
+++ b/Aaru.Images/BlindWrite5/Read.cs
@@ -68,18 +68,18 @@ namespace Aaru.DiscImages
             header = Marshal.ByteArrayToStructureLittleEndian<Bw5Header>(hdr);
 
             AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.signature = {0}",
-                                      StringHandlers.CToString(header.signature));
+                                       StringHandlers.CToString(header.signature));
 
             for(int i = 0; i < header.unknown1.Length; i++)
                 AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.unknown1[{1}] = 0x{0:X8}", header.unknown1[i],
-                                          i);
+                                           i);
 
             AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.profile = {0}", header.profile);
             AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.sessions = {0}", header.sessions);
 
             for(int i = 0; i < header.unknown2.Length; i++)
                 AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.unknown2[{1}] = 0x{0:X8}", header.unknown2[i],
-                                          i);
+                                           i);
 
             AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.mcnIsValid = {0}", header.mcnIsValid);
             AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.mcn = {0}", StringHandlers.CToString(header.mcn));
@@ -87,7 +87,7 @@ namespace Aaru.DiscImages
 
             for(int i = 0; i < header.unknown4.Length; i++)
                 AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.unknown4[{1}] = 0x{0:X8}", header.unknown4[i],
-                                          i);
+                                           i);
 
             AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.pmaLen = {0}", header.pmaLen);
             AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.atipLen = {0}", header.atipLen);
@@ -97,29 +97,29 @@ namespace Aaru.DiscImages
 
             for(int i = 0; i < header.unknown5.Length; i++)
                 AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.unknown5[{1}] = 0x{0:X8}", header.unknown5[i],
-                                          i);
+                                           i);
 
             AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.dvdStrLen = {0}", header.dvdStrLen);
             AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.dvdInfoLen = {0}", header.dvdInfoLen);
 
             for(int i = 0; i < header.unknown6.Length; i++)
                 AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.unknown6[{1}] = 0x{0:X2}", header.unknown6[i],
-                                          i);
+                                           i);
 
             AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.manufacturer = {0}",
-                                      StringHandlers.CToString(header.manufacturer));
+                                       StringHandlers.CToString(header.manufacturer));
 
             AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.product = {0}",
-                                      StringHandlers.CToString(header.product));
+                                       StringHandlers.CToString(header.product));
 
             AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.revision = {0}",
-                                      StringHandlers.CToString(header.revision));
+                                       StringHandlers.CToString(header.revision));
 
             AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.vendor = {0}",
-                                      StringHandlers.CToString(header.vendor));
+                                       StringHandlers.CToString(header.vendor));
 
             AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.volumeId = {0}",
-                                      StringHandlers.CToString(header.volumeId));
+                                       StringHandlers.CToString(header.volumeId));
 
             AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.mode2ALen = {0}", header.mode2ALen);
             AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.unkBlkLen = {0}", header.unkBlkLen);
@@ -137,7 +137,7 @@ namespace Aaru.DiscImages
 
                 if(!(decoded2A is null))
                     AaruConsole.DebugWriteLine("BlindWrite5 plugin", "mode page 2A: {0}",
-                                              Modes.PrettifyModePage_2A(decoded2A));
+                                               Modes.PrettifyModePage_2A(decoded2A));
                 else
                     mode2A = null;
             }
@@ -200,7 +200,7 @@ namespace Aaru.DiscImages
 
                 if(decodedCdText.HasValue)
                     AaruConsole.DebugWriteLine("BlindWrite5 plugin", "CD-Text: {0}",
-                                              CDTextOnLeadIn.Prettify(decodedCdText));
+                                               CDTextOnLeadIn.Prettify(decodedCdText));
                 else
                     cdtext = null;
             }
@@ -264,7 +264,7 @@ namespace Aaru.DiscImages
                 stream.Read(discInformation, 0, discInformation.Length);
 
                 AaruConsole.DebugWriteLine("BlindWrite5 plugin", "Disc information: {0}",
-                                          PrintHex.ByteArrayToHexArrayString(discInformation, 40));
+                                           PrintHex.ByteArrayToHexArrayString(discInformation, 40));
             }
             else
                 discInformation = null;
@@ -323,13 +323,13 @@ namespace Aaru.DiscImages
 
                 for(int i = 0; i < dataFile.Unknown1.Length; i++)
                     AaruConsole.DebugWriteLine("BlindWrite5 plugin", "dataFile.unknown1[{1}] = {0}",
-                                              dataFile.Unknown1[i], i);
+                                               dataFile.Unknown1[i], i);
 
                 AaruConsole.DebugWriteLine("BlindWrite5 plugin", "dataFile.offset = {0}", dataFile.Offset);
 
                 for(int i = 0; i < dataFile.Unknown2.Length; i++)
                     AaruConsole.DebugWriteLine("BlindWrite5 plugin", "dataFile.unknown2[{1}] = {0}",
-                                              dataFile.Unknown2[i], i);
+                                               dataFile.Unknown2[i], i);
 
                 AaruConsole.DebugWriteLine("BlindWrite5 plugin", "dataFile.startLba = {0}", dataFile.StartLba);
                 AaruConsole.DebugWriteLine("BlindWrite5 plugin", "dataFile.sectors = {0}", dataFile.Sectors);
@@ -361,9 +361,10 @@ namespace Aaru.DiscImages
                 AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].end = {1}", ses, session.End);
 
                 AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].firstTrack = {1}", ses,
-                                          session.FirstTrack);
+                                           session.FirstTrack);
 
-                AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].lastTrack = {1}", ses, session.LastTrack);
+                AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].lastTrack = {1}", ses,
+                                           session.LastTrack);
 
                 for(int tSeq = 0; tSeq < session.Entries; tSeq++)
                 {
@@ -380,82 +381,82 @@ namespace Aaru.DiscImages
                     }
 
                     AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].track[{1}].type = {2}", ses, tSeq,
-                                              session.Tracks[tSeq].type);
+                                               session.Tracks[tSeq].type);
 
                     for(int i = 0; i < session.Tracks[tSeq].unknown1.Length; i++)
                         AaruConsole.DebugWriteLine("BlindWrite5 plugin",
-                                                  "session[{0}].track[{1}].unknown1[{2}] = 0x{3:X2}", ses, tSeq, i,
-                                                  session.Tracks[tSeq].unknown1[i]);
+                                                   "session[{0}].track[{1}].unknown1[{2}] = 0x{3:X2}", ses, tSeq, i,
+                                                   session.Tracks[tSeq].unknown1[i]);
 
                     AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].track[{1}].unknown2 = 0x{2:X8}", ses,
-                                              tSeq, session.Tracks[tSeq].unknown2);
+                                               tSeq, session.Tracks[tSeq].unknown2);
 
                     AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].track[{1}].subchannel = {2}", ses,
-                                              tSeq, session.Tracks[tSeq].subchannel);
+                                               tSeq, session.Tracks[tSeq].subchannel);
 
                     AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].track[{1}].unknown3 = 0x{2:X2}", ses,
-                                              tSeq, session.Tracks[tSeq].unknown3);
+                                               tSeq, session.Tracks[tSeq].unknown3);
 
                     AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].track[{1}].ctl = {2}", ses, tSeq,
-                                              session.Tracks[tSeq].ctl);
+                                               session.Tracks[tSeq].ctl);
 
                     AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].track[{1}].adr = {2}", ses, tSeq,
-                                              session.Tracks[tSeq].adr);
+                                               session.Tracks[tSeq].adr);
 
                     AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].track[{1}].point = {2}", ses, tSeq,
-                                              session.Tracks[tSeq].point);
+                                               session.Tracks[tSeq].point);
 
                     AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].track[{1}].unknown4 = 0x{2:X2}", ses,
-                                              tSeq, session.Tracks[tSeq].tno);
+                                               tSeq, session.Tracks[tSeq].tno);
 
                     AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].track[{1}].min = {2}", ses, tSeq,
-                                              session.Tracks[tSeq].min);
+                                               session.Tracks[tSeq].min);
 
                     AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].track[{1}].sec = {2}", ses, tSeq,
-                                              session.Tracks[tSeq].sec);
+                                               session.Tracks[tSeq].sec);
 
                     AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].track[{1}].frame = {2}", ses, tSeq,
-                                              session.Tracks[tSeq].frame);
+                                               session.Tracks[tSeq].frame);
 
                     AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].track[{1}].zero = {2}", ses, tSeq,
-                                              session.Tracks[tSeq].zero);
+                                               session.Tracks[tSeq].zero);
 
                     AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].track[{1}].pmin = {2}", ses, tSeq,
-                                              session.Tracks[tSeq].pmin);
+                                               session.Tracks[tSeq].pmin);
 
                     AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].track[{1}].psec = {2}", ses, tSeq,
-                                              session.Tracks[tSeq].psec);
+                                               session.Tracks[tSeq].psec);
 
                     AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].track[{1}].pframe = {2}", ses, tSeq,
-                                              session.Tracks[tSeq].pframe);
+                                               session.Tracks[tSeq].pframe);
 
                     AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].track[{1}].unknown5 = 0x{2:X2}", ses,
-                                              tSeq, session.Tracks[tSeq].unknown5);
+                                               tSeq, session.Tracks[tSeq].unknown5);
 
                     AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].track[{1}].pregap = {2}", ses, tSeq,
-                                              session.Tracks[tSeq].pregap);
+                                               session.Tracks[tSeq].pregap);
 
                     for(int i = 0; i < session.Tracks[tSeq].unknown6.Length; i++)
                         AaruConsole.DebugWriteLine("BlindWrite5 plugin",
-                                                  "session[{0}].track[{1}].unknown6[{2}] = 0x{3:X8}", ses, tSeq, i,
-                                                  session.Tracks[tSeq].unknown6[i]);
+                                                   "session[{0}].track[{1}].unknown6[{2}] = 0x{3:X8}", ses, tSeq, i,
+                                                   session.Tracks[tSeq].unknown6[i]);
 
-                    AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].track[{1}].startLba = {2}", ses, tSeq,
-                                              session.Tracks[tSeq].startLba);
+                    AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].track[{1}].startLba = {2}", ses,
+                                               tSeq, session.Tracks[tSeq].startLba);
 
                     AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].track[{1}].sectors = {2}", ses, tSeq,
-                                              session.Tracks[tSeq].sectors);
+                                               session.Tracks[tSeq].sectors);
 
                     for(int i = 0; i < session.Tracks[tSeq].unknown7.Length; i++)
                         AaruConsole.DebugWriteLine("BlindWrite5 plugin",
-                                                  "session[{0}].track[{1}].unknown7[{2}] = 0x{3:X8}", ses, tSeq, i,
-                                                  session.Tracks[tSeq].unknown7[i]);
+                                                   "session[{0}].track[{1}].unknown7[{2}] = 0x{3:X8}", ses, tSeq, i,
+                                                   session.Tracks[tSeq].unknown7[i]);
 
                     AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].track[{1}].session = {2}", ses, tSeq,
-                                              session.Tracks[tSeq].session);
+                                               session.Tracks[tSeq].session);
 
                     AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].track[{1}].unknown8 = 0x{2:X4}", ses,
-                                              tSeq, session.Tracks[tSeq].unknown8);
+                                               tSeq, session.Tracks[tSeq].unknown8);
 
                     if(session.Tracks[tSeq].type == Bw5TrackType.Dvd ||
                        session.Tracks[tSeq].type == Bw5TrackType.NotData)
@@ -464,8 +465,8 @@ namespace Aaru.DiscImages
                     {
                         for(int i = 0; i < session.Tracks[tSeq].unknown9.Length; i++)
                             AaruConsole.DebugWriteLine("BlindWrite5 plugin",
-                                                      "session[{0}].track[{1}].unknown9[{2}] = 0x{3:X8}", ses, tSeq, i,
-                                                      session.Tracks[tSeq].unknown9[i]);
+                                                       "session[{0}].track[{1}].unknown9[{2}] = 0x{3:X8}", ses, tSeq, i,
+                                                       session.Tracks[tSeq].unknown9[i]);
                     }
                 }
 
@@ -628,7 +629,7 @@ namespace Aaru.DiscImages
                             break;
                         default:
                             AaruConsole.ErrorWriteLine("BlindWrite5 found unknown subchannel size: {0}",
-                                                      sectorSize - 2352);
+                                                       sectorSize - 2352);
 
                             return false;
                     }
@@ -858,13 +859,17 @@ namespace Aaru.DiscImages
             foreach(Track track in Tracks)
             {
                 AaruConsole.DebugWriteLine("BlindWrite5 plugin", "Partition sequence: {0}", track.TrackSequence);
-                AaruConsole.DebugWriteLine("BlindWrite5 plugin", "\tPartition description: {0}", track.TrackDescription);
+
+                AaruConsole.DebugWriteLine("BlindWrite5 plugin", "\tPartition description: {0}",
+                                           track.TrackDescription);
+
                 AaruConsole.DebugWriteLine("BlindWrite5 plugin", "\tPartition type: {0}", track.TrackType);
 
                 AaruConsole.DebugWriteLine("BlindWrite5 plugin", "\tPartition starting sector: {0}",
-                                          track.TrackStartSector);
+                                           track.TrackStartSector);
 
-                AaruConsole.DebugWriteLine("BlindWrite5 plugin", "\tPartition ending sector: {0}", track.TrackEndSector);
+                AaruConsole.DebugWriteLine("BlindWrite5 plugin", "\tPartition ending sector: {0}",
+                                           track.TrackEndSector);
             }
 
             AaruConsole.DebugWriteLine("BlindWrite5 plugin", "printing partition map");
@@ -1146,28 +1151,28 @@ namespace Aaru.DiscImages
                 case MediaTagType.SCSI_MODEPAGE_2A:
                 {
                     if(mode2A != null)
-                        return(byte[])mode2A.Clone();
+                        return (byte[])mode2A.Clone();
 
                     throw new FeatureNotPresentImageException("Image does not contain SCSI MODE PAGE 2Ah.");
                 }
                 case MediaTagType.CD_PMA:
                 {
                     if(pma != null)
-                        return(byte[])pma.Clone();
+                        return (byte[])pma.Clone();
 
                     throw new FeatureNotPresentImageException("Image does not contain PMA information.");
                 }
                 case MediaTagType.CD_ATIP:
                 {
                     if(atip != null)
-                        return(byte[])atip.Clone();
+                        return (byte[])atip.Clone();
 
                     throw new FeatureNotPresentImageException("Image does not contain ATIP information.");
                 }
                 case MediaTagType.CD_TEXT:
                 {
                     if(cdtext != null)
-                        return(byte[])cdtext.Clone();
+                        return (byte[])cdtext.Clone();
 
                     throw new FeatureNotPresentImageException("Image does not contain CD-Text information.");
                 }
@@ -1175,28 +1180,28 @@ namespace Aaru.DiscImages
                 case MediaTagType.BD_BCA:
                 {
                     if(bca != null)
-                        return(byte[])bca.Clone();
+                        return (byte[])bca.Clone();
 
                     throw new FeatureNotPresentImageException("Image does not contain BCA information.");
                 }
                 case MediaTagType.DVD_PFI:
                 {
                     if(pfi != null)
-                        return(byte[])pfi.Clone();
+                        return (byte[])pfi.Clone();
 
                     throw new FeatureNotPresentImageException("Image does not contain PFI.");
                 }
                 case MediaTagType.DVD_DMI:
                 {
                     if(dmi != null)
-                        return(byte[])dmi.Clone();
+                        return (byte[])dmi.Clone();
 
                     throw new FeatureNotPresentImageException("Image does not contain DMI.");
                 }
                 case MediaTagType.CD_FullTOC:
                 {
                     if(fullToc != null)
-                        return(byte[])fullToc.Clone();
+                        return (byte[])fullToc.Clone();
 
                     throw new FeatureNotPresentImageException("Image does not contain TOC information.");
                 }
@@ -1240,7 +1245,7 @@ namespace Aaru.DiscImages
         {
             // TODO: Cross data files
             var aaruTrack = new Track();
-            var chars    = new DataFileCharacteristics();
+            var chars     = new DataFileCharacteristics();
 
             aaruTrack.TrackSequence = 0;
 
@@ -1379,7 +1384,7 @@ namespace Aaru.DiscImages
         {
             // TODO: Cross data files
             var aaruTrack = new Track();
-            var chars    = new DataFileCharacteristics();
+            var chars     = new DataFileCharacteristics();
 
             aaruTrack.TrackSequence = 0;
 
@@ -1712,7 +1717,7 @@ namespace Aaru.DiscImages
         {
             // TODO: Cross data files
             var aaruTrack = new Track();
-            var chars    = new DataFileCharacteristics();
+            var chars     = new DataFileCharacteristics();
 
             aaruTrack.TrackSequence = 0;
 
diff --git a/Aaru.Images/BlindWrite5/Structs.cs b/Aaru.Images/BlindWrite5/Structs.cs
index 389fb5b26..3871f8305 100644
--- a/Aaru.Images/BlindWrite5/Structs.cs
+++ b/Aaru.Images/BlindWrite5/Structs.cs
@@ -43,46 +43,46 @@ namespace Aaru.DiscImages
         struct Bw5Header
         {
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public byte[] signature;
+            public readonly byte[] signature;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public uint[] unknown1;
-            public ProfileNumber profile;
-            public ushort        sessions;
+            public readonly uint[] unknown1;
+            public readonly ProfileNumber profile;
+            public readonly ushort        sessions;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
-            public uint[] unknown2;
+            public readonly uint[] unknown2;
             [MarshalAs(UnmanagedType.U1, SizeConst = 3)]
-            public bool mcnIsValid;
+            public readonly bool mcnIsValid;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 13)]
-            public byte[] mcn;
-            public ushort unknown3;
+            public readonly byte[] mcn;
+            public readonly ushort unknown3;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
-            public uint[] unknown4;
-            public ushort pmaLen;
-            public ushort atipLen;
-            public ushort cdtLen;
-            public ushort cdInfoLen;
-            public uint   bcaLen;
+            public readonly uint[] unknown4;
+            public readonly ushort pmaLen;
+            public readonly ushort atipLen;
+            public readonly ushort cdtLen;
+            public readonly ushort cdInfoLen;
+            public readonly uint   bcaLen;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
-            public uint[] unknown5;
-            public uint dvdStrLen;
-            public uint dvdInfoLen;
+            public readonly uint[] unknown5;
+            public readonly uint dvdStrLen;
+            public readonly uint dvdInfoLen;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
-            public byte[] unknown6;
+            public readonly byte[] unknown6;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public byte[] manufacturer;
+            public readonly byte[] manufacturer;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public byte[] product;
+            public readonly byte[] product;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
-            public byte[] revision;
+            public readonly byte[] revision;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 20)]
-            public byte[] vendor;
+            public readonly byte[] vendor;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
-            public byte[] volumeId;
-            public uint mode2ALen;
-            public uint unkBlkLen;
-            public uint dataLen;
-            public uint sessionsLen;
-            public uint dpmLen;
+            public readonly byte[] volumeId;
+            public readonly uint mode2ALen;
+            public readonly uint unkBlkLen;
+            public readonly uint dataLen;
+            public readonly uint sessionsLen;
+            public readonly uint dpmLen;
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
@@ -107,36 +107,37 @@ namespace Aaru.DiscImages
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct Bw5TrackDescriptor
         {
-            public Bw5TrackType type;
+            public readonly Bw5TrackType type;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
-            public byte[] unknown1;
-            public uint               unknown2;
-            public Bw5TrackSubchannel subchannel;
-            public byte               unknown3;
-            public byte               ctl;
-            public byte               adr;
-            public byte               point;
-            public byte               tno;
-            public byte               min;
-            public byte               sec;
-            public byte               frame;
-            public byte               zero;
-            public byte               pmin;
-            public byte               psec;
-            public byte               pframe;
-            public byte               unknown5;
-            public uint               pregap;
+            public readonly byte[] unknown1;
+            public readonly uint               unknown2;
+            public readonly Bw5TrackSubchannel subchannel;
+            public readonly byte               unknown3;
+            public readonly byte               ctl;
+            public readonly byte               adr;
+            public readonly byte               point;
+            public readonly byte               tno;
+            public readonly byte               min;
+            public readonly byte               sec;
+            public readonly byte               frame;
+            public readonly byte               zero;
+            public readonly byte               pmin;
+            public readonly byte               psec;
+            public readonly byte               pframe;
+            public readonly byte               unknown5;
+            public readonly uint               pregap;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
-            public uint[] unknown6;
-            public int startLba;
-            public int sectors;
+            public readonly uint[] unknown6;
+            public readonly int startLba;
+            public readonly int sectors;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
-            public uint[] unknown7;
-            public uint   session;
-            public ushort unknown8;
+            public readonly uint[] unknown7;
+            public readonly uint   session;
+            public readonly ushort unknown8;
+
             // Seems to be only on non DVD track descriptors
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
-            public uint[] unknown9;
+            public readonly uint[] unknown9;
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
diff --git a/Aaru.Images/BlindWrite5/Verify.cs b/Aaru.Images/BlindWrite5/Verify.cs
index 427a92f7f..03818dc0d 100644
--- a/Aaru.Images/BlindWrite5/Verify.cs
+++ b/Aaru.Images/BlindWrite5/Verify.cs
@@ -41,10 +41,11 @@ namespace Aaru.DiscImages
         public bool? VerifySector(ulong sectorAddress)
         {
             byte[] buffer = ReadSectorLong(sectorAddress);
+
             return CdChecksums.CheckCdSector(buffer);
         }
 
-        public bool? VerifySectors(ulong           sectorAddress, uint length, out List<ulong> failingLbas,
+        public bool? VerifySectors(ulong sectorAddress, uint length, out List<ulong> failingLbas,
                                    out List<ulong> unknownLbas)
         {
             byte[] buffer = ReadSectorsLong(sectorAddress, length);
@@ -62,19 +63,22 @@ namespace Aaru.DiscImages
                 {
                     case null:
                         unknownLbas.Add((ulong)i + sectorAddress);
+
                         break;
                     case false:
                         failingLbas.Add((ulong)i + sectorAddress);
+
                         break;
                 }
             }
 
-            if(unknownLbas.Count > 0) return null;
+            if(unknownLbas.Count > 0)
+                return null;
 
             return failingLbas.Count <= 0;
         }
 
-        public bool? VerifySectors(ulong           sectorAddress, uint length, uint track, out List<ulong> failingLbas,
+        public bool? VerifySectors(ulong sectorAddress, uint length, uint track, out List<ulong> failingLbas,
                                    out List<ulong> unknownLbas)
         {
             byte[] buffer = ReadSectorsLong(sectorAddress, length, track);
@@ -92,14 +96,17 @@ namespace Aaru.DiscImages
                 {
                     case null:
                         unknownLbas.Add((ulong)i + sectorAddress);
+
                         break;
                     case false:
                         failingLbas.Add((ulong)i + sectorAddress);
+
                         break;
                 }
             }
 
-            if(unknownLbas.Count > 0) return null;
+            if(unknownLbas.Count > 0)
+                return null;
 
             return failingLbas.Count <= 0;
         }
@@ -107,6 +114,7 @@ namespace Aaru.DiscImages
         public bool? VerifySector(ulong sectorAddress, uint track)
         {
             byte[] buffer = ReadSectorLong(sectorAddress, track);
+
             return CdChecksums.CheckCdSector(buffer);
         }
     }
diff --git a/Aaru.Images/CDRDAO/CDRDAO.cs b/Aaru.Images/CDRDAO/CDRDAO.cs
index 6f0484a8d..f8906bc5c 100644
--- a/Aaru.Images/CDRDAO/CDRDAO.cs
+++ b/Aaru.Images/CDRDAO/CDRDAO.cs
@@ -57,28 +57,16 @@ namespace Aaru.DiscImages
         Dictionary<uint, FileStream> writingStreams;
         List<Track>                  writingTracks;
 
-        public Cdrdao()
+        public Cdrdao() => imageInfo = new ImageInfo
         {
-            imageInfo = new ImageInfo
-            {
-                ReadableSectorTags    = new List<SectorTagType>(),
-                ReadableMediaTags     = new List<MediaTagType>(),
-                HasPartitions         = true,
-                HasSessions           = true,
-                Version               = null,
-                ApplicationVersion    = null,
-                MediaTitle            = null,
-                Creator               = null,
-                MediaManufacturer     = null,
-                MediaModel            = null,
-                MediaPartNumber       = null,
-                MediaSequence         = 0,
-                LastMediaSequence     = 0,
-                DriveManufacturer     = null,
-                DriveModel            = null,
-                DriveSerialNumber     = null,
-                DriveFirmwareRevision = null
-            };
-        }
+            ReadableSectorTags = new List<SectorTagType>(), ReadableMediaTags = new List<MediaTagType>(),
+            HasPartitions      = true, HasSessions                            = true, Version = null,
+            ApplicationVersion = null,
+            MediaTitle         = null, Creator = null, MediaManufacturer = null,
+            MediaModel         = null,
+            MediaPartNumber    = null, MediaSequence = 0, LastMediaSequence = 0,
+            DriveManufacturer  = null,
+            DriveModel         = null, DriveSerialNumber = null, DriveFirmwareRevision = null
+        };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/CDRDAO/Helpers.cs b/Aaru.Images/CDRDAO/Helpers.cs
index ac887a5a5..40b1cf2fd 100644
--- a/Aaru.Images/CDRDAO/Helpers.cs
+++ b/Aaru.Images/CDRDAO/Helpers.cs
@@ -86,7 +86,7 @@ namespace Aaru.DiscImages
         }
 
         static (byte minute, byte second, byte frame) LbaToMsf(ulong sector) =>
-            ((byte)(sector / 75 / 60), (byte)(sector / 75 % 60), (byte)(sector % 75));
+            ((byte)(sector / 75 / 60), (byte)((sector / 75) % 60), (byte)(sector % 75));
 
         static string GetTrackMode(Track track)
         {
diff --git a/Aaru.Images/CDRDAO/Identify.cs b/Aaru.Images/CDRDAO/Identify.cs
index 24e1a1e72..9b33aee0d 100644
--- a/Aaru.Images/CDRDAO/Identify.cs
+++ b/Aaru.Images/CDRDAO/Identify.cs
@@ -48,28 +48,36 @@ namespace Aaru.DiscImages
                 byte[] testArray = new byte[512];
                 imageFilter.GetDataForkStream().Read(testArray, 0, 512);
                 imageFilter.GetDataForkStream().Seek(0, SeekOrigin.Begin);
+
                 // Check for unexpected control characters that shouldn't be present in a text file and can crash this plugin
                 bool twoConsecutiveNulls = false;
+
                 for(int i = 0; i < 512; i++)
                 {
-                    if(i >= imageFilter.GetDataForkStream().Length) break;
+                    if(i >= imageFilter.GetDataForkStream().Length)
+                        break;
 
                     if(testArray[i] == 0)
                     {
-                        if(twoConsecutiveNulls) return false;
+                        if(twoConsecutiveNulls)
+                            return false;
 
                         twoConsecutiveNulls = true;
                     }
-                    else twoConsecutiveNulls = false;
+                    else
+                        twoConsecutiveNulls = false;
 
-                    if(testArray[i] < 0x20 && testArray[i] != 0x0A && testArray[i] != 0x0D && testArray[i] != 0x00)
+                    if(testArray[i] < 0x20  &&
+                       testArray[i] != 0x0A &&
+                       testArray[i] != 0x0D &&
+                       testArray[i] != 0x00)
                         return false;
                 }
 
                 tocStream = new StreamReader(imageFilter.GetDataForkStream());
 
-                Regex cr = new Regex(REGEX_COMMENT);
-                Regex dr = new Regex(REGEX_DISCTYPE);
+                var cr = new Regex(REGEX_COMMENT);
+                var dr = new Regex(REGEX_DISCTYPE);
 
                 while(tocStream.Peek() >= 0)
                 {
@@ -79,7 +87,8 @@ namespace Aaru.DiscImages
                     Match cm = cr.Match(line);
 
                     // Skip comments at start of file
-                    if(cm.Success) continue;
+                    if(cm.Success)
+                        continue;
 
                     return dm.Success;
                 }
@@ -89,8 +98,9 @@ namespace Aaru.DiscImages
             catch(Exception ex)
             {
                 AaruConsole.ErrorWriteLine("Exception trying to identify image file {0}", cdrdaoFilter.GetFilename());
-                AaruConsole.ErrorWriteLine("Exception: {0}",                              ex.Message);
-                AaruConsole.ErrorWriteLine("Stack trace: {0}",                            ex.StackTrace);
+                AaruConsole.ErrorWriteLine("Exception: {0}", ex.Message);
+                AaruConsole.ErrorWriteLine("Stack trace: {0}", ex.StackTrace);
+
                 return false;
             }
         }
diff --git a/Aaru.Images/CDRDAO/Properties.cs b/Aaru.Images/CDRDAO/Properties.cs
index b87bfb85a..f523cf12f 100644
--- a/Aaru.Images/CDRDAO/Properties.cs
+++ b/Aaru.Images/CDRDAO/Properties.cs
@@ -57,36 +57,36 @@ namespace Aaru.DiscImages
 
                 foreach(CdrdaoTrack cdrTrack in discimage.Tracks)
                 {
-                    Track aaruTrack = new Track
+                    var aaruTrack = new Track
                     {
-                        Indexes                = cdrTrack.Indexes,
-                        TrackDescription       = cdrTrack.Title,
-                        TrackStartSector       = cdrTrack.StartSector,
-                        TrackPregap            = cdrTrack.Pregap,
-                        TrackSession           = 1,
+                        Indexes                = cdrTrack.Indexes, TrackDescription = cdrTrack.Title,
+                        TrackStartSector       = cdrTrack.StartSector, TrackPregap  = cdrTrack.Pregap, TrackSession = 1,
                         TrackSequence          = cdrTrack.Sequence,
                         TrackType              = CdrdaoTrackTypeToTrackType(cdrTrack.Tracktype),
                         TrackFilter            = cdrTrack.Trackfile.Datafilter,
                         TrackFile              = cdrTrack.Trackfile.Datafilter.GetFilename(),
-                        TrackFileOffset        = cdrTrack.Trackfile.Offset,
-                        TrackFileType          = cdrTrack.Trackfile.Filetype,
+                        TrackFileOffset        = cdrTrack.Trackfile.Offset, TrackFileType = cdrTrack.Trackfile.Filetype,
                         TrackRawBytesPerSector = cdrTrack.Bps,
                         TrackBytesPerSector    = CdrdaoTrackTypeToCookedBytesPerSector(cdrTrack.Tracktype)
                     };
 
-                    aaruTrack.TrackEndSector = aaruTrack.TrackStartSector + cdrTrack.Sectors - 1;
+                    aaruTrack.TrackEndSector = (aaruTrack.TrackStartSector + cdrTrack.Sectors) - 1;
+
                     if(!cdrTrack.Indexes.TryGetValue(0, out aaruTrack.TrackStartSector))
                         cdrTrack.Indexes.TryGetValue(1, out aaruTrack.TrackStartSector);
+
                     if(cdrTrack.Subchannel)
                     {
                         aaruTrack.TrackSubchannelType = cdrTrack.Packedsubchannel
-                                                           ? TrackSubchannelType.PackedInterleaved
-                                                           : TrackSubchannelType.RawInterleaved;
+                                                            ? TrackSubchannelType.PackedInterleaved
+                                                            : TrackSubchannelType.RawInterleaved;
+
                         aaruTrack.TrackSubchannelFilter = cdrTrack.Trackfile.Datafilter;
                         aaruTrack.TrackSubchannelFile   = cdrTrack.Trackfile.Datafilter.GetFilename();
                         aaruTrack.TrackSubchannelOffset = cdrTrack.Trackfile.Offset;
                     }
-                    else aaruTrack.TrackSubchannelType = TrackSubchannelType.None;
+                    else
+                        aaruTrack.TrackSubchannelType = TrackSubchannelType.None;
 
                     tracks.Add(aaruTrack);
                 }
@@ -94,34 +94,41 @@ namespace Aaru.DiscImages
                 return tracks;
             }
         }
+
         public List<DumpHardwareType> DumpHardware => null;
         public CICMMetadataType       CicmMetadata => null;
+
         // TODO: Decode CD-Text to text
-        public IEnumerable<MediaTagType> SupportedMediaTags => new[] {MediaTagType.CD_MCN};
-        public IEnumerable<SectorTagType> SupportedSectorTags =>
-            new[]
-            {
-                SectorTagType.CdSectorEcc, SectorTagType.CdSectorEccP, SectorTagType.CdSectorEccQ,
-                SectorTagType.CdSectorEdc, SectorTagType.CdSectorHeader, SectorTagType.CdSectorSubchannel,
-                SectorTagType.CdSectorSubHeader, SectorTagType.CdSectorSync, SectorTagType.CdTrackFlags,
-                SectorTagType.CdTrackIsrc
-            };
-        public IEnumerable<MediaType> SupportedMediaTypes =>
-            new[]
-            {
-                MediaType.CD, MediaType.CDDA, MediaType.CDEG, MediaType.CDG, MediaType.CDI, MediaType.CDMIDI,
-                MediaType.CDMRW, MediaType.CDPLUS, MediaType.CDR, MediaType.CDROM, MediaType.CDROMXA,
-                MediaType.CDRW, MediaType.CDV, MediaType.DDCD, MediaType.DDCDR, MediaType.DDCDRW, MediaType.MEGACD,
-                MediaType.PS1CD, MediaType.PS2CD, MediaType.SuperCDROM2, MediaType.SVCD, MediaType.SATURNCD,
-                MediaType.ThreeDO, MediaType.VCD, MediaType.VCDHD, MediaType.NeoGeoCD, MediaType.PCFX,
-                MediaType.CDTV, MediaType.CD32, MediaType.Nuon, MediaType.Playdia, MediaType.Pippin,
-                MediaType.FMTOWNS, MediaType.MilCD, MediaType.VideoNow, MediaType.VideoNowColor,
-                MediaType.VideoNowXp
-            };
-        public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
-            new[] {("separate", typeof(bool), "Write each track to a separate file.", (object)false)};
-        public IEnumerable<string> KnownExtensions => new[] {".toc"};
-        public bool                IsWriting       { get; private set; }
-        public string              ErrorMessage    { get; private set; }
+        public IEnumerable<MediaTagType> SupportedMediaTags => new[]
+        {
+            MediaTagType.CD_MCN
+        };
+        public IEnumerable<SectorTagType> SupportedSectorTags => new[]
+        {
+            SectorTagType.CdSectorEcc, SectorTagType.CdSectorEccP, SectorTagType.CdSectorEccQ,
+            SectorTagType.CdSectorEdc, SectorTagType.CdSectorHeader, SectorTagType.CdSectorSubchannel,
+            SectorTagType.CdSectorSubHeader, SectorTagType.CdSectorSync, SectorTagType.CdTrackFlags,
+            SectorTagType.CdTrackIsrc
+        };
+        public IEnumerable<MediaType> SupportedMediaTypes => new[]
+        {
+            MediaType.CD, MediaType.CDDA, MediaType.CDEG, MediaType.CDG, MediaType.CDI, MediaType.CDMIDI,
+            MediaType.CDMRW, MediaType.CDPLUS, MediaType.CDR, MediaType.CDROM, MediaType.CDROMXA, MediaType.CDRW,
+            MediaType.CDV, MediaType.DDCD, MediaType.DDCDR, MediaType.DDCDRW, MediaType.MEGACD, MediaType.PS1CD,
+            MediaType.PS2CD, MediaType.SuperCDROM2, MediaType.SVCD, MediaType.SATURNCD, MediaType.ThreeDO,
+            MediaType.VCD, MediaType.VCDHD, MediaType.NeoGeoCD, MediaType.PCFX, MediaType.CDTV, MediaType.CD32,
+            MediaType.Nuon, MediaType.Playdia, MediaType.Pippin, MediaType.FMTOWNS, MediaType.MilCD, MediaType.VideoNow,
+            MediaType.VideoNowColor, MediaType.VideoNowXp
+        };
+        public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions => new[]
+        {
+            ("separate", typeof(bool), "Write each track to a separate file.", (object)false)
+        };
+        public IEnumerable<string> KnownExtensions => new[]
+        {
+            ".toc"
+        };
+        public bool   IsWriting    { get; private set; }
+        public string ErrorMessage { get; private set; }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/CDRDAO/Read.cs b/Aaru.Images/CDRDAO/Read.cs
index c642b2c18..e9b3b1bad 100644
--- a/Aaru.Images/CDRDAO/Read.cs
+++ b/Aaru.Images/CDRDAO/Read.cs
@@ -129,7 +129,7 @@ namespace Aaru.DiscImages
                     if(!matchDiskType.Success)
                     {
                         AaruConsole.DebugWriteLine("CDRDAO plugin", "Not a CDRDAO TOC or TOC type not in line {0}.",
-                                                  lineNumber);
+                                                   lineNumber);
 
                         return false;
                     }
@@ -183,32 +183,32 @@ namespace Aaru.DiscImages
                             continue;
 
                         AaruConsole.DebugWriteLine("CDRDAO plugin", "Found comment \"{1}\" at line {0}", lineNumber,
-                                                  matchComment.Groups["comment"].Value.Trim());
+                                                   matchComment.Groups["comment"].Value.Trim());
 
                         commentBuilder.AppendLine(matchComment.Groups["comment"].Value.Trim());
                     }
                     else if(matchDiskType.Success)
                     {
                         AaruConsole.DebugWriteLine("CDRDAO plugin", "Found {1} at line {0}", lineNumber,
-                                                  matchDiskType.Groups["type"].Value);
+                                                   matchDiskType.Groups["type"].Value);
 
                         discimage.Disktypestr = matchDiskType.Groups["type"].Value;
 
                         switch(matchDiskType.Groups["type"].Value)
                         {
-                            case"CD_DA":
+                            case "CD_DA":
                                 discimage.Disktype = MediaType.CDDA;
 
                                 break;
-                            case"CD_ROM":
+                            case "CD_ROM":
                                 discimage.Disktype = MediaType.CDROM;
 
                                 break;
-                            case"CD_ROM_XA":
+                            case "CD_ROM_XA":
                                 discimage.Disktype = MediaType.CDROMXA;
 
                                 break;
-                            case"CD_I":
+                            case "CD_I":
                                 discimage.Disktype = MediaType.CDI;
 
                                 break;
@@ -221,7 +221,7 @@ namespace Aaru.DiscImages
                     else if(matchMcn.Success)
                     {
                         AaruConsole.DebugWriteLine("CDRDAO plugin", "Found CATALOG \"{1}\" at line {0}", lineNumber,
-                                                  matchMcn.Groups["catalog"].Value);
+                                                   matchMcn.Groups["catalog"].Value);
 
                         discimage.Mcn = matchMcn.Groups["catalog"].Value;
                     }
@@ -229,13 +229,13 @@ namespace Aaru.DiscImages
                     {
                         if(matchTrack.Groups["subchan"].Value == "")
                             AaruConsole.DebugWriteLine("CDRDAO plugin",
-                                                      "Found TRACK type \"{1}\" with no subchannel at line {0}",
-                                                      lineNumber, matchTrack.Groups["type"].Value);
+                                                       "Found TRACK type \"{1}\" with no subchannel at line {0}",
+                                                       lineNumber, matchTrack.Groups["type"].Value);
                         else
                             AaruConsole.DebugWriteLine("CDRDAO plugin",
-                                                      "Found TRACK type \"{1}\" subchannel {2} at line {0}", lineNumber,
-                                                      matchTrack.Groups["type"].Value,
-                                                      matchTrack.Groups["subchan"].Value);
+                                                       "Found TRACK type \"{1}\" subchannel {2} at line {0}",
+                                                       lineNumber, matchTrack.Groups["type"].Value,
+                                                       matchTrack.Groups["subchan"].Value);
 
                         if(intrack)
                         {
@@ -260,23 +260,23 @@ namespace Aaru.DiscImages
 
                         switch(matchTrack.Groups["type"].Value)
                         {
-                            case"AUDIO":
-                            case"MODE1_RAW":
-                            case"MODE2_RAW":
+                            case "AUDIO":
+                            case "MODE1_RAW":
+                            case "MODE2_RAW":
                                 currenttrack.Bps = 2352;
 
                                 break;
-                            case"MODE1":
-                            case"MODE2_FORM1":
+                            case "MODE1":
+                            case "MODE2_FORM1":
                                 currenttrack.Bps = 2048;
 
                                 break;
-                            case"MODE2_FORM2":
+                            case "MODE2_FORM2":
                                 currenttrack.Bps = 2324;
 
                                 break;
-                            case"MODE2":
-                            case"MODE2_FORM_MIX":
+                            case "MODE2":
+                            case "MODE2_FORM_MIX":
                                 currenttrack.Bps = 2336;
 
                                 break;
@@ -287,11 +287,11 @@ namespace Aaru.DiscImages
 
                         switch(matchTrack.Groups["subchan"].Value)
                         {
-                            case"": break;
-                            case"RW":
+                            case "": break;
+                            case "RW":
                                 currenttrack.Packedsubchannel = true;
-                                goto case"RW_RAW";
-                            case"RW_RAW":
+                                goto case "RW_RAW";
+                            case "RW_RAW":
                                 currenttrack.Subchannel = true;
 
                                 break;
@@ -308,28 +308,28 @@ namespace Aaru.DiscImages
                     else if(matchCopy.Success)
                     {
                         AaruConsole.DebugWriteLine("CDRDAO plugin", "Found {1} COPY at line {0}", lineNumber,
-                                                  matchCopy.Groups["no"].Value);
+                                                   matchCopy.Groups["no"].Value);
 
                         currenttrack.FlagDcp |= intrack && matchCopy.Groups["no"].Value == "";
                     }
                     else if(matchEmphasis.Success)
                     {
                         AaruConsole.DebugWriteLine("CDRDAO plugin", "Found {1} PRE_EMPHASIS at line {0}", lineNumber,
-                                                  matchEmphasis.Groups["no"].Value);
+                                                   matchEmphasis.Groups["no"].Value);
 
                         currenttrack.FlagPre |= intrack && matchEmphasis.Groups["no"].Value == "";
                     }
                     else if(matchStereo.Success)
                     {
                         AaruConsole.DebugWriteLine("CDRDAO plugin", "Found {1}_CHANNEL_AUDIO at line {0}", lineNumber,
-                                                  matchStereo.Groups["num"].Value);
+                                                   matchStereo.Groups["num"].Value);
 
                         currenttrack.Flag_4Ch |= intrack && matchStereo.Groups["num"].Value == "FOUR";
                     }
                     else if(matchIsrc.Success)
                     {
                         AaruConsole.DebugWriteLine("CDRDAO plugin", "Found ISRC \"{1}\" at line {0}", lineNumber,
-                                                  matchIsrc.Groups["isrc"].Value);
+                                                   matchIsrc.Groups["isrc"].Value);
 
                         if(intrack)
                             currenttrack.Isrc = matchIsrc.Groups["isrc"].Value;
@@ -337,7 +337,7 @@ namespace Aaru.DiscImages
                     else if(matchIndex.Success)
                     {
                         AaruConsole.DebugWriteLine("CDRDAO plugin", "Found INDEX \"{1}\" at line {0}", lineNumber,
-                                                  matchIndex.Groups["address"].Value);
+                                                   matchIndex.Groups["address"].Value);
 
                         string[] lengthString = matchFile.Groups["length"].Value.Split(':');
 
@@ -350,7 +350,7 @@ namespace Aaru.DiscImages
                     else if(matchPregap.Success)
                     {
                         AaruConsole.DebugWriteLine("CDRDAO plugin", "Found START \"{1}\" at line {0}", lineNumber,
-                                                  matchPregap.Groups["address"].Value);
+                                                   matchPregap.Groups["address"].Value);
 
                         currenttrack.Indexes.Add(0, currenttrack.StartSector);
 
@@ -368,7 +368,7 @@ namespace Aaru.DiscImages
                     else if(matchZeroPregap.Success)
                     {
                         AaruConsole.DebugWriteLine("CDRDAO plugin", "Found PREGAP \"{1}\" at line {0}", lineNumber,
-                                                  matchZeroPregap.Groups["length"].Value);
+                                                   matchZeroPregap.Groups["length"].Value);
 
                         currenttrack.Indexes.Add(0, currenttrack.StartSector);
                         string[] lengthString = matchZeroPregap.Groups["length"].Value.Split(':');
@@ -378,10 +378,10 @@ namespace Aaru.DiscImages
                     }
                     else if(matchZeroData.Success)
                         AaruConsole.DebugWriteLine("CDRDAO plugin", "Found ZERO \"{1}\" at line {0}", lineNumber,
-                                                  matchZeroData.Groups["length"].Value);
+                                                   matchZeroData.Groups["length"].Value);
                     else if(matchZeroAudio.Success)
                         AaruConsole.DebugWriteLine("CDRDAO plugin", "Found SILENCE \"{1}\" at line {0}", lineNumber,
-                                                  matchZeroAudio.Groups["length"].Value);
+                                                   matchZeroAudio.Groups["length"].Value);
                     else
                     {
                         FiltersList filtersList;
@@ -389,7 +389,7 @@ namespace Aaru.DiscImages
                         if(matchAudioFile.Success)
                         {
                             AaruConsole.DebugWriteLine("CDRDAO plugin", "Found AUDIOFILE \"{1}\" at line {0}",
-                                                      lineNumber, matchAudioFile.Groups["filename"].Value);
+                                                       lineNumber, matchAudioFile.Groups["filename"].Value);
 
                             filtersList = new FiltersList();
 
@@ -431,8 +431,8 @@ namespace Aaru.DiscImages
                         }
                         else if(matchFile.Success)
                         {
-                            AaruConsole.DebugWriteLine("CDRDAO plugin", "Found DATAFILE \"{1}\" at line {0}", lineNumber,
-                                                      matchFile.Groups["filename"].Value);
+                            AaruConsole.DebugWriteLine("CDRDAO plugin", "Found DATAFILE \"{1}\" at line {0}",
+                                                       lineNumber, matchFile.Groups["filename"].Value);
 
                             filtersList = new FiltersList();
 
@@ -463,7 +463,7 @@ namespace Aaru.DiscImages
                         else if(matchTitle.Success)
                         {
                             AaruConsole.DebugWriteLine("CDRDAO plugin", "Found TITLE \"{1}\" at line {0}", lineNumber,
-                                                      matchTitle.Groups["title"].Value);
+                                                       matchTitle.Groups["title"].Value);
 
                             if(intrack)
                                 currenttrack.Title = matchTitle.Groups["title"].Value;
@@ -473,7 +473,7 @@ namespace Aaru.DiscImages
                         else if(matchPerformer.Success)
                         {
                             AaruConsole.DebugWriteLine("CDRDAO plugin", "Found PERFORMER \"{1}\" at line {0}",
-                                                      lineNumber, matchPerformer.Groups["performer"].Value);
+                                                       lineNumber, matchPerformer.Groups["performer"].Value);
 
                             if(intrack)
                                 currenttrack.Performer = matchPerformer.Groups["performer"].Value;
@@ -483,7 +483,7 @@ namespace Aaru.DiscImages
                         else if(matchSongwriter.Success)
                         {
                             AaruConsole.DebugWriteLine("CDRDAO plugin", "Found SONGWRITER \"{1}\" at line {0}",
-                                                      lineNumber, matchSongwriter.Groups["songwriter"].Value);
+                                                       lineNumber, matchSongwriter.Groups["songwriter"].Value);
 
                             if(intrack)
                                 currenttrack.Songwriter = matchSongwriter.Groups["songwriter"].Value;
@@ -492,8 +492,8 @@ namespace Aaru.DiscImages
                         }
                         else if(matchComposer.Success)
                         {
-                            AaruConsole.DebugWriteLine("CDRDAO plugin", "Found COMPOSER \"{1}\" at line {0}", lineNumber,
-                                                      matchComposer.Groups["composer"].Value);
+                            AaruConsole.DebugWriteLine("CDRDAO plugin", "Found COMPOSER \"{1}\" at line {0}",
+                                                       lineNumber, matchComposer.Groups["composer"].Value);
 
                             if(intrack)
                                 currenttrack.Composer = matchComposer.Groups["composer"].Value;
@@ -502,8 +502,8 @@ namespace Aaru.DiscImages
                         }
                         else if(matchArranger.Success)
                         {
-                            AaruConsole.DebugWriteLine("CDRDAO plugin", "Found ARRANGER \"{1}\" at line {0}", lineNumber,
-                                                      matchArranger.Groups["arranger"].Value);
+                            AaruConsole.DebugWriteLine("CDRDAO plugin", "Found ARRANGER \"{1}\" at line {0}",
+                                                       lineNumber, matchArranger.Groups["arranger"].Value);
 
                             if(intrack)
                                 currenttrack.Arranger = matchArranger.Groups["arranger"].Value;
@@ -513,7 +513,7 @@ namespace Aaru.DiscImages
                         else if(matchMessage.Success)
                         {
                             AaruConsole.DebugWriteLine("CDRDAO plugin", "Found MESSAGE \"{1}\" at line {0}", lineNumber,
-                                                      matchMessage.Groups["message"].Value);
+                                                       matchMessage.Groups["message"].Value);
 
                             if(intrack)
                                 currenttrack.Message = matchMessage.Groups["message"].Value;
@@ -523,7 +523,7 @@ namespace Aaru.DiscImages
                         else if(matchDiscId.Success)
                         {
                             AaruConsole.DebugWriteLine("CDRDAO plugin", "Found DISC_ID \"{1}\" at line {0}", lineNumber,
-                                                      matchDiscId.Groups["discid"].Value);
+                                                       matchDiscId.Groups["discid"].Value);
 
                             if(!intrack)
                                 discimage.DiskId = matchDiscId.Groups["discid"].Value;
@@ -531,7 +531,7 @@ namespace Aaru.DiscImages
                         else if(matchUpc.Success)
                         {
                             AaruConsole.DebugWriteLine("CDRDAO plugin", "Found UPC_EAN \"{1}\" at line {0}", lineNumber,
-                                                      matchUpc.Groups["catalog"].Value);
+                                                       matchUpc.Groups["catalog"].Value);
 
                             if(!intrack)
                                 discimage.Barcode = matchUpc.Groups["catalog"].Value;
@@ -542,9 +542,9 @@ namespace Aaru.DiscImages
                                 matchLanguage.Success    ||
                                 matchClosure.Success     ||
                                 matchLanguageMap.Success ||
-                                matchLanguageMapping.Success) { }
+                                matchLanguageMapping.Success) {}
                         else if(line == "") // Empty line, ignore it
-                        { }
+                        {}
                     }
 
                     // TODO: Regex CD-TEXT SIZE_INFO
@@ -625,15 +625,16 @@ namespace Aaru.DiscImages
                 for(int i = 0; i < discimage.Tracks.Count; i++)
                 {
                     AaruConsole.DebugWriteLine("CDRDAO plugin", "\tTrack {0} information:",
-                                              discimage.Tracks[i].Sequence);
+                                               discimage.Tracks[i].Sequence);
 
                     AaruConsole.DebugWriteLine("CDRDAO plugin", "\t\t{0} bytes per sector", discimage.Tracks[i].Bps);
                     AaruConsole.DebugWriteLine("CDRDAO plugin", "\t\tPregap: {0} sectors", discimage.Tracks[i].Pregap);
 
                     AaruConsole.DebugWriteLine("CDRDAO plugin", "\t\tData: {0} sectors starting at sector {1}",
-                                              discimage.Tracks[i].Sectors, discimage.Tracks[i].StartSector);
+                                               discimage.Tracks[i].Sectors, discimage.Tracks[i].StartSector);
 
-                    AaruConsole.DebugWriteLine("CDRDAO plugin", "\t\tPostgap: {0} sectors", discimage.Tracks[i].Postgap);
+                    AaruConsole.DebugWriteLine("CDRDAO plugin", "\t\tPostgap: {0} sectors",
+                                               discimage.Tracks[i].Postgap);
 
                     if(discimage.Tracks[i].Flag_4Ch)
                         AaruConsole.DebugWriteLine("CDRDAO plugin", "\t\tTrack is flagged as quadraphonic");
@@ -645,16 +646,16 @@ namespace Aaru.DiscImages
                         AaruConsole.DebugWriteLine("CDRDAO plugin", "\t\tTrack has pre-emphasis applied");
 
                     AaruConsole.DebugWriteLine("CDRDAO plugin",
-                                              "\t\tTrack resides in file {0}, type defined as {1}, starting at byte {2}",
-                                              discimage.Tracks[i].Trackfile.Datafilter.GetFilename(),
-                                              discimage.Tracks[i].Trackfile.Filetype,
-                                              discimage.Tracks[i].Trackfile.Offset);
+                                               "\t\tTrack resides in file {0}, type defined as {1}, starting at byte {2}",
+                                               discimage.Tracks[i].Trackfile.Datafilter.GetFilename(),
+                                               discimage.Tracks[i].Trackfile.Filetype,
+                                               discimage.Tracks[i].Trackfile.Offset);
 
                     AaruConsole.DebugWriteLine("CDRDAO plugin", "\t\tIndexes:");
 
                     foreach(KeyValuePair<int, ulong> kvp in discimage.Tracks[i].Indexes)
                         AaruConsole.DebugWriteLine("CDRDAO plugin", "\t\t\tIndex {0} starts at sector {1}", kvp.Key,
-                                                  kvp.Value);
+                                                   kvp.Value);
 
                     if(discimage.Tracks[i].Isrc == null)
                         AaruConsole.DebugWriteLine("CDRDAO plugin", "\t\tISRC is not set.");
@@ -674,13 +675,14 @@ namespace Aaru.DiscImages
                     if(discimage.Tracks[i].Performer == null)
                         AaruConsole.DebugWriteLine("CDRDAO plugin", "\t\tPerformer is not set.");
                     else
-                        AaruConsole.DebugWriteLine("CDRDAO plugin", "\t\tPerformer: {0}", discimage.Tracks[i].Performer);
+                        AaruConsole.DebugWriteLine("CDRDAO plugin", "\t\tPerformer: {0}",
+                                                   discimage.Tracks[i].Performer);
 
                     if(discimage.Tracks[i].Songwriter == null)
                         AaruConsole.DebugWriteLine("CDRDAO plugin", "\t\tSongwriter is not set.");
                     else
                         AaruConsole.DebugWriteLine("CDRDAO plugin", "\t\tSongwriter: {0}",
-                                                  discimage.Tracks[i].Songwriter);
+                                                   discimage.Tracks[i].Songwriter);
 
                     if(discimage.Tracks[i].Title == null)
                         AaruConsole.DebugWriteLine("CDRDAO plugin", "\t\tTitle is not set.");
diff --git a/Aaru.Images/CDRDAO/Verify.cs b/Aaru.Images/CDRDAO/Verify.cs
index fd81fecbb..47526bcda 100644
--- a/Aaru.Images/CDRDAO/Verify.cs
+++ b/Aaru.Images/CDRDAO/Verify.cs
@@ -41,10 +41,11 @@ namespace Aaru.DiscImages
         public bool? VerifySector(ulong sectorAddress)
         {
             byte[] buffer = ReadSectorLong(sectorAddress);
+
             return CdChecksums.CheckCdSector(buffer);
         }
 
-        public bool? VerifySectors(ulong           sectorAddress, uint length, out List<ulong> failingLbas,
+        public bool? VerifySectors(ulong sectorAddress, uint length, out List<ulong> failingLbas,
                                    out List<ulong> unknownLbas)
         {
             byte[] buffer = ReadSectorsLong(sectorAddress, length);
@@ -62,19 +63,22 @@ namespace Aaru.DiscImages
                 {
                     case null:
                         unknownLbas.Add((ulong)i + sectorAddress);
+
                         break;
                     case false:
                         failingLbas.Add((ulong)i + sectorAddress);
+
                         break;
                 }
             }
 
-            if(unknownLbas.Count > 0) return null;
+            if(unknownLbas.Count > 0)
+                return null;
 
             return failingLbas.Count <= 0;
         }
 
-        public bool? VerifySectors(ulong           sectorAddress, uint length, uint track, out List<ulong> failingLbas,
+        public bool? VerifySectors(ulong sectorAddress, uint length, uint track, out List<ulong> failingLbas,
                                    out List<ulong> unknownLbas)
         {
             byte[] buffer = ReadSectorsLong(sectorAddress, length, track);
@@ -92,14 +96,17 @@ namespace Aaru.DiscImages
                 {
                     case null:
                         unknownLbas.Add((ulong)i + sectorAddress);
+
                         break;
                     case false:
                         failingLbas.Add((ulong)i + sectorAddress);
+
                         break;
                 }
             }
 
-            if(unknownLbas.Count > 0) return null;
+            if(unknownLbas.Count > 0)
+                return null;
 
             return failingLbas.Count <= 0;
         }
@@ -107,6 +114,7 @@ namespace Aaru.DiscImages
         public bool? VerifySector(ulong sectorAddress, uint track)
         {
             byte[] buffer = ReadSectorLong(sectorAddress, track);
+
             return CdChecksums.CheckCdSector(buffer);
         }
     }
diff --git a/Aaru.Images/CDRDAO/Write.cs b/Aaru.Images/CDRDAO/Write.cs
index 1e4508d1d..7e2dc3d7f 100644
--- a/Aaru.Images/CDRDAO/Write.cs
+++ b/Aaru.Images/CDRDAO/Write.cs
@@ -46,7 +46,7 @@ namespace Aaru.DiscImages
     public partial class Cdrdao
     {
         public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
-                           uint   sectorSize)
+                           uint sectorSize)
         {
             if(options != null)
             {
@@ -55,25 +55,32 @@ namespace Aaru.DiscImages
                     if(!bool.TryParse(tmpValue, out separateTracksWriting))
                     {
                         ErrorMessage = "Invalid value for split option";
+
                         return false;
                     }
 
                     if(separateTracksWriting)
                     {
                         ErrorMessage = "Separate tracksnot yet implemented";
+
                         return false;
                     }
                 }
             }
-            else separateTracksWriting = false;
+            else
+                separateTracksWriting = false;
 
             if(!SupportedMediaTypes.Contains(mediaType))
             {
                 ErrorMessage = $"Unsupport media format {mediaType}";
+
                 return false;
             }
 
-            imageInfo = new ImageInfo {MediaType = mediaType, SectorSize = sectorSize, Sectors = sectors};
+            imageInfo = new ImageInfo
+            {
+                MediaType = mediaType, SectorSize = sectorSize, Sectors = sectors
+            };
 
             // TODO: Separate tracks
             try
@@ -84,16 +91,21 @@ namespace Aaru.DiscImages
             catch(IOException e)
             {
                 ErrorMessage = $"Could not create new image file, exception {e.Message}";
+
                 return false;
             }
 
-            discimage = new CdrdaoDisc {Disktype = mediaType, Tracks = new List<CdrdaoTrack>()};
+            discimage = new CdrdaoDisc
+            {
+                Disktype = mediaType, Tracks = new List<CdrdaoTrack>()
+            };
 
             trackFlags = new Dictionary<byte, byte>();
             trackIsrcs = new Dictionary<byte, string>();
 
             IsWriting    = true;
             ErrorMessage = null;
+
             return true;
         }
 
@@ -102,6 +114,7 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Tried to write on a non-writable image";
+
                 return false;
             }
 
@@ -109,9 +122,11 @@ namespace Aaru.DiscImages
             {
                 case MediaTagType.CD_MCN:
                     discimage.Mcn = Encoding.ASCII.GetString(data);
+
                     return true;
                 default:
                     ErrorMessage = $"Unsupported media tag {tag}";
+
                     return false;
             }
         }
@@ -121,6 +136,7 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Tried to write on a non-writable image";
+
                 return false;
             }
 
@@ -131,6 +147,7 @@ namespace Aaru.DiscImages
             if(track.TrackSequence == 0)
             {
                 ErrorMessage = $"Can't found track containing {sectorAddress}";
+
                 return false;
             }
 
@@ -139,18 +156,21 @@ namespace Aaru.DiscImages
             if(trackStream == null)
             {
                 ErrorMessage = $"Can't found file containing {sectorAddress}";
+
                 return false;
             }
 
             if(track.TrackBytesPerSector != track.TrackRawBytesPerSector)
             {
                 ErrorMessage = "Invalid write mode for this sector";
+
                 return false;
             }
 
             if(data.Length != track.TrackRawBytesPerSector)
             {
                 ErrorMessage = "Incorrect data size";
+
                 return false;
             }
 
@@ -158,6 +178,7 @@ namespace Aaru.DiscImages
             if(track.TrackType == TrackType.Audio)
             {
                 byte[] swapped = new byte[data.Length];
+
                 for(long i = 0; i < swapped.Length; i += 2)
                 {
                     swapped[i] = data[i + 1];
@@ -167,8 +188,10 @@ namespace Aaru.DiscImages
                 data = swapped;
             }
 
-            trackStream.Seek((long)(track.TrackFileOffset + (sectorAddress - track.TrackStartSector) * (ulong)track.TrackRawBytesPerSector),
-                             SeekOrigin.Begin);
+            trackStream.
+                Seek((long)(track.TrackFileOffset + ((sectorAddress - track.TrackStartSector) * (ulong)track.TrackRawBytesPerSector)),
+                     SeekOrigin.Begin);
+
             trackStream.Write(data, 0, data.Length);
 
             return true;
@@ -179,6 +202,7 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Tried to write on a non-writable image";
+
                 return false;
             }
 
@@ -189,6 +213,7 @@ namespace Aaru.DiscImages
             if(track.TrackSequence == 0)
             {
                 ErrorMessage = $"Can't found track containing {sectorAddress}";
+
                 return false;
             }
 
@@ -197,24 +222,28 @@ namespace Aaru.DiscImages
             if(trackStream == null)
             {
                 ErrorMessage = $"Can't found file containing {sectorAddress}";
+
                 return false;
             }
 
             if(track.TrackBytesPerSector != track.TrackRawBytesPerSector)
             {
                 ErrorMessage = "Invalid write mode for this sector";
+
                 return false;
             }
 
             if(sectorAddress + length > track.TrackEndSector + 1)
             {
                 ErrorMessage = "Can't cross tracks";
+
                 return false;
             }
 
             if(data.Length % track.TrackRawBytesPerSector != 0)
             {
                 ErrorMessage = "Incorrect data size";
+
                 return false;
             }
 
@@ -222,6 +251,7 @@ namespace Aaru.DiscImages
             if(track.TrackType == TrackType.Audio)
             {
                 byte[] swapped = new byte[data.Length];
+
                 for(long i = 0; i < swapped.Length; i += 2)
                 {
                     swapped[i] = data[i + 1];
@@ -234,18 +264,21 @@ namespace Aaru.DiscImages
             switch(track.TrackSubchannelType)
             {
                 case TrackSubchannelType.None:
-                    trackStream
-                       .Seek((long)(track.TrackFileOffset + (sectorAddress - track.TrackStartSector) * (ulong)track.TrackRawBytesPerSector),
+                    trackStream.
+                        Seek((long)(track.TrackFileOffset + ((sectorAddress - track.TrackStartSector) * (ulong)track.TrackRawBytesPerSector)),
                              SeekOrigin.Begin);
+
                     trackStream.Write(data, 0, data.Length);
 
                     ErrorMessage = "";
+
                     return true;
                 case TrackSubchannelType.Raw:
                 case TrackSubchannelType.RawInterleaved:
-                    trackStream
-                       .Seek((long)(track.TrackFileOffset + (sectorAddress - track.TrackStartSector) * (ulong)(track.TrackRawBytesPerSector + 96)),
+                    trackStream.
+                        Seek((long)(track.TrackFileOffset + ((sectorAddress - track.TrackStartSector) * (ulong)(track.TrackRawBytesPerSector + 96))),
                              SeekOrigin.Begin);
+
                     for(uint i = 0; i < length; i++)
                     {
                         trackStream.Write(data, (int)(i * track.TrackRawBytesPerSector), track.TrackRawBytesPerSector);
@@ -253,9 +286,11 @@ namespace Aaru.DiscImages
                     }
 
                     ErrorMessage = "";
+
                     return true;
                 default:
                     ErrorMessage = "Invalid subchannel mode for this sector";
+
                     return false;
             }
         }
@@ -265,6 +300,7 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Tried to write on a non-writable image";
+
                 return false;
             }
 
@@ -275,6 +311,7 @@ namespace Aaru.DiscImages
             if(track.TrackSequence == 0)
             {
                 ErrorMessage = $"Can't found track containing {sectorAddress}";
+
                 return false;
             }
 
@@ -283,12 +320,14 @@ namespace Aaru.DiscImages
             if(trackStream == null)
             {
                 ErrorMessage = $"Can't found file containing {sectorAddress}";
+
                 return false;
             }
 
             if(data.Length != track.TrackRawBytesPerSector)
             {
                 ErrorMessage = "Incorrect data size";
+
                 return false;
             }
 
@@ -296,6 +335,7 @@ namespace Aaru.DiscImages
             if(track.TrackType == TrackType.Audio)
             {
                 byte[] swapped = new byte[data.Length];
+
                 for(long i = 0; i < swapped.Length; i += 2)
                 {
                     swapped[i] = data[i + 1];
@@ -307,8 +347,10 @@ namespace Aaru.DiscImages
 
             uint subchannelSize = (uint)(track.TrackSubchannelType != TrackSubchannelType.None ? 96 : 0);
 
-            trackStream.Seek((long)(track.TrackFileOffset + (sectorAddress - track.TrackStartSector) * (ulong)(track.TrackRawBytesPerSector + subchannelSize)),
-                             SeekOrigin.Begin);
+            trackStream.
+                Seek((long)(track.TrackFileOffset + ((sectorAddress - track.TrackStartSector) * (ulong)(track.TrackRawBytesPerSector + subchannelSize))),
+                     SeekOrigin.Begin);
+
             trackStream.Write(data, 0, data.Length);
 
             return true;
@@ -319,6 +361,7 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Tried to write on a non-writable image";
+
                 return false;
             }
 
@@ -329,6 +372,7 @@ namespace Aaru.DiscImages
             if(track.TrackSequence == 0)
             {
                 ErrorMessage = $"Can't found track containing {sectorAddress}";
+
                 return false;
             }
 
@@ -337,18 +381,21 @@ namespace Aaru.DiscImages
             if(trackStream == null)
             {
                 ErrorMessage = $"Can't found file containing {sectorAddress}";
+
                 return false;
             }
 
             if(sectorAddress + length > track.TrackEndSector + 1)
             {
                 ErrorMessage = "Can't cross tracks";
+
                 return false;
             }
 
             if(data.Length % track.TrackRawBytesPerSector != 0)
             {
                 ErrorMessage = "Incorrect data size";
+
                 return false;
             }
 
@@ -356,6 +403,7 @@ namespace Aaru.DiscImages
             if(track.TrackType == TrackType.Audio)
             {
                 byte[] swapped = new byte[data.Length];
+
                 for(long i = 0; i < swapped.Length; i += 2)
                 {
                     swapped[i] = data[i + 1];
@@ -369,8 +417,10 @@ namespace Aaru.DiscImages
 
             for(uint i = 0; i < length; i++)
             {
-                trackStream.Seek((long)(track.TrackFileOffset + (i + sectorAddress - track.TrackStartSector) * (ulong)(track.TrackRawBytesPerSector + subchannelSize)),
-                                 SeekOrigin.Begin);
+                trackStream.
+                    Seek((long)(track.TrackFileOffset + (((i + sectorAddress) - track.TrackStartSector) * (ulong)(track.TrackRawBytesPerSector + subchannelSize))),
+                         SeekOrigin.Begin);
+
                 trackStream.Write(data, (int)(i * track.TrackRawBytesPerSector), track.TrackRawBytesPerSector);
             }
 
@@ -382,21 +432,26 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Tried to write on a non-writable image";
+
                 return false;
             }
 
-            if(tracks == null || tracks.Count == 0)
+            if(tracks       == null ||
+               tracks.Count == 0)
             {
                 ErrorMessage = "Invalid tracks sent";
+
                 return false;
             }
 
-            if(writingTracks != null && writingStreams != null)
+            if(writingTracks  != null &&
+               writingStreams != null)
                 foreach(FileStream oldTrack in writingStreams.Select(t => t.Value).Distinct())
                     oldTrack.Close();
 
             ulong currentOffset = 0;
             writingTracks = new List<Track>();
+
             foreach(Track track in tracks.OrderBy(t => t.TrackSequence))
             {
                 if(track.TrackSubchannelType == TrackSubchannelType.Q16 ||
@@ -404,23 +459,27 @@ namespace Aaru.DiscImages
                 {
                     ErrorMessage =
                         $"Unsupported subchannel type {track.TrackSubchannelType} for track {track.TrackSequence}";
+
                     return false;
                 }
 
                 Track newTrack = track;
-                newTrack.TrackFile = separateTracksWriting
-                                         ? writingBaseName + $"_track{track.TrackSequence:D2}.bin"
-                                         : writingBaseName + ".bin";
+
+                newTrack.TrackFile = separateTracksWriting ? writingBaseName + $"_track{track.TrackSequence:D2}.bin"
+                                         : writingBaseName                   + ".bin";
+
                 newTrack.TrackFileOffset = separateTracksWriting ? 0 : currentOffset;
                 writingTracks.Add(newTrack);
+
                 currentOffset += (ulong)newTrack.TrackRawBytesPerSector *
-                                 (newTrack.TrackEndSector - newTrack.TrackStartSector + 1);
+                                 ((newTrack.TrackEndSector - newTrack.TrackStartSector) + 1);
 
                 if(track.TrackSubchannelType != TrackSubchannelType.None)
-                    currentOffset += 96 * (newTrack.TrackEndSector - newTrack.TrackStartSector + 1);
+                    currentOffset += 96 * ((newTrack.TrackEndSector - newTrack.TrackStartSector) + 1);
             }
 
             writingStreams = new Dictionary<uint, FileStream>();
+
             if(separateTracksWriting)
                 foreach(Track track in writingTracks)
                     writingStreams.Add(track.TrackSequence,
@@ -428,9 +487,11 @@ namespace Aaru.DiscImages
                                                       FileShare.None));
             else
             {
-                FileStream jointstream = new FileStream(writingBaseName + ".bin", FileMode.OpenOrCreate,
-                                                        FileAccess.ReadWrite, FileShare.None);
-                foreach(Track track in writingTracks) writingStreams.Add(track.TrackSequence, jointstream);
+                var jointstream = new FileStream(writingBaseName + ".bin", FileMode.OpenOrCreate, FileAccess.ReadWrite,
+                                                 FileShare.None);
+
+                foreach(Track track in writingTracks)
+                    writingStreams.Add(track.TrackSequence, jointstream);
             }
 
             return true;
@@ -441,6 +502,7 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Image is not opened for writing";
+
                 return false;
             }
 
@@ -457,23 +519,33 @@ namespace Aaru.DiscImages
             }
 
             bool data = writingTracks.Count(t => t.TrackType != TrackType.Audio) > 0;
+
             bool mode2 = writingTracks.Count(t => t.TrackType == TrackType.CdMode2Form1 ||
                                                   t.TrackType == TrackType.CdMode2Form2 ||
                                                   t.TrackType == TrackType.CdMode2Formless) > 0;
 
-            if(mode2) descriptorStream.WriteLine("CD_ROM_XA");
-            else if(data) descriptorStream.WriteLine("CD_ROM");
-            else descriptorStream.WriteLine("CD_DA");
+            if(mode2)
+                descriptorStream.WriteLine("CD_ROM_XA");
+            else if(data)
+                descriptorStream.WriteLine("CD_ROM");
+            else
+                descriptorStream.WriteLine("CD_DA");
 
             if(!string.IsNullOrWhiteSpace(discimage.Comment))
             {
-                string[] commentLines = discimage.Comment.Split(new[] {'\n'}, StringSplitOptions.RemoveEmptyEntries);
-                foreach(string line in commentLines) descriptorStream.WriteLine("// {0}", line);
+                string[] commentLines = discimage.Comment.Split(new[]
+                {
+                    '\n'
+                }, StringSplitOptions.RemoveEmptyEntries);
+
+                foreach(string line in commentLines)
+                    descriptorStream.WriteLine("// {0}", line);
             }
 
             descriptorStream.WriteLine();
 
-            if(!string.IsNullOrEmpty(discimage.Mcn)) descriptorStream.WriteLine("CATALOG {0}", discimage.Mcn);
+            if(!string.IsNullOrEmpty(discimage.Mcn))
+                descriptorStream.WriteLine("CATALOG {0}", discimage.Mcn);
 
             foreach(Track track in writingTracks)
             {
@@ -487,13 +559,16 @@ namespace Aaru.DiscImages
                     case TrackSubchannelType.Packed:
                     case TrackSubchannelType.PackedInterleaved:
                         subchannelType = " RW";
+
                         break;
                     case TrackSubchannelType.Raw:
                     case TrackSubchannelType.RawInterleaved:
                         subchannelType = " RW_RAW";
+
                         break;
                     default:
                         subchannelType = "";
+
                         break;
                 }
 
@@ -501,13 +576,14 @@ namespace Aaru.DiscImages
 
                 trackFlags.TryGetValue((byte)track.TrackSequence, out byte flagsByte);
 
-                CdFlags flags = (CdFlags)flagsByte;
+                var flags = (CdFlags)flagsByte;
 
                 descriptorStream.WriteLine("{0}COPY", flags.HasFlag(CdFlags.CopyPermitted) ? "" : "NO ");
 
                 if(track.TrackType == TrackType.Audio)
                 {
                     descriptorStream.WriteLine("{0}PRE_EMPHASIS", flags.HasFlag(CdFlags.PreEmphasis) ? "" : "NO ");
+
                     descriptorStream.WriteLine("{0}_CHANNEL_AUDIO",
                                                flags.HasFlag(CdFlags.FourChannel) ? "FOUR" : "TWO");
                 }
@@ -515,13 +591,13 @@ namespace Aaru.DiscImages
                 if(trackIsrcs.TryGetValue((byte)track.TrackSequence, out string isrc))
                     descriptorStream.WriteLine("ISRC {0}", isrc);
 
-                (byte minute, byte second, byte frame)
-                    msf = LbaToMsf(track.TrackEndSector - track.TrackStartSector + 1);
+                (byte minute, byte second, byte frame) msf =
+                    LbaToMsf((track.TrackEndSector - track.TrackStartSector) + 1);
 
                 descriptorStream.WriteLine("DATAFILE \"{0}\" #{1} {2:D2}:{3:D2}:{4:D2} // length in bytes: {5}",
                                            Path.GetFileName(track.TrackFile), track.TrackFileOffset, msf.minute,
                                            msf.second, msf.frame,
-                                           (track.TrackEndSector - track.TrackStartSector + 1) *
+                                           ((track.TrackEndSector - track.TrackStartSector) + 1) *
                                            (ulong)(track.TrackRawBytesPerSector +
                                                    (track.TrackSubchannelType != TrackSubchannelType.None ? 96 : 0)));
 
@@ -533,6 +609,7 @@ namespace Aaru.DiscImages
 
             IsWriting    = false;
             ErrorMessage = "";
+
             return true;
         }
 
@@ -540,12 +617,14 @@ namespace Aaru.DiscImages
         {
             discimage.Barcode = metadata.MediaBarcode;
             discimage.Comment = metadata.Comments;
+
             return true;
         }
 
         public bool SetGeometry(uint cylinders, uint heads, uint sectorsPerTrack)
         {
             ErrorMessage = "Unsupported feature";
+
             return false;
         }
 
@@ -554,6 +633,7 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Tried to write on a non-writable image";
+
                 return false;
             }
 
@@ -564,6 +644,7 @@ namespace Aaru.DiscImages
             if(track.TrackSequence == 0)
             {
                 ErrorMessage = $"Can't found track containing {sectorAddress}";
+
                 return false;
             }
 
@@ -574,6 +655,7 @@ namespace Aaru.DiscImages
                     if(data.Length != 1)
                     {
                         ErrorMessage = "Incorrect data size for track flags";
+
                         return false;
                     }
 
@@ -583,7 +665,9 @@ namespace Aaru.DiscImages
                 }
                 case SectorTagType.CdTrackIsrc:
                 {
-                    if(data != null) trackIsrcs.Add((byte)track.TrackSequence, Encoding.UTF8.GetString(data));
+                    if(data != null)
+                        trackIsrcs.Add((byte)track.TrackSequence, Encoding.UTF8.GetString(data));
+
                     return true;
                 }
                 case SectorTagType.CdSectorSubchannel:
@@ -592,12 +676,14 @@ namespace Aaru.DiscImages
                     {
                         ErrorMessage =
                             $"Trying to write subchannel to track {track.TrackSequence}, that does not have subchannel";
+
                         return false;
                     }
 
                     if(data.Length != 96)
                     {
                         ErrorMessage = "Incorrect data size for subchannel";
+
                         return false;
                     }
 
@@ -606,18 +692,21 @@ namespace Aaru.DiscImages
                     if(trackStream == null)
                     {
                         ErrorMessage = $"Can't found file containing {sectorAddress}";
+
                         return false;
                     }
 
-                    trackStream
-                       .Seek((long)(track.TrackFileOffset + (sectorAddress - track.TrackStartSector) * (ulong)(track.TrackRawBytesPerSector + 96)) + track.TrackRawBytesPerSector,
+                    trackStream.
+                        Seek((long)(track.TrackFileOffset + ((sectorAddress - track.TrackStartSector) * (ulong)(track.TrackRawBytesPerSector + 96))) + track.TrackRawBytesPerSector,
                              SeekOrigin.Begin);
+
                     trackStream.Write(data, 0, data.Length);
 
                     return true;
                 }
                 default:
                     ErrorMessage = $"Unsupported tag type {tag}";
+
                     return false;
             }
         }
@@ -627,6 +716,7 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Tried to write on a non-writable image";
+
                 return false;
             }
 
@@ -637,6 +727,7 @@ namespace Aaru.DiscImages
             if(track.TrackSequence == 0)
             {
                 ErrorMessage = $"Can't found track containing {sectorAddress}";
+
                 return false;
             }
 
@@ -650,12 +741,14 @@ namespace Aaru.DiscImages
                     {
                         ErrorMessage =
                             $"Trying to write subchannel to track {track.TrackSequence}, that does not have subchannel";
+
                         return false;
                     }
 
                     if(data.Length % 96 != 0)
                     {
                         ErrorMessage = "Incorrect data size for subchannel";
+
                         return false;
                     }
 
@@ -664,14 +757,16 @@ namespace Aaru.DiscImages
                     if(trackStream == null)
                     {
                         ErrorMessage = $"Can't found file containing {sectorAddress}";
+
                         return false;
                     }
 
                     for(uint i = 0; i < length; i++)
                     {
-                        trackStream
-                           .Seek((long)(track.TrackFileOffset + (i + sectorAddress - track.TrackStartSector) * (ulong)(track.TrackRawBytesPerSector + 96)) + track.TrackRawBytesPerSector,
+                        trackStream.
+                            Seek((long)(track.TrackFileOffset + (((i + sectorAddress) - track.TrackStartSector) * (ulong)(track.TrackRawBytesPerSector + 96))) + track.TrackRawBytesPerSector,
                                  SeekOrigin.Begin);
+
                         trackStream.Write(data, (int)(i * 96), 96);
                     }
 
@@ -679,6 +774,7 @@ namespace Aaru.DiscImages
                 }
                 default:
                     ErrorMessage = $"Unsupported tag type {tag}";
+
                     return false;
             }
         }
diff --git a/Aaru.Images/CDRWin/Constants.cs b/Aaru.Images/CDRWin/Constants.cs
index ea4bfffab..372150515 100644
--- a/Aaru.Images/CDRWin/Constants.cs
+++ b/Aaru.Images/CDRWin/Constants.cs
@@ -172,7 +172,7 @@ namespace Aaru.DiscImages
         const string REGEX_TRURIP_TRACK_SHA1    = @"\bREM\s+(Gap|Trk)\s+(?<number>\d{2}):\s+[\da-f]{40}$";
         const string REGEX_TRURIP_TRACK_UNKNOWN = @"\bREM\s+(Gap|Trk)\s+(?<number>\d{2}):\s+[\da-f]{8,}$";
         const string REGEX_DIC_MEDIA_TYPE       = @"\bREM\s+METADATA DIC MEDIA-TYPE:\s+(?<mediatype>.+)$";
-        const string REGEX_AARU_MEDIA_TYPE       = @"\bREM\s+METADATA AARU MEDIA-TYPE:\s+(?<mediatype>.+)$";
+        const string REGEX_AARU_MEDIA_TYPE      = @"\bREM\s+METADATA AARU MEDIA-TYPE:\s+(?<mediatype>.+)$";
         const string REGEX_APPLICATION_VERSION  = @"\bREM\s+Ripping Tool Version:\s+(?<application>.+)$";
         const string REGEX_DUMP_EXTENT =
             @"\bREM\s+METADATA DUMP EXTENT:\s+(?<application>.+)\s+\|\s+(?<version>.+)\s+\|\s+(?<os>.+)\s+\|\s+(?<manufacturer>.+)\s+\|\s+(?<model>.+)\s+\|\s+(?<firmware>.+)\s+\|\s+(?<serial>.+)\s+\|\s+(?<start>\d+):(?<end>\d+)$";
diff --git a/Aaru.Images/CDRWin/Helpers.cs b/Aaru.Images/CDRWin/Helpers.cs
index 9026c099d..438391486 100644
--- a/Aaru.Images/CDRWin/Helpers.cs
+++ b/Aaru.Images/CDRWin/Helpers.cs
@@ -144,7 +144,7 @@ namespace Aaru.DiscImages
             }
         }
 
-        static(byte minute, byte second, byte frame) LbaToMsf(ulong sector) =>
+        static (byte minute, byte second, byte frame) LbaToMsf(ulong sector) =>
             ((byte)(sector / 75 / 60), (byte)((sector / 75) % 60), (byte)(sector % 75));
 
         static string GetTrackMode(Track track)
@@ -235,7 +235,7 @@ namespace Aaru.DiscImages
                 case MediaType.HDDVDROM:  return CDRWIN_DISK_TYPE_HDDVD;
                 case MediaType.HDDVDRW:   return CDRWIN_DISK_TYPE_HDDVDRW;
                 case MediaType.HDDVDRWDL: return CDRWIN_DISK_TYPE_HDDVDRWDL;
-                default:                  return"";
+                default:                  return "";
             }
         }
     }
diff --git a/Aaru.Images/CDRWin/Read.cs b/Aaru.Images/CDRWin/Read.cs
index 9f81f0b78..1c8be3af7 100644
--- a/Aaru.Images/CDRWin/Read.cs
+++ b/Aaru.Images/CDRWin/Read.cs
@@ -213,9 +213,9 @@ namespace Aaru.DiscImages
                         if(matchTruripTrackCrc32.Success)
                         {
                             AaruConsole.DebugWriteLine("CDRWin plugin", "Found CRC32 for {1} {2} at line {0}",
-                                                      lineNumber,
-                                                      matchTruripTrackCrc32.Groups[1].Value == "Trk" ? "track" : "gap",
-                                                      matchTruripTrackCrc32.Groups[2].Value);
+                                                       lineNumber,
+                                                       matchTruripTrackCrc32.Groups[1].Value == "Trk" ? "track" : "gap",
+                                                       matchTruripTrackCrc32.Groups[2].Value);
 
                             continue;
                         }
@@ -223,9 +223,9 @@ namespace Aaru.DiscImages
                         if(matchTruripTrackMd5.Success)
                         {
                             AaruConsole.DebugWriteLine("CDRWin plugin", "Found CRC32 for {1} {2} at line {0}",
-                                                      lineNumber,
-                                                      matchTruripTrackMd5.Groups[1].Value == "Trk" ? "track" : "gap",
-                                                      matchTruripTrackMd5.Groups[2].Value);
+                                                       lineNumber,
+                                                       matchTruripTrackMd5.Groups[1].Value == "Trk" ? "track" : "gap",
+                                                       matchTruripTrackMd5.Groups[2].Value);
 
                             continue;
                         }
@@ -233,9 +233,9 @@ namespace Aaru.DiscImages
                         if(matchTruripTrackSha1.Success)
                         {
                             AaruConsole.DebugWriteLine("CDRWin plugin", "Found CRC32 for {1} {2} at line {0}",
-                                                      lineNumber,
-                                                      matchTruripTrackSha1.Groups[1].Value == "Trk" ? "track" : "gap",
-                                                      matchTruripTrackSha1.Groups[2].Value);
+                                                       lineNumber,
+                                                       matchTruripTrackSha1.Groups[1].Value == "Trk" ? "track" : "gap",
+                                                       matchTruripTrackSha1.Groups[2].Value);
 
                             continue;
                         }
@@ -243,10 +243,10 @@ namespace Aaru.DiscImages
                         if(matchTruripTrackUnknownHash.Success)
                         {
                             AaruConsole.DebugWriteLine("CDRWin plugin",
-                                                      "Found unknown hash for {1} {2} at line {0}. Please report this disc image.",
-                                                      lineNumber,
-                                                      matchTruripTrackUnknownHash.Groups[1].Value == "Trk" ? "track"
-                                                          : "gap", matchTruripTrackUnknownHash.Groups[2].Value);
+                                                       "Found unknown hash for {1} {2} at line {0}. Please report this disc image.",
+                                                       lineNumber,
+                                                       matchTruripTrackUnknownHash.Groups[1].Value == "Trk" ? "track"
+                                                           : "gap", matchTruripTrackUnknownHash.Groups[2].Value);
 
                             continue;
                         }
@@ -261,7 +261,7 @@ namespace Aaru.DiscImages
                        ulong.TryParse(matchDumpExtent.Groups["end"].Value, out ulong extentEnd))
                     {
                         AaruConsole.DebugWriteLine("CDRWin plugin", "Found REM METADATA DUMP EXTENT at line {0}",
-                                                  lineNumber);
+                                                   lineNumber);
 
                         if(DumpHardware is null)
                             DumpHardware = new List<DumpHardwareType>();
@@ -317,7 +317,7 @@ namespace Aaru.DiscImages
                             !inTrack)
                     {
                         AaruConsole.DebugWriteLine("CDRWin plugin", "Found REM METADATA DIC MEDIA-TYPE at line {0}",
-                                                  lineNumber);
+                                                   lineNumber);
 
                         _discImage.AaruMediaType = matchDicMediaType.Groups[1].Value;
                     }
@@ -325,7 +325,7 @@ namespace Aaru.DiscImages
                             !inTrack)
                     {
                         AaruConsole.DebugWriteLine("CDRWin plugin", "Found REM METADATA AARU MEDIA-TYPE at line {0}",
-                                                  lineNumber);
+                                                   lineNumber);
 
                         _discImage.AaruMediaType = matchAaruMediaType.Groups[1].Value;
                     }
@@ -333,7 +333,7 @@ namespace Aaru.DiscImages
                             !inTrack)
                     {
                         AaruConsole.DebugWriteLine("CDRWin plugin", "Found REM ORIGINAL MEDIA TYPE at line {0}",
-                                                  lineNumber);
+                                                   lineNumber);
 
                         _discImage.OriginalMediaType = matchDiskType.Groups[1].Value;
                     }
@@ -357,7 +357,7 @@ namespace Aaru.DiscImages
                             !inTrack)
                     {
                         AaruConsole.DebugWriteLine("CDRWin plugin", "Found REM Ripping Tool Version at line {0}",
-                                                  lineNumber);
+                                                   lineNumber);
 
                         _imageInfo.ApplicationVersion = matchApplicationVersion.Groups[1].Value;
                     }
@@ -369,9 +369,9 @@ namespace Aaru.DiscImages
                     else if(matchTruripTrack.Success)
                     {
                         AaruConsole.DebugWriteLine("CDRWin plugin",
-                                                  "Found REM Gap Append Method: {1} [{2}] HASHES at line {0}",
-                                                  lineNumber, matchTruripTrack.Groups[1].Value,
-                                                  matchTruripTrack.Groups[2].Value);
+                                                   "Found REM Gap Append Method: {1} [{2}] HASHES at line {0}",
+                                                   lineNumber, matchTruripTrack.Groups[1].Value,
+                                                   matchTruripTrack.Groups[2].Value);
 
                         inTruripTrackHash   = true;
                         _discImage.IsTrurip = true;
@@ -554,7 +554,7 @@ namespace Aaru.DiscImages
 
                             // File does exist, process it
                             AaruConsole.DebugWriteLine("CDRWin plugin", "File \"{0}\" found",
-                                                      currentFile.DataFilter.GetFilename());
+                                                       currentFile.DataFilter.GetFilename());
 
                             switch(currentFile.FileType)
                             {
@@ -623,22 +623,22 @@ namespace Aaru.DiscImages
                                         cueTracks[currentTrack.Sequence - 2].Bps;
 
                                     AaruConsole.DebugWriteLine("CDRWin plugin", "Sets currentFile.offset to {0}",
-                                                              currentFile.Offset);
+                                                               currentFile.Offset);
 
                                     AaruConsole.DebugWriteLine("CDRWin plugin",
-                                                              "cueTracks[currentTrack.sequence-2].sectors = {0}",
-                                                              cueTracks[currentTrack.Sequence - 2].Sectors);
+                                                               "cueTracks[currentTrack.sequence-2].sectors = {0}",
+                                                               cueTracks[currentTrack.Sequence - 2].Sectors);
 
                                     AaruConsole.DebugWriteLine("CDRWin plugin",
-                                                              "cueTracks[currentTrack.sequence-2].bps = {0}",
-                                                              cueTracks[currentTrack.Sequence - 2].Bps);
+                                                               "cueTracks[currentTrack.sequence-2].bps = {0}",
+                                                               cueTracks[currentTrack.Sequence - 2].Bps);
                                 }
 
                             if((index == 0 || (index == 1 && !currentTrack.Indexes.ContainsKey(0))) &&
                                currentTrack.Sequence == 1)
                             {
                                 AaruConsole.DebugWriteLine("CDRWin plugin", "Sets currentFile.offset to {0}",
-                                                          offset * currentTrack.Bps);
+                                                           offset * currentTrack.Bps);
 
                                 currentFile.Offset = offset * currentTrack.Bps;
                             }
@@ -738,7 +738,7 @@ namespace Aaru.DiscImages
                             };
 
                             AaruConsole.DebugWriteLine("CDRWin plugin", "Setting currentTrack.sequence to {0}",
-                                                      currentTrack.Sequence);
+                                                       currentTrack.Sequence);
 
                             currentFile.Sequence   = currentTrack.Sequence;
                             currentTrack.Bps       = CdrWinTrackTypeToBytesPerSector(matchTrack.Groups[2].Value);
@@ -747,7 +747,7 @@ namespace Aaru.DiscImages
                             inTrack                = true;
                         }
                         else if(line == "") // Empty line, ignore it
-                        { }
+                        {}
                         else // Non-empty unknown field
                             throw new
                                 FeatureUnsupportedImageException($"Found unknown field defined at line {lineNumber}: \"{line}\"");
@@ -923,7 +923,7 @@ namespace Aaru.DiscImages
                     AaruConsole.DebugWriteLine("CDRWin plugin", "\tISOBuster disc type not set.");
                 else
                     AaruConsole.DebugWriteLine("CDRWin plugin", "\tISOBuster disc type: {0}",
-                                              _discImage.OriginalMediaType);
+                                               _discImage.OriginalMediaType);
 
                 AaruConsole.DebugWriteLine("CDRWin plugin", "\tGuessed disk type: {0}", _discImage.MediaType);
 
@@ -955,16 +955,16 @@ namespace Aaru.DiscImages
                     AaruConsole.DebugWriteLine("CDRWin plugin", "\tSession {0} information:", i + 1);
 
                     AaruConsole.DebugWriteLine("CDRWin plugin", "\t\tStarting track: {0}",
-                                              _discImage.Sessions[i].StartTrack);
+                                               _discImage.Sessions[i].StartTrack);
 
                     AaruConsole.DebugWriteLine("CDRWin plugin", "\t\tStarting sector: {0}",
-                                              _discImage.Sessions[i].StartSector);
+                                               _discImage.Sessions[i].StartSector);
 
                     AaruConsole.DebugWriteLine("CDRWin plugin", "\t\tEnding track: {0}",
-                                              _discImage.Sessions[i].EndTrack);
+                                               _discImage.Sessions[i].EndTrack);
 
                     AaruConsole.DebugWriteLine("CDRWin plugin", "\t\tEnding sector: {0}",
-                                              _discImage.Sessions[i].EndSector);
+                                               _discImage.Sessions[i].EndSector);
                 }
 
                 AaruConsole.DebugWriteLine("CDRWin plugin", "Track information:");
@@ -973,14 +973,14 @@ namespace Aaru.DiscImages
                 for(int i = 0; i < _discImage.Tracks.Count; i++)
                 {
                     AaruConsole.DebugWriteLine("CDRWin plugin", "\tTrack {0} information:",
-                                              _discImage.Tracks[i].Sequence);
+                                               _discImage.Tracks[i].Sequence);
 
                     AaruConsole.DebugWriteLine("CDRWin plugin", "\t\t{0} bytes per sector", _discImage.Tracks[i].Bps);
                     AaruConsole.DebugWriteLine("CDRWin plugin", "\t\tPregap: {0} sectors", _discImage.Tracks[i].Pregap);
                     AaruConsole.DebugWriteLine("CDRWin plugin", "\t\tData: {0} sectors", _discImage.Tracks[i].Sectors);
 
                     AaruConsole.DebugWriteLine("CDRWin plugin", "\t\tPostgap: {0} sectors",
-                                              _discImage.Tracks[i].Postgap);
+                                               _discImage.Tracks[i].Postgap);
 
                     if(_discImage.Tracks[i].Flag4ch)
                         AaruConsole.DebugWriteLine("CDRWin plugin", "\t\tTrack is flagged as quadraphonic");
@@ -995,16 +995,16 @@ namespace Aaru.DiscImages
                         AaruConsole.DebugWriteLine("CDRWin plugin", "\t\tTrack has SCMS");
 
                     AaruConsole.DebugWriteLine("CDRWin plugin",
-                                              "\t\tTrack resides in file {0}, type defined as {1}, starting at byte {2}",
-                                              _discImage.Tracks[i].TrackFile.DataFilter.GetFilename(),
-                                              _discImage.Tracks[i].TrackFile.FileType,
-                                              _discImage.Tracks[i].TrackFile.Offset);
+                                               "\t\tTrack resides in file {0}, type defined as {1}, starting at byte {2}",
+                                               _discImage.Tracks[i].TrackFile.DataFilter.GetFilename(),
+                                               _discImage.Tracks[i].TrackFile.FileType,
+                                               _discImage.Tracks[i].TrackFile.Offset);
 
                     AaruConsole.DebugWriteLine("CDRWin plugin", "\t\tIndexes:");
 
                     foreach(KeyValuePair<int, ulong> kvp in _discImage.Tracks[i].Indexes)
                         AaruConsole.DebugWriteLine("CDRWin plugin", "\t\t\tIndex {0} starts at sector {1}", kvp.Key,
-                                                  kvp.Value);
+                                                   kvp.Value);
 
                     if(_discImage.Tracks[i].Isrc == null)
                         AaruConsole.DebugWriteLine("CDRWin plugin", "\t\tISRC is not set.");
@@ -1030,13 +1030,13 @@ namespace Aaru.DiscImages
                         AaruConsole.DebugWriteLine("CDRWin plugin", "\t\tPerformer is not set.");
                     else
                         AaruConsole.DebugWriteLine("CDRWin plugin", "\t\tPerformer: {0}",
-                                                  _discImage.Tracks[i].Performer);
+                                                   _discImage.Tracks[i].Performer);
 
                     if(_discImage.Tracks[i].Songwriter == null)
                         AaruConsole.DebugWriteLine("CDRWin plugin", "\t\tSongwriter is not set.");
                     else
                         AaruConsole.DebugWriteLine("CDRWin plugin", "\t\tSongwriter: {0}",
-                                                  _discImage.Tracks[i].Songwriter);
+                                                   _discImage.Tracks[i].Songwriter);
 
                     if(_discImage.Tracks[i].Title == null)
                         AaruConsole.DebugWriteLine("CDRWin plugin", "\t\tTitle is not set.");
diff --git a/Aaru.Images/CHD/CHD.cs b/Aaru.Images/CHD/CHD.cs
index 160d58752..ccf370d0c 100644
--- a/Aaru.Images/CHD/CHD.cs
+++ b/Aaru.Images/CHD/CHD.cs
@@ -43,7 +43,10 @@ namespace Aaru.DiscImages
     public partial class Chd : IOpticalMediaImage, IVerifiableImage
     {
         /// <summary>"MComprHD"</summary>
-        readonly byte[] chdTag = {0x4D, 0x43, 0x6F, 0x6D, 0x70, 0x72, 0x48, 0x44};
+        readonly byte[] chdTag =
+        {
+            0x4D, 0x43, 0x6F, 0x6D, 0x70, 0x72, 0x48, 0x44
+        };
         uint                      bytesPerHunk;
         byte[]                    cis;
         byte[]                    expectedChecksum;
@@ -72,29 +75,17 @@ namespace Aaru.DiscImages
         uint                      totalHunks;
         Dictionary<uint, Track>   tracks;
 
-        public Chd()
+        public Chd() => imageInfo = new ImageInfo
         {
-            imageInfo = new ImageInfo
-            {
-                ReadableSectorTags    = new List<SectorTagType>(),
-                ReadableMediaTags     = new List<MediaTagType>(),
-                HasPartitions         = false,
-                HasSessions           = false,
-                Application           = "MAME",
-                Creator               = null,
-                Comments              = null,
-                MediaManufacturer     = null,
-                MediaModel            = null,
-                MediaSerialNumber     = null,
-                MediaBarcode          = null,
-                MediaPartNumber       = null,
-                MediaSequence         = 0,
-                LastMediaSequence     = 0,
-                DriveManufacturer     = null,
-                DriveModel            = null,
-                DriveSerialNumber     = null,
-                DriveFirmwareRevision = null
-            };
-        }
+            ReadableSectorTags    = new List<SectorTagType>(), ReadableMediaTags = new List<MediaTagType>(),
+            HasPartitions         = false, HasSessions                           = false, Application = "MAME",
+            Creator               = null,
+            Comments              = null, MediaManufacturer = null, MediaModel = null,
+            MediaSerialNumber     = null,
+            MediaBarcode          = null, MediaPartNumber = null, MediaSequence = 0,
+            LastMediaSequence     = 0,
+            DriveManufacturer     = null, DriveModel = null, DriveSerialNumber = null,
+            DriveFirmwareRevision = null
+        };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/CHD/Enums.cs b/Aaru.Images/CHD/Enums.cs
index 1e53c27e3..e7d669768 100644
--- a/Aaru.Images/CHD/Enums.cs
+++ b/Aaru.Images/CHD/Enums.cs
@@ -36,16 +36,13 @@ namespace Aaru.DiscImages
     {
         enum ChdCompression : uint
         {
-            None     = 0,
-            Zlib     = 1,
-            ZlibPlus = 2,
-            Av       = 3
+            None = 0, Zlib = 1, ZlibPlus = 2,
+            Av   = 3
         }
 
         enum ChdFlags : uint
         {
-            HasParent = 1,
-            Writable  = 2
+            HasParent = 1, Writable = 2
         }
 
         enum Chdv3EntryFlags : byte
@@ -68,21 +65,14 @@ namespace Aaru.DiscImages
 
         enum ChdOldTrackType : uint
         {
-            Mode1 = 0,
-            Mode1Raw,
-            Mode2,
-            Mode2Form1,
-            Mode2Form2,
-            Mode2FormMix,
-            Mode2Raw,
-            Audio
+            Mode1 = 0, Mode1Raw, Mode2,
+            Mode2Form1, Mode2Form2, Mode2FormMix,
+            Mode2Raw, Audio
         }
 
         enum ChdOldSubType : uint
         {
-            Cooked = 0,
-            Raw,
-            None
+            Cooked = 0, Raw, None
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/CHD/Helpers.cs b/Aaru.Images/CHD/Helpers.cs
index d5221bb6a..dbbafac4e 100644
--- a/Aaru.Images/CHD/Helpers.cs
+++ b/Aaru.Images/CHD/Helpers.cs
@@ -46,7 +46,8 @@ namespace Aaru.DiscImages
     {
         Track GetTrack(ulong sector)
         {
-            Track track = new Track();
+            var track = new Track();
+
             foreach(KeyValuePair<ulong, uint> kvp in offsetmap.Where(kvp => sector >= kvp.Key))
                 tracks.TryGetValue(kvp.Value, out track);
 
@@ -56,12 +57,14 @@ namespace Aaru.DiscImages
         ulong GetAbsoluteSector(ulong relativeSector, uint track)
         {
             tracks.TryGetValue(track, out Track aaruTrack);
+
             return aaruTrack.TrackStartSector + relativeSector;
         }
 
         byte[] GetHunk(ulong hunkNo)
         {
-            if(hunkCache.TryGetValue(hunkNo, out byte[] hunk)) return hunk;
+            if(hunkCache.TryGetValue(hunkNo, out byte[] hunk))
+                return hunk;
 
             switch(mapVersion)
             {
@@ -73,16 +76,17 @@ namespace Aaru.DiscImages
                     imageStream.Seek((long)offset, SeekOrigin.Begin);
                     imageStream.Read(compHunk, 0, compHunk.Length);
 
-                    if(length                              == sectorsPerHunk * imageInfo.SectorSize) hunk = compHunk;
+                    if(length == sectorsPerHunk * imageInfo.SectorSize)
+                        hunk = compHunk;
                     else if((ChdCompression)hdrCompression > ChdCompression.Zlib)
                         throw new
                             ImageNotSupportedException($"Unsupported compression {(ChdCompression)hdrCompression}");
                     else
                     {
-                        DeflateStream zStream =
-                            new DeflateStream(new MemoryStream(compHunk), CompressionMode.Decompress);
+                        var zStream = new DeflateStream(new MemoryStream(compHunk), CompressionMode.Decompress);
                         hunk = new byte[sectorsPerHunk * imageInfo.SectorSize];
                         int read = zStream.Read(hunk, 0, (int)(sectorsPerHunk * imageInfo.SectorSize));
+
                         if(read != sectorsPerHunk * imageInfo.SectorSize)
                             throw new
                                 IOException($"Unable to decompress hunk correctly, got {read} bytes, expected {sectorsPerHunk * imageInfo.SectorSize}");
@@ -95,6 +99,7 @@ namespace Aaru.DiscImages
                     byte[] entryBytes = new byte[16];
                     Array.Copy(hunkMap, (int)(hunkNo * 16), entryBytes, 0, 16);
                     ChdMapV3Entry entry = Marshal.ByteArrayToStructureBigEndian<ChdMapV3Entry>(entryBytes);
+
                     switch((Chdv3EntryFlags)(entry.flags & 0x0F))
                     {
                         case Chdv3EntryFlags.Invalid: throw new ArgumentException("Invalid hunk found.");
@@ -109,16 +114,20 @@ namespace Aaru.DiscImages
                                         byte[] zHunk = new byte[(entry.lengthLsb << 16) + entry.lengthLsb];
                                         imageStream.Seek((long)entry.offset, SeekOrigin.Begin);
                                         imageStream.Read(zHunk, 0, zHunk.Length);
-                                        DeflateStream zStream =
+
+                                        var zStream =
                                             new DeflateStream(new MemoryStream(zHunk), CompressionMode.Decompress);
+
                                         hunk = new byte[bytesPerHunk];
                                         int read = zStream.Read(hunk, 0, (int)bytesPerHunk);
+
                                         if(read != bytesPerHunk)
                                             throw new
                                                 IOException($"Unable to decompress hunk correctly, got {read} bytes, expected {bytesPerHunk}");
 
                                         zStream.Close();
                                     }
+
                                     // TODO: Guess wth is MAME doing with these hunks
                                     else
                                         throw new
@@ -136,12 +145,15 @@ namespace Aaru.DiscImages
                             hunk = new byte[bytesPerHunk];
                             imageStream.Seek((long)entry.offset, SeekOrigin.Begin);
                             imageStream.Read(hunk, 0, hunk.Length);
+
                             break;
                         case Chdv3EntryFlags.Mini:
                             hunk = new byte[bytesPerHunk];
                             byte[] mini;
                             mini = BigEndianBitConverter.GetBytes(entry.offset);
-                            for(int i = 0; i < bytesPerHunk; i++) hunk[i] = mini[i % 8];
+
+                            for(int i = 0; i < bytesPerHunk; i++)
+                                hunk[i] = mini[i % 8];
 
                             break;
                         case Chdv3EntryFlags.SelfHunk: return GetHunk(entry.offset);
@@ -161,13 +173,15 @@ namespace Aaru.DiscImages
                         imageStream.Seek(hunkTableSmall[hunkNo] * bytesPerHunk, SeekOrigin.Begin);
                         imageStream.Read(hunk, 0, hunk.Length);
                     }
-                    else throw new ImageNotSupportedException("Compressed v5 hunks not yet supported");
+                    else
+                        throw new ImageNotSupportedException("Compressed v5 hunks not yet supported");
 
                     break;
                 default: throw new ImageNotSupportedException($"Unsupported hunk map version {mapVersion}");
             }
 
-            if(hunkCache.Count >= maxBlockCache) hunkCache.Clear();
+            if(hunkCache.Count >= maxBlockCache)
+                hunkCache.Clear();
 
             hunkCache.Add(hunkNo, hunk);
 
diff --git a/Aaru.Images/CHD/Properties.cs b/Aaru.Images/CHD/Properties.cs
index c36a041b3..68a30e376 100644
--- a/Aaru.Images/CHD/Properties.cs
+++ b/Aaru.Images/CHD/Properties.cs
@@ -47,6 +47,7 @@ namespace Aaru.DiscImages
         public Guid      Id     => new Guid("0D50233A-08BD-47D4-988B-27EAA0358597");
         public string    Format => "Compressed Hunks of Data";
         public string    Author => "Natalia Portillo";
+
         public List<Partition> Partitions
         {
             get
@@ -58,6 +59,7 @@ namespace Aaru.DiscImages
                 return partitions;
             }
         }
+
         public List<Track> Tracks
         {
             get
@@ -69,6 +71,7 @@ namespace Aaru.DiscImages
                 return tracks.Values.ToList();
             }
         }
+
         public List<Session> Sessions
         {
             get
@@ -80,6 +83,7 @@ namespace Aaru.DiscImages
                 throw new NotImplementedException();
             }
         }
+
         public List<DumpHardwareType> DumpHardware => null;
         public CICMMetadataType       CicmMetadata => null;
     }
diff --git a/Aaru.Images/CHD/Read.cs b/Aaru.Images/CHD/Read.cs
index c4baf64e4..31beb2e65 100644
--- a/Aaru.Images/CHD/Read.cs
+++ b/Aaru.Images/CHD/Read.cs
@@ -81,13 +81,15 @@ namespace Aaru.DiscImages
                 {
                     ChdHeaderV1 hdrV1 = Marshal.ByteArrayToStructureBigEndian<ChdHeaderV1>(buffer);
 
-                    AaruConsole.DebugWriteLine("CHD plugin", "hdrV1.tag = \"{0}\"", Encoding.ASCII.GetString(hdrV1.tag));
+                    AaruConsole.DebugWriteLine("CHD plugin", "hdrV1.tag = \"{0}\"",
+                                               Encoding.ASCII.GetString(hdrV1.tag));
+
                     AaruConsole.DebugWriteLine("CHD plugin", "hdrV1.length = {0} bytes", hdrV1.length);
                     AaruConsole.DebugWriteLine("CHD plugin", "hdrV1.version = {0}", hdrV1.version);
                     AaruConsole.DebugWriteLine("CHD plugin", "hdrV1.flags = {0}", (ChdFlags)hdrV1.flags);
 
                     AaruConsole.DebugWriteLine("CHD plugin", "hdrV1.compression = {0}",
-                                              (ChdCompression)hdrV1.compression);
+                                               (ChdCompression)hdrV1.compression);
 
                     AaruConsole.DebugWriteLine("CHD plugin", "hdrV1.hunksize = {0}", hdrV1.hunksize);
                     AaruConsole.DebugWriteLine("CHD plugin", "hdrV1.totalhunks = {0}", hdrV1.totalhunks);
@@ -97,8 +99,8 @@ namespace Aaru.DiscImages
                     AaruConsole.DebugWriteLine("CHD plugin", "hdrV1.md5 = {0}", ArrayHelpers.ByteArrayToHex(hdrV1.md5));
 
                     AaruConsole.DebugWriteLine("CHD plugin", "hdrV1.parentmd5 = {0}",
-                                              ArrayHelpers.ArrayIsNullOrEmpty(hdrV1.parentmd5) ? "null"
-                                                  : ArrayHelpers.ByteArrayToHex(hdrV1.parentmd5));
+                                               ArrayHelpers.ArrayIsNullOrEmpty(hdrV1.parentmd5) ? "null"
+                                                   : ArrayHelpers.ByteArrayToHex(hdrV1.parentmd5));
 
                     AaruConsole.DebugWriteLine("CHD plugin", "Reading Hunk map.");
                     DateTime start = DateTime.UtcNow;
@@ -154,13 +156,15 @@ namespace Aaru.DiscImages
                 {
                     ChdHeaderV2 hdrV2 = Marshal.ByteArrayToStructureBigEndian<ChdHeaderV2>(buffer);
 
-                    AaruConsole.DebugWriteLine("CHD plugin", "hdrV2.tag = \"{0}\"", Encoding.ASCII.GetString(hdrV2.tag));
+                    AaruConsole.DebugWriteLine("CHD plugin", "hdrV2.tag = \"{0}\"",
+                                               Encoding.ASCII.GetString(hdrV2.tag));
+
                     AaruConsole.DebugWriteLine("CHD plugin", "hdrV2.length = {0} bytes", hdrV2.length);
                     AaruConsole.DebugWriteLine("CHD plugin", "hdrV2.version = {0}", hdrV2.version);
                     AaruConsole.DebugWriteLine("CHD plugin", "hdrV2.flags = {0}", (ChdFlags)hdrV2.flags);
 
                     AaruConsole.DebugWriteLine("CHD plugin", "hdrV2.compression = {0}",
-                                              (ChdCompression)hdrV2.compression);
+                                               (ChdCompression)hdrV2.compression);
 
                     AaruConsole.DebugWriteLine("CHD plugin", "hdrV2.hunksize = {0}", hdrV2.hunksize);
                     AaruConsole.DebugWriteLine("CHD plugin", "hdrV2.totalhunks = {0}", hdrV2.totalhunks);
@@ -170,8 +174,8 @@ namespace Aaru.DiscImages
                     AaruConsole.DebugWriteLine("CHD plugin", "hdrV2.md5 = {0}", ArrayHelpers.ByteArrayToHex(hdrV2.md5));
 
                     AaruConsole.DebugWriteLine("CHD plugin", "hdrV2.parentmd5 = {0}",
-                                              ArrayHelpers.ArrayIsNullOrEmpty(hdrV2.parentmd5) ? "null"
-                                                  : ArrayHelpers.ByteArrayToHex(hdrV2.parentmd5));
+                                               ArrayHelpers.ArrayIsNullOrEmpty(hdrV2.parentmd5) ? "null"
+                                                   : ArrayHelpers.ByteArrayToHex(hdrV2.parentmd5));
 
                     AaruConsole.DebugWriteLine("CHD plugin", "hdrV2.seclen = {0}", hdrV2.seclen);
 
@@ -230,13 +234,15 @@ namespace Aaru.DiscImages
                 {
                     ChdHeaderV3 hdrV3 = Marshal.ByteArrayToStructureBigEndian<ChdHeaderV3>(buffer);
 
-                    AaruConsole.DebugWriteLine("CHD plugin", "hdrV3.tag = \"{0}\"", Encoding.ASCII.GetString(hdrV3.tag));
+                    AaruConsole.DebugWriteLine("CHD plugin", "hdrV3.tag = \"{0}\"",
+                                               Encoding.ASCII.GetString(hdrV3.tag));
+
                     AaruConsole.DebugWriteLine("CHD plugin", "hdrV3.length = {0} bytes", hdrV3.length);
                     AaruConsole.DebugWriteLine("CHD plugin", "hdrV3.version = {0}", hdrV3.version);
                     AaruConsole.DebugWriteLine("CHD plugin", "hdrV3.flags = {0}", (ChdFlags)hdrV3.flags);
 
                     AaruConsole.DebugWriteLine("CHD plugin", "hdrV3.compression = {0}",
-                                              (ChdCompression)hdrV3.compression);
+                                               (ChdCompression)hdrV3.compression);
 
                     AaruConsole.DebugWriteLine("CHD plugin", "hdrV3.totalhunks = {0}", hdrV3.totalhunks);
                     AaruConsole.DebugWriteLine("CHD plugin", "hdrV3.logicalbytes = {0}", hdrV3.logicalbytes);
@@ -244,17 +250,17 @@ namespace Aaru.DiscImages
                     AaruConsole.DebugWriteLine("CHD plugin", "hdrV3.md5 = {0}", ArrayHelpers.ByteArrayToHex(hdrV3.md5));
 
                     AaruConsole.DebugWriteLine("CHD plugin", "hdrV3.parentmd5 = {0}",
-                                              ArrayHelpers.ArrayIsNullOrEmpty(hdrV3.parentmd5) ? "null"
-                                                  : ArrayHelpers.ByteArrayToHex(hdrV3.parentmd5));
+                                               ArrayHelpers.ArrayIsNullOrEmpty(hdrV3.parentmd5) ? "null"
+                                                   : ArrayHelpers.ByteArrayToHex(hdrV3.parentmd5));
 
                     AaruConsole.DebugWriteLine("CHD plugin", "hdrV3.hunkbytes = {0}", hdrV3.hunkbytes);
 
                     AaruConsole.DebugWriteLine("CHD plugin", "hdrV3.sha1 = {0}",
-                                              ArrayHelpers.ByteArrayToHex(hdrV3.sha1));
+                                               ArrayHelpers.ByteArrayToHex(hdrV3.sha1));
 
                     AaruConsole.DebugWriteLine("CHD plugin", "hdrV3.parentsha1 = {0}",
-                                              ArrayHelpers.ArrayIsNullOrEmpty(hdrV3.parentsha1) ? "null"
-                                                  : ArrayHelpers.ByteArrayToHex(hdrV3.parentsha1));
+                                               ArrayHelpers.ArrayIsNullOrEmpty(hdrV3.parentsha1) ? "null"
+                                                   : ArrayHelpers.ByteArrayToHex(hdrV3.parentsha1));
 
                     AaruConsole.DebugWriteLine("CHD plugin", "Reading Hunk map.");
                     DateTime start = DateTime.UtcNow;
@@ -282,13 +288,15 @@ namespace Aaru.DiscImages
                 {
                     ChdHeaderV4 hdrV4 = Marshal.ByteArrayToStructureBigEndian<ChdHeaderV4>(buffer);
 
-                    AaruConsole.DebugWriteLine("CHD plugin", "hdrV4.tag = \"{0}\"", Encoding.ASCII.GetString(hdrV4.tag));
+                    AaruConsole.DebugWriteLine("CHD plugin", "hdrV4.tag = \"{0}\"",
+                                               Encoding.ASCII.GetString(hdrV4.tag));
+
                     AaruConsole.DebugWriteLine("CHD plugin", "hdrV4.length = {0} bytes", hdrV4.length);
                     AaruConsole.DebugWriteLine("CHD plugin", "hdrV4.version = {0}", hdrV4.version);
                     AaruConsole.DebugWriteLine("CHD plugin", "hdrV4.flags = {0}", (ChdFlags)hdrV4.flags);
 
                     AaruConsole.DebugWriteLine("CHD plugin", "hdrV4.compression = {0}",
-                                              (ChdCompression)hdrV4.compression);
+                                               (ChdCompression)hdrV4.compression);
 
                     AaruConsole.DebugWriteLine("CHD plugin", "hdrV4.totalhunks = {0}", hdrV4.totalhunks);
                     AaruConsole.DebugWriteLine("CHD plugin", "hdrV4.logicalbytes = {0}", hdrV4.logicalbytes);
@@ -296,14 +304,14 @@ namespace Aaru.DiscImages
                     AaruConsole.DebugWriteLine("CHD plugin", "hdrV4.hunkbytes = {0}", hdrV4.hunkbytes);
 
                     AaruConsole.DebugWriteLine("CHD plugin", "hdrV4.sha1 = {0}",
-                                              ArrayHelpers.ByteArrayToHex(hdrV4.sha1));
+                                               ArrayHelpers.ByteArrayToHex(hdrV4.sha1));
 
                     AaruConsole.DebugWriteLine("CHD plugin", "hdrV4.parentsha1 = {0}",
-                                              ArrayHelpers.ArrayIsNullOrEmpty(hdrV4.parentsha1) ? "null"
-                                                  : ArrayHelpers.ByteArrayToHex(hdrV4.parentsha1));
+                                               ArrayHelpers.ArrayIsNullOrEmpty(hdrV4.parentsha1) ? "null"
+                                                   : ArrayHelpers.ByteArrayToHex(hdrV4.parentsha1));
 
                     AaruConsole.DebugWriteLine("CHD plugin", "hdrV4.rawsha1 = {0}",
-                                              ArrayHelpers.ByteArrayToHex(hdrV4.rawsha1));
+                                               ArrayHelpers.ByteArrayToHex(hdrV4.rawsha1));
 
                     AaruConsole.DebugWriteLine("CHD plugin", "Reading Hunk map.");
                     DateTime start = DateTime.UtcNow;
@@ -331,25 +339,27 @@ namespace Aaru.DiscImages
                 {
                     ChdHeaderV5 hdrV5 = Marshal.ByteArrayToStructureBigEndian<ChdHeaderV5>(buffer);
 
-                    AaruConsole.DebugWriteLine("CHD plugin", "hdrV5.tag = \"{0}\"", Encoding.ASCII.GetString(hdrV5.tag));
+                    AaruConsole.DebugWriteLine("CHD plugin", "hdrV5.tag = \"{0}\"",
+                                               Encoding.ASCII.GetString(hdrV5.tag));
+
                     AaruConsole.DebugWriteLine("CHD plugin", "hdrV5.length = {0} bytes", hdrV5.length);
                     AaruConsole.DebugWriteLine("CHD plugin", "hdrV5.version = {0}", hdrV5.version);
 
                     AaruConsole.DebugWriteLine("CHD plugin", "hdrV5.compressor0 = \"{0}\"",
-                                              Encoding.ASCII.GetString(BigEndianBitConverter.
-                                                                           GetBytes(hdrV5.compressor0)));
+                                               Encoding.ASCII.GetString(BigEndianBitConverter.
+                                                                            GetBytes(hdrV5.compressor0)));
 
                     AaruConsole.DebugWriteLine("CHD plugin", "hdrV5.compressor1 = \"{0}\"",
-                                              Encoding.ASCII.GetString(BigEndianBitConverter.
-                                                                           GetBytes(hdrV5.compressor1)));
+                                               Encoding.ASCII.GetString(BigEndianBitConverter.
+                                                                            GetBytes(hdrV5.compressor1)));
 
                     AaruConsole.DebugWriteLine("CHD plugin", "hdrV5.compressor2 = \"{0}\"",
-                                              Encoding.ASCII.GetString(BigEndianBitConverter.
-                                                                           GetBytes(hdrV5.compressor2)));
+                                               Encoding.ASCII.GetString(BigEndianBitConverter.
+                                                                            GetBytes(hdrV5.compressor2)));
 
                     AaruConsole.DebugWriteLine("CHD plugin", "hdrV5.compressor3 = \"{0}\"",
-                                              Encoding.ASCII.GetString(BigEndianBitConverter.
-                                                                           GetBytes(hdrV5.compressor3)));
+                                               Encoding.ASCII.GetString(BigEndianBitConverter.
+                                                                            GetBytes(hdrV5.compressor3)));
 
                     AaruConsole.DebugWriteLine("CHD plugin", "hdrV5.logicalbytes = {0}", hdrV5.logicalbytes);
                     AaruConsole.DebugWriteLine("CHD plugin", "hdrV5.mapoffset = {0}", hdrV5.mapoffset);
@@ -358,14 +368,14 @@ namespace Aaru.DiscImages
                     AaruConsole.DebugWriteLine("CHD plugin", "hdrV5.unitbytes = {0}", hdrV5.unitbytes);
 
                     AaruConsole.DebugWriteLine("CHD plugin", "hdrV5.sha1 = {0}",
-                                              ArrayHelpers.ByteArrayToHex(hdrV5.sha1));
+                                               ArrayHelpers.ByteArrayToHex(hdrV5.sha1));
 
                     AaruConsole.DebugWriteLine("CHD plugin", "hdrV5.parentsha1 = {0}",
-                                              ArrayHelpers.ArrayIsNullOrEmpty(hdrV5.parentsha1) ? "null"
-                                                  : ArrayHelpers.ByteArrayToHex(hdrV5.parentsha1));
+                                               ArrayHelpers.ArrayIsNullOrEmpty(hdrV5.parentsha1) ? "null"
+                                                   : ArrayHelpers.ByteArrayToHex(hdrV5.parentsha1));
 
                     AaruConsole.DebugWriteLine("CHD plugin", "hdrV5.rawsha1 = {0}",
-                                              ArrayHelpers.ByteArrayToHex(hdrV5.rawsha1));
+                                               ArrayHelpers.ByteArrayToHex(hdrV5.rawsha1));
 
                     // TODO: Implement compressed CHD v5
                     if(hdrV5.compressor0 == 0)
@@ -449,7 +459,7 @@ namespace Aaru.DiscImages
                     stream.Read(meta, 0, meta.Length);
 
                     AaruConsole.DebugWriteLine("CHD plugin", "Found metadata \"{0}\"",
-                                              Encoding.ASCII.GetString(BigEndianBitConverter.GetBytes(header.tag)));
+                                               Encoding.ASCII.GetString(BigEndianBitConverter.GetBytes(header.tag)));
 
                     switch(header.tag)
                     {
@@ -587,7 +597,7 @@ namespace Aaru.DiscImages
                                 aaruTrack.TrackStartSector =  currentSector;
                                 aaruTrack.TrackSequence    =  i + 1;
                                 aaruTrack.TrackSession     =  1;
-                                currentSector             += chdTrack.frames + chdTrack.extraFrames;
+                                currentSector              += chdTrack.frames + chdTrack.extraFrames;
                                 tracks.Add(aaruTrack.TrackSequence, aaruTrack);
                             }
 
@@ -709,7 +719,7 @@ namespace Aaru.DiscImages
                                 aaruTrack.TrackStartSector =  currentSector;
                                 aaruTrack.TrackSequence    =  trackNo;
                                 aaruTrack.TrackSession     =  1;
-                                currentSector             += frames;
+                                currentSector              += frames;
                                 currentTrack++;
                                 tracks.Add(aaruTrack.TrackSequence, aaruTrack);
                             }
@@ -836,7 +846,7 @@ namespace Aaru.DiscImages
                                 aaruTrack.TrackStartSector =  currentSector;
                                 aaruTrack.TrackSequence    =  trackNo;
                                 aaruTrack.TrackSession     =  1;
-                                currentSector             += frames;
+                                currentSector              += frames;
                                 currentTrack++;
                                 tracks.Add(aaruTrack.TrackSequence, aaruTrack);
                             }
@@ -969,7 +979,7 @@ namespace Aaru.DiscImages
                                 aaruTrack.TrackStartSector =  currentSector;
                                 aaruTrack.TrackSequence    =  trackNo;
                                 aaruTrack.TrackSession     =  (ushort)(trackNo > 2 ? 2 : 1);
-                                currentSector             += frames;
+                                currentSector              += frames;
                                 currentTrack++;
                                 tracks.Add(aaruTrack.TrackSequence, aaruTrack);
                             }
@@ -978,7 +988,7 @@ namespace Aaru.DiscImages
 
                         // "IDNT"
                         case HARD_DISK_IDENT_METADATA:
-                            Identify.IdentifyDevice? idnt = global::Aaru.CommonTypes.Structs.Devices.ATA.Identify.Decode(meta);
+                            Identify.IdentifyDevice? idnt = CommonTypes.Structs.Devices.ATA.Identify.Decode(meta);
 
                             if(idnt.HasValue)
                             {
diff --git a/Aaru.Images/CHD/Structs.cs b/Aaru.Images/CHD/Structs.cs
index 1f7f6ef14..bd9e6c9c7 100644
--- a/Aaru.Images/CHD/Structs.cs
+++ b/Aaru.Images/CHD/Structs.cs
@@ -41,205 +41,119 @@ namespace Aaru.DiscImages
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct ChdHeaderV1
         {
-            /// <summary>
-            ///     Magic identifier, 'MComprHD'
-            /// </summary>
+            /// <summary>Magic identifier, 'MComprHD'</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public byte[] tag;
-            /// <summary>
-            ///     Length of header
-            /// </summary>
-            public uint length;
-            /// <summary>
-            ///     Image format version
-            /// </summary>
-            public uint version;
-            /// <summary>
-            ///     Image flags, <see cref="ChdFlags" />
-            /// </summary>
-            public uint flags;
-            /// <summary>
-            ///     Compression algorithm, <see cref="ChdCompression" />
-            /// </summary>
-            public uint compression;
-            /// <summary>
-            ///     Sectors per hunk
-            /// </summary>
-            public uint hunksize;
-            /// <summary>
-            ///     Total # of hunk in image
-            /// </summary>
-            public uint totalhunks;
-            /// <summary>
-            ///     Cylinders on disk
-            /// </summary>
-            public uint cylinders;
-            /// <summary>
-            ///     Heads per cylinder
-            /// </summary>
-            public uint heads;
-            /// <summary>
-            ///     Sectors per track
-            /// </summary>
-            public uint sectors;
-            /// <summary>
-            ///     MD5 of raw data
-            /// </summary>
+            public readonly byte[] tag;
+            /// <summary>Length of header</summary>
+            public readonly uint length;
+            /// <summary>Image format version</summary>
+            public readonly uint version;
+            /// <summary>Image flags, <see cref="ChdFlags" /></summary>
+            public readonly uint flags;
+            /// <summary>Compression algorithm, <see cref="ChdCompression" /></summary>
+            public readonly uint compression;
+            /// <summary>Sectors per hunk</summary>
+            public readonly uint hunksize;
+            /// <summary>Total # of hunk in image</summary>
+            public readonly uint totalhunks;
+            /// <summary>Cylinders on disk</summary>
+            public readonly uint cylinders;
+            /// <summary>Heads per cylinder</summary>
+            public readonly uint heads;
+            /// <summary>Sectors per track</summary>
+            public readonly uint sectors;
+            /// <summary>MD5 of raw data</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public byte[] md5;
-            /// <summary>
-            ///     MD5 of parent file
-            /// </summary>
+            public readonly byte[] md5;
+            /// <summary>MD5 of parent file</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public byte[] parentmd5;
+            public readonly byte[] parentmd5;
         }
 
         // Hunks are represented in a 64 bit integer with 44 bit as offset, 20 bits as length
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct ChdHeaderV2
         {
-            /// <summary>
-            ///     Magic identifier, 'MComprHD'
-            /// </summary>
+            /// <summary>Magic identifier, 'MComprHD'</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public byte[] tag;
-            /// <summary>
-            ///     Length of header
-            /// </summary>
-            public uint length;
-            /// <summary>
-            ///     Image format version
-            /// </summary>
-            public uint version;
-            /// <summary>
-            ///     Image flags, <see cref="ChdFlags" />
-            /// </summary>
-            public uint flags;
-            /// <summary>
-            ///     Compression algorithm, <see cref="ChdCompression" />
-            /// </summary>
-            public uint compression;
-            /// <summary>
-            ///     Sectors per hunk
-            /// </summary>
-            public uint hunksize;
-            /// <summary>
-            ///     Total # of hunk in image
-            /// </summary>
-            public uint totalhunks;
-            /// <summary>
-            ///     Cylinders on disk
-            /// </summary>
-            public uint cylinders;
-            /// <summary>
-            ///     Heads per cylinder
-            /// </summary>
-            public uint heads;
-            /// <summary>
-            ///     Sectors per track
-            /// </summary>
-            public uint sectors;
-            /// <summary>
-            ///     MD5 of raw data
-            /// </summary>
+            public readonly byte[] tag;
+            /// <summary>Length of header</summary>
+            public readonly uint length;
+            /// <summary>Image format version</summary>
+            public readonly uint version;
+            /// <summary>Image flags, <see cref="ChdFlags" /></summary>
+            public readonly uint flags;
+            /// <summary>Compression algorithm, <see cref="ChdCompression" /></summary>
+            public readonly uint compression;
+            /// <summary>Sectors per hunk</summary>
+            public readonly uint hunksize;
+            /// <summary>Total # of hunk in image</summary>
+            public readonly uint totalhunks;
+            /// <summary>Cylinders on disk</summary>
+            public readonly uint cylinders;
+            /// <summary>Heads per cylinder</summary>
+            public readonly uint heads;
+            /// <summary>Sectors per track</summary>
+            public readonly uint sectors;
+            /// <summary>MD5 of raw data</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public byte[] md5;
-            /// <summary>
-            ///     MD5 of parent file
-            /// </summary>
+            public readonly byte[] md5;
+            /// <summary>MD5 of parent file</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public byte[] parentmd5;
-            /// <summary>
-            ///     Bytes per sector
-            /// </summary>
-            public uint seclen;
+            public readonly byte[] parentmd5;
+            /// <summary>Bytes per sector</summary>
+            public readonly uint seclen;
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct ChdHeaderV3
         {
-            /// <summary>
-            ///     Magic identifier, 'MComprHD'
-            /// </summary>
+            /// <summary>Magic identifier, 'MComprHD'</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public byte[] tag;
-            /// <summary>
-            ///     Length of header
-            /// </summary>
-            public uint length;
-            /// <summary>
-            ///     Image format version
-            /// </summary>
-            public uint version;
-            /// <summary>
-            ///     Image flags, <see cref="ChdFlags" />
-            /// </summary>
-            public uint flags;
-            /// <summary>
-            ///     Compression algorithm, <see cref="ChdCompression" />
-            /// </summary>
-            public uint compression;
-            /// <summary>
-            ///     Total # of hunk in image
-            /// </summary>
-            public uint totalhunks;
-            /// <summary>
-            ///     Total bytes in image
-            /// </summary>
-            public ulong logicalbytes;
-            /// <summary>
-            ///     Offset to first metadata blob
-            /// </summary>
-            public ulong metaoffset;
-            /// <summary>
-            ///     MD5 of raw data
-            /// </summary>
+            public readonly byte[] tag;
+            /// <summary>Length of header</summary>
+            public readonly uint length;
+            /// <summary>Image format version</summary>
+            public readonly uint version;
+            /// <summary>Image flags, <see cref="ChdFlags" /></summary>
+            public readonly uint flags;
+            /// <summary>Compression algorithm, <see cref="ChdCompression" /></summary>
+            public readonly uint compression;
+            /// <summary>Total # of hunk in image</summary>
+            public readonly uint totalhunks;
+            /// <summary>Total bytes in image</summary>
+            public readonly ulong logicalbytes;
+            /// <summary>Offset to first metadata blob</summary>
+            public readonly ulong metaoffset;
+            /// <summary>MD5 of raw data</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public byte[] md5;
-            /// <summary>
-            ///     MD5 of parent file
-            /// </summary>
+            public readonly byte[] md5;
+            /// <summary>MD5 of parent file</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public byte[] parentmd5;
-            /// <summary>
-            ///     Bytes per hunk
-            /// </summary>
-            public uint hunkbytes;
-            /// <summary>
-            ///     SHA1 of raw data
-            /// </summary>
+            public readonly byte[] parentmd5;
+            /// <summary>Bytes per hunk</summary>
+            public readonly uint hunkbytes;
+            /// <summary>SHA1 of raw data</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 20)]
-            public byte[] sha1;
-            /// <summary>
-            ///     SHA1 of parent file
-            /// </summary>
+            public readonly byte[] sha1;
+            /// <summary>SHA1 of parent file</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 20)]
-            public byte[] parentsha1;
+            public readonly byte[] parentsha1;
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct ChdMapV3Entry
         {
-            /// <summary>
-            ///     Offset to hunk from start of image
-            /// </summary>
-            public ulong offset;
-            /// <summary>
-            ///     CRC32 of uncompressed hunk
-            /// </summary>
-            public uint crc;
-            /// <summary>
-            ///     Lower 16 bits of length
-            /// </summary>
-            public ushort lengthLsb;
-            /// <summary>
-            ///     Upper 8 bits of length
-            /// </summary>
-            public byte length;
-            /// <summary>
-            ///     Hunk flags
-            /// </summary>
-            public byte flags;
+            /// <summary>Offset to hunk from start of image</summary>
+            public readonly ulong offset;
+            /// <summary>CRC32 of uncompressed hunk</summary>
+            public readonly uint crc;
+            /// <summary>Lower 16 bits of length</summary>
+            public readonly ushort lengthLsb;
+            /// <summary>Upper 8 bits of length</summary>
+            public readonly byte length;
+            /// <summary>Hunk flags</summary>
+            public readonly byte flags;
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
@@ -256,188 +170,120 @@ namespace Aaru.DiscImages
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct ChdHeaderV4
         {
-            /// <summary>
-            ///     Magic identifier, 'MComprHD'
-            /// </summary>
+            /// <summary>Magic identifier, 'MComprHD'</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public byte[] tag;
-            /// <summary>
-            ///     Length of header
-            /// </summary>
-            public uint length;
-            /// <summary>
-            ///     Image format version
-            /// </summary>
-            public uint version;
-            /// <summary>
-            ///     Image flags, <see cref="ChdFlags" />
-            /// </summary>
-            public uint flags;
-            /// <summary>
-            ///     Compression algorithm, <see cref="ChdCompression" />
-            /// </summary>
-            public uint compression;
-            /// <summary>
-            ///     Total # of hunk in image
-            /// </summary>
-            public uint totalhunks;
-            /// <summary>
-            ///     Total bytes in image
-            /// </summary>
-            public ulong logicalbytes;
-            /// <summary>
-            ///     Offset to first metadata blob
-            /// </summary>
-            public ulong metaoffset;
-            /// <summary>
-            ///     Bytes per hunk
-            /// </summary>
-            public uint hunkbytes;
-            /// <summary>
-            ///     SHA1 of raw+meta data
-            /// </summary>
+            public readonly byte[] tag;
+            /// <summary>Length of header</summary>
+            public readonly uint length;
+            /// <summary>Image format version</summary>
+            public readonly uint version;
+            /// <summary>Image flags, <see cref="ChdFlags" /></summary>
+            public readonly uint flags;
+            /// <summary>Compression algorithm, <see cref="ChdCompression" /></summary>
+            public readonly uint compression;
+            /// <summary>Total # of hunk in image</summary>
+            public readonly uint totalhunks;
+            /// <summary>Total bytes in image</summary>
+            public readonly ulong logicalbytes;
+            /// <summary>Offset to first metadata blob</summary>
+            public readonly ulong metaoffset;
+            /// <summary>Bytes per hunk</summary>
+            public readonly uint hunkbytes;
+            /// <summary>SHA1 of raw+meta data</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 20)]
-            public byte[] sha1;
-            /// <summary>
-            ///     SHA1 of parent file
-            /// </summary>
+            public readonly byte[] sha1;
+            /// <summary>SHA1 of parent file</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 20)]
-            public byte[] parentsha1;
-            /// <summary>
-            ///     SHA1 of raw data
-            /// </summary>
+            public readonly byte[] parentsha1;
+            /// <summary>SHA1 of raw data</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 20)]
-            public byte[] rawsha1;
+            public readonly byte[] rawsha1;
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct ChdHeaderV5
         {
-            /// <summary>
-            ///     Magic identifier, 'MComprHD'
-            /// </summary>
+            /// <summary>Magic identifier, 'MComprHD'</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public byte[] tag;
-            /// <summary>
-            ///     Length of header
-            /// </summary>
-            public uint length;
-            /// <summary>
-            ///     Image format version
-            /// </summary>
-            public uint version;
-            /// <summary>
-            ///     Compressor 0
-            /// </summary>
-            public uint compressor0;
-            /// <summary>
-            ///     Compressor 1
-            /// </summary>
-            public uint compressor1;
-            /// <summary>
-            ///     Compressor 2
-            /// </summary>
-            public uint compressor2;
-            /// <summary>
-            ///     Compressor 3
-            /// </summary>
-            public uint compressor3;
-            /// <summary>
-            ///     Total bytes in image
-            /// </summary>
-            public ulong logicalbytes;
-            /// <summary>
-            ///     Offset to hunk map
-            /// </summary>
-            public ulong mapoffset;
-            /// <summary>
-            ///     Offset to first metadata blob
-            /// </summary>
-            public ulong metaoffset;
-            /// <summary>
-            ///     Bytes per hunk
-            /// </summary>
-            public uint hunkbytes;
-            /// <summary>
-            ///     Bytes per unit within hunk
-            /// </summary>
-            public uint unitbytes;
-            /// <summary>
-            ///     SHA1 of raw data
-            /// </summary>
+            public readonly byte[] tag;
+            /// <summary>Length of header</summary>
+            public readonly uint length;
+            /// <summary>Image format version</summary>
+            public readonly uint version;
+            /// <summary>Compressor 0</summary>
+            public readonly uint compressor0;
+            /// <summary>Compressor 1</summary>
+            public readonly uint compressor1;
+            /// <summary>Compressor 2</summary>
+            public readonly uint compressor2;
+            /// <summary>Compressor 3</summary>
+            public readonly uint compressor3;
+            /// <summary>Total bytes in image</summary>
+            public readonly ulong logicalbytes;
+            /// <summary>Offset to hunk map</summary>
+            public readonly ulong mapoffset;
+            /// <summary>Offset to first metadata blob</summary>
+            public readonly ulong metaoffset;
+            /// <summary>Bytes per hunk</summary>
+            public readonly uint hunkbytes;
+            /// <summary>Bytes per unit within hunk</summary>
+            public readonly uint unitbytes;
+            /// <summary>SHA1 of raw data</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 20)]
-            public byte[] rawsha1;
-            /// <summary>
-            ///     SHA1 of raw+meta data
-            /// </summary>
+            public readonly byte[] rawsha1;
+            /// <summary>SHA1 of raw+meta data</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 20)]
-            public byte[] sha1;
-            /// <summary>
-            ///     SHA1 of parent file
-            /// </summary>
+            public readonly byte[] sha1;
+            /// <summary>SHA1 of parent file</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 20)]
-            public byte[] parentsha1;
+            public readonly byte[] parentsha1;
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct ChdCompressedMapHeaderV5
         {
-            /// <summary>
-            ///     Length of compressed map
-            /// </summary>
-            public uint length;
-            /// <summary>
-            ///     Offset of first block (48 bits) and CRC16 of map (16 bits)
-            /// </summary>
-            public ulong startAndCrc;
-            /// <summary>
-            ///     Bits used to encode compressed length on map entry
-            /// </summary>
-            public byte bitsUsedToEncodeCompLength;
-            /// <summary>
-            ///     Bits used to encode self-refs
-            /// </summary>
-            public byte bitsUsedToEncodeSelfRefs;
-            /// <summary>
-            ///     Bits used to encode parent unit refs
-            /// </summary>
-            public byte bitsUsedToEncodeParentUnits;
-            public byte reserved;
+            /// <summary>Length of compressed map</summary>
+            public readonly uint length;
+            /// <summary>Offset of first block (48 bits) and CRC16 of map (16 bits)</summary>
+            public readonly ulong startAndCrc;
+            /// <summary>Bits used to encode compressed length on map entry</summary>
+            public readonly byte bitsUsedToEncodeCompLength;
+            /// <summary>Bits used to encode self-refs</summary>
+            public readonly byte bitsUsedToEncodeSelfRefs;
+            /// <summary>Bits used to encode parent unit refs</summary>
+            public readonly byte bitsUsedToEncodeParentUnits;
+            public readonly byte reserved;
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct ChdMapV5Entry
         {
-            /// <summary>
-            ///     Compression (8 bits) and length (24 bits)
-            /// </summary>
-            public uint compAndLength;
-            /// <summary>
-            ///     Offset (48 bits) and CRC (16 bits)
-            /// </summary>
-            public ulong offsetAndCrc;
+            /// <summary>Compression (8 bits) and length (24 bits)</summary>
+            public readonly uint compAndLength;
+            /// <summary>Offset (48 bits) and CRC (16 bits)</summary>
+            public readonly ulong offsetAndCrc;
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct ChdMetadataHeader
         {
-            public uint  tag;
-            public uint  flagsAndLength;
-            public ulong next;
+            public readonly uint  tag;
+            public readonly uint  flagsAndLength;
+            public readonly ulong next;
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct HunkSector
         {
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 64)]
-            public ulong[] hunkEntry;
+            public readonly ulong[] hunkEntry;
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct HunkSectorSmall
         {
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 128)]
-            public uint[] hunkEntry;
+            public readonly uint[] hunkEntry;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/CHD/Verify.cs b/Aaru.Images/CHD/Verify.cs
index c49e825f1..dbec110e8 100644
--- a/Aaru.Images/CHD/Verify.cs
+++ b/Aaru.Images/CHD/Verify.cs
@@ -42,18 +42,22 @@ namespace Aaru.DiscImages
     {
         public bool? VerifySector(ulong sectorAddress)
         {
-            if(isHdd) return null;
+            if(isHdd)
+                return null;
 
             byte[] buffer = ReadSectorLong(sectorAddress);
+
             return CdChecksums.CheckCdSector(buffer);
         }
 
-        public bool? VerifySectors(ulong           sectorAddress, uint length, out List<ulong> failingLbas,
+        public bool? VerifySectors(ulong sectorAddress, uint length, out List<ulong> failingLbas,
                                    out List<ulong> unknownLbas)
         {
             unknownLbas = new List<ulong>();
             failingLbas = new List<ulong>();
-            if(isHdd) return null;
+
+            if(isHdd)
+                return null;
 
             byte[] buffer = ReadSectorsLong(sectorAddress, length);
             int    bps    = (int)(buffer.Length / length);
@@ -68,24 +72,29 @@ namespace Aaru.DiscImages
                 {
                     case null:
                         unknownLbas.Add((ulong)i + sectorAddress);
+
                         break;
                     case false:
                         failingLbas.Add((ulong)i + sectorAddress);
+
                         break;
                 }
             }
 
-            if(unknownLbas.Count > 0) return null;
+            if(unknownLbas.Count > 0)
+                return null;
 
             return failingLbas.Count <= 0;
         }
 
-        public bool? VerifySectors(ulong           sectorAddress, uint length, uint track, out List<ulong> failingLbas,
+        public bool? VerifySectors(ulong sectorAddress, uint length, uint track, out List<ulong> failingLbas,
                                    out List<ulong> unknownLbas)
         {
             unknownLbas = new List<ulong>();
             failingLbas = new List<ulong>();
-            if(isHdd) return null;
+
+            if(isHdd)
+                return null;
 
             byte[] buffer = ReadSectorsLong(sectorAddress, length, track);
             int    bps    = (int)(buffer.Length / length);
@@ -100,14 +109,17 @@ namespace Aaru.DiscImages
                 {
                     case null:
                         unknownLbas.Add((ulong)i + sectorAddress);
+
                         break;
                     case false:
                         failingLbas.Add((ulong)i + sectorAddress);
+
                         break;
                 }
             }
 
-            if(unknownLbas.Count > 0) return null;
+            if(unknownLbas.Count > 0)
+                return null;
 
             return failingLbas.Count <= 0;
         }
@@ -115,17 +127,22 @@ namespace Aaru.DiscImages
         public bool? VerifyMediaImage()
         {
             byte[] calculated;
+
             if(mapVersion >= 3)
             {
-                Sha1Context sha1Ctx = new Sha1Context();
-                for(uint i = 0; i < totalHunks; i++) sha1Ctx.Update(GetHunk(i));
+                var sha1Ctx = new Sha1Context();
+
+                for(uint i = 0; i < totalHunks; i++)
+                    sha1Ctx.Update(GetHunk(i));
 
                 calculated = sha1Ctx.Final();
             }
             else
             {
-                Md5Context md5Ctx = new Md5Context();
-                for(uint i = 0; i < totalHunks; i++) md5Ctx.Update(GetHunk(i));
+                var md5Ctx = new Md5Context();
+
+                for(uint i = 0; i < totalHunks; i++)
+                    md5Ctx.Update(GetHunk(i));
 
                 calculated = md5Ctx.Final();
             }
diff --git a/Aaru.Images/CPCDSK/CPCDSK.cs b/Aaru.Images/CPCDSK/CPCDSK.cs
index 45c55fe7f..d15176fb9 100644
--- a/Aaru.Images/CPCDSK/CPCDSK.cs
+++ b/Aaru.Images/CPCDSK/CPCDSK.cs
@@ -44,31 +44,18 @@ namespace Aaru.DiscImages
         ImageInfo                 imageInfo;
         Dictionary<ulong, byte[]> sectors;
 
-        public Cpcdsk()
+        public Cpcdsk() => imageInfo = new ImageInfo
         {
-            imageInfo = new ImageInfo
-            {
-                ReadableSectorTags    = new List<SectorTagType>(),
-                ReadableMediaTags     = new List<MediaTagType>(),
-                HasPartitions         = false,
-                HasSessions           = false,
-                Version               = null,
-                Application           = null,
-                ApplicationVersion    = null,
-                Creator               = null,
-                Comments              = null,
-                MediaManufacturer     = null,
-                MediaModel            = null,
-                MediaSerialNumber     = null,
-                MediaBarcode          = null,
-                MediaPartNumber       = null,
-                MediaSequence         = 0,
-                LastMediaSequence     = 0,
-                DriveManufacturer     = null,
-                DriveModel            = null,
-                DriveSerialNumber     = null,
-                DriveFirmwareRevision = null
-            };
-        }
+            ReadableSectorTags = new List<SectorTagType>(), ReadableMediaTags = new List<MediaTagType>(),
+            HasPartitions      = false, HasSessions                           = false, Version = null,
+            Application        = null,
+            ApplicationVersion = null, Creator = null, Comments = null,
+            MediaManufacturer  = null,
+            MediaModel         = null, MediaSerialNumber = null, MediaBarcode = null,
+            MediaPartNumber    = null,
+            MediaSequence      = 0, LastMediaSequence = 0, DriveManufacturer = null,
+            DriveModel         = null,
+            DriveSerialNumber  = null, DriveFirmwareRevision = null
+        };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/CPCDSK/Constants.cs b/Aaru.Images/CPCDSK/Constants.cs
index b1067748f..b0eb64f14 100644
--- a/Aaru.Images/CPCDSK/Constants.cs
+++ b/Aaru.Images/CPCDSK/Constants.cs
@@ -34,32 +34,27 @@ namespace Aaru.DiscImages
 {
     public partial class Cpcdsk
     {
-        /// <summary>
-        ///     Identifier for CPCEMU disk images, "MV - CPC" + usually : "EMU Disk-File\r\nDisk-Info\r\n" but not required
-        /// </summary>
+        /// <summary>Identifier for CPCEMU disk images, "MV - CPC" + usually : "EMU Disk-File\r\nDisk-Info\r\n" but not required</summary>
         readonly byte[] cpcdskId =
         {
             0x4D, 0x56, 0x20, 0x2D, 0x20, 0x43, 0x50, 0x43
         };
-        /// <summary>
-        ///     Identifier for DU54 disk images, "MV - CPC format Disk Image (DU54)"
-        /// </summary>
+        /// <summary>Identifier for DU54 disk images, "MV - CPC format Disk Image (DU54)"</summary>
         readonly byte[] du54Id =
         {
-            0x4D, 0x56, 0x20, 0x2D, 0x20, 0x43, 0x50, 0x43, 0x20, 0x66, 0x6F, 0x72, 0x6D, 0x61, 0x74, 0x20, 0x44,
-            0x69, 0x73, 0x6B, 0x20
+            0x4D, 0x56, 0x20, 0x2D, 0x20, 0x43, 0x50, 0x43, 0x20, 0x66, 0x6F, 0x72, 0x6D, 0x61, 0x74, 0x20, 0x44, 0x69,
+            0x73, 0x6B, 0x20
         };
-        /// <summary>
-        ///     Identifier for Extended CPCEMU disk images, "EXTENDED CPC DSK File"
-        /// </summary>
+        /// <summary>Identifier for Extended CPCEMU disk images, "EXTENDED CPC DSK File"</summary>
         readonly byte[] edskId =
         {
-            0x45, 0x58, 0x54, 0x45, 0x4E, 0x44, 0x45, 0x44, 0x20, 0x43, 0x50, 0x43, 0x20, 0x44, 0x53, 0x4B, 0x20,
-            0x46, 0x69, 0x6C, 0x65
+            0x45, 0x58, 0x54, 0x45, 0x4E, 0x44, 0x45, 0x44, 0x20, 0x43, 0x50, 0x43, 0x20, 0x44, 0x53, 0x4B, 0x20, 0x46,
+            0x69, 0x6C, 0x65
+        };
+        /// <summary>Identifier for track information, "Track-Info\r\n"</summary>
+        readonly byte[] trackId =
+        {
+            0x54, 0x72, 0x61, 0x63, 0x6B, 0x2D, 0x49, 0x6E, 0x66, 0x6F
         };
-        /// <summary>
-        ///     Identifier for track information, "Track-Info\r\n"
-        /// </summary>
-        readonly byte[] trackId = {0x54, 0x72, 0x61, 0x63, 0x6B, 0x2D, 0x49, 0x6E, 0x66, 0x6F};
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/CPCDSK/Identify.cs b/Aaru.Images/CPCDSK/Identify.cs
index 299bc4867..d12b6395b 100644
--- a/Aaru.Images/CPCDSK/Identify.cs
+++ b/Aaru.Images/CPCDSK/Identify.cs
@@ -45,14 +45,15 @@ namespace Aaru.DiscImages
             Stream stream = imageFilter.GetDataForkStream();
             stream.Seek(0, SeekOrigin.Begin);
 
-            if(stream.Length < 512) return false;
+            if(stream.Length < 512)
+                return false;
 
             byte[] headerB = new byte[256];
             stream.Read(headerB, 0, 256);
             CpcDiskInfo header = Marshal.ByteArrayToStructureLittleEndian<CpcDiskInfo>(headerB);
 
             AaruConsole.DebugWriteLine("CPCDSK plugin", "header.magic = \"{0}\"",
-                                      StringHandlers.CToString(header.magic));
+                                       StringHandlers.CToString(header.magic));
 
             return cpcdskId.SequenceEqual(header.magic.Take(cpcdskId.Length)) || edskId.SequenceEqual(header.magic) ||
                    du54Id.SequenceEqual(header.magic);
diff --git a/Aaru.Images/CPCDSK/Read.cs b/Aaru.Images/CPCDSK/Read.cs
index 2d6bcb246..a807f9768 100644
--- a/Aaru.Images/CPCDSK/Read.cs
+++ b/Aaru.Images/CPCDSK/Read.cs
@@ -60,7 +60,7 @@ namespace Aaru.DiscImages
             CpcDiskInfo header = Marshal.ByteArrayToStructureLittleEndian<CpcDiskInfo>(headerB);
 
             if(!cpcdskId.SequenceEqual(header.magic.Take(cpcdskId.Length)) &&
-               !edskId.SequenceEqual(header.magic)   &&
+               !edskId.SequenceEqual(header.magic)                         &&
                !du54Id.SequenceEqual(header.magic))
                 return false;
 
@@ -68,13 +68,13 @@ namespace Aaru.DiscImages
             AaruConsole.DebugWriteLine("CPCDSK plugin", "Extended = {0}", extended);
 
             AaruConsole.DebugWriteLine("CPCDSK plugin", "header.magic = \"{0}\"",
-                                      StringHandlers.CToString(header.magic));
+                                       StringHandlers.CToString(header.magic));
 
             AaruConsole.DebugWriteLine("CPCDSK plugin", "header.magic2 = \"{0}\"",
-                                      StringHandlers.CToString(header.magic2));
+                                       StringHandlers.CToString(header.magic2));
 
             AaruConsole.DebugWriteLine("CPCDSK plugin", "header.creator = \"{0}\"",
-                                      StringHandlers.CToString(header.creator));
+                                       StringHandlers.CToString(header.creator));
 
             AaruConsole.DebugWriteLine("CPCDSK plugin", "header.tracks = {0}", header.tracks);
             AaruConsole.DebugWriteLine("CPCDSK plugin", "header.sides = {0}", header.sides);
@@ -86,7 +86,7 @@ namespace Aaru.DiscImages
                 {
                     for(int j = 0; j < header.sides; j++)
                         AaruConsole.DebugWriteLine("CPCDSK plugin", "Track {0} Side {1} size = {2}", i, j,
-                                                  header.tracksizeTable[(i * header.sides) + j] * 256);
+                                                   header.tracksizeTable[(i * header.sides) + j] * 256);
                 }
 
             ulong currentSector = 0;
@@ -121,31 +121,33 @@ namespace Aaru.DiscImages
                     }
 
                     AaruConsole.DebugWriteLine("CPCDSK plugin", "trackInfo[{1}:{2}].magic = \"{0}\"",
-                                              StringHandlers.CToString(trackInfo.magic), i, j);
+                                               StringHandlers.CToString(trackInfo.magic), i, j);
 
                     AaruConsole.DebugWriteLine("CPCDSK plugin", "trackInfo[{1}:{2}].bps = {0}",
-                                              SizeCodeToBytes(trackInfo.bps), i, j);
+                                               SizeCodeToBytes(trackInfo.bps), i, j);
 
                     AaruConsole.DebugWriteLine("CPCDSK plugin", "trackInfo[{1}:{2}].dataRate = {0}", trackInfo.dataRate,
-                                              i, j);
+                                               i, j);
 
-                    AaruConsole.DebugWriteLine("CPCDSK plugin", "trackInfo[{1}:{2}].filler = 0x{0:X2}", trackInfo.filler,
-                                              i, j);
+                    AaruConsole.DebugWriteLine("CPCDSK plugin", "trackInfo[{1}:{2}].filler = 0x{0:X2}",
+                                               trackInfo.filler, i, j);
 
                     AaruConsole.DebugWriteLine("CPCDSK plugin", "trackInfo[{1}:{2}].gap3 = 0x{0:X2}", trackInfo.gap3, i,
-                                              j);
+                                               j);
 
-                    AaruConsole.DebugWriteLine("CPCDSK plugin", "trackInfo[{1}:{2}].padding = {0}", trackInfo.padding, i,
-                                              j);
+                    AaruConsole.DebugWriteLine("CPCDSK plugin", "trackInfo[{1}:{2}].padding = {0}", trackInfo.padding,
+                                               i, j);
 
                     AaruConsole.DebugWriteLine("CPCDSK plugin", "trackInfo[{1}:{2}].recordingMode = {0}",
-                                              trackInfo.recordingMode, i, j);
+                                               trackInfo.recordingMode, i, j);
 
-                    AaruConsole.DebugWriteLine("CPCDSK plugin", "trackInfo[{1}:{2}].sectors = {0}", trackInfo.sectors, i,
-                                              j);
+                    AaruConsole.DebugWriteLine("CPCDSK plugin", "trackInfo[{1}:{2}].sectors = {0}", trackInfo.sectors,
+                                               i, j);
 
                     AaruConsole.DebugWriteLine("CPCDSK plugin", "trackInfo[{1}:{2}].side = {0}", trackInfo.side, i, j);
-                    AaruConsole.DebugWriteLine("CPCDSK plugin", "trackInfo[{1}:{2}].track = {0}", trackInfo.track, i, j);
+
+                    AaruConsole.DebugWriteLine("CPCDSK plugin", "trackInfo[{1}:{2}].track = {0}", trackInfo.track, i,
+                                               j);
 
                     if(trackInfo.sectors != sectorsPerTrack)
                         if(sectorsPerTrack == 0)
@@ -159,25 +161,25 @@ namespace Aaru.DiscImages
                     for(int k = 1; k <= trackInfo.sectors; k++)
                     {
                         AaruConsole.DebugWriteLine("CPCDSK plugin", "trackInfo[{1}:{2}].sector[{3}].id = 0x{0:X2}",
-                                                  trackInfo.sectorsInfo[k - 1].id, i, j, k);
+                                                   trackInfo.sectorsInfo[k - 1].id, i, j, k);
 
                         AaruConsole.DebugWriteLine("CPCDSK plugin", "trackInfo[{1}:{2}].sector[{3}].len = {0}",
-                                                  trackInfo.sectorsInfo[k - 1].len, i, j, k);
+                                                   trackInfo.sectorsInfo[k - 1].len, i, j, k);
 
                         AaruConsole.DebugWriteLine("CPCDSK plugin", "trackInfo[{1}:{2}].sector[{3}].side = {0}",
-                                                  trackInfo.sectorsInfo[k - 1].side, i, j, k);
+                                                   trackInfo.sectorsInfo[k - 1].side, i, j, k);
 
                         AaruConsole.DebugWriteLine("CPCDSK plugin", "trackInfo[{1}:{2}].sector[{3}].size = {0}",
-                                                  SizeCodeToBytes(trackInfo.sectorsInfo[k - 1].size), i, j, k);
+                                                   SizeCodeToBytes(trackInfo.sectorsInfo[k - 1].size), i, j, k);
 
                         AaruConsole.DebugWriteLine("CPCDSK plugin", "trackInfo[{1}:{2}].sector[{3}].st1 = 0x{0:X2}",
-                                                  trackInfo.sectorsInfo[k - 1].st1, i, j, k);
+                                                   trackInfo.sectorsInfo[k - 1].st1, i, j, k);
 
                         AaruConsole.DebugWriteLine("CPCDSK plugin", "trackInfo[{1}:{2}].sector[{3}].st2 = 0x{0:X2}",
-                                                  trackInfo.sectorsInfo[k - 1].st2, i, j, k);
+                                                   trackInfo.sectorsInfo[k - 1].st2, i, j, k);
 
                         AaruConsole.DebugWriteLine("CPCDSK plugin", "trackInfo[{1}:{2}].sector[{3}].track = {0}",
-                                                  trackInfo.sectorsInfo[k - 1].track, i, j, k);
+                                                   trackInfo.sectorsInfo[k - 1].track, i, j, k);
 
                         int sectLen = extended ? trackInfo.sectorsInfo[k - 1].len
                                           : SizeCodeToBytes(trackInfo.sectorsInfo[k - 1].size);
diff --git a/Aaru.Images/CPCDSK/Structs.cs b/Aaru.Images/CPCDSK/Structs.cs
index 0f4dc7701..d4bee4128 100644
--- a/Aaru.Images/CPCDSK/Structs.cs
+++ b/Aaru.Images/CPCDSK/Structs.cs
@@ -40,129 +40,81 @@ namespace Aaru.DiscImages
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct CpcDiskInfo
         {
-            /// <summary>
-            ///     Magic number, "MV - CPC" in old files, "EXTENDED CPC DSK File" in extended ones
-            /// </summary>
+            /// <summary>Magic number, "MV - CPC" in old files, "EXTENDED CPC DSK File" in extended ones</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 21)]
-            public byte[] magic;
-            /// <summary>
-            ///     Second part of magic, should be "\r\nDisk-Info\r\n" in all, but some emulators write spaces instead.
-            /// </summary>
+            public readonly byte[] magic;
+            /// <summary>Second part of magic, should be "\r\nDisk-Info\r\n" in all, but some emulators write spaces instead.</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 13)]
-            public byte[] magic2;
-            /// <summary>
-            ///     Creator application (can be null)
-            /// </summary>
+            public readonly byte[] magic2;
+            /// <summary>Creator application (can be null)</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 14)]
-            public byte[] creator;
+            public readonly byte[] creator;
+            /// <summary>Tracks</summary>
+            public readonly byte tracks;
+            /// <summary>Sides</summary>
+            public readonly byte sides;
             /// <summary>
-            ///     Tracks
-            /// </summary>
-            public byte tracks;
-            /// <summary>
-            ///     Sides
-            /// </summary>
-            public byte sides;
-            /// <summary>
-            ///     Size of a track including the 256 bytes header. Unused by extended format, as this format includes a table in the
-            ///     next field
-            /// </summary>
-            public ushort tracksize;
-            /// <summary>
-            ///     Size of each track in the extended format. 0 indicates track is not formatted and not present in image.
+            ///     Size of a track including the 256 bytes header. Unused by extended format, as this format includes a table in
+            ///     the next field
             /// </summary>
+            public readonly ushort tracksize;
+            /// <summary>Size of each track in the extended format. 0 indicates track is not formatted and not present in image.</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 204)]
-            public byte[] tracksizeTable;
+            public readonly byte[] tracksizeTable;
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct CpcTrackInfo
         {
-            /// <summary>
-            ///     Magic number, "Track-Info\r\n"
-            /// </summary>
+            /// <summary>Magic number, "Track-Info\r\n"</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 10)]
-            public byte[] magic;
+            public readonly byte[] magic;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
-            public byte[] carriageReturn;
-            /// <summary>
-            ///     Padding
-            /// </summary>
-            public uint padding;
-            /// <summary>
-            ///     Track number
-            /// </summary>
-            public byte track;
-            /// <summary>
-            ///     Side number
-            /// </summary>
-            public byte side;
-            /// <summary>
-            ///     Controller data rate
-            /// </summary>
-            public byte dataRate;
-            /// <summary>
-            ///     Recording mode
-            /// </summary>
-            public byte recordingMode;
-            /// <summary>
-            ///     Bytes per sector
-            /// </summary>
-            public IBMSectorSizeCode bps;
-            /// <summary>
-            ///     How many sectors in this track
-            /// </summary>
-            public byte sectors;
-            /// <summary>
-            ///     GAP#3
-            /// </summary>
-            public byte gap3;
-            /// <summary>
-            ///     Filler
-            /// </summary>
-            public byte filler;
-            /// <summary>
-            ///     Informatino for up to 32 sectors
-            /// </summary>
+            public readonly byte[] carriageReturn;
+            /// <summary>Padding</summary>
+            public readonly uint padding;
+            /// <summary>Track number</summary>
+            public readonly byte track;
+            /// <summary>Side number</summary>
+            public readonly byte side;
+            /// <summary>Controller data rate</summary>
+            public readonly byte dataRate;
+            /// <summary>Recording mode</summary>
+            public readonly byte recordingMode;
+            /// <summary>Bytes per sector</summary>
+            public readonly IBMSectorSizeCode bps;
+            /// <summary>How many sectors in this track</summary>
+            public readonly byte sectors;
+            /// <summary>GAP#3</summary>
+            public readonly byte gap3;
+            /// <summary>Filler</summary>
+            public readonly byte filler;
+            /// <summary>Informatino for up to 32 sectors</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
-            public CpcSectorInfo[] sectorsInfo;
+            public readonly CpcSectorInfo[] sectorsInfo;
         }
 
-        /// <summary>
-        ///     Sector information
-        /// </summary>
+        /// <summary>Sector information</summary>
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct CpcSectorInfo
         {
+            /// <summary>Track number from address mark</summary>
+            public readonly byte track;
+            /// <summary>Side number from address mark</summary>
+            public readonly byte side;
+            /// <summary>Sector ID from address mark</summary>
+            public readonly byte id;
+            /// <summary>Sector size from address mark</summary>
+            public readonly IBMSectorSizeCode size;
+            /// <summary>ST1 register from controller</summary>
+            public readonly byte st1;
+            /// <summary>ST2 register from controller</summary>
+            public readonly byte st2;
             /// <summary>
-            ///     Track number from address mark
+            ///     Length in bytes of this sector size. If it is bigger than expected sector size, it's a weak sector read
+            ///     several times.
             /// </summary>
-            public byte track;
-            /// <summary>
-            ///     Side number from address mark
-            /// </summary>
-            public byte side;
-            /// <summary>
-            ///     Sector ID from address mark
-            /// </summary>
-            public byte id;
-            /// <summary>
-            ///     Sector size from address mark
-            /// </summary>
-            public IBMSectorSizeCode size;
-            /// <summary>
-            ///     ST1 register from controller
-            /// </summary>
-            public byte st1;
-            /// <summary>
-            ///     ST2 register from controller
-            /// </summary>
-            public byte st2;
-            /// <summary>
-            ///     Length in bytes of this sector size. If it is bigger than expected sector size, it's a weak sector read several
-            ///     times.
-            /// </summary>
-            public ushort len;
+            public readonly ushort len;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/CisCopy/CisCopy.cs b/Aaru.Images/CisCopy/CisCopy.cs
index 851b27cd8..4dc2f607d 100644
--- a/Aaru.Images/CisCopy/CisCopy.cs
+++ b/Aaru.Images/CisCopy/CisCopy.cs
@@ -60,31 +60,18 @@ namespace Aaru.DiscImages
         long       writingOffset;
         FileStream writingStream;
 
-        public CisCopy()
+        public CisCopy() => imageInfo = new ImageInfo
         {
-            imageInfo = new ImageInfo
-            {
-                ReadableSectorTags    = new List<SectorTagType>(),
-                ReadableMediaTags     = new List<MediaTagType>(),
-                HasPartitions         = false,
-                HasSessions           = false,
-                Version               = null,
-                Application           = null,
-                ApplicationVersion    = null,
-                Creator               = null,
-                Comments              = null,
-                MediaManufacturer     = null,
-                MediaModel            = null,
-                MediaSerialNumber     = null,
-                MediaBarcode          = null,
-                MediaPartNumber       = null,
-                MediaSequence         = 0,
-                LastMediaSequence     = 0,
-                DriveManufacturer     = null,
-                DriveModel            = null,
-                DriveSerialNumber     = null,
-                DriveFirmwareRevision = null
-            };
-        }
+            ReadableSectorTags = new List<SectorTagType>(), ReadableMediaTags = new List<MediaTagType>(),
+            HasPartitions      = false, HasSessions                           = false, Version = null,
+            Application        = null,
+            ApplicationVersion = null, Creator = null, Comments = null,
+            MediaManufacturer  = null,
+            MediaModel         = null, MediaSerialNumber = null, MediaBarcode = null,
+            MediaPartNumber    = null,
+            MediaSequence      = 0, LastMediaSequence = 0, DriveManufacturer = null,
+            DriveModel         = null,
+            DriveSerialNumber  = null, DriveFirmwareRevision = null
+        };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/CisCopy/Enums.cs b/Aaru.Images/CisCopy/Enums.cs
index cae64cd20..3b092de15 100644
--- a/Aaru.Images/CisCopy/Enums.cs
+++ b/Aaru.Images/CisCopy/Enums.cs
@@ -39,27 +39,19 @@ namespace Aaru.DiscImages
         [SuppressMessage("ReSharper", "InconsistentNaming")]
         enum DiskType : byte
         {
-            MD1DD8 = 1,
-            MD1DD  = 2,
-            MD2DD8 = 3,
-            MD2DD  = 4,
-            MF2DD  = 5,
-            MD2HD  = 6,
+            MD1DD8 = 1, MD1DD = 2, MD2DD8 = 3,
+            MD2DD  = 4, MF2DD = 5, MD2HD  = 6,
             MF2HD  = 7
         }
 
         enum Compression : byte
         {
-            None   = 0,
-            Normal = 1,
-            High   = 2
+            None = 0, Normal = 1, High = 2
         }
 
         enum TrackType : byte
         {
-            Copied           = 0x4C,
-            Omitted          = 0xFA,
-            OmittedAlternate = 0xFE
+            Copied = 0x4C, Omitted = 0xFA, OmittedAlternate = 0xFE
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/CisCopy/Identify.cs b/Aaru.Images/CisCopy/Identify.cs
index c322540ef..22a7a2cd5 100644
--- a/Aaru.Images/CisCopy/Identify.cs
+++ b/Aaru.Images/CisCopy/Identify.cs
@@ -42,8 +42,8 @@ namespace Aaru.DiscImages
             Stream stream = imageFilter.GetDataForkStream();
             stream.Seek(0, SeekOrigin.Begin);
 
-            DiskType type = (DiskType)stream.ReadByte();
-            byte     tracks;
+            var  type = (DiskType)stream.ReadByte();
+            byte tracks;
 
             switch(type)
             {
@@ -52,11 +52,13 @@ namespace Aaru.DiscImages
                 case DiskType.MD2DD8:
                 case DiskType.MD2DD:
                     tracks = 80;
+
                     break;
                 case DiskType.MF2DD:
                 case DiskType.MD2HD:
                 case DiskType.MF2HD:
                     tracks = 160;
+
                     break;
                 default: return false;
             }
@@ -65,42 +67,53 @@ namespace Aaru.DiscImages
             stream.Read(trackBytes, 0, tracks);
 
             for(int i = 0; i < tracks; i++)
-                if(trackBytes[i] != (byte)TrackType.Copied && trackBytes[i] != (byte)TrackType.Omitted &&
+                if(trackBytes[i] != (byte)TrackType.Copied  &&
+                   trackBytes[i] != (byte)TrackType.Omitted &&
                    trackBytes[i] != (byte)TrackType.OmittedAlternate)
                     return false;
 
-            Compression cmpr = (Compression)stream.ReadByte();
+            var cmpr = (Compression)stream.ReadByte();
 
-            if(cmpr != Compression.None && cmpr != Compression.Normal && cmpr != Compression.High) return false;
+            if(cmpr != Compression.None   &&
+               cmpr != Compression.Normal &&
+               cmpr != Compression.High)
+                return false;
 
             switch(type)
             {
                 case DiskType.MD1DD8:
-                    if(stream.Length > 40 * 1 * 8 * 512 + 82) return false;
+                    if(stream.Length > (40 * 1 * 8 * 512) + 82)
+                        return false;
 
                     break;
                 case DiskType.MD1DD:
-                    if(stream.Length > 40 * 1 * 9 * 512 + 82) return false;
+                    if(stream.Length > (40 * 1 * 9 * 512) + 82)
+                        return false;
 
                     break;
                 case DiskType.MD2DD8:
-                    if(stream.Length > 40 * 2 * 8 * 512 + 82) return false;
+                    if(stream.Length > (40 * 2 * 8 * 512) + 82)
+                        return false;
 
                     break;
                 case DiskType.MD2DD:
-                    if(stream.Length > 40 * 2 * 9 * 512 + 82) return false;
+                    if(stream.Length > (40 * 2 * 9 * 512) + 82)
+                        return false;
 
                     break;
                 case DiskType.MF2DD:
-                    if(stream.Length > 80 * 2 * 9 * 512 + 162) return false;
+                    if(stream.Length > (80 * 2 * 9 * 512) + 162)
+                        return false;
 
                     break;
                 case DiskType.MD2HD:
-                    if(stream.Length > 80 * 2 * 15 * 512 + 162) return false;
+                    if(stream.Length > (80 * 2 * 15 * 512) + 162)
+                        return false;
 
                     break;
                 case DiskType.MF2HD:
-                    if(stream.Length > 80 * 2 * 18 * 512 + 162) return false;
+                    if(stream.Length > (80 * 2 * 18 * 512) + 162)
+                        return false;
 
                     break;
             }
diff --git a/Aaru.Images/CisCopy/Properties.cs b/Aaru.Images/CisCopy/Properties.cs
index 9954c37c9..7eab0e10d 100644
--- a/Aaru.Images/CisCopy/Properties.cs
+++ b/Aaru.Images/CisCopy/Properties.cs
@@ -41,26 +41,32 @@ namespace Aaru.DiscImages
 {
     public partial class CisCopy
     {
-        public string                     Name                => "CisCopy Disk Image (DC-File)";
-        public Guid                       Id                  => new Guid("EDF20CC7-6012-49E2-9E92-663A53E42130");
-        public string                     Format              => "CisCopy";
-        public string                     Author              => "Natalia Portillo";
-        public ImageInfo                  Info                => imageInfo;
-        public List<DumpHardwareType>     DumpHardware        => null;
-        public CICMMetadataType           CicmMetadata        => null;
-        public IEnumerable<MediaTagType>  SupportedMediaTags  => new MediaTagType[] { };
-        public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[] { };
+        public string                 Name         => "CisCopy Disk Image (DC-File)";
+        public Guid                   Id           => new Guid("EDF20CC7-6012-49E2-9E92-663A53E42130");
+        public string                 Format       => "CisCopy";
+        public string                 Author       => "Natalia Portillo";
+        public ImageInfo              Info         => imageInfo;
+        public List<DumpHardwareType> DumpHardware => null;
+        public CICMMetadataType       CicmMetadata => null;
+        public IEnumerable<MediaTagType> SupportedMediaTags => new MediaTagType[]
+            {};
+        public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[]
+            {};
+
         // TODO: Test with real hardware to see real supported media
-        public IEnumerable<MediaType> SupportedMediaTypes =>
-            new[]
-            {
-                MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_HD, MediaType.DOS_525_DS_DD_8, MediaType.DOS_525_DS_DD_9,
-                MediaType.DOS_525_HD, MediaType.DOS_525_SS_DD_8, MediaType.DOS_525_SS_DD_9
-            };
+        public IEnumerable<MediaType> SupportedMediaTypes => new[]
+        {
+            MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_HD, MediaType.DOS_525_DS_DD_8, MediaType.DOS_525_DS_DD_9,
+            MediaType.DOS_525_HD, MediaType.DOS_525_SS_DD_8, MediaType.DOS_525_SS_DD_9
+        };
         public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
-            new (string name, Type type, string description, object @default)[] { };
-        public IEnumerable<string> KnownExtensions => new[] {".dcf"};
-        public bool                IsWriting       { get; private set; }
-        public string              ErrorMessage    { get; private set; }
+            new (string name, Type type, string description, object @default)[]
+                {};
+        public IEnumerable<string> KnownExtensions => new[]
+        {
+            ".dcf"
+        };
+        public bool   IsWriting    { get; private set; }
+        public string ErrorMessage { get; private set; }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/CisCopy/Read.cs b/Aaru.Images/CisCopy/Read.cs
index da7368910..35c49bec4 100644
--- a/Aaru.Images/CisCopy/Read.cs
+++ b/Aaru.Images/CisCopy/Read.cs
@@ -47,8 +47,8 @@ namespace Aaru.DiscImages
             Stream stream = imageFilter.GetDataForkStream();
             stream.Seek(0, SeekOrigin.Begin);
 
-            DiskType type = (DiskType)stream.ReadByte();
-            byte     tracks;
+            var  type = (DiskType)stream.ReadByte();
+            byte tracks;
 
             switch(type)
             {
@@ -57,11 +57,13 @@ namespace Aaru.DiscImages
                 case DiskType.MD2DD8:
                 case DiskType.MD2DD:
                     tracks = 80;
+
                     break;
                 case DiskType.MF2DD:
                 case DiskType.MD2HD:
                 case DiskType.MF2HD:
                     tracks = 160;
+
                     break;
                 default: throw new ImageNotSupportedException($"Incorrect disk type {(byte)type}");
             }
@@ -69,7 +71,7 @@ namespace Aaru.DiscImages
             byte[] trackBytes = new byte[tracks];
             stream.Read(trackBytes, 0, tracks);
 
-            Compression cmpr = (Compression)stream.ReadByte();
+            var cmpr = (Compression)stream.ReadByte();
 
             if(cmpr != Compression.None)
                 throw new FeatureSupportedButNotImplementedImageException("Compressed images are not supported.");
@@ -81,31 +83,40 @@ namespace Aaru.DiscImages
                 case DiskType.MD1DD8:
                 case DiskType.MD2DD8:
                     tracksize = 8 * 512;
+
                     break;
                 case DiskType.MD1DD:
                 case DiskType.MD2DD:
                 case DiskType.MF2DD:
                     tracksize = 9 * 512;
+
                     break;
                 case DiskType.MD2HD:
                     tracksize = 15 * 512;
+
                     break;
                 case DiskType.MF2HD:
                     tracksize = 18 * 512;
+
                     break;
             }
 
-            int headstep                                                   = 1;
-            if(type == DiskType.MD1DD || type == DiskType.MD1DD8) headstep = 2;
+            int headstep = 1;
 
-            MemoryStream decodedImage = new MemoryStream();
+            if(type == DiskType.MD1DD ||
+               type == DiskType.MD1DD8)
+                headstep = 2;
+
+            var decodedImage = new MemoryStream();
 
             for(int i = 0; i < tracks; i += headstep)
             {
                 byte[] track = new byte[tracksize];
 
-                if((TrackType)trackBytes[i] == TrackType.Copied) stream.Read(track, 0, tracksize);
-                else ArrayHelpers.ArrayFill(track, (byte)0xF6);
+                if((TrackType)trackBytes[i] == TrackType.Copied)
+                    stream.Read(track, 0, tracksize);
+                else
+                    ArrayHelpers.ArrayFill(track, (byte)0xF6);
 
                 decodedImage.Write(track, 0, tracksize);
             }
@@ -125,6 +136,7 @@ namespace Aaru.DiscImages
                     imageInfo.Heads           = 1;
                     imageInfo.Cylinders       = 40;
                     imageInfo.SectorsPerTrack = 8;
+
                     break;
                 case DiskType.MD2DD8:
                     imageInfo.MediaType       = MediaType.DOS_525_DS_DD_8;
@@ -132,6 +144,7 @@ namespace Aaru.DiscImages
                     imageInfo.Heads           = 2;
                     imageInfo.Cylinders       = 40;
                     imageInfo.SectorsPerTrack = 8;
+
                     break;
                 case DiskType.MD1DD:
                     imageInfo.MediaType       = MediaType.DOS_525_SS_DD_9;
@@ -139,6 +152,7 @@ namespace Aaru.DiscImages
                     imageInfo.Heads           = 1;
                     imageInfo.Cylinders       = 40;
                     imageInfo.SectorsPerTrack = 9;
+
                     break;
                 case DiskType.MD2DD:
                     imageInfo.MediaType       = MediaType.DOS_525_DS_DD_9;
@@ -146,6 +160,7 @@ namespace Aaru.DiscImages
                     imageInfo.Heads           = 2;
                     imageInfo.Cylinders       = 40;
                     imageInfo.SectorsPerTrack = 9;
+
                     break;
                 case DiskType.MF2DD:
                     imageInfo.MediaType       = MediaType.DOS_35_DS_DD_9;
@@ -153,6 +168,7 @@ namespace Aaru.DiscImages
                     imageInfo.Heads           = 2;
                     imageInfo.Cylinders       = 80;
                     imageInfo.SectorsPerTrack = 9;
+
                     break;
                 case DiskType.MD2HD:
                     imageInfo.MediaType       = MediaType.DOS_525_HD;
@@ -160,6 +176,7 @@ namespace Aaru.DiscImages
                     imageInfo.Heads           = 2;
                     imageInfo.Cylinders       = 80;
                     imageInfo.SectorsPerTrack = 15;
+
                     break;
                 case DiskType.MF2HD:
                     imageInfo.MediaType       = MediaType.DOS_35_HD;
@@ -167,6 +184,7 @@ namespace Aaru.DiscImages
                     imageInfo.Heads           = 2;
                     imageInfo.Cylinders       = 80;
                     imageInfo.SectorsPerTrack = 18;
+
                     break;
             }
 
diff --git a/Aaru.Images/CisCopy/Write.cs b/Aaru.Images/CisCopy/Write.cs
index b14e997f2..b5abdc9ac 100644
--- a/Aaru.Images/CisCopy/Write.cs
+++ b/Aaru.Images/CisCopy/Write.cs
@@ -43,55 +43,73 @@ namespace Aaru.DiscImages
     public partial class CisCopy
     {
         public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
-                           uint   sectorSize)
+                           uint sectorSize)
         {
             if(sectorSize != 512)
             {
                 ErrorMessage = "Unsupported sector size";
+
                 return false;
             }
 
             if(!SupportedMediaTypes.Contains(mediaType))
             {
                 ErrorMessage = $"Unsupport media format {mediaType}";
+
                 return false;
             }
 
-            imageInfo = new ImageInfo {MediaType = mediaType, SectorSize = sectorSize, Sectors = sectors};
+            imageInfo = new ImageInfo
+            {
+                MediaType = mediaType, SectorSize = sectorSize, Sectors = sectors
+            };
 
-            try { writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None); }
+            try
+            {
+                writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
+            }
             catch(IOException e)
             {
                 ErrorMessage = $"Could not create new image file, exception {e.Message}";
+
                 return false;
             }
 
             DiskType diskType;
+
             switch(mediaType)
             {
                 case MediaType.DOS_35_DS_DD_9:
                     diskType = DiskType.MF2DD;
+
                     break;
                 case MediaType.DOS_35_HD:
                     diskType = DiskType.MF2HD;
+
                     break;
                 case MediaType.DOS_525_DS_DD_8:
                     diskType = DiskType.MD2DD8;
+
                     break;
                 case MediaType.DOS_525_DS_DD_9:
                     diskType = DiskType.MD2DD;
+
                     break;
                 case MediaType.DOS_525_HD:
                     diskType = DiskType.MD2HD;
+
                     break;
                 case MediaType.DOS_525_SS_DD_8:
                     diskType = DiskType.MD1DD8;
+
                     break;
                 case MediaType.DOS_525_SS_DD_9:
                     diskType = DiskType.MD1DD;
+
                     break;
                 default:
                     ErrorMessage = $"Unsupport media format {mediaType}";
+
                     return false;
             }
 
@@ -106,21 +124,28 @@ namespace Aaru.DiscImages
                 case DiskType.MD2DD8:
                 case DiskType.MD2DD:
                     tracks = 80;
+
                     break;
                 case DiskType.MF2DD:
                 case DiskType.MD2HD:
                 case DiskType.MF2HD:
                     tracks = 160;
+
                     break;
             }
 
-            int headstep                                                           = 1;
-            if(diskType == DiskType.MD1DD || diskType == DiskType.MD1DD8) headstep = 2;
+            int headstep = 1;
+
+            if(diskType == DiskType.MD1DD ||
+               diskType == DiskType.MD1DD8)
+                headstep = 2;
 
             for(int i = 0; i < tracks; i += headstep)
             {
                 writingStream.WriteByte((byte)TrackType.Copied);
-                if(headstep == 2) writingStream.WriteByte(0);
+
+                if(headstep == 2)
+                    writingStream.WriteByte(0);
             }
 
             writingStream.WriteByte((byte)Compression.None);
@@ -128,12 +153,14 @@ namespace Aaru.DiscImages
 
             IsWriting    = true;
             ErrorMessage = null;
+
             return true;
         }
 
         public bool WriteMediaTag(byte[] data, MediaTagType tag)
         {
             ErrorMessage = "Writing media tags is not supported.";
+
             return false;
         }
 
@@ -142,18 +169,21 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Tried to write on a non-writable image";
+
                 return false;
             }
 
             if(data.Length != 512)
             {
                 ErrorMessage = "Incorrect data size";
+
                 return false;
             }
 
             if(sectorAddress >= imageInfo.Sectors)
             {
                 ErrorMessage = "Tried to write past image size";
+
                 return false;
             }
 
@@ -161,6 +191,7 @@ namespace Aaru.DiscImages
             writingStream.Write(data, 0, data.Length);
 
             ErrorMessage = "";
+
             return true;
         }
 
@@ -169,18 +200,21 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Tried to write on a non-writable image";
+
                 return false;
             }
 
             if(data.Length % 512 != 0)
             {
                 ErrorMessage = "Incorrect data size";
+
                 return false;
             }
 
             if(sectorAddress + length > imageInfo.Sectors)
             {
                 ErrorMessage = "Tried to write past image size";
+
                 return false;
             }
 
@@ -188,18 +222,21 @@ namespace Aaru.DiscImages
             writingStream.Write(data, 0, data.Length);
 
             ErrorMessage = "";
+
             return true;
         }
 
         public bool WriteSectorLong(byte[] data, ulong sectorAddress)
         {
             ErrorMessage = "Writing sectors with tags is not supported.";
+
             return false;
         }
 
         public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
         {
             ErrorMessage = "Writing sectors with tags is not supported.";
+
             return false;
         }
 
@@ -208,6 +245,7 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Image is not opened for writing";
+
                 return false;
             }
 
@@ -216,6 +254,7 @@ namespace Aaru.DiscImages
 
             IsWriting    = false;
             ErrorMessage = "";
+
             return true;
         }
 
@@ -226,12 +265,14 @@ namespace Aaru.DiscImages
         public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
         {
             ErrorMessage = "Unsupported feature";
+
             return false;
         }
 
         public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
         {
             ErrorMessage = "Unsupported feature";
+
             return false;
         }
 
diff --git a/Aaru.Images/CloneCD/CloneCD.cs b/Aaru.Images/CloneCD/CloneCD.cs
index 162d3f89d..eee8868dd 100644
--- a/Aaru.Images/CloneCD/CloneCD.cs
+++ b/Aaru.Images/CloneCD/CloneCD.cs
@@ -57,28 +57,16 @@ namespace Aaru.DiscImages
         Dictionary<byte, byte>  trackFlags;
         string                  writingBaseName;
 
-        public CloneCd()
+        public CloneCd() => imageInfo = new ImageInfo
         {
-            imageInfo = new ImageInfo
-            {
-                ReadableSectorTags    = new List<SectorTagType>(),
-                ReadableMediaTags     = new List<MediaTagType>(),
-                HasPartitions         = true,
-                HasSessions           = true,
-                Version               = null,
-                ApplicationVersion    = null,
-                MediaTitle            = null,
-                Creator               = null,
-                MediaManufacturer     = null,
-                MediaModel            = null,
-                MediaPartNumber       = null,
-                MediaSequence         = 0,
-                LastMediaSequence     = 0,
-                DriveManufacturer     = null,
-                DriveModel            = null,
-                DriveSerialNumber     = null,
-                DriveFirmwareRevision = null
-            };
-        }
+            ReadableSectorTags = new List<SectorTagType>(), ReadableMediaTags = new List<MediaTagType>(),
+            HasPartitions      = true, HasSessions                            = true, Version = null,
+            ApplicationVersion = null,
+            MediaTitle         = null, Creator = null, MediaManufacturer = null,
+            MediaModel         = null,
+            MediaPartNumber    = null, MediaSequence = 0, LastMediaSequence = 0,
+            DriveManufacturer  = null,
+            DriveModel         = null, DriveSerialNumber = null, DriveFirmwareRevision = null
+        };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/CloneCD/Helpers.cs b/Aaru.Images/CloneCD/Helpers.cs
index 979c9fd79..a5c483806 100644
--- a/Aaru.Images/CloneCD/Helpers.cs
+++ b/Aaru.Images/CloneCD/Helpers.cs
@@ -34,12 +34,13 @@ namespace Aaru.DiscImages
 {
     public partial class CloneCd
     {
-        static ulong GetLba(int minute, int second, int frame) => (ulong)(minute * 60 * 75 + second * 75 + frame - 150);
+        static ulong GetLba(int minute, int second, int frame) =>
+            (ulong)(((minute * 60 * 75) + (second * 75) + frame) - 150);
 
         static long MsfToLba((byte minute, byte second, byte frame) msf) =>
-            msf.minute * 60 * 75 + msf.second * 75 + msf.frame - 150;
+            ((msf.minute * 60 * 75) + (msf.second * 75) + msf.frame) - 150;
 
         static (byte minute, byte second, byte frame) LbaToMsf(ulong sector) =>
-            ((byte)((sector + 150) / 75 / 60), (byte)((sector + 150) / 75 % 60), (byte)((sector + 150) % 75));
+            ((byte)((sector + 150) / 75 / 60), (byte)(((sector + 150) / 75) % 60), (byte)((sector + 150) % 75));
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/CloneCD/Identify.cs b/Aaru.Images/CloneCD/Identify.cs
index 2f6983d7b..6427f0bb2 100644
--- a/Aaru.Images/CloneCD/Identify.cs
+++ b/Aaru.Images/CloneCD/Identify.cs
@@ -50,21 +50,29 @@ namespace Aaru.DiscImages
                 byte[] testArray = new byte[512];
                 imageFilter.GetDataForkStream().Read(testArray, 0, 512);
                 imageFilter.GetDataForkStream().Seek(0, SeekOrigin.Begin);
+
                 // Check for unexpected control characters that shouldn't be present in a text file and can crash this plugin
                 bool twoConsecutiveNulls = false;
+
                 for(int i = 0; i < 512; i++)
                 {
-                    if(i >= imageFilter.GetDataForkStream().Length) break;
+                    if(i >= imageFilter.GetDataForkStream().Length)
+                        break;
 
                     if(testArray[i] == 0)
                     {
-                        if(twoConsecutiveNulls) return false;
+                        if(twoConsecutiveNulls)
+                            return false;
 
                         twoConsecutiveNulls = true;
                     }
-                    else twoConsecutiveNulls = false;
+                    else
+                        twoConsecutiveNulls = false;
 
-                    if(testArray[i] < 0x20 && testArray[i] != 0x0A && testArray[i] != 0x0D && testArray[i] != 0x00)
+                    if(testArray[i] < 0x20  &&
+                       testArray[i] != 0x0A &&
+                       testArray[i] != 0x0D &&
+                       testArray[i] != 0x00)
                         return false;
                 }
 
@@ -72,7 +80,7 @@ namespace Aaru.DiscImages
 
                 string line = cueStream.ReadLine();
 
-                Regex hdr = new Regex(CCD_IDENTIFIER);
+                var hdr = new Regex(CCD_IDENTIFIER);
 
                 Match hdm = hdr.Match(line ?? throw new InvalidOperationException());
 
@@ -81,8 +89,9 @@ namespace Aaru.DiscImages
             catch(Exception ex)
             {
                 AaruConsole.ErrorWriteLine("Exception trying to identify image file {0}", ccdFilter);
-                AaruConsole.ErrorWriteLine("Exception: {0}",                              ex.Message);
-                AaruConsole.ErrorWriteLine("Stack trace: {0}",                            ex.StackTrace);
+                AaruConsole.ErrorWriteLine("Exception: {0}", ex.Message);
+                AaruConsole.ErrorWriteLine("Stack trace: {0}", ex.StackTrace);
+
                 return false;
             }
         }
diff --git a/Aaru.Images/CloneCD/Properties.cs b/Aaru.Images/CloneCD/Properties.cs
index 95dbb2735..c44b696d2 100644
--- a/Aaru.Images/CloneCD/Properties.cs
+++ b/Aaru.Images/CloneCD/Properties.cs
@@ -41,40 +41,44 @@ namespace Aaru.DiscImages
 {
     public partial class CloneCd
     {
-        public ImageInfo                 Info               => imageInfo;
-        public string                    Name               => "CloneCD";
-        public Guid                      Id                 => new Guid("EE9C2975-2E79-427A-8EE9-F86F19165784");
-        public string                    Format             => "CloneCD";
-        public string                    Author             => "Natalia Portillo";
-        public List<Partition>           Partitions         { get; private set; }
-        public List<Track>               Tracks             { get; private set; }
-        public List<Session>             Sessions           { get; private set; }
-        public List<DumpHardwareType>    DumpHardware       => null;
-        public CICMMetadataType          CicmMetadata       => null;
-        public IEnumerable<MediaTagType> SupportedMediaTags => new[] {MediaTagType.CD_MCN, MediaTagType.CD_FullTOC};
-        public IEnumerable<SectorTagType> SupportedSectorTags =>
-            new[]
-            {
-                SectorTagType.CdSectorEcc, SectorTagType.CdSectorEccP, SectorTagType.CdSectorEccQ,
-                SectorTagType.CdSectorEdc, SectorTagType.CdSectorHeader, SectorTagType.CdSectorSubHeader,
-                SectorTagType.CdSectorSync, SectorTagType.CdTrackFlags, SectorTagType.CdSectorSubchannel
-            };
-        public IEnumerable<MediaType> SupportedMediaTypes =>
-            new[]
-            {
-                MediaType.CD, MediaType.CDDA, MediaType.CDEG, MediaType.CDG, MediaType.CDI, MediaType.CDMIDI,
-                MediaType.CDMRW, MediaType.CDPLUS, MediaType.CDR, MediaType.CDROM, MediaType.CDROMXA,
-                MediaType.CDRW, MediaType.CDV, MediaType.DTSCD, MediaType.JaguarCD, MediaType.MEGACD,
-                MediaType.PS1CD, MediaType.PS2CD, MediaType.SuperCDROM2, MediaType.SVCD, MediaType.SATURNCD,
-                MediaType.ThreeDO, MediaType.VCD, MediaType.VCDHD, MediaType.NeoGeoCD, MediaType.PCFX,
-                MediaType.CDTV, MediaType.CD32, MediaType.Nuon, MediaType.Playdia, MediaType.Pippin,
-                MediaType.FMTOWNS, MediaType.MilCD, MediaType.VideoNow, MediaType.VideoNowColor,
-                MediaType.VideoNowXp
-            };
+        public ImageInfo              Info         => imageInfo;
+        public string                 Name         => "CloneCD";
+        public Guid                   Id           => new Guid("EE9C2975-2E79-427A-8EE9-F86F19165784");
+        public string                 Format       => "CloneCD";
+        public string                 Author       => "Natalia Portillo";
+        public List<Partition>        Partitions   { get; private set; }
+        public List<Track>            Tracks       { get; private set; }
+        public List<Session>          Sessions     { get; private set; }
+        public List<DumpHardwareType> DumpHardware => null;
+        public CICMMetadataType       CicmMetadata => null;
+        public IEnumerable<MediaTagType> SupportedMediaTags => new[]
+        {
+            MediaTagType.CD_MCN, MediaTagType.CD_FullTOC
+        };
+        public IEnumerable<SectorTagType> SupportedSectorTags => new[]
+        {
+            SectorTagType.CdSectorEcc, SectorTagType.CdSectorEccP, SectorTagType.CdSectorEccQ,
+            SectorTagType.CdSectorEdc, SectorTagType.CdSectorHeader, SectorTagType.CdSectorSubHeader,
+            SectorTagType.CdSectorSync, SectorTagType.CdTrackFlags, SectorTagType.CdSectorSubchannel
+        };
+        public IEnumerable<MediaType> SupportedMediaTypes => new[]
+        {
+            MediaType.CD, MediaType.CDDA, MediaType.CDEG, MediaType.CDG, MediaType.CDI, MediaType.CDMIDI,
+            MediaType.CDMRW, MediaType.CDPLUS, MediaType.CDR, MediaType.CDROM, MediaType.CDROMXA, MediaType.CDRW,
+            MediaType.CDV, MediaType.DTSCD, MediaType.JaguarCD, MediaType.MEGACD, MediaType.PS1CD, MediaType.PS2CD,
+            MediaType.SuperCDROM2, MediaType.SVCD, MediaType.SATURNCD, MediaType.ThreeDO, MediaType.VCD,
+            MediaType.VCDHD, MediaType.NeoGeoCD, MediaType.PCFX, MediaType.CDTV, MediaType.CD32, MediaType.Nuon,
+            MediaType.Playdia, MediaType.Pippin, MediaType.FMTOWNS, MediaType.MilCD, MediaType.VideoNow,
+            MediaType.VideoNowColor, MediaType.VideoNowXp
+        };
         public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
-            new (string name, Type type, string description, object @default)[] { };
-        public IEnumerable<string> KnownExtensions => new[] {".ccd"};
-        public bool                IsWriting       { get; private set; }
-        public string              ErrorMessage    { get; private set; }
+            new (string name, Type type, string description, object @default)[]
+                {};
+        public IEnumerable<string> KnownExtensions => new[]
+        {
+            ".ccd"
+        };
+        public bool   IsWriting    { get; private set; }
+        public string ErrorMessage { get; private set; }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/CloneCD/Read.cs b/Aaru.Images/CloneCD/Read.cs
index 18d2c58ce..3d85ddfd6 100644
--- a/Aaru.Images/CloneCD/Read.cs
+++ b/Aaru.Images/CloneCD/Read.cs
@@ -183,19 +183,20 @@ namespace Aaru.DiscImages
                             Match discCatMatch  = discCatRegex.Match(line);
 
                             if(discEntMatch.Success)
-                                AaruConsole.DebugWriteLine("CloneCD plugin", "Found TocEntries at line {0}", lineNumber);
+                                AaruConsole.DebugWriteLine("CloneCD plugin", "Found TocEntries at line {0}",
+                                                           lineNumber);
                             else if(discSessMatch.Success)
                                 AaruConsole.DebugWriteLine("CloneCD plugin", "Found Sessions at line {0}", lineNumber);
                             else if(discScrMatch.Success)
                             {
                                 AaruConsole.DebugWriteLine("CloneCD plugin", "Found DataTracksScrambled at line {0}",
-                                                          lineNumber);
+                                                           lineNumber);
 
                                 scrambled |= discScrMatch.Groups["value"].Value == "1";
                             }
                             else if(cdtLenMatch.Success)
                                 AaruConsole.DebugWriteLine("CloneCD plugin", "Found CDTextLength at line {0}",
-                                                          lineNumber);
+                                                           lineNumber);
                             else if(discCatMatch.Success)
                             {
                                 AaruConsole.DebugWriteLine("CloneCD plugin", "Found Catalog at line {0}", lineNumber);
@@ -211,11 +212,11 @@ namespace Aaru.DiscImages
 
                             if(cdtEntsMatch.Success)
                                 AaruConsole.DebugWriteLine("CloneCD plugin", "Found CD-Text Entries at line {0}",
-                                                          lineNumber);
+                                                           lineNumber);
                             else if(cdtEntMatch.Success)
                             {
                                 AaruConsole.DebugWriteLine("CloneCD plugin", "Found CD-Text Entry at line {0}",
-                                                          lineNumber);
+                                                           lineNumber);
 
                                 string[] bytes = cdtEntMatch.Groups["value"].Value.Split(new[]
                                 {
@@ -234,9 +235,11 @@ namespace Aaru.DiscImages
                             Match sessSubcMatch = sessSubcRegex.Match(line);
 
                             if(sessPregMatch.Success)
-                                AaruConsole.DebugWriteLine("CloneCD plugin", "Found PreGapMode at line {0}", lineNumber);
+                                AaruConsole.DebugWriteLine("CloneCD plugin", "Found PreGapMode at line {0}",
+                                                           lineNumber);
                             else if(sessSubcMatch.Success)
-                                AaruConsole.DebugWriteLine("CloneCD plugin", "Found PreGapSubC at line {0}", lineNumber);
+                                AaruConsole.DebugWriteLine("CloneCD plugin", "Found PreGapSubC at line {0}",
+                                                           lineNumber);
                         }
                         else if(inEntry)
                         {
@@ -645,7 +648,7 @@ namespace Aaru.DiscImages
 
                                         if(imageInfo.MediaManufacturer != "")
                                             AaruConsole.DebugWriteLine("CloneCD plugin", "Disc manufactured by: {0}",
-                                                                      imageInfo.MediaManufacturer);
+                                                                       imageInfo.MediaManufacturer);
                                     }
 
                                     break;
@@ -656,7 +659,7 @@ namespace Aaru.DiscImages
                         {
                             uint id = (uint)((descriptor.Min << 16) + (descriptor.Sec << 8) + descriptor.Frame);
                             AaruConsole.DebugWriteLine("CloneCD plugin", "Disc ID: {0:X6}", id & 0x00FFFFFF);
-                            imageInfo.MediaSerialNumber = $"{id                               & 0x00FFFFFF:X6}";
+                            imageInfo.MediaSerialNumber = $"{id                                & 0x00FFFFFF:X6}";
 
                             break;
                         }
@@ -978,7 +981,7 @@ namespace Aaru.DiscImages
                 case SectorTagType.CdSectorSubHeader:
                 case SectorTagType.CdSectorSync: break;
                 case SectorTagType.CdTrackFlags:
-                    return!trackFlags.TryGetValue((byte)aaruTrack.TrackSequence, out byte flags) ? new[]
+                    return !trackFlags.TryGetValue((byte)aaruTrack.TrackSequence, out byte flags) ? new[]
                     {
                         flags
                     } : new byte[1];
diff --git a/Aaru.Images/CloneCD/Verify.cs b/Aaru.Images/CloneCD/Verify.cs
index 2d479b269..505ee6087 100644
--- a/Aaru.Images/CloneCD/Verify.cs
+++ b/Aaru.Images/CloneCD/Verify.cs
@@ -41,10 +41,11 @@ namespace Aaru.DiscImages
         public bool? VerifySector(ulong sectorAddress)
         {
             byte[] buffer = ReadSectorLong(sectorAddress);
+
             return CdChecksums.CheckCdSector(buffer);
         }
 
-        public bool? VerifySectors(ulong           sectorAddress, uint length, out List<ulong> failingLbas,
+        public bool? VerifySectors(ulong sectorAddress, uint length, out List<ulong> failingLbas,
                                    out List<ulong> unknownLbas)
         {
             byte[] buffer = ReadSectorsLong(sectorAddress, length);
@@ -62,19 +63,22 @@ namespace Aaru.DiscImages
                 {
                     case null:
                         unknownLbas.Add((ulong)i + sectorAddress);
+
                         break;
                     case false:
                         failingLbas.Add((ulong)i + sectorAddress);
+
                         break;
                 }
             }
 
-            if(unknownLbas.Count > 0) return null;
+            if(unknownLbas.Count > 0)
+                return null;
 
             return failingLbas.Count <= 0;
         }
 
-        public bool? VerifySectors(ulong           sectorAddress, uint length, uint track, out List<ulong> failingLbas,
+        public bool? VerifySectors(ulong sectorAddress, uint length, uint track, out List<ulong> failingLbas,
                                    out List<ulong> unknownLbas)
         {
             byte[] buffer = ReadSectorsLong(sectorAddress, length, track);
@@ -92,14 +96,17 @@ namespace Aaru.DiscImages
                 {
                     case null:
                         unknownLbas.Add((ulong)i + sectorAddress);
+
                         break;
                     case false:
                         failingLbas.Add((ulong)i + sectorAddress);
+
                         break;
                 }
             }
 
-            if(unknownLbas.Count > 0) return null;
+            if(unknownLbas.Count > 0)
+                return null;
 
             return failingLbas.Count <= 0;
         }
@@ -107,6 +114,7 @@ namespace Aaru.DiscImages
         public bool? VerifySector(ulong sectorAddress, uint track)
         {
             byte[] buffer = ReadSectorLong(sectorAddress, track);
+
             return CdChecksums.CheckCdSector(buffer);
         }
     }
diff --git a/Aaru.Images/CloneCD/Write.cs b/Aaru.Images/CloneCD/Write.cs
index 2b42ca0dc..e3e24a015 100644
--- a/Aaru.Images/CloneCD/Write.cs
+++ b/Aaru.Images/CloneCD/Write.cs
@@ -47,26 +47,32 @@ namespace Aaru.DiscImages
     public partial class CloneCd
     {
         public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
-                           uint   sectorSize)
+                           uint sectorSize)
         {
             if(!SupportedMediaTypes.Contains(mediaType))
             {
                 ErrorMessage = $"Unsupport media format {mediaType}";
+
                 return false;
             }
 
-            imageInfo = new ImageInfo {MediaType = mediaType, SectorSize = sectorSize, Sectors = sectors};
+            imageInfo = new ImageInfo
+            {
+                MediaType = mediaType, SectorSize = sectorSize, Sectors = sectors
+            };
 
             try
             {
                 writingBaseName  = Path.Combine(Path.GetDirectoryName(path), Path.GetFileNameWithoutExtension(path));
                 descriptorStream = new StreamWriter(path, false, Encoding.ASCII);
+
                 dataStream = new FileStream(writingBaseName + ".img", FileMode.OpenOrCreate, FileAccess.ReadWrite,
                                             FileShare.None);
             }
             catch(IOException e)
             {
                 ErrorMessage = $"Could not create new image file, exception {e.Message}";
+
                 return false;
             }
 
@@ -76,6 +82,7 @@ namespace Aaru.DiscImages
 
             IsWriting    = true;
             ErrorMessage = null;
+
             return true;
         }
 
@@ -84,6 +91,7 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Tried to write on a non-writable image";
+
                 return false;
             }
 
@@ -91,15 +99,18 @@ namespace Aaru.DiscImages
             {
                 case MediaTagType.CD_MCN:
                     catalog = Encoding.ASCII.GetString(data);
+
                     return true;
                 case MediaTagType.CD_FullTOC:
                     fulltoc = new byte[data.Length + 2];
                     Array.Copy(data, 0, fulltoc, 2, data.Length);
                     fulltoc[0] = (byte)((data.Length & 0xFF00) >> 8);
                     fulltoc[1] = (byte)(data.Length & 0xFF);
+
                     return true;
                 default:
                     ErrorMessage = $"Unsupported media tag {tag}";
+
                     return false;
             }
         }
@@ -109,11 +120,13 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Tried to write on a non-writable image";
+
                 return false;
             }
 
             // TODO: Implement ECC generation
             ErrorMessage = "This format requires sectors to be raw. Generating ECC is not yet implemented";
+
             return false;
         }
 
@@ -122,11 +135,13 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Tried to write on a non-writable image";
+
                 return false;
             }
 
             // TODO: Implement ECC generation
             ErrorMessage = "This format requires sectors to be raw. Generating ECC is not yet implemented";
+
             return false;
         }
 
@@ -135,6 +150,7 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Tried to write on a non-writable image";
+
                 return false;
             }
 
@@ -145,17 +161,20 @@ namespace Aaru.DiscImages
             if(track.TrackSequence == 0)
             {
                 ErrorMessage = $"Can't found track containing {sectorAddress}";
+
                 return false;
             }
 
             if(data.Length != track.TrackRawBytesPerSector)
             {
                 ErrorMessage = "Incorrect data size";
+
                 return false;
             }
 
-            dataStream.Seek((long)(track.TrackFileOffset + (sectorAddress - track.TrackStartSector) * (ulong)track.TrackRawBytesPerSector),
+            dataStream.Seek((long)(track.TrackFileOffset + ((sectorAddress - track.TrackStartSector) * (ulong)track.TrackRawBytesPerSector)),
                             SeekOrigin.Begin);
+
             dataStream.Write(data, 0, data.Length);
 
             return true;
@@ -166,6 +185,7 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Tried to write on a non-writable image";
+
                 return false;
             }
 
@@ -176,23 +196,27 @@ namespace Aaru.DiscImages
             if(track.TrackSequence == 0)
             {
                 ErrorMessage = $"Can't found track containing {sectorAddress}";
+
                 return false;
             }
 
             if(sectorAddress + length > track.TrackEndSector + 1)
             {
                 ErrorMessage = "Can't cross tracks";
+
                 return false;
             }
 
             if(data.Length % track.TrackRawBytesPerSector != 0)
             {
                 ErrorMessage = "Incorrect data size";
+
                 return false;
             }
 
-            dataStream.Seek((long)(track.TrackFileOffset + (sectorAddress - track.TrackStartSector) * (ulong)track.TrackRawBytesPerSector),
+            dataStream.Seek((long)(track.TrackFileOffset + ((sectorAddress - track.TrackStartSector) * (ulong)track.TrackRawBytesPerSector)),
                             SeekOrigin.Begin);
+
             dataStream.Write(data, 0, data.Length);
 
             return true;
@@ -204,21 +228,26 @@ namespace Aaru.DiscImages
             ulong currentSubchannelOffset = 0;
 
             Tracks = new List<Track>();
+
             foreach(Track track in tracks.OrderBy(t => t.TrackSequence))
             {
                 Track newTrack = track;
                 uint  subchannelSize;
+
                 switch(track.TrackSubchannelType)
                 {
                     case TrackSubchannelType.None:
                         subchannelSize = 0;
+
                         break;
                     case TrackSubchannelType.Raw:
                     case TrackSubchannelType.RawInterleaved:
                         subchannelSize = 96;
+
                         break;
                     default:
                         ErrorMessage = $"Unsupported subchannel type {track.TrackSubchannelType}";
+
                         return false;
                 }
 
@@ -226,8 +255,9 @@ namespace Aaru.DiscImages
                 newTrack.TrackSubchannelOffset = currentSubchannelOffset;
 
                 currentDataOffset += (ulong)newTrack.TrackRawBytesPerSector *
-                                     (newTrack.TrackEndSector - newTrack.TrackStartSector + 1);
-                currentSubchannelOffset += subchannelSize * (newTrack.TrackEndSector - newTrack.TrackStartSector + 1);
+                                     ((newTrack.TrackEndSector - newTrack.TrackStartSector) + 1);
+
+                currentSubchannelOffset += subchannelSize * ((newTrack.TrackEndSector - newTrack.TrackStartSector) + 1);
 
                 Tracks.Add(newTrack);
             }
@@ -240,6 +270,7 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Image is not opened for writing";
+
                 return false;
             }
 
@@ -253,7 +284,8 @@ namespace Aaru.DiscImages
             FullTOC.CDFullTOC  toc;
 
             // Easy, just decode the real toc
-            if(fulltoc != null) nullableToc = FullTOC.Decode(fulltoc);
+            if(fulltoc != null)
+                nullableToc = FullTOC.Decode(fulltoc);
 
             // Not easy, create a toc from scratch
             if(nullableToc == null)
@@ -273,10 +305,12 @@ namespace Aaru.DiscImages
                     if(track.TrackSession <= toc.LastCompleteSession)
                     {
                         currentTrack = (byte)track.TrackSequence;
+
                         continue;
                     }
 
-                    if(toc.LastCompleteSession > 0) sessionEndingTrack.Add(toc.LastCompleteSession, currentTrack);
+                    if(toc.LastCompleteSession > 0)
+                        sessionEndingTrack.Add(toc.LastCompleteSession, currentTrack);
 
                     toc.LastCompleteSession = (byte)track.TrackSession;
                 }
@@ -287,30 +321,28 @@ namespace Aaru.DiscImages
                 {
                     trackFlags.TryGetValue((byte)track.TrackSequence, out byte trackControl);
 
-                    if(trackControl == 0 && track.TrackType != TrackType.Audio) trackControl = (byte)CdFlags.DataTrack;
+                    if(trackControl    == 0 &&
+                       track.TrackType != TrackType.Audio)
+                        trackControl = (byte)CdFlags.DataTrack;
 
                     // Lead-Out
-                    if(track.TrackSession > currentSession && currentSession != 0)
+                    if(track.TrackSession > currentSession &&
+                       currentSession     != 0)
                     {
                         (byte minute, byte second, byte frame) leadoutAmsf = LbaToMsf(track.TrackStartSector - 150);
+
                         (byte minute, byte second, byte frame) leadoutPmsf =
-                            LbaToMsf(Tracks.OrderBy(t => t.TrackSession).ThenBy(t => t.TrackSequence).Last()
-                                           .TrackStartSector);
+                            LbaToMsf(Tracks.OrderBy(t => t.TrackSession).ThenBy(t => t.TrackSequence).Last().
+                                            TrackStartSector);
 
                         // Lead-out
                         trackDescriptors.Add(new FullTOC.TrackDataDescriptor
                         {
-                            SessionNumber = currentSession,
-                            POINT         = 0xB0,
-                            ADR           = 5,
+                            SessionNumber = currentSession, POINT = 0xB0, ADR = 5,
                             CONTROL       = 0,
-                            HOUR          = 0,
-                            Min           = leadoutAmsf.minute,
-                            Sec           = leadoutAmsf.second,
+                            HOUR          = 0, Min = leadoutAmsf.minute, Sec = leadoutAmsf.second,
                             Frame         = leadoutAmsf.frame,
-                            PHOUR         = 2,
-                            PMIN          = leadoutPmsf.minute,
-                            PSEC          = leadoutPmsf.second,
+                            PHOUR         = 2, PMIN = leadoutPmsf.minute, PSEC = leadoutPmsf.second,
                             PFRAME        = leadoutPmsf.frame
                         });
 
@@ -318,13 +350,8 @@ namespace Aaru.DiscImages
                         // Format seems like ATIP, but ATIP should not be as 0xC0 in TOC...
                         trackDescriptors.Add(new FullTOC.TrackDataDescriptor
                         {
-                            SessionNumber = currentSession,
-                            POINT         = 0xC0,
-                            ADR           = 5,
-                            CONTROL       = 0,
-                            Min           = 128,
-                            PMIN          = 97,
-                            PSEC          = 25
+                            SessionNumber = currentSession, POINT = 0xC0, ADR = 5, CONTROL = 0,
+                            Min           = 128, PMIN             = 97, PSEC  = 25
                         });
                     }
 
@@ -333,6 +360,7 @@ namespace Aaru.DiscImages
                     {
                         currentSession = (byte)track.TrackSession;
                         sessionEndingTrack.TryGetValue(currentSession, out byte endingTrackNumber);
+
                         (byte minute, byte second, byte frame) leadinPmsf =
                             LbaToMsf(Tracks.FirstOrDefault(t => t.TrackSequence == endingTrackNumber).TrackEndSector +
                                      1);
@@ -340,33 +368,23 @@ namespace Aaru.DiscImages
                         // Starting track
                         trackDescriptors.Add(new FullTOC.TrackDataDescriptor
                         {
-                            SessionNumber = currentSession,
-                            POINT         = 0xA0,
-                            ADR           = 1,
-                            CONTROL       = trackControl,
+                            SessionNumber = currentSession, POINT = 0xA0, ADR = 1, CONTROL = trackControl,
                             PMIN          = (byte)track.TrackSequence
                         });
 
                         // Ending track
                         trackDescriptors.Add(new FullTOC.TrackDataDescriptor
                         {
-                            SessionNumber = currentSession,
-                            POINT         = 0xA1,
-                            ADR           = 1,
-                            CONTROL       = trackControl,
+                            SessionNumber = currentSession, POINT = 0xA1, ADR = 1, CONTROL = trackControl,
                             PMIN          = endingTrackNumber
                         });
 
                         // Lead-out start
                         trackDescriptors.Add(new FullTOC.TrackDataDescriptor
                         {
-                            SessionNumber = currentSession,
-                            POINT         = 0xA2,
-                            ADR           = 1,
+                            SessionNumber = currentSession, POINT = 0xA2, ADR = 1,
                             CONTROL       = trackControl,
-                            PHOUR         = 0,
-                            PMIN          = leadinPmsf.minute,
-                            PSEC          = leadinPmsf.second,
+                            PHOUR         = 0, PMIN = leadinPmsf.minute, PSEC = leadinPmsf.second,
                             PFRAME        = leadinPmsf.frame
                         });
                     }
@@ -376,12 +394,8 @@ namespace Aaru.DiscImages
                     // Track
                     trackDescriptors.Add(new FullTOC.TrackDataDescriptor
                     {
-                        SessionNumber = (byte)track.TrackSession,
-                        POINT         = (byte)track.TrackSequence,
-                        ADR           = 1,
-                        CONTROL       = trackControl,
-                        PHOUR         = 0,
-                        PMIN          = pmsf.minute,
+                        SessionNumber = (byte)track.TrackSession, POINT = (byte)track.TrackSequence, ADR = 1,
+                        CONTROL       = trackControl, PHOUR             = 0, PMIN                        = pmsf.minute,
                         PSEC          = pmsf.second,
                         PFRAME        = pmsf.frame
                     });
@@ -389,16 +403,20 @@ namespace Aaru.DiscImages
 
                 toc.TrackDescriptors = trackDescriptors.ToArray();
             }
-            else toc = nullableToc.Value;
+            else
+                toc = nullableToc.Value;
 
             descriptorStream.WriteLine("[CloneCD]");
             descriptorStream.WriteLine("Version=2");
             descriptorStream.WriteLine("[Disc]");
             descriptorStream.WriteLine("TocEntries={0}", toc.TrackDescriptors.Length);
-            descriptorStream.WriteLine("Sessions={0}",   toc.LastCompleteSession);
+            descriptorStream.WriteLine("Sessions={0}", toc.LastCompleteSession);
             descriptorStream.WriteLine("DataTracksScrambled=0");
             descriptorStream.WriteLine("CDTextLength=0");
-            if(!string.IsNullOrEmpty(catalog)) descriptorStream.WriteLine("CATALOG={0}", catalog);
+
+            if(!string.IsNullOrEmpty(catalog))
+                descriptorStream.WriteLine("CATALOG={0}", catalog);
+
             for(int i = 1; i <= toc.LastCompleteSession; i++)
             {
                 // TODO: Use first track of session info
@@ -411,29 +429,35 @@ namespace Aaru.DiscImages
             {
                 long alba = MsfToLba((toc.TrackDescriptors[i].Min, toc.TrackDescriptors[i].Sec,
                                       toc.TrackDescriptors[i].Frame));
+
                 long plba = MsfToLba((toc.TrackDescriptors[i].PMIN, toc.TrackDescriptors[i].PSEC,
                                       toc.TrackDescriptors[i].PFRAME));
 
-                if(alba > 405000) alba = (alba - 405000 + 300) * -1;
-                if(plba > 405000) plba = (plba - 405000 + 300) * -1;
+                if(alba > 405000)
+                    alba = ((alba - 405000) + 300) * -1;
 
-                descriptorStream.WriteLine("[Entry {0}]",      i);
-                descriptorStream.WriteLine("Session={0}",      toc.TrackDescriptors[i].SessionNumber);
-                descriptorStream.WriteLine("Point=0x{0:x2}",   toc.TrackDescriptors[i].POINT);
-                descriptorStream.WriteLine("ADR=0x{0:x2}",     toc.TrackDescriptors[i].ADR);
+                if(plba > 405000)
+                    plba = ((plba - 405000) + 300) * -1;
+
+                descriptorStream.WriteLine("[Entry {0}]", i);
+                descriptorStream.WriteLine("Session={0}", toc.TrackDescriptors[i].SessionNumber);
+                descriptorStream.WriteLine("Point=0x{0:x2}", toc.TrackDescriptors[i].POINT);
+                descriptorStream.WriteLine("ADR=0x{0:x2}", toc.TrackDescriptors[i].ADR);
                 descriptorStream.WriteLine("Control=0x{0:x2}", toc.TrackDescriptors[i].CONTROL);
-                descriptorStream.WriteLine("TrackNo={0}",      toc.TrackDescriptors[i].TNO);
-                descriptorStream.WriteLine("AMin={0}",         toc.TrackDescriptors[i].Min);
-                descriptorStream.WriteLine("ASec={0}",         toc.TrackDescriptors[i].Sec);
-                descriptorStream.WriteLine("AFrame={0}",       toc.TrackDescriptors[i].Frame);
-                descriptorStream.WriteLine("ALBA={0}",         alba);
+                descriptorStream.WriteLine("TrackNo={0}", toc.TrackDescriptors[i].TNO);
+                descriptorStream.WriteLine("AMin={0}", toc.TrackDescriptors[i].Min);
+                descriptorStream.WriteLine("ASec={0}", toc.TrackDescriptors[i].Sec);
+                descriptorStream.WriteLine("AFrame={0}", toc.TrackDescriptors[i].Frame);
+                descriptorStream.WriteLine("ALBA={0}", alba);
+
                 descriptorStream.WriteLine("Zero={0}",
                                            ((toc.TrackDescriptors[i].HOUR & 0x0F) << 4) +
                                            (toc.TrackDescriptors[i].PHOUR & 0x0F));
-                descriptorStream.WriteLine("PMin={0}",   toc.TrackDescriptors[i].PMIN);
-                descriptorStream.WriteLine("PSec={0}",   toc.TrackDescriptors[i].PSEC);
+
+                descriptorStream.WriteLine("PMin={0}", toc.TrackDescriptors[i].PMIN);
+                descriptorStream.WriteLine("PSec={0}", toc.TrackDescriptors[i].PSEC);
                 descriptorStream.WriteLine("PFrame={0}", toc.TrackDescriptors[i].PFRAME);
-                descriptorStream.WriteLine("PLBA={0}",   plba);
+                descriptorStream.WriteLine("PLBA={0}", plba);
             }
 
             descriptorStream.Flush();
@@ -441,6 +465,7 @@ namespace Aaru.DiscImages
 
             IsWriting    = false;
             ErrorMessage = "";
+
             return true;
         }
 
@@ -449,6 +474,7 @@ namespace Aaru.DiscImages
         public bool SetGeometry(uint cylinders, uint heads, uint sectorsPerTrack)
         {
             ErrorMessage = "Unsupported feature";
+
             return false;
         }
 
@@ -457,6 +483,7 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Tried to write on a non-writable image";
+
                 return false;
             }
 
@@ -467,6 +494,7 @@ namespace Aaru.DiscImages
             if(track.TrackSequence == 0)
             {
                 ErrorMessage = $"Can't found track containing {sectorAddress}";
+
                 return false;
             }
 
@@ -477,6 +505,7 @@ namespace Aaru.DiscImages
                     if(data.Length != 1)
                     {
                         ErrorMessage = "Incorrect data size for track flags";
+
                         return false;
                     }
 
@@ -490,12 +519,14 @@ namespace Aaru.DiscImages
                     {
                         ErrorMessage =
                             $"Trying to write subchannel to track {track.TrackSequence}, that does not have subchannel";
+
                         return false;
                     }
 
                     if(data.Length != 96)
                     {
                         ErrorMessage = "Incorrect data size for subchannel";
+
                         return false;
                     }
 
@@ -508,17 +539,20 @@ namespace Aaru.DiscImages
                         catch(IOException e)
                         {
                             ErrorMessage = $"Could not create subchannel file, exception {e.Message}";
+
                             return false;
                         }
 
-                    subStream.Seek((long)(track.TrackSubchannelOffset + (sectorAddress - track.TrackStartSector) * 96),
+                    subStream.Seek((long)(track.TrackSubchannelOffset + ((sectorAddress - track.TrackStartSector) * 96)),
                                    SeekOrigin.Begin);
+
                     subStream.Write(data, 0, data.Length);
 
                     return true;
                 }
                 default:
                     ErrorMessage = $"Unsupported tag type {tag}";
+
                     return false;
             }
         }
@@ -528,6 +562,7 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Tried to write on a non-writable image";
+
                 return false;
             }
 
@@ -538,6 +573,7 @@ namespace Aaru.DiscImages
             if(track.TrackSequence == 0)
             {
                 ErrorMessage = $"Can't found track containing {sectorAddress}";
+
                 return false;
             }
 
@@ -551,12 +587,14 @@ namespace Aaru.DiscImages
                     {
                         ErrorMessage =
                             $"Trying to write subchannel to track {track.TrackSequence}, that does not have subchannel";
+
                         return false;
                     }
 
                     if(data.Length % 96 != 0)
                     {
                         ErrorMessage = "Incorrect data size for subchannel";
+
                         return false;
                     }
 
@@ -569,17 +607,20 @@ namespace Aaru.DiscImages
                         catch(IOException e)
                         {
                             ErrorMessage = $"Could not create subchannel file, exception {e.Message}";
+
                             return false;
                         }
 
-                    subStream.Seek((long)(track.TrackSubchannelOffset + (sectorAddress - track.TrackStartSector) * 96),
+                    subStream.Seek((long)(track.TrackSubchannelOffset + ((sectorAddress - track.TrackStartSector) * 96)),
                                    SeekOrigin.Begin);
+
                     subStream.Write(data, 0, data.Length);
 
                     return true;
                 }
                 default:
                     ErrorMessage = $"Unsupported tag type {tag}";
+
                     return false;
             }
         }
diff --git a/Aaru.Images/CopyQM/Constants.cs b/Aaru.Images/CopyQM/Constants.cs
index c6d8ec836..5980c6c27 100644
--- a/Aaru.Images/CopyQM/Constants.cs
+++ b/Aaru.Images/CopyQM/Constants.cs
@@ -47,38 +47,35 @@ namespace Aaru.DiscImages
 
         readonly uint[] copyQmCrcTable =
         {
-            0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA, 0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3,
-            0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988, 0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91,
-            0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE, 0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7,
-            0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC, 0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5,
-            0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172, 0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B,
-            0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940, 0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59,
-            0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116, 0x21B4F4B5, 0x56B3C423, 0xCFBA9599, 0xB8BDA50F,
-            0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924, 0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D,
-            0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A, 0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433,
-            0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818, 0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01,
-            0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E, 0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457,
-            0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA, 0xFCB9887C, 0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65,
-            0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2, 0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB,
-            0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0, 0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9,
-            0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086, 0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F,
-            0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4, 0x59B33D17, 0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD,
-            0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A, 0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683,
-            0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8, 0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1,
-            0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE, 0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7,
-            0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC, 0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5,
-            0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252, 0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B,
-            0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60, 0xDF60EFC3, 0xA867DF55, 0x316E8EEF, 0x4669BE79,
-            0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236, 0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F,
-            0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04, 0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D,
-            0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A, 0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713,
-            0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38, 0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21,
-            0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E, 0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777,
-            0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C, 0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45,
-            0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2, 0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB,
-            0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0, 0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9,
-            0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6, 0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF,
-            0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94, 0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D
+            0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA, 0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3, 0x0EDB8832,
+            0x79DCB8A4, 0xE0D5E91E, 0x97D2D988, 0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91, 0x1DB71064, 0x6AB020F2,
+            0xF3B97148, 0x84BE41DE, 0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7, 0x136C9856, 0x646BA8C0, 0xFD62F97A,
+            0x8A65C9EC, 0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5, 0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172,
+            0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B, 0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940, 0x32D86CE3,
+            0x45DF5C75, 0xDCD60DCF, 0xABD13D59, 0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116, 0x21B4F4B5, 0x56B3C423,
+            0xCFBA9599, 0xB8BDA50F, 0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924, 0x2F6F7C87, 0x58684C11, 0xC1611DAB,
+            0xB6662D3D, 0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A, 0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433,
+            0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818, 0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01, 0x6B6B51F4,
+            0x1C6C6162, 0x856530D8, 0xF262004E, 0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457, 0x65B0D9C6, 0x12B7E950,
+            0x8BBEB8EA, 0xFCB9887C, 0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65, 0x4DB26158, 0x3AB551CE, 0xA3BC0074,
+            0xD4BB30E2, 0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB, 0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0,
+            0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9, 0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086, 0x5768B525,
+            0x206F85B3, 0xB966D409, 0xCE61E49F, 0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4, 0x59B33D17, 0x2EB40D81,
+            0xB7BD5C3B, 0xC0BA6CAD, 0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A, 0xEAD54739, 0x9DD277AF, 0x04DB2615,
+            0x73DC1683, 0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8, 0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1,
+            0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE, 0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7, 0xFED41B76,
+            0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC, 0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5, 0xD6D6A3E8, 0xA1D1937E,
+            0x38D8C2C4, 0x4FDFF252, 0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B, 0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6,
+            0x41047A60, 0xDF60EFC3, 0xA867DF55, 0x316E8EEF, 0x4669BE79, 0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236,
+            0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F, 0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04, 0xC2D7FFA7,
+            0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D, 0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A, 0x9C0906A9, 0xEB0E363F,
+            0x72076785, 0x05005713, 0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38, 0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7,
+            0x0BDBDF21, 0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E, 0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777,
+            0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C, 0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45, 0xA00AE278,
+            0xD70DD2EE, 0x4E048354, 0x3903B3C2, 0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB, 0xAED16A4A, 0xD9D65ADC,
+            0x40DF0B66, 0x37D83BF0, 0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9, 0xBDBDF21C, 0xCABAC28A, 0x53B39330,
+            0x24B4A3A6, 0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF, 0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94,
+            0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D
         };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/CopyQM/CopyQM.cs b/Aaru.Images/CopyQM/CopyQM.cs
index bc04128da..499750e9e 100644
--- a/Aaru.Images/CopyQM/CopyQM.cs
+++ b/Aaru.Images/CopyQM/CopyQM.cs
@@ -47,31 +47,18 @@ namespace Aaru.DiscImages
         bool         headerChecksumOk;
         ImageInfo    imageInfo;
 
-        public CopyQm()
+        public CopyQm() => imageInfo = new ImageInfo
         {
-            imageInfo = new ImageInfo
-            {
-                ReadableSectorTags    = new List<SectorTagType>(),
-                ReadableMediaTags     = new List<MediaTagType>(),
-                HasPartitions         = false,
-                HasSessions           = false,
-                Version               = null,
-                Application           = null,
-                ApplicationVersion    = null,
-                Creator               = null,
-                Comments              = null,
-                MediaManufacturer     = null,
-                MediaModel            = null,
-                MediaSerialNumber     = null,
-                MediaBarcode          = null,
-                MediaPartNumber       = null,
-                MediaSequence         = 0,
-                LastMediaSequence     = 0,
-                DriveManufacturer     = null,
-                DriveModel            = null,
-                DriveSerialNumber     = null,
-                DriveFirmwareRevision = null
-            };
-        }
+            ReadableSectorTags = new List<SectorTagType>(), ReadableMediaTags = new List<MediaTagType>(),
+            HasPartitions      = false, HasSessions                           = false, Version = null,
+            Application        = null,
+            ApplicationVersion = null, Creator = null, Comments = null,
+            MediaManufacturer  = null,
+            MediaModel         = null, MediaSerialNumber = null, MediaBarcode = null,
+            MediaPartNumber    = null,
+            MediaSequence      = 0, LastMediaSequence = 0, DriveManufacturer = null,
+            DriveModel         = null,
+            DriveSerialNumber  = null, DriveFirmwareRevision = null
+        };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/CopyQM/Identify.cs b/Aaru.Images/CopyQM/Identify.cs
index ab5e3bbde..0b98ec088 100644
--- a/Aaru.Images/CopyQM/Identify.cs
+++ b/Aaru.Images/CopyQM/Identify.cs
@@ -42,7 +42,9 @@ namespace Aaru.DiscImages
         {
             Stream stream = imageFilter.GetDataForkStream();
             stream.Seek(0, SeekOrigin.Begin);
-            if(stream.Length < 133) return false;
+
+            if(stream.Length < 133)
+                return false;
 
             byte[] hdr = new byte[133];
             stream.Read(hdr, 0, 133);
diff --git a/Aaru.Images/CopyQM/Read.cs b/Aaru.Images/CopyQM/Read.cs
index 9cd67b7ca..dc8f2e5e6 100644
--- a/Aaru.Images/CopyQM/Read.cs
+++ b/Aaru.Images/CopyQM/Read.cs
@@ -52,35 +52,35 @@ namespace Aaru.DiscImages
             stream.Read(hdr, 0, 133);
             header = Marshal.ByteArrayToStructureLittleEndian<CopyQmHeader>(hdr);
 
-            AaruConsole.DebugWriteLine("CopyQM plugin", "header.magic = 0x{0:X4}",       header.magic);
-            AaruConsole.DebugWriteLine("CopyQM plugin", "header.mark = 0x{0:X2}",        header.mark);
-            AaruConsole.DebugWriteLine("CopyQM plugin", "header.sectorSize = {0}",       header.sectorSize);
+            AaruConsole.DebugWriteLine("CopyQM plugin", "header.magic = 0x{0:X4}", header.magic);
+            AaruConsole.DebugWriteLine("CopyQM plugin", "header.mark = 0x{0:X2}", header.mark);
+            AaruConsole.DebugWriteLine("CopyQM plugin", "header.sectorSize = {0}", header.sectorSize);
             AaruConsole.DebugWriteLine("CopyQM plugin", "header.sectorPerCluster = {0}", header.sectorPerCluster);
-            AaruConsole.DebugWriteLine("CopyQM plugin", "header.reservedSectors = {0}",  header.reservedSectors);
-            AaruConsole.DebugWriteLine("CopyQM plugin", "header.fatCopy = {0}",          header.fatCopy);
-            AaruConsole.DebugWriteLine("CopyQM plugin", "header.rootEntries = {0}",      header.rootEntries);
-            AaruConsole.DebugWriteLine("CopyQM plugin", "header.sectors = {0}",          header.sectors);
-            AaruConsole.DebugWriteLine("CopyQM plugin", "header.mediaType = 0x{0:X2}",   header.mediaType);
-            AaruConsole.DebugWriteLine("CopyQM plugin", "header.sectorsPerFat = {0}",    header.sectorsPerFat);
-            AaruConsole.DebugWriteLine("CopyQM plugin", "header.sectorsPerTrack = {0}",  header.sectorsPerTrack);
-            AaruConsole.DebugWriteLine("CopyQM plugin", "header.heads = {0}",            header.heads);
-            AaruConsole.DebugWriteLine("CopyQM plugin", "header.hidden = {0}",           header.hidden);
-            AaruConsole.DebugWriteLine("CopyQM plugin", "header.sectorsBig = {0}",       header.sectorsBig);
-            AaruConsole.DebugWriteLine("CopyQM plugin", "header.description = {0}",      header.description);
-            AaruConsole.DebugWriteLine("CopyQM plugin", "header.blind = {0}",            header.blind);
-            AaruConsole.DebugWriteLine("CopyQM plugin", "header.density = {0}",          header.density);
-            AaruConsole.DebugWriteLine("CopyQM plugin", "header.imageCylinders = {0}",   header.imageCylinders);
-            AaruConsole.DebugWriteLine("CopyQM plugin", "header.totalCylinders = {0}",   header.totalCylinders);
-            AaruConsole.DebugWriteLine("CopyQM plugin", "header.crc = 0x{0:X8}",         header.crc);
-            AaruConsole.DebugWriteLine("CopyQM plugin", "header.volumeLabel = {0}",      header.volumeLabel);
-            AaruConsole.DebugWriteLine("CopyQM plugin", "header.time = 0x{0:X4}",        header.time);
-            AaruConsole.DebugWriteLine("CopyQM plugin", "header.date = 0x{0:X4}",        header.date);
-            AaruConsole.DebugWriteLine("CopyQM plugin", "header.commentLength = {0}",    header.commentLength);
-            AaruConsole.DebugWriteLine("CopyQM plugin", "header.secbs = {0}",            header.secbs);
-            AaruConsole.DebugWriteLine("CopyQM plugin", "header.unknown = 0x{0:X4}",     header.unknown);
-            AaruConsole.DebugWriteLine("CopyQM plugin", "header.interleave = {0}",       header.interleave);
-            AaruConsole.DebugWriteLine("CopyQM plugin", "header.skew = {0}",             header.skew);
-            AaruConsole.DebugWriteLine("CopyQM plugin", "header.drive = {0}",            header.drive);
+            AaruConsole.DebugWriteLine("CopyQM plugin", "header.reservedSectors = {0}", header.reservedSectors);
+            AaruConsole.DebugWriteLine("CopyQM plugin", "header.fatCopy = {0}", header.fatCopy);
+            AaruConsole.DebugWriteLine("CopyQM plugin", "header.rootEntries = {0}", header.rootEntries);
+            AaruConsole.DebugWriteLine("CopyQM plugin", "header.sectors = {0}", header.sectors);
+            AaruConsole.DebugWriteLine("CopyQM plugin", "header.mediaType = 0x{0:X2}", header.mediaType);
+            AaruConsole.DebugWriteLine("CopyQM plugin", "header.sectorsPerFat = {0}", header.sectorsPerFat);
+            AaruConsole.DebugWriteLine("CopyQM plugin", "header.sectorsPerTrack = {0}", header.sectorsPerTrack);
+            AaruConsole.DebugWriteLine("CopyQM plugin", "header.heads = {0}", header.heads);
+            AaruConsole.DebugWriteLine("CopyQM plugin", "header.hidden = {0}", header.hidden);
+            AaruConsole.DebugWriteLine("CopyQM plugin", "header.sectorsBig = {0}", header.sectorsBig);
+            AaruConsole.DebugWriteLine("CopyQM plugin", "header.description = {0}", header.description);
+            AaruConsole.DebugWriteLine("CopyQM plugin", "header.blind = {0}", header.blind);
+            AaruConsole.DebugWriteLine("CopyQM plugin", "header.density = {0}", header.density);
+            AaruConsole.DebugWriteLine("CopyQM plugin", "header.imageCylinders = {0}", header.imageCylinders);
+            AaruConsole.DebugWriteLine("CopyQM plugin", "header.totalCylinders = {0}", header.totalCylinders);
+            AaruConsole.DebugWriteLine("CopyQM plugin", "header.crc = 0x{0:X8}", header.crc);
+            AaruConsole.DebugWriteLine("CopyQM plugin", "header.volumeLabel = {0}", header.volumeLabel);
+            AaruConsole.DebugWriteLine("CopyQM plugin", "header.time = 0x{0:X4}", header.time);
+            AaruConsole.DebugWriteLine("CopyQM plugin", "header.date = 0x{0:X4}", header.date);
+            AaruConsole.DebugWriteLine("CopyQM plugin", "header.commentLength = {0}", header.commentLength);
+            AaruConsole.DebugWriteLine("CopyQM plugin", "header.secbs = {0}", header.secbs);
+            AaruConsole.DebugWriteLine("CopyQM plugin", "header.unknown = 0x{0:X4}", header.unknown);
+            AaruConsole.DebugWriteLine("CopyQM plugin", "header.interleave = {0}", header.interleave);
+            AaruConsole.DebugWriteLine("CopyQM plugin", "header.skew = {0}", header.skew);
+            AaruConsole.DebugWriteLine("CopyQM plugin", "header.drive = {0}", header.drive);
 
             byte[] cmt = new byte[header.commentLength];
             stream.Read(cmt, 0, header.commentLength);
@@ -92,7 +92,9 @@ namespace Aaru.DiscImages
             while(stream.Position + 2 < stream.Length)
             {
                 byte[] runLengthBytes = new byte[2];
-                if(stream.Read(runLengthBytes, 0, 2) != 2) break;
+
+                if(stream.Read(runLengthBytes, 0, 2) != 2)
+                    break;
 
                 short runLength = BitConverter.ToInt16(runLengthBytes, 0);
 
@@ -105,6 +107,7 @@ namespace Aaru.DiscImages
                     for(int i = 0; i < runLength * -1; i++)
                     {
                         decodedImage.WriteByte(repeatedByte);
+
                         calculatedDataCrc = copyQmCrcTable[(repeatedByte ^ calculatedDataCrc) & 0x3F] ^
                                             (calculatedDataCrc >> 8);
                     }
@@ -123,7 +126,7 @@ namespace Aaru.DiscImages
             // In case there is omitted data
             long sectors = header.sectorsPerTrack * header.heads * header.totalCylinders;
 
-            long fillingLen = sectors * header.sectorSize - decodedImage.Length;
+            long fillingLen = (sectors * header.sectorSize) - decodedImage.Length;
 
             if(fillingLen > 0)
             {
@@ -132,15 +135,18 @@ namespace Aaru.DiscImages
                 decodedImage.Write(filling, 0, filling.Length);
             }
 
-            int sum                                     = 0;
-            for(int i = 0; i < hdr.Length - 1; i++) sum += hdr[i];
+            int sum = 0;
+
+            for(int i = 0; i < hdr.Length - 1; i++)
+                sum += hdr[i];
 
             headerChecksumOk = ((-1 * sum) & 0xFF) == header.headerChecksum;
 
             AaruConsole.DebugWriteLine("CopyQM plugin", "Calculated header checksum = 0x{0:X2}, {1}", (-1 * sum) & 0xFF,
-                                      headerChecksumOk);
+                                       headerChecksumOk);
+
             AaruConsole.DebugWriteLine("CopyQM plugin", "Calculated data CRC = 0x{0:X8}, {1}", calculatedDataCrc,
-                                      calculatedDataCrc == header.crc);
+                                       calculatedDataCrc == header.crc);
 
             imageInfo.Application          = "CopyQM";
             imageInfo.CreationTime         = DateHandlers.DosToDateTime(header.date, header.time);
@@ -158,12 +164,15 @@ namespace Aaru.DiscImages
             {
                 case MediaType.NEC_525_HD when header.drive == COPYQM_35_HD || header.drive == COPYQM_35_ED:
                     imageInfo.MediaType = MediaType.NEC_35_HD_8;
+
                     break;
                 case MediaType.DOS_525_HD when header.drive == COPYQM_35_HD || header.drive == COPYQM_35_ED:
                     imageInfo.MediaType = MediaType.NEC_35_HD_15;
+
                     break;
                 case MediaType.RX50 when header.drive == COPYQM_525_DD || header.drive == COPYQM_525_HD:
                     imageInfo.MediaType = MediaType.ATARI_35_SS_DD;
+
                     break;
             }
 
@@ -173,6 +182,7 @@ namespace Aaru.DiscImages
             decodedImage.Close();
 
             AaruConsole.VerboseWriteLine("CopyQM image contains a disk of type {0}", imageInfo.MediaType);
+
             if(!string.IsNullOrEmpty(imageInfo.Comments))
                 AaruConsole.VerboseWriteLine("CopyQM comments: {0}", imageInfo.Comments);
 
diff --git a/Aaru.Images/CopyQM/Structs.cs b/Aaru.Images/CopyQM/Structs.cs
index 4f4ee62f3..ece54b264 100644
--- a/Aaru.Images/CopyQM/Structs.cs
+++ b/Aaru.Images/CopyQM/Structs.cs
@@ -40,70 +40,70 @@ namespace Aaru.DiscImages
         struct CopyQmHeader
         {
             /// <summary>0x00 magic, "CQ"</summary>
-            public ushort magic;
+            public readonly ushort magic;
             /// <summary>0x02 always 0x14</summary>
-            public byte mark;
+            public readonly byte mark;
             /// <summary>0x03 Bytes per sector (part of FAT's BPB)</summary>
-            public ushort sectorSize;
+            public readonly ushort sectorSize;
             /// <summary>0x05 Sectors per cluster (part of FAT's BPB)</summary>
-            public byte sectorPerCluster;
+            public readonly byte sectorPerCluster;
             /// <summary>0x06 Reserved sectors (part of FAT's BPB)</summary>
-            public ushort reservedSectors;
+            public readonly ushort reservedSectors;
             /// <summary>0x08 Number of FAT copies (part of FAT's BPB)</summary>
-            public byte fatCopy;
+            public readonly byte fatCopy;
             /// <summary>0x09 Maximum number of entries in root directory (part of FAT's BPB)</summary>
-            public ushort rootEntries;
+            public readonly ushort rootEntries;
             /// <summary>0x0B Sectors on disk (part of FAT's BPB)</summary>
-            public ushort sectors;
+            public readonly ushort sectors;
             /// <summary>0x0D Media descriptor (part of FAT's BPB)</summary>
-            public byte mediaType;
+            public readonly byte mediaType;
             /// <summary>0x0E Sectors per FAT (part of FAT's BPB)</summary>
-            public ushort sectorsPerFat;
+            public readonly ushort sectorsPerFat;
             /// <summary>0x10 Sectors per track (part of FAT's BPB)</summary>
-            public ushort sectorsPerTrack;
+            public readonly ushort sectorsPerTrack;
             /// <summary>0x12 Heads (part of FAT's BPB)</summary>
-            public ushort heads;
+            public readonly ushort heads;
             /// <summary>0x14 Hidden sectors (part of FAT's BPB)</summary>
-            public uint hidden;
+            public readonly uint hidden;
             /// <summary>0x18 Sectors on disk (part of FAT's BPB)</summary>
-            public uint sectorsBig;
+            public readonly uint sectorsBig;
             /// <summary>0x1C Description</summary>
             [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 60)]
-            public string description;
+            public readonly string description;
             /// <summary>0x58 Blind mode. 0 = DOS, 1 = blind, 2 = HFS</summary>
-            public byte blind;
+            public readonly byte blind;
             /// <summary>0x59 Density. 0 = Double, 1 = High, 2 = Quad/Extra</summary>
-            public byte density;
+            public readonly byte density;
             /// <summary>0x5A Cylinders in image</summary>
-            public byte imageCylinders;
+            public readonly byte imageCylinders;
             /// <summary>0x5B Cylinders on disk</summary>
-            public byte totalCylinders;
+            public readonly byte totalCylinders;
             /// <summary>0x5C CRC32 of data</summary>
-            public uint crc;
+            public readonly uint crc;
             /// <summary>0x60 DOS volume label</summary>
             [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 11)]
-            public string volumeLabel;
+            public readonly string volumeLabel;
             /// <summary>0x6B Modification time</summary>
-            public ushort time;
+            public readonly ushort time;
             /// <summary>0x6D Modification date</summary>
-            public ushort date;
+            public readonly ushort date;
             /// <summary>0x6F Comment length</summary>
-            public ushort commentLength;
+            public readonly ushort commentLength;
             /// <summary>0x71 Sector base (first sector - 1)</summary>
-            public byte secbs;
+            public readonly byte secbs;
             /// <summary>0x72 Unknown</summary>
-            public ushort unknown;
+            public readonly ushort unknown;
             /// <summary>0x74 Interleave</summary>
-            public byte interleave;
+            public readonly byte interleave;
             /// <summary>0x75 Skew</summary>
-            public byte skew;
+            public readonly byte skew;
             /// <summary>0x76 Source drive type. 1 = 5.25" DD, 2 = 5.25" HD, 3 = 3.5" DD, 4 = 3.5" HD, 6 = 3.5" ED</summary>
-            public byte drive;
+            public readonly byte drive;
             /// <summary>0x77 Filling bytes</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 13)]
-            public byte[] fill;
+            public readonly byte[] fill;
             /// <summary>0x84 Header checksum</summary>
-            public byte headerChecksum;
+            public readonly byte headerChecksum;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/CopyTape/CopyTape.cs b/Aaru.Images/CopyTape/CopyTape.cs
index 6241cc741..477c6302c 100644
--- a/Aaru.Images/CopyTape/CopyTape.cs
+++ b/Aaru.Images/CopyTape/CopyTape.cs
@@ -12,28 +12,16 @@ namespace Aaru.DiscImages.CopyTape
         ImageInfo imageInfo;
         Stream    imageStream;
 
-        public CopyTape()
+        public CopyTape() => imageInfo = new ImageInfo
         {
-            imageInfo = new ImageInfo
-            {
-                ReadableSectorTags    = new List<SectorTagType>(),
-                ReadableMediaTags     = new List<MediaTagType>(),
-                HasPartitions         = true,
-                HasSessions           = true,
-                Version               = null,
-                ApplicationVersion    = null,
-                MediaTitle            = null,
-                Creator               = null,
-                MediaManufacturer     = null,
-                MediaModel            = null,
-                MediaPartNumber       = null,
-                MediaSequence         = 0,
-                LastMediaSequence     = 0,
-                DriveManufacturer     = null,
-                DriveModel            = null,
-                DriveSerialNumber     = null,
-                DriveFirmwareRevision = null
-            };
-        }
+            ReadableSectorTags = new List<SectorTagType>(), ReadableMediaTags = new List<MediaTagType>(),
+            HasPartitions      = true, HasSessions                            = true, Version = null,
+            ApplicationVersion = null,
+            MediaTitle         = null, Creator = null, MediaManufacturer = null,
+            MediaModel         = null,
+            MediaPartNumber    = null, MediaSequence = 0, LastMediaSequence = 0,
+            DriveManufacturer  = null,
+            DriveModel         = null, DriveSerialNumber = null, DriveFirmwareRevision = null
+        };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/CopyTape/Identify.cs b/Aaru.Images/CopyTape/Identify.cs
index aaab1f185..2cb9521b9 100644
--- a/Aaru.Images/CopyTape/Identify.cs
+++ b/Aaru.Images/CopyTape/Identify.cs
@@ -41,7 +41,8 @@ namespace Aaru.DiscImages.CopyTape
     {
         public bool Identify(IFilter imageFilter)
         {
-            if(imageFilter.GetDataForkLength() <= 16) return false;
+            if(imageFilter.GetDataForkLength() <= 16)
+                return false;
 
             byte[] header = new byte[16];
 
@@ -51,18 +52,23 @@ namespace Aaru.DiscImages.CopyTape
 
             string mark = Encoding.ASCII.GetString(header);
 
-            Regex blockRx = new Regex(BlockRegex);
+            var   blockRx = new Regex(BlockRegex);
             Match blockMt = blockRx.Match(mark);
 
-            if(!blockMt.Success) return false;
+            if(!blockMt.Success)
+                return false;
 
             string blkSize = blockMt.Groups["blockSize"].Value;
 
-            if(string.IsNullOrWhiteSpace(blkSize)) return false;
+            if(string.IsNullOrWhiteSpace(blkSize))
+                return false;
 
-            if(!uint.TryParse(blkSize, out uint blockSize)) return false;
+            if(!uint.TryParse(blkSize, out uint blockSize))
+                return false;
 
-            if(blockSize == 0 || blockSize + 17 >= imageFilter.GetDataForkLength()) return false;
+            if(blockSize      == 0 ||
+               blockSize + 17 >= imageFilter.GetDataForkLength())
+                return false;
 
             strm.Position += blockSize;
 
diff --git a/Aaru.Images/CopyTape/Properties.cs b/Aaru.Images/CopyTape/Properties.cs
index 8700706e8..cdab43741 100644
--- a/Aaru.Images/CopyTape/Properties.cs
+++ b/Aaru.Images/CopyTape/Properties.cs
@@ -52,42 +52,45 @@ namespace Aaru.DiscImages.CopyTape
         public List<TapePartition>    TapePartitions { get; private set; }
         public bool                   IsTape         { get; set; }
 
-        public IEnumerable<MediaTagType>  SupportedMediaTags  => new MediaTagType[] { };
-        public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[] { };
-        public IEnumerable<MediaType> SupportedMediaTypes =>
-            new[]
-            {
-                MediaType.UnknownTape, MediaType.ADR2120, MediaType.ADR260, MediaType.ADR30, MediaType.ADR50,
-                MediaType.AIT1, MediaType.AIT1Turbo, MediaType.AIT2, MediaType.AIT2Turbo, MediaType.AIT3,
-                MediaType.AIT3Ex, MediaType.AIT3Turbo, MediaType.AIT4, MediaType.AIT5, MediaType.AITETurbo,
-                MediaType.SAIT1, MediaType.SAIT2, MediaType.Ditto, MediaType.DittoMax, MediaType.DigitalAudioTape,
-                MediaType.DAT160, MediaType.DAT320, MediaType.DAT72, MediaType.DDS1, MediaType.DDS2, MediaType.DDS3,
-                MediaType.DDS4, MediaType.CompactTapeI, MediaType.CompactTapeII, MediaType.DECtapeII,
-                MediaType.DLTtapeIII, MediaType.DLTtapeIIIxt, MediaType.DLTtapeIV, MediaType.DLTtapeS4,
-                MediaType.SDLT1, MediaType.SDLT2, MediaType.VStapeI, MediaType.Exatape15m, MediaType.Exatape22m,
-                MediaType.Exatape22mAME, MediaType.Exatape28m, MediaType.Exatape40m, MediaType.Exatape45m,
-                MediaType.Exatape54m, MediaType.Exatape75m, MediaType.Exatape76m, MediaType.Exatape80m,
-                MediaType.Exatape106m, MediaType.Exatape160mXL, MediaType.Exatape112m, MediaType.Exatape125m,
-                MediaType.Exatape150m, MediaType.Exatape170m, MediaType.Exatape225m, MediaType.IBM3470,
-                MediaType.IBM3480, MediaType.IBM3490, MediaType.IBM3490E, MediaType.IBM3592, MediaType.LTO,
-                MediaType.LTO2, MediaType.LTO3, MediaType.LTO3WORM, MediaType.LTO4, MediaType.LTO4WORM,
-                MediaType.LTO5, MediaType.LTO5WORM, MediaType.LTO6, MediaType.LTO6WORM, MediaType.LTO7,
-                MediaType.LTO7WORM, MediaType.MLR1, MediaType.MLR1SL, MediaType.MLR3, MediaType.SLR1,
-                MediaType.SLR2, MediaType.SLR3, MediaType.SLR32, MediaType.SLR32SL, MediaType.SLR4, MediaType.SLR5,
-                MediaType.SLR5SL, MediaType.SLR6, MediaType.SLRtape7, MediaType.SLRtape7SL, MediaType.SLRtape24,
-                MediaType.SLRtape24SL, MediaType.SLRtape40, MediaType.SLRtape50, MediaType.SLRtape60,
-                MediaType.SLRtape75, MediaType.SLRtape100, MediaType.SLRtape140, MediaType.QIC11, MediaType.QIC120,
-                MediaType.QIC1350, MediaType.QIC150, MediaType.QIC24, MediaType.QIC3010, MediaType.QIC3020,
-                MediaType.QIC3080, MediaType.QIC3095, MediaType.QIC320, MediaType.QIC40, MediaType.QIC525,
-                MediaType.QIC80, MediaType.STK4480, MediaType.STK4490, MediaType.STK9490, MediaType.T9840A,
-                MediaType.T9840B, MediaType.T9840C, MediaType.T9840D, MediaType.T9940A, MediaType.T9940B,
-                MediaType.T10000A, MediaType.T10000B, MediaType.T10000C, MediaType.T10000D, MediaType.Travan,
-                MediaType.Travan1Ex, MediaType.Travan3, MediaType.Travan3Ex, MediaType.Travan4, MediaType.Travan5,
-                MediaType.Travan7, MediaType.VXA1, MediaType.VXA2, MediaType.VXA3
-            };
+        public IEnumerable<MediaTagType> SupportedMediaTags => new MediaTagType[]
+            {};
+        public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[]
+            {};
+        public IEnumerable<MediaType> SupportedMediaTypes => new[]
+        {
+            MediaType.UnknownTape, MediaType.ADR2120, MediaType.ADR260, MediaType.ADR30, MediaType.ADR50,
+            MediaType.AIT1, MediaType.AIT1Turbo, MediaType.AIT2, MediaType.AIT2Turbo, MediaType.AIT3, MediaType.AIT3Ex,
+            MediaType.AIT3Turbo, MediaType.AIT4, MediaType.AIT5, MediaType.AITETurbo, MediaType.SAIT1, MediaType.SAIT2,
+            MediaType.Ditto, MediaType.DittoMax, MediaType.DigitalAudioTape, MediaType.DAT160, MediaType.DAT320,
+            MediaType.DAT72, MediaType.DDS1, MediaType.DDS2, MediaType.DDS3, MediaType.DDS4, MediaType.CompactTapeI,
+            MediaType.CompactTapeII, MediaType.DECtapeII, MediaType.DLTtapeIII, MediaType.DLTtapeIIIxt,
+            MediaType.DLTtapeIV, MediaType.DLTtapeS4, MediaType.SDLT1, MediaType.SDLT2, MediaType.VStapeI,
+            MediaType.Exatape15m, MediaType.Exatape22m, MediaType.Exatape22mAME, MediaType.Exatape28m,
+            MediaType.Exatape40m, MediaType.Exatape45m, MediaType.Exatape54m, MediaType.Exatape75m,
+            MediaType.Exatape76m, MediaType.Exatape80m, MediaType.Exatape106m, MediaType.Exatape160mXL,
+            MediaType.Exatape112m, MediaType.Exatape125m, MediaType.Exatape150m, MediaType.Exatape170m,
+            MediaType.Exatape225m, MediaType.IBM3470, MediaType.IBM3480, MediaType.IBM3490, MediaType.IBM3490E,
+            MediaType.IBM3592, MediaType.LTO, MediaType.LTO2, MediaType.LTO3, MediaType.LTO3WORM, MediaType.LTO4,
+            MediaType.LTO4WORM, MediaType.LTO5, MediaType.LTO5WORM, MediaType.LTO6, MediaType.LTO6WORM, MediaType.LTO7,
+            MediaType.LTO7WORM, MediaType.MLR1, MediaType.MLR1SL, MediaType.MLR3, MediaType.SLR1, MediaType.SLR2,
+            MediaType.SLR3, MediaType.SLR32, MediaType.SLR32SL, MediaType.SLR4, MediaType.SLR5, MediaType.SLR5SL,
+            MediaType.SLR6, MediaType.SLRtape7, MediaType.SLRtape7SL, MediaType.SLRtape24, MediaType.SLRtape24SL,
+            MediaType.SLRtape40, MediaType.SLRtape50, MediaType.SLRtape60, MediaType.SLRtape75, MediaType.SLRtape100,
+            MediaType.SLRtape140, MediaType.QIC11, MediaType.QIC120, MediaType.QIC1350, MediaType.QIC150,
+            MediaType.QIC24, MediaType.QIC3010, MediaType.QIC3020, MediaType.QIC3080, MediaType.QIC3095,
+            MediaType.QIC320, MediaType.QIC40, MediaType.QIC525, MediaType.QIC80, MediaType.STK4480, MediaType.STK4490,
+            MediaType.STK9490, MediaType.T9840A, MediaType.T9840B, MediaType.T9840C, MediaType.T9840D, MediaType.T9940A,
+            MediaType.T9940B, MediaType.T10000A, MediaType.T10000B, MediaType.T10000C, MediaType.T10000D,
+            MediaType.Travan, MediaType.Travan1Ex, MediaType.Travan3, MediaType.Travan3Ex, MediaType.Travan4,
+            MediaType.Travan5, MediaType.Travan7, MediaType.VXA1, MediaType.VXA2, MediaType.VXA3
+        };
         public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
-            new (string name, Type type, string description, object @default)[] { };
-        public IEnumerable<string> KnownExtensions => new[] {".cptp"};
+            new (string name, Type type, string description, object @default)[]
+                {};
+        public IEnumerable<string> KnownExtensions => new[]
+        {
+            ".cptp"
+        };
 
         public bool   IsWriting    { get; private set; }
         public string ErrorMessage { get; private set; }
diff --git a/Aaru.Images/CopyTape/Read.cs b/Aaru.Images/CopyTape/Read.cs
index 5d76714fe..5a3638b03 100644
--- a/Aaru.Images/CopyTape/Read.cs
+++ b/Aaru.Images/CopyTape/Read.cs
@@ -47,12 +47,13 @@ namespace Aaru.DiscImages.CopyTape
         public bool Open(IFilter imageFilter)
         {
             List<long> blockPositions = new List<long>();
-            Regex      partialBlockRx = new Regex(PartialBlockRegex);
-            Regex      blockRx        = new Regex(BlockRegex);
-            Regex      filemarkRx     = new Regex(FilemarkRegex);
-            Regex      eotRx          = new Regex(EndOfTapeRegex);
+            var        partialBlockRx = new Regex(PartialBlockRegex);
+            var        blockRx        = new Regex(BlockRegex);
+            var        filemarkRx     = new Regex(FilemarkRegex);
+            var        eotRx          = new Regex(EndOfTapeRegex);
 
-            if(imageFilter.GetDataForkLength() <= 16) return false;
+            if(imageFilter.GetDataForkLength() <= 16)
+                return false;
 
             imageStream          = imageFilter.GetDataForkStream();
             imageStream.Position = 0;
@@ -75,23 +76,24 @@ namespace Aaru.DiscImages.CopyTape
                 Match filemarkMt     = filemarkRx.Match(mark);
                 Match eotMt          = eotRx.Match(mark);
 
-                if(eotMt.Success) break;
+                if(eotMt.Success)
+                    break;
 
                 if(filemarkMt.Success)
                 {
                     Files.Add(new TapeFile
                     {
-                        File       = currentFile,
-                        FirstBlock = currentFileStart,
-                        LastBlock  = currentBlock - 1,
-                        Partition  = 0
+                        File = currentFile, FirstBlock = currentFileStart, LastBlock = currentBlock - 1, Partition = 0
                     });
+
                     inFile = false;
                     currentFile++;
+
                     continue;
                 }
 
-                if(!partialBlockMt.Success) throw new ArgumentException("Found unhandled header, cannot open.");
+                if(!partialBlockMt.Success)
+                    throw new ArgumentException("Found unhandled header, cannot open.");
 
                 imageStream.Position -= 9;
 
@@ -105,7 +107,8 @@ namespace Aaru.DiscImages.CopyTape
                 mark = Encoding.ASCII.GetString(blockHeader);
                 Match blockMt = blockRx.Match(mark);
 
-                if(!blockMt.Success) throw new ArgumentException("Cannot decode block header, cannot open.");
+                if(!blockMt.Success)
+                    throw new ArgumentException("Cannot decode block header, cannot open.");
 
                 string blkSize = blockMt.Groups["blockSize"].Value;
 
@@ -115,26 +118,33 @@ namespace Aaru.DiscImages.CopyTape
                 if(!uint.TryParse(blkSize, out uint blockSize))
                     throw new ArgumentException("Cannot decode block header, cannot open.");
 
-                if(blockSize == 0 || blockSize + 17 > imageFilter.GetDataForkLength())
+                if(blockSize      == 0 ||
+                   blockSize + 17 > imageFilter.GetDataForkLength())
                     throw new ArgumentException("Cannot decode block header, cannot open.");
 
                 imageStream.Position += blockSize;
 
                 int newLine = imageStream.ReadByte();
 
-                if(newLine != 0x0A) throw new ArgumentException("Cannot decode block header, cannot open.");
+                if(newLine != 0x0A)
+                    throw new ArgumentException("Cannot decode block header, cannot open.");
 
                 blockPositions.Add(imageStream.Position - blockSize - 17);
                 currentBlock++;
                 imageInfo.ImageSize += blockSize;
-                if(imageInfo.SectorSize < blockSize) imageInfo.SectorSize = blockSize;
+
+                if(imageInfo.SectorSize < blockSize)
+                    imageInfo.SectorSize = blockSize;
             }
 
             blockPositionCache = blockPositions.ToArray();
 
             TapePartitions = new List<TapePartition>
             {
-                new TapePartition {FirstBlock = 0, LastBlock = currentBlock - 1, Number = 0}
+                new TapePartition
+                {
+                    FirstBlock = 0, LastBlock = currentBlock - 1, Number = 0
+                }
             };
 
             imageInfo.Sectors              = (ulong)blockPositionCache.LongLength;
@@ -157,13 +167,14 @@ namespace Aaru.DiscImages.CopyTape
             imageStream.Position = blockPositionCache[sectorAddress];
 
             byte[] blockHeader = new byte[16];
-            Regex  blockRx     = new Regex(BlockRegex);
+            var    blockRx     = new Regex(BlockRegex);
 
             imageStream.Read(blockHeader, 0, 16);
             string mark    = Encoding.ASCII.GetString(blockHeader);
             Match  blockMt = blockRx.Match(mark);
 
-            if(!blockMt.Success) throw new ArgumentException("Cannot decode block header, cannot read.");
+            if(!blockMt.Success)
+                throw new ArgumentException("Cannot decode block header, cannot read.");
 
             string blkSize = blockMt.Groups["blockSize"].Value;
 
@@ -173,21 +184,23 @@ namespace Aaru.DiscImages.CopyTape
             if(!uint.TryParse(blkSize, out uint blockSize))
                 throw new ArgumentException("Cannot decode block header, cannot read.");
 
-            if(blockSize == 0 || blockSize + 17 > imageStream.Length)
+            if(blockSize      == 0 ||
+               blockSize + 17 > imageStream.Length)
                 throw new ArgumentException("Cannot decode block header, cannot read.");
 
             byte[] data = new byte[blockSize];
 
             imageStream.Read(data, 0, (int)blockSize);
 
-            if(imageStream.ReadByte() != 0x0A) throw new ArgumentException("Cannot decode block header, cannot read.");
+            if(imageStream.ReadByte() != 0x0A)
+                throw new ArgumentException("Cannot decode block header, cannot read.");
 
             return data;
         }
 
         public byte[] ReadSectors(ulong sectorAddress, uint length)
         {
-            MemoryStream dataMs = new MemoryStream();
+            var dataMs = new MemoryStream();
 
             for(uint i = 0; i < length; i++)
             {
diff --git a/Aaru.Images/CopyTape/Write.cs b/Aaru.Images/CopyTape/Write.cs
index ca6735f9f..3aa1183c8 100644
--- a/Aaru.Images/CopyTape/Write.cs
+++ b/Aaru.Images/CopyTape/Write.cs
@@ -48,20 +48,28 @@ namespace Aaru.DiscImages.CopyTape
         Dictionary<ulong, ulong> writtenBlockPositions;
 
         public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
-                           uint   sectorSize)
+                           uint sectorSize)
         {
             if(!SupportedMediaTypes.Contains(mediaType))
             {
                 ErrorMessage = $"Unsupport media format {mediaType}";
+
                 return false;
             }
 
-            imageInfo = new ImageInfo {MediaType = mediaType, SectorSize = sectorSize, Sectors = sectors};
+            imageInfo = new ImageInfo
+            {
+                MediaType = mediaType, SectorSize = sectorSize, Sectors = sectors
+            };
 
-            try { dataStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None); }
+            try
+            {
+                dataStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
+            }
             catch(IOException e)
             {
                 ErrorMessage = $"Could not create new image file, exception {e.Message}";
+
                 return false;
             }
 
@@ -72,12 +80,14 @@ namespace Aaru.DiscImages.CopyTape
             ErrorMessage          = null;
             lastWrittenBlock      = 0;
             writtenBlockPositions = new Dictionary<ulong, ulong>();
+
             return true;
         }
 
         public bool WriteMediaTag(byte[] data, MediaTagType tag)
         {
             ErrorMessage = "Unsupported feature";
+
             return false;
         }
 
@@ -85,27 +95,36 @@ namespace Aaru.DiscImages.CopyTape
         {
             if(!writtenBlockPositions.TryGetValue(sectorAddress, out ulong position))
             {
-                if(dataStream.Length != 0 && lastWrittenBlock >= sectorAddress)
+                if(dataStream.Length != 0 &&
+                   lastWrittenBlock  >= sectorAddress)
                 {
                     ErrorMessage = "Cannot write unwritten blocks";
+
                     return false;
                 }
 
-                if(lastWrittenBlock + 1 != sectorAddress && sectorAddress != 0 && lastWrittenBlock != 0)
+                if(lastWrittenBlock + 1 != sectorAddress &&
+                   sectorAddress        != 0             &&
+                   lastWrittenBlock     != 0)
                 {
                     ErrorMessage = "Cannot skip blocks";
+
                     return false;
                 }
             }
-            else dataStream.Position = (long)position;
+            else
+                dataStream.Position = (long)position;
 
             byte[] header = Encoding.ASCII.GetBytes($"CPTP:BLK {data.Length:D6}\n");
 
             writtenBlockPositions[sectorAddress] = (ulong)dataStream.Position;
             dataStream.Write(header, 0, header.Length);
-            dataStream.Write(data,   0, data.Length);
+            dataStream.Write(data, 0, data.Length);
             dataStream.WriteByte(0x0A);
-            if(sectorAddress > lastWrittenBlock) lastWrittenBlock = sectorAddress;
+
+            if(sectorAddress > lastWrittenBlock)
+                lastWrittenBlock = sectorAddress;
+
             dataStream.Seek(0, SeekOrigin.End);
 
             return true;
@@ -116,7 +135,9 @@ namespace Aaru.DiscImages.CopyTape
             for(uint i = 0; i < length; i++)
             {
                 bool ret = WriteSector(data, sectorAddress + i);
-                if(!ret) return false;
+
+                if(!ret)
+                    return false;
             }
 
             return true;
@@ -125,12 +146,14 @@ namespace Aaru.DiscImages.CopyTape
         public bool WriteSectorLong(byte[] data, ulong sectorAddress)
         {
             ErrorMessage = "Unsupported feature";
+
             return false;
         }
 
         public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
         {
             ErrorMessage = "Unsupported feature";
+
             return false;
         }
 
@@ -139,6 +162,7 @@ namespace Aaru.DiscImages.CopyTape
             if(!IsWriting)
             {
                 ErrorMessage = "Image is not opened for writing";
+
                 return false;
             }
 
@@ -149,6 +173,7 @@ namespace Aaru.DiscImages.CopyTape
             dataStream.Close();
 
             IsWriting = false;
+
             return true;
         }
 
@@ -157,18 +182,21 @@ namespace Aaru.DiscImages.CopyTape
         public bool SetGeometry(uint cylinders, uint heads, uint sectorsPerTrack)
         {
             ErrorMessage = "Unsupported feature";
+
             return false;
         }
 
         public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
         {
             ErrorMessage = "Unsupported feature";
+
             return false;
         }
 
         public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
         {
             ErrorMessage = "Unsupported feature";
+
             return false;
         }
 
@@ -181,6 +209,7 @@ namespace Aaru.DiscImages.CopyTape
             if(file.Partition != 0)
             {
                 ErrorMessage = "Unsupported feature";
+
                 return false;
             }
 
@@ -193,15 +222,18 @@ namespace Aaru.DiscImages.CopyTape
 
         public bool AddPartition(TapePartition partition)
         {
-            if(partition.Number == 0) return true;
+            if(partition.Number == 0)
+                return true;
 
             ErrorMessage = "Unsupported feature";
+
             return false;
         }
 
         public bool SetTape()
         {
             IsTape = true;
+
             return true;
         }
     }
diff --git a/Aaru.Images/D88/Constants.cs b/Aaru.Images/D88/Constants.cs
index cc681a8bd..4278d86a1 100644
--- a/Aaru.Images/D88/Constants.cs
+++ b/Aaru.Images/D88/Constants.cs
@@ -34,7 +34,10 @@ namespace Aaru.DiscImages
 {
     public partial class D88
     {
-        const    byte   READ_ONLY     = 0x10;
-        readonly byte[] reservedEmpty = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+        const byte READ_ONLY = 0x10;
+        readonly byte[] reservedEmpty =
+        {
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+        };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/D88/D88.cs b/Aaru.Images/D88/D88.cs
index fc316bc45..4e875f79f 100644
--- a/Aaru.Images/D88/D88.cs
+++ b/Aaru.Images/D88/D88.cs
@@ -45,31 +45,18 @@ namespace Aaru.DiscImages
         ImageInfo    imageInfo;
         List<byte[]> sectorsData;
 
-        public D88()
+        public D88() => imageInfo = new ImageInfo
         {
-            imageInfo = new ImageInfo
-            {
-                ReadableSectorTags    = new List<SectorTagType>(),
-                ReadableMediaTags     = new List<MediaTagType>(),
-                HasPartitions         = false,
-                HasSessions           = false,
-                Version               = null,
-                Application           = null,
-                ApplicationVersion    = null,
-                Creator               = null,
-                Comments              = null,
-                MediaManufacturer     = null,
-                MediaModel            = null,
-                MediaSerialNumber     = null,
-                MediaBarcode          = null,
-                MediaPartNumber       = null,
-                MediaSequence         = 0,
-                LastMediaSequence     = 0,
-                DriveManufacturer     = null,
-                DriveModel            = null,
-                DriveSerialNumber     = null,
-                DriveFirmwareRevision = null
-            };
-        }
+            ReadableSectorTags = new List<SectorTagType>(), ReadableMediaTags = new List<MediaTagType>(),
+            HasPartitions      = false, HasSessions                           = false, Version = null,
+            Application        = null,
+            ApplicationVersion = null, Creator = null, Comments = null,
+            MediaManufacturer  = null,
+            MediaModel         = null, MediaSerialNumber = null, MediaBarcode = null,
+            MediaPartNumber    = null,
+            MediaSequence      = 0, LastMediaSequence = 0, DriveManufacturer = null,
+            DriveModel         = null,
+            DriveSerialNumber  = null, DriveFirmwareRevision = null
+        };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/D88/Enums.cs b/Aaru.Images/D88/Enums.cs
index 06ae810ca..1244e70b4 100644
--- a/Aaru.Images/D88/Enums.cs
+++ b/Aaru.Images/D88/Enums.cs
@@ -36,52 +36,28 @@ namespace Aaru.DiscImages
     {
         enum DiskType : byte
         {
-            D2  = 0x00,
-            Dd2 = 0x10,
-            Hd2 = 0x20
+            D2 = 0x00, Dd2 = 0x10, Hd2 = 0x20
         }
 
         enum DensityType : byte
         {
-            Mfm = 0x00,
-            Fm  = 0x40
+            Mfm = 0x00, Fm = 0x40
         }
 
-        /// <summary>
-        ///     Status as returned by PC-98 BIOS
-        ///     ステータスは、PC-98x1 のBIOS が返してくるステータスで、
-        /// </summary>
+        /// <summary>Status as returned by PC-98 BIOS ステータスは、PC-98x1 のBIOS が返してくるステータスで、</summary>
         enum StatusType : byte
         {
-            /// <summary>
-            ///     Normal
-            ///     正常
-            /// </summary>
+            /// <summary>Normal 正常</summary>
             Normal = 0x00,
-            /// <summary>
-            ///     Deleted
-            ///     正常(DELETED DATA)
-            /// </summary>
+            /// <summary>Deleted 正常(DELETED DATA)</summary>
             Deleted = 0x10,
-            /// <summary>
-            ///     CRC error in address fields
-            ///     ID CRC エラー
-            /// </summary>
+            /// <summary>CRC error in address fields ID CRC エラー</summary>
             IdError = 0xA0,
-            /// <summary>
-            ///     CRC error in data block
-            ///     データ CRC エラー
-            /// </summary>
+            /// <summary>CRC error in data block データ CRC エラー</summary>
             DataError = 0xB0,
-            /// <summary>
-            ///     Address mark not found
-            ///     アドレスマークなし
-            /// </summary>
+            /// <summary>Address mark not found アドレスマークなし</summary>
             AddressMarkNotFound = 0xE0,
-            /// <summary>
-            ///     Data mark not found
-            ///     データマークなし
-            /// </summary>
+            /// <summary>Data mark not found データマークなし</summary>
             DataMarkNotFound = 0xF0
         }
     }
diff --git a/Aaru.Images/D88/Identify.cs b/Aaru.Images/D88/Identify.cs
index 57af45153..e040d182f 100644
--- a/Aaru.Images/D88/Identify.cs
+++ b/Aaru.Images/D88/Identify.cs
@@ -45,10 +45,12 @@ namespace Aaru.DiscImages
         {
             Stream stream = imageFilter.GetDataForkStream();
             stream.Seek(0, SeekOrigin.Begin);
-            // Even if disk name is supposedly ASCII, I'm pretty sure most emulators allow Shift-JIS to be used :p
-            Encoding shiftjis = Encoding.GetEncoding("shift_jis");
 
-            if(stream.Length < Marshal.SizeOf<D88Header>()) return false;
+            // Even if disk name is supposedly ASCII, I'm pretty sure most emulators allow Shift-JIS to be used :p
+            var shiftjis = Encoding.GetEncoding("shift_jis");
+
+            if(stream.Length < Marshal.SizeOf<D88Header>())
+                return false;
 
             byte[] hdrB = new byte[Marshal.SizeOf<D88Header>()];
             stream.Read(hdrB, 0, hdrB.Length);
@@ -56,27 +58,39 @@ namespace Aaru.DiscImages
             D88Header d88Hdr = Marshal.ByteArrayToStructureLittleEndian<D88Header>(hdrB);
 
             AaruConsole.DebugWriteLine("D88 plugin", "d88hdr.name = \"{0}\"",
-                                      StringHandlers.CToString(d88Hdr.name, shiftjis));
+                                       StringHandlers.CToString(d88Hdr.name, shiftjis));
+
             AaruConsole.DebugWriteLine("D88 plugin", "d88hdr.reserved is empty? = {0}",
-                                      d88Hdr.reserved.SequenceEqual(reservedEmpty));
+                                       d88Hdr.reserved.SequenceEqual(reservedEmpty));
+
             AaruConsole.DebugWriteLine("D88 plugin", "d88hdr.write_protect = 0x{0:X2}", d88Hdr.write_protect);
+
             AaruConsole.DebugWriteLine("D88 plugin", "d88hdr.disk_type = {0} ({1})", d88Hdr.disk_type,
-                                      (byte)d88Hdr.disk_type);
+                                       (byte)d88Hdr.disk_type);
+
             AaruConsole.DebugWriteLine("D88 plugin", "d88hdr.disk_size = {0}", d88Hdr.disk_size);
 
-            if(d88Hdr.disk_size != stream.Length) return false;
+            if(d88Hdr.disk_size != stream.Length)
+                return false;
 
-            if(d88Hdr.disk_type != DiskType.D2 && d88Hdr.disk_type != DiskType.Dd2 &&
-               d88Hdr.disk_type != DiskType.Hd2) return false;
+            if(d88Hdr.disk_type != DiskType.D2  &&
+               d88Hdr.disk_type != DiskType.Dd2 &&
+               d88Hdr.disk_type != DiskType.Hd2)
+                return false;
 
-            if(!d88Hdr.reserved.SequenceEqual(reservedEmpty)) return false;
+            if(!d88Hdr.reserved.SequenceEqual(reservedEmpty))
+                return false;
 
             int counter = 0;
+
             foreach(int t in d88Hdr.track_table)
             {
-                if(t > 0) counter++;
+                if(t > 0)
+                    counter++;
 
-                if(t < 0 || t > stream.Length) return false;
+                if(t < 0 ||
+                   t > stream.Length)
+                    return false;
             }
 
             AaruConsole.DebugWriteLine("D88 plugin", "{0} tracks", counter);
diff --git a/Aaru.Images/D88/Read.cs b/Aaru.Images/D88/Read.cs
index 3b38e4481..b8cc375af 100644
--- a/Aaru.Images/D88/Read.cs
+++ b/Aaru.Images/D88/Read.cs
@@ -50,42 +50,57 @@ namespace Aaru.DiscImages
         {
             Stream stream = imageFilter.GetDataForkStream();
             stream.Seek(0, SeekOrigin.Begin);
-            // Even if disk name is supposedly ASCII, I'm pretty sure most emulators allow Shift-JIS to be used :p
-            Encoding shiftjis = Encoding.GetEncoding("shift_jis");
 
-            if(stream.Length < Marshal.SizeOf<D88Header>()) return false;
+            // Even if disk name is supposedly ASCII, I'm pretty sure most emulators allow Shift-JIS to be used :p
+            var shiftjis = Encoding.GetEncoding("shift_jis");
+
+            if(stream.Length < Marshal.SizeOf<D88Header>())
+                return false;
 
             byte[] hdrB = new byte[Marshal.SizeOf<D88Header>()];
             stream.Read(hdrB, 0, hdrB.Length);
             D88Header d88Hdr = Marshal.ByteArrayToStructureLittleEndian<D88Header>(hdrB);
 
             AaruConsole.DebugWriteLine("D88 plugin", "d88hdr.name = \"{0}\"",
-                                      StringHandlers.CToString(d88Hdr.name, shiftjis));
+                                       StringHandlers.CToString(d88Hdr.name, shiftjis));
+
             AaruConsole.DebugWriteLine("D88 plugin", "d88hdr.reserved is empty? = {0}",
-                                      d88Hdr.reserved.SequenceEqual(reservedEmpty));
+                                       d88Hdr.reserved.SequenceEqual(reservedEmpty));
+
             AaruConsole.DebugWriteLine("D88 plugin", "d88hdr.write_protect = 0x{0:X2}", d88Hdr.write_protect);
+
             AaruConsole.DebugWriteLine("D88 plugin", "d88hdr.disk_type = {0} ({1})", d88Hdr.disk_type,
-                                      (byte)d88Hdr.disk_type);
+                                       (byte)d88Hdr.disk_type);
+
             AaruConsole.DebugWriteLine("D88 plugin", "d88hdr.disk_size = {0}", d88Hdr.disk_size);
 
-            if(d88Hdr.disk_size != stream.Length) return false;
+            if(d88Hdr.disk_size != stream.Length)
+                return false;
 
-            if(d88Hdr.disk_type != DiskType.D2 && d88Hdr.disk_type != DiskType.Dd2 &&
-               d88Hdr.disk_type != DiskType.Hd2) return false;
+            if(d88Hdr.disk_type != DiskType.D2  &&
+               d88Hdr.disk_type != DiskType.Dd2 &&
+               d88Hdr.disk_type != DiskType.Hd2)
+                return false;
 
-            if(!d88Hdr.reserved.SequenceEqual(reservedEmpty)) return false;
+            if(!d88Hdr.reserved.SequenceEqual(reservedEmpty))
+                return false;
 
             int trkCounter = 0;
+
             foreach(int t in d88Hdr.track_table)
             {
-                if(t > 0) trkCounter++;
+                if(t > 0)
+                    trkCounter++;
 
-                if(t < 0 || t > stream.Length) return false;
+                if(t < 0 ||
+                   t > stream.Length)
+                    return false;
             }
 
             AaruConsole.DebugWriteLine("D88 plugin", "{0} tracks", trkCounter);
 
-            if(trkCounter == 0) return false;
+            if(trkCounter == 0)
+                return false;
 
             hdrB = new byte[Marshal.SizeOf<SectorHeader>()];
             stream.Seek(d88Hdr.track_table[0], SeekOrigin.Begin);
@@ -93,14 +108,14 @@ namespace Aaru.DiscImages
 
             SectorHeader sechdr = Marshal.ByteArrayToStructureLittleEndian<SectorHeader>(hdrB);
 
-            AaruConsole.DebugWriteLine("D88 plugin", "sechdr.c = {0}",            sechdr.c);
-            AaruConsole.DebugWriteLine("D88 plugin", "sechdr.h = {0}",            sechdr.h);
-            AaruConsole.DebugWriteLine("D88 plugin", "sechdr.r = {0}",            sechdr.r);
-            AaruConsole.DebugWriteLine("D88 plugin", "sechdr.n = {0}",            sechdr.n);
-            AaruConsole.DebugWriteLine("D88 plugin", "sechdr.spt = {0}",          sechdr.spt);
-            AaruConsole.DebugWriteLine("D88 plugin", "sechdr.density = {0}",      sechdr.density);
+            AaruConsole.DebugWriteLine("D88 plugin", "sechdr.c = {0}", sechdr.c);
+            AaruConsole.DebugWriteLine("D88 plugin", "sechdr.h = {0}", sechdr.h);
+            AaruConsole.DebugWriteLine("D88 plugin", "sechdr.r = {0}", sechdr.r);
+            AaruConsole.DebugWriteLine("D88 plugin", "sechdr.n = {0}", sechdr.n);
+            AaruConsole.DebugWriteLine("D88 plugin", "sechdr.spt = {0}", sechdr.spt);
+            AaruConsole.DebugWriteLine("D88 plugin", "sechdr.density = {0}", sechdr.density);
             AaruConsole.DebugWriteLine("D88 plugin", "sechdr.deleted_mark = {0}", sechdr.deleted_mark);
-            AaruConsole.DebugWriteLine("D88 plugin", "sechdr.status = {0}",       sechdr.status);
+            AaruConsole.DebugWriteLine("D88 plugin", "sechdr.status = {0}", sechdr.status);
             AaruConsole.DebugWriteLine("D88 plugin", "sechdr.size_of_data = {0}", sechdr.size_of_data);
 
             short             spt      = sechdr.spt;
@@ -116,16 +131,19 @@ namespace Aaru.DiscImages
 
                 sechdr = Marshal.ByteArrayToStructureLittleEndian<SectorHeader>(hdrB);
 
-                if(sechdr.spt != spt || sechdr.n != bps)
+                if(sechdr.spt != spt ||
+                   sechdr.n   != bps)
                 {
                     AaruConsole.DebugWriteLine("D88 plugin",
-                                              "Disk tracks are not same size. spt = {0} (expected {1}), bps = {2} (expected {3}) at track {4} sector {5}",
-                                              sechdr.spt, spt, sechdr.n, bps, i, 0);
+                                               "Disk tracks are not same size. spt = {0} (expected {1}), bps = {2} (expected {3}) at track {4} sector {5}",
+                                               sechdr.spt, spt, sechdr.n, bps, i, 0);
+
                     allEqual = false;
                 }
 
                 short  maxJ = sechdr.spt;
                 byte[] secB;
+
                 for(short j = 1; j < maxJ; j++)
                 {
                     secB = new byte[sechdr.size_of_data];
@@ -135,11 +153,14 @@ namespace Aaru.DiscImages
 
                     sechdr = Marshal.ByteArrayToStructureLittleEndian<SectorHeader>(hdrB);
 
-                    if(sechdr.spt == spt && sechdr.n == bps) continue;
+                    if(sechdr.spt == spt &&
+                       sechdr.n   == bps)
+                        continue;
 
                     AaruConsole.DebugWriteLine("D88 plugin",
-                                              "Disk tracks are not same size. spt = {0} (expected {1}), bps = {2} (expected {3}) at track {4} sector {5}",
-                                              sechdr.spt, spt, sechdr.n, bps, i, j, sechdr.deleted_mark);
+                                               "Disk tracks are not same size. spt = {0} (expected {1}), bps = {2} (expected {3}) at track {4} sector {5}",
+                                               sechdr.spt, spt, sechdr.n, bps, i, j, sechdr.deleted_mark);
+
                     allEqual = false;
                 }
 
@@ -147,29 +168,38 @@ namespace Aaru.DiscImages
                 stream.Read(secB, 0, secB.Length);
                 sectors.Add(sechdr.r, secB);
 
-                foreach(KeyValuePair<byte, byte[]> kvp in sectors) sectorsData.Add(kvp.Value);
+                foreach(KeyValuePair<byte, byte[]> kvp in sectors)
+                    sectorsData.Add(kvp.Value);
             }
 
             AaruConsole.DebugWriteLine("D88 plugin", "{0} sectors", sectorsData.Count);
 
             imageInfo.MediaType = MediaType.Unknown;
+
             if(allEqual)
-                if(trkCounter == 154 && spt == 26 && bps == IBMSectorSizeCode.EighthKilo)
+                if(trkCounter == 154 &&
+                   spt        == 26  &&
+                   bps        == IBMSectorSizeCode.EighthKilo)
                     imageInfo.MediaType = MediaType.NEC_8_SD;
                 else if(bps == IBMSectorSizeCode.QuarterKilo)
                     switch(trkCounter)
                     {
                         case 80 when spt == 16:
                             imageInfo.MediaType = MediaType.NEC_525_SS;
+
                             break;
                         case 154 when spt == 26:
                             imageInfo.MediaType = MediaType.NEC_8_DD;
+
                             break;
                         case 160 when spt == 16:
                             imageInfo.MediaType = MediaType.NEC_525_DS;
+
                             break;
                     }
-                else if(trkCounter == 154 && spt == 8 && bps == IBMSectorSizeCode.Kilo)
+                else if(trkCounter == 154 &&
+                        spt        == 8   &&
+                        bps        == IBMSectorSizeCode.Kilo)
                     imageInfo.MediaType = MediaType.NEC_525_HD;
                 else if(bps == IBMSectorSizeCode.HalfKilo)
                     switch(d88Hdr.track_table.Length)
@@ -180,9 +210,11 @@ namespace Aaru.DiscImages
                             {
                                 case 8:
                                     imageInfo.MediaType = MediaType.DOS_525_SS_DD_8;
+
                                     break;
                                 case 9:
                                     imageInfo.MediaType = MediaType.DOS_525_SS_DD_9;
+
                                     break;
                             }
                         }
@@ -194,9 +226,11 @@ namespace Aaru.DiscImages
                             {
                                 case 8:
                                     imageInfo.MediaType = MediaType.DOS_525_DS_DD_8;
+
                                     break;
                                 case 9:
                                     imageInfo.MediaType = MediaType.DOS_525_DS_DD_9;
+
                                     break;
                             }
                         }
@@ -208,22 +242,28 @@ namespace Aaru.DiscImages
                             {
                                 case 15:
                                     imageInfo.MediaType = MediaType.NEC_35_HD_15;
+
                                     break;
                                 case 9:
                                     imageInfo.MediaType = MediaType.DOS_35_DS_DD_9;
+
                                     break;
                                 case 18:
                                     imageInfo.MediaType = MediaType.DOS_35_HD;
+
                                     break;
                                 case 36:
                                     imageInfo.MediaType = MediaType.DOS_35_ED;
+
                                     break;
                             }
                         }
 
                             break;
                         case 480:
-                            if(spt == 38) imageInfo.MediaType = MediaType.NEC_35_TD;
+                            if(spt == 38)
+                                imageInfo.MediaType = MediaType.NEC_35_TD;
+
                             break;
                     }
 
@@ -244,67 +284,80 @@ namespace Aaru.DiscImages
                     imageInfo.Cylinders       = 80;
                     imageInfo.Heads           = 1;
                     imageInfo.SectorsPerTrack = 16;
+
                     break;
                 case MediaType.NEC_8_SD:
                 case MediaType.NEC_8_DD:
                     imageInfo.Cylinders       = 77;
                     imageInfo.Heads           = 2;
                     imageInfo.SectorsPerTrack = 26;
+
                     break;
                 case MediaType.NEC_525_DS:
                     imageInfo.Cylinders       = 80;
                     imageInfo.Heads           = 2;
                     imageInfo.SectorsPerTrack = 16;
+
                     break;
                 case MediaType.NEC_525_HD:
                     imageInfo.Cylinders       = 77;
                     imageInfo.Heads           = 2;
                     imageInfo.SectorsPerTrack = 8;
+
                     break;
                 case MediaType.DOS_525_SS_DD_8:
                     imageInfo.Cylinders       = 40;
                     imageInfo.Heads           = 1;
                     imageInfo.SectorsPerTrack = 8;
+
                     break;
                 case MediaType.DOS_525_SS_DD_9:
                     imageInfo.Cylinders       = 40;
                     imageInfo.Heads           = 1;
                     imageInfo.SectorsPerTrack = 9;
+
                     break;
                 case MediaType.DOS_525_DS_DD_8:
                     imageInfo.Cylinders       = 40;
                     imageInfo.Heads           = 2;
                     imageInfo.SectorsPerTrack = 8;
+
                     break;
                 case MediaType.DOS_525_DS_DD_9:
                     imageInfo.Cylinders       = 40;
                     imageInfo.Heads           = 2;
                     imageInfo.SectorsPerTrack = 9;
+
                     break;
                 case MediaType.NEC_35_HD_15:
                     imageInfo.Cylinders       = 80;
                     imageInfo.Heads           = 2;
                     imageInfo.SectorsPerTrack = 15;
+
                     break;
                 case MediaType.DOS_35_DS_DD_9:
                     imageInfo.Cylinders       = 80;
                     imageInfo.Heads           = 2;
                     imageInfo.SectorsPerTrack = 9;
+
                     break;
                 case MediaType.DOS_35_HD:
                     imageInfo.Cylinders       = 80;
                     imageInfo.Heads           = 2;
                     imageInfo.SectorsPerTrack = 18;
+
                     break;
                 case MediaType.DOS_35_ED:
                     imageInfo.Cylinders       = 80;
                     imageInfo.Heads           = 2;
                     imageInfo.SectorsPerTrack = 36;
+
                     break;
                 case MediaType.NEC_35_TD:
                     imageInfo.Cylinders       = 240;
                     imageInfo.Heads           = 2;
                     imageInfo.SectorsPerTrack = 38;
+
                     break;
             }
 
@@ -321,7 +374,8 @@ namespace Aaru.DiscImages
             if(sectorAddress + length > imageInfo.Sectors)
                 throw new ArgumentOutOfRangeException(nameof(length), "Requested more sectors than available");
 
-            MemoryStream buffer = new MemoryStream();
+            var buffer = new MemoryStream();
+
             for(int i = 0; i < length; i++)
                 buffer.Write(sectorsData[(int)sectorAddress + i], 0, sectorsData[(int)sectorAddress + i].Length);
 
diff --git a/Aaru.Images/D88/Structs.cs b/Aaru.Images/D88/Structs.cs
index 776513b52..efbea3b26 100644
--- a/Aaru.Images/D88/Structs.cs
+++ b/Aaru.Images/D88/Structs.cs
@@ -40,95 +40,47 @@ namespace Aaru.DiscImages
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct D88Header
         {
-            /// <summary>
-            ///     Disk name, nul-terminated ASCII
-            ///     ディスクの名前(ASCII + '\0')
-            /// </summary>
+            /// <summary>Disk name, nul-terminated ASCII ディスクの名前(ASCII + '\0')</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 17)]
-            public byte[] name;
-            /// <summary>
-            ///     Reserved
-            ///     ディスクの名前(ASCII + '\0')
-            /// </summary>
+            public readonly byte[] name;
+            /// <summary>Reserved ディスクの名前(ASCII + '\0')</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 9)]
-            public byte[] reserved;
-            /// <summary>
-            ///     Write protect status
-            ///     ライトプロテクト： 0x00 なし、0x10 あり
-            /// </summary>
-            public byte write_protect;
-            /// <summary>
-            ///     Disk type
-            ///     ディスクの種類： 0x00 2D、 0x10 2DD、 0x20 2HD
-            /// </summary>
-            public DiskType disk_type;
-            /// <summary>
-            ///     Disk image size
-            ///     ディスクのサイズ
-            /// </summary>
-            public int disk_size;
-            /// <summary>
-            ///     Track pointers
-            ///     トラック部のオフセットテーブル 0 Track ～ 163 Track
-            /// </summary>
+            public readonly byte[] reserved;
+            /// <summary>Write protect status ライトプロテクト： 0x00 なし、0x10 あり</summary>
+            public readonly byte write_protect;
+            /// <summary>Disk type ディスクの種類： 0x00 2D、 0x10 2DD、 0x20 2HD</summary>
+            public readonly DiskType disk_type;
+            /// <summary>Disk image size ディスクのサイズ</summary>
+            public readonly int disk_size;
+            /// <summary>Track pointers トラック部のオフセットテーブル 0 Track ～ 163 Track</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 164)]
-            public int[] track_table;
+            public readonly int[] track_table;
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct SectorHeader
         {
-            /// <summary>
-            ///     Cylinder
-            ///     ID の C
-            /// </summary>
-            public byte c;
-            /// <summary>
-            ///     Head
-            ///     ID の H
-            /// </summary>
-            public byte h;
-            /// <summary>
-            ///     Sector number
-            ///     ID の R
-            /// </summary>
-            public byte r;
-            /// <summary>
-            ///     Sector size
-            ///     ID の N
-            /// </summary>
-            public IBMSectorSizeCode n;
-            /// <summary>
-            ///     Number of sectors in this track
-            ///     このトラック内に存在するセクタの数
-            /// </summary>
-            public short spt;
-            /// <summary>
-            ///     Density: 0x00 MFM, 0x40 FM
-            ///     記録密度： 0x00 倍密度、0x40 単密度
-            /// </summary>
-            public DensityType density;
-            /// <summary>
-            ///     Deleted sector, 0x00 not deleted, 0x10 deleted
-            ///     DELETED MARK： 0x00 ノーマル、 0x10 DELETED
-            /// </summary>
-            public byte deleted_mark;
-            /// <summary>
-            ///     Sector status
-            ///     ステータス
-            /// </summary>
-            public byte status;
-            /// <summary>
-            ///     Reserved
-            ///     リザーブ
-            /// </summary>
+            /// <summary>Cylinder ID の C</summary>
+            public readonly byte c;
+            /// <summary>Head ID の H</summary>
+            public readonly byte h;
+            /// <summary>Sector number ID の R</summary>
+            public readonly byte r;
+            /// <summary>Sector size ID の N</summary>
+            public readonly IBMSectorSizeCode n;
+            /// <summary>Number of sectors in this track このトラック内に存在するセクタの数</summary>
+            public readonly short spt;
+            /// <summary>Density: 0x00 MFM, 0x40 FM 記録密度： 0x00 倍密度、0x40 単密度</summary>
+            public readonly DensityType density;
+            /// <summary>Deleted sector, 0x00 not deleted, 0x10 deleted DELETED MARK： 0x00 ノーマル、 0x10 DELETED</summary>
+            public readonly byte deleted_mark;
+            /// <summary>Sector status ステータス</summary>
+            public readonly byte status;
+            /// <summary>Reserved リザーブ</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 5)]
-            public byte[] reserved;
-            /// <summary>
-            ///     Size of data following this field
-            ///     このセクタ部のデータサイズ
-            /// </summary>
-            public short size_of_data;
+            public readonly byte[] reserved;
+            /// <summary>Size of data following this field このセクタ部のデータサイズ</summary>
+            public readonly short size_of_data;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/DART/Constants.cs b/Aaru.Images/DART/Constants.cs
index 33e50a263..e1a99061b 100644
--- a/Aaru.Images/DART/Constants.cs
+++ b/Aaru.Images/DART/Constants.cs
@@ -45,8 +45,10 @@ namespace Aaru.DiscImages
         // Compression types
         // "fast"
         const byte COMPRESS_RLE = 0;
+
         // "best"
         const byte COMPRESS_LZH = 1;
+
         // DART <= 1.4
         const byte COMPRESS_NONE = 2;
 
@@ -68,6 +70,6 @@ namespace Aaru.DiscImages
         const int TAG_SECTOR_SIZE   = 12;
         const int DATA_SIZE         = SECTORS_PER_BLOCK * SECTOR_SIZE;
         const int TAG_SIZE          = SECTORS_PER_BLOCK * TAG_SECTOR_SIZE;
-        const int BUFFER_SIZE       = SECTORS_PER_BLOCK * SECTOR_SIZE + SECTORS_PER_BLOCK * TAG_SECTOR_SIZE;
+        const int BUFFER_SIZE       = (SECTORS_PER_BLOCK * SECTOR_SIZE) + (SECTORS_PER_BLOCK * TAG_SECTOR_SIZE);
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/DART/DART.cs b/Aaru.Images/DART/DART.cs
index 3ff11c97c..b3c1a4ba4 100644
--- a/Aaru.Images/DART/DART.cs
+++ b/Aaru.Images/DART/DART.cs
@@ -46,31 +46,18 @@ namespace Aaru.DiscImages
         byte[]    tagCache;
         uint      tagChecksum;
 
-        public Dart()
+        public Dart() => imageInfo = new ImageInfo
         {
-            imageInfo = new ImageInfo
-            {
-                ReadableSectorTags    = new List<SectorTagType>(),
-                ReadableMediaTags     = new List<MediaTagType>(),
-                HasPartitions         = false,
-                HasSessions           = false,
-                Version               = null,
-                Application           = null,
-                ApplicationVersion    = null,
-                Creator               = null,
-                Comments              = null,
-                MediaManufacturer     = null,
-                MediaModel            = null,
-                MediaSerialNumber     = null,
-                MediaBarcode          = null,
-                MediaPartNumber       = null,
-                MediaSequence         = 0,
-                LastMediaSequence     = 0,
-                DriveManufacturer     = null,
-                DriveModel            = null,
-                DriveSerialNumber     = null,
-                DriveFirmwareRevision = null
-            };
-        }
+            ReadableSectorTags = new List<SectorTagType>(), ReadableMediaTags = new List<MediaTagType>(),
+            HasPartitions      = false, HasSessions                           = false, Version = null,
+            Application        = null,
+            ApplicationVersion = null, Creator = null, Comments = null,
+            MediaManufacturer  = null,
+            MediaModel         = null, MediaSerialNumber = null, MediaBarcode = null,
+            MediaPartNumber    = null,
+            MediaSequence      = 0, LastMediaSequence = 0, DriveManufacturer = null,
+            DriveModel         = null,
+            DriveSerialNumber  = null, DriveFirmwareRevision = null
+        };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/DART/Identify.cs b/Aaru.Images/DART/Identify.cs
index 196b584a0..f46c74608 100644
--- a/Aaru.Images/DART/Identify.cs
+++ b/Aaru.Images/DART/Identify.cs
@@ -42,7 +42,8 @@ namespace Aaru.DiscImages
         {
             Stream stream = imageFilter.GetDataForkStream();
 
-            if(stream.Length < 84) return false;
+            if(stream.Length < 84)
+                return false;
 
             stream.Seek(0, SeekOrigin.Begin);
             byte[] headerB = new byte[Marshal.SizeOf<DartHeader>()];
@@ -50,37 +51,47 @@ namespace Aaru.DiscImages
             stream.Read(headerB, 0, Marshal.SizeOf<DartHeader>());
             DartHeader header = Marshal.ByteArrayToStructureBigEndian<DartHeader>(headerB);
 
-            if(header.srcCmp > COMPRESS_NONE) return false;
+            if(header.srcCmp > COMPRESS_NONE)
+                return false;
 
-            int expectedMaxSize = 84 + header.srcSize * 2 * 524;
+            int expectedMaxSize = 84 + (header.srcSize * 2 * 524);
 
             switch(header.srcType)
             {
                 case DISK_MAC:
-                    if(header.srcSize != SIZE_MAC_SS && header.srcSize != SIZE_MAC) return false;
+                    if(header.srcSize != SIZE_MAC_SS &&
+                       header.srcSize != SIZE_MAC)
+                        return false;
 
                     break;
                 case DISK_LISA:
-                    if(header.srcSize != SIZE_LISA) return false;
+                    if(header.srcSize != SIZE_LISA)
+                        return false;
 
                     break;
                 case DISK_APPLE2:
-                    if(header.srcSize != SIZE_APPLE2) return false;
+                    if(header.srcSize != SIZE_APPLE2)
+                        return false;
 
                     break;
                 case DISK_MAC_HD:
-                    if(header.srcSize != SIZE_MAC_HD) return false;
+                    if(header.srcSize != SIZE_MAC_HD)
+                        return false;
 
                     expectedMaxSize += 64;
+
                     break;
                 case DISK_DOS:
-                    if(header.srcSize != SIZE_DOS) return false;
+                    if(header.srcSize != SIZE_DOS)
+                        return false;
 
                     break;
                 case DISK_DOS_HD:
-                    if(header.srcSize != SIZE_DOS_HD) return false;
+                    if(header.srcSize != SIZE_DOS_HD)
+                        return false;
 
                     expectedMaxSize += 64;
+
                     break;
                 default: return false;
             }
diff --git a/Aaru.Images/DART/Read.cs b/Aaru.Images/DART/Read.cs
index 5c298cc82..e02689d6e 100644
--- a/Aaru.Images/DART/Read.cs
+++ b/Aaru.Images/DART/Read.cs
@@ -33,8 +33,6 @@
 using System;
 using System.IO;
 using System.Text.RegularExpressions;
-using Claunia.Encoding;
-using Claunia.RsrcFork;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Exceptions;
@@ -42,6 +40,8 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Compression;
 using Aaru.Console;
 using Aaru.Helpers;
+using Claunia.Encoding;
+using Claunia.RsrcFork;
 using Version = Resources.Version;
 
 namespace Aaru.DiscImages
@@ -52,7 +52,8 @@ namespace Aaru.DiscImages
         {
             Stream stream = imageFilter.GetDataForkStream();
 
-            if(stream.Length < 84) return false;
+            if(stream.Length < 84)
+                return false;
 
             stream.Seek(0, SeekOrigin.Begin);
             byte[] headerB = new byte[Marshal.SizeOf<DartHeader>()];
@@ -60,48 +61,61 @@ namespace Aaru.DiscImages
             stream.Read(headerB, 0, Marshal.SizeOf<DartHeader>());
             DartHeader header = Marshal.ByteArrayToStructureBigEndian<DartHeader>(headerB);
 
-            if(header.srcCmp > COMPRESS_NONE) return false;
+            if(header.srcCmp > COMPRESS_NONE)
+                return false;
 
-            int expectedMaxSize = 84 + header.srcSize * 2 * 524;
+            int expectedMaxSize = 84 + (header.srcSize * 2 * 524);
 
             switch(header.srcType)
             {
                 case DISK_MAC:
-                    if(header.srcSize != SIZE_MAC_SS && header.srcSize != SIZE_MAC) return false;
+                    if(header.srcSize != SIZE_MAC_SS &&
+                       header.srcSize != SIZE_MAC)
+                        return false;
 
                     break;
                 case DISK_LISA:
-                    if(header.srcSize != SIZE_LISA) return false;
+                    if(header.srcSize != SIZE_LISA)
+                        return false;
 
                     break;
                 case DISK_APPLE2:
-                    if(header.srcSize != DISK_APPLE2) return false;
+                    if(header.srcSize != DISK_APPLE2)
+                        return false;
 
                     break;
                 case DISK_MAC_HD:
-                    if(header.srcSize != SIZE_MAC_HD) return false;
+                    if(header.srcSize != SIZE_MAC_HD)
+                        return false;
 
                     expectedMaxSize += 64;
+
                     break;
                 case DISK_DOS:
-                    if(header.srcSize != SIZE_DOS) return false;
+                    if(header.srcSize != SIZE_DOS)
+                        return false;
 
                     break;
                 case DISK_DOS_HD:
-                    if(header.srcSize != SIZE_DOS_HD) return false;
+                    if(header.srcSize != SIZE_DOS_HD)
+                        return false;
 
                     expectedMaxSize += 64;
+
                     break;
                 default: return false;
             }
 
-            if(stream.Length > expectedMaxSize) return false;
+            if(stream.Length > expectedMaxSize)
+                return false;
 
             short[] bLength;
 
-            if(header.srcType == DISK_MAC_HD || header.srcType == DISK_DOS_HD)
-                bLength  = new short[BLOCK_ARRAY_LEN_HIGH];
-            else bLength = new short[BLOCK_ARRAY_LEN_LOW];
+            if(header.srcType == DISK_MAC_HD ||
+               header.srcType == DISK_DOS_HD)
+                bLength = new short[BLOCK_ARRAY_LEN_HIGH];
+            else
+                bLength = new short[BLOCK_ARRAY_LEN_LOW];
 
             for(int i = 0; i < bLength.Length; i++)
             {
@@ -110,13 +124,14 @@ namespace Aaru.DiscImages
                 bLength[i] = BigEndianBitConverter.ToInt16(tmpShort, 0);
             }
 
-            MemoryStream dataMs = new MemoryStream();
-            MemoryStream tagMs  = new MemoryStream();
+            var dataMs = new MemoryStream();
+            var tagMs  = new MemoryStream();
 
             foreach(short l in bLength)
                 if(l != 0)
                 {
                     byte[] buffer = new byte[BUFFER_SIZE];
+
                     if(l == -1)
                     {
                         stream.Read(buffer, 0, BUFFER_SIZE);
@@ -126,13 +141,17 @@ namespace Aaru.DiscImages
                     else
                     {
                         byte[] temp;
+
                         if(header.srcCmp == COMPRESS_RLE)
                         {
                             temp = new byte[l * 2];
                             stream.Read(temp, 0, temp.Length);
-                            AppleRle rle = new AppleRle(new MemoryStream(temp));
+                            var rle = new AppleRle(new MemoryStream(temp));
                             buffer = new byte[BUFFER_SIZE];
-                            for(int i = 0; i < BUFFER_SIZE; i++) buffer[i] = (byte)rle.ProduceByte();
+
+                            for(int i = 0; i < BUFFER_SIZE; i++)
+                                buffer[i] = (byte)rle.ProduceByte();
+
                             dataMs.Write(buffer, 0, DATA_SIZE);
                             tagMs.Write(buffer, DATA_SIZE, TAG_SIZE);
                         }
@@ -140,13 +159,17 @@ namespace Aaru.DiscImages
                         {
                             temp = new byte[l];
                             stream.Read(temp, 0, temp.Length);
+
                             throw new ImageNotSupportedException("LZH Compressed images not yet supported");
                         }
                     }
                 }
 
             dataCache = dataMs.ToArray();
-            if(header.srcType == DISK_LISA || header.srcType == DISK_MAC || header.srcType == DISK_APPLE2)
+
+            if(header.srcType == DISK_LISA ||
+               header.srcType == DISK_MAC  ||
+               header.srcType == DISK_APPLE2)
             {
                 imageInfo.ReadableSectorTags.Add(SectorTagType.AppleSectorTag);
                 tagCache = tagMs.ToArray();
@@ -156,7 +179,8 @@ namespace Aaru.DiscImages
             {
                 if(imageFilter.HasResourceFork())
                 {
-                    ResourceFork rsrcFork = new ResourceFork(imageFilter.GetResourceForkStream());
+                    var rsrcFork = new ResourceFork(imageFilter.GetResourceForkStream());
+
                     // "vers"
                     if(rsrcFork.ContainsKey(0x76657273))
                     {
@@ -166,31 +190,40 @@ namespace Aaru.DiscImages
 
                         if(vers != null)
                         {
-                            Version version = new Version(vers);
+                            var version = new Version(vers);
 
                             string release = null;
                             string dev     = null;
                             string pre     = null;
 
-                            string major                              = $"{version.MajorVersion}";
-                            string minor                              = $".{version.MinorVersion / 10}";
-                            if(version.MinorVersion % 10 > 0) release = $".{version.MinorVersion % 10}";
+                            string major = $"{version.MajorVersion}";
+                            string minor = $".{version.MinorVersion / 10}";
+
+                            if(version.MinorVersion % 10 > 0)
+                                release = $".{version.MinorVersion % 10}";
+
                             switch(version.DevStage)
                             {
                                 case Version.DevelopmentStage.Alpha:
                                     dev = "a";
+
                                     break;
                                 case Version.DevelopmentStage.Beta:
                                     dev = "b";
+
                                     break;
                                 case Version.DevelopmentStage.PreAlpha:
                                     dev = "d";
+
                                     break;
                             }
 
-                            if(dev == null && version.PreReleaseVersion > 0) dev = "f";
+                            if(dev                       == null &&
+                               version.PreReleaseVersion > 0)
+                                dev = "f";
 
-                            if(dev != null) pre = $"{version.PreReleaseVersion}";
+                            if(dev != null)
+                                pre = $"{version.PreReleaseVersion}";
 
                             imageInfo.ApplicationVersion = $"{major}{minor}{release}{dev}{pre}";
                             imageInfo.Application        = version.VersionString;
@@ -202,13 +235,16 @@ namespace Aaru.DiscImages
                     if(rsrcFork.ContainsKey(0x44415254))
                     {
                         Resource dartRsrc = rsrcFork.GetResource(0x44415254);
+
                         if(dartRsrc != null)
                         {
                             string dArt = StringHandlers.PascalToString(dartRsrc.GetResource(dartRsrc.GetIds()[0]),
                                                                         Encoding.GetEncoding("macintosh"));
+
                             const string DART_REGEX =
                                 @"(?<version>\S+), tag checksum=\$(?<tagchk>[0123456789ABCDEF]{8}), data checksum=\$(?<datachk>[0123456789ABCDEF]{8})$";
-                            Regex dArtEx    = new Regex(DART_REGEX);
+
+                            var   dArtEx    = new Regex(DART_REGEX);
                             Match dArtMatch = dArtEx.Match(dArt);
 
                             if(dArtMatch.Success)
@@ -216,7 +252,7 @@ namespace Aaru.DiscImages
                                 imageInfo.Application        = "DART";
                                 imageInfo.ApplicationVersion = dArtMatch.Groups["version"].Value;
                                 dataChecksum                 = Convert.ToUInt32(dArtMatch.Groups["datachk"].Value, 16);
-                                tagChecksum                  = Convert.ToUInt32(dArtMatch.Groups["tagchk"].Value,  16);
+                                tagChecksum                  = Convert.ToUInt32(dArtMatch.Groups["tagchk"].Value, 16);
                             }
                         }
                     }
@@ -225,6 +261,7 @@ namespace Aaru.DiscImages
                     if(rsrcFork.ContainsKey(0x434B534D))
                     {
                         Resource cksmRsrc = rsrcFork.GetResource(0x434B534D);
+
                         if(cksmRsrc?.ContainsId(1) == true)
                         {
                             byte[] tagChk = cksmRsrc.GetResource(1);
@@ -239,10 +276,10 @@ namespace Aaru.DiscImages
                     }
                 }
             }
-            catch(InvalidCastException) { }
+            catch(InvalidCastException) {}
 
             AaruConsole.DebugWriteLine("DART plugin", "Image application = {0} version {1}", imageInfo.Application,
-                                      imageInfo.ApplicationVersion);
+                                       imageInfo.ApplicationVersion);
 
             imageInfo.Sectors              = (ulong)(header.srcSize * 2);
             imageInfo.CreationTime         = imageFilter.GetCreationTime();
@@ -260,24 +297,28 @@ namespace Aaru.DiscImages
                     imageInfo.Heads           = 1;
                     imageInfo.SectorsPerTrack = 10;
                     imageInfo.MediaType       = MediaType.AppleSonySS;
+
                     break;
                 case SIZE_MAC:
                     imageInfo.Cylinders       = 80;
                     imageInfo.Heads           = 2;
                     imageInfo.SectorsPerTrack = 10;
                     imageInfo.MediaType       = MediaType.AppleSonyDS;
+
                     break;
                 case SIZE_DOS:
                     imageInfo.Cylinders       = 80;
                     imageInfo.Heads           = 2;
                     imageInfo.SectorsPerTrack = 9;
                     imageInfo.MediaType       = MediaType.DOS_35_DS_DD_9;
+
                     break;
                 case SIZE_MAC_HD:
                     imageInfo.Cylinders       = 80;
                     imageInfo.Heads           = 2;
                     imageInfo.SectorsPerTrack = 18;
                     imageInfo.MediaType       = MediaType.DOS_35_HD;
+
                     break;
             }
 
@@ -308,7 +349,8 @@ namespace Aaru.DiscImages
             if(tag != SectorTagType.AppleSectorTag)
                 throw new FeatureUnsupportedImageException($"Tag {tag} not supported by image format");
 
-            if(tagCache == null || tagCache.Length == 0)
+            if(tagCache        == null ||
+               tagCache.Length == 0)
                 throw new FeatureNotPresentImageException("Disk image does not have tags");
 
             if(sectorAddress > imageInfo.Sectors - 1)
@@ -342,8 +384,9 @@ namespace Aaru.DiscImages
             {
                 Array.Copy(data, i * imageInfo.SectorSize, buffer, i * (imageInfo.SectorSize + TAG_SECTOR_SIZE),
                            imageInfo.SectorSize);
+
                 Array.Copy(tags, i * TAG_SECTOR_SIZE, buffer,
-                           i * (imageInfo.SectorSize + TAG_SECTOR_SIZE) + imageInfo.SectorSize, TAG_SECTOR_SIZE);
+                           (i * (imageInfo.SectorSize + TAG_SECTOR_SIZE)) + imageInfo.SectorSize, TAG_SECTOR_SIZE);
             }
 
             return buffer;
diff --git a/Aaru.Images/DART/Structs.cs b/Aaru.Images/DART/Structs.cs
index 9f7705265..b4c38aa09 100644
--- a/Aaru.Images/DART/Structs.cs
+++ b/Aaru.Images/DART/Structs.cs
@@ -39,9 +39,9 @@ namespace Aaru.DiscImages
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct DartHeader
         {
-            public byte  srcCmp;
-            public byte  srcType;
-            public short srcSize;
+            public readonly byte  srcCmp;
+            public readonly byte  srcType;
+            public readonly short srcSize;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/DIM/Constants.cs b/Aaru.Images/DIM/Constants.cs
index 5a39451e6..2049f0076 100644
--- a/Aaru.Images/DIM/Constants.cs
+++ b/Aaru.Images/DIM/Constants.cs
@@ -36,6 +36,9 @@ namespace Aaru.DiscImages
     {
         /// <summary>Start of data sectors in disk image, should be 0x100</summary>
         const uint DATA_OFFSET = 0x100;
-        readonly byte[] headerId = {0x44, 0x49, 0x46, 0x43, 0x20, 0x48, 0x45, 0x41, 0x44, 0x45, 0x52, 0x20, 0x20};
+        readonly byte[] headerId =
+        {
+            0x44, 0x49, 0x46, 0x43, 0x20, 0x48, 0x45, 0x41, 0x44, 0x45, 0x52, 0x20, 0x20
+        };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/DIM/DIM.cs b/Aaru.Images/DIM/DIM.cs
index dc08f0005..8f3b9bbd5 100644
--- a/Aaru.Images/DIM/DIM.cs
+++ b/Aaru.Images/DIM/DIM.cs
@@ -46,31 +46,18 @@ namespace Aaru.DiscImages
         byte[]    hdrId;
         ImageInfo imageInfo;
 
-        public Dim()
+        public Dim() => imageInfo = new ImageInfo
         {
-            imageInfo = new ImageInfo
-            {
-                ReadableSectorTags    = new List<SectorTagType>(),
-                ReadableMediaTags     = new List<MediaTagType>(),
-                HasPartitions         = false,
-                HasSessions           = false,
-                Version               = null,
-                Application           = null,
-                ApplicationVersion    = null,
-                Creator               = null,
-                Comments              = null,
-                MediaManufacturer     = null,
-                MediaModel            = null,
-                MediaSerialNumber     = null,
-                MediaBarcode          = null,
-                MediaPartNumber       = null,
-                MediaSequence         = 0,
-                LastMediaSequence     = 0,
-                DriveManufacturer     = null,
-                DriveModel            = null,
-                DriveSerialNumber     = null,
-                DriveFirmwareRevision = null
-            };
-        }
+            ReadableSectorTags = new List<SectorTagType>(), ReadableMediaTags = new List<MediaTagType>(),
+            HasPartitions      = false, HasSessions                           = false, Version = null,
+            Application        = null,
+            ApplicationVersion = null, Creator = null, Comments = null,
+            MediaManufacturer  = null,
+            MediaModel         = null, MediaSerialNumber = null, MediaBarcode = null,
+            MediaPartNumber    = null,
+            MediaSequence      = 0, LastMediaSequence = 0, DriveManufacturer = null,
+            DriveModel         = null,
+            DriveSerialNumber  = null, DriveFirmwareRevision = null
+        };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/DIM/Enums.cs b/Aaru.Images/DIM/Enums.cs
index 7c0374d0e..9b350fe40 100644
--- a/Aaru.Images/DIM/Enums.cs
+++ b/Aaru.Images/DIM/Enums.cs
@@ -36,12 +36,8 @@ namespace Aaru.DiscImages
     {
         enum DiskType : byte
         {
-            Hd2  = 0,
-            Hs2  = 1,
-            Hc2  = 2,
-            Hde2 = 3,
-            Hq2  = 9,
-            N88  = 17
+            Hd2  = 0, Hs2 = 1, Hc2 = 2,
+            Hde2 = 3, Hq2 = 9, N88 = 17
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/DIM/Identify.cs b/Aaru.Images/DIM/Identify.cs
index e41e28b86..e23bec31a 100644
--- a/Aaru.Images/DIM/Identify.cs
+++ b/Aaru.Images/DIM/Identify.cs
@@ -43,7 +43,8 @@ namespace Aaru.DiscImages
             Stream stream = imageFilter.GetDataForkStream();
             stream.Seek(0, SeekOrigin.Begin);
 
-            if(stream.Length < DATA_OFFSET) return false;
+            if(stream.Length < DATA_OFFSET)
+                return false;
 
             comment = new byte[60];
             hdrId   = new byte[13];
diff --git a/Aaru.Images/DIM/Read.cs b/Aaru.Images/DIM/Read.cs
index a5490fd76..8a3c93bd0 100644
--- a/Aaru.Images/DIM/Read.cs
+++ b/Aaru.Images/DIM/Read.cs
@@ -48,7 +48,8 @@ namespace Aaru.DiscImages
             Stream stream = imageFilter.GetDataForkStream();
             stream.Seek(0, SeekOrigin.Begin);
 
-            if(stream.Length < DATA_OFFSET) return false;
+            if(stream.Length < DATA_OFFSET)
+                return false;
 
             long diskSize = stream.Length - DATA_OFFSET;
 
@@ -61,7 +62,8 @@ namespace Aaru.DiscImages
             stream.Seek(0xC2, SeekOrigin.Begin);
             stream.Read(comment, 0, 60);
 
-            if(!headerId.SequenceEqual(hdrId)) return false;
+            if(!headerId.SequenceEqual(hdrId))
+                return false;
 
             imageInfo.MediaType = MediaType.Unknown;
 
@@ -71,72 +73,106 @@ namespace Aaru.DiscImages
                 case DiskType.Hd2:
                     if(diskSize % (2 * 8 * 1024) != 0)
                     {
-                        AaruConsole.ErrorWriteLine("DIM shows unknown image with {0} tracks", diskSize / (2 * 8 * 1024));
+                        AaruConsole.ErrorWriteLine("DIM shows unknown image with {0} tracks",
+                                                   diskSize / (2 * 8 * 1024));
+
                         return false;
                     }
 
-                    if(diskSize / (2 * 8 * 1024) == 77) imageInfo.MediaType = MediaType.SHARP_525;
+                    if(diskSize / (2 * 8 * 1024) == 77)
+                        imageInfo.MediaType = MediaType.SHARP_525;
+
                     imageInfo.SectorSize = 1024;
+
                     break;
+
                 // 9 spt, 1024 bps
                 case DiskType.Hs2:
                     if(diskSize % (2 * 9 * 512) != 0)
                     {
                         AaruConsole.ErrorWriteLine("DIM shows unknown image with {0} tracks", diskSize / (2 * 9 * 512));
+
                         return false;
                     }
 
-                    if(diskSize / (2 * 9 * 512) == 80) imageInfo.MediaType = MediaType.SHARP_525_9;
+                    if(diskSize / (2 * 9 * 512) == 80)
+                        imageInfo.MediaType = MediaType.SHARP_525_9;
+
                     imageInfo.SectorSize = 512;
+
                     break;
+
                 // 15 spt, 512 bps
                 case DiskType.Hc2:
                     if(diskSize % (2 * 15 * 512) != 0)
                     {
-                        AaruConsole.ErrorWriteLine("DIM shows unknown image with {0} tracks", diskSize / (2 * 15 * 512));
+                        AaruConsole.ErrorWriteLine("DIM shows unknown image with {0} tracks",
+                                                   diskSize / (2 * 15 * 512));
+
                         return false;
                     }
 
-                    if(diskSize / (2 * 15 * 512) == 80) imageInfo.MediaType = MediaType.DOS_525_HD;
+                    if(diskSize / (2 * 15 * 512) == 80)
+                        imageInfo.MediaType = MediaType.DOS_525_HD;
+
                     imageInfo.SectorSize = 512;
+
                     break;
+
                 // 9 spt, 1024 bps
                 case DiskType.Hde2:
                     if(diskSize % (2 * 9 * 512) != 0)
                     {
                         AaruConsole.ErrorWriteLine("DIM shows unknown image with {0} tracks", diskSize / (2 * 9 * 512));
+
                         return false;
                     }
 
-                    if(diskSize / (2 * 9 * 512) == 80) imageInfo.MediaType = MediaType.SHARP_35_9;
+                    if(diskSize / (2 * 9 * 512) == 80)
+                        imageInfo.MediaType = MediaType.SHARP_35_9;
+
                     imageInfo.SectorSize = 512;
+
                     break;
+
                 // 18 spt, 512 bps
                 case DiskType.Hq2:
                     if(diskSize % (2 * 18 * 512) != 0)
                     {
-                        AaruConsole.ErrorWriteLine("DIM shows unknown image with {0} tracks", diskSize / (2 * 18 * 512));
+                        AaruConsole.ErrorWriteLine("DIM shows unknown image with {0} tracks",
+                                                   diskSize / (2 * 18 * 512));
+
                         return false;
                     }
 
-                    if(diskSize / (2 * 18 * 512) == 80) imageInfo.MediaType = MediaType.DOS_35_HD;
+                    if(diskSize / (2 * 18 * 512) == 80)
+                        imageInfo.MediaType = MediaType.DOS_35_HD;
+
                     imageInfo.SectorSize = 512;
+
                     break;
+
                 // 26 spt, 256 bps
                 case DiskType.N88:
                     if(diskSize % (2 * 26 * 256) == 0)
                     {
-                        if(diskSize % (2 * 26 * 256) == 77) imageInfo.MediaType = MediaType.NEC_8_DD;
+                        if(diskSize % (2 * 26 * 256) == 77)
+                            imageInfo.MediaType = MediaType.NEC_8_DD;
+
                         imageInfo.SectorSize = 256;
                     }
                     else if(diskSize % (2 * 26 * 128) == 0)
                     {
-                        if(diskSize % (2 * 26 * 128) == 77) imageInfo.MediaType = MediaType.NEC_8_SD;
+                        if(diskSize % (2 * 26 * 128) == 77)
+                            imageInfo.MediaType = MediaType.NEC_8_SD;
+
                         imageInfo.SectorSize = 256;
                     }
                     else
                     {
-                        AaruConsole.ErrorWriteLine("DIM shows unknown image with {0} tracks", diskSize / (2 * 26 * 256));
+                        AaruConsole.ErrorWriteLine("DIM shows unknown image with {0} tracks",
+                                                   diskSize / (2 * 26 * 256));
+
                         return false;
                     }
 
@@ -145,6 +181,7 @@ namespace Aaru.DiscImages
             }
 
             AaruConsole.VerboseWriteLine("DIM image contains a disk of type {0}", imageInfo.MediaType);
+
             if(!string.IsNullOrEmpty(imageInfo.Comments))
                 AaruConsole.VerboseWriteLine("DIM comments: {0}", imageInfo.Comments);
 
@@ -164,32 +201,38 @@ namespace Aaru.DiscImages
                     imageInfo.Cylinders       = 77;
                     imageInfo.Heads           = 2;
                     imageInfo.SectorsPerTrack = 8;
+
                     break;
                 case MediaType.SHARP_525_9:
                     imageInfo.Cylinders       = 80;
                     imageInfo.Heads           = 2;
                     imageInfo.SectorsPerTrack = 9;
+
                     break;
                 case MediaType.DOS_525_HD:
                     imageInfo.Cylinders       = 80;
                     imageInfo.Heads           = 2;
                     imageInfo.SectorsPerTrack = 15;
+
                     break;
                 case MediaType.SHARP_35_9:
                     imageInfo.Cylinders       = 80;
                     imageInfo.Heads           = 2;
                     imageInfo.SectorsPerTrack = 9;
+
                     break;
                 case MediaType.DOS_35_HD:
                     imageInfo.Cylinders       = 80;
                     imageInfo.Heads           = 2;
                     imageInfo.SectorsPerTrack = 18;
+
                     break;
                 case MediaType.NEC_8_DD:
                 case MediaType.NEC_8_SD:
                     imageInfo.Cylinders       = 77;
                     imageInfo.Heads           = 2;
                     imageInfo.SectorsPerTrack = 26;
+
                     break;
             }
 
@@ -210,7 +253,7 @@ namespace Aaru.DiscImages
 
             Stream stream = dimImageFilter.GetDataForkStream();
 
-            stream.Seek((long)(DATA_OFFSET + sectorAddress * imageInfo.SectorSize), SeekOrigin.Begin);
+            stream.Seek((long)(DATA_OFFSET + (sectorAddress * imageInfo.SectorSize)), SeekOrigin.Begin);
 
             stream.Read(buffer, 0, (int)(length * imageInfo.SectorSize));
 
diff --git a/Aaru.Images/DiscFerret/Constants.cs b/Aaru.Images/DiscFerret/Constants.cs
index 86ab6faec..e431464dd 100644
--- a/Aaru.Images/DiscFerret/Constants.cs
+++ b/Aaru.Images/DiscFerret/Constants.cs
@@ -34,13 +34,9 @@ namespace Aaru.DiscImages
 {
     public partial class DiscFerret
     {
-        /// <summary>
-        ///     "DFER"
-        /// </summary>
+        /// <summary>"DFER"</summary>
         const uint DFI_MAGIC = 0x52454644;
-        /// <summary>
-        ///     "DFE2"
-        /// </summary>
+        /// <summary>"DFE2"</summary>
         const uint DFI_MAGIC2 = 0x32454644;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/DiscFerret/DiscFerret.cs b/Aaru.Images/DiscFerret/DiscFerret.cs
index 696d89bb2..d94009c04 100644
--- a/Aaru.Images/DiscFerret/DiscFerret.cs
+++ b/Aaru.Images/DiscFerret/DiscFerret.cs
@@ -40,35 +40,23 @@ namespace Aaru.DiscImages
     public partial class DiscFerret : IMediaImage, IVerifiableSectorsImage
     {
         ImageInfo imageInfo;
+
         // TODO: These variables have been made public so create-sidecar can access to this information until I define an API >4.0
         public SortedDictionary<int, long> TrackLengths;
         public SortedDictionary<int, long> TrackOffsets;
 
-        public DiscFerret()
+        public DiscFerret() => imageInfo = new ImageInfo
         {
-            imageInfo = new ImageInfo
-            {
-                ReadableSectorTags    = new List<SectorTagType>(),
-                ReadableMediaTags     = new List<MediaTagType>(),
-                HasPartitions         = false,
-                HasSessions           = false,
-                Version               = null,
-                Application           = null,
-                ApplicationVersion    = null,
-                Creator               = null,
-                Comments              = null,
-                MediaManufacturer     = null,
-                MediaModel            = null,
-                MediaSerialNumber     = null,
-                MediaBarcode          = null,
-                MediaPartNumber       = null,
-                MediaSequence         = 0,
-                LastMediaSequence     = 0,
-                DriveManufacturer     = null,
-                DriveModel            = null,
-                DriveSerialNumber     = null,
-                DriveFirmwareRevision = null
-            };
-        }
+            ReadableSectorTags = new List<SectorTagType>(), ReadableMediaTags = new List<MediaTagType>(),
+            HasPartitions      = false, HasSessions                           = false, Version = null,
+            Application        = null,
+            ApplicationVersion = null, Creator = null, Comments = null,
+            MediaManufacturer  = null,
+            MediaModel         = null, MediaSerialNumber = null, MediaBarcode = null,
+            MediaPartNumber    = null,
+            MediaSequence      = 0, LastMediaSequence = 0, DriveManufacturer = null,
+            DriveModel         = null,
+            DriveSerialNumber  = null, DriveFirmwareRevision = null
+        };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/DiscFerret/Read.cs b/Aaru.Images/DiscFerret/Read.cs
index 1bf002854..2fb55f665 100644
--- a/Aaru.Images/DiscFerret/Read.cs
+++ b/Aaru.Images/DiscFerret/Read.cs
@@ -49,7 +49,9 @@ namespace Aaru.DiscImages
             stream.Read(magicB, 0, 4);
             uint magic = BitConverter.ToUInt32(magicB, 0);
 
-            if(magic != DFI_MAGIC && magic != DFI_MAGIC2) return false;
+            if(magic != DFI_MAGIC &&
+               magic != DFI_MAGIC2)
+                return false;
 
             TrackOffsets = new SortedDictionary<int, long>();
             TrackLengths = new SortedDictionary<int, long>();
@@ -66,41 +68,50 @@ namespace Aaru.DiscImages
                 DfiBlockHeader blockHeader = Marshal.ByteArrayToStructureBigEndian<DfiBlockHeader>(blk);
 
                 AaruConsole.DebugWriteLine("DiscFerret plugin", "block@{0}.cylinder = {1}", thisOffset,
-                                          blockHeader.cylinder);
+                                           blockHeader.cylinder);
+
                 AaruConsole.DebugWriteLine("DiscFerret plugin", "block@{0}.head = {1}", thisOffset, blockHeader.head);
+
                 AaruConsole.DebugWriteLine("DiscFerret plugin", "block@{0}.sector = {1}", thisOffset,
-                                          blockHeader.sector);
+                                           blockHeader.sector);
+
                 AaruConsole.DebugWriteLine("DiscFerret plugin", "block@{0}.length = {1}", thisOffset,
-                                          blockHeader.length);
+                                           blockHeader.length);
 
                 if(stream.Position + blockHeader.length > stream.Length)
                 {
                     AaruConsole.DebugWriteLine("DiscFerret plugin", "Invalid track block found at {0}", thisOffset);
+
                     break;
                 }
 
                 stream.Position += blockHeader.length;
 
-                if(blockHeader.cylinder > 0 && blockHeader.cylinder > lastCylinder)
+                if(blockHeader.cylinder > 0 &&
+                   blockHeader.cylinder > lastCylinder)
                 {
                     lastCylinder = blockHeader.cylinder;
                     lastHead     = 0;
                     TrackOffsets.Add(t, offset);
-                    TrackLengths.Add(t, thisOffset - offset + 1);
+                    TrackLengths.Add(t, (thisOffset - offset) + 1);
                     offset = thisOffset;
                     t++;
                 }
-                else if(blockHeader.head > 0 && blockHeader.head > lastHead)
+                else if(blockHeader.head > 0 &&
+                        blockHeader.head > lastHead)
                 {
                     lastHead = blockHeader.head;
                     TrackOffsets.Add(t, offset);
-                    TrackLengths.Add(t, thisOffset - offset + 1);
+                    TrackLengths.Add(t, (thisOffset - offset) + 1);
                     offset = thisOffset;
                     t++;
                 }
 
-                if(blockHeader.cylinder > imageInfo.Cylinders) imageInfo.Cylinders = blockHeader.cylinder;
-                if(blockHeader.head     > imageInfo.Heads) imageInfo.Heads         = blockHeader.head;
+                if(blockHeader.cylinder > imageInfo.Cylinders)
+                    imageInfo.Cylinders = blockHeader.cylinder;
+
+                if(blockHeader.head > imageInfo.Heads)
+                    imageInfo.Heads = blockHeader.head;
             }
 
             imageInfo.Heads++;
diff --git a/Aaru.Images/DiscFerret/Structs.cs b/Aaru.Images/DiscFerret/Structs.cs
index 36355f24e..cc78621f5 100644
--- a/Aaru.Images/DiscFerret/Structs.cs
+++ b/Aaru.Images/DiscFerret/Structs.cs
@@ -39,10 +39,10 @@ namespace Aaru.DiscImages
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct DfiBlockHeader
         {
-            public ushort cylinder;
-            public ushort head;
-            public ushort sector;
-            public uint   length;
+            public readonly ushort cylinder;
+            public readonly ushort head;
+            public readonly ushort sector;
+            public readonly uint   length;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/DiscFerret/Verify.cs b/Aaru.Images/DiscFerret/Verify.cs
index 0d573b7cb..9dff31d22 100644
--- a/Aaru.Images/DiscFerret/Verify.cs
+++ b/Aaru.Images/DiscFerret/Verify.cs
@@ -40,7 +40,7 @@ namespace Aaru.DiscImages
         public bool? VerifySector(ulong sectorAddress) =>
             throw new NotImplementedException("Flux decoding is not yet implemented.");
 
-        public bool? VerifySectors(ulong           sectorAddress, uint length, out List<ulong> failingLbas,
+        public bool? VerifySectors(ulong sectorAddress, uint length, out List<ulong> failingLbas,
                                    out List<ulong> unknownLbas) =>
             throw new NotImplementedException("Flux decoding is not yet implemented.");
     }
diff --git a/Aaru.Images/DiscJuggler/DiscJuggler.cs b/Aaru.Images/DiscJuggler/DiscJuggler.cs
index 4b778dbe5..29dc38aa8 100644
--- a/Aaru.Images/DiscJuggler/DiscJuggler.cs
+++ b/Aaru.Images/DiscJuggler/DiscJuggler.cs
@@ -48,28 +48,16 @@ namespace Aaru.DiscImages
         Dictionary<uint, ulong> offsetmap;
         Dictionary<uint, byte>  trackFlags;
 
-        public DiscJuggler()
+        public DiscJuggler() => imageInfo = new ImageInfo
         {
-            imageInfo = new ImageInfo
-            {
-                ReadableSectorTags    = new List<SectorTagType>(),
-                ReadableMediaTags     = new List<MediaTagType>(),
-                HasPartitions         = true,
-                HasSessions           = true,
-                Version               = null,
-                ApplicationVersion    = null,
-                MediaTitle            = null,
-                Creator               = null,
-                MediaManufacturer     = null,
-                MediaModel            = null,
-                MediaPartNumber       = null,
-                MediaSequence         = 0,
-                LastMediaSequence     = 0,
-                DriveManufacturer     = null,
-                DriveModel            = null,
-                DriveSerialNumber     = null,
-                DriveFirmwareRevision = null
-            };
-        }
+            ReadableSectorTags = new List<SectorTagType>(), ReadableMediaTags = new List<MediaTagType>(),
+            HasPartitions      = true, HasSessions                            = true, Version = null,
+            ApplicationVersion = null,
+            MediaTitle         = null, Creator = null, MediaManufacturer = null,
+            MediaModel         = null,
+            MediaPartNumber    = null, MediaSequence = 0, LastMediaSequence = 0,
+            DriveManufacturer  = null,
+            DriveModel         = null, DriveSerialNumber = null, DriveFirmwareRevision = null
+        };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/DiscJuggler/Identify.cs b/Aaru.Images/DiscJuggler/Identify.cs
index d29d9c433..dc2819bca 100644
--- a/Aaru.Images/DiscJuggler/Identify.cs
+++ b/Aaru.Images/DiscJuggler/Identify.cs
@@ -50,20 +50,34 @@ namespace Aaru.DiscImages
 
             AaruConsole.DebugWriteLine("DiscJuggler plugin", "dscLen = {0}", dscLen);
 
-            if(dscLen >= imageStream.Length) return false;
+            if(dscLen >= imageStream.Length)
+                return false;
 
             byte[] descriptor = new byte[dscLen];
             imageStream.Seek(-dscLen, SeekOrigin.End);
             imageStream.Read(descriptor, 0, dscLen);
 
             // Sessions
-            if(descriptor[0] > 99 || descriptor[0] == 0) return false;
+            if(descriptor[0] > 99 ||
+               descriptor[0] == 0)
+                return false;
 
             // Seems all sessions start with this data
-            if(descriptor[1]  != 0x00 || descriptor[3]  != 0x00 || descriptor[4]  != 0x00 || descriptor[5]  != 0x00 ||
-               descriptor[6]  != 0x00 || descriptor[7]  != 0x00 || descriptor[8]  != 0x00 || descriptor[9]  != 0x00 ||
-               descriptor[10] != 0x01 || descriptor[11] != 0x00 || descriptor[12] != 0x00 || descriptor[13] != 0x00 ||
-               descriptor[14] != 0xFF || descriptor[15] != 0xFF) return false;
+            if(descriptor[1]  != 0x00 ||
+               descriptor[3]  != 0x00 ||
+               descriptor[4]  != 0x00 ||
+               descriptor[5]  != 0x00 ||
+               descriptor[6]  != 0x00 ||
+               descriptor[7]  != 0x00 ||
+               descriptor[8]  != 0x00 ||
+               descriptor[9]  != 0x00 ||
+               descriptor[10] != 0x01 ||
+               descriptor[11] != 0x00 ||
+               descriptor[12] != 0x00 ||
+               descriptor[13] != 0x00 ||
+               descriptor[14] != 0xFF ||
+               descriptor[15] != 0xFF)
+                return false;
 
             // Too many tracks
             return descriptor[2] <= 99;
diff --git a/Aaru.Images/DiscJuggler/Read.cs b/Aaru.Images/DiscJuggler/Read.cs
index 53097bfcb..cc6305fb1 100644
--- a/Aaru.Images/DiscJuggler/Read.cs
+++ b/Aaru.Images/DiscJuggler/Read.cs
@@ -187,7 +187,7 @@ namespace Aaru.DiscImages
                             track.TrackDescription = Encoding.Default.GetString(textBlk, 0, bLen);
 
                             AaruConsole.DebugWriteLine("DiscJuggler plugin", "\tTrack title = {0}",
-                                                      track.TrackDescription);
+                                                       track.TrackDescription);
                         }
                     }
 
@@ -206,8 +206,8 @@ namespace Aaru.DiscImages
                     track.TrackSequence =  BitConverter.ToUInt32(descriptor, position) + lastSessionTrack + 1;
 
                     AaruConsole.DebugWriteLine("DiscJuggler plugin", "\ttrack = {1} + {2} + 1 = {0}",
-                                              track.TrackSequence, BitConverter.ToUInt32(descriptor, position),
-                                              lastSessionTrack);
+                                               track.TrackSequence, BitConverter.ToUInt32(descriptor, position),
+                                               lastSessionTrack);
 
                     position               += 4;
                     track.TrackStartSector =  BitConverter.ToUInt32(descriptor, position);
@@ -559,7 +559,7 @@ namespace Aaru.DiscImages
                 AaruConsole.DebugWriteLine("DiscJuggler plugin", "session.EndSector = {0}", session.EndSector);
 
                 AaruConsole.DebugWriteLine("DiscJuggler plugin", "session.SessionSequence = {0}",
-                                          session.SessionSequence);
+                                           session.SessionSequence);
             }
 
             // Skip unknown
diff --git a/Aaru.Images/DiscJuggler/Verify.cs b/Aaru.Images/DiscJuggler/Verify.cs
index 97569b2f6..64dcb0307 100644
--- a/Aaru.Images/DiscJuggler/Verify.cs
+++ b/Aaru.Images/DiscJuggler/Verify.cs
@@ -41,10 +41,11 @@ namespace Aaru.DiscImages
         public bool? VerifySector(ulong sectorAddress)
         {
             byte[] buffer = ReadSectorLong(sectorAddress);
+
             return CdChecksums.CheckCdSector(buffer);
         }
 
-        public bool? VerifySectors(ulong           sectorAddress, uint length, out List<ulong> failingLbas,
+        public bool? VerifySectors(ulong sectorAddress, uint length, out List<ulong> failingLbas,
                                    out List<ulong> unknownLbas)
         {
             byte[] buffer = ReadSectorsLong(sectorAddress, length);
@@ -62,19 +63,22 @@ namespace Aaru.DiscImages
                 {
                     case null:
                         unknownLbas.Add((ulong)i + sectorAddress);
+
                         break;
                     case false:
                         failingLbas.Add((ulong)i + sectorAddress);
+
                         break;
                 }
             }
 
-            if(unknownLbas.Count > 0) return null;
+            if(unknownLbas.Count > 0)
+                return null;
 
             return failingLbas.Count <= 0;
         }
 
-        public bool? VerifySectors(ulong           sectorAddress, uint length, uint track, out List<ulong> failingLbas,
+        public bool? VerifySectors(ulong sectorAddress, uint length, uint track, out List<ulong> failingLbas,
                                    out List<ulong> unknownLbas)
         {
             byte[] buffer = ReadSectorsLong(sectorAddress, length, track);
@@ -92,14 +96,17 @@ namespace Aaru.DiscImages
                 {
                     case null:
                         unknownLbas.Add((ulong)i + sectorAddress);
+
                         break;
                     case false:
                         failingLbas.Add((ulong)i + sectorAddress);
+
                         break;
                 }
             }
 
-            if(unknownLbas.Count > 0) return null;
+            if(unknownLbas.Count > 0)
+                return null;
 
             return failingLbas.Count <= 0;
         }
@@ -107,6 +114,7 @@ namespace Aaru.DiscImages
         public bool? VerifySector(ulong sectorAddress, uint track)
         {
             byte[] buffer = ReadSectorLong(sectorAddress, track);
+
             return CdChecksums.CheckCdSector(buffer);
         }
     }
diff --git a/Aaru.Images/DiskCopy42/Constants.cs b/Aaru.Images/DiskCopy42/Constants.cs
index 19e65db27..91e8b9112 100644
--- a/Aaru.Images/DiskCopy42/Constants.cs
+++ b/Aaru.Images/DiskCopy42/Constants.cs
@@ -44,12 +44,14 @@ namespace Aaru.DiscImages
         /// <summary>3.5", double side, high density, MFM</summary>
         const byte kSonyFormat1440K = 0x03;
         /// <summary>3.5", double side, high density, MFM, 21 sectors/track (aka, Microsoft DMF)</summary>
+
         // Unchecked value</summary>
         const byte kSonyFormat1680K = 0x04;
         /// <summary>Defined by Sigma Seven's BLU</summary>
         const byte kSigmaFormatTwiggy = 0x54;
         /// <summary>Defined by LisaEm</summary>
         const byte kNotStandardFormat = 0x5D;
+
         // There should be a value for Apple HD20 hard disks, unknown...
         // fmyByte byte
         // Based on GCR nibble
diff --git a/Aaru.Images/DiskCopy42/DiskCopy42.cs b/Aaru.Images/DiskCopy42/DiskCopy42.cs
index 898b39534..2e1aa3fbe 100644
--- a/Aaru.Images/DiskCopy42/DiskCopy42.cs
+++ b/Aaru.Images/DiskCopy42/DiskCopy42.cs
@@ -59,36 +59,20 @@ namespace Aaru.DiscImages
         byte[]     twiggyCacheTags;
         FileStream writingStream;
 
-        public DiskCopy42()
+        public DiskCopy42() => imageInfo = new ImageInfo
         {
-            imageInfo = new ImageInfo
-            {
-                ReadableSectorTags    = new List<SectorTagType>(),
-                ReadableMediaTags     = new List<MediaTagType>(),
-                HasPartitions         = false,
-                HasSessions           = false,
-                Version               = "4.2",
-                Application           = "Apple DiskCopy",
-                ApplicationVersion    = "4.2",
-                Creator               = null,
-                Comments              = null,
-                MediaManufacturer     = null,
-                MediaModel            = null,
-                MediaSerialNumber     = null,
-                MediaBarcode          = null,
-                MediaPartNumber       = null,
-                MediaSequence         = 0,
-                LastMediaSequence     = 0,
-                DriveManufacturer     = null,
-                DriveModel            = null,
-                DriveSerialNumber     = null,
-                DriveFirmwareRevision = null
-            };
-        }
+            ReadableSectorTags = new List<SectorTagType>(), ReadableMediaTags = new List<MediaTagType>(),
+            HasPartitions      = false, HasSessions                           = false, Version = "4.2",
+            Application        = "Apple DiskCopy",
+            ApplicationVersion = "4.2", Creator = null, Comments = null,
+            MediaManufacturer  = null,
+            MediaModel         = null, MediaSerialNumber = null, MediaBarcode = null,
+            MediaPartNumber    = null,
+            MediaSequence      = 0, LastMediaSequence = 0, DriveManufacturer = null,
+            DriveModel         = null,
+            DriveSerialNumber  = null, DriveFirmwareRevision = null
+        };
 
-        ~DiskCopy42()
-        {
-            Close();
-        }
+        ~DiskCopy42() => Close();
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/DiskCopy42/Helpers.cs b/Aaru.Images/DiskCopy42/Helpers.cs
index 18997e048..c3847725c 100644
--- a/Aaru.Images/DiskCopy42/Helpers.cs
+++ b/Aaru.Images/DiskCopy42/Helpers.cs
@@ -37,7 +37,9 @@ namespace Aaru.DiscImages
         static uint DC42CheckSum(byte[] buffer)
         {
             uint dc42Chk = 0;
-            if((buffer.Length & 0x01) == 0x01) return 0xFFFFFFFF;
+
+            if((buffer.Length & 0x01) == 0x01)
+                return 0xFFFFFFFF;
 
             for(uint i = 0; i < buffer.Length; i += 2)
             {
diff --git a/Aaru.Images/DiskCopy42/Identify.cs b/Aaru.Images/DiskCopy42/Identify.cs
index 7bf17b246..8d9cfd76a 100644
--- a/Aaru.Images/DiskCopy42/Identify.cs
+++ b/Aaru.Images/DiskCopy42/Identify.cs
@@ -32,9 +32,9 @@
 
 using System;
 using System.IO;
-using Claunia.Encoding;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
+using Claunia.Encoding;
 
 namespace Aaru.DiscImages
 {
@@ -49,9 +49,10 @@ namespace Aaru.DiscImages
             stream.Read(buffer, 0, 0x58);
 
             // Incorrect pascal string length, not DC42
-            if(buffer[0] > 63) return false;
+            if(buffer[0] > 63)
+                return false;
 
-            Dc42Header tmpHeader = new Dc42Header();
+            var tmpHeader = new Dc42Header();
 
             Array.Copy(buffer, 0, pString, 0, 64);
 
@@ -65,17 +66,19 @@ namespace Aaru.DiscImages
             tmpHeader.Valid        = buffer[0x52];
             tmpHeader.Reserved     = buffer[0x53];
 
-            AaruConsole.DebugWriteLine("DC42 plugin", "tmp_header.diskName = \"{0}\"",      tmpHeader.DiskName);
-            AaruConsole.DebugWriteLine("DC42 plugin", "tmp_header.dataSize = {0} bytes",    tmpHeader.DataSize);
-            AaruConsole.DebugWriteLine("DC42 plugin", "tmp_header.tagSize = {0} bytes",     tmpHeader.TagSize);
+            AaruConsole.DebugWriteLine("DC42 plugin", "tmp_header.diskName = \"{0}\"", tmpHeader.DiskName);
+            AaruConsole.DebugWriteLine("DC42 plugin", "tmp_header.dataSize = {0} bytes", tmpHeader.DataSize);
+            AaruConsole.DebugWriteLine("DC42 plugin", "tmp_header.tagSize = {0} bytes", tmpHeader.TagSize);
             AaruConsole.DebugWriteLine("DC42 plugin", "tmp_header.dataChecksum = 0x{0:X8}", tmpHeader.DataChecksum);
-            AaruConsole.DebugWriteLine("DC42 plugin", "tmp_header.tagChecksum = 0x{0:X8}",  tmpHeader.TagChecksum);
-            AaruConsole.DebugWriteLine("DC42 plugin", "tmp_header.format = 0x{0:X2}",       tmpHeader.Format);
-            AaruConsole.DebugWriteLine("DC42 plugin", "tmp_header.fmtByte = 0x{0:X2}",      tmpHeader.FmtByte);
-            AaruConsole.DebugWriteLine("DC42 plugin", "tmp_header.valid = {0}",             tmpHeader.Valid);
-            AaruConsole.DebugWriteLine("DC42 plugin", "tmp_header.reserved = {0}",          tmpHeader.Reserved);
+            AaruConsole.DebugWriteLine("DC42 plugin", "tmp_header.tagChecksum = 0x{0:X8}", tmpHeader.TagChecksum);
+            AaruConsole.DebugWriteLine("DC42 plugin", "tmp_header.format = 0x{0:X2}", tmpHeader.Format);
+            AaruConsole.DebugWriteLine("DC42 plugin", "tmp_header.fmtByte = 0x{0:X2}", tmpHeader.FmtByte);
+            AaruConsole.DebugWriteLine("DC42 plugin", "tmp_header.valid = {0}", tmpHeader.Valid);
+            AaruConsole.DebugWriteLine("DC42 plugin", "tmp_header.reserved = {0}", tmpHeader.Reserved);
 
-            if(tmpHeader.Valid != 1 || tmpHeader.Reserved != 0) return false;
+            if(tmpHeader.Valid    != 1 ||
+               tmpHeader.Reserved != 0)
+                return false;
 
             // Some versions seem to incorrectly create little endian fields
             if(tmpHeader.DataSize + tmpHeader.TagSize + 0x54 != imageFilter.GetDataForkLength() &&
@@ -87,32 +90,41 @@ namespace Aaru.DiscImages
                 tmpHeader.TagChecksum  = BitConverter.ToUInt32(buffer, 0x4C);
 
                 if(tmpHeader.DataSize + tmpHeader.TagSize + 0x54 != imageFilter.GetDataForkLength() &&
-                   tmpHeader.Format                              != kSigmaFormatTwiggy) return false;
+                   tmpHeader.Format                              != kSigmaFormatTwiggy)
+                    return false;
             }
 
-            if(tmpHeader.Format != kSonyFormat400K  && tmpHeader.Format != kSonyFormat800K    &&
-               tmpHeader.Format != kSonyFormat720K  && tmpHeader.Format != kSonyFormat1440K   &&
-               tmpHeader.Format != kSonyFormat1680K && tmpHeader.Format != kSigmaFormatTwiggy &&
+            if(tmpHeader.Format != kSonyFormat400K    &&
+               tmpHeader.Format != kSonyFormat800K    &&
+               tmpHeader.Format != kSonyFormat720K    &&
+               tmpHeader.Format != kSonyFormat1440K   &&
+               tmpHeader.Format != kSonyFormat1680K   &&
+               tmpHeader.Format != kSigmaFormatTwiggy &&
                tmpHeader.Format != kNotStandardFormat)
             {
                 AaruConsole.DebugWriteLine("DC42 plugin", "Unknown tmp_header.format = 0x{0:X2} value",
-                                          tmpHeader.Format);
+                                           tmpHeader.Format);
 
                 return false;
             }
 
-            if(tmpHeader.FmtByte != kSonyFmtByte400K          && tmpHeader.FmtByte != kSonyFmtByte800K    &&
-               tmpHeader.FmtByte != kSonyFmtByte800KIncorrect && tmpHeader.FmtByte != kSonyFmtByteProDos  &&
-               tmpHeader.FmtByte != kInvalidFmtByte           && tmpHeader.FmtByte != kSigmaFmtByteTwiggy &&
-               tmpHeader.FmtByte != kFmtNotStandard           && tmpHeader.FmtByte != kMacOSXFmtByte)
+            if(tmpHeader.FmtByte != kSonyFmtByte400K          &&
+               tmpHeader.FmtByte != kSonyFmtByte800K          &&
+               tmpHeader.FmtByte != kSonyFmtByte800KIncorrect &&
+               tmpHeader.FmtByte != kSonyFmtByteProDos        &&
+               tmpHeader.FmtByte != kInvalidFmtByte           &&
+               tmpHeader.FmtByte != kSigmaFmtByteTwiggy       &&
+               tmpHeader.FmtByte != kFmtNotStandard           &&
+               tmpHeader.FmtByte != kMacOSXFmtByte)
             {
                 AaruConsole.DebugWriteLine("DC42 plugin", "Unknown tmp_header.fmtByte = 0x{0:X2} value",
-                                          tmpHeader.FmtByte);
+                                           tmpHeader.FmtByte);
 
                 return false;
             }
 
-            if(tmpHeader.FmtByte != kInvalidFmtByte) return true;
+            if(tmpHeader.FmtByte != kInvalidFmtByte)
+                return true;
 
             AaruConsole.DebugWriteLine("DC42 plugin", "Image says it's unformatted");
 
diff --git a/Aaru.Images/DiskCopy42/Properties.cs b/Aaru.Images/DiskCopy42/Properties.cs
index 324f50320..89e4e1ead 100644
--- a/Aaru.Images/DiskCopy42/Properties.cs
+++ b/Aaru.Images/DiskCopy42/Properties.cs
@@ -41,26 +41,33 @@ namespace Aaru.DiscImages
 {
     public partial class DiskCopy42
     {
-        public ImageInfo                  Info                => imageInfo;
-        public string                     Name                => "Apple DiskCopy 4.2";
-        public Guid                       Id                  => new Guid("0240B7B1-E959-4CDC-B0BD-386D6E467B88");
-        public string                     Author              => "Natalia Portillo";
-        public List<DumpHardwareType>     DumpHardware        => null;
-        public CICMMetadataType           CicmMetadata        => null;
-        public string                     Format              => "Apple DiskCopy 4.2";
-        public IEnumerable<MediaTagType>  SupportedMediaTags  => new MediaTagType[] { };
-        public IEnumerable<SectorTagType> SupportedSectorTags => new[] {SectorTagType.AppleSectorTag};
-        public IEnumerable<MediaType> SupportedMediaTypes =>
-            new[]
-            {
-                MediaType.AppleFileWare, MediaType.AppleHD20, MediaType.AppleProfile, MediaType.AppleSonyDS,
-                MediaType.AppleSonySS, MediaType.AppleWidget, MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_HD,
-                MediaType.DMF
-            };
-        public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
-            new[] {("macosx", typeof(bool), "Use Mac OS X format byte", (object)false)};
-        public IEnumerable<string> KnownExtensions => new[] {".dc42", ".diskcopy42", ".image"};
-        public bool                IsWriting       { get; private set; }
-        public string              ErrorMessage    { get; private set; }
+        public ImageInfo              Info         => imageInfo;
+        public string                 Name         => "Apple DiskCopy 4.2";
+        public Guid                   Id           => new Guid("0240B7B1-E959-4CDC-B0BD-386D6E467B88");
+        public string                 Author       => "Natalia Portillo";
+        public List<DumpHardwareType> DumpHardware => null;
+        public CICMMetadataType       CicmMetadata => null;
+        public string                 Format       => "Apple DiskCopy 4.2";
+        public IEnumerable<MediaTagType> SupportedMediaTags => new MediaTagType[]
+            {};
+        public IEnumerable<SectorTagType> SupportedSectorTags => new[]
+        {
+            SectorTagType.AppleSectorTag
+        };
+        public IEnumerable<MediaType> SupportedMediaTypes => new[]
+        {
+            MediaType.AppleFileWare, MediaType.AppleHD20, MediaType.AppleProfile, MediaType.AppleSonyDS,
+            MediaType.AppleSonySS, MediaType.AppleWidget, MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_HD, MediaType.DMF
+        };
+        public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions => new[]
+        {
+            ("macosx", typeof(bool), "Use Mac OS X format byte", (object)false)
+        };
+        public IEnumerable<string> KnownExtensions => new[]
+        {
+            ".dc42", ".diskcopy42", ".image"
+        };
+        public bool   IsWriting    { get; private set; }
+        public string ErrorMessage { get; private set; }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/DiskCopy42/Read.cs b/Aaru.Images/DiskCopy42/Read.cs
index 286a049cd..3a95c62c9 100644
--- a/Aaru.Images/DiskCopy42/Read.cs
+++ b/Aaru.Images/DiskCopy42/Read.cs
@@ -33,13 +33,13 @@
 using System;
 using System.IO;
 using System.Text.RegularExpressions;
-using Claunia.Encoding;
-using Claunia.RsrcFork;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Exceptions;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
+using Claunia.Encoding;
+using Claunia.RsrcFork;
 using Version = Resources.Version;
 
 namespace Aaru.DiscImages
@@ -56,7 +56,8 @@ namespace Aaru.DiscImages
             IsWriting = false;
 
             // Incorrect pascal string length, not DC42
-            if(buffer[0] > 63) return false;
+            if(buffer[0] > 63)
+                return false;
 
             header = new Dc42Header();
 
@@ -71,17 +72,19 @@ namespace Aaru.DiscImages
             header.Valid        = buffer[0x52];
             header.Reserved     = buffer[0x53];
 
-            AaruConsole.DebugWriteLine("DC42 plugin", "header.diskName = \"{0}\"",      header.DiskName);
-            AaruConsole.DebugWriteLine("DC42 plugin", "header.dataSize = {0} bytes",    header.DataSize);
-            AaruConsole.DebugWriteLine("DC42 plugin", "header.tagSize = {0} bytes",     header.TagSize);
+            AaruConsole.DebugWriteLine("DC42 plugin", "header.diskName = \"{0}\"", header.DiskName);
+            AaruConsole.DebugWriteLine("DC42 plugin", "header.dataSize = {0} bytes", header.DataSize);
+            AaruConsole.DebugWriteLine("DC42 plugin", "header.tagSize = {0} bytes", header.TagSize);
             AaruConsole.DebugWriteLine("DC42 plugin", "header.dataChecksum = 0x{0:X8}", header.DataChecksum);
-            AaruConsole.DebugWriteLine("DC42 plugin", "header.tagChecksum = 0x{0:X8}",  header.TagChecksum);
-            AaruConsole.DebugWriteLine("DC42 plugin", "header.format = 0x{0:X2}",       header.Format);
-            AaruConsole.DebugWriteLine("DC42 plugin", "header.fmtByte = 0x{0:X2}",      header.FmtByte);
-            AaruConsole.DebugWriteLine("DC42 plugin", "header.valid = {0}",             header.Valid);
-            AaruConsole.DebugWriteLine("DC42 plugin", "header.reserved = {0}",          header.Reserved);
+            AaruConsole.DebugWriteLine("DC42 plugin", "header.tagChecksum = 0x{0:X8}", header.TagChecksum);
+            AaruConsole.DebugWriteLine("DC42 plugin", "header.format = 0x{0:X2}", header.Format);
+            AaruConsole.DebugWriteLine("DC42 plugin", "header.fmtByte = 0x{0:X2}", header.FmtByte);
+            AaruConsole.DebugWriteLine("DC42 plugin", "header.valid = {0}", header.Valid);
+            AaruConsole.DebugWriteLine("DC42 plugin", "header.reserved = {0}", header.Reserved);
 
-            if(header.Valid != 1 || header.Reserved != 0) return false;
+            if(header.Valid    != 1 ||
+               header.Reserved != 0)
+                return false;
 
             // Some versions seem to incorrectly create little endian fields
             if(header.DataSize + header.TagSize + 0x54 != imageFilter.GetDataForkLength() &&
@@ -93,12 +96,16 @@ namespace Aaru.DiscImages
                 header.TagChecksum  = BitConverter.ToUInt32(buffer, 0x4C);
 
                 if(header.DataSize + header.TagSize + 0x54 != imageFilter.GetDataForkLength() &&
-                   header.Format                           != kSigmaFormatTwiggy) return false;
+                   header.Format                           != kSigmaFormatTwiggy)
+                    return false;
             }
 
-            if(header.Format != kSonyFormat400K  && header.Format != kSonyFormat800K    &&
-               header.Format != kSonyFormat720K  && header.Format != kSonyFormat1440K   &&
-               header.Format != kSonyFormat1680K && header.Format != kSigmaFormatTwiggy &&
+            if(header.Format != kSonyFormat400K    &&
+               header.Format != kSonyFormat800K    &&
+               header.Format != kSonyFormat720K    &&
+               header.Format != kSonyFormat1440K   &&
+               header.Format != kSonyFormat1680K   &&
+               header.Format != kSigmaFormatTwiggy &&
                header.Format != kNotStandardFormat)
             {
                 AaruConsole.DebugWriteLine("DC42 plugin", "Unknown header.format = 0x{0:X2} value", header.Format);
@@ -106,12 +113,17 @@ namespace Aaru.DiscImages
                 return false;
             }
 
-            if(header.FmtByte != kSonyFmtByte400K          && header.FmtByte != kSonyFmtByte800K    &&
-               header.FmtByte != kSonyFmtByte800KIncorrect && header.FmtByte != kSonyFmtByteProDos  &&
-               header.FmtByte != kInvalidFmtByte           && header.FmtByte != kSigmaFmtByteTwiggy &&
-               header.FmtByte != kFmtNotStandard           && header.FmtByte != kMacOSXFmtByte)
+            if(header.FmtByte != kSonyFmtByte400K          &&
+               header.FmtByte != kSonyFmtByte800K          &&
+               header.FmtByte != kSonyFmtByte800KIncorrect &&
+               header.FmtByte != kSonyFmtByteProDos        &&
+               header.FmtByte != kInvalidFmtByte           &&
+               header.FmtByte != kSigmaFmtByteTwiggy       &&
+               header.FmtByte != kFmtNotStandard           &&
+               header.FmtByte != kMacOSXFmtByte)
             {
-                AaruConsole.DebugWriteLine("DC42 plugin", "Unknown tmp_header.fmtByte = 0x{0:X2} value", header.FmtByte);
+                AaruConsole.DebugWriteLine("DC42 plugin", "Unknown tmp_header.fmtByte = 0x{0:X2} value",
+                                           header.FmtByte);
 
                 return false;
             }
@@ -136,16 +148,19 @@ namespace Aaru.DiscImages
                 bptag = (uint)(header.TagSize / imageInfo.Sectors);
                 AaruConsole.DebugWriteLine("DC42 plugin", "bptag = {0} bytes", bptag);
 
-                if(bptag != 12 && bptag != 20 && bptag != 24)
+                if(bptag != 12 &&
+                   bptag != 20 &&
+                   bptag != 24)
                 {
                     AaruConsole.DebugWriteLine("DC42 plugin", "Unknown tag size");
+
                     return false;
                 }
 
                 imageInfo.ReadableSectorTags.Add(SectorTagType.AppleSectorTag);
             }
 
-            imageInfo.ImageSize            = imageInfo.Sectors * imageInfo.SectorSize + imageInfo.Sectors * bptag;
+            imageInfo.ImageSize            = (imageInfo.Sectors * imageInfo.SectorSize) + (imageInfo.Sectors * bptag);
             imageInfo.CreationTime         = imageFilter.GetCreationTime();
             imageInfo.LastModificationTime = imageFilter.GetLastWriteTime();
             imageInfo.MediaTitle           = header.DiskName;
@@ -154,45 +169,57 @@ namespace Aaru.DiscImages
             {
                 case kSonyFormat400K:
                     imageInfo.MediaType = imageInfo.Sectors == 1600 ? MediaType.AppleSonyDS : MediaType.AppleSonySS;
+
                     break;
                 case kSonyFormat800K:
                     imageInfo.MediaType = MediaType.AppleSonyDS;
+
                     break;
                 case kSonyFormat720K:
                     imageInfo.MediaType = MediaType.DOS_35_DS_DD_9;
+
                     break;
                 case kSonyFormat1440K:
                     imageInfo.MediaType = MediaType.DOS_35_HD;
+
                     break;
                 case kSonyFormat1680K:
                     imageInfo.MediaType = MediaType.DMF;
+
                     break;
                 case kSigmaFormatTwiggy:
                     imageInfo.MediaType = MediaType.AppleFileWare;
+
                     break;
                 case kNotStandardFormat:
                     switch(imageInfo.Sectors)
                     {
                         case 9728:
                             imageInfo.MediaType = MediaType.AppleProfile;
+
                             break;
                         case 19456:
                             imageInfo.MediaType = MediaType.AppleProfile;
+
                             break;
                         case 38912:
                             imageInfo.MediaType = MediaType.AppleWidget;
+
                             break;
                         case 39040:
                             imageInfo.MediaType = MediaType.AppleHD20;
+
                             break;
                         default:
                             imageInfo.MediaType = MediaType.Unknown;
+
                             break;
                     }
 
                     break;
                 default:
                     imageInfo.MediaType = MediaType.Unknown;
+
                     break;
             }
 
@@ -213,43 +240,69 @@ namespace Aaru.DiscImages
                 tagstream.Seek(tagOffset, SeekOrigin.Begin);
                 tagstream.Read(tags, 0, (int)header.TagSize);
 
-                ushort mfsMagic     = BigEndianBitConverter.ToUInt16(data, data.Length / 2 + 0x400);
-                ushort mfsAllBlocks = BigEndianBitConverter.ToUInt16(data, data.Length / 2 + 0x412);
+                ushort mfsMagic     = BigEndianBitConverter.ToUInt16(data, (data.Length / 2) + 0x400);
+                ushort mfsAllBlocks = BigEndianBitConverter.ToUInt16(data, (data.Length / 2) + 0x412);
 
                 // Detect a Macintosh Twiggy
-                if(mfsMagic == 0xD2D7 && mfsAllBlocks == 422)
+                if(mfsMagic     == 0xD2D7 &&
+                   mfsAllBlocks == 422)
                 {
                     AaruConsole.DebugWriteLine("DC42 plugin", "Macintosh Twiggy detected, reversing disk sides");
-                    Array.Copy(data, header.DataSize / 2, twiggyCache,     0, header.DataSize / 2);
-                    Array.Copy(tags, header.TagSize  / 2, twiggyCacheTags, 0, header.TagSize  / 2);
-                    Array.Copy(data, 0,                   twiggyCache,     header.DataSize    / 2, header.DataSize / 2);
-                    Array.Copy(tags, 0,                   twiggyCacheTags, header.TagSize     / 2, header.TagSize  / 2);
+                    Array.Copy(data, header.DataSize                    / 2, twiggyCache, 0, header.DataSize    / 2);
+                    Array.Copy(tags, header.TagSize                     / 2, twiggyCacheTags, 0, header.TagSize / 2);
+                    Array.Copy(data, 0, twiggyCache, header.DataSize    / 2, header.DataSize                    / 2);
+                    Array.Copy(tags, 0, twiggyCacheTags, header.TagSize / 2, header.TagSize                     / 2);
                 }
                 else
                 {
                     AaruConsole.DebugWriteLine("DC42 plugin", "Lisa Twiggy detected, reversing second half of disk");
-                    Array.Copy(data, 0, twiggyCache,     0, header.DataSize / 2);
-                    Array.Copy(tags, 0, twiggyCacheTags, 0, header.TagSize  / 2);
+                    Array.Copy(data, 0, twiggyCache, 0, header.DataSize    / 2);
+                    Array.Copy(tags, 0, twiggyCacheTags, 0, header.TagSize / 2);
 
                     int copiedSectors = 0;
                     int sectorsToCopy = 0;
 
                     for(int i = 0; i < 46; i++)
                     {
-                        if(i >= 0  && i <= 3) sectorsToCopy  = 22;
-                        if(i >= 4  && i <= 10) sectorsToCopy = 21;
-                        if(i >= 11 && i <= 16) sectorsToCopy = 20;
-                        if(i >= 17 && i <= 22) sectorsToCopy = 19;
-                        if(i >= 23 && i <= 28) sectorsToCopy = 18;
-                        if(i >= 29 && i <= 34) sectorsToCopy = 17;
-                        if(i >= 35 && i <= 41) sectorsToCopy = 16;
-                        if(i >= 42 && i <= 45) sectorsToCopy = 15;
+                        if(i >= 0 &&
+                           i <= 3)
+                            sectorsToCopy = 22;
 
-                        Array.Copy(data, header.DataSize / 2                + copiedSectors * 512, twiggyCache,
-                                   twiggyCache.Length - copiedSectors * 512 - sectorsToCopy * 512, sectorsToCopy * 512);
-                        Array.Copy(tags, header.TagSize / 2 + copiedSectors * bptag,
+                        if(i >= 4 &&
+                           i <= 10)
+                            sectorsToCopy = 21;
+
+                        if(i >= 11 &&
+                           i <= 16)
+                            sectorsToCopy = 20;
+
+                        if(i >= 17 &&
+                           i <= 22)
+                            sectorsToCopy = 19;
+
+                        if(i >= 23 &&
+                           i <= 28)
+                            sectorsToCopy = 18;
+
+                        if(i >= 29 &&
+                           i <= 34)
+                            sectorsToCopy = 17;
+
+                        if(i >= 35 &&
+                           i <= 41)
+                            sectorsToCopy = 16;
+
+                        if(i >= 42 &&
+                           i <= 45)
+                            sectorsToCopy = 15;
+
+                        Array.Copy(data, (header.DataSize / 2)                + (copiedSectors * 512), twiggyCache,
+                                   twiggyCache.Length - (copiedSectors * 512) - (sectorsToCopy * 512),
+                                   sectorsToCopy * 512);
+
+                        Array.Copy(tags, (header.TagSize / 2) + (copiedSectors * bptag),
                                    twiggyCacheTags,
-                                   twiggyCacheTags.Length - copiedSectors * bptag - sectorsToCopy * bptag,
+                                   twiggyCacheTags.Length - (copiedSectors * bptag) - (sectorsToCopy * bptag),
                                    sectorsToCopy * bptag);
 
                         copiedSectors += sectorsToCopy;
@@ -261,7 +314,8 @@ namespace Aaru.DiscImages
             {
                 if(imageFilter.HasResourceFork())
                 {
-                    ResourceFork rsrcFork = new ResourceFork(imageFilter.GetResourceForkStream());
+                    var rsrcFork = new ResourceFork(imageFilter.GetResourceForkStream());
+
                     if(rsrcFork.ContainsKey(0x76657273))
                     {
                         Resource versRsrc = rsrcFork.GetResource(0x76657273);
@@ -270,31 +324,40 @@ namespace Aaru.DiscImages
 
                         if(vers != null)
                         {
-                            Version version = new Version(vers);
+                            var version = new Version(vers);
 
                             string release = null;
                             string dev     = null;
                             string pre     = null;
 
-                            string major                              = $"{version.MajorVersion}";
-                            string minor                              = $".{version.MinorVersion / 10}";
-                            if(version.MinorVersion % 10 > 0) release = $".{version.MinorVersion % 10}";
+                            string major = $"{version.MajorVersion}";
+                            string minor = $".{version.MinorVersion / 10}";
+
+                            if(version.MinorVersion % 10 > 0)
+                                release = $".{version.MinorVersion % 10}";
+
                             switch(version.DevStage)
                             {
                                 case Version.DevelopmentStage.Alpha:
                                     dev = "a";
+
                                     break;
                                 case Version.DevelopmentStage.Beta:
                                     dev = "b";
+
                                     break;
                                 case Version.DevelopmentStage.PreAlpha:
                                     dev = "d";
+
                                     break;
                             }
 
-                            if(dev == null && version.PreReleaseVersion > 0) dev = "f";
+                            if(dev                       == null &&
+                               version.PreReleaseVersion > 0)
+                                dev = "f";
 
-                            if(dev != null) pre = $"{version.PreReleaseVersion}";
+                            if(dev != null)
+                                pre = $"{version.PreReleaseVersion}";
 
                             imageInfo.ApplicationVersion = $"{major}{minor}{release}{dev}{pre}";
                             imageInfo.Application        = version.VersionString;
@@ -305,11 +368,13 @@ namespace Aaru.DiscImages
                     if(rsrcFork.ContainsKey(0x64437079))
                     {
                         Resource dCpyRsrc = rsrcFork.GetResource(0x64437079);
+
                         if(dCpyRsrc != null)
                         {
                             string dCpy = StringHandlers.PascalToString(dCpyRsrc.GetResource(dCpyRsrc.GetIds()[0]),
                                                                         Encoding.GetEncoding("macintosh"));
-                            Regex dCpyEx    = new Regex(REGEX_DCPY);
+
+                            var   dCpyEx    = new Regex(REGEX_DCPY);
                             Match dCpyMatch = dCpyEx.Match(dCpy);
 
                             if(dCpyMatch.Success)
@@ -321,10 +386,10 @@ namespace Aaru.DiscImages
                     }
                 }
             }
-            catch(InvalidCastException) { }
+            catch(InvalidCastException) {}
 
             AaruConsole.DebugWriteLine("DC42 plugin", "Image application = {0} version {1}", imageInfo.Application,
-                                      imageInfo.ApplicationVersion);
+                                       imageInfo.ApplicationVersion);
 
             imageInfo.XmlMediaType = XmlMediaType.BlockMedia;
             AaruConsole.VerboseWriteLine("DiskCopy 4.2 image contains a disk of type {0}", imageInfo.MediaType);
@@ -335,55 +400,66 @@ namespace Aaru.DiscImages
                     imageInfo.Cylinders       = 80;
                     imageInfo.Heads           = 1;
                     imageInfo.SectorsPerTrack = 10;
+
                     break;
                 case MediaType.AppleSonyDS:
                     imageInfo.Cylinders       = 80;
                     imageInfo.Heads           = 2;
                     imageInfo.SectorsPerTrack = 10;
+
                     break;
                 case MediaType.DOS_35_DS_DD_9:
                     imageInfo.Cylinders       = 80;
                     imageInfo.Heads           = 2;
                     imageInfo.SectorsPerTrack = 9;
+
                     break;
                 case MediaType.DOS_35_HD:
                     imageInfo.Cylinders       = 80;
                     imageInfo.Heads           = 2;
                     imageInfo.SectorsPerTrack = 18;
+
                     break;
                 case MediaType.DMF:
                     imageInfo.Cylinders       = 80;
                     imageInfo.Heads           = 2;
                     imageInfo.SectorsPerTrack = 21;
+
                     break;
                 case MediaType.AppleProfile:
                     switch(imageInfo.Sectors)
                     {
                         case 9728:
                             imageInfo.Cylinders = 152;
+
                             break;
                         case 19456:
                             imageInfo.Cylinders = 304;
+
                             break;
                     }
 
                     imageInfo.Heads           = 4;
                     imageInfo.SectorsPerTrack = 16;
+
                     break;
                 case MediaType.AppleWidget:
                     imageInfo.Cylinders       = 608;
                     imageInfo.Heads           = 2;
                     imageInfo.SectorsPerTrack = 16;
+
                     break;
                 case MediaType.AppleHD20:
                     imageInfo.Cylinders       = 610;
                     imageInfo.Heads           = 2;
                     imageInfo.SectorsPerTrack = 16;
+
                     break;
                 default:
                     imageInfo.Cylinders       = (uint)(imageInfo.Sectors / 16 / 63);
                     imageInfo.Heads           = 16;
                     imageInfo.SectorsPerTrack = 63;
+
                     break;
             }
 
@@ -410,7 +486,7 @@ namespace Aaru.DiscImages
             else
             {
                 Stream stream = dc42ImageFilter.GetDataForkStream();
-                stream.Seek((long)(dataOffset + sectorAddress * imageInfo.SectorSize), SeekOrigin.Begin);
+                stream.Seek((long)(dataOffset + (sectorAddress * imageInfo.SectorSize)), SeekOrigin.Begin);
                 stream.Read(buffer, 0, (int)(length * imageInfo.SectorSize));
             }
 
@@ -422,7 +498,8 @@ namespace Aaru.DiscImages
             if(tag != SectorTagType.AppleSectorTag)
                 throw new FeatureUnsupportedImageException($"Tag {tag} not supported by image format");
 
-            if(header.TagSize == 0) throw new FeatureNotPresentImageException("Disk image does not have tags");
+            if(header.TagSize == 0)
+                throw new FeatureNotPresentImageException("Disk image does not have tags");
 
             if(sectorAddress > imageInfo.Sectors - 1)
                 throw new ArgumentOutOfRangeException(nameof(sectorAddress), "Sector address not found");
@@ -432,11 +509,12 @@ namespace Aaru.DiscImages
 
             byte[] buffer = new byte[length * bptag];
 
-            if(twiggy) Array.Copy(twiggyCacheTags, (int)sectorAddress * bptag, buffer, 0, length * bptag);
+            if(twiggy)
+                Array.Copy(twiggyCacheTags, (int)sectorAddress * bptag, buffer, 0, length * bptag);
             else
             {
                 Stream stream = dc42ImageFilter.GetDataForkStream();
-                stream.Seek((long)(tagOffset + sectorAddress * bptag), SeekOrigin.Begin);
+                stream.Seek((long)(tagOffset + (sectorAddress * bptag)), SeekOrigin.Begin);
                 stream.Read(buffer, 0, (int)(length * bptag));
             }
 
@@ -461,7 +539,8 @@ namespace Aaru.DiscImages
             {
                 Array.Copy(data, i * imageInfo.SectorSize, buffer, i * (imageInfo.SectorSize + bptag),
                            imageInfo.SectorSize);
-                Array.Copy(tags, i * bptag, buffer, i * (imageInfo.SectorSize + bptag) + imageInfo.SectorSize, bptag);
+
+                Array.Copy(tags, i * bptag, buffer, (i * (imageInfo.SectorSize + bptag)) + imageInfo.SectorSize, bptag);
             }
 
             return buffer;
diff --git a/Aaru.Images/DiskCopy42/Verify.cs b/Aaru.Images/DiskCopy42/Verify.cs
index 42fef381e..59759e010 100644
--- a/Aaru.Images/DiskCopy42/Verify.cs
+++ b/Aaru.Images/DiskCopy42/Verify.cs
@@ -51,9 +51,10 @@ namespace Aaru.DiscImages
             AaruConsole.DebugWriteLine("DC42 plugin", "Calculating data checksum");
             uint dataChk = DC42CheckSum(data);
             AaruConsole.DebugWriteLine("DC42 plugin", "Calculated data checksum = 0x{0:X8}", dataChk);
-            AaruConsole.DebugWriteLine("DC42 plugin", "Stored data checksum = 0x{0:X8}",     header.DataChecksum);
+            AaruConsole.DebugWriteLine("DC42 plugin", "Stored data checksum = 0x{0:X8}", header.DataChecksum);
 
-            if(header.TagSize <= 0) return dataChk == header.DataChecksum && tagsChk == header.TagChecksum;
+            if(header.TagSize <= 0)
+                return dataChk == header.DataChecksum && tagsChk == header.TagChecksum;
 
             AaruConsole.DebugWriteLine("DC42 plugin", "Reading tags");
             Stream tagstream = dc42ImageFilter.GetDataForkStream();
@@ -63,7 +64,7 @@ namespace Aaru.DiscImages
             AaruConsole.DebugWriteLine("DC42 plugin", "Calculating tag checksum");
             tagsChk = DC42CheckSum(tags);
             AaruConsole.DebugWriteLine("DC42 plugin", "Calculated tag checksum = 0x{0:X8}", tagsChk);
-            AaruConsole.DebugWriteLine("DC42 plugin", "Stored tag checksum = 0x{0:X8}",     header.TagChecksum);
+            AaruConsole.DebugWriteLine("DC42 plugin", "Stored tag checksum = 0x{0:X8}", header.TagChecksum);
 
             return dataChk == header.DataChecksum && tagsChk == header.TagChecksum;
         }
diff --git a/Aaru.Images/DiskCopy42/Write.cs b/Aaru.Images/DiskCopy42/Write.cs
index c24e37c65..7009e2e6c 100644
--- a/Aaru.Images/DiskCopy42/Write.cs
+++ b/Aaru.Images/DiskCopy42/Write.cs
@@ -32,10 +32,10 @@
 
 using System.Collections.Generic;
 using System.IO;
-using Claunia.Encoding;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Structs;
+using Claunia.Encoding;
 using Schemas;
 
 namespace Aaru.DiscImages
@@ -43,18 +43,20 @@ namespace Aaru.DiscImages
     public partial class DiskCopy42
     {
         public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
-                           uint   sectorSize)
+                           uint sectorSize)
         {
             header = new Dc42Header();
             bool tags   = false;
             bool macosx = false;
 
-            if(options != null && options.TryGetValue("macosx", out string tmpOption))
+            if(options != null &&
+               options.TryGetValue("macosx", out string tmpOption))
                 bool.TryParse(tmpOption, out macosx);
 
             if(sectorSize != 512)
             {
                 ErrorMessage = "Unsupported sector size";
+
                 return false;
             }
 
@@ -64,96 +66,116 @@ namespace Aaru.DiscImages
                     header.FmtByte = kSigmaFmtByteTwiggy;
                     header.Format  = kSigmaFormatTwiggy;
                     twiggy         = true;
+
                     // TODO
                     ErrorMessage = "Twiggy write support not yet implemented";
+
                     return false;
                 case MediaType.AppleHD20:
                     if(sectors != 39040)
                     {
                         ErrorMessage = "Incorrect number of sectors for Apple HD20 image";
+
                         return false;
                     }
 
                     header.FmtByte = kFmtNotStandard;
                     header.Format  = kNotStandardFormat;
                     tags           = true;
+
                     break;
                 case MediaType.AppleProfile:
-                    if(sectors != 9728 && sectors != 19456)
+                    if(sectors != 9728 &&
+                       sectors != 19456)
                     {
                         ErrorMessage = "Incorrect number of sectors for Apple Profile image";
+
                         return false;
                     }
 
                     header.FmtByte = kFmtNotStandard;
                     header.Format  = kNotStandardFormat;
                     tags           = true;
+
                     break;
                 case MediaType.AppleSonyDS:
                     if(sectors != 1600)
                     {
                         ErrorMessage = "Incorrect number of sectors for Apple MF2DD image";
+
                         return false;
                     }
 
                     header.FmtByte = macosx ? kMacOSXFmtByte : kSonyFmtByte800K;
                     header.Format  = kSonyFormat800K;
                     tags           = true;
+
                     break;
                 case MediaType.AppleSonySS:
                     if(sectors != 800)
                     {
                         ErrorMessage = "Incorrect number of sectors for Apple MF1DD image";
+
                         return false;
                     }
 
                     header.FmtByte = macosx ? kMacOSXFmtByte : kSonyFmtByte400K;
                     header.Format  = kSonyFormat400K;
                     tags           = true;
+
                     break;
                 case MediaType.AppleWidget:
                     if(sectors != 39040)
                     {
                         ErrorMessage = "Incorrect number of sectors for Apple Widget image";
+
                         return false;
                     }
 
                     header.FmtByte = kFmtNotStandard;
                     header.Format  = kNotStandardFormat;
                     tags           = true;
+
                     break;
                 case MediaType.DOS_35_DS_DD_9:
                     if(sectors != 1440)
                     {
                         ErrorMessage = "Incorrect number of sectors for MF2DD image";
+
                         return false;
                     }
 
                     header.FmtByte = macosx ? kMacOSXFmtByte : kSonyFmtByte720K;
                     header.Format  = kSonyFormat720K;
+
                     break;
                 case MediaType.DOS_35_HD:
                     if(sectors != 2880)
                     {
                         ErrorMessage = "Incorrect number of sectors for MF2HD image";
+
                         return false;
                     }
 
                     header.Format  = kSonyFmtByte1440K;
                     header.FmtByte = macosx ? kMacOSXFmtByte : kSonyFmtByte1440K;
+
                     break;
                 case MediaType.DMF:
                     if(sectors != 3360)
                     {
                         ErrorMessage = "Incorrect number of sectors for DMF image";
+
                         return false;
                     }
 
                     header.FmtByte = macosx ? kMacOSXFmtByte : kSonyFmtByte1680K;
                     header.Format  = kSonyFormat1680K;
+
                     break;
                 default:
                     ErrorMessage = $"Unsupport media format {mediaType}";
+
                     return false;
             }
 
@@ -162,25 +184,36 @@ namespace Aaru.DiscImages
             header.DiskName = "-Aaru converted image-";
             header.Valid    = 1;
             header.DataSize = (uint)(sectors * 512);
-            if(tags) header.TagSize = (uint)(sectors * 12);
 
-            imageInfo = new ImageInfo {MediaType = mediaType, SectorSize = sectorSize, Sectors = sectors};
+            if(tags)
+                header.TagSize = (uint)(sectors * 12);
 
-            try { writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None); }
+            imageInfo = new ImageInfo
+            {
+                MediaType = mediaType, SectorSize = sectorSize, Sectors = sectors
+            };
+
+            try
+            {
+                writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
+            }
             catch(IOException e)
             {
                 ErrorMessage = $"Could not create new image file, exception {e.Message}";
+
                 return false;
             }
 
             IsWriting    = true;
             ErrorMessage = null;
+
             return true;
         }
 
         public bool WriteMediaTag(byte[] data, MediaTagType tag)
         {
             ErrorMessage = "Unsupported feature";
+
             return false;
         }
 
@@ -189,25 +222,29 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Tried to write on a non-writable image";
+
                 return false;
             }
 
             if(data.Length != 512)
             {
                 ErrorMessage = "Incorrect data size";
+
                 return false;
             }
 
             if(sectorAddress >= imageInfo.Sectors)
             {
                 ErrorMessage = "Tried to write past image size";
+
                 return false;
             }
 
-            writingStream.Seek((long)(dataOffset + sectorAddress * 512), SeekOrigin.Begin);
+            writingStream.Seek((long)(dataOffset + (sectorAddress * 512)), SeekOrigin.Begin);
             writingStream.Write(data, 0, data.Length);
 
             ErrorMessage = "";
+
             return true;
         }
 
@@ -216,25 +253,29 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Tried to write on a non-writable image";
+
                 return false;
             }
 
             if(data.Length % 512 != 0)
             {
                 ErrorMessage = "Incorrect data size";
+
                 return false;
             }
 
             if(sectorAddress + length > imageInfo.Sectors)
             {
                 ErrorMessage = "Tried to write past image size";
+
                 return false;
             }
 
-            writingStream.Seek((long)(dataOffset + sectorAddress * 512), SeekOrigin.Begin);
+            writingStream.Seek((long)(dataOffset + (sectorAddress * 512)), SeekOrigin.Begin);
             writingStream.Write(data, 0, data.Length);
 
             ErrorMessage = "";
+
             return true;
         }
 
@@ -243,33 +284,38 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Tried to write on a non-writable image";
+
                 return false;
             }
 
             if(header.TagSize == 0)
             {
                 ErrorMessage = "Image does not support tags";
+
                 return false;
             }
 
             if(data.Length != 524)
             {
                 ErrorMessage = "Incorrect data size";
+
                 return false;
             }
 
             if(sectorAddress >= imageInfo.Sectors)
             {
                 ErrorMessage = "Tried to write past image size";
+
                 return false;
             }
 
-            writingStream.Seek((long)(dataOffset + sectorAddress * 512), SeekOrigin.Begin);
+            writingStream.Seek((long)(dataOffset + (sectorAddress * 512)), SeekOrigin.Begin);
             writingStream.Write(data, 0, 512);
-            writingStream.Seek((long)(tagOffset + sectorAddress * 12), SeekOrigin.Begin);
+            writingStream.Seek((long)(tagOffset + (sectorAddress * 12)), SeekOrigin.Begin);
             writingStream.Write(data, 512, 12);
 
             ErrorMessage = "";
+
             return true;
         }
 
@@ -278,38 +324,43 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Tried to write on a non-writable image";
+
                 return false;
             }
 
             if(header.TagSize == 0)
             {
                 ErrorMessage = "Image does not support tags";
+
                 return false;
             }
 
             if(data.Length % 524 != 0)
             {
                 ErrorMessage = "Incorrect data size";
+
                 return false;
             }
 
             if(sectorAddress + length > imageInfo.Sectors)
             {
                 ErrorMessage = "Tried to write past image size";
+
                 return false;
             }
 
             for(uint i = 0; i < length; i++)
             {
-                writingStream.Seek((long)(dataOffset + (sectorAddress + i) * 512), SeekOrigin.Begin);
-                writingStream.Write(data, (int)(i                          * 524 + 0), 512);
-                writingStream.Seek((long)(tagOffset + (sectorAddress + i) * 12),
-                                   SeekOrigin.Begin);
-                writingStream.Write(data, (int)(i * 524 + 512),
-                                    12);
+                writingStream.Seek((long)(dataOffset + ((sectorAddress + i) * 512)), SeekOrigin.Begin);
+                writingStream.Write(data, (int)((i                          * 524) + 0), 512);
+
+                writingStream.Seek((long)(tagOffset + ((sectorAddress + i) * 12)), SeekOrigin.Begin);
+
+                writingStream.Write(data, (int)((i * 524) + 512), 12);
             }
 
             ErrorMessage = "";
+
             return true;
         }
 
@@ -318,11 +369,13 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Image is not opened for writing";
+
                 return false;
             }
 
             // No tags where written
-            if(writingStream.Length == 0x54 + header.DataSize) header.TagSize = 0;
+            if(writingStream.Length == 0x54 + header.DataSize)
+                header.TagSize = 0;
 
             writingStream.Seek(0x54, SeekOrigin.Begin);
             byte[] data = new byte[header.DataSize];
@@ -334,16 +387,19 @@ namespace Aaru.DiscImages
             header.TagChecksum = DC42CheckSum(data);
 
             writingStream.Seek(0, SeekOrigin.Begin);
-            if(header.DiskName.Length > 63) header.DiskName = header.DiskName.Substring(0, 63);
+
+            if(header.DiskName.Length > 63)
+                header.DiskName = header.DiskName.Substring(0, 63);
+
             writingStream.WriteByte((byte)header.DiskName.Length);
             Encoding macRoman = new MacRoman();
             writingStream.Write(macRoman.GetBytes(header.DiskName), 0, header.DiskName.Length);
 
             writingStream.Seek(64, SeekOrigin.Begin);
-            writingStream.Write(BigEndianBitConverter.GetBytes(header.DataSize),     0, 4);
-            writingStream.Write(BigEndianBitConverter.GetBytes(header.TagSize),      0, 4);
+            writingStream.Write(BigEndianBitConverter.GetBytes(header.DataSize), 0, 4);
+            writingStream.Write(BigEndianBitConverter.GetBytes(header.TagSize), 0, 4);
             writingStream.Write(BigEndianBitConverter.GetBytes(header.DataChecksum), 0, 4);
-            writingStream.Write(BigEndianBitConverter.GetBytes(header.TagChecksum),  0, 4);
+            writingStream.Write(BigEndianBitConverter.GetBytes(header.TagChecksum), 0, 4);
             writingStream.WriteByte(header.Format);
             writingStream.WriteByte(header.FmtByte);
             writingStream.WriteByte(1);
@@ -354,6 +410,7 @@ namespace Aaru.DiscImages
 
             IsWriting    = false;
             ErrorMessage = "";
+
             return true;
         }
 
@@ -369,12 +426,14 @@ namespace Aaru.DiscImages
         public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
         {
             ErrorMessage = "Unsupported feature";
+
             return false;
         }
 
         public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
         {
             ErrorMessage = "Unsupported feature";
+
             return false;
         }
 
diff --git a/Aaru.Images/DriDiskCopy/DriDiskCopy.cs b/Aaru.Images/DriDiskCopy/DriDiskCopy.cs
index eca921f87..dbc0f03cc 100644
--- a/Aaru.Images/DriDiskCopy/DriDiskCopy.cs
+++ b/Aaru.Images/DriDiskCopy/DriDiskCopy.cs
@@ -48,29 +48,17 @@ namespace Aaru.DiscImages
         ImageInfo  imageInfo;
         FileStream writingStream;
 
-        public DriDiskCopy()
+        public DriDiskCopy() => imageInfo = new ImageInfo
         {
-            imageInfo = new ImageInfo
-            {
-                ReadableSectorTags    = new List<SectorTagType>(),
-                ReadableMediaTags     = new List<MediaTagType>(),
-                HasPartitions         = false,
-                HasSessions           = false,
-                Application           = "DiskCopy",
-                Creator               = null,
-                Comments              = null,
-                MediaManufacturer     = null,
-                MediaModel            = null,
-                MediaSerialNumber     = null,
-                MediaBarcode          = null,
-                MediaPartNumber       = null,
-                MediaSequence         = 0,
-                LastMediaSequence     = 0,
-                DriveManufacturer     = null,
-                DriveModel            = null,
-                DriveSerialNumber     = null,
-                DriveFirmwareRevision = null
-            };
-        }
+            ReadableSectorTags    = new List<SectorTagType>(), ReadableMediaTags = new List<MediaTagType>(),
+            HasPartitions         = false, HasSessions                           = false, Application = "DiskCopy",
+            Creator               = null,
+            Comments              = null, MediaManufacturer = null, MediaModel = null,
+            MediaSerialNumber     = null,
+            MediaBarcode          = null, MediaPartNumber = null, MediaSequence = 0,
+            LastMediaSequence     = 0,
+            DriveManufacturer     = null, DriveModel = null, DriveSerialNumber = null,
+            DriveFirmwareRevision = null
+        };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/DriDiskCopy/Enums.cs b/Aaru.Images/DriDiskCopy/Enums.cs
index 4f5894c4f..f0e10879f 100644
--- a/Aaru.Images/DriDiskCopy/Enums.cs
+++ b/Aaru.Images/DriDiskCopy/Enums.cs
@@ -36,9 +36,7 @@ namespace Aaru.DiscImages
 {
     public partial class DriDiskCopy
     {
-        /// <summary>
-        ///     Drive codes change according to CMOS stored valued
-        /// </summary>
+        /// <summary>Drive codes change according to CMOS stored valued</summary>
         [SuppressMessage("ReSharper", "InconsistentNaming")]
         enum DriDriveCodes : byte
         {
diff --git a/Aaru.Images/DriDiskCopy/Identify.cs b/Aaru.Images/DriDiskCopy/Identify.cs
index 87483fae6..236c94a88 100644
--- a/Aaru.Images/DriDiskCopy/Identify.cs
+++ b/Aaru.Images/DriDiskCopy/Identify.cs
@@ -44,7 +44,8 @@ namespace Aaru.DiscImages
         {
             Stream stream = imageFilter.GetDataForkStream();
 
-            if((stream.Length - Marshal.SizeOf<DriFooter>()) % 512 != 0) return false;
+            if((stream.Length - Marshal.SizeOf<DriFooter>()) % 512 != 0)
+                return false;
 
             byte[] buffer = new byte[Marshal.SizeOf<DriFooter>()];
             stream.Seek(-buffer.Length, SeekOrigin.End);
@@ -55,41 +56,51 @@ namespace Aaru.DiscImages
             string sig = StringHandlers.CToString(tmpFooter.signature);
 
             AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "tmp_footer.signature = \"{0}\"", sig);
-            AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "tmp_footer.bpb.five = {0}",      tmpFooter.bpb.five);
-            AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "tmp_footer.bpb.driveCode = {0}", tmpFooter.bpb.driveCode);
-            AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "tmp_footer.bpb.unknown = {0}",   tmpFooter.bpb.unknown);
-            AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "tmp_footer.bpb.cylinders = {0}", tmpFooter.bpb.cylinders);
-            AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "tmp_footer.bpb.unknown2 = {0}",  tmpFooter.bpb.unknown2);
-            AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "tmp_footer.bpb.bps = {0}",       tmpFooter.bpb.bps);
-            AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "tmp_footer.bpb.spc = {0}",       tmpFooter.bpb.spc);
-            AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "tmp_footer.bpb.rsectors = {0}",  tmpFooter.bpb.rsectors);
-            AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "tmp_footer.bpb.fats_no = {0}",   tmpFooter.bpb.fats_no);
-            AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "tmp_footer.bpb.sectors = {0}",   tmpFooter.bpb.sectors);
+            AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "tmp_footer.bpb.five = {0}", tmpFooter.bpb.five);
+
+            AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "tmp_footer.bpb.driveCode = {0}",
+                                       tmpFooter.bpb.driveCode);
+
+            AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "tmp_footer.bpb.unknown = {0}", tmpFooter.bpb.unknown);
+
+            AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "tmp_footer.bpb.cylinders = {0}",
+                                       tmpFooter.bpb.cylinders);
+
+            AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "tmp_footer.bpb.unknown2 = {0}", tmpFooter.bpb.unknown2);
+            AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "tmp_footer.bpb.bps = {0}", tmpFooter.bpb.bps);
+            AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "tmp_footer.bpb.spc = {0}", tmpFooter.bpb.spc);
+            AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "tmp_footer.bpb.rsectors = {0}", tmpFooter.bpb.rsectors);
+            AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "tmp_footer.bpb.fats_no = {0}", tmpFooter.bpb.fats_no);
+            AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "tmp_footer.bpb.sectors = {0}", tmpFooter.bpb.sectors);
+
             AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "tmp_footer.bpb.media_descriptor = {0}",
-                                      tmpFooter.bpb.media_descriptor);
-            AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "tmp_footer.bpb.spfat = {0}",    tmpFooter.bpb.spfat);
-            AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "tmp_footer.bpb.sptrack = {0}",  tmpFooter.bpb.sptrack);
-            AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "tmp_footer.bpb.heads = {0}",    tmpFooter.bpb.heads);
+                                       tmpFooter.bpb.media_descriptor);
+
+            AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "tmp_footer.bpb.spfat = {0}", tmpFooter.bpb.spfat);
+            AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "tmp_footer.bpb.sptrack = {0}", tmpFooter.bpb.sptrack);
+            AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "tmp_footer.bpb.heads = {0}", tmpFooter.bpb.heads);
             AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "tmp_footer.bpb.hsectors = {0}", tmpFooter.bpb.hsectors);
             AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "tmp_footer.bpb.drive_no = {0}", tmpFooter.bpb.drive_no);
             AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "tmp_footer.bpb.unknown3 = {0}", tmpFooter.bpb.unknown3);
             AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "tmp_footer.bpb.unknown4 = {0}", tmpFooter.bpb.unknown4);
             AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "tmp_footer.bpb.sptrack2 = {0}", tmpFooter.bpb.sptrack2);
-            AaruConsole.DebugWriteLine("DRI DiskCopy plugin",
-                                      "ArrayHelpers.ArrayIsNullOrEmpty(tmp_footer.bpb.unknown5) = {0}",
-                                      ArrayHelpers.ArrayIsNullOrEmpty(tmpFooter.bpb.unknown5));
 
-            Regex regexSignature = new Regex(REGEX_DRI);
+            AaruConsole.DebugWriteLine("DRI DiskCopy plugin",
+                                       "ArrayHelpers.ArrayIsNullOrEmpty(tmp_footer.bpb.unknown5) = {0}",
+                                       ArrayHelpers.ArrayIsNullOrEmpty(tmpFooter.bpb.unknown5));
+
+            var   regexSignature = new Regex(REGEX_DRI);
             Match matchSignature = regexSignature.Match(sig);
 
             AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "MatchSignature.Success? = {0}", matchSignature.Success);
 
-            if(!matchSignature.Success) return false;
+            if(!matchSignature.Success)
+                return false;
 
             if(tmpFooter.bpb.sptrack * tmpFooter.bpb.cylinders * tmpFooter.bpb.heads != tmpFooter.bpb.sectors)
                 return false;
 
-            return tmpFooter.bpb.sectors * tmpFooter.bpb.bps + Marshal.SizeOf<DriFooter>() == stream.Length;
+            return (tmpFooter.bpb.sectors * tmpFooter.bpb.bps) + Marshal.SizeOf<DriFooter>() == stream.Length;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/DriDiskCopy/Properties.cs b/Aaru.Images/DriDiskCopy/Properties.cs
index 4dd777091..3be0d002e 100644
--- a/Aaru.Images/DriDiskCopy/Properties.cs
+++ b/Aaru.Images/DriDiskCopy/Properties.cs
@@ -43,31 +43,36 @@ namespace Aaru.DiscImages
     {
         public ImageInfo Info => imageInfo;
 
-        public string                     Name                => "Digital Research DiskCopy";
-        public Guid                       Id                  => new Guid("9F0BE551-8BAB-4038-8B5A-691F1BF5FFF3");
-        public string                     Author              => "Natalia Portillo";
-        public string                     Format              => "Digital Research DiskCopy";
-        public List<DumpHardwareType>     DumpHardware        => null;
-        public CICMMetadataType           CicmMetadata        => null;
-        public IEnumerable<MediaTagType>  SupportedMediaTags  => new MediaTagType[] { };
-        public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[] { };
+        public string                 Name         => "Digital Research DiskCopy";
+        public Guid                   Id           => new Guid("9F0BE551-8BAB-4038-8B5A-691F1BF5FFF3");
+        public string                 Author       => "Natalia Portillo";
+        public string                 Format       => "Digital Research DiskCopy";
+        public List<DumpHardwareType> DumpHardware => null;
+        public CICMMetadataType       CicmMetadata => null;
+        public IEnumerable<MediaTagType> SupportedMediaTags => new MediaTagType[]
+            {};
+        public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[]
+            {};
+
         // TODO: Test with real hardware to see real supported media
-        public IEnumerable<MediaType> SupportedMediaTypes =>
-            new[]
-            {
-                MediaType.ACORN_35_DS_DD, MediaType.ACORN_35_DS_HD, MediaType.Apricot_35, MediaType.ATARI_35_DS_DD,
-                MediaType.ATARI_35_DS_DD_11, MediaType.ATARI_35_SS_DD, MediaType.ATARI_35_SS_DD_11, MediaType.DMF,
-                MediaType.DMF_82, MediaType.DOS_35_DS_DD_8, MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_ED,
-                MediaType.DOS_35_HD, MediaType.DOS_35_SS_DD_8, MediaType.DOS_35_SS_DD_9, MediaType.DOS_525_DS_DD_8,
-                MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_HD, MediaType.DOS_525_SS_DD_8,
-                MediaType.DOS_525_SS_DD_9, MediaType.FDFORMAT_35_DD, MediaType.FDFORMAT_35_HD,
-                MediaType.FDFORMAT_525_DD, MediaType.FDFORMAT_525_HD, MediaType.RX50, MediaType.XDF_35,
-                MediaType.XDF_525
-            };
+        public IEnumerable<MediaType> SupportedMediaTypes => new[]
+        {
+            MediaType.ACORN_35_DS_DD, MediaType.ACORN_35_DS_HD, MediaType.Apricot_35, MediaType.ATARI_35_DS_DD,
+            MediaType.ATARI_35_DS_DD_11, MediaType.ATARI_35_SS_DD, MediaType.ATARI_35_SS_DD_11, MediaType.DMF,
+            MediaType.DMF_82, MediaType.DOS_35_DS_DD_8, MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_ED,
+            MediaType.DOS_35_HD, MediaType.DOS_35_SS_DD_8, MediaType.DOS_35_SS_DD_9, MediaType.DOS_525_DS_DD_8,
+            MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_HD, MediaType.DOS_525_SS_DD_8, MediaType.DOS_525_SS_DD_9,
+            MediaType.FDFORMAT_35_DD, MediaType.FDFORMAT_35_HD, MediaType.FDFORMAT_525_DD, MediaType.FDFORMAT_525_HD,
+            MediaType.RX50, MediaType.XDF_35, MediaType.XDF_525
+        };
         public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
-            new (string name, Type type, string description, object @default)[] { };
-        public IEnumerable<string> KnownExtensions => new[] {".dsk"};
-        public bool                IsWriting       { get; private set; }
-        public string              ErrorMessage    { get; private set; }
+            new (string name, Type type, string description, object @default)[]
+                {};
+        public IEnumerable<string> KnownExtensions => new[]
+        {
+            ".dsk"
+        };
+        public bool   IsWriting    { get; private set; }
+        public string ErrorMessage { get; private set; }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/DriDiskCopy/Read.cs b/Aaru.Images/DriDiskCopy/Read.cs
index 0a64e49f6..bc36adae8 100644
--- a/Aaru.Images/DriDiskCopy/Read.cs
+++ b/Aaru.Images/DriDiskCopy/Read.cs
@@ -47,7 +47,8 @@ namespace Aaru.DiscImages
         {
             Stream stream = imageFilter.GetDataForkStream();
 
-            if((stream.Length - Marshal.SizeOf<DriFooter>()) % 512 != 0) return false;
+            if((stream.Length - Marshal.SizeOf<DriFooter>()) % 512 != 0)
+                return false;
 
             byte[] buffer = new byte[Marshal.SizeOf<DriFooter>()];
             stream.Seek(-buffer.Length, SeekOrigin.End);
@@ -57,14 +58,17 @@ namespace Aaru.DiscImages
 
             string sig = StringHandlers.CToString(footer.signature);
 
-            Regex regexSignature = new Regex(REGEX_DRI);
+            var   regexSignature = new Regex(REGEX_DRI);
             Match matchSignature = regexSignature.Match(sig);
 
-            if(!matchSignature.Success) return false;
+            if(!matchSignature.Success)
+                return false;
 
-            if(footer.bpb.sptrack * footer.bpb.cylinders * footer.bpb.heads != footer.bpb.sectors) return false;
+            if(footer.bpb.sptrack * footer.bpb.cylinders * footer.bpb.heads != footer.bpb.sectors)
+                return false;
 
-            if(footer.bpb.sectors * footer.bpb.bps + Marshal.SizeOf<DriFooter>() != stream.Length) return false;
+            if((footer.bpb.sectors * footer.bpb.bps) + Marshal.SizeOf<DriFooter>() != stream.Length)
+                return false;
 
             imageInfo.Cylinders          = footer.bpb.cylinders;
             imageInfo.Heads              = footer.bpb.heads;
@@ -80,12 +84,14 @@ namespace Aaru.DiscImages
             imageInfo.LastModificationTime = imageFilter.GetLastWriteTime();
 
             AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "Image application = {0} version {1}",
-                                      imageInfo.Application, imageInfo.ApplicationVersion);
+                                       imageInfo.Application, imageInfo.ApplicationVersion);
 
             // Correct some incorrect data in images of NEC 2HD disks
-            if(imageInfo.Cylinders  == 77  && imageInfo.Heads == 2 && imageInfo.SectorsPerTrack == 16 &&
-               imageInfo.SectorSize == 512 && (footer.bpb.driveCode == DriDriveCodes.md2hd ||
-                                               footer.bpb.driveCode == DriDriveCodes.mf2hd))
+            if(imageInfo.Cylinders       == 77  &&
+               imageInfo.Heads           == 2   &&
+               imageInfo.SectorsPerTrack == 16  &&
+               imageInfo.SectorSize      == 512 &&
+               (footer.bpb.driveCode == DriDriveCodes.md2hd || footer.bpb.driveCode == DriDriveCodes.mf2hd))
             {
                 imageInfo.SectorsPerTrack = 8;
                 imageInfo.SectorSize      = 1024;
@@ -100,20 +106,24 @@ namespace Aaru.DiscImages
                 case MediaType.NEC_525_HD when footer.bpb.driveCode == DriDriveCodes.mf2hd ||
                                                footer.bpb.driveCode == DriDriveCodes.mf2ed:
                     imageInfo.MediaType = MediaType.NEC_35_HD_8;
+
                     break;
                 case MediaType.DOS_525_HD when footer.bpb.driveCode == DriDriveCodes.mf2hd ||
                                                footer.bpb.driveCode == DriDriveCodes.mf2ed:
                     imageInfo.MediaType = MediaType.NEC_35_HD_15;
+
                     break;
                 case MediaType.RX50 when footer.bpb.driveCode == DriDriveCodes.md2dd ||
                                          footer.bpb.driveCode == DriDriveCodes.md2hd:
                     imageInfo.MediaType = MediaType.ATARI_35_SS_DD;
+
                     break;
             }
 
             imageInfo.XmlMediaType = XmlMediaType.BlockMedia;
+
             AaruConsole.VerboseWriteLine("Digital Research DiskCopy image contains a disk of type {0}",
-                                        imageInfo.MediaType);
+                                         imageInfo.MediaType);
 
             return true;
         }
diff --git a/Aaru.Images/DriDiskCopy/Structs.cs b/Aaru.Images/DriDiskCopy/Structs.cs
index d5181920a..c864c9ed3 100644
--- a/Aaru.Images/DriDiskCopy/Structs.cs
+++ b/Aaru.Images/DriDiskCopy/Structs.cs
@@ -56,39 +56,39 @@ namespace Aaru.DiscImages
             /// <summary>A drive code that corresponds (but it not equal to) CMOS drive types</summary>
             public DriDriveCodes driveCode;
             /// <summary>Unknown seems to be always 2</summary>
-            public ushort unknown;
+            public readonly ushort unknown;
             /// <summary>Cylinders</summary>
             public ushort cylinders;
             /// <summary>Seems to always be 0</summary>
-            public byte unknown2;
+            public readonly byte unknown2;
             /// <summary>Bytes per sector</summary>
             public ushort bps;
             /// <summary>Sectors per cluster</summary>
-            public byte spc;
+            public readonly byte spc;
             /// <summary>Sectors between BPB and FAT</summary>
-            public ushort rsectors;
+            public readonly ushort rsectors;
             /// <summary>How many FATs</summary>
-            public byte fats_no;
+            public readonly byte fats_no;
             /// <summary>Entries in root directory</summary>
-            public ushort root_entries;
+            public readonly ushort root_entries;
             /// <summary>Total sectors</summary>
             public ushort sectors;
             /// <summary>Media descriptor</summary>
-            public byte media_descriptor;
+            public readonly byte media_descriptor;
             /// <summary>Sectors per FAT</summary>
-            public ushort spfat;
+            public readonly ushort spfat;
             /// <summary>Sectors per track</summary>
             public ushort sptrack;
             /// <summary>Heads</summary>
             public ushort heads;
             /// <summary>Hidden sectors before BPB</summary>
-            public uint hsectors;
+            public readonly uint hsectors;
             /// <summary>Drive number</summary>
-            public byte drive_no;
+            public readonly byte drive_no;
             /// <summary>Seems to be 0</summary>
-            public ulong unknown3;
+            public readonly ulong unknown3;
             /// <summary>Seems to be 0</summary>
-            public byte unknown4;
+            public readonly byte unknown4;
             /// <summary>Sectors per track (again?)</summary>
             public ushort sptrack2;
             /// <summary>Seems to be 0</summary>
diff --git a/Aaru.Images/DriDiskCopy/Write.cs b/Aaru.Images/DriDiskCopy/Write.cs
index f9cfd48e1..d812f4b15 100644
--- a/Aaru.Images/DriDiskCopy/Write.cs
+++ b/Aaru.Images/DriDiskCopy/Write.cs
@@ -46,32 +46,42 @@ namespace Aaru.DiscImages
     public partial class DriDiskCopy
     {
         public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
-                           uint   sectorSize)
+                           uint sectorSize)
         {
             if(sectorSize == 0)
             {
                 ErrorMessage = "Unsupported sector size";
+
                 return false;
             }
 
             if(sectors > ushort.MaxValue)
             {
                 ErrorMessage = "Too many sectors";
+
                 return false;
             }
 
             if(!SupportedMediaTypes.Contains(mediaType))
             {
                 ErrorMessage = $"Unsupport media format {mediaType}";
+
                 return false;
             }
 
-            imageInfo = new ImageInfo {MediaType = mediaType, SectorSize = sectorSize, Sectors = sectors};
+            imageInfo = new ImageInfo
+            {
+                MediaType = mediaType, SectorSize = sectorSize, Sectors = sectors
+            };
 
-            try { writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None); }
+            try
+            {
+                writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
+            }
             catch(IOException e)
             {
                 ErrorMessage = $"Could not create new image file, exception {e.Message}";
+
                 return false;
             }
 
@@ -81,32 +91,31 @@ namespace Aaru.DiscImages
 
             footer = new DriFooter
             {
-                signature = new byte[51],
-                bpb = new DriBpb
+                signature = new byte[51], bpb = new DriBpb
                 {
-                    five      = 5,
-                    driveCode = DriDriveCodes.mf2ed,
+                    five      = 5, driveCode = DriDriveCodes.mf2ed,
                     cylinders = geometry.cylinders,
-                    bps       = (ushort)imageInfo.SectorSize,
-                    sectors   = (ushort)imageInfo.Sectors,
-                    sptrack   = (ushort)imageInfo.SectorsPerTrack,
-                    heads     = (ushort)imageInfo.Heads,
-                    sptrack2  = (ushort)imageInfo.SectorsPerTrack,
-                    unknown5  = new byte[144]
+                    bps       = (ushort)imageInfo.SectorSize, sectors       = (ushort)imageInfo.Sectors,
+                    sptrack   = (ushort)imageInfo.SectorsPerTrack, heads    = (ushort)imageInfo.Heads,
+                    sptrack2  = (ushort)imageInfo.SectorsPerTrack, unknown5 = new byte[144]
                 }
             };
+
             Array.Copy(Encoding.ASCII.GetBytes("DiskImage 2.01 (C) 1990,1991 Digital Research Inc"), 0,
                        footer.signature, 0, 49);
+
             footer.bpbcopy = footer.bpb;
 
             IsWriting    = true;
             ErrorMessage = null;
+
             return true;
         }
 
         public bool WriteMediaTag(byte[] data, MediaTagType tag)
         {
             ErrorMessage = "Writing media tags is not supported.";
+
             return false;
         }
 
@@ -115,18 +124,21 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Tried to write on a non-writable image";
+
                 return false;
             }
 
             if(data.Length != imageInfo.SectorSize)
             {
                 ErrorMessage = "Incorrect data size";
+
                 return false;
             }
 
             if(sectorAddress >= imageInfo.Sectors)
             {
                 ErrorMessage = "Tried to write past image size";
+
                 return false;
             }
 
@@ -134,6 +146,7 @@ namespace Aaru.DiscImages
             writingStream.Write(data, 0, data.Length);
 
             ErrorMessage = "";
+
             return true;
         }
 
@@ -142,18 +155,21 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Tried to write on a non-writable image";
+
                 return false;
             }
 
             if(data.Length % imageInfo.SectorSize != 0)
             {
                 ErrorMessage = "Incorrect data size";
+
                 return false;
             }
 
             if(sectorAddress + length > imageInfo.Sectors)
             {
                 ErrorMessage = "Tried to write past image size";
+
                 return false;
             }
 
@@ -161,18 +177,21 @@ namespace Aaru.DiscImages
             writingStream.Write(data, 0, data.Length);
 
             ErrorMessage = "";
+
             return true;
         }
 
         public bool WriteSectorLong(byte[] data, ulong sectorAddress)
         {
             ErrorMessage = "Writing sectors with tags is not supported.";
+
             return false;
         }
 
         public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
         {
             ErrorMessage = "Writing sectors with tags is not supported.";
+
             return false;
         }
 
@@ -181,6 +200,7 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Image is not opened for writing";
+
                 return false;
             }
 
@@ -198,6 +218,7 @@ namespace Aaru.DiscImages
 
             IsWriting    = false;
             ErrorMessage = "";
+
             return true;
         }
 
@@ -208,12 +229,14 @@ namespace Aaru.DiscImages
         public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
         {
             ErrorMessage = "Unsupported feature";
+
             return false;
         }
 
         public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
         {
             ErrorMessage = "Unsupported feature";
+
             return false;
         }
 
diff --git a/Aaru.Images/GDI/GDI.cs b/Aaru.Images/GDI/GDI.cs
index d13d54f24..aa3fd5a20 100644
--- a/Aaru.Images/GDI/GDI.cs
+++ b/Aaru.Images/GDI/GDI.cs
@@ -50,28 +50,16 @@ namespace Aaru.DiscImages
         /// <summary>Dictionary, index is track #, value is track number, or 0 if a TOC</summary>
         Dictionary<uint, ulong> offsetmap;
 
-        public Gdi()
+        public Gdi() => imageInfo = new ImageInfo
         {
-            imageInfo = new ImageInfo
-            {
-                ReadableSectorTags    = new List<SectorTagType>(),
-                ReadableMediaTags     = new List<MediaTagType>(),
-                HasPartitions         = true,
-                HasSessions           = true,
-                Version               = null,
-                ApplicationVersion    = null,
-                MediaTitle            = null,
-                Creator               = null,
-                MediaManufacturer     = null,
-                MediaModel            = null,
-                MediaPartNumber       = null,
-                MediaSequence         = 0,
-                LastMediaSequence     = 0,
-                DriveManufacturer     = null,
-                DriveModel            = null,
-                DriveSerialNumber     = null,
-                DriveFirmwareRevision = null
-            };
-        }
+            ReadableSectorTags = new List<SectorTagType>(), ReadableMediaTags = new List<MediaTagType>(),
+            HasPartitions      = true, HasSessions                            = true, Version = null,
+            ApplicationVersion = null,
+            MediaTitle         = null, Creator = null, MediaManufacturer = null,
+            MediaModel         = null,
+            MediaPartNumber    = null, MediaSequence = 0, LastMediaSequence = 0,
+            DriveManufacturer  = null,
+            DriveModel         = null, DriveSerialNumber = null, DriveFirmwareRevision = null
+        };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/GDI/Identify.cs b/Aaru.Images/GDI/Identify.cs
index dbacfb76b..0d72e3635 100644
--- a/Aaru.Images/GDI/Identify.cs
+++ b/Aaru.Images/GDI/Identify.cs
@@ -49,21 +49,29 @@ namespace Aaru.DiscImages
                 byte[] testArray = new byte[512];
                 imageFilter.GetDataForkStream().Read(testArray, 0, 512);
                 imageFilter.GetDataForkStream().Seek(0, SeekOrigin.Begin);
+
                 // Check for unexpected control characters that shouldn't be present in a text file and can crash this plugin
                 bool twoConsecutiveNulls = false;
+
                 for(int i = 0; i < 512; i++)
                 {
-                    if(i >= imageFilter.GetDataForkStream().Length) break;
+                    if(i >= imageFilter.GetDataForkStream().Length)
+                        break;
 
                     if(testArray[i] == 0)
                     {
-                        if(twoConsecutiveNulls) return false;
+                        if(twoConsecutiveNulls)
+                            return false;
 
                         twoConsecutiveNulls = true;
                     }
-                    else twoConsecutiveNulls = false;
+                    else
+                        twoConsecutiveNulls = false;
 
-                    if(testArray[i] < 0x20 && testArray[i] != 0x0A && testArray[i] != 0x0D && testArray[i] != 0x00)
+                    if(testArray[i] < 0x20  &&
+                       testArray[i] != 0x0A &&
+                       testArray[i] != 0x0D &&
+                       testArray[i] != 0x00)
                         return false;
                 }
 
@@ -79,29 +87,33 @@ namespace Aaru.DiscImages
 
                     if(lineNumber == 1)
                     {
-                        if(!int.TryParse(line, out tracks)) return false;
+                        if(!int.TryParse(line, out tracks))
+                            return false;
                     }
                     else
                     {
-                        Regex regexTrack = new Regex(REGEX_TRACK);
+                        var regexTrack = new Regex(REGEX_TRACK);
 
                         Match trackMatch = regexTrack.Match(line ?? throw new InvalidOperationException());
 
-                        if(!trackMatch.Success) return false;
+                        if(!trackMatch.Success)
+                            return false;
 
                         tracksFound++;
                     }
                 }
 
-                if(tracks == 0) return false;
+                if(tracks == 0)
+                    return false;
 
                 return tracks == tracksFound;
             }
             catch(Exception ex)
             {
                 AaruConsole.ErrorWriteLine("Exception trying to identify image file {0}", imageFilter.GetBasePath());
-                AaruConsole.ErrorWriteLine("Exception: {0}",                              ex.Message);
-                AaruConsole.ErrorWriteLine("Stack trace: {0}",                            ex.StackTrace);
+                AaruConsole.ErrorWriteLine("Exception: {0}", ex.Message);
+                AaruConsole.ErrorWriteLine("Stack trace: {0}", ex.StackTrace);
+
                 return false;
             }
         }
diff --git a/Aaru.Images/GDI/Properties.cs b/Aaru.Images/GDI/Properties.cs
index d7c922d2c..7133bb554 100644
--- a/Aaru.Images/GDI/Properties.cs
+++ b/Aaru.Images/GDI/Properties.cs
@@ -58,25 +58,21 @@ namespace Aaru.DiscImages
 
                 foreach(GdiTrack gdiTrack in discimage.Tracks)
                 {
-                    Track track = new Track
+                    var track = new Track
                     {
-                        Indexes                = new Dictionary<int, ulong>(),
-                        TrackDescription       = null,
-                        TrackStartSector       = gdiTrack.StartSector,
-                        TrackPregap            = gdiTrack.Pregap,
-                        TrackSession           = (ushort)(gdiTrack.HighDensity ? 2 : 1),
-                        TrackSequence          = gdiTrack.Sequence,
-                        TrackType              = gdiTrack.Tracktype,
-                        TrackFilter            = gdiTrack.Trackfilter,
-                        TrackFile              = gdiTrack.Trackfile,
-                        TrackFileOffset        = (ulong)gdiTrack.Offset,
-                        TrackFileType          = "BINARY",
-                        TrackRawBytesPerSector = gdiTrack.Bps,
-                        TrackBytesPerSector    = gdiTrack.Tracktype == TrackType.Data ? 2048 : 2352,
-                        TrackSubchannelType    = TrackSubchannelType.None
+                        Indexes             = new Dictionary<int, ulong>(), TrackDescription        = null,
+                        TrackStartSector    = gdiTrack.StartSector, TrackPregap                     = gdiTrack.Pregap,
+                        TrackSession        = (ushort)(gdiTrack.HighDensity ? 2 : 1), TrackSequence = gdiTrack.Sequence,
+                        TrackType           = gdiTrack.Tracktype,
+                        TrackFilter         = gdiTrack.Trackfilter,
+                        TrackFile           = gdiTrack.Trackfile,
+                        TrackFileOffset     = (ulong)gdiTrack.Offset,
+                        TrackFileType       = "BINARY", TrackRawBytesPerSector = gdiTrack.Bps,
+                        TrackBytesPerSector = gdiTrack.Tracktype == TrackType.Data ? 2048 : 2352,
+                        TrackSubchannelType = TrackSubchannelType.None
                     };
 
-                    track.TrackEndSector = track.TrackStartSector + gdiTrack.Sectors - 1;
+                    track.TrackEndSector = (track.TrackStartSector + gdiTrack.Sectors) - 1;
 
                     tracks.Add(track);
                 }
diff --git a/Aaru.Images/GDI/Read.cs b/Aaru.Images/GDI/Read.cs
index ab772af7f..37914d428 100644
--- a/Aaru.Images/GDI/Read.cs
+++ b/Aaru.Images/GDI/Read.cs
@@ -48,7 +48,8 @@ namespace Aaru.DiscImages
     {
         public bool Open(IFilter imageFilter)
         {
-            if(imageFilter == null) return false;
+            if(imageFilter == null)
+                return false;
 
             try
             {
@@ -58,12 +59,15 @@ namespace Aaru.DiscImages
                 bool highDensity = false;
 
                 // Initialize all RegExs
-                Regex regexTrack = new Regex(REGEX_TRACK);
+                var regexTrack = new Regex(REGEX_TRACK);
 
                 // Initialize all RegEx matches
 
                 // Initialize disc
-                discimage = new GdiDisc {Sessions = new List<Session>(), Tracks = new List<GdiTrack>()};
+                discimage = new GdiDisc
+                {
+                    Sessions = new List<Session>(), Tracks = new List<GdiTrack>()
+                };
 
                 ulong currentStart = 0;
                 offsetmap                = new Dictionary<uint, ulong>();
@@ -87,25 +91,27 @@ namespace Aaru.DiscImages
                             throw new ImageNotSupportedException($"Unknown line \"{line}\" at line {lineNumber}");
 
                         AaruConsole.DebugWriteLine("GDI plugin",
-                                                  "Found track {0} starts at {1} flags {2} type {3} file {4} offset {5} at line {6}",
-                                                  trackMatch.Groups["track"].Value, trackMatch.Groups["start"].Value,
-                                                  trackMatch.Groups["flags"].Value, trackMatch.Groups["type"].Value,
-                                                  trackMatch.Groups["filename"].Value,
-                                                  trackMatch.Groups["offset"].Value, lineNumber);
+                                                   "Found track {0} starts at {1} flags {2} type {3} file {4} offset {5} at line {6}",
+                                                   trackMatch.Groups["track"].Value, trackMatch.Groups["start"].Value,
+                                                   trackMatch.Groups["flags"].Value, trackMatch.Groups["type"].Value,
+                                                   trackMatch.Groups["filename"].Value,
+                                                   trackMatch.Groups["offset"].Value, lineNumber);
 
-                        FiltersList filtersList = new FiltersList();
-                        GdiTrack currentTrack = new GdiTrack
+                        var filtersList = new FiltersList();
+
+                        var currentTrack = new GdiTrack
                         {
                             Bps         = ushort.Parse(trackMatch.Groups["type"].Value),
                             Flags       = byte.Parse(trackMatch.Groups["flags"].Value),
                             Offset      = long.Parse(trackMatch.Groups["offset"].Value),
                             Sequence    = uint.Parse(trackMatch.Groups["track"].Value),
                             StartSector = ulong.Parse(trackMatch.Groups["start"].Value),
-                            Trackfilter =
-                                filtersList.GetFilter(Path.Combine(imageFilter.GetParentFolder(),
-                                                                   trackMatch.Groups["filename"].Value
-                                                                             .Replace("\\\"", "\"").Trim('"')))
+                            Trackfilter = filtersList.GetFilter(Path.Combine(imageFilter.GetParentFolder(),
+                                                                             trackMatch.Groups["filename"].Value.
+                                                                                        Replace("\\\"", "\"").
+                                                                                        Trim('"')))
                         };
+
                         currentTrack.Trackfile = currentTrack.Trackfilter.GetFilename();
 
                         if(currentTrack.StartSector - currentStart > 0)
@@ -128,6 +134,7 @@ namespace Aaru.DiscImages
                         currentTrack.Sectors =
                             (ulong)((currentTrack.Trackfilter.GetDataForkLength() - currentTrack.Offset) /
                                     currentTrack.Bps);
+
                         currentTrack.Sectors     += currentTrack.Pregap;
                         currentStart             += currentTrack.Sectors;
                         currentTrack.HighDensity =  highDensity;
@@ -140,6 +147,7 @@ namespace Aaru.DiscImages
                 }
 
                 Session[] sessions = new Session[2];
+
                 for(int s = 0; s < sessions.Length; s++)
                     if(s == 0)
                     {
@@ -147,15 +155,19 @@ namespace Aaru.DiscImages
 
                         foreach(GdiTrack trk in discimage.Tracks.Where(trk => !trk.HighDensity))
                         {
-                            if(sessions[s].StartTrack      == 0) sessions[s].StartTrack           = trk.Sequence;
-                            else if(sessions[s].StartTrack > trk.Sequence) sessions[s].StartTrack = trk.Sequence;
+                            if(sessions[s].StartTrack == 0)
+                                sessions[s].StartTrack = trk.Sequence;
+                            else if(sessions[s].StartTrack > trk.Sequence)
+                                sessions[s].StartTrack = trk.Sequence;
 
-                            if(sessions[s].EndTrack < trk.Sequence) sessions[s].EndTrack = trk.Sequence;
+                            if(sessions[s].EndTrack < trk.Sequence)
+                                sessions[s].EndTrack = trk.Sequence;
 
-                            if(sessions[s].StartSector > trk.StartSector) sessions[s].StartSector = trk.StartSector;
+                            if(sessions[s].StartSector > trk.StartSector)
+                                sessions[s].StartSector = trk.StartSector;
 
-                            if(sessions[s].EndSector < trk.Sectors                    + trk.StartSector - 1)
-                                sessions[s].EndSector = trk.Sectors + trk.StartSector - 1;
+                            if(sessions[s].EndSector < (trk.Sectors + trk.StartSector) - 1)
+                                sessions[s].EndSector = (trk.Sectors + trk.StartSector) - 1;
                         }
                     }
                     else
@@ -164,15 +176,19 @@ namespace Aaru.DiscImages
 
                         foreach(GdiTrack trk in discimage.Tracks.Where(trk => trk.HighDensity))
                         {
-                            if(sessions[s].StartTrack      == 0) sessions[s].StartTrack           = trk.Sequence;
-                            else if(sessions[s].StartTrack > trk.Sequence) sessions[s].StartTrack = trk.Sequence;
+                            if(sessions[s].StartTrack == 0)
+                                sessions[s].StartTrack = trk.Sequence;
+                            else if(sessions[s].StartTrack > trk.Sequence)
+                                sessions[s].StartTrack = trk.Sequence;
 
-                            if(sessions[s].EndTrack < trk.Sequence) sessions[s].EndTrack = trk.Sequence;
+                            if(sessions[s].EndTrack < trk.Sequence)
+                                sessions[s].EndTrack = trk.Sequence;
 
-                            if(sessions[s].StartSector > trk.StartSector) sessions[s].StartSector = trk.StartSector;
+                            if(sessions[s].StartSector > trk.StartSector)
+                                sessions[s].StartSector = trk.StartSector;
 
-                            if(sessions[s].EndSector < trk.Sectors                    + trk.StartSector - 1)
-                                sessions[s].EndSector = trk.Sectors + trk.StartSector - 1;
+                            if(sessions[s].EndSector < (trk.Sectors + trk.StartSector) - 1)
+                                sessions[s].EndSector = (trk.Sectors + trk.StartSector) - 1;
                         }
                     }
 
@@ -186,38 +202,46 @@ namespace Aaru.DiscImages
 
                 AaruConsole.DebugWriteLine("GDI plugin", "Session information:");
                 AaruConsole.DebugWriteLine("GDI plugin", "\tDisc contains {0} sessions", discimage.Sessions.Count);
+
                 for(int i = 0; i < discimage.Sessions.Count; i++)
                 {
                     AaruConsole.DebugWriteLine("GDI plugin", "\tSession {0} information:", i + 1);
+
                     AaruConsole.DebugWriteLine("GDI plugin", "\t\tStarting track: {0}",
-                                              discimage.Sessions[i].StartTrack);
+                                               discimage.Sessions[i].StartTrack);
+
                     AaruConsole.DebugWriteLine("GDI plugin", "\t\tStarting sector: {0}",
-                                              discimage.Sessions[i].StartSector);
-                    AaruConsole.DebugWriteLine("GDI plugin", "\t\tEnding track: {0}",  discimage.Sessions[i].EndTrack);
+                                               discimage.Sessions[i].StartSector);
+
+                    AaruConsole.DebugWriteLine("GDI plugin", "\t\tEnding track: {0}", discimage.Sessions[i].EndTrack);
                     AaruConsole.DebugWriteLine("GDI plugin", "\t\tEnding sector: {0}", discimage.Sessions[i].EndSector);
                 }
 
                 AaruConsole.DebugWriteLine("GDI plugin", "Track information:");
                 AaruConsole.DebugWriteLine("GDI plugin", "\tDisc contains {0} tracks", discimage.Tracks.Count);
+
                 for(int i = 0; i < discimage.Tracks.Count; i++)
                 {
                     AaruConsole.DebugWriteLine("GDI plugin", "\tTrack {0} information:", discimage.Tracks[i].Sequence);
                     AaruConsole.DebugWriteLine("GDI plugin", "\t\t{0} bytes per sector", discimage.Tracks[i].Bps);
-                    AaruConsole.DebugWriteLine("GDI plugin", "\t\tPregap: {0} sectors",  discimage.Tracks[i].Pregap);
+                    AaruConsole.DebugWriteLine("GDI plugin", "\t\tPregap: {0} sectors", discimage.Tracks[i].Pregap);
 
                     if((discimage.Tracks[i].Flags & 0x8) == 0x8)
                         AaruConsole.DebugWriteLine("GDI plugin", "\t\tTrack is flagged as quadraphonic");
+
                     if((discimage.Tracks[i].Flags & 0x4) == 0x4)
                         AaruConsole.DebugWriteLine("GDI plugin", "\t\tTrack is data");
+
                     if((discimage.Tracks[i].Flags & 0x2) == 0x2)
                         AaruConsole.DebugWriteLine("GDI plugin", "\t\tTrack allows digital copy");
+
                     if((discimage.Tracks[i].Flags & 0x1) == 0x1)
                         AaruConsole.DebugWriteLine("GDI plugin", "\t\tTrack has pre-emphasis applied");
 
                     AaruConsole.DebugWriteLine("GDI plugin",
-                                              "\t\tTrack resides in file {0}, type defined as {1}, starting at byte {2}",
-                                              discimage.Tracks[i].Trackfilter, discimage.Tracks[i].Tracktype,
-                                              discimage.Tracks[i].Offset);
+                                               "\t\tTrack resides in file {0}, type defined as {1}, starting at byte {2}",
+                                               discimage.Tracks[i].Trackfilter, discimage.Tracks[i].Tracktype,
+                                               discimage.Tracks[i].Offset);
                 }
 
                 AaruConsole.DebugWriteLine("GDI plugin", "Building offset map");
@@ -227,20 +251,18 @@ namespace Aaru.DiscImages
 
                 for(int i = 0; i < discimage.Tracks.Count; i++)
                 {
-                    if(discimage.Tracks[i].Sequence == 1 && i != 0)
+                    if(discimage.Tracks[i].Sequence == 1 &&
+                       i                            != 0)
                         throw new ImageNotSupportedException("Unordered tracks");
 
                     // Index 01
-                    Partition partition = new Partition
+                    var partition = new Partition
                     {
-                        Description = $"Track {discimage.Tracks[i].Sequence}.",
-                        Name        = null,
+                        Description = $"Track {discimage.Tracks[i].Sequence}.", Name = null,
                         Start       = discimage.Tracks[i].StartSector,
                         Size        = discimage.Tracks[i].Sectors * discimage.Tracks[i].Bps,
-                        Length      = discimage.Tracks[i].Sectors,
-                        Sequence    = discimage.Tracks[i].Sequence,
-                        Offset      = byteOffset,
-                        Type        = discimage.Tracks[i].Tracktype.ToString()
+                        Length      = discimage.Tracks[i].Sectors, Sequence = discimage.Tracks[i].Sequence,
+                        Offset      = byteOffset, Type                      = discimage.Tracks[i].Tracktype.ToString()
                     };
 
                     byteOffset += partition.Size;
@@ -248,8 +270,11 @@ namespace Aaru.DiscImages
                     Partitions.Add(partition);
                 }
 
-                foreach(GdiTrack track in discimage.Tracks) imageInfo.ImageSize += track.Bps * track.Sectors;
-                foreach(GdiTrack track in discimage.Tracks) imageInfo.Sectors   += track.Sectors;
+                foreach(GdiTrack track in discimage.Tracks)
+                    imageInfo.ImageSize += track.Bps * track.Sectors;
+
+                foreach(GdiTrack track in discimage.Tracks)
+                    imageInfo.Sectors += track.Sectors;
 
                 imageInfo.Sectors += densitySeparationSectors;
 
@@ -283,8 +308,9 @@ namespace Aaru.DiscImages
             catch(Exception ex)
             {
                 AaruConsole.ErrorWriteLine("Exception trying to identify image file {0}", imageFilter.GetBasePath());
-                AaruConsole.ErrorWriteLine("Exception: {0}",                              ex.Message);
-                AaruConsole.ErrorWriteLine("Stack trace: {0}",                            ex.StackTrace);
+                AaruConsole.ErrorWriteLine("Exception: {0}", ex.Message);
+                AaruConsole.ErrorWriteLine("Stack trace: {0}", ex.StackTrace);
+
                 return false;
             }
         }
@@ -300,16 +326,16 @@ namespace Aaru.DiscImages
 
         public byte[] ReadSectors(ulong sectorAddress, uint length)
         {
-            foreach(KeyValuePair<uint, ulong> kvp in from kvp in offsetmap
-                                                     where sectorAddress >= kvp.Value
+            foreach(KeyValuePair<uint, ulong> kvp in from kvp in offsetmap where sectorAddress >= kvp.Value
                                                      from gdiTrack in discimage.Tracks
                                                      where gdiTrack.Sequence         == kvp.Key
-                                                     where sectorAddress - kvp.Value < gdiTrack.Sectors
-                                                     select kvp)
+                                                     where sectorAddress - kvp.Value < gdiTrack.Sectors select kvp)
                 return ReadSectors(sectorAddress - kvp.Value, length, kvp.Key);
 
             offsetmap.TryGetValue(0, out ulong transitionStart);
-            if(sectorAddress >= transitionStart && sectorAddress < densitySeparationSectors + transitionStart)
+
+            if(sectorAddress >= transitionStart &&
+               sectorAddress < densitySeparationSectors + transitionStart)
                 return ReadSectors(sectorAddress - transitionStart, length, 0);
 
             throw new ArgumentOutOfRangeException(nameof(sectorAddress), "Sector address not found");
@@ -317,16 +343,16 @@ namespace Aaru.DiscImages
 
         public byte[] ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag)
         {
-            foreach(KeyValuePair<uint, ulong> kvp in from kvp in offsetmap
-                                                     where sectorAddress >= kvp.Value
+            foreach(KeyValuePair<uint, ulong> kvp in from kvp in offsetmap where sectorAddress >= kvp.Value
                                                      from gdiTrack in discimage.Tracks
                                                      where gdiTrack.Sequence         == kvp.Key
-                                                     where sectorAddress - kvp.Value < gdiTrack.Sectors
-                                                     select kvp)
+                                                     where sectorAddress - kvp.Value < gdiTrack.Sectors select kvp)
                 return ReadSectorsTag(sectorAddress - kvp.Value, length, kvp.Key, tag);
 
             offsetmap.TryGetValue(0, out ulong transitionStart);
-            if(sectorAddress >= transitionStart && sectorAddress < densitySeparationSectors + transitionStart)
+
+            if(sectorAddress >= transitionStart &&
+               sectorAddress < densitySeparationSectors + transitionStart)
                 return ReadSectorsTag(sectorAddress - transitionStart, length, 0, tag);
 
             throw new ArgumentOutOfRangeException(nameof(sectorAddress), "Sector address not found");
@@ -343,11 +369,15 @@ namespace Aaru.DiscImages
                 return new byte[length * 2352];
             }
 
-            GdiTrack aaruTrack = new GdiTrack {Sequence = 0};
+            var aaruTrack = new GdiTrack
+            {
+                Sequence = 0
+            };
 
             foreach(GdiTrack gdiTrack in discimage.Tracks.Where(gdiTrack => gdiTrack.Sequence == track))
             {
                 aaruTrack = gdiTrack;
+
                 break;
             }
 
@@ -369,6 +399,7 @@ namespace Aaru.DiscImages
                     sectorOffset = 0;
                     sectorSize   = 2352;
                     sectorSkip   = 0;
+
                     break;
                 }
                 case TrackType.CdMode1:
@@ -395,10 +426,12 @@ namespace Aaru.DiscImages
 
             ulong remainingSectors = length;
 
-            if(aaruTrack.Pregap > 0 && sectorAddress < aaruTrack.Pregap)
+            if(aaruTrack.Pregap > 0 &&
+               sectorAddress    < aaruTrack.Pregap)
             {
                 ulong  remainingPregap = aaruTrack.Pregap - sectorAddress;
                 byte[] zero;
+
                 if(length > remainingPregap)
                 {
                     zero             =  new byte[remainingPregap * sectorSize];
@@ -413,14 +446,19 @@ namespace Aaru.DiscImages
                 Array.Copy(zero, 0, buffer, 0, zero.Length);
             }
 
-            if(remainingSectors == 0) return buffer;
+            if(remainingSectors == 0)
+                return buffer;
 
             imageStream = aaruTrack.Trackfilter.GetDataForkStream();
-            BinaryReader br = new BinaryReader(imageStream);
-            br.BaseStream
-              .Seek(aaruTrack.Offset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip) + aaruTrack.Pregap * aaruTrack.Bps),
+            var br = new BinaryReader(imageStream);
+
+            br.BaseStream.
+               Seek(aaruTrack.Offset + (long)((sectorAddress * (sectorOffset + sectorSize + sectorSkip)) + (aaruTrack.Pregap * aaruTrack.Bps)),
                     SeekOrigin.Begin);
-            if(sectorOffset == 0 && sectorSkip == 0) buffer = br.ReadBytes((int)(sectorSize * remainingSectors));
+
+            if(sectorOffset == 0 &&
+               sectorSkip   == 0)
+                buffer = br.ReadBytes((int)(sectorSize * remainingSectors));
             else
                 for(ulong i = 0; i < remainingSectors; i++)
                 {
@@ -441,16 +479,24 @@ namespace Aaru.DiscImages
                     throw new ArgumentOutOfRangeException(nameof(length),
                                                           "Requested more sectors than present in track, won't cross tracks");
 
-                if(tag == SectorTagType.CdTrackFlags) return new byte[] {0x00};
+                if(tag == SectorTagType.CdTrackFlags)
+                    return new byte[]
+                    {
+                        0x00
+                    };
 
                 throw new ArgumentException("Unsupported tag requested for this track", nameof(tag));
             }
 
-            GdiTrack aaruTrack = new GdiTrack {Sequence = 0};
+            var aaruTrack = new GdiTrack
+            {
+                Sequence = 0
+            };
 
             foreach(GdiTrack gdiTrack in discimage.Tracks.Where(gdiTrack => gdiTrack.Sequence == track))
             {
                 aaruTrack = gdiTrack;
+
                 break;
             }
 
@@ -499,6 +545,7 @@ namespace Aaru.DiscImages
                             sectorOffset = 0;
                             sectorSize   = 12;
                             sectorSkip   = 2340;
+
                             break;
                         }
                         case SectorTagType.CdSectorHeader:
@@ -506,6 +553,7 @@ namespace Aaru.DiscImages
                             sectorOffset = 12;
                             sectorSize   = 4;
                             sectorSkip   = 2336;
+
                             break;
                         }
                         case SectorTagType.CdSectorSubchannel:
@@ -516,6 +564,7 @@ namespace Aaru.DiscImages
                             sectorOffset = 2076;
                             sectorSize   = 276;
                             sectorSkip   = 0;
+
                             break;
                         }
                         case SectorTagType.CdSectorEccP:
@@ -523,6 +572,7 @@ namespace Aaru.DiscImages
                             sectorOffset = 2076;
                             sectorSize   = 172;
                             sectorSkip   = 104;
+
                             break;
                         }
                         case SectorTagType.CdSectorEccQ:
@@ -530,6 +580,7 @@ namespace Aaru.DiscImages
                             sectorOffset = 2248;
                             sectorSize   = 104;
                             sectorSkip   = 0;
+
                             break;
                         }
                         case SectorTagType.CdSectorEdc:
@@ -537,6 +588,7 @@ namespace Aaru.DiscImages
                             sectorOffset = 2064;
                             sectorSize   = 4;
                             sectorSkip   = 284;
+
                             break;
                         }
                         default: throw new ArgumentException("Unsupported tag requested", nameof(tag));
@@ -551,10 +603,12 @@ namespace Aaru.DiscImages
 
             ulong remainingSectors = length;
 
-            if(aaruTrack.Pregap > 0 && sectorAddress < aaruTrack.Pregap)
+            if(aaruTrack.Pregap > 0 &&
+               sectorAddress    < aaruTrack.Pregap)
             {
                 ulong  remainingPregap = aaruTrack.Pregap - sectorAddress;
                 byte[] zero;
+
                 if(length > remainingPregap)
                 {
                     zero             =  new byte[remainingPregap * sectorSize];
@@ -569,14 +623,19 @@ namespace Aaru.DiscImages
                 Array.Copy(zero, 0, buffer, 0, zero.Length);
             }
 
-            if(remainingSectors == 0) return buffer;
+            if(remainingSectors == 0)
+                return buffer;
 
             imageStream = aaruTrack.Trackfilter.GetDataForkStream();
-            BinaryReader br = new BinaryReader(imageStream);
-            br.BaseStream
-              .Seek(aaruTrack.Offset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip) + aaruTrack.Pregap * aaruTrack.Bps),
+            var br = new BinaryReader(imageStream);
+
+            br.BaseStream.
+               Seek(aaruTrack.Offset + (long)((sectorAddress * (sectorOffset + sectorSize + sectorSkip)) + (aaruTrack.Pregap * aaruTrack.Bps)),
                     SeekOrigin.Begin);
-            if(sectorOffset == 0 && sectorSkip == 0) buffer = br.ReadBytes((int)(sectorSize * remainingSectors));
+
+            if(sectorOffset == 0 &&
+               sectorSkip   == 0)
+                buffer = br.ReadBytes((int)(sectorSize * remainingSectors));
             else
                 for(ulong i = 0; i < remainingSectors; i++)
                 {
@@ -595,12 +654,10 @@ namespace Aaru.DiscImages
 
         public byte[] ReadSectorsLong(ulong sectorAddress, uint length)
         {
-            foreach(KeyValuePair<uint, ulong> kvp in from kvp in offsetmap
-                                                     where sectorAddress >= kvp.Value
+            foreach(KeyValuePair<uint, ulong> kvp in from kvp in offsetmap where sectorAddress >= kvp.Value
                                                      from gdiTrack in discimage.Tracks
                                                      where gdiTrack.Sequence         == kvp.Key
-                                                     where sectorAddress - kvp.Value < gdiTrack.Sectors
-                                                     select kvp)
+                                                     where sectorAddress - kvp.Value < gdiTrack.Sectors select kvp)
                 return ReadSectorsLong(sectorAddress - kvp.Value, length, kvp.Key);
 
             throw new ArgumentOutOfRangeException(nameof(sectorAddress), "Sector address not found");
@@ -617,11 +674,15 @@ namespace Aaru.DiscImages
                 return new byte[length * 2352];
             }
 
-            GdiTrack aaruTrack = new GdiTrack {Sequence = 0};
+            var aaruTrack = new GdiTrack
+            {
+                Sequence = 0
+            };
 
             foreach(GdiTrack gdiTrack in discimage.Tracks.Where(gdiTrack => gdiTrack.Sequence == track))
             {
                 aaruTrack = gdiTrack;
+
                 break;
             }
 
@@ -643,6 +704,7 @@ namespace Aaru.DiscImages
                     sectorOffset = 0;
                     sectorSize   = 2352;
                     sectorSkip   = 0;
+
                     break;
                 }
                 case TrackType.CdMode1:
@@ -669,10 +731,12 @@ namespace Aaru.DiscImages
 
             ulong remainingSectors = length;
 
-            if(aaruTrack.Pregap > 0 && sectorAddress < aaruTrack.Pregap)
+            if(aaruTrack.Pregap > 0 &&
+               sectorAddress    < aaruTrack.Pregap)
             {
                 ulong  remainingPregap = aaruTrack.Pregap - sectorAddress;
                 byte[] zero;
+
                 if(length > remainingPregap)
                 {
                     zero             =  new byte[remainingPregap * sectorSize];
@@ -687,14 +751,19 @@ namespace Aaru.DiscImages
                 Array.Copy(zero, 0, buffer, 0, zero.Length);
             }
 
-            if(remainingSectors == 0) return buffer;
+            if(remainingSectors == 0)
+                return buffer;
 
             imageStream = aaruTrack.Trackfilter.GetDataForkStream();
-            BinaryReader br = new BinaryReader(imageStream);
-            br.BaseStream
-              .Seek(aaruTrack.Offset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip) + aaruTrack.Pregap * aaruTrack.Bps),
+            var br = new BinaryReader(imageStream);
+
+            br.BaseStream.
+               Seek(aaruTrack.Offset + (long)((sectorAddress * (sectorOffset + sectorSize + sectorSkip)) + (aaruTrack.Pregap * aaruTrack.Bps)),
                     SeekOrigin.Begin);
-            if(sectorOffset == 0 && sectorSkip == 0) buffer = br.ReadBytes((int)(sectorSize * remainingSectors));
+
+            if(sectorOffset == 0 &&
+               sectorSkip   == 0)
+                buffer = br.ReadBytes((int)(sectorSize * remainingSectors));
             else
                 for(ulong i = 0; i < remainingSectors; i++)
                 {
@@ -709,7 +778,8 @@ namespace Aaru.DiscImages
 
         public List<Track> GetSessionTracks(Session session)
         {
-            if(discimage.Sessions.Contains(session)) return GetSessionTracks(session.SessionSequence);
+            if(discimage.Sessions.Contains(session))
+                return GetSessionTracks(session.SessionSequence);
 
             throw new ImageNotSupportedException("Session does not exist in disc image");
         }
@@ -723,9 +793,11 @@ namespace Aaru.DiscImages
             {
                 case 1:
                     expectedDensity = false;
+
                     break;
                 case 2:
                     expectedDensity = true;
+
                     break;
                 default: throw new ImageNotSupportedException("Session does not exist in disc image");
             }
@@ -733,25 +805,21 @@ namespace Aaru.DiscImages
             foreach(GdiTrack gdiTrack in discimage.Tracks)
                 if(gdiTrack.HighDensity == expectedDensity)
                 {
-                    Track track = new Track
+                    var track = new Track
                     {
-                        Indexes                = new Dictionary<int, ulong>(),
-                        TrackDescription       = null,
-                        TrackStartSector       = gdiTrack.StartSector,
-                        TrackPregap            = gdiTrack.Pregap,
-                        TrackSession           = (ushort)(gdiTrack.HighDensity ? 2 : 1),
-                        TrackSequence          = gdiTrack.Sequence,
-                        TrackType              = gdiTrack.Tracktype,
-                        TrackFilter            = gdiTrack.Trackfilter,
-                        TrackFile              = gdiTrack.Trackfile,
-                        TrackFileOffset        = (ulong)gdiTrack.Offset,
-                        TrackFileType          = "BINARY",
-                        TrackRawBytesPerSector = gdiTrack.Bps,
-                        TrackBytesPerSector    = gdiTrack.Tracktype == TrackType.Data ? 2048 : 2352,
-                        TrackSubchannelType    = TrackSubchannelType.None
+                        Indexes             = new Dictionary<int, ulong>(), TrackDescription        = null,
+                        TrackStartSector    = gdiTrack.StartSector, TrackPregap                     = gdiTrack.Pregap,
+                        TrackSession        = (ushort)(gdiTrack.HighDensity ? 2 : 1), TrackSequence = gdiTrack.Sequence,
+                        TrackType           = gdiTrack.Tracktype,
+                        TrackFilter         = gdiTrack.Trackfilter,
+                        TrackFile           = gdiTrack.Trackfile,
+                        TrackFileOffset     = (ulong)gdiTrack.Offset,
+                        TrackFileType       = "BINARY", TrackRawBytesPerSector = gdiTrack.Bps,
+                        TrackBytesPerSector = gdiTrack.Tracktype == TrackType.Data ? 2048 : 2352,
+                        TrackSubchannelType = TrackSubchannelType.None
                     };
 
-                    track.TrackEndSector = track.TrackStartSector + gdiTrack.Sectors - 1;
+                    track.TrackEndSector = (track.TrackStartSector + gdiTrack.Sectors) - 1;
 
                     tracks.Add(track);
                 }
diff --git a/Aaru.Images/GDI/Verify.cs b/Aaru.Images/GDI/Verify.cs
index 328d5ce0d..ea8027abb 100644
--- a/Aaru.Images/GDI/Verify.cs
+++ b/Aaru.Images/GDI/Verify.cs
@@ -41,10 +41,11 @@ namespace Aaru.DiscImages
         public bool? VerifySector(ulong sectorAddress)
         {
             byte[] buffer = ReadSectorLong(sectorAddress);
+
             return CdChecksums.CheckCdSector(buffer);
         }
 
-        public bool? VerifySectors(ulong           sectorAddress, uint length, out List<ulong> failingLbas,
+        public bool? VerifySectors(ulong sectorAddress, uint length, out List<ulong> failingLbas,
                                    out List<ulong> unknownLbas)
         {
             byte[] buffer = ReadSectorsLong(sectorAddress, length);
@@ -62,19 +63,22 @@ namespace Aaru.DiscImages
                 {
                     case null:
                         unknownLbas.Add((ulong)i + sectorAddress);
+
                         break;
                     case false:
                         failingLbas.Add((ulong)i + sectorAddress);
+
                         break;
                 }
             }
 
-            if(unknownLbas.Count > 0) return null;
+            if(unknownLbas.Count > 0)
+                return null;
 
             return failingLbas.Count <= 0;
         }
 
-        public bool? VerifySectors(ulong           sectorAddress, uint length, uint track, out List<ulong> failingLbas,
+        public bool? VerifySectors(ulong sectorAddress, uint length, uint track, out List<ulong> failingLbas,
                                    out List<ulong> unknownLbas)
         {
             byte[] buffer = ReadSectorsLong(sectorAddress, length, track);
@@ -92,14 +96,17 @@ namespace Aaru.DiscImages
                 {
                     case null:
                         unknownLbas.Add((ulong)i + sectorAddress);
+
                         break;
                     case false:
                         failingLbas.Add((ulong)i + sectorAddress);
+
                         break;
                 }
             }
 
-            if(unknownLbas.Count > 0) return null;
+            if(unknownLbas.Count > 0)
+                return null;
 
             return failingLbas.Count <= 0;
         }
@@ -107,6 +114,7 @@ namespace Aaru.DiscImages
         public bool? VerifySector(ulong sectorAddress, uint track)
         {
             byte[] buffer = ReadSectorLong(sectorAddress, track);
+
             return CdChecksums.CheckCdSector(buffer);
         }
     }
diff --git a/Aaru.Images/HDCopy/HDCopy.cs b/Aaru.Images/HDCopy/HDCopy.cs
index 4a43bb156..7694421ea 100644
--- a/Aaru.Images/HDCopy/HDCopy.cs
+++ b/Aaru.Images/HDCopy/HDCopy.cs
@@ -72,52 +72,30 @@ namespace Aaru.DiscImages
 {
     public partial class HdCopy : IMediaImage
     {
-        /// <summary>
-        ///     The HDCP file header after the image has been opened
-        /// </summary>
+        /// <summary>Every track that has been read is cached here</summary>
+        readonly Dictionary<int, byte[]> trackCache = new Dictionary<int, byte[]>();
+
+        /// <summary>The offset in the file where each track starts, or -1 if the track is not present</summary>
+        readonly Dictionary<int, long> trackOffset = new Dictionary<int, long>();
+        /// <summary>The HDCP file header after the image has been opened</summary>
         HdcpFileHeader fileHeader;
 
-        /// <summary>
-        ///     The ImageFilter we're reading from, after the file has been opened
-        /// </summary>
+        /// <summary>The ImageFilter we're reading from, after the file has been opened</summary>
         IFilter hdcpImageFilter;
         ImageInfo imageInfo;
 
-        /// <summary>
-        ///     Every track that has been read is cached here
-        /// </summary>
-        Dictionary<int, byte[]> trackCache = new Dictionary<int, byte[]>();
-
-        /// <summary>
-        ///     The offset in the file where each track starts, or -1 if the track is not present
-        /// </summary>
-        Dictionary<int, long> trackOffset = new Dictionary<int, long>();
-
-        public HdCopy()
+        public HdCopy() => imageInfo = new ImageInfo
         {
-            imageInfo = new ImageInfo
-            {
-                ReadableSectorTags    = new List<SectorTagType>(),
-                ReadableMediaTags     = new List<MediaTagType>(),
-                HasPartitions         = false,
-                HasSessions           = false,
-                Version               = null,
-                Application           = null,
-                ApplicationVersion    = null,
-                Creator               = null,
-                Comments              = null,
-                MediaManufacturer     = null,
-                MediaModel            = null,
-                MediaSerialNumber     = null,
-                MediaBarcode          = null,
-                MediaPartNumber       = null,
-                MediaSequence         = 0,
-                LastMediaSequence     = 0,
-                DriveManufacturer     = null,
-                DriveModel            = null,
-                DriveSerialNumber     = null,
-                DriveFirmwareRevision = null
-            };
-        }
+            ReadableSectorTags = new List<SectorTagType>(), ReadableMediaTags = new List<MediaTagType>(),
+            HasPartitions      = false, HasSessions                           = false, Version = null,
+            Application        = null,
+            ApplicationVersion = null, Creator = null, Comments = null,
+            MediaManufacturer  = null,
+            MediaModel         = null, MediaSerialNumber = null, MediaBarcode = null,
+            MediaPartNumber    = null,
+            MediaSequence      = 0, LastMediaSequence = 0, DriveManufacturer = null,
+            DriveModel         = null,
+            DriveSerialNumber  = null, DriveFirmwareRevision = null
+        };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/HDCopy/Helpers.cs b/Aaru.Images/HDCopy/Helpers.cs
index 345dd2b2d..2196345b1 100644
--- a/Aaru.Images/HDCopy/Helpers.cs
+++ b/Aaru.Images/HDCopy/Helpers.cs
@@ -60,14 +60,17 @@ namespace Aaru.DiscImages
             // decompress the data
             int sIndex = 0; // source buffer position
             int dIndex = 0; // destination buffer position
+
             while(sIndex < compressedLength)
                 if(cBuffer[sIndex] == escapeByte)
                 {
                     sIndex++; // skip over escape byte
                     byte fillByte  = cBuffer[sIndex++];
                     byte fillCount = cBuffer[sIndex++];
+
                     // fill destination buffer
-                    for(int i = 0; i < fillCount; i++) trackData[dIndex++] = fillByte;
+                    for(int i = 0; i < fillCount; i++)
+                        trackData[dIndex++] = fillByte;
                 }
                 else
                     trackData[dIndex++] = cBuffer[sIndex++];
diff --git a/Aaru.Images/HDCopy/Identify.cs b/Aaru.Images/HDCopy/Identify.cs
index 1ff089495..556b31f8d 100644
--- a/Aaru.Images/HDCopy/Identify.cs
+++ b/Aaru.Images/HDCopy/Identify.cs
@@ -44,10 +44,11 @@ namespace Aaru.DiscImages
             Stream stream = imageFilter.GetDataForkStream();
             stream.Seek(0, SeekOrigin.Begin);
 
-            if(stream.Length < 2 + 2 * 82) return false;
+            if(stream.Length < 2 + (2 * 82))
+                return false;
 
-            byte[] header = new byte[2 + 2 * 82];
-            stream.Read(header, 0, 2 + 2 * 82);
+            byte[] header = new byte[2 + (2 * 82)];
+            stream.Read(header, 0, 2 + (2 * 82));
 
             HdcpFileHeader fheader = Marshal.ByteArrayToStructureLittleEndian<HdcpFileHeader>(header);
 
@@ -55,12 +56,18 @@ namespace Aaru.DiscImages
              * We know the image is from a DOS floppy disk, so assume
              * some sane cylinder and sectors-per-track count.
              */
-            if(fheader.sectorsPerTrack < 8 || fheader.sectorsPerTrack > 40) return false;
+            if(fheader.sectorsPerTrack < 8 ||
+               fheader.sectorsPerTrack > 40)
+                return false;
 
-            if(fheader.lastCylinder < 37 || fheader.lastCylinder >= 82) return false;
+            if(fheader.lastCylinder < 37 ||
+               fheader.lastCylinder >= 82)
+                return false;
 
             // Validate the trackmap. First two tracks need to be present
-            if(fheader.trackMap[0] != 1 || fheader.trackMap[1] != 1) return false;
+            if(fheader.trackMap[0] != 1 ||
+               fheader.trackMap[1] != 1)
+                return false;
 
             // all other tracks must be either present (=1) or absent (=0)
             for(int i = 0; i < 2 * 82; i++)
diff --git a/Aaru.Images/HDCopy/Read.cs b/Aaru.Images/HDCopy/Read.cs
index c79bc69cc..fc37dd1f9 100644
--- a/Aaru.Images/HDCopy/Read.cs
+++ b/Aaru.Images/HDCopy/Read.cs
@@ -48,13 +48,14 @@ namespace Aaru.DiscImages
             Stream stream = imageFilter.GetDataForkStream();
             stream.Seek(0, SeekOrigin.Begin);
 
-            byte[] header = new byte[2 + 2 * 82];
-            stream.Read(header, 0, 2 + 2 * 82);
+            byte[] header = new byte[2 + (2 * 82)];
+            stream.Read(header, 0, 2 + (2 * 82));
 
             HdcpFileHeader fheader = Marshal.ByteArrayToStructureLittleEndian<HdcpFileHeader>(header);
+
             AaruConsole.DebugWriteLine("HDCP plugin",
-                                      "Detected HD-Copy image with {0} tracks and {1} sectors per track.",
-                                      fheader.lastCylinder + 1, fheader.sectorsPerTrack);
+                                       "Detected HD-Copy image with {0} tracks and {1} sectors per track.",
+                                       fheader.lastCylinder + 1, fheader.sectorsPerTrack);
 
             imageInfo.Cylinders       = (uint)fheader.lastCylinder + 1;
             imageInfo.SectorsPerTrack = fheader.sectorsPerTrack;
@@ -68,12 +69,13 @@ namespace Aaru.DiscImages
             imageInfo.CreationTime         = imageFilter.GetCreationTime();
             imageInfo.LastModificationTime = imageFilter.GetLastWriteTime();
             imageInfo.MediaTitle           = Path.GetFileNameWithoutExtension(imageFilter.GetFilename());
+
             imageInfo.MediaType = Geometry.GetMediaType(((ushort)imageInfo.Cylinders, 2,
                                                          (ushort)imageInfo.SectorsPerTrack, 512, MediaEncoding.MFM,
                                                          false));
 
             // the start offset of the track data
-            long currentOffset = 2 + 2 * 82;
+            long currentOffset = 2 + (2 * 82);
 
             // build table of track offsets
             for(int i = 0; i < imageInfo.Cylinders * 2; i++)
@@ -82,30 +84,36 @@ namespace Aaru.DiscImages
                 else
                 {
                     // track is present, read the block header
-                    if(currentOffset + 3 >= stream.Length) return false;
+                    if(currentOffset + 3 >= stream.Length)
+                        return false;
 
                     byte[] blkHeader = new byte[2];
                     stream.Read(blkHeader, 0, 2);
                     short blkLength = BitConverter.ToInt16(blkHeader, 0);
 
                     // assume block sizes are positive
-                    if(blkLength < 0) return false;
+                    if(blkLength < 0)
+                        return false;
+
+                    AaruConsole.DebugWriteLine("HDCP plugin", "Track {0} offset 0x{1:x8}, size={2:x4}", i,
+                                               currentOffset, blkLength);
 
-                    AaruConsole.DebugWriteLine("HDCP plugin", "Track {0} offset 0x{1:x8}, size={2:x4}", i, currentOffset,
-                                              blkLength);
                     trackOffset[i] = currentOffset;
 
                     currentOffset += 2 + blkLength;
+
                     // skip the block data
                     stream.Seek(blkLength, SeekOrigin.Current);
                 }
 
             // ensure that the last track is present completely
-            if(currentOffset > stream.Length) return false;
+            if(currentOffset > stream.Length)
+                return false;
 
             // save some variables for later use
             fileHeader      = fheader;
             hdcpImageFilter = imageFilter;
+
             return true;
         }
 
@@ -121,11 +129,14 @@ namespace Aaru.DiscImages
                 throw new ArgumentOutOfRangeException(nameof(sectorAddress), "Sector address not found");
 
             byte[] result = new byte[imageInfo.SectorSize];
-            if(trackOffset[trackNum] == -1) Array.Clear(result, 0, (int)imageInfo.SectorSize);
+
+            if(trackOffset[trackNum] == -1)
+                Array.Clear(result, 0, (int)imageInfo.SectorSize);
             else
             {
                 // track is present in file, make sure it has been loaded
-                if(!trackCache.ContainsKey(trackNum)) ReadTrackIntoCache(hdcpImageFilter.GetDataForkStream(), trackNum);
+                if(!trackCache.ContainsKey(trackNum))
+                    ReadTrackIntoCache(hdcpImageFilter.GetDataForkStream(), trackNum);
 
                 Array.Copy(trackCache[trackNum], sectorOffset * imageInfo.SectorSize, result, 0, imageInfo.SectorSize);
             }
diff --git a/Aaru.Images/HDCopy/Structs.cs b/Aaru.Images/HDCopy/Structs.cs
index 157df1b9e..ceb7d1289 100644
--- a/Aaru.Images/HDCopy/Structs.cs
+++ b/Aaru.Images/HDCopy/Structs.cs
@@ -37,47 +37,33 @@ namespace Aaru.DiscImages
 {
     public partial class HdCopy
     {
-        /// <summary>
-        ///     The global header of a HDCP image file
-        /// </summary>
+        /// <summary>The global header of a HDCP image file</summary>
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct HdcpFileHeader
         {
-            /// <summary>
-            ///     Last cylinder (zero-based)
-            /// </summary>
-            public byte lastCylinder;
+            /// <summary>Last cylinder (zero-based)</summary>
+            public readonly byte lastCylinder;
+
+            /// <summary>Sectors per track</summary>
+            public readonly byte sectorsPerTrack;
 
             /// <summary>
-            ///     Sectors per track
-            /// </summary>
-            public byte sectorsPerTrack;
-
-            /// <summary>
-            ///     The track map. It contains one byte for each track.
-            ///     Up to 82 tracks (41 tracks * 2 sides) are supported.
-            ///     0 means track is not present, 1 means it is present.
-            ///     The first 2 tracks are always present.
+            ///     The track map. It contains one byte for each track. Up to 82 tracks (41 tracks * 2 sides) are supported. 0
+            ///     means track is not present, 1 means it is present. The first 2 tracks are always present.
             /// </summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2 * 82)]
-            public byte[] trackMap;
+            public readonly byte[] trackMap;
         }
 
-        /// <summary>
-        ///     The header for a RLE-compressed block
-        /// </summary>
+        /// <summary>The header for a RLE-compressed block</summary>
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct HdcpBlockHeader
         {
-            /// <summary>
-            ///     The length of the compressed block, in bytes. Little-endian.
-            /// </summary>
-            public ushort length;
+            /// <summary>The length of the compressed block, in bytes. Little-endian.</summary>
+            public readonly ushort length;
 
-            /// <summary>
-            ///     The byte value used as RLE escape sequence
-            /// </summary>
-            public byte escape;
+            /// <summary>The byte value used as RLE escape sequence</summary>
+            public readonly byte escape;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/IMD/Enums.cs b/Aaru.Images/IMD/Enums.cs
index e207e3333..4f08186f5 100644
--- a/Aaru.Images/IMD/Enums.cs
+++ b/Aaru.Images/IMD/Enums.cs
@@ -52,15 +52,9 @@ namespace Aaru.DiscImages
 
         enum SectorType : byte
         {
-            Unavailable            = 0,
-            Normal                 = 1,
-            Compressed             = 2,
-            Deleted                = 3,
-            CompressedDeleted      = 4,
-            Error                  = 5,
-            CompressedError        = 6,
-            DeletedError           = 7,
-            CompressedDeletedError = 8
+            Unavailable     = 0, Normal            = 1, Compressed             = 2,
+            Deleted         = 3, CompressedDeleted = 4, Error                  = 5,
+            CompressedError = 6, DeletedError      = 7, CompressedDeletedError = 8
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/IMD/IMD.cs b/Aaru.Images/IMD/IMD.cs
index 1533e0ab6..704a620e0 100644
--- a/Aaru.Images/IMD/IMD.cs
+++ b/Aaru.Images/IMD/IMD.cs
@@ -42,31 +42,18 @@ namespace Aaru.DiscImages
         ImageInfo    imageInfo;
         List<byte[]> sectorsData;
 
-        public Imd()
+        public Imd() => imageInfo = new ImageInfo
         {
-            imageInfo = new ImageInfo
-            {
-                ReadableSectorTags    = new List<SectorTagType>(),
-                ReadableMediaTags     = new List<MediaTagType>(),
-                HasPartitions         = false,
-                HasSessions           = false,
-                Version               = null,
-                Application           = null,
-                ApplicationVersion    = null,
-                Creator               = null,
-                Comments              = null,
-                MediaManufacturer     = null,
-                MediaModel            = null,
-                MediaSerialNumber     = null,
-                MediaBarcode          = null,
-                MediaPartNumber       = null,
-                MediaSequence         = 0,
-                LastMediaSequence     = 0,
-                DriveManufacturer     = null,
-                DriveModel            = null,
-                DriveSerialNumber     = null,
-                DriveFirmwareRevision = null
-            };
-        }
+            ReadableSectorTags = new List<SectorTagType>(), ReadableMediaTags = new List<MediaTagType>(),
+            HasPartitions      = false, HasSessions                           = false, Version = null,
+            Application        = null,
+            ApplicationVersion = null, Creator = null, Comments = null,
+            MediaManufacturer  = null,
+            MediaModel         = null, MediaSerialNumber = null, MediaBarcode = null,
+            MediaPartNumber    = null,
+            MediaSequence      = 0, LastMediaSequence = 0, DriveManufacturer = null,
+            DriveModel         = null,
+            DriveSerialNumber  = null, DriveFirmwareRevision = null
+        };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/IMD/Identify.cs b/Aaru.Images/IMD/Identify.cs
index 6599a8869..893479acd 100644
--- a/Aaru.Images/IMD/Identify.cs
+++ b/Aaru.Images/IMD/Identify.cs
@@ -43,12 +43,14 @@ namespace Aaru.DiscImages
         {
             Stream stream = imageFilter.GetDataForkStream();
             stream.Seek(0, SeekOrigin.Begin);
-            if(stream.Length < 31) return false;
+
+            if(stream.Length < 31)
+                return false;
 
             byte[] hdr = new byte[31];
             stream.Read(hdr, 0, 31);
 
-            Regex hr = new Regex(REGEX_HEADER);
+            var   hr = new Regex(REGEX_HEADER);
             Match hm = hr.Match(Encoding.ASCII.GetString(hdr));
 
             return hm.Success;
diff --git a/Aaru.Images/IMD/Read.cs b/Aaru.Images/IMD/Read.cs
index 98b3bc690..6ee9bb16a 100644
--- a/Aaru.Images/IMD/Read.cs
+++ b/Aaru.Images/IMD/Read.cs
@@ -48,12 +48,15 @@ namespace Aaru.DiscImages
             Stream stream = imageFilter.GetDataForkStream();
             stream.Seek(0, SeekOrigin.Begin);
 
-            MemoryStream cmt = new MemoryStream();
+            var cmt = new MemoryStream();
             stream.Seek(0x1F, SeekOrigin.Begin);
+
             for(uint i = 0; i < stream.Length; i++)
             {
                 byte b = (byte)stream.ReadByte();
-                if(b == 0x1A) break;
+
+                if(b == 0x1A)
+                    break;
 
                 cmt.WriteByte(b);
             }
@@ -86,46 +89,61 @@ namespace Aaru.DiscImages
                     imageInfo.Cylinders++;
                 }
 
-                if((head & 1) == 1) imageInfo.Heads = 2;
+                if((head & 1) == 1)
+                    imageInfo.Heads = 2;
 
                 stream.Read(idmap, 0, idmap.Length);
-                if((head & SECTOR_CYLINDER_MAP_MASK) == SECTOR_CYLINDER_MAP_MASK) stream.Read(cylmap, 0, cylmap.Length);
+
+                if((head & SECTOR_CYLINDER_MAP_MASK) == SECTOR_CYLINDER_MAP_MASK)
+                    stream.Read(cylmap, 0, cylmap.Length);
+
                 if((head & SECTOR_HEAD_MAP_MASK) == SECTOR_HEAD_MAP_MASK)
                     stream.Read(headmap, 0, headmap.Length);
+
                 if(n == 0xFF)
                 {
                     byte[] bpsbytes = new byte[spt * 2];
                     stream.Read(bpsbytes, 0, bpsbytes.Length);
-                    for(int i = 0; i < spt; i++) bps[i] = BitConverter.ToUInt16(bpsbytes, i * 2);
+
+                    for(int i = 0; i < spt; i++)
+                        bps[i] = BitConverter.ToUInt16(bpsbytes, i * 2);
                 }
                 else
                     for(int i = 0; i < spt; i++)
                         bps[i] = (ushort)(128 << n);
 
-                if(spt > imageInfo.SectorsPerTrack) imageInfo.SectorsPerTrack = spt;
+                if(spt > imageInfo.SectorsPerTrack)
+                    imageInfo.SectorsPerTrack = spt;
 
                 SortedDictionary<byte, byte[]> track = new SortedDictionary<byte, byte[]>();
 
                 for(int i = 0; i < spt; i++)
                 {
-                    SectorType type = (SectorType)stream.ReadByte();
-                    byte[]     data = new byte[bps[i]];
+                    var    type = (SectorType)stream.ReadByte();
+                    byte[] data = new byte[bps[i]];
 
                     // TODO; Handle disks with different bps in track 0
-                    if(bps[i] > imageInfo.SectorSize) imageInfo.SectorSize = bps[i];
+                    if(bps[i] > imageInfo.SectorSize)
+                        imageInfo.SectorSize = bps[i];
 
                     switch(type)
                     {
                         case SectorType.Unavailable:
-                            if(!track.ContainsKey(idmap[i])) track.Add(idmap[i], data);
+                            if(!track.ContainsKey(idmap[i]))
+                                track.Add(idmap[i], data);
+
                             break;
                         case SectorType.Normal:
                         case SectorType.Deleted:
                         case SectorType.Error:
                         case SectorType.DeletedError:
                             stream.Read(data, 0, data.Length);
-                            if(!track.ContainsKey(idmap[i])) track.Add(idmap[i], data);
+
+                            if(!track.ContainsKey(idmap[i]))
+                                track.Add(idmap[i], data);
+
                             imageInfo.ImageSize += (ulong)data.Length;
+
                             break;
                         case SectorType.Compressed:
                         case SectorType.CompressedDeleted:
@@ -133,7 +151,10 @@ namespace Aaru.DiscImages
                         case SectorType.CompressedDeletedError:
                             byte filling = (byte)stream.ReadByte();
                             ArrayHelpers.ArrayFill(data, filling);
-                            if(!track.ContainsKey(idmap[i])) track.Add(idmap[i], data);
+
+                            if(!track.ContainsKey(idmap[i]))
+                                track.Add(idmap[i], data);
+
                             break;
                         default: throw new ImageNotSupportedException($"Invalid sector type {(byte)type}");
                     }
@@ -147,6 +168,7 @@ namespace Aaru.DiscImages
             }
 
             imageInfo.Application = "IMD";
+
             // TODO: The header is the date of dump or the date of the application compilation?
             imageInfo.CreationTime         = imageFilter.GetCreationTime();
             imageInfo.LastModificationTime = imageFilter.GetLastWriteTime();
@@ -156,7 +178,10 @@ namespace Aaru.DiscImages
             imageInfo.MediaType            = MediaType.Unknown;
 
             MediaEncoding mediaEncoding = MediaEncoding.MFM;
-            if(mode == TransferRate.TwoHundred || mode == TransferRate.ThreeHundred || mode == TransferRate.FiveHundred)
+
+            if(mode == TransferRate.TwoHundred   ||
+               mode == TransferRate.ThreeHundred ||
+               mode == TransferRate.FiveHundred)
                 mediaEncoding = MediaEncoding.FM;
 
             imageInfo.MediaType = Geometry.GetMediaType(((ushort)imageInfo.Cylinders, (byte)imageInfo.Heads,
@@ -167,18 +192,22 @@ namespace Aaru.DiscImages
             {
                 case MediaType.NEC_525_HD when mode == TransferRate.FiveHundredMfm:
                     imageInfo.MediaType = MediaType.NEC_35_HD_8;
+
                     break;
                 case MediaType.DOS_525_HD when mode == TransferRate.FiveHundredMfm:
                     imageInfo.MediaType = MediaType.NEC_35_HD_15;
+
                     break;
                 case MediaType.RX50 when mode == TransferRate.FiveHundredMfm:
                     imageInfo.MediaType = MediaType.ATARI_35_SS_DD;
+
                     break;
             }
 
             imageInfo.XmlMediaType = XmlMediaType.BlockMedia;
 
             AaruConsole.VerboseWriteLine("IMD image contains a disk of type {0}", imageInfo.MediaType);
+
             if(!string.IsNullOrEmpty(imageInfo.Comments))
                 AaruConsole.VerboseWriteLine("IMD comments: {0}", imageInfo.Comments);
 
@@ -195,7 +224,8 @@ namespace Aaru.DiscImages
             if(sectorAddress + length > imageInfo.Sectors)
                 throw new ArgumentOutOfRangeException(nameof(length), "Requested more sectors than available");
 
-            MemoryStream buffer = new MemoryStream();
+            var buffer = new MemoryStream();
+
             for(int i = 0; i < length; i++)
                 buffer.Write(sectorsData[(int)sectorAddress + i], 0, sectorsData[(int)sectorAddress + i].Length);
 
diff --git a/Aaru.Images/KryoFlux/Enums.cs b/Aaru.Images/KryoFlux/Enums.cs
index 834839072..fb2070cb3 100644
--- a/Aaru.Images/KryoFlux/Enums.cs
+++ b/Aaru.Images/KryoFlux/Enums.cs
@@ -36,30 +36,17 @@ namespace Aaru.DiscImages
     {
         enum BlockIds : byte
         {
-            Flux2   = 0x00,
-            Flux2_1 = 0x01,
-            Flux2_2 = 0x02,
-            Flux2_3 = 0x03,
-            Flux2_4 = 0x04,
-            Flux2_5 = 0x05,
-            Flux2_6 = 0x06,
-            Flux2_7 = 0x07,
-            Nop1    = 0x08,
-            Nop2    = 0x09,
-            Nop3    = 0x0A,
-            Ovl16   = 0x0B,
-            Flux3   = 0x0C,
-            Oob     = 0x0D
+            Flux2   = 0x00, Flux2_1 = 0x01, Flux2_2 = 0x02,
+            Flux2_3 = 0x03, Flux2_4 = 0x04, Flux2_5 = 0x05,
+            Flux2_6 = 0x06, Flux2_7 = 0x07, Nop1    = 0x08,
+            Nop2    = 0x09, Nop3    = 0x0A, Ovl16   = 0x0B,
+            Flux3   = 0x0C, Oob     = 0x0D
         }
 
         enum OobTypes : byte
         {
-            Invalid    = 0x00,
-            StreamInfo = 0x01,
-            Index      = 0x02,
-            StreamEnd  = 0x03,
-            KFInfo     = 0x04,
-            EOF        = 0x0D
+            Invalid   = 0x00, StreamInfo = 0x01, Index = 0x02,
+            StreamEnd = 0x03, KFInfo     = 0x04, EOF   = 0x0D
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/KryoFlux/Identify.cs b/Aaru.Images/KryoFlux/Identify.cs
index 1c82d9cfb..fa021cf9d 100644
--- a/Aaru.Images/KryoFlux/Identify.cs
+++ b/Aaru.Images/KryoFlux/Identify.cs
@@ -42,7 +42,9 @@ namespace Aaru.DiscImages
         {
             Stream stream = imageFilter.GetDataForkStream();
             stream.Seek(0, SeekOrigin.Begin);
-            if(stream.Length < Marshal.SizeOf<OobBlock>()) return false;
+
+            if(stream.Length < Marshal.SizeOf<OobBlock>())
+                return false;
 
             byte[] hdr = new byte[Marshal.SizeOf<OobBlock>()];
             stream.Read(hdr, 0, Marshal.SizeOf<OobBlock>());
diff --git a/Aaru.Images/KryoFlux/KryoFlux.cs b/Aaru.Images/KryoFlux/KryoFlux.cs
index cfc65ebb3..dcc13e88e 100644
--- a/Aaru.Images/KryoFlux/KryoFlux.cs
+++ b/Aaru.Images/KryoFlux/KryoFlux.cs
@@ -44,31 +44,18 @@ namespace Aaru.DiscImages
         // TODO: These variables have been made public so create-sidecar can access to this information until I define an API >4.0
         public SortedDictionary<byte, IFilter> tracks;
 
-        public KryoFlux()
+        public KryoFlux() => imageInfo = new ImageInfo
         {
-            imageInfo = new ImageInfo
-            {
-                ReadableSectorTags    = new List<SectorTagType>(),
-                ReadableMediaTags     = new List<MediaTagType>(),
-                HasPartitions         = false,
-                HasSessions           = false,
-                Version               = null,
-                Application           = null,
-                ApplicationVersion    = null,
-                Creator               = null,
-                Comments              = null,
-                MediaManufacturer     = null,
-                MediaModel            = null,
-                MediaSerialNumber     = null,
-                MediaBarcode          = null,
-                MediaPartNumber       = null,
-                MediaSequence         = 0,
-                LastMediaSequence     = 0,
-                DriveManufacturer     = null,
-                DriveModel            = null,
-                DriveSerialNumber     = null,
-                DriveFirmwareRevision = null
-            };
-        }
+            ReadableSectorTags = new List<SectorTagType>(), ReadableMediaTags = new List<MediaTagType>(),
+            HasPartitions      = false, HasSessions                           = false, Version = null,
+            Application        = null,
+            ApplicationVersion = null, Creator = null, Comments = null,
+            MediaManufacturer  = null,
+            MediaModel         = null, MediaSerialNumber = null, MediaBarcode = null,
+            MediaPartNumber    = null,
+            MediaSequence      = 0, LastMediaSequence = 0, DriveManufacturer = null,
+            DriveModel         = null,
+            DriveSerialNumber  = null, DriveFirmwareRevision = null
+        };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/KryoFlux/Read.cs b/Aaru.Images/KryoFlux/Read.cs
index f3bd0cc07..88be0c20f 100644
--- a/Aaru.Images/KryoFlux/Read.cs
+++ b/Aaru.Images/KryoFlux/Read.cs
@@ -49,7 +49,9 @@ namespace Aaru.DiscImages
         {
             Stream stream = imageFilter.GetDataForkStream();
             stream.Seek(0, SeekOrigin.Begin);
-            if(stream.Length < Marshal.SizeOf<OobBlock>()) return false;
+
+            if(stream.Length < Marshal.SizeOf<OobBlock>())
+                return false;
 
             byte[] hdr = new byte[Marshal.SizeOf<OobBlock>()];
             stream.Read(hdr, 0, Marshal.SizeOf<OobBlock>());
@@ -63,25 +65,29 @@ namespace Aaru.DiscImages
 
             OobBlock footer = Marshal.ByteArrayToStructureLittleEndian<OobBlock>(hdr);
 
-            if(header.blockId != BlockIds.Oob || header.blockType != OobTypes.KFInfo ||
-               footer.blockId != BlockIds.Oob || footer.blockType != OobTypes.EOF    ||
-               footer.length  != 0x0D0D) return false;
+            if(header.blockId   != BlockIds.Oob    ||
+               header.blockType != OobTypes.KFInfo ||
+               footer.blockId   != BlockIds.Oob    ||
+               footer.blockType != OobTypes.EOF    ||
+               footer.length    != 0x0D0D)
+                return false;
 
             // TODO: This is supposing NoFilter, shouldn't
             tracks = new SortedDictionary<byte, IFilter>();
             byte step    = 1;
             byte heads   = 2;
             bool topHead = false;
+
             string basename = Path.Combine(imageFilter.GetParentFolder(),
-                                           imageFilter.GetFilename()
-                                                      .Substring(0, imageFilter.GetFilename().Length - 8));
+                                           imageFilter.
+                                               GetFilename().Substring(0, imageFilter.GetFilename().Length - 8));
 
             for(byte t = 0; t < 166; t += step)
             {
                 int cylinder = t / heads;
                 int head     = topHead ? 1 : t % heads;
-                string trackfile = Directory.Exists(basename)
-                                       ? Path.Combine(basename, $"{cylinder:D2}.{head:D1}.raw")
+
+                string trackfile = Directory.Exists(basename) ? Path.Combine(basename, $"{cylinder:D2}.{head:D1}.raw")
                                        : $"{basename}{cylinder:D2}.{head:D1}.raw";
 
                 if(!File.Exists(trackfile))
@@ -90,40 +96,50 @@ namespace Aaru.DiscImages
                         if(head == 0)
                         {
                             AaruConsole.DebugWriteLine("KryoFlux plugin",
-                                                      "Cannot find cyl 0 hd 0, supposing only top head was dumped");
+                                                       "Cannot find cyl 0 hd 0, supposing only top head was dumped");
+
                             topHead = true;
                             heads   = 1;
+
                             continue;
                         }
 
                         AaruConsole.DebugWriteLine("KryoFlux plugin",
-                                                  "Cannot find cyl 0 hd 1, supposing only bottom head was dumped");
+                                                   "Cannot find cyl 0 hd 1, supposing only bottom head was dumped");
+
                         heads = 1;
+
                         continue;
                     }
                     else if(cylinder == 1)
                     {
                         AaruConsole.DebugWriteLine("KryoFlux plugin", "Cannot find cyl 1, supposing double stepping");
                         step = 2;
+
                         continue;
                     }
                     else
                     {
                         AaruConsole.DebugWriteLine("KryoFlux plugin", "Arrived end of disk at cylinder {0}", cylinder);
+
                         break;
                     }
 
-                ZZZNoFilter trackFilter = new ZZZNoFilter();
+                var trackFilter = new ZZZNoFilter();
                 trackFilter.Open(trackfile);
-                if(!trackFilter.IsOpened()) throw new IOException("Could not open KryoFlux track file.");
+
+                if(!trackFilter.IsOpened())
+                    throw new IOException("Could not open KryoFlux track file.");
 
                 imageInfo.CreationTime         = DateTime.MaxValue;
                 imageInfo.LastModificationTime = DateTime.MinValue;
 
                 Stream trackStream = trackFilter.GetDataForkStream();
+
                 while(trackStream.Position < trackStream.Length)
                 {
                     byte blockId = (byte)trackStream.ReadByte();
+
                     switch(blockId)
                     {
                         case (byte)BlockIds.Oob:
@@ -138,19 +154,25 @@ namespace Aaru.DiscImages
                             if(oobBlk.blockType == OobTypes.EOF)
                             {
                                 trackStream.Position = trackStream.Length;
+
                                 break;
                             }
 
                             if(oobBlk.blockType != OobTypes.KFInfo)
                             {
                                 trackStream.Position += oobBlk.length;
+
                                 break;
                             }
 
                             byte[] kfinfo = new byte[oobBlk.length];
                             trackStream.Read(kfinfo, 0, oobBlk.length);
-                            string   kfinfoStr = StringHandlers.CToString(kfinfo);
-                            string[] lines     = kfinfoStr.Split(new[] {','}, StringSplitOptions.RemoveEmptyEntries);
+                            string kfinfoStr = StringHandlers.CToString(kfinfo);
+
+                            string[] lines = kfinfoStr.Split(new[]
+                            {
+                                ','
+                            }, StringSplitOptions.RemoveEmptyEntries);
 
                             DateTime blockDate = DateTime.Now;
                             DateTime blockTime = DateTime.Now;
@@ -168,27 +190,34 @@ namespace Aaru.DiscImages
                                         if(DateTime.TryParseExact(kvp[1], "yyyy.MM.dd", CultureInfo.InvariantCulture,
                                                                   DateTimeStyles.AssumeLocal, out blockDate))
                                             foundDate = true;
+
                                         break;
                                     case hostTime:
                                         DateTime.TryParseExact(kvp[1], "HH:mm:ss", CultureInfo.InvariantCulture,
                                                                DateTimeStyles.AssumeLocal, out blockTime);
+
                                         break;
                                     case kfName:
                                         imageInfo.Application = kvp[1];
+
                                         break;
                                     case kfVersion:
                                         imageInfo.ApplicationVersion = kvp[1];
+
                                         break;
                                 }
                             }
 
                             if(foundDate)
                             {
-                                DateTime blockTimestamp = new DateTime(blockDate.Year, blockDate.Month, blockDate.Day,
-                                                                       blockTime.Hour, blockTime.Minute,
-                                                                       blockTime.Second);
+                                var blockTimestamp = new DateTime(blockDate.Year, blockDate.Month, blockDate.Day,
+                                                                  blockTime.Hour, blockTime.Minute, blockTime.Second);
+
                                 AaruConsole.DebugWriteLine("KryoFlux plugin", "Found timestamp: {0}", blockTimestamp);
-                                if(blockTimestamp < Info.CreationTime) imageInfo.CreationTime = blockTimestamp;
+
+                                if(blockTimestamp < Info.CreationTime)
+                                    imageInfo.CreationTime = blockTimestamp;
+
                                 if(blockTimestamp > Info.LastModificationTime)
                                     imageInfo.LastModificationTime = blockTimestamp;
                             }
@@ -205,10 +234,12 @@ namespace Aaru.DiscImages
                         case (byte)BlockIds.Flux2_7:
                         case (byte)BlockIds.Nop2:
                             trackStream.Position++;
+
                             continue;
                         case (byte)BlockIds.Nop3:
                         case (byte)BlockIds.Flux3:
                             trackStream.Position += 2;
+
                             continue;
                         default: continue;
                     }
diff --git a/Aaru.Images/KryoFlux/Structs.cs b/Aaru.Images/KryoFlux/Structs.cs
index 82eb4cb9c..22233eff0 100644
--- a/Aaru.Images/KryoFlux/Structs.cs
+++ b/Aaru.Images/KryoFlux/Structs.cs
@@ -39,9 +39,9 @@ namespace Aaru.DiscImages
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct OobBlock
         {
-            public BlockIds blockId;
-            public OobTypes blockType;
-            public ushort   length;
+            public readonly BlockIds blockId;
+            public readonly OobTypes blockType;
+            public readonly ushort   length;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/KryoFlux/Verify.cs b/Aaru.Images/KryoFlux/Verify.cs
index c66e14c59..2ee78680e 100644
--- a/Aaru.Images/KryoFlux/Verify.cs
+++ b/Aaru.Images/KryoFlux/Verify.cs
@@ -40,7 +40,7 @@ namespace Aaru.DiscImages
         public bool? VerifySector(ulong sectorAddress) =>
             throw new NotImplementedException("Flux decoding is not yet implemented.");
 
-        public bool? VerifySectors(ulong           sectorAddress, uint length, out List<ulong> failingLbas,
+        public bool? VerifySectors(ulong sectorAddress, uint length, out List<ulong> failingLbas,
                                    out List<ulong> unknownLbas) =>
             throw new NotImplementedException("Flux decoding is not yet implemented.");
     }
diff --git a/Aaru.Images/MaxiDisk/Enums.cs b/Aaru.Images/MaxiDisk/Enums.cs
index 6d9421769..e7730de9d 100644
--- a/Aaru.Images/MaxiDisk/Enums.cs
+++ b/Aaru.Images/MaxiDisk/Enums.cs
@@ -36,18 +36,10 @@ namespace Aaru.DiscImages
     {
         enum HdkDiskTypes : byte
         {
-            Dos360   = 0,
-            Maxi420  = 1,
-            Dos720   = 2,
-            Maxi800  = 3,
-            Dos1200  = 4,
-            Maxi1400 = 5,
-            Dos1440  = 6,
-            Mac1440  = 7,
-            Maxi1600 = 8,
-            Dmf      = 9,
-            Dos2880  = 10,
-            Maxi3200 = 11
+            Dos360  = 0, Maxi420 = 1, Dos720    = 2,
+            Maxi800 = 3, Dos1200 = 4, Maxi1400  = 5,
+            Dos1440 = 6, Mac1440 = 7, Maxi1600  = 8,
+            Dmf     = 9, Dos2880 = 10, Maxi3200 = 11
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/MaxiDisk/Identify.cs b/Aaru.Images/MaxiDisk/Identify.cs
index d169f3f5b..9e7464d12 100644
--- a/Aaru.Images/MaxiDisk/Identify.cs
+++ b/Aaru.Images/MaxiDisk/Identify.cs
@@ -43,7 +43,8 @@ namespace Aaru.DiscImages
         {
             Stream stream = imageFilter.GetDataForkStream();
 
-            if(stream.Length < 8) return false;
+            if(stream.Length < 8)
+                return false;
 
             byte[] buffer = new byte[8];
             stream.Seek(0, SeekOrigin.Begin);
@@ -51,13 +52,15 @@ namespace Aaru.DiscImages
 
             HdkHeader tmpHeader = Marshal.ByteArrayToStructureLittleEndian<HdkHeader>(buffer);
 
-            AaruConsole.DebugWriteLine("MAXI Disk plugin", "tmp_header.unknown = {0}",        tmpHeader.unknown);
-            AaruConsole.DebugWriteLine("MAXI Disk plugin", "tmp_header.diskType = {0}",       tmpHeader.diskType);
-            AaruConsole.DebugWriteLine("MAXI Disk plugin", "tmp_header.heads = {0}",          tmpHeader.heads);
-            AaruConsole.DebugWriteLine("MAXI Disk plugin", "tmp_header.cylinders = {0}",      tmpHeader.cylinders);
+            AaruConsole.DebugWriteLine("MAXI Disk plugin", "tmp_header.unknown = {0}", tmpHeader.unknown);
+            AaruConsole.DebugWriteLine("MAXI Disk plugin", "tmp_header.diskType = {0}", tmpHeader.diskType);
+            AaruConsole.DebugWriteLine("MAXI Disk plugin", "tmp_header.heads = {0}", tmpHeader.heads);
+            AaruConsole.DebugWriteLine("MAXI Disk plugin", "tmp_header.cylinders = {0}", tmpHeader.cylinders);
             AaruConsole.DebugWriteLine("MAXI Disk plugin", "tmp_header.bytesPerSector = {0}", tmpHeader.bytesPerSector);
+
             AaruConsole.DebugWriteLine("MAXI Disk plugin", "tmp_header.sectorsPerTrack = {0}",
-                                      tmpHeader.sectorsPerTrack);
+                                       tmpHeader.sectorsPerTrack);
+
             AaruConsole.DebugWriteLine("MAXI Disk plugin", "tmp_header.unknown2 = {0}", tmpHeader.unknown2);
             AaruConsole.DebugWriteLine("MAXI Disk plugin", "tmp_header.unknown3 = {0}", tmpHeader.unknown3);
 
@@ -67,16 +70,20 @@ namespace Aaru.DiscImages
             //    return false;
 
             // Only floppies supported
-            if(tmpHeader.heads == 0 || tmpHeader.heads > 2) return false;
+            if(tmpHeader.heads == 0 ||
+               tmpHeader.heads > 2)
+                return false;
 
             // No floppies with more than this?
-            if(tmpHeader.cylinders > 90) return false;
+            if(tmpHeader.cylinders > 90)
+                return false;
 
             // Maximum supported bps is 16384
-            if(tmpHeader.bytesPerSector > 7) return false;
+            if(tmpHeader.bytesPerSector > 7)
+                return false;
 
-            int expectedFileSize = tmpHeader.heads * tmpHeader.cylinders * tmpHeader.sectorsPerTrack *
-                                   (128 << tmpHeader.bytesPerSector) + 8;
+            int expectedFileSize = (tmpHeader.heads * tmpHeader.cylinders * tmpHeader.sectorsPerTrack *
+                                    (128 << tmpHeader.bytesPerSector)) + 8;
 
             return expectedFileSize == stream.Length;
         }
diff --git a/Aaru.Images/MaxiDisk/MaxiDisk.cs b/Aaru.Images/MaxiDisk/MaxiDisk.cs
index 4da6719cd..67e71af1d 100644
--- a/Aaru.Images/MaxiDisk/MaxiDisk.cs
+++ b/Aaru.Images/MaxiDisk/MaxiDisk.cs
@@ -45,29 +45,17 @@ namespace Aaru.DiscImages
         ImageInfo  imageInfo;
         FileStream writingStream;
 
-        public MaxiDisk()
+        public MaxiDisk() => imageInfo = new ImageInfo
         {
-            imageInfo = new ImageInfo
-            {
-                ReadableSectorTags    = new List<SectorTagType>(),
-                ReadableMediaTags     = new List<MediaTagType>(),
-                HasPartitions         = false,
-                HasSessions           = false,
-                Application           = "MAXI Disk",
-                Creator               = null,
-                Comments              = null,
-                MediaManufacturer     = null,
-                MediaModel            = null,
-                MediaSerialNumber     = null,
-                MediaBarcode          = null,
-                MediaPartNumber       = null,
-                MediaSequence         = 0,
-                LastMediaSequence     = 0,
-                DriveManufacturer     = null,
-                DriveModel            = null,
-                DriveSerialNumber     = null,
-                DriveFirmwareRevision = null
-            };
-        }
+            ReadableSectorTags    = new List<SectorTagType>(), ReadableMediaTags = new List<MediaTagType>(),
+            HasPartitions         = false, HasSessions                           = false, Application = "MAXI Disk",
+            Creator               = null,
+            Comments              = null, MediaManufacturer = null, MediaModel = null,
+            MediaSerialNumber     = null,
+            MediaBarcode          = null, MediaPartNumber = null, MediaSequence = 0,
+            LastMediaSequence     = 0,
+            DriveManufacturer     = null, DriveModel = null, DriveSerialNumber = null,
+            DriveFirmwareRevision = null
+        };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/MaxiDisk/Properties.cs b/Aaru.Images/MaxiDisk/Properties.cs
index 46ad9874b..d74316769 100644
--- a/Aaru.Images/MaxiDisk/Properties.cs
+++ b/Aaru.Images/MaxiDisk/Properties.cs
@@ -41,32 +41,36 @@ namespace Aaru.DiscImages
 {
     public partial class MaxiDisk
     {
-        public ImageInfo                  Info                => imageInfo;
-        public string                     Author              => "Natalia Portillo";
-        public string                     Name                => "MAXI Disk image";
-        public Guid                       Id                  => new Guid("D27D924A-7034-466E-ADE1-B81EF37E469E");
-        public string                     Format              => "MAXI Disk";
-        public List<DumpHardwareType>     DumpHardware        => null;
-        public CICMMetadataType           CicmMetadata        => null;
-        public IEnumerable<MediaTagType>  SupportedMediaTags  => new MediaTagType[] { };
-        public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[] { };
+        public ImageInfo              Info         => imageInfo;
+        public string                 Author       => "Natalia Portillo";
+        public string                 Name         => "MAXI Disk image";
+        public Guid                   Id           => new Guid("D27D924A-7034-466E-ADE1-B81EF37E469E");
+        public string                 Format       => "MAXI Disk";
+        public List<DumpHardwareType> DumpHardware => null;
+        public CICMMetadataType       CicmMetadata => null;
+        public IEnumerable<MediaTagType> SupportedMediaTags => new MediaTagType[]
+            {};
+        public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[]
+            {};
+
         // TODO: Test with real hardware to see real supported media
-        public IEnumerable<MediaType> SupportedMediaTypes =>
-            new[]
-            {
-                MediaType.Apricot_35, MediaType.ATARI_35_DS_DD, MediaType.ATARI_35_DS_DD_11,
-                MediaType.ATARI_35_SS_DD, MediaType.ATARI_35_SS_DD_11, MediaType.DMF, MediaType.DMF_82,
-                MediaType.DOS_35_DS_DD_8, MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_ED, MediaType.DOS_35_HD,
-                MediaType.DOS_35_SS_DD_8, MediaType.DOS_35_SS_DD_9, MediaType.DOS_525_DS_DD_8,
-                MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_HD, MediaType.DOS_525_SS_DD_8,
-                MediaType.DOS_525_SS_DD_9, MediaType.FDFORMAT_35_DD, MediaType.FDFORMAT_35_HD,
-                MediaType.FDFORMAT_525_DD, MediaType.FDFORMAT_525_HD, MediaType.RX50, MediaType.XDF_35,
-                MediaType.XDF_525
-            };
+        public IEnumerable<MediaType> SupportedMediaTypes => new[]
+        {
+            MediaType.Apricot_35, MediaType.ATARI_35_DS_DD, MediaType.ATARI_35_DS_DD_11, MediaType.ATARI_35_SS_DD,
+            MediaType.ATARI_35_SS_DD_11, MediaType.DMF, MediaType.DMF_82, MediaType.DOS_35_DS_DD_8,
+            MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_ED, MediaType.DOS_35_HD, MediaType.DOS_35_SS_DD_8,
+            MediaType.DOS_35_SS_DD_9, MediaType.DOS_525_DS_DD_8, MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_HD,
+            MediaType.DOS_525_SS_DD_8, MediaType.DOS_525_SS_DD_9, MediaType.FDFORMAT_35_DD, MediaType.FDFORMAT_35_HD,
+            MediaType.FDFORMAT_525_DD, MediaType.FDFORMAT_525_HD, MediaType.RX50, MediaType.XDF_35, MediaType.XDF_525
+        };
         public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
-            new (string name, Type type, string description, object @default)[] { };
-        public IEnumerable<string> KnownExtensions => new[] {".hdk"};
-        public bool                IsWriting       { get; private set; }
-        public string              ErrorMessage    { get; private set; }
+            new (string name, Type type, string description, object @default)[]
+                {};
+        public IEnumerable<string> KnownExtensions => new[]
+        {
+            ".hdk"
+        };
+        public bool   IsWriting    { get; private set; }
+        public string ErrorMessage { get; private set; }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/MaxiDisk/Read.cs b/Aaru.Images/MaxiDisk/Read.cs
index dd60047b4..5bce6b968 100644
--- a/Aaru.Images/MaxiDisk/Read.cs
+++ b/Aaru.Images/MaxiDisk/Read.cs
@@ -45,7 +45,8 @@ namespace Aaru.DiscImages
         {
             Stream stream = imageFilter.GetDataForkStream();
 
-            if(stream.Length < 8) return false;
+            if(stream.Length < 8)
+                return false;
 
             byte[] buffer = new byte[8];
             stream.Seek(0, SeekOrigin.Begin);
@@ -59,18 +60,23 @@ namespace Aaru.DiscImages
             //    return false;
 
             // Only floppies supported
-            if(tmpHeader.heads == 0 || tmpHeader.heads > 2) return false;
+            if(tmpHeader.heads == 0 ||
+               tmpHeader.heads > 2)
+                return false;
 
             // No floppies with more than this?
-            if(tmpHeader.cylinders > 90) return false;
+            if(tmpHeader.cylinders > 90)
+                return false;
 
             // Maximum supported bps is 16384
-            if(tmpHeader.bytesPerSector > 7) return false;
+            if(tmpHeader.bytesPerSector > 7)
+                return false;
 
-            int expectedFileSize = tmpHeader.heads * tmpHeader.cylinders * tmpHeader.sectorsPerTrack *
-                                   (128 << tmpHeader.bytesPerSector) + 8;
+            int expectedFileSize = (tmpHeader.heads * tmpHeader.cylinders * tmpHeader.sectorsPerTrack *
+                                    (128 << tmpHeader.bytesPerSector)) + 8;
 
-            if(expectedFileSize != stream.Length) return false;
+            if(expectedFileSize != stream.Length)
+                return false;
 
             imageInfo.Cylinders       = tmpHeader.cylinders;
             imageInfo.Heads           = tmpHeader.heads;
@@ -106,7 +112,7 @@ namespace Aaru.DiscImages
             byte[] buffer = new byte[length * imageInfo.SectorSize];
 
             Stream stream = hdkImageFilter.GetDataForkStream();
-            stream.Seek((long)(8 + sectorAddress * imageInfo.SectorSize), SeekOrigin.Begin);
+            stream.Seek((long)(8 + (sectorAddress * imageInfo.SectorSize)), SeekOrigin.Begin);
             stream.Read(buffer, 0, (int)(length * imageInfo.SectorSize));
 
             return buffer;
diff --git a/Aaru.Images/MaxiDisk/Structs.cs b/Aaru.Images/MaxiDisk/Structs.cs
index b202bef9a..25ceaa5df 100644
--- a/Aaru.Images/MaxiDisk/Structs.cs
+++ b/Aaru.Images/MaxiDisk/Structs.cs
@@ -39,14 +39,14 @@ namespace Aaru.DiscImages
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct HdkHeader
         {
-            public byte unknown;
-            public byte diskType;
-            public byte heads;
-            public byte cylinders;
-            public byte bytesPerSector;
-            public byte sectorsPerTrack;
-            public byte unknown2;
-            public byte unknown3;
+            public readonly byte unknown;
+            public          byte diskType;
+            public          byte heads;
+            public          byte cylinders;
+            public          byte bytesPerSector;
+            public          byte sectorsPerTrack;
+            public readonly byte unknown2;
+            public readonly byte unknown3;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/MaxiDisk/Write.cs b/Aaru.Images/MaxiDisk/Write.cs
index 24820f683..e47a1cc2e 100644
--- a/Aaru.Images/MaxiDisk/Write.cs
+++ b/Aaru.Images/MaxiDisk/Write.cs
@@ -45,65 +45,75 @@ namespace Aaru.DiscImages
     public partial class MaxiDisk
     {
         public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
-                           uint   sectorSize)
+                           uint sectorSize)
         {
-            if(CountBits.Count(sectorSize) != 1 || sectorSize > 16384)
+            if(CountBits.Count(sectorSize) != 1 ||
+               sectorSize                  > 16384)
             {
                 ErrorMessage = "Unsupported sector size";
+
                 return false;
             }
 
             if(sectors > 90 * 2 * 255)
             {
                 ErrorMessage = "Too many sectors";
+
                 return false;
             }
 
             if(!SupportedMediaTypes.Contains(mediaType))
             {
                 ErrorMessage = $"Unsupport media format {mediaType}";
+
                 return false;
             }
 
             (ushort cylinders, byte heads, ushort sectorsPerTrack, uint bytesPerSector, MediaEncoding encoding, bool
                 variableSectorsPerTrack, MediaType type) geometry = Geometry.GetGeometry(mediaType);
+
             imageInfo = new ImageInfo
             {
-                MediaType       = mediaType,
-                SectorSize      = sectorSize,
-                Sectors         = sectors,
-                Cylinders       = geometry.cylinders,
-                Heads           = geometry.heads,
-                SectorsPerTrack = geometry.sectorsPerTrack
+                MediaType = mediaType, SectorSize = sectorSize, Sectors = sectors,
+                Cylinders = geometry.cylinders,
+                Heads     = geometry.heads, SectorsPerTrack = geometry.sectorsPerTrack
             };
 
             if(imageInfo.Cylinders > 90)
             {
                 ErrorMessage = "Too many cylinders";
+
                 return false;
             }
 
             if(imageInfo.Heads > 2)
             {
                 ErrorMessage = "Too many heads";
+
                 return false;
             }
 
-            try { writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None); }
+            try
+            {
+                writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
+            }
             catch(IOException e)
             {
                 ErrorMessage = $"Could not create new image file, exception {e.Message}";
+
                 return false;
             }
 
             IsWriting    = true;
             ErrorMessage = null;
+
             return true;
         }
 
         public bool WriteMediaTag(byte[] data, MediaTagType tag)
         {
             ErrorMessage = "Writing media tags is not supported.";
+
             return false;
         }
 
@@ -112,26 +122,31 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Tried to write on a non-writable image";
+
                 return false;
             }
 
             if(data.Length != 512)
             {
                 ErrorMessage = "Incorrect data size";
+
                 return false;
             }
 
             if(sectorAddress >= imageInfo.Sectors)
             {
                 ErrorMessage = "Tried to write past image size";
+
                 return false;
             }
 
-            writingStream.Seek((long)((ulong)Marshal.SizeOf<HdkHeader>() + sectorAddress * imageInfo.SectorSize),
+            writingStream.Seek((long)((ulong)Marshal.SizeOf<HdkHeader>() + (sectorAddress * imageInfo.SectorSize)),
                                SeekOrigin.Begin);
+
             writingStream.Write(data, 0, data.Length);
 
             ErrorMessage = "";
+
             return true;
         }
 
@@ -140,38 +155,45 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Tried to write on a non-writable image";
+
                 return false;
             }
 
             if(data.Length % 512 != 0)
             {
                 ErrorMessage = "Incorrect data size";
+
                 return false;
             }
 
             if(sectorAddress + length > imageInfo.Sectors)
             {
                 ErrorMessage = "Tried to write past image size";
+
                 return false;
             }
 
-            writingStream.Seek((long)((ulong)Marshal.SizeOf<HdkHeader>() + sectorAddress * imageInfo.SectorSize),
+            writingStream.Seek((long)((ulong)Marshal.SizeOf<HdkHeader>() + (sectorAddress * imageInfo.SectorSize)),
                                SeekOrigin.Begin);
+
             writingStream.Write(data, 0, data.Length);
 
             ErrorMessage = "";
+
             return true;
         }
 
         public bool WriteSectorLong(byte[] data, ulong sectorAddress)
         {
             ErrorMessage = "Writing sectors with tags is not supported.";
+
             return false;
         }
 
         public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
         {
             ErrorMessage = "Writing sectors with tags is not supported.";
+
             return false;
         }
 
@@ -180,15 +202,14 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Image is not opened for writing";
+
                 return false;
             }
 
-            HdkHeader header = new HdkHeader
+            var header = new HdkHeader
             {
-                diskType        = (byte)HdkDiskTypes.Dos2880,
-                cylinders       = (byte)imageInfo.Cylinders,
-                heads           = (byte)imageInfo.Heads,
-                sectorsPerTrack = (byte)imageInfo.SectorsPerTrack
+                diskType = (byte)HdkDiskTypes.Dos2880, cylinders  = (byte)imageInfo.Cylinders,
+                heads    = (byte)imageInfo.Heads, sectorsPerTrack = (byte)imageInfo.SectorsPerTrack
             };
 
             for(uint i = imageInfo.SectorSize / 128; i > 1;)
@@ -211,6 +232,7 @@ namespace Aaru.DiscImages
 
             IsWriting    = false;
             ErrorMessage = "";
+
             return true;
         }
 
@@ -221,18 +243,21 @@ namespace Aaru.DiscImages
             if(cylinders > 90)
             {
                 ErrorMessage = "Too many cylinders.";
+
                 return false;
             }
 
             if(heads > 2)
             {
                 ErrorMessage = "Too many heads.";
+
                 return false;
             }
 
             if(sectorsPerTrack > byte.MaxValue)
             {
                 ErrorMessage = "Too many sectors per track.";
+
                 return false;
             }
 
@@ -246,12 +271,14 @@ namespace Aaru.DiscImages
         public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
         {
             ErrorMessage = "Unsupported feature";
+
             return false;
         }
 
         public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
         {
             ErrorMessage = "Unsupported feature";
+
             return false;
         }
 
diff --git a/Aaru.Images/NDIF/Constants.cs b/Aaru.Images/NDIF/Constants.cs
index 0aea5e6e6..943ad9a73 100644
--- a/Aaru.Images/NDIF/Constants.cs
+++ b/Aaru.Images/NDIF/Constants.cs
@@ -34,13 +34,9 @@ namespace Aaru.DiscImages
 {
     public partial class Ndif
     {
-        /// <summary>
-        ///     Resource OSType for NDIF is "bcem"
-        /// </summary>
+        /// <summary>Resource OSType for NDIF is "bcem"</summary>
         const uint NDIF_RESOURCE = 0x6263656D;
-        /// <summary>
-        ///     Resource ID is always 128? Never found another
-        /// </summary>
+        /// <summary>Resource ID is always 128? Never found another</summary>
         const short NDIF_RESOURCEID = 128;
 
         const byte CHUNK_TYPE_NOCOPY  = 0;
@@ -49,9 +45,7 @@ namespace Aaru.DiscImages
         const byte CHUNK_TYPE_RLE     = 0x81;
         const byte CHUNK_TYPE_LZH     = 0x82;
         const byte CHUNK_TYPE_ADC     = 0x83;
-        /// <summary>
-        ///     Created by ShrinkWrap 3.5, dunno which version of the StuffIt algorithm it is using
-        /// </summary>
+        /// <summary>Created by ShrinkWrap 3.5, dunno which version of the StuffIt algorithm it is using</summary>
         const byte CHUNK_TYPE_STUFFIT = 0xF0;
         const byte CHUNK_TYPE_END             = 0xFF;
         const byte CHUNK_TYPE_COMPRESSED_MASK = 0x80;
diff --git a/Aaru.Images/NDIF/Identify.cs b/Aaru.Images/NDIF/Identify.cs
index 406b8f20e..84a5a4e3a 100644
--- a/Aaru.Images/NDIF/Identify.cs
+++ b/Aaru.Images/NDIF/Identify.cs
@@ -31,8 +31,8 @@
 // ****************************************************************************/
 
 using System;
-using Claunia.RsrcFork;
 using Aaru.CommonTypes.Interfaces;
+using Claunia.RsrcFork;
 
 namespace Aaru.DiscImages
 {
@@ -40,18 +40,26 @@ namespace Aaru.DiscImages
     {
         public bool Identify(IFilter imageFilter)
         {
-            if(!imageFilter.HasResourceFork() || imageFilter.GetResourceForkLength() == 0) return false;
+            if(!imageFilter.HasResourceFork() ||
+               imageFilter.GetResourceForkLength() == 0)
+                return false;
 
             try
             {
-                ResourceFork rsrcFork = new ResourceFork(imageFilter.GetResourceForkStream());
-                if(!rsrcFork.ContainsKey(NDIF_RESOURCE)) return false;
+                var rsrcFork = new ResourceFork(imageFilter.GetResourceForkStream());
+
+                if(!rsrcFork.ContainsKey(NDIF_RESOURCE))
+                    return false;
 
                 Resource rsrc = rsrcFork.GetResource(NDIF_RESOURCE);
 
-                if(rsrc.ContainsId(NDIF_RESOURCEID)) return true;
+                if(rsrc.ContainsId(NDIF_RESOURCEID))
+                    return true;
+            }
+            catch(InvalidCastException)
+            {
+                return false;
             }
-            catch(InvalidCastException) { return false; }
 
             return false;
         }
diff --git a/Aaru.Images/NDIF/NDIF.cs b/Aaru.Images/NDIF/NDIF.cs
index cf8dad17c..f20dfd515 100644
--- a/Aaru.Images/NDIF/NDIF.cs
+++ b/Aaru.Images/NDIF/NDIF.cs
@@ -53,31 +53,18 @@ namespace Aaru.DiscImages
         Stream                        imageStream;
         Dictionary<ulong, byte[]>     sectorCache;
 
-        public Ndif()
+        public Ndif() => imageInfo = new ImageInfo
         {
-            imageInfo = new ImageInfo
-            {
-                ReadableSectorTags    = new List<SectorTagType>(),
-                ReadableMediaTags     = new List<MediaTagType>(),
-                HasPartitions         = false,
-                HasSessions           = false,
-                Version               = null,
-                Application           = null,
-                ApplicationVersion    = null,
-                Creator               = null,
-                Comments              = null,
-                MediaManufacturer     = null,
-                MediaModel            = null,
-                MediaSerialNumber     = null,
-                MediaBarcode          = null,
-                MediaPartNumber       = null,
-                MediaSequence         = 0,
-                LastMediaSequence     = 0,
-                DriveManufacturer     = null,
-                DriveModel            = null,
-                DriveSerialNumber     = null,
-                DriveFirmwareRevision = null
-            };
-        }
+            ReadableSectorTags = new List<SectorTagType>(), ReadableMediaTags = new List<MediaTagType>(),
+            HasPartitions      = false, HasSessions                           = false, Version = null,
+            Application        = null,
+            ApplicationVersion = null, Creator = null, Comments = null,
+            MediaManufacturer  = null,
+            MediaModel         = null, MediaSerialNumber = null, MediaBarcode = null,
+            MediaPartNumber    = null,
+            MediaSequence      = 0, LastMediaSequence = 0, DriveManufacturer = null,
+            DriveModel         = null,
+            DriveSerialNumber  = null, DriveFirmwareRevision = null
+        };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/NDIF/Read.cs b/Aaru.Images/NDIF/Read.cs
index ad24419b0..8a7fd2d32 100644
--- a/Aaru.Images/NDIF/Read.cs
+++ b/Aaru.Images/NDIF/Read.cs
@@ -34,8 +34,6 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using Claunia.Encoding;
-using Claunia.RsrcFork;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Exceptions;
@@ -43,6 +41,8 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Compression;
 using Aaru.Console;
 using Aaru.Helpers;
+using Claunia.Encoding;
+using Claunia.RsrcFork;
 using SharpCompress.Compressors.ADC;
 using Version = Resources.Version;
 
@@ -52,7 +52,9 @@ namespace Aaru.DiscImages
     {
         public bool Open(IFilter imageFilter)
         {
-            if(!imageFilter.HasResourceFork() || imageFilter.GetResourceForkLength() == 0) return false;
+            if(!imageFilter.HasResourceFork() ||
+               imageFilter.GetResourceForkLength() == 0)
+                return false;
 
             ResourceFork rsrcFork;
             Resource     rsrc;
@@ -61,43 +63,54 @@ namespace Aaru.DiscImages
             try
             {
                 rsrcFork = new ResourceFork(imageFilter.GetResourceForkStream());
-                if(!rsrcFork.ContainsKey(NDIF_RESOURCE)) return false;
+
+                if(!rsrcFork.ContainsKey(NDIF_RESOURCE))
+                    return false;
 
                 rsrc = rsrcFork.GetResource(NDIF_RESOURCE);
 
                 bcems = rsrc.GetIds();
 
-                if(bcems == null || bcems.Length == 0) return false;
+                if(bcems        == null ||
+                   bcems.Length == 0)
+                    return false;
+            }
+            catch(InvalidCastException)
+            {
+                return false;
             }
-            catch(InvalidCastException) { return false; }
 
             imageInfo.Sectors = 0;
+
             foreach(byte[] bcem in bcems.Select(id => rsrc.GetResource(NDIF_RESOURCEID)))
             {
-                if(bcem.Length < 128) return false;
+                if(bcem.Length < 128)
+                    return false;
 
                 header = Marshal.ByteArrayToStructureBigEndian<ChunkHeader>(bcem);
 
-                AaruConsole.DebugWriteLine("NDIF plugin", "footer.type = {0}",   header.version);
+                AaruConsole.DebugWriteLine("NDIF plugin", "footer.type = {0}", header.version);
                 AaruConsole.DebugWriteLine("NDIF plugin", "footer.driver = {0}", header.driver);
+
                 AaruConsole.DebugWriteLine("NDIF plugin", "footer.name = {0}",
-                                          StringHandlers.PascalToString(header.name,
-                                                                        Encoding.GetEncoding("macintosh")));
-                AaruConsole.DebugWriteLine("NDIF plugin", "footer.sectors = {0}",            header.sectors);
+                                           StringHandlers.PascalToString(header.name,
+                                                                         Encoding.GetEncoding("macintosh")));
+
+                AaruConsole.DebugWriteLine("NDIF plugin", "footer.sectors = {0}", header.sectors);
                 AaruConsole.DebugWriteLine("NDIF plugin", "footer.maxSectorsPerChunk = {0}", header.maxSectorsPerChunk);
-                AaruConsole.DebugWriteLine("NDIF plugin", "footer.dataOffset = {0}",         header.dataOffset);
-                AaruConsole.DebugWriteLine("NDIF plugin", "footer.crc = 0x{0:X7}",           header.crc);
-                AaruConsole.DebugWriteLine("NDIF plugin", "footer.segmented = {0}",          header.segmented);
-                AaruConsole.DebugWriteLine("NDIF plugin", "footer.p1 = 0x{0:X8}",            header.p1);
-                AaruConsole.DebugWriteLine("NDIF plugin", "footer.p2 = 0x{0:X8}",            header.p2);
-                AaruConsole.DebugWriteLine("NDIF plugin", "footer.unknown[0] = 0x{0:X8}",    header.unknown[0]);
-                AaruConsole.DebugWriteLine("NDIF plugin", "footer.unknown[1] = 0x{0:X8}",    header.unknown[1]);
-                AaruConsole.DebugWriteLine("NDIF plugin", "footer.unknown[2] = 0x{0:X8}",    header.unknown[2]);
-                AaruConsole.DebugWriteLine("NDIF plugin", "footer.unknown[3] = 0x{0:X8}",    header.unknown[3]);
-                AaruConsole.DebugWriteLine("NDIF plugin", "footer.unknown[4] = 0x{0:X8}",    header.unknown[4]);
-                AaruConsole.DebugWriteLine("NDIF plugin", "footer.encrypted = {0}",          header.encrypted);
-                AaruConsole.DebugWriteLine("NDIF plugin", "footer.hash = 0x{0:X8}",          header.hash);
-                AaruConsole.DebugWriteLine("NDIF plugin", "footer.chunks = {0}",             header.chunks);
+                AaruConsole.DebugWriteLine("NDIF plugin", "footer.dataOffset = {0}", header.dataOffset);
+                AaruConsole.DebugWriteLine("NDIF plugin", "footer.crc = 0x{0:X7}", header.crc);
+                AaruConsole.DebugWriteLine("NDIF plugin", "footer.segmented = {0}", header.segmented);
+                AaruConsole.DebugWriteLine("NDIF plugin", "footer.p1 = 0x{0:X8}", header.p1);
+                AaruConsole.DebugWriteLine("NDIF plugin", "footer.p2 = 0x{0:X8}", header.p2);
+                AaruConsole.DebugWriteLine("NDIF plugin", "footer.unknown[0] = 0x{0:X8}", header.unknown[0]);
+                AaruConsole.DebugWriteLine("NDIF plugin", "footer.unknown[1] = 0x{0:X8}", header.unknown[1]);
+                AaruConsole.DebugWriteLine("NDIF plugin", "footer.unknown[2] = 0x{0:X8}", header.unknown[2]);
+                AaruConsole.DebugWriteLine("NDIF plugin", "footer.unknown[3] = 0x{0:X8}", header.unknown[3]);
+                AaruConsole.DebugWriteLine("NDIF plugin", "footer.unknown[4] = 0x{0:X8}", header.unknown[4]);
+                AaruConsole.DebugWriteLine("NDIF plugin", "footer.encrypted = {0}", header.encrypted);
+                AaruConsole.DebugWriteLine("NDIF plugin", "footer.hash = 0x{0:X8}", header.hash);
+                AaruConsole.DebugWriteLine("NDIF plugin", "footer.chunks = {0}", header.chunks);
 
                 // Block chunks and headers
                 chunks = new Dictionary<ulong, BlockChunk>();
@@ -106,20 +119,21 @@ namespace Aaru.DiscImages
                 {
                     // Obsolete read-only NDIF only prepended the header and then put the image without any kind of block references.
                     // So let's falsify a block chunk
-                    BlockChunk bChnk  = new BlockChunk();
-                    byte[]     sector = new byte[4];
-                    Array.Copy(bcem, 128 + 0 + i * 12, sector, 1, 3);
+                    var    bChnk  = new BlockChunk();
+                    byte[] sector = new byte[4];
+                    Array.Copy(bcem, 128 + 0 + (i * 12), sector, 1, 3);
                     bChnk.sector = BigEndianBitConverter.ToUInt32(sector, 0);
-                    bChnk.type   = bcem[128 + 3                                 + i * 12];
-                    bChnk.offset = BigEndianBitConverter.ToUInt32(bcem, 128 + 4 + i * 12);
-                    bChnk.length = BigEndianBitConverter.ToUInt32(bcem, 128 + 8 + i * 12);
+                    bChnk.type   = bcem[128 + 3                                 + (i * 12)];
+                    bChnk.offset = BigEndianBitConverter.ToUInt32(bcem, 128 + 4 + (i * 12));
+                    bChnk.length = BigEndianBitConverter.ToUInt32(bcem, 128 + 8 + (i * 12));
 
                     AaruConsole.DebugWriteLine("NDIF plugin", "bHdr.chunk[{0}].type = 0x{1:X2}", i, bChnk.type);
-                    AaruConsole.DebugWriteLine("NDIF plugin", "bHdr.chunk[{0}].sector = {1}",    i, bChnk.sector);
-                    AaruConsole.DebugWriteLine("NDIF plugin", "bHdr.chunk[{0}].offset = {1}",    i, bChnk.offset);
-                    AaruConsole.DebugWriteLine("NDIF plugin", "bHdr.chunk[{0}].length = {1}",    i, bChnk.length);
+                    AaruConsole.DebugWriteLine("NDIF plugin", "bHdr.chunk[{0}].sector = {1}", i, bChnk.sector);
+                    AaruConsole.DebugWriteLine("NDIF plugin", "bHdr.chunk[{0}].offset = {1}", i, bChnk.offset);
+                    AaruConsole.DebugWriteLine("NDIF plugin", "bHdr.chunk[{0}].length = {1}", i, bChnk.length);
 
-                    if(bChnk.type == CHUNK_TYPE_END) break;
+                    if(bChnk.type == CHUNK_TYPE_END)
+                        break;
 
                     bChnk.offset += header.dataOffset;
                     bChnk.sector += (uint)imageInfo.Sectors;
@@ -138,9 +152,10 @@ namespace Aaru.DiscImages
                     }
 
                     // TODO: Handle compressed chunks
-                    if(bChnk.type > CHUNK_TYPE_COPY    && bChnk.type < CHUNK_TYPE_KENCODE ||
-                       bChnk.type > CHUNK_TYPE_ADC     && bChnk.type < CHUNK_TYPE_STUFFIT ||
-                       bChnk.type > CHUNK_TYPE_STUFFIT && bChnk.type < CHUNK_TYPE_END     || bChnk.type == 1)
+                    if((bChnk.type > CHUNK_TYPE_COPY    && bChnk.type < CHUNK_TYPE_KENCODE) ||
+                       (bChnk.type > CHUNK_TYPE_ADC     && bChnk.type < CHUNK_TYPE_STUFFIT) ||
+                       (bChnk.type > CHUNK_TYPE_STUFFIT && bChnk.type < CHUNK_TYPE_END)     ||
+                       bChnk.type == 1)
                         throw new ImageNotSupportedException($"Unsupported chunk type 0x{bChnk.type:X8} found");
 
                     chunks.Add(bChnk.sector, bChnk);
@@ -149,73 +164,92 @@ namespace Aaru.DiscImages
                 imageInfo.Sectors += header.sectors;
             }
 
-            if(header.segmented > 0) throw new ImageNotSupportedException("Segmented images are not yet supported.");
+            if(header.segmented > 0)
+                throw new ImageNotSupportedException("Segmented images are not yet supported.");
 
-            if(header.encrypted > 0) throw new ImageNotSupportedException("Encrypted images are not yet supported.");
+            if(header.encrypted > 0)
+                throw new ImageNotSupportedException("Encrypted images are not yet supported.");
 
             switch(imageInfo.Sectors)
             {
                 case 1440:
                     imageInfo.MediaType = MediaType.DOS_35_DS_DD_9;
+
                     break;
                 case 1600:
                     imageInfo.MediaType = MediaType.AppleSonyDS;
+
                     break;
                 case 2880:
                     imageInfo.MediaType = MediaType.DOS_35_HD;
+
                     break;
                 case 3360:
                     imageInfo.MediaType = MediaType.DMF;
+
                     break;
                 default:
                     imageInfo.MediaType = MediaType.GENERIC_HDD;
+
                     break;
             }
 
             if(rsrcFork.ContainsKey(0x76657273))
             {
                 Resource versRsrc = rsrcFork.GetResource(0x76657273);
+
                 if(versRsrc != null)
                 {
                     byte[] vers = versRsrc.GetResource(versRsrc.GetIds()[0]);
 
-                    Version version = new Version(vers);
+                    var version = new Version(vers);
 
                     string release = null;
                     string dev     = null;
                     string pre     = null;
 
-                    string major                              = $"{version.MajorVersion}";
-                    string minor                              = $".{version.MinorVersion / 10}";
-                    if(version.MinorVersion % 10 > 0) release = $".{version.MinorVersion % 10}";
+                    string major = $"{version.MajorVersion}";
+                    string minor = $".{version.MinorVersion / 10}";
+
+                    if(version.MinorVersion % 10 > 0)
+                        release = $".{version.MinorVersion % 10}";
+
                     switch(version.DevStage)
                     {
                         case Version.DevelopmentStage.Alpha:
                             dev = "a";
+
                             break;
                         case Version.DevelopmentStage.Beta:
                             dev = "b";
+
                             break;
                         case Version.DevelopmentStage.PreAlpha:
                             dev = "d";
+
                             break;
                     }
 
-                    if(dev == null && version.PreReleaseVersion > 0) dev = "f";
+                    if(dev                       == null &&
+                       version.PreReleaseVersion > 0)
+                        dev = "f";
 
-                    if(dev != null) pre = $"{version.PreReleaseVersion}";
+                    if(dev != null)
+                        pre = $"{version.PreReleaseVersion}";
 
                     imageInfo.ApplicationVersion = $"{major}{minor}{release}{dev}{pre}";
                     imageInfo.Application        = version.VersionString;
                     imageInfo.Comments           = version.VersionMessage;
 
-                    if(version.MajorVersion      == 3) imageInfo.Application = "ShrinkWrap™";
-                    else if(version.MajorVersion == 6) imageInfo.Application = "DiskCopy";
+                    if(version.MajorVersion == 3)
+                        imageInfo.Application = "ShrinkWrap™";
+                    else if(version.MajorVersion == 6)
+                        imageInfo.Application = "DiskCopy";
                 }
             }
 
             AaruConsole.DebugWriteLine("NDIF plugin", "Image application = {0} version {1}", imageInfo.Application,
-                                      imageInfo.ApplicationVersion);
+                                       imageInfo.ApplicationVersion);
 
             sectorCache           = new Dictionary<ulong, byte[]>();
             chunkCache            = new Dictionary<ulong, byte[]>();
@@ -225,8 +259,9 @@ namespace Aaru.DiscImages
 
             imageInfo.CreationTime         = imageFilter.GetCreationTime();
             imageInfo.LastModificationTime = imageFilter.GetLastWriteTime();
-            imageInfo.MediaTitle =
-                StringHandlers.PascalToString(header.name, Encoding.GetEncoding("macintosh"));
+
+            imageInfo.MediaTitle = StringHandlers.PascalToString(header.name, Encoding.GetEncoding("macintosh"));
+
             imageInfo.SectorSize         = SECTOR_SIZE;
             imageInfo.XmlMediaType       = XmlMediaType.BlockMedia;
             imageInfo.ImageSize          = imageInfo.Sectors * SECTOR_SIZE;
@@ -239,27 +274,32 @@ namespace Aaru.DiscImages
                     imageInfo.Cylinders       = 80;
                     imageInfo.Heads           = 2;
                     imageInfo.SectorsPerTrack = 10;
+
                     break;
                 case MediaType.DOS_35_DS_DD_9:
                     imageInfo.Cylinders       = 80;
                     imageInfo.Heads           = 2;
                     imageInfo.SectorsPerTrack = 9;
+
                     break;
                 case MediaType.DOS_35_HD:
                     imageInfo.Cylinders       = 80;
                     imageInfo.Heads           = 2;
                     imageInfo.SectorsPerTrack = 18;
+
                     break;
                 case MediaType.DMF:
                     imageInfo.Cylinders       = 80;
                     imageInfo.Heads           = 2;
                     imageInfo.SectorsPerTrack = 21;
+
                     break;
                 default:
                     imageInfo.MediaType       = MediaType.GENERIC_HDD;
                     imageInfo.Cylinders       = (uint)(imageInfo.Sectors / 16 / 63);
                     imageInfo.Heads           = 16;
                     imageInfo.SectorsPerTrack = 63;
+
                     break;
             }
 
@@ -272,11 +312,12 @@ namespace Aaru.DiscImages
                 throw new ArgumentOutOfRangeException(nameof(sectorAddress),
                                                       $"Sector address {sectorAddress} not found");
 
-            if(sectorCache.TryGetValue(sectorAddress, out byte[] sector)) return sector;
+            if(sectorCache.TryGetValue(sectorAddress, out byte[] sector))
+                return sector;
 
-            BlockChunk currentChunk     = new BlockChunk();
-            bool       chunkFound       = false;
-            ulong      chunkStartSector = 0;
+            var   currentChunk     = new BlockChunk();
+            bool  chunkFound       = false;
+            ulong chunkStartSector = 0;
 
             foreach(KeyValuePair<ulong, BlockChunk> kvp in chunks.Where(kvp => sectorAddress >= kvp.Key))
             {
@@ -302,8 +343,8 @@ namespace Aaru.DiscImages
                     byte[] cmpBuffer = new byte[currentChunk.length];
                     imageStream.Seek(currentChunk.offset, SeekOrigin.Begin);
                     imageStream.Read(cmpBuffer, 0, cmpBuffer.Length);
-                    MemoryStream cmpMs = new MemoryStream(cmpBuffer);
-                    int          realSize;
+                    var cmpMs = new MemoryStream(cmpBuffer);
+                    int realSize;
 
                     switch(currentChunk.type)
                     {
@@ -314,6 +355,7 @@ namespace Aaru.DiscImages
                             realSize = decStream.Read(tmpBuffer, 0, (int)buffersize);
                             buffer   = new byte[realSize];
                             Array.Copy(tmpBuffer, 0, buffer, 0, realSize);
+
                             break;
                         }
 
@@ -321,11 +363,14 @@ namespace Aaru.DiscImages
                         {
                             byte[] tmpBuffer = new byte[buffersize];
                             realSize = 0;
-                            AppleRle rle = new AppleRle(cmpMs);
+                            var rle = new AppleRle(cmpMs);
+
                             for(int i = 0; i < buffersize; i++)
                             {
                                 int b = rle.ProduceByte();
-                                if(b == -1) break;
+
+                                if(b == -1)
+                                    break;
 
                                 tmpBuffer[i] = (byte)b;
                                 realSize++;
@@ -333,6 +378,7 @@ namespace Aaru.DiscImages
 
                             buffer = new byte[realSize];
                             Array.Copy(tmpBuffer, 0, buffer, 0, realSize);
+
                             break;
                         }
 
@@ -354,7 +400,8 @@ namespace Aaru.DiscImages
                 sector = new byte[SECTOR_SIZE];
                 Array.Copy(buffer, relOff, sector, 0, SECTOR_SIZE);
 
-                if(sectorCache.Count >= MAX_CACHED_SECTORS) sectorCache.Clear();
+                if(sectorCache.Count >= MAX_CACHED_SECTORS)
+                    sectorCache.Clear();
 
                 sectorCache.Add(sectorAddress, sector);
 
@@ -366,18 +413,22 @@ namespace Aaru.DiscImages
                 case CHUNK_TYPE_NOCOPY:
                     sector = new byte[SECTOR_SIZE];
 
-                    if(sectorCache.Count >= MAX_CACHED_SECTORS) sectorCache.Clear();
+                    if(sectorCache.Count >= MAX_CACHED_SECTORS)
+                        sectorCache.Clear();
 
                     sectorCache.Add(sectorAddress, sector);
+
                     return sector;
                 case CHUNK_TYPE_COPY:
                     imageStream.Seek(currentChunk.offset + relOff, SeekOrigin.Begin);
                     sector = new byte[SECTOR_SIZE];
                     imageStream.Read(sector, 0, sector.Length);
 
-                    if(sectorCache.Count >= MAX_CACHED_SECTORS) sectorCache.Clear();
+                    if(sectorCache.Count >= MAX_CACHED_SECTORS)
+                        sectorCache.Clear();
 
                     sectorCache.Add(sectorAddress, sector);
+
                     return sector;
             }
 
@@ -393,7 +444,7 @@ namespace Aaru.DiscImages
             if(sectorAddress + length > imageInfo.Sectors)
                 throw new ArgumentOutOfRangeException(nameof(length), "Requested more sectors than available");
 
-            MemoryStream ms = new MemoryStream();
+            var ms = new MemoryStream();
 
             for(uint i = 0; i < length; i++)
             {
diff --git a/Aaru.Images/NDIF/Structs.cs b/Aaru.Images/NDIF/Structs.cs
index 40b59d6e7..0c748dd8c 100644
--- a/Aaru.Images/NDIF/Structs.cs
+++ b/Aaru.Images/NDIF/Structs.cs
@@ -40,106 +40,62 @@ namespace Aaru.DiscImages
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct ChunkHeader
         {
-            /// <summary>
-            ///     Version
-            /// </summary>
-            public short version;
-            /// <summary>
-            ///     Filesystem ID
-            /// </summary>
-            public short driver;
-            /// <summary>
-            ///     Disk image name, Str63 (Pascal string)
-            /// </summary>
+            /// <summary>Version</summary>
+            public readonly short version;
+            /// <summary>Filesystem ID</summary>
+            public readonly short driver;
+            /// <summary>Disk image name, Str63 (Pascal string)</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 64)]
-            public byte[] name;
-            /// <summary>
-            ///     Sectors in image
-            /// </summary>
-            public uint sectors;
-            /// <summary>
-            ///     Maximum number of sectors per chunk
-            /// </summary>
-            public uint maxSectorsPerChunk;
-            /// <summary>
-            ///     Offset to add to every chunk offset
-            /// </summary>
-            public uint dataOffset;
-            /// <summary>
-            ///     CRC28 of whole image
-            /// </summary>
-            public uint crc;
-            /// <summary>
-            ///     Set to 1 if segmented
-            /// </summary>
-            public uint segmented;
-            /// <summary>
-            ///     Unknown
-            /// </summary>
-            public uint p1;
-            /// <summary>
-            ///     Unknown
-            /// </summary>
-            public uint p2;
-            /// <summary>
-            ///     Unknown, spare?
-            /// </summary>
+            public readonly byte[] name;
+            /// <summary>Sectors in image</summary>
+            public readonly uint sectors;
+            /// <summary>Maximum number of sectors per chunk</summary>
+            public readonly uint maxSectorsPerChunk;
+            /// <summary>Offset to add to every chunk offset</summary>
+            public readonly uint dataOffset;
+            /// <summary>CRC28 of whole image</summary>
+            public readonly uint crc;
+            /// <summary>Set to 1 if segmented</summary>
+            public readonly uint segmented;
+            /// <summary>Unknown</summary>
+            public readonly uint p1;
+            /// <summary>Unknown</summary>
+            public readonly uint p2;
+            /// <summary>Unknown, spare?</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 5)]
-            public uint[] unknown;
-            /// <summary>
-            ///     Set to 1 by ShrinkWrap if image is encrypted
-            /// </summary>
-            public uint encrypted;
-            /// <summary>
-            ///     Set by ShrinkWrap if image is encrypted, value is the same for same password
-            /// </summary>
-            public uint hash;
-            /// <summary>
-            ///     How many chunks follow the header
-            /// </summary>
-            public uint chunks;
+            public readonly uint[] unknown;
+            /// <summary>Set to 1 by ShrinkWrap if image is encrypted</summary>
+            public readonly uint encrypted;
+            /// <summary>Set by ShrinkWrap if image is encrypted, value is the same for same password</summary>
+            public readonly uint hash;
+            /// <summary>How many chunks follow the header</summary>
+            public readonly uint chunks;
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct BlockChunk
         {
-            /// <summary>
-            ///     Starting sector, 3 bytes
-            /// </summary>
+            /// <summary>Starting sector, 3 bytes</summary>
             public uint sector;
-            /// <summary>
-            ///     Chunk type
-            /// </summary>
+            /// <summary>Chunk type</summary>
             public byte type;
-            /// <summary>
-            ///     Offset in start of chunk
-            /// </summary>
+            /// <summary>Offset in start of chunk</summary>
             public uint offset;
-            /// <summary>
-            ///     Length in bytes of chunk
-            /// </summary>
+            /// <summary>Length in bytes of chunk</summary>
             public uint length;
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct SegmentHeader
         {
-            /// <summary>
-            ///     Segment #
-            /// </summary>
-            public ushort segment;
-            /// <summary>
-            ///     How many segments
-            /// </summary>
-            public ushort segments;
-            /// <summary>
-            ///     Seems to be a Guid, changes with different images, same for all segments of same image
-            /// </summary>
-            public Guid segmentId;
-            /// <summary>
-            ///     Seems to be a CRC28 of this segment, unchecked
-            /// </summary>
-            public uint crc;
+            /// <summary>Segment #</summary>
+            public readonly ushort segment;
+            /// <summary>How many segments</summary>
+            public readonly ushort segments;
+            /// <summary>Seems to be a Guid, changes with different images, same for all segments of same image</summary>
+            public readonly Guid segmentId;
+            /// <summary>Seems to be a CRC28 of this segment, unchecked</summary>
+            public readonly uint crc;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/NHDr0/Identify.cs b/Aaru.Images/NHDr0/Identify.cs
index d39b140a0..c8fc97dfe 100644
--- a/Aaru.Images/NHDr0/Identify.cs
+++ b/Aaru.Images/NHDr0/Identify.cs
@@ -45,28 +45,34 @@ namespace Aaru.DiscImages
         {
             Stream stream = imageFilter.GetDataForkStream();
             stream.Seek(0, SeekOrigin.Begin);
-            // Even if comment is supposedly ASCII, I'm pretty sure most emulators allow Shift-JIS to be used :p
-            Encoding shiftjis = Encoding.GetEncoding("shift_jis");
 
-            if(stream.Length < Marshal.SizeOf<Nhdr0Header>()) return false;
+            // Even if comment is supposedly ASCII, I'm pretty sure most emulators allow Shift-JIS to be used :p
+            var shiftjis = Encoding.GetEncoding("shift_jis");
+
+            if(stream.Length < Marshal.SizeOf<Nhdr0Header>())
+                return false;
 
             byte[] hdrB = new byte[Marshal.SizeOf<Nhdr0Header>()];
             stream.Read(hdrB, 0, hdrB.Length);
 
             nhdhdr = Marshal.ByteArrayToStructureLittleEndian<Nhdr0Header>(hdrB);
 
-            if(!nhdhdr.szFileID.SequenceEqual(signature)) return false;
+            if(!nhdhdr.szFileID.SequenceEqual(signature))
+                return false;
 
             AaruConsole.DebugWriteLine("NHDr0 plugin", "nhdhdr.szFileID = \"{0}\"",
-                                      StringHandlers.CToString(nhdhdr.szFileID, shiftjis));
+                                       StringHandlers.CToString(nhdhdr.szFileID, shiftjis));
+
             AaruConsole.DebugWriteLine("NHDr0 plugin", "nhdhdr.reserved1 = {0}", nhdhdr.reserved1);
+
             AaruConsole.DebugWriteLine("NHDr0 plugin", "nhdhdr.szComment = \"{0}\"",
-                                      StringHandlers.CToString(nhdhdr.szComment, shiftjis));
+                                       StringHandlers.CToString(nhdhdr.szComment, shiftjis));
+
             AaruConsole.DebugWriteLine("NHDr0 plugin", "nhdhdr.dwHeadSize = {0}", nhdhdr.dwHeadSize);
             AaruConsole.DebugWriteLine("NHDr0 plugin", "nhdhdr.dwCylinder = {0}", nhdhdr.dwCylinder);
-            AaruConsole.DebugWriteLine("NHDr0 plugin", "nhdhdr.wHead = {0}",      nhdhdr.wHead);
-            AaruConsole.DebugWriteLine("NHDr0 plugin", "nhdhdr.wSect = {0}",      nhdhdr.wSect);
-            AaruConsole.DebugWriteLine("NHDr0 plugin", "nhdhdr.wSectLen = {0}",   nhdhdr.wSectLen);
+            AaruConsole.DebugWriteLine("NHDr0 plugin", "nhdhdr.wHead = {0}", nhdhdr.wHead);
+            AaruConsole.DebugWriteLine("NHDr0 plugin", "nhdhdr.wSect = {0}", nhdhdr.wSect);
+            AaruConsole.DebugWriteLine("NHDr0 plugin", "nhdhdr.wSectLen = {0}", nhdhdr.wSectLen);
 
             return true;
         }
diff --git a/Aaru.Images/NHDr0/NHDr0.cs b/Aaru.Images/NHDr0/NHDr0.cs
index 664fcf8e1..0e740fbea 100644
--- a/Aaru.Images/NHDr0/NHDr0.cs
+++ b/Aaru.Images/NHDr0/NHDr0.cs
@@ -46,31 +46,18 @@ namespace Aaru.DiscImages
         IFilter     nhdImageFilter;
         FileStream  writingStream;
 
-        public Nhdr0()
+        public Nhdr0() => imageInfo = new ImageInfo
         {
-            imageInfo = new ImageInfo
-            {
-                ReadableSectorTags    = new List<SectorTagType>(),
-                ReadableMediaTags     = new List<MediaTagType>(),
-                HasPartitions         = false,
-                HasSessions           = false,
-                Version               = null,
-                Application           = null,
-                ApplicationVersion    = null,
-                Creator               = null,
-                Comments              = null,
-                MediaManufacturer     = null,
-                MediaModel            = null,
-                MediaSerialNumber     = null,
-                MediaBarcode          = null,
-                MediaPartNumber       = null,
-                MediaSequence         = 0,
-                LastMediaSequence     = 0,
-                DriveManufacturer     = null,
-                DriveModel            = null,
-                DriveSerialNumber     = null,
-                DriveFirmwareRevision = null
-            };
-        }
+            ReadableSectorTags = new List<SectorTagType>(), ReadableMediaTags = new List<MediaTagType>(),
+            HasPartitions      = false, HasSessions                           = false, Version = null,
+            Application        = null,
+            ApplicationVersion = null, Creator = null, Comments = null,
+            MediaManufacturer  = null,
+            MediaModel         = null, MediaSerialNumber = null, MediaBarcode = null,
+            MediaPartNumber    = null,
+            MediaSequence      = 0, LastMediaSequence = 0, DriveManufacturer = null,
+            DriveModel         = null,
+            DriveSerialNumber  = null, DriveFirmwareRevision = null
+        };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/NHDr0/Properties.cs b/Aaru.Images/NHDr0/Properties.cs
index ef5563064..8fe842442 100644
--- a/Aaru.Images/NHDr0/Properties.cs
+++ b/Aaru.Images/NHDr0/Properties.cs
@@ -41,21 +41,31 @@ namespace Aaru.DiscImages
 {
     public partial class Nhdr0
     {
-        public string                     Name                => "T98-Next NHD r0 Disk Image";
-        public Guid                       Id                  => new Guid("6ECACD0A-8F4D-4465-8815-AEA000D370E3");
-        public ImageInfo                  Info                => imageInfo;
-        public string                     Author              => "Natalia Portillo";
-        public string                     Format              => "NHDr0 disk image";
-        public List<DumpHardwareType>     DumpHardware        => null;
-        public CICMMetadataType           CicmMetadata        => null;
-        public IEnumerable<MediaTagType>  SupportedMediaTags  => new MediaTagType[] { };
-        public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[] { };
-        public IEnumerable<MediaType>     SupportedMediaTypes => new[] {MediaType.GENERIC_HDD, MediaType.Unknown};
+        public string                 Name         => "T98-Next NHD r0 Disk Image";
+        public Guid                   Id           => new Guid("6ECACD0A-8F4D-4465-8815-AEA000D370E3");
+        public ImageInfo              Info         => imageInfo;
+        public string                 Author       => "Natalia Portillo";
+        public string                 Format       => "NHDr0 disk image";
+        public List<DumpHardwareType> DumpHardware => null;
+        public CICMMetadataType       CicmMetadata => null;
+        public IEnumerable<MediaTagType> SupportedMediaTags => new MediaTagType[]
+            {};
+        public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[]
+            {};
+        public IEnumerable<MediaType> SupportedMediaTypes => new[]
+        {
+            MediaType.GENERIC_HDD, MediaType.Unknown
+        };
+
         // TODO: Support dynamic images
         public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
-            new (string name, Type type, string description, object @default)[] { };
-        public IEnumerable<string> KnownExtensions => new[] {".nhd"};
-        public bool                IsWriting       { get; private set; }
-        public string              ErrorMessage    { get; private set; }
+            new (string name, Type type, string description, object @default)[]
+                {};
+        public IEnumerable<string> KnownExtensions => new[]
+        {
+            ".nhd"
+        };
+        public bool   IsWriting    { get; private set; }
+        public string ErrorMessage { get; private set; }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/NHDr0/Read.cs b/Aaru.Images/NHDr0/Read.cs
index 57578e770..88a82d9ec 100644
--- a/Aaru.Images/NHDr0/Read.cs
+++ b/Aaru.Images/NHDr0/Read.cs
@@ -46,10 +46,12 @@ namespace Aaru.DiscImages
         {
             Stream stream = imageFilter.GetDataForkStream();
             stream.Seek(0, SeekOrigin.Begin);
-            // Even if comment is supposedly ASCII, I'm pretty sure most emulators allow Shift-JIS to be used :p
-            Encoding shiftjis = Encoding.GetEncoding("shift_jis");
 
-            if(stream.Length < Marshal.SizeOf<Nhdr0Header>()) return false;
+            // Even if comment is supposedly ASCII, I'm pretty sure most emulators allow Shift-JIS to be used :p
+            var shiftjis = Encoding.GetEncoding("shift_jis");
+
+            if(stream.Length < Marshal.SizeOf<Nhdr0Header>())
+                return false;
 
             byte[] hdrB = new byte[Marshal.SizeOf<Nhdr0Header>()];
             stream.Read(hdrB, 0, hdrB.Length);
@@ -89,7 +91,7 @@ namespace Aaru.DiscImages
 
             Stream stream = nhdImageFilter.GetDataForkStream();
 
-            stream.Seek((long)((ulong)nhdhdr.dwHeadSize + sectorAddress * imageInfo.SectorSize), SeekOrigin.Begin);
+            stream.Seek((long)((ulong)nhdhdr.dwHeadSize + (sectorAddress * imageInfo.SectorSize)), SeekOrigin.Begin);
 
             stream.Read(buffer, 0, (int)(length * imageInfo.SectorSize));
 
diff --git a/Aaru.Images/NHDr0/Structs.cs b/Aaru.Images/NHDr0/Structs.cs
index d8e668afe..81e4fdb85 100644
--- a/Aaru.Images/NHDr0/Structs.cs
+++ b/Aaru.Images/NHDr0/Structs.cs
@@ -41,7 +41,7 @@ namespace Aaru.DiscImages
         {
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 15)]
             public byte[] szFileID;
-            public byte reserved1;
+            public readonly byte reserved1;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 0x100)]
             public byte[] szComment;
             public int   dwHeadSize;
diff --git a/Aaru.Images/NHDr0/Write.cs b/Aaru.Images/NHDr0/Write.cs
index 076897000..021c29f33 100644
--- a/Aaru.Images/NHDr0/Write.cs
+++ b/Aaru.Images/NHDr0/Write.cs
@@ -46,37 +46,48 @@ namespace Aaru.DiscImages
     public partial class Nhdr0
     {
         public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
-                           uint   sectorSize)
+                           uint sectorSize)
         {
             if(sectorSize != 0)
             {
                 ErrorMessage = "Unsupported sector size";
+
                 return false;
             }
 
             if(!SupportedMediaTypes.Contains(mediaType))
             {
                 ErrorMessage = $"Unsupport media format {mediaType}";
+
                 return false;
             }
 
-            imageInfo = new ImageInfo {MediaType = mediaType, SectorSize = sectorSize, Sectors = sectors};
+            imageInfo = new ImageInfo
+            {
+                MediaType = mediaType, SectorSize = sectorSize, Sectors = sectors
+            };
 
-            try { writingStream = new FileStream(path, FileMode.CreateNew, FileAccess.ReadWrite, FileShare.None); }
+            try
+            {
+                writingStream = new FileStream(path, FileMode.CreateNew, FileAccess.ReadWrite, FileShare.None);
+            }
             catch(IOException e)
             {
                 ErrorMessage = $"Could not create new image file, exception {e.Message}";
+
                 return false;
             }
 
             IsWriting    = true;
             ErrorMessage = null;
+
             return true;
         }
 
         public bool WriteMediaTag(byte[] data, MediaTagType tag)
         {
             ErrorMessage = "Writing media tags is not supported.";
+
             return false;
         }
 
@@ -85,26 +96,31 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Tried to write on a non-writable image";
+
                 return false;
             }
 
             if(data.Length != imageInfo.SectorSize)
             {
                 ErrorMessage = "Incorrect data size";
+
                 return false;
             }
 
             if(sectorAddress >= imageInfo.Sectors)
             {
                 ErrorMessage = "Tried to write past image size";
+
                 return false;
             }
 
-            writingStream.Seek((long)((ulong)Marshal.SizeOf<Nhdr0Header>() + sectorAddress * imageInfo.SectorSize),
+            writingStream.Seek((long)((ulong)Marshal.SizeOf<Nhdr0Header>() + (sectorAddress * imageInfo.SectorSize)),
                                SeekOrigin.Begin);
+
             writingStream.Write(data, 0, data.Length);
 
             ErrorMessage = "";
+
             return true;
         }
 
@@ -113,38 +129,45 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Tried to write on a non-writable image";
+
                 return false;
             }
 
             if(data.Length % 512 != 0)
             {
                 ErrorMessage = "Incorrect data size";
+
                 return false;
             }
 
             if(sectorAddress + length > imageInfo.Sectors)
             {
                 ErrorMessage = "Tried to write past image size";
+
                 return false;
             }
 
-            writingStream.Seek((long)((ulong)Marshal.SizeOf<Nhdr0Header>() + sectorAddress * imageInfo.SectorSize),
+            writingStream.Seek((long)((ulong)Marshal.SizeOf<Nhdr0Header>() + (sectorAddress * imageInfo.SectorSize)),
                                SeekOrigin.Begin);
+
             writingStream.Write(data, 0, data.Length);
 
             ErrorMessage = "";
+
             return true;
         }
 
         public bool WriteSectorLong(byte[] data, ulong sectorAddress)
         {
             ErrorMessage = "Writing sectors with tags is not supported.";
+
             return false;
         }
 
         public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
         {
             ErrorMessage = "Writing sectors with tags is not supported.";
+
             return false;
         }
 
@@ -153,6 +176,7 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Image is not opened for writing";
+
                 return false;
             }
 
@@ -174,19 +198,19 @@ namespace Aaru.DiscImages
 
                     imageInfo.Cylinders = (uint)(imageInfo.Sectors / imageInfo.Heads / imageInfo.SectorsPerTrack);
 
-                    if(imageInfo.Cylinders == 0 && imageInfo.Heads == 0 && imageInfo.SectorsPerTrack == 0) break;
+                    if(imageInfo.Cylinders       == 0 &&
+                       imageInfo.Heads           == 0 &&
+                       imageInfo.SectorsPerTrack == 0)
+                        break;
                 }
             }
 
-            Nhdr0Header header = new Nhdr0Header
+            var header = new Nhdr0Header
             {
-                szFileID   = signature,
-                szComment  = new byte[0x100],
+                szFileID   = signature, szComment = new byte[0x100],
                 dwHeadSize = Marshal.SizeOf<Nhdr0Header>(),
-                dwCylinder = (byte)imageInfo.Cylinders,
-                wHead      = (byte)imageInfo.Heads,
-                wSect      = (byte)imageInfo.SectorsPerTrack,
-                wSectLen   = (byte)imageInfo.SectorSize,
+                dwCylinder = (byte)imageInfo.Cylinders, wHead          = (byte)imageInfo.Heads,
+                wSect      = (byte)imageInfo.SectorsPerTrack, wSectLen = (byte)imageInfo.SectorSize,
                 reserved2  = new byte[2],
                 reserved3  = new byte[0xE0]
             };
@@ -194,6 +218,7 @@ namespace Aaru.DiscImages
             if(!string.IsNullOrEmpty(imageInfo.Comments))
             {
                 byte[] commentBytes = Encoding.GetEncoding("shift_jis").GetBytes(imageInfo.Comments);
+
                 Array.Copy(commentBytes, 0, header.szComment, 0,
                            commentBytes.Length >= 0x100 ? 0x100 : commentBytes.Length);
             }
@@ -217,6 +242,7 @@ namespace Aaru.DiscImages
         public bool SetMetadata(ImageInfo metadata)
         {
             imageInfo.Comments = metadata.Comments;
+
             return true;
         }
 
@@ -225,18 +251,21 @@ namespace Aaru.DiscImages
             if(cylinders > int.MaxValue)
             {
                 ErrorMessage = "Too many cylinders.";
+
                 return false;
             }
 
             if(heads > short.MaxValue)
             {
                 ErrorMessage = "Too many heads.";
+
                 return false;
             }
 
             if(sectorsPerTrack > short.MaxValue)
             {
                 ErrorMessage = "Too many sectors per track.";
+
                 return false;
             }
 
@@ -250,12 +279,14 @@ namespace Aaru.DiscImages
         public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
         {
             ErrorMessage = "Unsupported feature";
+
             return false;
         }
 
         public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
         {
             ErrorMessage = "Unsupported feature";
+
             return false;
         }
 
diff --git a/Aaru.Images/Nero/Enums.cs b/Aaru.Images/Nero/Enums.cs
index 7c4ed8e08..7b719f438 100644
--- a/Aaru.Images/Nero/Enums.cs
+++ b/Aaru.Images/Nero/Enums.cs
@@ -39,184 +39,95 @@ namespace Aaru.DiscImages
     {
         enum DaoMode : ushort
         {
-            Data         = 0x0000,
-            DataM2F1     = 0x0002,
-            DataM2F2     = 0x0003,
-            DataRaw      = 0x0005,
-            DataM2Raw    = 0x0006,
-            Audio        = 0x0007,
-            DataRawSub   = 0x000F,
-            AudioSub     = 0x0010,
-            DataM2RawSub = 0x0011
+            Data       = 0x0000, DataM2F1  = 0x0002, DataM2F2     = 0x0003,
+            DataRaw    = 0x0005, DataM2Raw = 0x0006, Audio        = 0x0007,
+            DataRawSub = 0x000F, AudioSub  = 0x0010, DataM2RawSub = 0x0011
         }
 
-        [Flags]
-        [SuppressMessage("ReSharper", "InconsistentNaming")]
+        [Flags, SuppressMessage("ReSharper", "InconsistentNaming")]
         enum NeroMediaTypes : uint
         {
-            /// <summary>
-            ///     No media
-            /// </summary>
+            /// <summary>No media</summary>
             NeroMtypNone = 0x00000,
-            /// <summary>
-            ///     CD-R/RW
-            /// </summary>
+            /// <summary>CD-R/RW</summary>
             NeroMtypCd = 0x00001,
-            /// <summary>
-            ///     DDCD-R/RW
-            /// </summary>
+            /// <summary>DDCD-R/RW</summary>
             NeroMtypDdcd = 0x00002,
-            /// <summary>
-            ///     DVD-R/RW
-            /// </summary>
+            /// <summary>DVD-R/RW</summary>
             NeroMtypDvdM = 0x00004,
-            /// <summary>
-            ///     DVD+RW
-            /// </summary>
+            /// <summary>DVD+RW</summary>
             NeroMtypDvdP = 0x00008,
-            /// <summary>
-            ///     DVD-RAM
-            /// </summary>
+            /// <summary>DVD-RAM</summary>
             NeroMtypDvdRam = 0x00010,
-            /// <summary>
-            ///     Multi-level disc
-            /// </summary>
+            /// <summary>Multi-level disc</summary>
             NeroMtypMl = 0x00020,
-            /// <summary>
-            ///     Mount Rainier
-            /// </summary>
+            /// <summary>Mount Rainier</summary>
             NeroMtypMrw = 0x00040,
-            /// <summary>
-            ///     Exclude CD-R
-            /// </summary>
+            /// <summary>Exclude CD-R</summary>
             NeroMtypNoCdr = 0x00080,
-            /// <summary>
-            ///     Exclude CD-RW
-            /// </summary>
+            /// <summary>Exclude CD-RW</summary>
             NeroMtypNoCdrw = 0x00100,
-            /// <summary>
-            ///     CD-RW
-            /// </summary>
+            /// <summary>CD-RW</summary>
             NeroMtypCdrw = NeroMtypCd | NeroMtypNoCdr,
-            /// <summary>
-            ///     CD-R
-            /// </summary>
+            /// <summary>CD-R</summary>
             NeroMtypCdr = NeroMtypCd | NeroMtypNoCdrw,
-            /// <summary>
-            ///     DVD-ROM
-            /// </summary>
+            /// <summary>DVD-ROM</summary>
             NeroMtypDvdRom = 0x00200,
-            /// <summary>
-            ///     CD-ROM
-            /// </summary>
+            /// <summary>CD-ROM</summary>
             NeroMtypCdrom = 0x00400,
-            /// <summary>
-            ///     Exclude DVD-RW
-            /// </summary>
+            /// <summary>Exclude DVD-RW</summary>
             NeroMtypNoDvdMRw = 0x00800,
-            /// <summary>
-            ///     Exclude DVD-R
-            /// </summary>
+            /// <summary>Exclude DVD-R</summary>
             NeroMtypNoDvdMR = 0x01000,
-            /// <summary>
-            ///     Exclude DVD+RW
-            /// </summary>
+            /// <summary>Exclude DVD+RW</summary>
             NeroMtypNoDvdPRw = 0x02000,
-            /// <summary>
-            ///     Exclude DVD+R
-            /// </summary>
+            /// <summary>Exclude DVD+R</summary>
             NeroMtypNoDvdPR = 0x04000,
-            /// <summary>
-            ///     DVD-R
-            /// </summary>
+            /// <summary>DVD-R</summary>
             NeroMtypDvdMR = NeroMtypDvdM | NeroMtypNoDvdMRw,
-            /// <summary>
-            ///     DVD-RW
-            /// </summary>
+            /// <summary>DVD-RW</summary>
             NeroMtypDvdMRw = NeroMtypDvdM | NeroMtypNoDvdMR,
-            /// <summary>
-            ///     DVD+R
-            /// </summary>
+            /// <summary>DVD+R</summary>
             NeroMtypDvdPR = NeroMtypDvdP | NeroMtypNoDvdPRw,
-            /// <summary>
-            ///     DVD+RW
-            /// </summary>
+            /// <summary>DVD+RW</summary>
             NeroMtypDvdPRw = NeroMtypDvdP | NeroMtypNoDvdPR,
-            /// <summary>
-            ///     Packet-writing (fixed)
-            /// </summary>
+            /// <summary>Packet-writing (fixed)</summary>
             NeroMtypFpacket = 0x08000,
-            /// <summary>
-            ///     Packet-writing (variable)
-            /// </summary>
+            /// <summary>Packet-writing (variable)</summary>
             NeroMtypVpacket = 0x10000,
-            /// <summary>
-            ///     Packet-writing (any)
-            /// </summary>
+            /// <summary>Packet-writing (any)</summary>
             NeroMtypPacketw = NeroMtypMrw | NeroMtypFpacket | NeroMtypVpacket,
-            /// <summary>
-            ///     HD-Burn
-            /// </summary>
+            /// <summary>HD-Burn</summary>
             NeroMtypHdb = 0x20000,
-            /// <summary>
-            ///     DVD+R DL
-            /// </summary>
+            /// <summary>DVD+R DL</summary>
             NeroMtypDvdPR9 = 0x40000,
-            /// <summary>
-            ///     DVD-R DL
-            /// </summary>
+            /// <summary>DVD-R DL</summary>
             NeroMtypDvdMR9 = 0x80000,
-            /// <summary>
-            ///     Any DVD double-layer
-            /// </summary>
+            /// <summary>Any DVD double-layer</summary>
             NeroMtypDvdAnyR9 = NeroMtypDvdPR9 | NeroMtypDvdMR9,
-            /// <summary>
-            ///     Any DVD
-            /// </summary>
+            /// <summary>Any DVD</summary>
             NeroMtypDvdAny = NeroMtypDvdM | NeroMtypDvdP | NeroMtypDvdRam | NeroMtypDvdAnyR9,
-            /// <summary>
-            ///     BD-ROM
-            /// </summary>
+            /// <summary>BD-ROM</summary>
             NeroMtypBdRom = 0x100000,
-            /// <summary>
-            ///     BD-R
-            /// </summary>
+            /// <summary>BD-R</summary>
             NeroMtypBdR = 0x200000,
-            /// <summary>
-            ///     BD-RE
-            /// </summary>
+            /// <summary>BD-RE</summary>
             NeroMtypBdRe = 0x400000,
-            /// <summary>
-            ///     BD-R/RE
-            /// </summary>
+            /// <summary>BD-R/RE</summary>
             NeroMtypBd = NeroMtypBdR | NeroMtypBdRe,
-            /// <summary>
-            ///     Any BD
-            /// </summary>
+            /// <summary>Any BD</summary>
             NeroMtypBdAny = NeroMtypBd | NeroMtypBdRom,
-            /// <summary>
-            ///     HD DVD-ROM
-            /// </summary>
+            /// <summary>HD DVD-ROM</summary>
             NeroMtypHdDvdRom = 0x0800000,
-            /// <summary>
-            ///     HD DVD-R
-            /// </summary>
+            /// <summary>HD DVD-R</summary>
             NeroMtypHdDvdR = 0x1000000,
-            /// <summary>
-            ///     HD DVD-RW
-            /// </summary>
+            /// <summary>HD DVD-RW</summary>
             NeroMtypHdDvdRw = 0x2000000,
-            /// <summary>
-            ///     HD DVD-R/RW
-            /// </summary>
+            /// <summary>HD DVD-R/RW</summary>
             NeroMtypHdDvd = NeroMtypHdDvdR | NeroMtypHdDvdRw,
-            /// <summary>
-            ///     Any HD DVD
-            /// </summary>
+            /// <summary>Any HD DVD</summary>
             NeroMtypHdDvdAny = NeroMtypHdDvd | NeroMtypHdDvdRom,
-            /// <summary>
-            ///     Any DVD, old
-            /// </summary>
+            /// <summary>Any DVD, old</summary>
             NeroMtypDvdAnyOld = NeroMtypDvdM | NeroMtypDvdP | NeroMtypDvdRam
         }
     }
diff --git a/Aaru.Images/Nero/Identify.cs b/Aaru.Images/Nero/Identify.cs
index dd44f2577..dfada4d9e 100644
--- a/Aaru.Images/Nero/Identify.cs
+++ b/Aaru.Images/Nero/Identify.cs
@@ -41,8 +41,8 @@ namespace Aaru.DiscImages
         public bool Identify(IFilter imageFilter)
         {
             imageStream = imageFilter.GetDataForkStream();
-            NeroV1Footer footerV1 = new NeroV1Footer();
-            NeroV2Footer footerV2 = new NeroV2Footer();
+            var footerV1 = new NeroV1Footer();
+            var footerV2 = new NeroV2Footer();
 
             imageStream.Seek(-8, SeekOrigin.End);
             byte[] buffer = new byte[8];
@@ -56,13 +56,15 @@ namespace Aaru.DiscImages
             footerV2.ChunkId          = BigEndianBitConverter.ToUInt32(buffer, 0);
             footerV2.FirstChunkOffset = BigEndianBitConverter.ToUInt64(buffer, 4);
 
-            AaruConsole.DebugWriteLine("Nero plugin", "imageStream.Length = {0}",        imageStream.Length);
-            AaruConsole.DebugWriteLine("Nero plugin", "footerV1.ChunkID = 0x{0:X8}",     footerV1.ChunkId);
+            AaruConsole.DebugWriteLine("Nero plugin", "imageStream.Length = {0}", imageStream.Length);
+            AaruConsole.DebugWriteLine("Nero plugin", "footerV1.ChunkID = 0x{0:X8}", footerV1.ChunkId);
             AaruConsole.DebugWriteLine("Nero plugin", "footerV1.FirstChunkOffset = {0}", footerV1.FirstChunkOffset);
-            AaruConsole.DebugWriteLine("Nero plugin", "footerV2.ChunkID = 0x{0:X8}",     footerV2.ChunkId);
+            AaruConsole.DebugWriteLine("Nero plugin", "footerV2.ChunkID = 0x{0:X8}", footerV2.ChunkId);
             AaruConsole.DebugWriteLine("Nero plugin", "footerV2.FirstChunkOffset = {0}", footerV2.FirstChunkOffset);
 
-            if(footerV2.ChunkId == NERO_FOOTER_V2 && footerV2.FirstChunkOffset < (ulong)imageStream.Length) return true;
+            if(footerV2.ChunkId          == NERO_FOOTER_V2 &&
+               footerV2.FirstChunkOffset < (ulong)imageStream.Length)
+                return true;
 
             return footerV1.ChunkId == NERO_FOOTER_V1 && footerV1.FirstChunkOffset < (ulong)imageStream.Length;
         }
diff --git a/Aaru.Images/Nero/Nero.cs b/Aaru.Images/Nero/Nero.cs
index 414ceab4d..2adb27af8 100644
--- a/Aaru.Images/Nero/Nero.cs
+++ b/Aaru.Images/Nero/Nero.cs
@@ -43,38 +43,40 @@ using Aaru.CommonTypes.Structs;
 
 namespace Aaru.DiscImages
 {
-    [SuppressMessage("ReSharper", "NotAccessedField.Local")]
-    [SuppressMessage("ReSharper", "CollectionNeverQueried.Local")]
+    [SuppressMessage("ReSharper", "NotAccessedField.Local"),
+     SuppressMessage("ReSharper", "CollectionNeverQueried.Local")]
     public partial class Nero : IOpticalMediaImage
     {
-        bool                        imageNewFormat;
-        Stream                      imageStream;
-        ImageInfo                   imageInfo;
-        NeroCdText                  neroCdtxt;
-        NeroV1Cuesheet              neroCuesheetV1;
-        NeroV2Cuesheet              neroCuesheetV2;
-        NeroV1Dao                   neroDaov1;
-        NeroV2Dao                   neroDaov2;
-        NeroDiscInformation         neroDiscInfo;
-        IFilter                     neroFilter;
-        NeroMediaType               neroMediaTyp;
-        NeroReloChunk               neroRelo;
-        Dictionary<ushort, uint>    neroSessions;
-        NeroV1Tao                   neroTaov1;
-        NeroV2Tao                   neroTaov2;
-        NeroTocChunk                neroToc;
-        Dictionary<uint, NeroTrack> neroTracks;
-        Dictionary<uint, ulong>     offsetmap;
-        Dictionary<uint, byte[]>    trackIsrCs;
-        byte[]                      upc;
+        bool                                 imageNewFormat;
+        Stream                               imageStream;
+        ImageInfo                            imageInfo;
+        NeroCdText                           neroCdtxt;
+        NeroV1Cuesheet                       neroCuesheetV1;
+        NeroV2Cuesheet                       neroCuesheetV2;
+        NeroV1Dao                            neroDaov1;
+        NeroV2Dao                            neroDaov2;
+        NeroDiscInformation                  neroDiscInfo;
+        IFilter                              neroFilter;
+        NeroMediaType                        neroMediaTyp;
+        NeroReloChunk                        neroRelo;
+        readonly Dictionary<ushort, uint>    neroSessions;
+        NeroV1Tao                            neroTaov1;
+        NeroV2Tao                            neroTaov2;
+        NeroTocChunk                         neroToc;
+        readonly Dictionary<uint, NeroTrack> neroTracks;
+        readonly Dictionary<uint, ulong>     offsetmap;
+        Dictionary<uint, byte[]>             trackIsrCs;
+        byte[]                               upc;
 
         public Nero()
         {
             imageNewFormat = false;
+
             imageInfo = new ImageInfo
             {
                 ReadableSectorTags = new List<SectorTagType>(), ReadableMediaTags = new List<MediaTagType>()
             };
+
             neroSessions = new Dictionary<ushort, uint>();
             neroTracks   = new Dictionary<uint, NeroTrack>();
             offsetmap    = new Dictionary<uint, ulong>();
diff --git a/Aaru.Images/Nero/Read.cs b/Aaru.Images/Nero/Read.cs
index e5f1a5f36..6698c8bd7 100644
--- a/Aaru.Images/Nero/Read.cs
+++ b/Aaru.Images/Nero/Read.cs
@@ -71,12 +71,12 @@ namespace Aaru.DiscImages
                 AaruConsole.DebugWriteLine("Nero plugin", "imageStream.Length = {0}", imageStream.Length);
 
                 AaruConsole.DebugWriteLine("Nero plugin", "footerV1.ChunkID = 0x{0:X8} (\"{1}\")", footerV1.ChunkId,
-                                          Encoding.ASCII.GetString(BigEndianBitConverter.GetBytes(footerV1.ChunkId)));
+                                           Encoding.ASCII.GetString(BigEndianBitConverter.GetBytes(footerV1.ChunkId)));
 
                 AaruConsole.DebugWriteLine("Nero plugin", "footerV1.FirstChunkOffset = {0}", footerV1.FirstChunkOffset);
 
                 AaruConsole.DebugWriteLine("Nero plugin", "footerV2.ChunkID = 0x{0:X8} (\"{1}\")", footerV2.ChunkId,
-                                          Encoding.ASCII.GetString(BigEndianBitConverter.GetBytes(footerV2.ChunkId)));
+                                           Encoding.ASCII.GetString(BigEndianBitConverter.GetBytes(footerV2.ChunkId)));
 
                 AaruConsole.DebugWriteLine("Nero plugin", "footerV2.FirstChunkOffset = {0}", footerV2.FirstChunkOffset);
 
@@ -118,7 +118,7 @@ namespace Aaru.DiscImages
                     uint chunkLength = BigEndianBitConverter.ToUInt32(chunkHeaderBuffer, 4);
 
                     AaruConsole.DebugWriteLine("Nero plugin", "ChunkID = 0x{0:X8} (\"{1}\")", chunkId,
-                                              Encoding.ASCII.GetString(BigEndianBitConverter.GetBytes(chunkId)));
+                                               Encoding.ASCII.GetString(BigEndianBitConverter.GetBytes(chunkId)));
 
                     AaruConsole.DebugWriteLine("Nero plugin", "ChunkLength = {0}", chunkLength);
 
@@ -127,7 +127,7 @@ namespace Aaru.DiscImages
                         case NERO_CUE_V1:
                         {
                             AaruConsole.DebugWriteLine("Nero plugin", "Found \"CUES\" chunk, parsing {0} bytes",
-                                                      chunkLength);
+                                                       chunkLength);
 
                             neroCuesheetV1 = new NeroV1Cuesheet
                             {
@@ -151,25 +151,25 @@ namespace Aaru.DiscImages
                                 AaruConsole.DebugWriteLine("Nero plugin", "Cuesheet entry {0}", (i / 8) + 1);
 
                                 AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Mode = {1:X2}", (i / 8) + 1,
-                                                          entry.Mode);
+                                                           entry.Mode);
 
                                 AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].TrackNumber = {1:X2}",
-                                                          (i / 8) + 1, entry.TrackNumber);
+                                                           (i / 8) + 1, entry.TrackNumber);
 
                                 AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].IndexNumber = {1:X2}",
-                                                          (i / 8) + 1, entry.IndexNumber);
+                                                           (i / 8) + 1, entry.IndexNumber);
 
                                 AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Dummy = {1:X4}", (i / 8) + 1,
-                                                          entry.Dummy);
+                                                           entry.Dummy);
 
                                 AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Minute = {1:X2}", (i / 8) + 1,
-                                                          entry.Minute);
+                                                           entry.Minute);
 
                                 AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Second = {1:X2}", (i / 8) + 1,
-                                                          entry.Second);
+                                                           entry.Second);
 
                                 AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Frame = {1:X2}", (i / 8) + 1,
-                                                          entry.Frame);
+                                                           entry.Frame);
 
                                 neroCuesheetV1.Entries.Add(entry);
                             }
@@ -180,7 +180,7 @@ namespace Aaru.DiscImages
                         case NERO_CUE_V2:
                         {
                             AaruConsole.DebugWriteLine("Nero plugin", "Found \"CUEX\" chunk, parsing {0} bytes",
-                                                      chunkLength);
+                                                       chunkLength);
 
                             neroCuesheetV2 = new NeroV2Cuesheet
                             {
@@ -202,19 +202,19 @@ namespace Aaru.DiscImages
                                 AaruConsole.DebugWriteLine("Nero plugin", "Cuesheet entry {0}", (i / 8) + 1);
 
                                 AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Mode = 0x{1:X2}", (i / 8) + 1,
-                                                          entry.Mode);
+                                                           entry.Mode);
 
                                 AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].TrackNumber = {1:X2}",
-                                                          (i / 8) + 1, entry.TrackNumber);
+                                                           (i / 8) + 1, entry.TrackNumber);
 
                                 AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].IndexNumber = {1:X2}",
-                                                          (i / 8) + 1, entry.IndexNumber);
+                                                           (i / 8) + 1, entry.IndexNumber);
 
                                 AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Dummy = {1:X2}", (i / 8) + 1,
-                                                          entry.Dummy);
+                                                           entry.Dummy);
 
                                 AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].LBAStart = {1}", (i / 8) + 1,
-                                                          entry.LbaStart);
+                                                           entry.LbaStart);
 
                                 neroCuesheetV2.Entries.Add(entry);
                             }
@@ -225,7 +225,7 @@ namespace Aaru.DiscImages
                         case NERO_DAO_V1:
                         {
                             AaruConsole.DebugWriteLine("Nero plugin", "Found \"DAOI\" chunk, parsing {0} bytes",
-                                                      chunkLength);
+                                                       chunkLength);
 
                             neroDaov1 = new NeroV1Dao
                             {
@@ -249,15 +249,16 @@ namespace Aaru.DiscImages
                                 imageInfo.ReadableSectorTags.Add(SectorTagType.CdTrackIsrc);
 
                             AaruConsole.DebugWriteLine("Nero plugin", "neroDAOV1.ChunkSizeLe = {0} bytes",
-                                                      neroDaov1.ChunkSizeLe);
+                                                       neroDaov1.ChunkSizeLe);
 
                             AaruConsole.DebugWriteLine("Nero plugin", "neroDAOV1.UPC = \"{0}\"",
-                                                      StringHandlers.CToString(neroDaov1.Upc));
+                                                       StringHandlers.CToString(neroDaov1.Upc));
 
-                            AaruConsole.DebugWriteLine("Nero plugin", "neroDAOV1.TocType = 0x{0:X4}", neroDaov1.TocType);
+                            AaruConsole.DebugWriteLine("Nero plugin", "neroDAOV1.TocType = 0x{0:X4}",
+                                                       neroDaov1.TocType);
 
                             AaruConsole.DebugWriteLine("Nero plugin", "neroDAOV1.FirstTrack = {0}",
-                                                      neroDaov1.FirstTrack);
+                                                       neroDaov1.FirstTrack);
 
                             AaruConsole.DebugWriteLine("Nero plugin", "neroDAOV1.LastTrack = {0}", neroDaov1.LastTrack);
 
@@ -281,25 +282,25 @@ namespace Aaru.DiscImages
                                 AaruConsole.DebugWriteLine("Nero plugin", "Disc-At-Once entry {0}", (i / 32) + 1);
 
                                 AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].ISRC = \"{1}\"", (i / 32) + 1,
-                                                          StringHandlers.CToString(entry.Isrc));
+                                                           StringHandlers.CToString(entry.Isrc));
 
                                 AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].SectorSize = {1}",
-                                                          (i / 32) + 1, entry.SectorSize);
+                                                           (i / 32) + 1, entry.SectorSize);
 
                                 AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Mode = {1} (0x{2:X4})",
-                                                          (i / 32) + 1, (DaoMode)entry.Mode, entry.Mode);
+                                                           (i / 32) + 1, (DaoMode)entry.Mode, entry.Mode);
 
                                 AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Unknown = 0x{1:X4}",
-                                                          (i / 32) + 1, entry.Unknown);
+                                                           (i / 32) + 1, entry.Unknown);
 
                                 AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Index0 = {1}", (i / 32) + 1,
-                                                          entry.Index0);
+                                                           entry.Index0);
 
                                 AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Index1 = {1}", (i / 32) + 1,
-                                                          entry.Index1);
+                                                           entry.Index1);
 
                                 AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].EndOfTrack = {1}",
-                                                          (i / 32) + 1, entry.EndOfTrack);
+                                                           (i / 32) + 1, entry.EndOfTrack);
 
                                 neroDaov1.Tracks.Add(entry);
 
@@ -335,7 +336,7 @@ namespace Aaru.DiscImages
                         case NERO_DAO_V2:
                         {
                             AaruConsole.DebugWriteLine("Nero plugin", "Found \"DAOX\" chunk, parsing {0} bytes",
-                                                      chunkLength);
+                                                       chunkLength);
 
                             neroDaov2 = new NeroV2Dao
                             {
@@ -361,15 +362,16 @@ namespace Aaru.DiscImages
                             upc = neroDaov2.Upc;
 
                             AaruConsole.DebugWriteLine("Nero plugin", "neroDAOV2.ChunkSizeLe = {0} bytes",
-                                                      neroDaov2.ChunkSizeLe);
+                                                       neroDaov2.ChunkSizeLe);
 
                             AaruConsole.DebugWriteLine("Nero plugin", "neroDAOV2.UPC = \"{0}\"",
-                                                      StringHandlers.CToString(neroDaov2.Upc));
+                                                       StringHandlers.CToString(neroDaov2.Upc));
 
-                            AaruConsole.DebugWriteLine("Nero plugin", "neroDAOV2.TocType = 0x{0:X4}", neroDaov2.TocType);
+                            AaruConsole.DebugWriteLine("Nero plugin", "neroDAOV2.TocType = 0x{0:X4}",
+                                                       neroDaov2.TocType);
 
                             AaruConsole.DebugWriteLine("Nero plugin", "neroDAOV2.FirstTrack = {0}",
-                                                      neroDaov2.FirstTrack);
+                                                       neroDaov2.FirstTrack);
 
                             AaruConsole.DebugWriteLine("Nero plugin", "neroDAOV2.LastTrack = {0}", neroDaov2.LastTrack);
 
@@ -391,25 +393,25 @@ namespace Aaru.DiscImages
                                 AaruConsole.DebugWriteLine("Nero plugin", "Disc-At-Once entry {0}", (i / 32) + 1);
 
                                 AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].ISRC = \"{1}\"", (i / 32) + 1,
-                                                          StringHandlers.CToString(entry.Isrc));
+                                                           StringHandlers.CToString(entry.Isrc));
 
                                 AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].SectorSize = {1}",
-                                                          (i / 32) + 1, entry.SectorSize);
+                                                           (i / 32) + 1, entry.SectorSize);
 
                                 AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Mode = {1} (0x{2:X4})",
-                                                          (i / 32) + 1, (DaoMode)entry.Mode, entry.Mode);
+                                                           (i / 32) + 1, (DaoMode)entry.Mode, entry.Mode);
 
                                 AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Unknown = {1:X2}",
-                                                          (i / 32) + 1, entry.Unknown);
+                                                           (i / 32) + 1, entry.Unknown);
 
                                 AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Index0 = {1}", (i / 32) + 1,
-                                                          entry.Index0);
+                                                           entry.Index0);
 
                                 AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Index1 = {1}", (i / 32) + 1,
-                                                          entry.Index1);
+                                                           entry.Index1);
 
                                 AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].EndOfTrack = {1}",
-                                                          (i / 32) + 1, entry.EndOfTrack);
+                                                           (i / 32) + 1, entry.EndOfTrack);
 
                                 neroDaov2.Tracks.Add(entry);
 
@@ -445,7 +447,7 @@ namespace Aaru.DiscImages
                         case NERO_CDTEXT:
                         {
                             AaruConsole.DebugWriteLine("Nero plugin", "Found \"CDTX\" chunk, parsing {0} bytes",
-                                                      chunkLength);
+                                                       chunkLength);
 
                             neroCdtxt = new NeroCdText
                             {
@@ -470,22 +472,22 @@ namespace Aaru.DiscImages
                                 AaruConsole.DebugWriteLine("Nero plugin", "CD-TEXT entry {0}", (i / 18) + 1);
 
                                 AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].PackType = 0x{1:X2}",
-                                                          (i / 18) + 1, entry.PackType);
+                                                           (i / 18) + 1, entry.PackType);
 
                                 AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].TrackNumber = 0x{1:X2}",
-                                                          (i / 18) + 1, entry.TrackNumber);
+                                                           (i / 18) + 1, entry.TrackNumber);
 
                                 AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].PackNumber = 0x{1:X2}",
-                                                          (i / 18) + 1, entry.PackNumber);
+                                                           (i / 18) + 1, entry.PackNumber);
 
                                 AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].BlockNumber = 0x{1:X2}",
-                                                          (i / 18) + 1, entry.BlockNumber);
+                                                           (i / 18) + 1, entry.BlockNumber);
 
                                 AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Text = \"{1}\"", (i / 18) + 1,
-                                                          StringHandlers.CToString(entry.Text));
+                                                           StringHandlers.CToString(entry.Text));
 
                                 AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].CRC = 0x{1:X4}", (i / 18) + 1,
-                                                          entry.Crc);
+                                                           entry.Crc);
 
                                 neroCdtxt.Packs.Add(entry);
                             }
@@ -496,7 +498,7 @@ namespace Aaru.DiscImages
                         case NERO_TAO_V1:
                         {
                             AaruConsole.DebugWriteLine("Nero plugin", "Found \"ETNF\" chunk, parsing {0} bytes",
-                                                      chunkLength);
+                                                       chunkLength);
 
                             neroTaov1 = new NeroV1Tao
                             {
@@ -519,19 +521,19 @@ namespace Aaru.DiscImages
                                 AaruConsole.DebugWriteLine("Nero plugin", "Track-at-Once entry {0}", (i / 20) + 1);
 
                                 AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Offset = {1}", (i / 20) + 1,
-                                                          entry.Offset);
+                                                           entry.Offset);
 
                                 AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Length = {1} bytes",
-                                                          (i / 20) + 1, entry.Length);
+                                                           (i / 20) + 1, entry.Length);
 
                                 AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Mode = {1} (0x{2:X4})",
-                                                          (i / 20) + 1, (DaoMode)entry.Mode, entry.Mode);
+                                                           (i / 20) + 1, (DaoMode)entry.Mode, entry.Mode);
 
                                 AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].StartLBA = {1}", (i / 20) + 1,
-                                                          entry.StartLba);
+                                                           entry.StartLba);
 
                                 AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Unknown = 0x{1:X4}",
-                                                          (i / 20) + 1, entry.Unknown);
+                                                           (i / 20) + 1, entry.Unknown);
 
                                 neroTaov1.Tracks.Add(entry);
 
@@ -563,7 +565,7 @@ namespace Aaru.DiscImages
                         case NERO_TAO_V2:
                         {
                             AaruConsole.DebugWriteLine("Nero plugin", "Found \"ETN2\" chunk, parsing {0} bytes",
-                                                      chunkLength);
+                                                       chunkLength);
 
                             neroTaov2 = new NeroV2Tao
                             {
@@ -587,22 +589,22 @@ namespace Aaru.DiscImages
                                 AaruConsole.DebugWriteLine("Nero plugin", "Track-at-Once entry {0}", (i / 32) + 1);
 
                                 AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Offset = {1}", (i / 32) + 1,
-                                                          entry.Offset);
+                                                           entry.Offset);
 
                                 AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Length = {1} bytes",
-                                                          (i / 32) + 1, entry.Length);
+                                                           (i / 32) + 1, entry.Length);
 
                                 AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Mode = {1} (0x{2:X4})",
-                                                          (i / 32) + 1, (DaoMode)entry.Mode, entry.Mode);
+                                                           (i / 32) + 1, (DaoMode)entry.Mode, entry.Mode);
 
                                 AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].StartLBA = {1}", (i / 32) + 1,
-                                                          entry.StartLba);
+                                                           entry.StartLba);
 
                                 AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Unknown = 0x{1:X4}",
-                                                          (i / 32) + 1, entry.Unknown);
+                                                           (i / 32) + 1, entry.Unknown);
 
                                 AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Sectors = {1}", (i / 32) + 1,
-                                                          entry.Sectors);
+                                                           entry.Sectors);
 
                                 neroTaov2.Tracks.Add(entry);
 
@@ -636,7 +638,7 @@ namespace Aaru.DiscImages
                         case NERO_SESSION:
                         {
                             AaruConsole.DebugWriteLine("Nero plugin", "Found \"SINF\" chunk, parsing {0} bytes",
-                                                      chunkLength);
+                                                       chunkLength);
 
                             byte[] tmpbuffer = new byte[4];
                             imageStream.Read(tmpbuffer, 0, 4);
@@ -644,7 +646,7 @@ namespace Aaru.DiscImages
                             neroSessions.Add(currentsession, sessionTracks);
 
                             AaruConsole.DebugWriteLine("Nero plugin", "\tSession {0} has {1} tracks", currentsession,
-                                                      sessionTracks);
+                                                       sessionTracks);
 
                             currentsession++;
 
@@ -654,7 +656,7 @@ namespace Aaru.DiscImages
                         case NERO_DISC_TYPE:
                         {
                             AaruConsole.DebugWriteLine("Nero plugin", "Found \"MTYP\" chunk, parsing {0} bytes",
-                                                      chunkLength);
+                                                       chunkLength);
 
                             neroMediaTyp = new NeroMediaType
                             {
@@ -666,7 +668,7 @@ namespace Aaru.DiscImages
                             neroMediaTyp.Type = BigEndianBitConverter.ToUInt32(tmpbuffer, 0);
 
                             AaruConsole.DebugWriteLine("Nero plugin", "\tMedia type is {0} ({1})",
-                                                      (NeroMediaTypes)neroMediaTyp.Type, neroMediaTyp.Type);
+                                                       (NeroMediaTypes)neroMediaTyp.Type, neroMediaTyp.Type);
 
                             imageInfo.MediaType = NeroMediaTypeToMediaType((NeroMediaTypes)neroMediaTyp.Type);
 
@@ -676,7 +678,7 @@ namespace Aaru.DiscImages
                         case NERO_DISC_INFO:
                         {
                             AaruConsole.DebugWriteLine("Nero plugin", "Found \"DINF\" chunk, parsing {0} bytes",
-                                                      chunkLength);
+                                                       chunkLength);
 
                             neroDiscInfo = new NeroDiscInformation
                             {
@@ -688,7 +690,7 @@ namespace Aaru.DiscImages
                             neroDiscInfo.Unknown = BigEndianBitConverter.ToUInt32(tmpbuffer, 0);
 
                             AaruConsole.DebugWriteLine("Nero plugin", "\tneroDiscInfo.Unknown = 0x{0:X4} ({0})",
-                                                      neroDiscInfo.Unknown);
+                                                       neroDiscInfo.Unknown);
 
                             break;
                         }
@@ -696,7 +698,7 @@ namespace Aaru.DiscImages
                         case NERO_RELOCATION:
                         {
                             AaruConsole.DebugWriteLine("Nero plugin", "Found \"RELO\" chunk, parsing {0} bytes",
-                                                      chunkLength);
+                                                       chunkLength);
 
                             neroRelo = new NeroReloChunk
                             {
@@ -708,7 +710,7 @@ namespace Aaru.DiscImages
                             neroRelo.Unknown = BigEndianBitConverter.ToUInt32(tmpbuffer, 0);
 
                             AaruConsole.DebugWriteLine("Nero plugin", "\tneroRELO.Unknown = 0x{0:X4} ({0})",
-                                                      neroRelo.Unknown);
+                                                       neroRelo.Unknown);
 
                             break;
                         }
@@ -716,7 +718,7 @@ namespace Aaru.DiscImages
                         case NERO_TOC:
                         {
                             AaruConsole.DebugWriteLine("Nero plugin", "Found \"TOCT\" chunk, parsing {0} bytes",
-                                                      chunkLength);
+                                                       chunkLength);
 
                             neroToc = new NeroTocChunk
                             {
@@ -728,7 +730,7 @@ namespace Aaru.DiscImages
                             neroToc.Unknown = BigEndianBitConverter.ToUInt16(tmpbuffer, 0);
 
                             AaruConsole.DebugWriteLine("Nero plugin", "\tneroTOC.Unknown = 0x{0:X4} ({0})",
-                                                      neroToc.Unknown);
+                                                       neroToc.Unknown);
 
                             break;
                         }
@@ -744,8 +746,8 @@ namespace Aaru.DiscImages
                         default:
                         {
                             AaruConsole.DebugWriteLine("Nero plugin", "Unknown chunk ID \"{0}\", skipping...",
-                                                      Encoding.ASCII.GetString(BigEndianBitConverter.
-                                                                                   GetBytes(chunkId)));
+                                                       Encoding.ASCII.GetString(BigEndianBitConverter.
+                                                                                    GetBytes(chunkId)));
 
                             imageStream.Seek(chunkLength, SeekOrigin.Current);
 
@@ -809,7 +811,7 @@ namespace Aaru.DiscImages
                     AaruConsole.DebugWriteLine("Nero plugin", "\tcurrentsessionmaxtrack = {0}", currentsessionmaxtrack);
 
                     AaruConsole.DebugWriteLine("Nero plugin", "\tcurrentsessioncurrenttrack = {0}",
-                                              currentsessioncurrenttrack);
+                                               currentsessioncurrenttrack);
 
                     var track = new Track();
 
@@ -825,8 +827,7 @@ namespace Aaru.DiscImages
                     track.TrackDescription = StringHandlers.CToString(neroTrack.Isrc);
                     track.TrackEndSector   = ((neroTrack.Length / neroTrack.SectorSize) + neroTrack.StartLba) - 1;
 
-                    track.TrackPregap = (neroTrack.Index1 - neroTrack.Index0) /
-                                                neroTrack.SectorSize;
+                    track.TrackPregap = (neroTrack.Index1 - neroTrack.Index0) / neroTrack.SectorSize;
 
                     track.TrackSequence       = neroTrack.Sequence;
                     track.TrackSession        = currentsession;
@@ -896,7 +897,7 @@ namespace Aaru.DiscImages
                     Tracks.Add(track);
 
                     AaruConsole.DebugWriteLine("Nero plugin", "\t\t _track.TrackDescription = {0}",
-                                              track.TrackDescription);
+                                               track.TrackDescription);
 
                     AaruConsole.DebugWriteLine("Nero plugin", "\t\t _track.TrackEndSector = {0}", track.TrackEndSector);
                     AaruConsole.DebugWriteLine("Nero plugin", "\t\t _track.TrackPregap = {0}", track.TrackPregap);
@@ -904,7 +905,7 @@ namespace Aaru.DiscImages
                     AaruConsole.DebugWriteLine("Nero plugin", "\t\t _track.TrackSession = {0}", track.TrackSession);
 
                     AaruConsole.DebugWriteLine("Nero plugin", "\t\t _track.TrackStartSector = {0}",
-                                              track.TrackStartSector);
+                                               track.TrackStartSector);
 
                     AaruConsole.DebugWriteLine("Nero plugin", "\t\t _track.TrackType = {0}", track.TrackType);
 
@@ -939,7 +940,7 @@ namespace Aaru.DiscImages
                     offsetmap.Add(track.TrackSequence, track.TrackStartSector);
 
                     AaruConsole.DebugWriteLine("Nero plugin", "\t\t Offset[{0}]: {1}", track.TrackSequence,
-                                              track.TrackStartSector);
+                                               track.TrackStartSector);
 
                     /*if(_neroTrack.Index0 < _neroTrack.Index1)
                         {
@@ -1188,8 +1189,9 @@ namespace Aaru.DiscImages
             imageStream = neroFilter.GetDataForkStream();
             var br = new BinaryReader(imageStream);
 
-            br.BaseStream.Seek((long)aaruTrack.Offset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)),
-                               SeekOrigin.Begin);
+            br.BaseStream.
+               Seek((long)aaruTrack.Offset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)),
+                    SeekOrigin.Begin);
 
             if(mode2)
             {
@@ -1468,8 +1470,9 @@ namespace Aaru.DiscImages
             imageStream = neroFilter.GetDataForkStream();
             var br = new BinaryReader(imageStream);
 
-            br.BaseStream.Seek((long)aaruTrack.Offset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)),
-                               SeekOrigin.Begin);
+            br.BaseStream.
+               Seek((long)aaruTrack.Offset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)),
+                    SeekOrigin.Begin);
 
             if(sectorOffset == 0 &&
                sectorSkip   == 0)
@@ -1565,8 +1568,9 @@ namespace Aaru.DiscImages
             imageStream = neroFilter.GetDataForkStream();
             var br = new BinaryReader(imageStream);
 
-            br.BaseStream.Seek((long)aaruTrack.Offset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)),
-                               SeekOrigin.Begin);
+            br.BaseStream.
+               Seek((long)aaruTrack.Offset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)),
+                    SeekOrigin.Begin);
 
             if(sectorOffset == 0 &&
                sectorSkip   == 0)
diff --git a/Aaru.Images/Nero/Structs.cs b/Aaru.Images/Nero/Structs.cs
index 829032dae..6c61ba8bc 100644
--- a/Aaru.Images/Nero/Structs.cs
+++ b/Aaru.Images/Nero/Structs.cs
@@ -38,542 +38,352 @@ namespace Aaru.DiscImages
     {
         struct NeroV1Footer
         {
-            /// <summary>
-            ///     "NERO"
-            /// </summary>
+            /// <summary>"NERO"</summary>
             public uint ChunkId;
 
-            /// <summary>
-            ///     Offset of first chunk in file
-            /// </summary>
+            /// <summary>Offset of first chunk in file</summary>
             public uint FirstChunkOffset;
         }
 
         struct NeroV2Footer
         {
-            /// <summary>
-            ///     "NER5"
-            /// </summary>
+            /// <summary>"NER5"</summary>
             public uint ChunkId;
 
-            /// <summary>
-            ///     Offset of first chunk in file
-            /// </summary>
+            /// <summary>Offset of first chunk in file</summary>
             public ulong FirstChunkOffset;
         }
 
         struct NeroV2CueEntry
         {
-            /// <summary>
-            ///     Track mode. 0x01 for audio, 0x21 for copy-protected audio, 0x41 for data
-            /// </summary>
+            /// <summary>Track mode. 0x01 for audio, 0x21 for copy-protected audio, 0x41 for data</summary>
             public byte Mode;
 
-            /// <summary>
-            ///     Track number in BCD
-            /// </summary>
+            /// <summary>Track number in BCD</summary>
             public byte TrackNumber;
 
-            /// <summary>
-            ///     Index number in BCD
-            /// </summary>
+            /// <summary>Index number in BCD</summary>
             public byte IndexNumber;
 
-            /// <summary>
-            ///     Always zero
-            /// </summary>
+            /// <summary>Always zero</summary>
             public byte Dummy;
 
-            /// <summary>
-            ///     LBA sector start for this entry
-            /// </summary>
+            /// <summary>LBA sector start for this entry</summary>
             public int LbaStart;
         }
 
         struct NeroV2Cuesheet
         {
-            /// <summary>
-            ///     "CUEX"
-            /// </summary>
+            /// <summary>"CUEX"</summary>
             public uint ChunkId;
 
-            /// <summary>
-            ///     Chunk size
-            /// </summary>
+            /// <summary>Chunk size</summary>
             public uint ChunkSize;
 
-            /// <summary>
-            ///     Cuesheet entries
-            /// </summary>
+            /// <summary>Cuesheet entries</summary>
             public List<NeroV2CueEntry> Entries;
         }
 
         struct NeroV1CueEntry
         {
-            /// <summary>
-            ///     Track mode. 0x01 for audio, 0x21 for copy-protected audio, 0x41 for data
-            /// </summary>
+            /// <summary>Track mode. 0x01 for audio, 0x21 for copy-protected audio, 0x41 for data</summary>
             public byte Mode;
 
-            /// <summary>
-            ///     Track number in BCD
-            /// </summary>
+            /// <summary>Track number in BCD</summary>
             public byte TrackNumber;
 
-            /// <summary>
-            ///     Index number in BCD
-            /// </summary>
+            /// <summary>Index number in BCD</summary>
             public byte IndexNumber;
 
-            /// <summary>
-            ///     Always zero
-            /// </summary>
+            /// <summary>Always zero</summary>
             public ushort Dummy;
 
-            /// <summary>
-            ///     MSF start sector's minute for this entry
-            /// </summary>
+            /// <summary>MSF start sector's minute for this entry</summary>
             public byte Minute;
 
-            /// <summary>
-            ///     MSF start sector's second for this entry
-            /// </summary>
+            /// <summary>MSF start sector's second for this entry</summary>
             public byte Second;
 
-            /// <summary>
-            ///     MSF start sector's frame for this entry
-            /// </summary>
+            /// <summary>MSF start sector's frame for this entry</summary>
             public byte Frame;
         }
 
         struct NeroV1Cuesheet
         {
-            /// <summary>
-            ///     "CUES"
-            /// </summary>
+            /// <summary>"CUES"</summary>
             public uint ChunkId;
 
-            /// <summary>
-            ///     Chunk size
-            /// </summary>
+            /// <summary>Chunk size</summary>
             public uint ChunkSize;
 
-            /// <summary>
-            ///     Cuesheet entries
-            /// </summary>
+            /// <summary>Cuesheet entries</summary>
             public List<NeroV1CueEntry> Entries;
         }
 
         struct NeroV1DaoEntry
         {
-            /// <summary>
-            ///     ISRC (12 bytes)
-            /// </summary>
+            /// <summary>ISRC (12 bytes)</summary>
             public byte[] Isrc;
 
-            /// <summary>
-            ///     Size of sector inside image (in bytes)
-            /// </summary>
+            /// <summary>Size of sector inside image (in bytes)</summary>
             public ushort SectorSize;
 
-            /// <summary>
-            ///     Sector mode in image
-            /// </summary>
+            /// <summary>Sector mode in image</summary>
             public ushort Mode;
 
-            /// <summary>
-            ///     Unknown
-            /// </summary>
+            /// <summary>Unknown</summary>
             public ushort Unknown;
 
-            /// <summary>
-            ///     Index 0 start
-            /// </summary>
+            /// <summary>Index 0 start</summary>
             public uint Index0;
 
-            /// <summary>
-            ///     Index 1 start
-            /// </summary>
+            /// <summary>Index 1 start</summary>
             public uint Index1;
 
-            /// <summary>
-            ///     End of track + 1
-            /// </summary>
+            /// <summary>End of track + 1</summary>
             public uint EndOfTrack;
         }
 
         struct NeroV1Dao
         {
-            /// <summary>
-            ///     "DAOI"
-            /// </summary>
+            /// <summary>"DAOI"</summary>
             public uint ChunkId;
 
-            /// <summary>
-            ///     Chunk size (big endian)
-            /// </summary>
+            /// <summary>Chunk size (big endian)</summary>
             public uint ChunkSizeBe;
 
-            /// <summary>
-            ///     Chunk size (little endian)
-            /// </summary>
+            /// <summary>Chunk size (little endian)</summary>
             public uint ChunkSizeLe;
 
-            /// <summary>
-            ///     UPC (14 bytes, null-padded)
-            /// </summary>
+            /// <summary>UPC (14 bytes, null-padded)</summary>
             public byte[] Upc;
 
-            /// <summary>
-            ///     TOC type
-            /// </summary>
+            /// <summary>TOC type</summary>
             public ushort TocType;
 
-            /// <summary>
-            ///     First track
-            /// </summary>
+            /// <summary>First track</summary>
             public byte FirstTrack;
 
-            /// <summary>
-            ///     Last track
-            /// </summary>
+            /// <summary>Last track</summary>
             public byte LastTrack;
 
-            /// <summary>
-            ///     Tracks
-            /// </summary>
+            /// <summary>Tracks</summary>
             public List<NeroV1DaoEntry> Tracks;
         }
 
         struct NeroV2DaoEntry
         {
-            /// <summary>
-            ///     ISRC (12 bytes)
-            /// </summary>
+            /// <summary>ISRC (12 bytes)</summary>
             public byte[] Isrc;
 
-            /// <summary>
-            ///     Size of sector inside image (in bytes)
-            /// </summary>
+            /// <summary>Size of sector inside image (in bytes)</summary>
             public ushort SectorSize;
 
-            /// <summary>
-            ///     Sector mode in image
-            /// </summary>
+            /// <summary>Sector mode in image</summary>
             public ushort Mode;
 
-            /// <summary>
-            ///     Seems to be always 0.
-            /// </summary>
+            /// <summary>Seems to be always 0.</summary>
             public ushort Unknown;
 
-            /// <summary>
-            ///     Index 0 start
-            /// </summary>
+            /// <summary>Index 0 start</summary>
             public ulong Index0;
 
-            /// <summary>
-            ///     Index 1 start
-            /// </summary>
+            /// <summary>Index 1 start</summary>
             public ulong Index1;
 
-            /// <summary>
-            ///     End of track + 1
-            /// </summary>
+            /// <summary>End of track + 1</summary>
             public ulong EndOfTrack;
         }
 
         struct NeroV2Dao
         {
-            /// <summary>
-            ///     "DAOX"
-            /// </summary>
+            /// <summary>"DAOX"</summary>
             public uint ChunkId;
 
-            /// <summary>
-            ///     Chunk size (big endian)
-            /// </summary>
+            /// <summary>Chunk size (big endian)</summary>
             public uint ChunkSizeBe;
 
-            /// <summary>
-            ///     Chunk size (little endian)
-            /// </summary>
+            /// <summary>Chunk size (little endian)</summary>
             public uint ChunkSizeLe;
 
-            /// <summary>
-            ///     UPC (14 bytes, null-padded)
-            /// </summary>
+            /// <summary>UPC (14 bytes, null-padded)</summary>
             public byte[] Upc;
 
-            /// <summary>
-            ///     TOC type
-            /// </summary>
+            /// <summary>TOC type</summary>
             public ushort TocType;
 
-            /// <summary>
-            ///     First track
-            /// </summary>
+            /// <summary>First track</summary>
             public byte FirstTrack;
 
-            /// <summary>
-            ///     Last track
-            /// </summary>
+            /// <summary>Last track</summary>
             public byte LastTrack;
 
-            /// <summary>
-            ///     Tracks
-            /// </summary>
+            /// <summary>Tracks</summary>
             public List<NeroV2DaoEntry> Tracks;
         }
 
         struct NeroCdTextPack
         {
-            /// <summary>
-            ///     Pack type
-            /// </summary>
+            /// <summary>Pack type</summary>
             public byte PackType;
 
-            /// <summary>
-            ///     Track number
-            /// </summary>
+            /// <summary>Track number</summary>
             public byte TrackNumber;
 
-            /// <summary>
-            ///     Pack number in block
-            /// </summary>
+            /// <summary>Pack number in block</summary>
             public byte PackNumber;
 
-            /// <summary>
-            ///     Block number
-            /// </summary>
+            /// <summary>Block number</summary>
             public byte BlockNumber;
 
-            /// <summary>
-            ///     12 bytes of data
-            /// </summary>
+            /// <summary>12 bytes of data</summary>
             public byte[] Text;
 
-            /// <summary>
-            ///     CRC
-            /// </summary>
+            /// <summary>CRC</summary>
             public ushort Crc;
         }
 
         struct NeroCdText
         {
-            /// <summary>
-            ///     "CDTX"
-            /// </summary>
+            /// <summary>"CDTX"</summary>
             public uint ChunkId;
 
-            /// <summary>
-            ///     Chunk size
-            /// </summary>
+            /// <summary>Chunk size</summary>
             public uint ChunkSize;
 
-            /// <summary>
-            ///     CD-TEXT packs
-            /// </summary>
+            /// <summary>CD-TEXT packs</summary>
             public List<NeroCdTextPack> Packs;
         }
 
         struct NeroV1TaoEntry
         {
-            /// <summary>
-            ///     Offset of track on image
-            /// </summary>
+            /// <summary>Offset of track on image</summary>
             public uint Offset;
 
-            /// <summary>
-            ///     Length of track in bytes
-            /// </summary>
+            /// <summary>Length of track in bytes</summary>
             public uint Length;
 
-            /// <summary>
-            ///     Track mode
-            /// </summary>
+            /// <summary>Track mode</summary>
             public uint Mode;
 
-            /// <summary>
-            ///     LBA track start (plus 150 lead in sectors)
-            /// </summary>
+            /// <summary>LBA track start (plus 150 lead in sectors)</summary>
             public uint StartLba;
 
-            /// <summary>
-            ///     Unknown
-            /// </summary>
+            /// <summary>Unknown</summary>
             public uint Unknown;
         }
 
         struct NeroV1Tao
         {
-            /// <summary>
-            ///     "ETNF"
-            /// </summary>
+            /// <summary>"ETNF"</summary>
             public uint ChunkId;
 
-            /// <summary>
-            ///     Chunk size
-            /// </summary>
+            /// <summary>Chunk size</summary>
             public uint ChunkSize;
 
-            /// <summary>
-            ///     CD-TEXT packs
-            /// </summary>
+            /// <summary>CD-TEXT packs</summary>
             public List<NeroV1TaoEntry> Tracks;
         }
 
         struct NeroV2TaoEntry
         {
-            /// <summary>
-            ///     Offset of track on image
-            /// </summary>
+            /// <summary>Offset of track on image</summary>
             public ulong Offset;
 
-            /// <summary>
-            ///     Length of track in bytes
-            /// </summary>
+            /// <summary>Length of track in bytes</summary>
             public ulong Length;
 
-            /// <summary>
-            ///     Track mode
-            /// </summary>
+            /// <summary>Track mode</summary>
             public uint Mode;
 
-            /// <summary>
-            ///     LBA track start (plus 150 lead in sectors)
-            /// </summary>
+            /// <summary>LBA track start (plus 150 lead in sectors)</summary>
             public uint StartLba;
 
-            /// <summary>
-            ///     Unknown
-            /// </summary>
+            /// <summary>Unknown</summary>
             public uint Unknown;
 
-            /// <summary>
-            ///     Track length in sectors
-            /// </summary>
+            /// <summary>Track length in sectors</summary>
             public uint Sectors;
         }
 
         struct NeroV2Tao
         {
-            /// <summary>
-            ///     "ETN2"
-            /// </summary>
+            /// <summary>"ETN2"</summary>
             public uint ChunkId;
 
-            /// <summary>
-            ///     Chunk size
-            /// </summary>
+            /// <summary>Chunk size</summary>
             public uint ChunkSize;
 
-            /// <summary>
-            ///     CD-TEXT packs
-            /// </summary>
+            /// <summary>CD-TEXT packs</summary>
             public List<NeroV2TaoEntry> Tracks;
         }
 
         struct NeroSession
         {
-            /// <summary>
-            ///     "SINF"
-            /// </summary>
+            /// <summary>"SINF"</summary>
             public uint ChunkId;
 
-            /// <summary>
-            ///     Chunk size
-            /// </summary>
+            /// <summary>Chunk size</summary>
             public uint ChunkSize;
 
-            /// <summary>
-            ///     Tracks in session
-            /// </summary>
+            /// <summary>Tracks in session</summary>
             public uint Tracks;
         }
 
         struct NeroMediaType
         {
-            /// <summary>
-            ///     "MTYP"
-            /// </summary>
+            /// <summary>"MTYP"</summary>
             public uint ChunkId;
 
-            /// <summary>
-            ///     Chunk size
-            /// </summary>
+            /// <summary>Chunk size</summary>
             public uint ChunkSize;
 
-            /// <summary>
-            ///     Media type
-            /// </summary>
+            /// <summary>Media type</summary>
             public uint Type;
         }
 
         struct NeroDiscInformation
         {
-            /// <summary>
-            ///     "DINF"
-            /// </summary>
+            /// <summary>"DINF"</summary>
             public uint ChunkId;
 
-            /// <summary>
-            ///     Chunk size
-            /// </summary>
+            /// <summary>Chunk size</summary>
             public uint ChunkSize;
 
-            /// <summary>
-            ///     Unknown
-            /// </summary>
+            /// <summary>Unknown</summary>
             public uint Unknown;
         }
 
         struct NeroTocChunk
         {
-            /// <summary>
-            ///     "TOCT"
-            /// </summary>
+            /// <summary>"TOCT"</summary>
             public uint ChunkId;
 
-            /// <summary>
-            ///     Chunk size
-            /// </summary>
+            /// <summary>Chunk size</summary>
             public uint ChunkSize;
 
-            /// <summary>
-            ///     Unknown
-            /// </summary>
+            /// <summary>Unknown</summary>
             public ushort Unknown;
         }
 
         struct NeroReloChunk
         {
-            /// <summary>
-            ///     "RELO"
-            /// </summary>
+            /// <summary>"RELO"</summary>
             public uint ChunkId;
 
-            /// <summary>
-            ///     Chunk size
-            /// </summary>
+            /// <summary>Chunk size</summary>
             public uint ChunkSize;
 
-            /// <summary>
-            ///     Unknown
-            /// </summary>
+            /// <summary>Unknown</summary>
             public uint Unknown;
         }
 
         struct NeroEndOfChunkChain
         {
-            /// <summary>
-            ///     "END!"
-            /// </summary>
+            /// <summary>"END!"</summary>
             public uint ChunkId;
 
-            /// <summary>
-            ///     Chunk size
-            /// </summary>
+            /// <summary>Chunk size</summary>
             public uint ChunkSize;
         }
 
diff --git a/Aaru.Images/Nero/Verify.cs b/Aaru.Images/Nero/Verify.cs
index 2e5c42167..b94def1c8 100644
--- a/Aaru.Images/Nero/Verify.cs
+++ b/Aaru.Images/Nero/Verify.cs
@@ -41,16 +41,18 @@ namespace Aaru.DiscImages
         public bool? VerifySector(ulong sectorAddress)
         {
             byte[] buffer = ReadSectorLong(sectorAddress);
+
             return CdChecksums.CheckCdSector(buffer);
         }
 
         public bool? VerifySector(ulong sectorAddress, uint track)
         {
             byte[] buffer = ReadSectorLong(sectorAddress, track);
+
             return CdChecksums.CheckCdSector(buffer);
         }
 
-        public bool? VerifySectors(ulong           sectorAddress, uint length, out List<ulong> failingLbas,
+        public bool? VerifySectors(ulong sectorAddress, uint length, out List<ulong> failingLbas,
                                    out List<ulong> unknownLbas)
         {
             byte[] buffer = ReadSectorsLong(sectorAddress, length);
@@ -68,19 +70,22 @@ namespace Aaru.DiscImages
                 {
                     case null:
                         unknownLbas.Add((ulong)i + sectorAddress);
+
                         break;
                     case false:
                         failingLbas.Add((ulong)i + sectorAddress);
+
                         break;
                 }
             }
 
-            if(unknownLbas.Count > 0) return null;
+            if(unknownLbas.Count > 0)
+                return null;
 
             return failingLbas.Count <= 0;
         }
 
-        public bool? VerifySectors(ulong           sectorAddress, uint length, uint track, out List<ulong> failingLbas,
+        public bool? VerifySectors(ulong sectorAddress, uint length, uint track, out List<ulong> failingLbas,
                                    out List<ulong> unknownLbas)
         {
             byte[] buffer = ReadSectorsLong(sectorAddress, length, track);
@@ -98,14 +103,17 @@ namespace Aaru.DiscImages
                 {
                     case null:
                         unknownLbas.Add((ulong)i + sectorAddress);
+
                         break;
                     case false:
                         failingLbas.Add((ulong)i + sectorAddress);
+
                         break;
                 }
             }
 
-            if(unknownLbas.Count > 0) return null;
+            if(unknownLbas.Count > 0)
+                return null;
 
             return failingLbas.Count <= 0;
         }
diff --git a/Aaru.Images/Parallels/Identify.cs b/Aaru.Images/Parallels/Identify.cs
index 802990042..e6a58592b 100644
--- a/Aaru.Images/Parallels/Identify.cs
+++ b/Aaru.Images/Parallels/Identify.cs
@@ -44,7 +44,8 @@ namespace Aaru.DiscImages
             Stream stream = imageFilter.GetDataForkStream();
             stream.Seek(0, SeekOrigin.Begin);
 
-            if(stream.Length < 512) return false;
+            if(stream.Length < 512)
+                return false;
 
             byte[] pHdrB = new byte[Marshal.SizeOf<ParallelsHeader>()];
             stream.Read(pHdrB, 0, Marshal.SizeOf<ParallelsHeader>());
diff --git a/Aaru.Images/Parallels/Parallels.cs b/Aaru.Images/Parallels/Parallels.cs
index 0a1e36ec5..093bbc36c 100644
--- a/Aaru.Images/Parallels/Parallels.cs
+++ b/Aaru.Images/Parallels/Parallels.cs
@@ -52,31 +52,18 @@ namespace Aaru.DiscImages
         Dictionary<ulong, byte[]> sectorCache;
         FileStream                writingStream;
 
-        public Parallels()
+        public Parallels() => imageInfo = new ImageInfo
         {
-            imageInfo = new ImageInfo
-            {
-                ReadableSectorTags    = new List<SectorTagType>(),
-                ReadableMediaTags     = new List<MediaTagType>(),
-                HasPartitions         = false,
-                HasSessions           = false,
-                Version               = "2",
-                Application           = "Parallels",
-                ApplicationVersion    = null,
-                Creator               = null,
-                Comments              = null,
-                MediaManufacturer     = null,
-                MediaModel            = null,
-                MediaSerialNumber     = null,
-                MediaBarcode          = null,
-                MediaPartNumber       = null,
-                MediaSequence         = 0,
-                LastMediaSequence     = 0,
-                DriveManufacturer     = null,
-                DriveModel            = null,
-                DriveSerialNumber     = null,
-                DriveFirmwareRevision = null
-            };
-        }
+            ReadableSectorTags = new List<SectorTagType>(), ReadableMediaTags = new List<MediaTagType>(),
+            HasPartitions      = false, HasSessions                           = false, Version = "2",
+            Application        = "Parallels",
+            ApplicationVersion = null, Creator = null, Comments = null,
+            MediaManufacturer  = null,
+            MediaModel         = null, MediaSerialNumber = null, MediaBarcode = null,
+            MediaPartNumber    = null,
+            MediaSequence      = 0, LastMediaSequence = 0, DriveManufacturer = null,
+            DriveModel         = null,
+            DriveSerialNumber  = null, DriveFirmwareRevision = null
+        };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/Parallels/Properties.cs b/Aaru.Images/Parallels/Properties.cs
index 6bc169be0..98eb7de82 100644
--- a/Aaru.Images/Parallels/Properties.cs
+++ b/Aaru.Images/Parallels/Properties.cs
@@ -41,27 +41,33 @@ namespace Aaru.DiscImages
 {
     public partial class Parallels
     {
-        public string                     Name                => "Parallels disk image";
-        public Guid                       Id                  => new Guid("E314DE35-C103-48A3-AD36-990F68523C46");
-        public ImageInfo                  Info                => imageInfo;
-        public string                     Author              => "Natalia Portillo";
-        public string                     Format              => "Parallels";
-        public List<DumpHardwareType>     DumpHardware        => null;
-        public CICMMetadataType           CicmMetadata        => null;
-        public IEnumerable<MediaTagType>  SupportedMediaTags  => new MediaTagType[] { };
-        public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[] { };
-        public IEnumerable<MediaType> SupportedMediaTypes =>
-            new[]
-            {
-                MediaType.Unknown, MediaType.GENERIC_HDD, MediaType.FlashDrive, MediaType.CompactFlash,
-                MediaType.CompactFlashType2, MediaType.PCCardTypeI, MediaType.PCCardTypeII, MediaType.PCCardTypeIII,
-                MediaType.PCCardTypeIV
-            };
+        public string                 Name         => "Parallels disk image";
+        public Guid                   Id           => new Guid("E314DE35-C103-48A3-AD36-990F68523C46");
+        public ImageInfo              Info         => imageInfo;
+        public string                 Author       => "Natalia Portillo";
+        public string                 Format       => "Parallels";
+        public List<DumpHardwareType> DumpHardware => null;
+        public CICMMetadataType       CicmMetadata => null;
+        public IEnumerable<MediaTagType> SupportedMediaTags => new MediaTagType[]
+            {};
+        public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[]
+            {};
+        public IEnumerable<MediaType> SupportedMediaTypes => new[]
+        {
+            MediaType.Unknown, MediaType.GENERIC_HDD, MediaType.FlashDrive, MediaType.CompactFlash,
+            MediaType.CompactFlashType2, MediaType.PCCardTypeI, MediaType.PCCardTypeII, MediaType.PCCardTypeIII,
+            MediaType.PCCardTypeIV
+        };
+
         // TODO: Add cluster size option
         public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
-            new (string name, Type type, string description, object @default)[] { };
-        public IEnumerable<string> KnownExtensions => new[] {".hdd"};
-        public bool                IsWriting       { get; private set; }
-        public string              ErrorMessage    { get; private set; }
+            new (string name, Type type, string description, object @default)[]
+                {};
+        public IEnumerable<string> KnownExtensions => new[]
+        {
+            ".hdd"
+        };
+        public bool   IsWriting    { get; private set; }
+        public string ErrorMessage { get; private set; }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/Parallels/Read.cs b/Aaru.Images/Parallels/Read.cs
index 3d112a7ca..b6a0e45df 100644
--- a/Aaru.Images/Parallels/Read.cs
+++ b/Aaru.Images/Parallels/Read.cs
@@ -49,24 +49,24 @@ namespace Aaru.DiscImages
             Stream stream = imageFilter.GetDataForkStream();
             stream.Seek(0, SeekOrigin.Begin);
 
-            if(stream.Length < 512) return false;
+            if(stream.Length < 512)
+                return false;
 
             byte[] pHdrB = new byte[Marshal.SizeOf<ParallelsHeader>()];
             stream.Read(pHdrB, 0, Marshal.SizeOf<ParallelsHeader>());
             pHdr = Marshal.ByteArrayToStructureLittleEndian<ParallelsHeader>(pHdrB);
 
-            AaruConsole.DebugWriteLine("Parallels plugin", "pHdr.magic = {0}",
-                                      StringHandlers.CToString(pHdr.magic));
-            AaruConsole.DebugWriteLine("Parallels plugin", "pHdr.version = {0}",      pHdr.version);
-            AaruConsole.DebugWriteLine("Parallels plugin", "pHdr.heads = {0}",        pHdr.heads);
-            AaruConsole.DebugWriteLine("Parallels plugin", "pHdr.cylinders = {0}",    pHdr.cylinders);
+            AaruConsole.DebugWriteLine("Parallels plugin", "pHdr.magic = {0}", StringHandlers.CToString(pHdr.magic));
+            AaruConsole.DebugWriteLine("Parallels plugin", "pHdr.version = {0}", pHdr.version);
+            AaruConsole.DebugWriteLine("Parallels plugin", "pHdr.heads = {0}", pHdr.heads);
+            AaruConsole.DebugWriteLine("Parallels plugin", "pHdr.cylinders = {0}", pHdr.cylinders);
             AaruConsole.DebugWriteLine("Parallels plugin", "pHdr.cluster_size = {0}", pHdr.cluster_size);
-            AaruConsole.DebugWriteLine("Parallels plugin", "pHdr.bat_entries = {0}",  pHdr.bat_entries);
-            AaruConsole.DebugWriteLine("Parallels plugin", "pHdr.sectors = {0}",      pHdr.sectors);
-            AaruConsole.DebugWriteLine("Parallels plugin", "pHdr.in_use = 0x{0:X8}",  pHdr.in_use);
-            AaruConsole.DebugWriteLine("Parallels plugin", "pHdr.data_off = {0}",     pHdr.data_off);
-            AaruConsole.DebugWriteLine("Parallels plugin", "pHdr.flags = {0}",        pHdr.flags);
-            AaruConsole.DebugWriteLine("Parallels plugin", "pHdr.ext_off = {0}",      pHdr.ext_off);
+            AaruConsole.DebugWriteLine("Parallels plugin", "pHdr.bat_entries = {0}", pHdr.bat_entries);
+            AaruConsole.DebugWriteLine("Parallels plugin", "pHdr.sectors = {0}", pHdr.sectors);
+            AaruConsole.DebugWriteLine("Parallels plugin", "pHdr.in_use = 0x{0:X8}", pHdr.in_use);
+            AaruConsole.DebugWriteLine("Parallels plugin", "pHdr.data_off = {0}", pHdr.data_off);
+            AaruConsole.DebugWriteLine("Parallels plugin", "pHdr.flags = {0}", pHdr.flags);
+            AaruConsole.DebugWriteLine("Parallels plugin", "pHdr.ext_off = {0}", pHdr.ext_off);
 
             extended = parallelsExtMagic.SequenceEqual(pHdr.magic);
             AaruConsole.DebugWriteLine("Parallels plugin", "pHdr.extended = {0}", extended);
@@ -75,13 +75,16 @@ namespace Aaru.DiscImages
             bat = new uint[pHdr.bat_entries];
             byte[] batB = new byte[pHdr.bat_entries * 4];
             stream.Read(batB, 0, batB.Length);
-            for(int i = 0; i < bat.Length; i++) bat[i] = BitConverter.ToUInt32(batB, i * 4);
+
+            for(int i = 0; i < bat.Length; i++)
+                bat[i] = BitConverter.ToUInt32(batB, i * 4);
 
             clusterBytes = pHdr.cluster_size * 512;
-            if(pHdr.data_off > 0) dataOffset = pHdr.data_off * 512;
+
+            if(pHdr.data_off > 0)
+                dataOffset = pHdr.data_off * 512;
             else
-                dataOffset =
-                    (stream.Position / clusterBytes + stream.Position % clusterBytes) * clusterBytes;
+                dataOffset = ((stream.Position / clusterBytes) + (stream.Position % clusterBytes)) * clusterBytes;
 
             sectorCache = new Dictionary<ulong, byte[]>();
 
@@ -109,9 +112,11 @@ namespace Aaru.DiscImages
                 throw new ArgumentOutOfRangeException(nameof(sectorAddress),
                                                       $"Sector address {sectorAddress} not found");
 
-            if(empty) return new byte[512];
+            if(empty)
+                return new byte[512];
 
-            if(sectorCache.TryGetValue(sectorAddress, out byte[] sector)) return sector;
+            if(sectorCache.TryGetValue(sectorAddress, out byte[] sector))
+                return sector;
 
             ulong index  = sectorAddress / pHdr.cluster_size;
             ulong secOff = sectorAddress % pHdr.cluster_size;
@@ -119,10 +124,13 @@ namespace Aaru.DiscImages
             uint  batOff = bat[index];
             ulong imageOff;
 
-            if(batOff == 0) return new byte[512];
+            if(batOff == 0)
+                return new byte[512];
 
-            if(extended) imageOff = batOff * clusterBytes;
-            else imageOff         = batOff * 512;
+            if(extended)
+                imageOff = batOff * clusterBytes;
+            else
+                imageOff = batOff * 512;
 
             byte[] cluster = new byte[clusterBytes];
             imageStream.Seek((long)imageOff, SeekOrigin.Begin);
@@ -130,7 +138,8 @@ namespace Aaru.DiscImages
             sector = new byte[512];
             Array.Copy(cluster, (int)(secOff * 512), sector, 0, 512);
 
-            if(sectorCache.Count > MAX_CACHED_SECTORS) sectorCache.Clear();
+            if(sectorCache.Count > MAX_CACHED_SECTORS)
+                sectorCache.Clear();
 
             sectorCache.Add(sectorAddress, sector);
 
@@ -146,9 +155,10 @@ namespace Aaru.DiscImages
             if(sectorAddress + length > imageInfo.Sectors)
                 throw new ArgumentOutOfRangeException(nameof(length), "Requested more sectors than available");
 
-            if(empty) return new byte[512 * length];
+            if(empty)
+                return new byte[512 * length];
 
-            MemoryStream ms = new MemoryStream();
+            var ms = new MemoryStream();
 
             for(uint i = 0; i < length; i++)
             {
diff --git a/Aaru.Images/Parallels/Structs.cs b/Aaru.Images/Parallels/Structs.cs
index 9224015b1..fec3d83aa 100644
--- a/Aaru.Images/Parallels/Structs.cs
+++ b/Aaru.Images/Parallels/Structs.cs
@@ -36,58 +36,36 @@ namespace Aaru.DiscImages
 {
     public partial class Parallels
     {
-        /// <summary>
-        ///     Parallels disk image header, little-endian
-        /// </summary>
+        /// <summary>Parallels disk image header, little-endian</summary>
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct ParallelsHeader
         {
-            /// <summary>
-            ///     Magic, <see cref="Parallels.parallelsMagic" /> or <see cref="Parallels.parallelsExtMagic" />
-            /// </summary>
+            /// <summary>Magic, <see cref="Parallels.parallelsMagic" /> or <see cref="Parallels.parallelsExtMagic" /></summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
             public byte[] magic;
-            /// <summary>
-            ///     Version
-            /// </summary>
+            /// <summary>Version</summary>
             public uint version;
-            /// <summary>
-            ///     Disk geometry parameter
-            /// </summary>
+            /// <summary>Disk geometry parameter</summary>
             public uint heads;
-            /// <summary>
-            ///     Disk geometry parameter
-            /// </summary>
+            /// <summary>Disk geometry parameter</summary>
             public uint cylinders;
-            /// <summary>
-            ///     Cluser size in sectors
-            /// </summary>
+            /// <summary>Cluser size in sectors</summary>
             public uint cluster_size;
-            /// <summary>
-            ///     Entries in BAT (clusters in image)
-            /// </summary>
+            /// <summary>Entries in BAT (clusters in image)</summary>
             public uint bat_entries;
-            /// <summary>
-            ///     Disk size in sectors
-            /// </summary>
+            /// <summary>Disk size in sectors</summary>
             public ulong sectors;
             /// <summary>
             ///     Set to <see cref="Parallels.PARALLELS_INUSE" /> if image is opened by any software,
             ///     <see cref="Parallels.PARALLELS_CLOSED" /> if not, and 0 if old version
             /// </summary>
             public uint in_use;
-            /// <summary>
-            ///     Offset in sectors to start of data
-            /// </summary>
+            /// <summary>Offset in sectors to start of data</summary>
             public uint data_off;
-            /// <summary>
-            ///     Flags
-            /// </summary>
-            public uint flags;
-            /// <summary>
-            ///     Offset in sectors to format extension
-            /// </summary>
-            public ulong ext_off;
+            /// <summary>Flags</summary>
+            public readonly uint flags;
+            /// <summary>Offset in sectors to format extension</summary>
+            public readonly ulong ext_off;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/Parallels/Write.cs b/Aaru.Images/Parallels/Write.cs
index 1eac0b0d0..eba0d7358 100644
--- a/Aaru.Images/Parallels/Write.cs
+++ b/Aaru.Images/Parallels/Write.cs
@@ -46,49 +46,60 @@ namespace Aaru.DiscImages
     {
         // TODO: Support extended
         public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
-                           uint   sectorSize)
+                           uint sectorSize)
         {
             if(sectorSize != 512)
             {
                 ErrorMessage = "Unsupported sector size";
+
                 return false;
             }
 
             if(!SupportedMediaTypes.Contains(mediaType))
             {
                 ErrorMessage = $"Unsupport media format {mediaType}";
+
                 return false;
             }
 
-            if(sectors * sectorSize / DEFAULT_CLUSTER_SIZE > uint.MaxValue)
+            if((sectors * sectorSize) / DEFAULT_CLUSTER_SIZE > uint.MaxValue)
             {
                 ErrorMessage = "Too many sectors for selected cluster size";
+
                 return false;
             }
 
-            imageInfo = new ImageInfo {MediaType = mediaType, SectorSize = sectorSize, Sectors = sectors};
+            imageInfo = new ImageInfo
+            {
+                MediaType = mediaType, SectorSize = sectorSize, Sectors = sectors
+            };
 
-            try { writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None); }
+            try
+            {
+                writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
+            }
             catch(IOException e)
             {
                 ErrorMessage = $"Could not create new image file, exception {e.Message}";
+
                 return false;
             }
 
-            uint batEntries = (uint)(sectors * sectorSize / DEFAULT_CLUSTER_SIZE);
-            if(sectors * sectorSize % DEFAULT_CLUSTER_SIZE > 0) batEntries++;
-            uint headerSectors = (uint)Marshal.SizeOf<ParallelsHeader>() + batEntries * 4;
-            if((uint)Marshal.SizeOf<ParallelsHeader>() + batEntries % 4 > 0) headerSectors++;
+            uint batEntries = (uint)((sectors * sectorSize) / DEFAULT_CLUSTER_SIZE);
+
+            if((sectors * sectorSize) % DEFAULT_CLUSTER_SIZE > 0)
+                batEntries++;
+
+            uint headerSectors = (uint)Marshal.SizeOf<ParallelsHeader>() + (batEntries * 4);
+
+            if((uint)Marshal.SizeOf<ParallelsHeader>() + (batEntries % 4) > 0)
+                headerSectors++;
 
             pHdr = new ParallelsHeader
             {
-                magic        = parallelsMagic,
-                version      = PARALLELS_VERSION,
-                sectors      = sectors,
-                in_use       = PARALLELS_CLOSED,
-                bat_entries  = batEntries,
-                data_off     = headerSectors,
-                cluster_size = DEFAULT_CLUSTER_SIZE / 512
+                magic       = parallelsMagic, version = PARALLELS_VERSION, sectors = sectors,
+                in_use      = PARALLELS_CLOSED,
+                bat_entries = batEntries, data_off = headerSectors, cluster_size = DEFAULT_CLUSTER_SIZE / 512
             };
 
             bat                    = new uint[batEntries];
@@ -96,12 +107,14 @@ namespace Aaru.DiscImages
 
             IsWriting    = true;
             ErrorMessage = null;
+
             return true;
         }
 
         public bool WriteMediaTag(byte[] data, MediaTagType tag)
         {
             ErrorMessage = "Writing media tags is not supported.";
+
             return false;
         }
 
@@ -110,23 +123,27 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Tried to write on a non-writable image";
+
                 return false;
             }
 
             if(data.Length != 512)
             {
                 ErrorMessage = "Incorrect data size";
+
                 return false;
             }
 
             if(sectorAddress >= imageInfo.Sectors)
             {
                 ErrorMessage = "Tried to write past image size";
+
                 return false;
             }
 
             // Ignore empty sectors
-            if(ArrayHelpers.ArrayIsNullOrEmpty(data)) return true;
+            if(ArrayHelpers.ArrayIsNullOrEmpty(data))
+                return true;
 
             ulong index  = sectorAddress / pHdr.cluster_size;
             ulong secOff = sectorAddress % pHdr.cluster_size;
@@ -142,11 +159,12 @@ namespace Aaru.DiscImages
 
             ulong imageOff = batOff * 512;
 
-            writingStream.Seek((long)imageOff,     SeekOrigin.Begin);
+            writingStream.Seek((long)imageOff, SeekOrigin.Begin);
             writingStream.Seek((long)secOff * 512, SeekOrigin.Current);
             writingStream.Write(data, 0, data.Length);
 
             ErrorMessage = "";
+
             return true;
         }
 
@@ -156,44 +174,53 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Tried to write on a non-writable image";
+
                 return false;
             }
 
             if(data.Length % 512 != 0)
             {
                 ErrorMessage = "Incorrect data size";
+
                 return false;
             }
 
             if(sectorAddress + length > imageInfo.Sectors)
             {
                 ErrorMessage = "Tried to write past image size";
+
                 return false;
             }
 
             // Ignore empty sectors
-            if(ArrayHelpers.ArrayIsNullOrEmpty(data)) return true;
+            if(ArrayHelpers.ArrayIsNullOrEmpty(data))
+                return true;
 
             for(uint i = 0; i < length; i++)
             {
                 byte[] tmp = new byte[512];
                 Array.Copy(data, i * 512, tmp, 0, 512);
-                if(!WriteSector(tmp, sectorAddress + i)) return false;
+
+                if(!WriteSector(tmp, sectorAddress + i))
+                    return false;
             }
 
             ErrorMessage = "";
+
             return true;
         }
 
         public bool WriteSectorLong(byte[] data, ulong sectorAddress)
         {
             ErrorMessage = "Writing sectors with tags is not supported.";
+
             return false;
         }
 
         public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
         {
             ErrorMessage = "Writing sectors with tags is not supported.";
+
             return false;
         }
 
@@ -202,6 +229,7 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Image is not opened for writing";
+
                 return false;
             }
 
@@ -223,7 +251,10 @@ namespace Aaru.DiscImages
 
                     pHdr.cylinders = (uint)(imageInfo.Sectors / pHdr.heads / imageInfo.SectorsPerTrack);
 
-                    if(pHdr.cylinders == 0 && pHdr.heads == 0 && imageInfo.SectorsPerTrack == 0) break;
+                    if(pHdr.cylinders            == 0 &&
+                       pHdr.heads                == 0 &&
+                       imageInfo.SectorsPerTrack == 0)
+                        break;
                 }
             }
 
@@ -236,13 +267,15 @@ namespace Aaru.DiscImages
             writingStream.Seek(0, SeekOrigin.Begin);
             writingStream.Write(hdr, 0, hdr.Length);
 
-            for(long i = 0; i < bat.LongLength; i++) writingStream.Write(BitConverter.GetBytes(bat[i]), 0, 4);
+            for(long i = 0; i < bat.LongLength; i++)
+                writingStream.Write(BitConverter.GetBytes(bat[i]), 0, 4);
 
             writingStream.Flush();
             writingStream.Close();
 
             IsWriting    = false;
             ErrorMessage = "";
+
             return true;
         }
 
@@ -252,18 +285,21 @@ namespace Aaru.DiscImages
         {
             pHdr.cylinders = cylinders;
             pHdr.heads     = heads;
+
             return true;
         }
 
         public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
         {
             ErrorMessage = "Writing sectors with tags is not supported.";
+
             return false;
         }
 
         public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
         {
             ErrorMessage = "Writing sectors with tags is not supported.";
+
             return false;
         }
 
diff --git a/Aaru.Images/PartClone/Constants.cs b/Aaru.Images/PartClone/Constants.cs
index 2f51a0c5a..9548441d2 100644
--- a/Aaru.Images/PartClone/Constants.cs
+++ b/Aaru.Images/PartClone/Constants.cs
@@ -34,10 +34,13 @@ namespace Aaru.DiscImages
 {
     public partial class PartClone
     {
-        const    int    CRC_SIZE           = 4;
-        const    uint   MAX_CACHE_SIZE     = 16777216;
-        const    uint   MAX_CACHED_SECTORS = MAX_CACHE_SIZE / 512;
-        readonly byte[] biTmAgIc           = {0x42, 0x69, 0x54, 0x6D, 0x41, 0x67, 0x49, 0x63};
+        const int  CRC_SIZE           = 4;
+        const uint MAX_CACHE_SIZE     = 16777216;
+        const uint MAX_CACHED_SECTORS = MAX_CACHE_SIZE / 512;
+        readonly byte[] biTmAgIc =
+        {
+            0x42, 0x69, 0x54, 0x6D, 0x41, 0x67, 0x49, 0x63
+        };
         readonly byte[] partCloneMagic =
         {
             0x70, 0x61, 0x72, 0x74, 0x63, 0x6C, 0x6F, 0x6E, 0x65, 0x2D, 0x69, 0x6D, 0x61, 0x67, 0x65
diff --git a/Aaru.Images/PartClone/Helpers.cs b/Aaru.Images/PartClone/Helpers.cs
index 93d0ee553..5cf5cc333 100644
--- a/Aaru.Images/PartClone/Helpers.cs
+++ b/Aaru.Images/PartClone/Helpers.cs
@@ -38,6 +38,7 @@ namespace Aaru.DiscImages
         {
             extents.GetStart(sectorAddress, out ulong extentStart);
             extentsOff.TryGetValue(extentStart, out ulong extentStartingOffset);
+
             return extentStartingOffset + (sectorAddress - extentStart);
         }
     }
diff --git a/Aaru.Images/PartClone/Identify.cs b/Aaru.Images/PartClone/Identify.cs
index 805735920..73810ba07 100644
--- a/Aaru.Images/PartClone/Identify.cs
+++ b/Aaru.Images/PartClone/Identify.cs
@@ -44,13 +44,15 @@ namespace Aaru.DiscImages
             Stream stream = imageFilter.GetDataForkStream();
             stream.Seek(0, SeekOrigin.Begin);
 
-            if(stream.Length < 512) return false;
+            if(stream.Length < 512)
+                return false;
 
             byte[] pHdrB = new byte[Marshal.SizeOf<PartCloneHeader>()];
             stream.Read(pHdrB, 0, Marshal.SizeOf<PartCloneHeader>());
             pHdr = Marshal.ByteArrayToStructureLittleEndian<PartCloneHeader>(pHdrB);
 
-            if(stream.Position + (long)pHdr.totalBlocks > stream.Length) return false;
+            if(stream.Position + (long)pHdr.totalBlocks > stream.Length)
+                return false;
 
             stream.Seek((long)pHdr.totalBlocks, SeekOrigin.Current);
 
diff --git a/Aaru.Images/PartClone/PartClone.cs b/Aaru.Images/PartClone/PartClone.cs
index c8adbf7ca..66aeda7e9 100644
--- a/Aaru.Images/PartClone/PartClone.cs
+++ b/Aaru.Images/PartClone/PartClone.cs
@@ -52,30 +52,18 @@ namespace Aaru.DiscImages
         PartCloneHeader           pHdr;
         Dictionary<ulong, byte[]> sectorCache;
 
-        public PartClone()
+        public PartClone() => imageInfo = new ImageInfo
         {
-            imageInfo = new ImageInfo
-            {
-                ReadableSectorTags    = new List<SectorTagType>(),
-                ReadableMediaTags     = new List<MediaTagType>(),
-                HasPartitions         = false,
-                HasSessions           = false,
-                Application           = "PartClone",
-                ApplicationVersion    = null,
-                Creator               = null,
-                Comments              = null,
-                MediaManufacturer     = null,
-                MediaModel            = null,
-                MediaSerialNumber     = null,
-                MediaBarcode          = null,
-                MediaPartNumber       = null,
-                MediaSequence         = 0,
-                LastMediaSequence     = 0,
-                DriveManufacturer     = null,
-                DriveModel            = null,
-                DriveSerialNumber     = null,
-                DriveFirmwareRevision = null
-            };
-        }
+            ReadableSectorTags    = new List<SectorTagType>(), ReadableMediaTags = new List<MediaTagType>(),
+            HasPartitions         = false, HasSessions                           = false,
+            Application           = "PartClone", ApplicationVersion              = null,
+            Creator               = null, Comments                               = null, MediaManufacturer = null,
+            MediaModel            = null,
+            MediaSerialNumber     = null, MediaBarcode = null, MediaPartNumber = null,
+            MediaSequence         = 0,
+            LastMediaSequence     = 0, DriveManufacturer = null, DriveModel = null,
+            DriveSerialNumber     = null,
+            DriveFirmwareRevision = null
+        };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/PartClone/Read.cs b/Aaru.Images/PartClone/Read.cs
index 17a2ee7c6..b4769f5fe 100644
--- a/Aaru.Images/PartClone/Read.cs
+++ b/Aaru.Images/PartClone/Read.cs
@@ -51,21 +51,25 @@ namespace Aaru.DiscImages
             Stream stream = imageFilter.GetDataForkStream();
             stream.Seek(0, SeekOrigin.Begin);
 
-            if(stream.Length < 512) return false;
+            if(stream.Length < 512)
+                return false;
 
             byte[] pHdrB = new byte[Marshal.SizeOf<PartCloneHeader>()];
             stream.Read(pHdrB, 0, Marshal.SizeOf<PartCloneHeader>());
             pHdr = Marshal.ByteArrayToStructureLittleEndian<PartCloneHeader>(pHdrB);
 
             AaruConsole.DebugWriteLine("PartClone plugin", "pHdr.magic = {0}", StringHandlers.CToString(pHdr.magic));
+
             AaruConsole.DebugWriteLine("PartClone plugin", "pHdr.filesystem = {0}",
-                                      StringHandlers.CToString(pHdr.filesystem));
+                                       StringHandlers.CToString(pHdr.filesystem));
+
             AaruConsole.DebugWriteLine("PartClone plugin", "pHdr.version = {0}",
-                                      StringHandlers.CToString(pHdr.version));
-            AaruConsole.DebugWriteLine("PartClone plugin", "pHdr.blockSize = {0}",   pHdr.blockSize);
-            AaruConsole.DebugWriteLine("PartClone plugin", "pHdr.deviceSize = {0}",  pHdr.deviceSize);
+                                       StringHandlers.CToString(pHdr.version));
+
+            AaruConsole.DebugWriteLine("PartClone plugin", "pHdr.blockSize = {0}", pHdr.blockSize);
+            AaruConsole.DebugWriteLine("PartClone plugin", "pHdr.deviceSize = {0}", pHdr.deviceSize);
             AaruConsole.DebugWriteLine("PartClone plugin", "pHdr.totalBlocks = {0}", pHdr.totalBlocks);
-            AaruConsole.DebugWriteLine("PartClone plugin", "pHdr.usedBlocks = {0}",  pHdr.usedBlocks);
+            AaruConsole.DebugWriteLine("PartClone plugin", "pHdr.usedBlocks = {0}", pHdr.usedBlocks);
 
             byteMap = new byte[pHdr.totalBlocks];
             AaruConsole.DebugWriteLine("PartClone plugin", "Reading bytemap {0} bytes", byteMap.Length);
@@ -107,14 +111,16 @@ namespace Aaru.DiscImages
                         extentsOff.TryGetValue(extentStart, out _);
                     }
 
-                if(next && current) blockOff++;
+                if(next && current)
+                    blockOff++;
 
                 current = next;
             }
 
             DateTime end = DateTime.Now;
+
             AaruConsole.DebugWriteLine("PartClone plugin", "Took {0} seconds to fill extents",
-                                      (end - start).TotalSeconds);
+                                       (end - start).TotalSeconds);
 
             sectorCache = new Dictionary<ulong, byte[]>();
 
@@ -137,9 +143,11 @@ namespace Aaru.DiscImages
                 throw new ArgumentOutOfRangeException(nameof(sectorAddress),
                                                       $"Sector address {sectorAddress} not found");
 
-            if(byteMap[sectorAddress] == 0) return new byte[pHdr.blockSize];
+            if(byteMap[sectorAddress] == 0)
+                return new byte[pHdr.blockSize];
 
-            if(sectorCache.TryGetValue(sectorAddress, out byte[] sector)) return sector;
+            if(sectorCache.TryGetValue(sectorAddress, out byte[] sector))
+                return sector;
 
             long imageOff = dataOff + (long)(BlockOffset(sectorAddress) * (pHdr.blockSize + CRC_SIZE));
 
@@ -147,7 +155,8 @@ namespace Aaru.DiscImages
             imageStream.Seek(imageOff, SeekOrigin.Begin);
             imageStream.Read(sector, 0, (int)pHdr.blockSize);
 
-            if(sectorCache.Count > MAX_CACHED_SECTORS) sectorCache.Clear();
+            if(sectorCache.Count > MAX_CACHED_SECTORS)
+                sectorCache.Clear();
 
             sectorCache.Add(sectorAddress, sector);
 
@@ -163,17 +172,20 @@ namespace Aaru.DiscImages
             if(sectorAddress + length > imageInfo.Sectors)
                 throw new ArgumentOutOfRangeException(nameof(length), "Requested more sectors than available");
 
-            MemoryStream ms = new MemoryStream();
+            var ms = new MemoryStream();
 
             bool allEmpty = true;
+
             for(uint i = 0; i < length; i++)
                 if(byteMap[sectorAddress + i] != 0)
                 {
                     allEmpty = false;
+
                     break;
                 }
 
-            if(allEmpty) return new byte[pHdr.blockSize * length];
+            if(allEmpty)
+                return new byte[pHdr.blockSize * length];
 
             for(uint i = 0; i < length; i++)
             {
diff --git a/Aaru.Images/PartClone/Structs.cs b/Aaru.Images/PartClone/Structs.cs
index 4679be7ba..953fea72b 100644
--- a/Aaru.Images/PartClone/Structs.cs
+++ b/Aaru.Images/PartClone/Structs.cs
@@ -36,52 +36,32 @@ namespace Aaru.DiscImages
 {
     public partial class PartClone
     {
-        /// <summary>
-        ///     PartClone disk image header, little-endian
-        /// </summary>
+        /// <summary>PartClone disk image header, little-endian</summary>
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct PartCloneHeader
         {
-            /// <summary>
-            ///     Magic, <see cref="PartClone.partCloneMagic" />
-            /// </summary>
+            /// <summary>Magic, <see cref="PartClone.partCloneMagic" /></summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 15)]
-            public byte[] magic;
-            /// <summary>
-            ///     Source filesystem
-            /// </summary>
+            public readonly byte[] magic;
+            /// <summary>Source filesystem</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 15)]
-            public byte[] filesystem;
-            /// <summary>
-            ///     Version
-            /// </summary>
+            public readonly byte[] filesystem;
+            /// <summary>Version</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
-            public byte[] version;
-            /// <summary>
-            ///     Padding
-            /// </summary>
-            public ushort padding;
-            /// <summary>
-            ///     Block (sector) size
-            /// </summary>
-            public uint blockSize;
-            /// <summary>
-            ///     Size of device containing the cloned partition
-            /// </summary>
-            public ulong deviceSize;
-            /// <summary>
-            ///     Total blocks in cloned partition
-            /// </summary>
-            public ulong totalBlocks;
-            /// <summary>
-            ///     Used blocks in cloned partition
-            /// </summary>
-            public ulong usedBlocks;
-            /// <summary>
-            ///     Empty space
-            /// </summary>
+            public readonly byte[] version;
+            /// <summary>Padding</summary>
+            public readonly ushort padding;
+            /// <summary>Block (sector) size</summary>
+            public readonly uint blockSize;
+            /// <summary>Size of device containing the cloned partition</summary>
+            public readonly ulong deviceSize;
+            /// <summary>Total blocks in cloned partition</summary>
+            public readonly ulong totalBlocks;
+            /// <summary>Used blocks in cloned partition</summary>
+            public readonly ulong usedBlocks;
+            /// <summary>Empty space</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4096)]
-            public byte[] buffer;
+            public readonly byte[] buffer;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/Partimage/Constants.cs b/Aaru.Images/Partimage/Constants.cs
index c1ce3c772..29a5c8ab0 100644
--- a/Aaru.Images/Partimage/Constants.cs
+++ b/Aaru.Images/Partimage/Constants.cs
@@ -64,8 +64,8 @@ namespace Aaru.DiscImages
         const uint   MAX_CACHED_SECTORS      = MAX_CACHE_SIZE / 512;
         readonly byte[] partimageMagic =
         {
-            0x50, 0x61, 0x52, 0x74, 0x49, 0x6D, 0x41, 0x67, 0x45, 0x2D, 0x56, 0x6F, 0x4C, 0x75, 0x4D, 0x65, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+            0x50, 0x61, 0x52, 0x74, 0x49, 0x6D, 0x41, 0x67, 0x45, 0x2D, 0x56, 0x6F, 0x4C, 0x75, 0x4D, 0x65, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
         };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/Partimage/Enums.cs b/Aaru.Images/Partimage/Enums.cs
index 15a3a3142..f4a28ed3c 100644
--- a/Aaru.Images/Partimage/Enums.cs
+++ b/Aaru.Images/Partimage/Enums.cs
@@ -36,10 +36,8 @@ namespace Aaru.DiscImages
     {
         enum PCompression : uint
         {
-            None  = 0,
-            Gzip  = 1,
-            Bzip2 = 2,
-            Lzo   = 3
+            None = 0, Gzip = 1, Bzip2 = 2,
+            Lzo  = 3
         }
 
         enum PEncryption : uint
diff --git a/Aaru.Images/Partimage/Helpers.cs b/Aaru.Images/Partimage/Helpers.cs
index 21253aeb5..bb48ea72b 100644
--- a/Aaru.Images/Partimage/Helpers.cs
+++ b/Aaru.Images/Partimage/Helpers.cs
@@ -38,6 +38,7 @@ namespace Aaru.DiscImages
         {
             extents.GetStart(sectorAddress, out ulong extentStart);
             extentsOff.TryGetValue(extentStart, out ulong extentStartingOffset);
+
             return extentStartingOffset + (sectorAddress - extentStart);
         }
     }
diff --git a/Aaru.Images/Partimage/Identify.cs b/Aaru.Images/Partimage/Identify.cs
index 7a30a63ce..a32db594f 100644
--- a/Aaru.Images/Partimage/Identify.cs
+++ b/Aaru.Images/Partimage/Identify.cs
@@ -44,7 +44,8 @@ namespace Aaru.DiscImages
             Stream stream = imageFilter.GetDataForkStream();
             stream.Seek(0, SeekOrigin.Begin);
 
-            if(stream.Length < 512) return false;
+            if(stream.Length < 512)
+                return false;
 
             byte[] pHdrB = new byte[Marshal.SizeOf<PartimageHeader>()];
             stream.Read(pHdrB, 0, Marshal.SizeOf<PartimageHeader>());
diff --git a/Aaru.Images/Partimage/Partimage.cs b/Aaru.Images/Partimage/Partimage.cs
index 5af893fb8..7509ddf39 100644
--- a/Aaru.Images/Partimage/Partimage.cs
+++ b/Aaru.Images/Partimage/Partimage.cs
@@ -53,30 +53,18 @@ namespace Aaru.DiscImages
         Stream                    imageStream;
         Dictionary<ulong, byte[]> sectorCache;
 
-        public Partimage()
+        public Partimage() => imageInfo = new ImageInfo
         {
-            imageInfo = new ImageInfo
-            {
-                ReadableSectorTags    = new List<SectorTagType>(),
-                ReadableMediaTags     = new List<MediaTagType>(),
-                HasPartitions         = false,
-                HasSessions           = false,
-                Application           = "Partimage",
-                ApplicationVersion    = null,
-                Creator               = null,
-                Comments              = null,
-                MediaManufacturer     = null,
-                MediaModel            = null,
-                MediaSerialNumber     = null,
-                MediaBarcode          = null,
-                MediaPartNumber       = null,
-                MediaSequence         = 0,
-                LastMediaSequence     = 0,
-                DriveManufacturer     = null,
-                DriveModel            = null,
-                DriveSerialNumber     = null,
-                DriveFirmwareRevision = null
-            };
-        }
+            ReadableSectorTags    = new List<SectorTagType>(), ReadableMediaTags = new List<MediaTagType>(),
+            HasPartitions         = false, HasSessions                           = false,
+            Application           = "Partimage", ApplicationVersion              = null,
+            Creator               = null, Comments                               = null, MediaManufacturer = null,
+            MediaModel            = null,
+            MediaSerialNumber     = null, MediaBarcode = null, MediaPartNumber = null,
+            MediaSequence         = 0,
+            LastMediaSequence     = 0, DriveManufacturer = null, DriveModel = null,
+            DriveSerialNumber     = null,
+            DriveFirmwareRevision = null
+        };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/Partimage/Read.cs b/Aaru.Images/Partimage/Read.cs
index a85fb8e49..39cfe7a03 100644
--- a/Aaru.Images/Partimage/Read.cs
+++ b/Aaru.Images/Partimage/Read.cs
@@ -50,20 +50,24 @@ namespace Aaru.DiscImages
             Stream stream = imageFilter.GetDataForkStream();
             stream.Seek(0, SeekOrigin.Begin);
 
-            if(stream.Length < 512) return false;
+            if(stream.Length < 512)
+                return false;
 
             byte[] hdrB = new byte[Marshal.SizeOf<PartimageHeader>()];
             stream.Read(hdrB, 0, Marshal.SizeOf<PartimageHeader>());
             cVolumeHeader = Marshal.ByteArrayToStructureLittleEndian<PartimageHeader>(hdrB);
 
             AaruConsole.DebugWriteLine("Partimage plugin", "CVolumeHeader.magic = {0}",
-                                      StringHandlers.CToString(cVolumeHeader.magic));
+                                       StringHandlers.CToString(cVolumeHeader.magic));
+
             AaruConsole.DebugWriteLine("Partimage plugin", "CVolumeHeader.version = {0}",
-                                      StringHandlers.CToString(cVolumeHeader.version));
+                                       StringHandlers.CToString(cVolumeHeader.version));
+
             AaruConsole.DebugWriteLine("Partimage plugin", "CVolumeHeader.volumeNumber = {0}",
-                                      cVolumeHeader.volumeNumber);
+                                       cVolumeHeader.volumeNumber);
+
             AaruConsole.DebugWriteLine("Partimage plugin", "CVolumeHeader.identificator = {0:X16}",
-                                      cVolumeHeader.identificator);
+                                       cVolumeHeader.identificator);
 
             // TODO: Support multifile volumes
             if(cVolumeHeader.volumeNumber > 0)
@@ -74,88 +78,127 @@ namespace Aaru.DiscImages
             cMainHeader = Marshal.ByteArrayToStructureLittleEndian<PartimageMainHeader>(hdrB);
 
             AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.szFileSystem = {0}",
-                                      StringHandlers.CToString(cMainHeader.szFileSystem));
-            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.szPartDescription = {0}",
-                                      StringHandlers.CToString(cMainHeader.szPartDescription));
-            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.szOriginalDevice = {0}",
-                                      StringHandlers.CToString(cMainHeader.szOriginalDevice));
-            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.szFirstImageFilepath = {0}",
-                                      StringHandlers.CToString(cMainHeader.szFirstImageFilepath));
-            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.szUnameSysname = {0}",
-                                      StringHandlers.CToString(cMainHeader.szUnameSysname));
-            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.szUnameNodename = {0}",
-                                      StringHandlers.CToString(cMainHeader.szUnameNodename));
-            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.szUnameRelease = {0}",
-                                      StringHandlers.CToString(cMainHeader.szUnameRelease));
-            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.szUnameVersion = {0}",
-                                      StringHandlers.CToString(cMainHeader.szUnameVersion));
-            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.szUnameMachine = {0}",
-                                      StringHandlers.CToString(cMainHeader.szUnameMachine));
-            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dwCompression = {0} ({1})",
-                                      cMainHeader.dwCompression, (uint)cMainHeader.dwCompression);
-            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dwMainFlags = {0}", cMainHeader.dwMainFlags);
-            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dateCreate.tm_sec = {0}",
-                                      cMainHeader.dateCreate.Second);
-            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dateCreate.tm_min = {0}",
-                                      cMainHeader.dateCreate.Minute);
-            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dateCreate.tm_hour = {0}",
-                                      cMainHeader.dateCreate.Hour);
-            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dateCreate.tm_mday = {0}",
-                                      cMainHeader.dateCreate.DayOfMonth);
-            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dateCreate.tm_mon = {0}",
-                                      cMainHeader.dateCreate.Month);
-            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dateCreate.tm_year = {0}",
-                                      cMainHeader.dateCreate.Year);
-            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dateCreate.tm_wday = {0}",
-                                      cMainHeader.dateCreate.DayOfWeek);
-            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dateCreate.tm_yday = {0}",
-                                      cMainHeader.dateCreate.DayOfYear);
-            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dateCreate.tm_isdst = {0}",
-                                      cMainHeader.dateCreate.IsDst);
-            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dateCreate.tm_gmtoffsec = {0}",
-                                      cMainHeader.dateCreate.GmtOff);
-            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dateCreate.tm_zone = {0}",
-                                      cMainHeader.dateCreate.Timezone);
+                                       StringHandlers.CToString(cMainHeader.szFileSystem));
+
+            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.szPartDescription = {0}",
+                                       StringHandlers.CToString(cMainHeader.szPartDescription));
+
+            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.szOriginalDevice = {0}",
+                                       StringHandlers.CToString(cMainHeader.szOriginalDevice));
+
+            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.szFirstImageFilepath = {0}",
+                                       StringHandlers.CToString(cMainHeader.szFirstImageFilepath));
+
+            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.szUnameSysname = {0}",
+                                       StringHandlers.CToString(cMainHeader.szUnameSysname));
+
+            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.szUnameNodename = {0}",
+                                       StringHandlers.CToString(cMainHeader.szUnameNodename));
+
+            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.szUnameRelease = {0}",
+                                       StringHandlers.CToString(cMainHeader.szUnameRelease));
+
+            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.szUnameVersion = {0}",
+                                       StringHandlers.CToString(cMainHeader.szUnameVersion));
+
+            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.szUnameMachine = {0}",
+                                       StringHandlers.CToString(cMainHeader.szUnameMachine));
+
+            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dwCompression = {0} ({1})",
+                                       cMainHeader.dwCompression, (uint)cMainHeader.dwCompression);
+
+            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dwMainFlags = {0}", cMainHeader.dwMainFlags);
+
+            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dateCreate.tm_sec = {0}",
+                                       cMainHeader.dateCreate.Second);
+
+            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dateCreate.tm_min = {0}",
+                                       cMainHeader.dateCreate.Minute);
+
+            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dateCreate.tm_hour = {0}",
+                                       cMainHeader.dateCreate.Hour);
+
+            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dateCreate.tm_mday = {0}",
+                                       cMainHeader.dateCreate.DayOfMonth);
+
+            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dateCreate.tm_mon = {0}",
+                                       cMainHeader.dateCreate.Month);
+
+            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dateCreate.tm_year = {0}",
+                                       cMainHeader.dateCreate.Year);
+
+            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dateCreate.tm_wday = {0}",
+                                       cMainHeader.dateCreate.DayOfWeek);
+
+            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dateCreate.tm_yday = {0}",
+                                       cMainHeader.dateCreate.DayOfYear);
+
+            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dateCreate.tm_isdst = {0}",
+                                       cMainHeader.dateCreate.IsDst);
+
+            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dateCreate.tm_gmtoffsec = {0}",
+                                       cMainHeader.dateCreate.GmtOff);
+
+            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dateCreate.tm_zone = {0}",
+                                       cMainHeader.dateCreate.Timezone);
+
+            var dateCreate = new DateTime(1900                              + (int)cMainHeader.dateCreate.Year,
+                                          (int)cMainHeader.dateCreate.Month + 1, (int)cMainHeader.dateCreate.DayOfMonth,
+                                          (int)cMainHeader.dateCreate.Hour, (int)cMainHeader.dateCreate.Minute,
+                                          (int)cMainHeader.dateCreate.Second);
 
-            DateTime dateCreate = new DateTime(1900                              + (int)cMainHeader.dateCreate.Year,
-                                               (int)cMainHeader.dateCreate.Month + 1,
-                                               (int)cMainHeader.dateCreate.DayOfMonth, (int)cMainHeader.dateCreate.Hour,
-                                               (int)cMainHeader.dateCreate.Minute, (int)cMainHeader.dateCreate.Second);
             AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dateCreate = {0}", dateCreate);
 
             AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.qwPartSize = {0}", cMainHeader.qwPartSize);
+
             AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.szHostname = {0}",
-                                      StringHandlers.CToString(cMainHeader.szHostname));
+                                       StringHandlers.CToString(cMainHeader.szHostname));
+
             AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.szVersion = {0}",
-                                      StringHandlers.CToString(cMainHeader.szVersion));
+                                       StringHandlers.CToString(cMainHeader.szVersion));
+
             AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dwMbrCount = {0}", cMainHeader.dwMbrCount);
-            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dwMbrSize = {0}",  cMainHeader.dwMbrSize);
+            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dwMbrSize = {0}", cMainHeader.dwMbrSize);
+
             AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dwEncryptAlgo = {0} ({1})",
-                                      cMainHeader.dwEncryptAlgo, (uint)cMainHeader.dwEncryptAlgo);
+                                       cMainHeader.dwEncryptAlgo, (uint)cMainHeader.dwEncryptAlgo);
+
             AaruConsole.DebugWriteLine("Partimage plugin", "ArrayIsNullOrEmpty(CMainHeader.cHashTestKey) = {0}",
-                                      ArrayHelpers.ArrayIsNullOrEmpty(cMainHeader.cHashTestKey));
+                                       ArrayHelpers.ArrayIsNullOrEmpty(cMainHeader.cHashTestKey));
+
             AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dwReservedFuture000 = {0}",
-                                      cMainHeader.dwReservedFuture000);
+                                       cMainHeader.dwReservedFuture000);
+
             AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dwReservedFuture001 = {0}",
-                                      cMainHeader.dwReservedFuture001);
+                                       cMainHeader.dwReservedFuture001);
+
             AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dwReservedFuture002 = {0}",
-                                      cMainHeader.dwReservedFuture002);
+                                       cMainHeader.dwReservedFuture002);
+
             AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dwReservedFuture003 = {0}",
-                                      cMainHeader.dwReservedFuture003);
+                                       cMainHeader.dwReservedFuture003);
+
             AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dwReservedFuture004 = {0}",
-                                      cMainHeader.dwReservedFuture004);
+                                       cMainHeader.dwReservedFuture004);
+
             AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dwReservedFuture005 = {0}",
-                                      cMainHeader.dwReservedFuture005);
+                                       cMainHeader.dwReservedFuture005);
+
             AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dwReservedFuture006 = {0}",
-                                      cMainHeader.dwReservedFuture006);
+                                       cMainHeader.dwReservedFuture006);
+
             AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dwReservedFuture007 = {0}",
-                                      cMainHeader.dwReservedFuture007);
+                                       cMainHeader.dwReservedFuture007);
+
             AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dwReservedFuture008 = {0}",
-                                      cMainHeader.dwReservedFuture008);
+                                       cMainHeader.dwReservedFuture008);
+
             AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dwReservedFuture009 = {0}",
-                                      cMainHeader.dwReservedFuture009);
+                                       cMainHeader.dwReservedFuture009);
+
             AaruConsole.DebugWriteLine("Partimage plugin", "ArrayIsNullOrEmpty(CMainHeader.cReserved) = {0}",
-                                      ArrayHelpers.ArrayIsNullOrEmpty(cMainHeader.cReserved));
+                                       ArrayHelpers.ArrayIsNullOrEmpty(cMainHeader.cReserved));
+
             AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.crc = 0x{0:X8}", cMainHeader.crc);
 
             // partimage 0.6.1 does not support them either
@@ -170,7 +213,9 @@ namespace Aaru.DiscImages
                 hdrB = new byte[MAGIC_BEGIN_MBRBACKUP.Length];
                 stream.Read(hdrB, 0, MAGIC_BEGIN_MBRBACKUP.Length);
                 magic = StringHandlers.CToString(hdrB);
-                if(!magic.Equals(MAGIC_BEGIN_MBRBACKUP)) throw new ImageNotSupportedException("Cannot find MBRs");
+
+                if(!magic.Equals(MAGIC_BEGIN_MBRBACKUP))
+                    throw new ImageNotSupportedException("Cannot find MBRs");
 
                 stream.Seek(cMainHeader.dwMbrSize * cMainHeader.dwMbrCount, SeekOrigin.Current);
             }
@@ -181,29 +226,39 @@ namespace Aaru.DiscImages
             hdrB = new byte[MAGIC_BEGIN_LOCALHEADER.Length];
             stream.Read(hdrB, 0, MAGIC_BEGIN_LOCALHEADER.Length);
             magic = StringHandlers.CToString(hdrB);
-            if(!magic.Equals(MAGIC_BEGIN_LOCALHEADER)) throw new ImageNotSupportedException("Cannot find local header");
+
+            if(!magic.Equals(MAGIC_BEGIN_LOCALHEADER))
+                throw new ImageNotSupportedException("Cannot find local header");
 
             hdrB = new byte[Marshal.SizeOf<CLocalHeader>()];
             stream.Read(hdrB, 0, Marshal.SizeOf<CLocalHeader>());
             CLocalHeader localHeader = Marshal.ByteArrayToStructureLittleEndian<CLocalHeader>(hdrB);
 
-            AaruConsole.DebugWriteLine("Partimage plugin", "CLocalHeader.qwBlockSize = {0}",  localHeader.qwBlockSize);
+            AaruConsole.DebugWriteLine("Partimage plugin", "CLocalHeader.qwBlockSize = {0}", localHeader.qwBlockSize);
             AaruConsole.DebugWriteLine("Partimage plugin", "CLocalHeader.qwUsedBlocks = {0}", localHeader.qwUsedBlocks);
+
             AaruConsole.DebugWriteLine("Partimage plugin", "CLocalHeader.qwBlocksCount = {0}",
-                                      localHeader.qwBlocksCount);
+                                       localHeader.qwBlocksCount);
+
             AaruConsole.DebugWriteLine("Partimage plugin", "CLocalHeader.qwBitmapSize = {0}", localHeader.qwBitmapSize);
+
             AaruConsole.DebugWriteLine("Partimage plugin", "CLocalHeader.qwBadBlocksCount = {0}",
-                                      localHeader.qwBadBlocksCount);
+                                       localHeader.qwBadBlocksCount);
+
             AaruConsole.DebugWriteLine("Partimage plugin", "CLocalHeader.szLabel = {0}",
-                                      StringHandlers.CToString(localHeader.szLabel));
+                                       StringHandlers.CToString(localHeader.szLabel));
+
             AaruConsole.DebugWriteLine("Partimage plugin", "ArrayIsNullOrEmpty(CLocalHeader.cReserved) = {0}",
-                                      ArrayHelpers.ArrayIsNullOrEmpty(localHeader.cReserved));
+                                       ArrayHelpers.ArrayIsNullOrEmpty(localHeader.cReserved));
+
             AaruConsole.DebugWriteLine("Partimage plugin", "CLocalHeader.crc = 0x{0:X8}", localHeader.crc);
 
             hdrB = new byte[MAGIC_BEGIN_BITMAP.Length];
             stream.Read(hdrB, 0, MAGIC_BEGIN_BITMAP.Length);
             magic = StringHandlers.CToString(hdrB);
-            if(!magic.Equals(MAGIC_BEGIN_BITMAP)) throw new ImageNotSupportedException("Cannot find bitmap");
+
+            if(!magic.Equals(MAGIC_BEGIN_BITMAP))
+                throw new ImageNotSupportedException("Cannot find bitmap");
 
             bitmap = new byte[localHeader.qwBitmapSize];
             stream.Read(bitmap, 0, (int)localHeader.qwBitmapSize);
@@ -211,7 +266,9 @@ namespace Aaru.DiscImages
             hdrB = new byte[MAGIC_BEGIN_INFO.Length];
             stream.Read(hdrB, 0, MAGIC_BEGIN_INFO.Length);
             magic = StringHandlers.CToString(hdrB);
-            if(!magic.Equals(MAGIC_BEGIN_INFO)) throw new ImageNotSupportedException("Cannot find info block");
+
+            if(!magic.Equals(MAGIC_BEGIN_INFO))
+                throw new ImageNotSupportedException("Cannot find info block");
 
             // Skip info block and its checksum
             stream.Seek(16384 + 4, SeekOrigin.Current);
@@ -219,7 +276,9 @@ namespace Aaru.DiscImages
             hdrB = new byte[MAGIC_BEGIN_DATABLOCKS.Length];
             stream.Read(hdrB, 0, MAGIC_BEGIN_DATABLOCKS.Length);
             magic = StringHandlers.CToString(hdrB);
-            if(!magic.Equals(MAGIC_BEGIN_DATABLOCKS)) throw new ImageNotSupportedException("Cannot find data blocks");
+
+            if(!magic.Equals(MAGIC_BEGIN_DATABLOCKS))
+                throw new ImageNotSupportedException("Cannot find data blocks");
 
             dataOff = stream.Position;
 
@@ -231,6 +290,7 @@ namespace Aaru.DiscImages
             hdrB = new byte[MAGIC_BEGIN_TAIL.Length];
             stream.Read(hdrB, 0, MAGIC_BEGIN_TAIL.Length);
             magic = StringHandlers.CToString(hdrB);
+
             if(!magic.Equals(MAGIC_BEGIN_TAIL))
                 throw new
                     ImageNotSupportedException("Cannot find tail. Multiple volumes are not supported or image is corrupt.");
@@ -260,14 +320,16 @@ namespace Aaru.DiscImages
                         extentsOff.TryGetValue(extentStart, out ulong _);
                     }
 
-                if(next && current) blockOff++;
+                if(next && current)
+                    blockOff++;
 
                 current = next;
             }
 
             DateTime end = DateTime.Now;
+
             AaruConsole.DebugWriteLine("Partimage plugin", "Took {0} seconds to fill extents",
-                                      (end - start).TotalSeconds);
+                                       (end - start).TotalSeconds);
 
             sectorCache = new Dictionary<ulong, byte[]>();
 
@@ -280,8 +342,10 @@ namespace Aaru.DiscImages
             imageInfo.MediaType            = MediaType.GENERIC_HDD;
             imageInfo.Version              = StringHandlers.CToString(cMainHeader.szVersion);
             imageInfo.Comments             = StringHandlers.CToString(cMainHeader.szPartDescription);
+
             imageInfo.ImageSize =
                 (ulong)(stream.Length - (dataOff + Marshal.SizeOf<CMainTail>() + MAGIC_BEGIN_TAIL.Length));
+
             imageStream = stream;
 
             return true;
@@ -296,23 +360,27 @@ namespace Aaru.DiscImages
             if((bitmap[sectorAddress / 8] & (1 << (int)(sectorAddress % 8))) == 0)
                 return new byte[imageInfo.SectorSize];
 
-            if(sectorCache.TryGetValue(sectorAddress, out byte[] sector)) return sector;
+            if(sectorCache.TryGetValue(sectorAddress, out byte[] sector))
+                return sector;
 
             ulong blockOff = BlockOffset(sectorAddress);
 
             // Offset of requested sector is:
             // Start of data +
             long imageOff = dataOff +
+
                             // How many stored bytes to skip
                             (long)(blockOff * imageInfo.SectorSize) +
+
                             // How many bytes of CRC blocks to skip
-                            (long)(blockOff / (CHECK_FREQUENCY / imageInfo.SectorSize)) * Marshal.SizeOf<CCheck>();
+                            ((long)(blockOff / (CHECK_FREQUENCY / imageInfo.SectorSize)) * Marshal.SizeOf<CCheck>());
 
             sector = new byte[imageInfo.SectorSize];
             imageStream.Seek(imageOff, SeekOrigin.Begin);
             imageStream.Read(sector, 0, (int)imageInfo.SectorSize);
 
-            if(sectorCache.Count > MAX_CACHED_SECTORS) sectorCache.Clear();
+            if(sectorCache.Count > MAX_CACHED_SECTORS)
+                sectorCache.Clear();
 
             sectorCache.Add(sectorAddress, sector);
 
@@ -328,17 +396,20 @@ namespace Aaru.DiscImages
             if(sectorAddress + length > imageInfo.Sectors)
                 throw new ArgumentOutOfRangeException(nameof(length), "Requested more sectors than available");
 
-            MemoryStream ms = new MemoryStream();
+            var ms = new MemoryStream();
 
             bool allEmpty = true;
+
             for(uint i = 0; i < length; i++)
                 if((bitmap[sectorAddress / 8] & (1 << (int)(sectorAddress % 8))) != 0)
                 {
                     allEmpty = false;
+
                     break;
                 }
 
-            if(allEmpty) return new byte[imageInfo.SectorSize * length];
+            if(allEmpty)
+                return new byte[imageInfo.SectorSize * length];
 
             for(uint i = 0; i < length; i++)
             {
diff --git a/Aaru.Images/Partimage/Structs.cs b/Aaru.Images/Partimage/Structs.cs
index 16350c443..629df5976 100644
--- a/Aaru.Images/Partimage/Structs.cs
+++ b/Aaru.Images/Partimage/Structs.cs
@@ -36,35 +36,23 @@ namespace Aaru.DiscImages
 {
     public partial class Partimage
     {
-        /// <summary>
-        ///     Partimage disk image header, little-endian
-        /// </summary>
+        /// <summary>Partimage disk image header, little-endian</summary>
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct PartimageHeader
         {
-            /// <summary>
-            ///     Magic, <see cref="Partimage.partimageMagic" />
-            /// </summary>
+            /// <summary>Magic, <see cref="Partimage.partimageMagic" /></summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
-            public byte[] magic;
-            /// <summary>
-            ///     Source filesystem
-            /// </summary>
+            public readonly byte[] magic;
+            /// <summary>Source filesystem</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 64)]
-            public byte[] version;
-            /// <summary>
-            ///     Volume number
-            /// </summary>
-            public uint volumeNumber;
-            /// <summary>
-            ///     Image identifier
-            /// </summary>
-            public ulong identificator;
-            /// <summary>
-            ///     Empty space
-            /// </summary>
+            public readonly byte[] version;
+            /// <summary>Volume number</summary>
+            public readonly uint volumeNumber;
+            /// <summary>Image identifier</summary>
+            public readonly ulong identificator;
+            /// <summary>Empty space</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 404)]
-            public byte[] reserved;
+            public readonly byte[] reserved;
         }
 
         struct PortableTm
@@ -83,85 +71,83 @@ namespace Aaru.DiscImages
             public uint Timezone;
         }
 
-        /// <summary>
-        ///     Partimage CMainHeader
-        /// </summary>
+        /// <summary>Partimage CMainHeader</summary>
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct PartimageMainHeader
         {
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 512)]
-            public byte[] szFileSystem; // ext2fs, ntfs, reiserfs, ...
+            public readonly byte[] szFileSystem; // ext2fs, ntfs, reiserfs, ...
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = MAX_DESCRIPTION)]
-            public byte[] szPartDescription; // user description of the partition
+            public readonly byte[] szPartDescription; // user description of the partition
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = MAX_DEVICENAMELEN)]
-            public byte[] szOriginalDevice; // original partition name
+            public readonly byte[] szOriginalDevice; // original partition name
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4095)]
-            public byte[] szFirstImageFilepath; //MAXPATHLEN]; // for splitted image files
+            public readonly byte[] szFirstImageFilepath; //MAXPATHLEN]; // for splitted image files
 
             // system and hardware infos
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = MAX_UNAMEINFOLEN)]
-            public byte[] szUnameSysname;
+            public readonly byte[] szUnameSysname;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = MAX_UNAMEINFOLEN)]
-            public byte[] szUnameNodename;
+            public readonly byte[] szUnameNodename;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = MAX_UNAMEINFOLEN)]
-            public byte[] szUnameRelease;
+            public readonly byte[] szUnameRelease;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = MAX_UNAMEINFOLEN)]
-            public byte[] szUnameVersion;
+            public readonly byte[] szUnameVersion;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = MAX_UNAMEINFOLEN)]
-            public byte[] szUnameMachine;
+            public readonly byte[] szUnameMachine;
 
-            public PCompression dwCompression; // COMPRESS_XXXXXX
-            public uint         dwMainFlags;
-            public PortableTm   dateCreate; // date of image creation
-            public ulong        qwPartSize; // size of the partition in bytes
+            public readonly PCompression dwCompression; // COMPRESS_XXXXXX
+            public readonly uint         dwMainFlags;
+            public readonly PortableTm   dateCreate; // date of image creation
+            public readonly ulong        qwPartSize; // size of the partition in bytes
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = MAX_HOSTNAMESIZE)]
-            public byte[] szHostname;
+            public readonly byte[] szHostname;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 64)]
-            public byte[] szVersion; // version of the image file
+            public readonly byte[] szVersion; // version of the image file
 
             // MBR backup
-            public uint dwMbrCount; // how many MBR are saved in the image file
-            public uint dwMbrSize;  // size of a MBR record (allow to change the size in the next versions)
+            public readonly uint dwMbrCount; // how many MBR are saved in the image file
+            public readonly uint dwMbrSize;  // size of a MBR record (allow to change the size in the next versions)
 
             // future encryption support
-            public PEncryption dwEncryptAlgo; // algo used to encrypt data
+            public readonly PEncryption dwEncryptAlgo; // algo used to encrypt data
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public byte[] cHashTestKey; // used to test the password without giving it
+            public readonly byte[] cHashTestKey; // used to test the password without giving it
 
             // reserved for future use (save DiskLabel, Extended partitions, ...)
-            public uint dwReservedFuture000;
-            public uint dwReservedFuture001;
-            public uint dwReservedFuture002;
-            public uint dwReservedFuture003;
-            public uint dwReservedFuture004;
-            public uint dwReservedFuture005;
-            public uint dwReservedFuture006;
-            public uint dwReservedFuture007;
-            public uint dwReservedFuture008;
-            public uint dwReservedFuture009;
+            public readonly uint dwReservedFuture000;
+            public readonly uint dwReservedFuture001;
+            public readonly uint dwReservedFuture002;
+            public readonly uint dwReservedFuture003;
+            public readonly uint dwReservedFuture004;
+            public readonly uint dwReservedFuture005;
+            public readonly uint dwReservedFuture006;
+            public readonly uint dwReservedFuture007;
+            public readonly uint dwReservedFuture008;
+            public readonly uint dwReservedFuture009;
 
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 6524)]
-            public byte[] cReserved; // Adjust to fit with total header size
+            public readonly byte[] cReserved; // Adjust to fit with total header size
 
-            public uint crc;
+            public readonly uint crc;
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct CMbr // must be 1024
         {
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = MBR_SIZE_WHOLE)]
-            public byte[] cData;
-            public uint dwDataCRC;
+            public readonly byte[] cData;
+            public readonly uint dwDataCRC;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = MAX_DEVICENAMELEN)]
-            public byte[] szDevice; // ex: "hda"
+            public readonly byte[] szDevice; // ex: "hda"
 
             // disk identificators
-            ulong qwBlocksCount;
+            readonly ulong qwBlocksCount;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = MAX_DESC_MODEL)]
-            public byte[] szDescModel;
+            public readonly byte[] szDescModel;
 
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 884)]
-            public byte[] cReserved; // for future use
+            public readonly byte[] cReserved; // for future use
 
             //public byte[] szDescGeometry[MAX_DESC_GEOMETRY];
             //public byte[] szDescIdentify[MAX_DESC_IDENTIFY];
@@ -171,36 +157,36 @@ namespace Aaru.DiscImages
         struct CCheck
         {
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
-            byte[] cMagic;      // must be 'C','H','K'
-            public uint  dwCRC; // CRC of the CHECK_FREQUENCY blocks
-            public ulong qwPos; // number of the last block written
+            readonly byte[] cMagic;      // must be 'C','H','K'
+            public readonly uint  dwCRC; // CRC of the CHECK_FREQUENCY blocks
+            public readonly ulong qwPos; // number of the last block written
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct CLocalHeader // size must be 16384 (adjust the reserved data)
         {
-            public ulong qwBlockSize;
-            public ulong qwUsedBlocks;
-            public ulong qwBlocksCount;
-            public ulong qwBitmapSize; // bytes in the bitmap
-            public ulong qwBadBlocksCount;
+            public readonly ulong qwBlockSize;
+            public readonly ulong qwUsedBlocks;
+            public readonly ulong qwBlocksCount;
+            public readonly ulong qwBitmapSize; // bytes in the bitmap
+            public readonly ulong qwBadBlocksCount;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 64)]
-            public byte[] szLabel;
+            public readonly byte[] szLabel;
 
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16280)]
-            public byte[] cReserved; // Adjust to fit with total header size
+            public readonly byte[] cReserved; // Adjust to fit with total header size
 
-            public uint crc;
+            public readonly uint crc;
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct CMainTail // size must be 16384 (adjust the reserved data)
         {
-            public ulong qwCRC;
-            public uint  dwVolumeNumber;
+            public readonly ulong qwCRC;
+            public readonly uint  dwVolumeNumber;
 
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16372)]
-            public byte[] cReserved; // Adjust to fit with total header size
+            public readonly byte[] cReserved; // Adjust to fit with total header size
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/QCOW/Constants.cs b/Aaru.Images/QCOW/Constants.cs
index 97413176a..dc9e8166a 100644
--- a/Aaru.Images/QCOW/Constants.cs
+++ b/Aaru.Images/QCOW/Constants.cs
@@ -34,9 +34,7 @@ namespace Aaru.DiscImages
 {
     public partial class Qcow
     {
-        /// <summary>
-        ///     Magic number: 'Q', 'F', 'I', 0xFB
-        /// </summary>
+        /// <summary>Magic number: 'Q', 'F', 'I', 0xFB</summary>
         const uint QCOW_MAGIC = 0x514649FB;
         const uint  QCOW_VERSION         = 1;
         const uint  QCOW_ENCRYPTION_NONE = 0;
diff --git a/Aaru.Images/QCOW/Identify.cs b/Aaru.Images/QCOW/Identify.cs
index 7deac447d..c1857935b 100644
--- a/Aaru.Images/QCOW/Identify.cs
+++ b/Aaru.Images/QCOW/Identify.cs
@@ -43,7 +43,8 @@ namespace Aaru.DiscImages
             Stream stream = imageFilter.GetDataForkStream();
             stream.Seek(0, SeekOrigin.Begin);
 
-            if(stream.Length < 512) return false;
+            if(stream.Length < 512)
+                return false;
 
             byte[] qHdrB = new byte[48];
             stream.Read(qHdrB, 0, 48);
diff --git a/Aaru.Images/QCOW/Properties.cs b/Aaru.Images/QCOW/Properties.cs
index d909cc4a9..a6c5adbe8 100644
--- a/Aaru.Images/QCOW/Properties.cs
+++ b/Aaru.Images/QCOW/Properties.cs
@@ -43,25 +43,30 @@ namespace Aaru.DiscImages
     {
         public ImageInfo Info => imageInfo;
 
-        public string                     Name                => "QEMU Copy-On-Write disk image";
-        public Guid                       Id                  => new Guid("A5C35765-9FE2-469D-BBBF-ACDEBDB7B954");
-        public string                     Author              => "Natalia Portillo";
-        public string                     Format              => "QEMU Copy-On-Write";
-        public List<DumpHardwareType>     DumpHardware        => null;
-        public CICMMetadataType           CicmMetadata        => null;
-        public IEnumerable<MediaTagType>  SupportedMediaTags  => new MediaTagType[] { };
-        public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[] { };
-        public IEnumerable<MediaType> SupportedMediaTypes =>
-            new[]
-            {
-                MediaType.Unknown, MediaType.GENERIC_HDD, MediaType.FlashDrive, MediaType.CompactFlash,
-                MediaType.CompactFlashType2, MediaType.PCCardTypeI, MediaType.PCCardTypeII, MediaType.PCCardTypeIII,
-                MediaType.PCCardTypeIV
-            };
+        public string                 Name         => "QEMU Copy-On-Write disk image";
+        public Guid                   Id           => new Guid("A5C35765-9FE2-469D-BBBF-ACDEBDB7B954");
+        public string                 Author       => "Natalia Portillo";
+        public string                 Format       => "QEMU Copy-On-Write";
+        public List<DumpHardwareType> DumpHardware => null;
+        public CICMMetadataType       CicmMetadata => null;
+        public IEnumerable<MediaTagType> SupportedMediaTags => new MediaTagType[]
+            {};
+        public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[]
+            {};
+        public IEnumerable<MediaType> SupportedMediaTypes => new[]
+        {
+            MediaType.Unknown, MediaType.GENERIC_HDD, MediaType.FlashDrive, MediaType.CompactFlash,
+            MediaType.CompactFlashType2, MediaType.PCCardTypeI, MediaType.PCCardTypeII, MediaType.PCCardTypeIII,
+            MediaType.PCCardTypeIV
+        };
         public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
-            new (string name, Type type, string description, object @default)[] { };
-        public IEnumerable<string> KnownExtensions => new[] {".qcow", ".qc"};
-        public bool                IsWriting       { get; private set; }
-        public string              ErrorMessage    { get; private set; }
+            new (string name, Type type, string description, object @default)[]
+                {};
+        public IEnumerable<string> KnownExtensions => new[]
+        {
+            ".qcow", ".qc"
+        };
+        public bool   IsWriting    { get; private set; }
+        public string ErrorMessage { get; private set; }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/QCOW/QCOW.cs b/Aaru.Images/QCOW/QCOW.cs
index ac2c3084c..efe06cb6f 100644
--- a/Aaru.Images/QCOW/QCOW.cs
+++ b/Aaru.Images/QCOW/QCOW.cs
@@ -59,31 +59,18 @@ namespace Aaru.DiscImages
         ulong                      sectorMask;
         FileStream                 writingStream;
 
-        public Qcow()
+        public Qcow() => imageInfo = new ImageInfo
         {
-            imageInfo = new ImageInfo
-            {
-                ReadableSectorTags    = new List<SectorTagType>(),
-                ReadableMediaTags     = new List<MediaTagType>(),
-                HasPartitions         = false,
-                HasSessions           = false,
-                Version               = "1",
-                Application           = "QEMU",
-                ApplicationVersion    = null,
-                Creator               = null,
-                Comments              = null,
-                MediaManufacturer     = null,
-                MediaModel            = null,
-                MediaSerialNumber     = null,
-                MediaBarcode          = null,
-                MediaPartNumber       = null,
-                MediaSequence         = 0,
-                LastMediaSequence     = 0,
-                DriveManufacturer     = null,
-                DriveModel            = null,
-                DriveSerialNumber     = null,
-                DriveFirmwareRevision = null
-            };
-        }
+            ReadableSectorTags = new List<SectorTagType>(), ReadableMediaTags = new List<MediaTagType>(),
+            HasPartitions      = false, HasSessions                           = false, Version = "1",
+            Application        = "QEMU",
+            ApplicationVersion = null, Creator = null, Comments = null,
+            MediaManufacturer  = null,
+            MediaModel         = null, MediaSerialNumber = null, MediaBarcode = null,
+            MediaPartNumber    = null,
+            MediaSequence      = 0, LastMediaSequence = 0, DriveManufacturer = null,
+            DriveModel         = null,
+            DriveSerialNumber  = null, DriveFirmwareRevision = null
+        };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/QCOW/Read.cs b/Aaru.Images/QCOW/Read.cs
index 900cde76c..b5270067a 100644
--- a/Aaru.Images/QCOW/Read.cs
+++ b/Aaru.Images/QCOW/Read.cs
@@ -51,31 +51,35 @@ namespace Aaru.DiscImages
             Stream stream = imageFilter.GetDataForkStream();
             stream.Seek(0, SeekOrigin.Begin);
 
-            if(stream.Length < 512) return false;
+            if(stream.Length < 512)
+                return false;
 
             byte[] qHdrB = new byte[48];
             stream.Read(qHdrB, 0, 48);
             qHdr = Marshal.SpanToStructureBigEndian<QCowHeader>(qHdrB);
 
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.magic = 0x{0:X8}",          qHdr.magic);
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.version = {0}",             qHdr.version);
+            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.magic = 0x{0:X8}", qHdr.magic);
+            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.version = {0}", qHdr.version);
             AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.backing_file_offset = {0}", qHdr.backing_file_offset);
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.backing_file_size = {0}",   qHdr.backing_file_size);
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.mtime = {0}",               qHdr.mtime);
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.size = {0}",                qHdr.size);
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.cluster_bits = {0}",        qHdr.cluster_bits);
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.l2_bits = {0}",             qHdr.l2_bits);
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.padding = {0}",             qHdr.padding);
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.crypt_method = {0}",        qHdr.crypt_method);
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.l1_table_offset = {0}",     qHdr.l1_table_offset);
+            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.backing_file_size = {0}", qHdr.backing_file_size);
+            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.mtime = {0}", qHdr.mtime);
+            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.size = {0}", qHdr.size);
+            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.cluster_bits = {0}", qHdr.cluster_bits);
+            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.l2_bits = {0}", qHdr.l2_bits);
+            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.padding = {0}", qHdr.padding);
+            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.crypt_method = {0}", qHdr.crypt_method);
+            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.l1_table_offset = {0}", qHdr.l1_table_offset);
 
-            if(qHdr.size <= 1) throw new ArgumentOutOfRangeException(nameof(qHdr.size), "Image size is too small");
+            if(qHdr.size <= 1)
+                throw new ArgumentOutOfRangeException(nameof(qHdr.size), "Image size is too small");
 
-            if(qHdr.cluster_bits < 9 || qHdr.cluster_bits > 16)
+            if(qHdr.cluster_bits < 9 ||
+               qHdr.cluster_bits > 16)
                 throw new ArgumentOutOfRangeException(nameof(qHdr.cluster_bits),
                                                       "Cluster size must be between 512 bytes and 64 Kbytes");
 
-            if(qHdr.l2_bits < 9 - 3 || qHdr.l2_bits > 16 - 3)
+            if(qHdr.l2_bits < 9  - 3 ||
+               qHdr.l2_bits > 16 - 3)
                 throw new ArgumentOutOfRangeException(nameof(qHdr.l2_bits),
                                                       "L2 size must be between 512 bytes and 64 Kbytes");
 
@@ -95,21 +99,23 @@ namespace Aaru.DiscImages
 
             clusterSize    = 1 << qHdr.cluster_bits;
             clusterSectors = 1 << (qHdr.cluster_bits - 9);
-            l1Size         = (uint)((qHdr.size + (ulong)(1 << shift) - 1) >> shift);
+            l1Size         = (uint)(((qHdr.size + (ulong)(1 << shift)) - 1) >> shift);
             l2Size         = 1 << qHdr.l2_bits;
 
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.clusterSize = {0}",    clusterSize);
+            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.clusterSize = {0}", clusterSize);
             AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.clusterSectors = {0}", clusterSectors);
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.l1Size = {0}",         l1Size);
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.l2Size = {0}",         l2Size);
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.sectors = {0}",        imageInfo.Sectors);
+            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.l1Size = {0}", l1Size);
+            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.l2Size = {0}", l2Size);
+            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.sectors = {0}", imageInfo.Sectors);
 
             byte[] l1TableB = new byte[l1Size * 8];
             stream.Seek((long)qHdr.l1_table_offset, SeekOrigin.Begin);
             stream.Read(l1TableB, 0, (int)l1Size * 8);
             l1Table = MemoryMarshal.Cast<byte, ulong>(l1TableB).ToArray();
             AaruConsole.DebugWriteLine("QCOW plugin", "Reading L1 table");
-            for(long i = 0; i < l1Table.LongLength; i++) l1Table[i] = Swapping.Swap(l1Table[i]);
+
+            for(long i = 0; i < l1Table.LongLength; i++)
+                l1Table[i] = Swapping.Swap(l1Table[i]);
 
             l1Mask = 0;
             int c = 0;
@@ -119,23 +125,28 @@ namespace Aaru.DiscImages
             {
                 l1Mask <<= 1;
 
-                if(c >= 64 - l1Shift) continue;
+                if(c >= 64 - l1Shift)
+                    continue;
 
                 l1Mask += 1;
                 c++;
             }
 
             l2Mask = 0;
-            for(int i = 0; i < qHdr.l2_bits; i++) l2Mask = (l2Mask << 1) + 1;
+
+            for(int i = 0; i < qHdr.l2_bits; i++)
+                l2Mask = (l2Mask << 1) + 1;
 
             l2Mask <<= qHdr.cluster_bits;
 
             sectorMask = 0;
-            for(int i = 0; i < qHdr.cluster_bits; i++) sectorMask = (sectorMask << 1) + 1;
 
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.l1Mask = {0:X}",     l1Mask);
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.l1Shift = {0}",      l1Shift);
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.l2Mask = {0:X}",     l2Mask);
+            for(int i = 0; i < qHdr.cluster_bits; i++)
+                sectorMask = (sectorMask << 1) + 1;
+
+            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.l1Mask = {0:X}", l1Mask);
+            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.l1Shift = {0}", l1Shift);
+            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.l2Mask = {0:X}", l2Mask);
             AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.sectorMask = {0:X}", sectorMask);
 
             maxL2TableCache = MAX_CACHE_SIZE / (l2Size * 8);
@@ -148,9 +159,10 @@ namespace Aaru.DiscImages
             clusterCache = new Dictionary<ulong, byte[]>();
 
             imageInfo.CreationTime = imageFilter.GetCreationTime();
-            imageInfo.LastModificationTime = qHdr.mtime > 0
-                                                 ? DateHandlers.UnixUnsignedToDateTime(qHdr.mtime)
+
+            imageInfo.LastModificationTime = qHdr.mtime > 0 ? DateHandlers.UnixUnsignedToDateTime(qHdr.mtime)
                                                  : imageFilter.GetLastWriteTime();
+
             imageInfo.MediaTitle   = Path.GetFileNameWithoutExtension(imageFilter.GetFilename());
             imageInfo.Sectors      = qHdr.size / 512;
             imageInfo.SectorSize   = 512;
@@ -172,7 +184,8 @@ namespace Aaru.DiscImages
                                                       $"Sector address {sectorAddress} not found");
 
             // Check cache
-            if(sectorCache.TryGetValue(sectorAddress, out byte[] sector)) return sector;
+            if(sectorCache.TryGetValue(sectorAddress, out byte[] sector))
+                return sector;
 
             ulong byteAddress = sectorAddress * 512;
 
@@ -183,7 +196,8 @@ namespace Aaru.DiscImages
                                                       $"Trying to read past L1 table, position {l1Off} of a max {l1Table.LongLength}");
 
             // TODO: Implement differential images
-            if(l1Table[l1Off] == 0) return new byte[512];
+            if(l1Table[l1Off] == 0)
+                return new byte[512];
 
             if(!l2TableCache.TryGetValue(l1Off, out ulong[] l2Table))
             {
@@ -192,9 +206,12 @@ namespace Aaru.DiscImages
                 imageStream.Read(l2TableB, 0, l2Size * 8);
                 AaruConsole.DebugWriteLine("QCOW plugin", "Reading L2 table #{0}", l1Off);
                 l2Table = MemoryMarshal.Cast<byte, ulong>(l2TableB).ToArray();
-                for(long i = 0; i < l2Table.LongLength; i++) l2Table[i] = Swapping.Swap(l2Table[i]);
 
-                if(l2TableCache.Count >= maxL2TableCache) l2TableCache.Clear();
+                for(long i = 0; i < l2Table.LongLength; i++)
+                    l2Table[i] = Swapping.Swap(l2Table[i]);
+
+                if(l2TableCache.Count >= maxL2TableCache)
+                    l2TableCache.Clear();
 
                 l2TableCache.Add(l1Off, l2Table);
             }
@@ -222,8 +239,7 @@ namespace Aaru.DiscImages
                         imageStream.Seek((long)realOff, SeekOrigin.Begin);
                         imageStream.Read(zCluster, 0, (int)compSize);
 
-                        DeflateStream zStream =
-                            new DeflateStream(new MemoryStream(zCluster), CompressionMode.Decompress);
+                        var zStream = new DeflateStream(new MemoryStream(zCluster), CompressionMode.Decompress);
                         cluster = new byte[clusterSize];
                         int read = zStream.Read(cluster, 0, clusterSize);
 
@@ -238,7 +254,8 @@ namespace Aaru.DiscImages
                         imageStream.Read(cluster, 0, clusterSize);
                     }
 
-                    if(clusterCache.Count >= maxClusterCache) clusterCache.Clear();
+                    if(clusterCache.Count >= maxClusterCache)
+                        clusterCache.Clear();
 
                     clusterCache.Add(offset, cluster);
                 }
@@ -246,7 +263,8 @@ namespace Aaru.DiscImages
                 Array.Copy(cluster, (int)(byteAddress & sectorMask), sector, 0, 512);
             }
 
-            if(sectorCache.Count >= MAX_CACHED_SECTORS) sectorCache.Clear();
+            if(sectorCache.Count >= MAX_CACHED_SECTORS)
+                sectorCache.Clear();
 
             sectorCache.Add(sectorAddress, sector);
 
@@ -262,7 +280,7 @@ namespace Aaru.DiscImages
             if(sectorAddress + length > imageInfo.Sectors)
                 throw new ArgumentOutOfRangeException(nameof(length), "Requested more sectors than available");
 
-            MemoryStream ms = new MemoryStream();
+            var ms = new MemoryStream();
 
             for(uint i = 0; i < length; i++)
             {
diff --git a/Aaru.Images/QCOW/Structs.cs b/Aaru.Images/QCOW/Structs.cs
index 076d7c8f8..265da617b 100644
--- a/Aaru.Images/QCOW/Structs.cs
+++ b/Aaru.Images/QCOW/Structs.cs
@@ -36,9 +36,7 @@ namespace Aaru.DiscImages
 {
     public partial class Qcow
     {
-        /// <summary>
-        ///     QCOW header, big-endian
-        /// </summary>
+        /// <summary>QCOW header, big-endian</summary>
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct QCowHeader
         {
@@ -46,45 +44,25 @@ namespace Aaru.DiscImages
             ///     <see cref="Qcow.QCOW_MAGIC" />
             /// </summary>
             public uint magic;
-            /// <summary>
-            ///     Must be 1
-            /// </summary>
+            /// <summary>Must be 1</summary>
             public uint version;
-            /// <summary>
-            ///     Offset inside file to string containing backing file
-            /// </summary>
-            public ulong backing_file_offset;
-            /// <summary>
-            ///     Size of <see cref="backing_file_offset" />
-            /// </summary>
-            public uint backing_file_size;
-            /// <summary>
-            ///     Modification time
-            /// </summary>
+            /// <summary>Offset inside file to string containing backing file</summary>
+            public readonly ulong backing_file_offset;
+            /// <summary>Size of <see cref="backing_file_offset" /></summary>
+            public readonly uint backing_file_size;
+            /// <summary>Modification time</summary>
             public uint mtime;
-            /// <summary>
-            ///     Size in bytes
-            /// </summary>
+            /// <summary>Size in bytes</summary>
             public ulong size;
-            /// <summary>
-            ///     Cluster bits
-            /// </summary>
+            /// <summary>Cluster bits</summary>
             public byte cluster_bits;
-            /// <summary>
-            ///     L2 table bits
-            /// </summary>
+            /// <summary>L2 table bits</summary>
             public byte l2_bits;
-            /// <summary>
-            ///     Padding
-            /// </summary>
-            public ushort padding;
-            /// <summary>
-            ///     Encryption method
-            /// </summary>
-            public uint crypt_method;
-            /// <summary>
-            ///     Offset to L1 table
-            /// </summary>
+            /// <summary>Padding</summary>
+            public readonly ushort padding;
+            /// <summary>Encryption method</summary>
+            public readonly uint crypt_method;
+            /// <summary>Offset to L1 table</summary>
             public ulong l1_table_offset;
         }
     }
diff --git a/Aaru.Images/QCOW/Write.cs b/Aaru.Images/QCOW/Write.cs
index 3a62acb30..8cd6e271e 100644
--- a/Aaru.Images/QCOW/Write.cs
+++ b/Aaru.Images/QCOW/Write.cs
@@ -46,50 +46,56 @@ namespace Aaru.DiscImages
     public partial class Qcow
     {
         public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
-                           uint   sectorSize)
+                           uint sectorSize)
         {
             if(sectorSize != 512)
             {
                 ErrorMessage = "Unsupported sector size";
+
                 return false;
             }
 
             if(!SupportedMediaTypes.Contains(mediaType))
             {
                 ErrorMessage = $"Unsupport media format {mediaType}";
+
                 return false;
             }
 
             // TODO: Correct this calculation
-            if(sectors * sectorSize / 65536 > uint.MaxValue)
+            if((sectors * sectorSize) / 65536 > uint.MaxValue)
             {
                 ErrorMessage = "Too many sectors for selected cluster size";
+
                 return false;
             }
 
-            imageInfo = new ImageInfo {MediaType = mediaType, SectorSize = sectorSize, Sectors = sectors};
+            imageInfo = new ImageInfo
+            {
+                MediaType = mediaType, SectorSize = sectorSize, Sectors = sectors
+            };
 
-            try { writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None); }
+            try
+            {
+                writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
+            }
             catch(IOException e)
             {
                 ErrorMessage = $"Could not create new image file, exception {e.Message}";
+
                 return false;
             }
 
             qHdr = new QCowHeader
             {
-                magic           = QCOW_MAGIC,
-                version         = QCOW_VERSION,
-                size            = sectors * sectorSize,
-                cluster_bits    = 12,
-                l2_bits         = 9,
-                l1_table_offset = (ulong)Marshal.SizeOf<QCowHeader>()
+                magic   = QCOW_MAGIC, version = QCOW_VERSION, size = sectors * sectorSize, cluster_bits = 12,
+                l2_bits = 9, l1_table_offset  = (ulong)Marshal.SizeOf<QCowHeader>()
             };
 
             int shift = qHdr.cluster_bits + qHdr.l2_bits;
             clusterSize    = 1 << qHdr.cluster_bits;
             clusterSectors = 1 << (qHdr.cluster_bits - 9);
-            l1Size         = (uint)((qHdr.size + (ulong)(1 << shift) - 1) >> shift);
+            l1Size         = (uint)(((qHdr.size + (ulong)(1 << shift)) - 1) >> shift);
             l2Size         = 1 << qHdr.l2_bits;
 
             l1Table = new ulong[l1Size];
@@ -102,31 +108,38 @@ namespace Aaru.DiscImages
             {
                 l1Mask <<= 1;
 
-                if(c >= 64 - l1Shift) continue;
+                if(c >= 64 - l1Shift)
+                    continue;
 
                 l1Mask += 1;
                 c++;
             }
 
             l2Mask = 0;
-            for(int i = 0; i < qHdr.l2_bits; i++) l2Mask = (l2Mask << 1) + 1;
+
+            for(int i = 0; i < qHdr.l2_bits; i++)
+                l2Mask = (l2Mask << 1) + 1;
 
             l2Mask <<= qHdr.cluster_bits;
 
             sectorMask = 0;
-            for(int i = 0; i < qHdr.cluster_bits; i++) sectorMask = (sectorMask << 1) + 1;
 
-            byte[] empty = new byte[qHdr.l1_table_offset + l1Size * 8];
+            for(int i = 0; i < qHdr.cluster_bits; i++)
+                sectorMask = (sectorMask << 1) + 1;
+
+            byte[] empty = new byte[qHdr.l1_table_offset + (l1Size * 8)];
             writingStream.Write(empty, 0, empty.Length);
 
             IsWriting    = true;
             ErrorMessage = null;
+
             return true;
         }
 
         public bool WriteMediaTag(byte[] data, MediaTagType tag)
         {
             ErrorMessage = "Writing media tags is not supported.";
+
             return false;
         }
 
@@ -135,23 +148,27 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Tried to write on a non-writable image";
+
                 return false;
             }
 
             if(data.Length != imageInfo.SectorSize)
             {
                 ErrorMessage = "Incorrect data size";
+
                 return false;
             }
 
             if(sectorAddress >= imageInfo.Sectors)
             {
                 ErrorMessage = "Tried to write past image size";
+
                 return false;
             }
 
             // Ignore empty sectors
-            if(ArrayHelpers.ArrayIsNullOrEmpty(data)) return true;
+            if(ArrayHelpers.ArrayIsNullOrEmpty(data))
+                return true;
 
             ulong byteAddress = sectorAddress * 512;
 
@@ -174,7 +191,7 @@ namespace Aaru.DiscImages
 
             ulong l2Off = (byteAddress & l2Mask) >> qHdr.cluster_bits;
 
-            writingStream.Seek((long)(l1Table[l1Off] + l2Off * 8), SeekOrigin.Begin);
+            writingStream.Seek((long)(l1Table[l1Off] + (l2Off * 8)), SeekOrigin.Begin);
 
             byte[] entry = new byte[8];
             writingStream.Read(entry, 0, 8);
@@ -185,7 +202,7 @@ namespace Aaru.DiscImages
                 offset = (ulong)writingStream.Length;
                 byte[] cluster = new byte[clusterSize];
                 entry = BigEndianBitConverter.GetBytes(offset);
-                writingStream.Seek((long)(l1Table[l1Off] + l2Off * 8), SeekOrigin.Begin);
+                writingStream.Seek((long)(l1Table[l1Off] + (l2Off * 8)), SeekOrigin.Begin);
                 writingStream.Write(entry, 0, 8);
                 writingStream.Seek(0, SeekOrigin.End);
                 writingStream.Write(cluster, 0, cluster.Length);
@@ -195,6 +212,7 @@ namespace Aaru.DiscImages
             writingStream.Write(data, 0, data.Length);
 
             ErrorMessage = "";
+
             return true;
         }
 
@@ -204,44 +222,53 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Tried to write on a non-writable image";
+
                 return false;
             }
 
             if(data.Length % imageInfo.SectorSize != 0)
             {
                 ErrorMessage = "Incorrect data size";
+
                 return false;
             }
 
             if(sectorAddress + length > imageInfo.Sectors)
             {
                 ErrorMessage = "Tried to write past image size";
+
                 return false;
             }
 
             // Ignore empty sectors
-            if(ArrayHelpers.ArrayIsNullOrEmpty(data)) return true;
+            if(ArrayHelpers.ArrayIsNullOrEmpty(data))
+                return true;
 
             for(uint i = 0; i < length; i++)
             {
                 byte[] tmp = new byte[imageInfo.SectorSize];
                 Array.Copy(data, i * imageInfo.SectorSize, tmp, 0, imageInfo.SectorSize);
-                if(!WriteSector(tmp, sectorAddress + i)) return false;
+
+                if(!WriteSector(tmp, sectorAddress + i))
+                    return false;
             }
 
             ErrorMessage = "";
+
             return true;
         }
 
         public bool WriteSectorLong(byte[] data, ulong sectorAddress)
         {
             ErrorMessage = "Writing sectors with tags is not supported.";
+
             return false;
         }
 
         public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
         {
             ErrorMessage = "Writing sectors with tags is not supported.";
+
             return false;
         }
 
@@ -250,28 +277,31 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Image is not opened for writing";
+
                 return false;
             }
 
             qHdr.mtime = (uint)(DateTime.Now - new DateTime(1970, 1, 1, 0, 0, 0)).TotalSeconds;
 
             writingStream.Seek(0, SeekOrigin.Begin);
-            writingStream.Write(BigEndianBitConverter.GetBytes(qHdr.magic),               0, 4);
-            writingStream.Write(BigEndianBitConverter.GetBytes(qHdr.version),             0, 4);
+            writingStream.Write(BigEndianBitConverter.GetBytes(qHdr.magic), 0, 4);
+            writingStream.Write(BigEndianBitConverter.GetBytes(qHdr.version), 0, 4);
             writingStream.Write(BigEndianBitConverter.GetBytes(qHdr.backing_file_offset), 0, 8);
-            writingStream.Write(BigEndianBitConverter.GetBytes(qHdr.backing_file_size),   0, 4);
-            writingStream.Write(BigEndianBitConverter.GetBytes(qHdr.mtime),               0, 4);
-            writingStream.Write(BigEndianBitConverter.GetBytes(qHdr.size),                0, 8);
+            writingStream.Write(BigEndianBitConverter.GetBytes(qHdr.backing_file_size), 0, 4);
+            writingStream.Write(BigEndianBitConverter.GetBytes(qHdr.mtime), 0, 4);
+            writingStream.Write(BigEndianBitConverter.GetBytes(qHdr.size), 0, 8);
             writingStream.WriteByte(qHdr.cluster_bits);
             writingStream.WriteByte(qHdr.l2_bits);
-            writingStream.Write(BigEndianBitConverter.GetBytes(qHdr.padding),         0, 2);
-            writingStream.Write(BigEndianBitConverter.GetBytes(qHdr.crypt_method),    0, 4);
+            writingStream.Write(BigEndianBitConverter.GetBytes(qHdr.padding), 0, 2);
+            writingStream.Write(BigEndianBitConverter.GetBytes(qHdr.crypt_method), 0, 4);
             writingStream.Write(BigEndianBitConverter.GetBytes(qHdr.l1_table_offset), 0, 8);
 
             writingStream.Seek((long)qHdr.l1_table_offset, SeekOrigin.Begin);
-            for(long i = 0; i < l1Table.LongLength; i++) l1Table[i] = Swapping.Swap(l1Table[i]);
-            byte[] l1TableB =
-                MemoryMarshal.Cast<ulong, byte>(l1Table).ToArray();
+
+            for(long i = 0; i < l1Table.LongLength; i++)
+                l1Table[i] = Swapping.Swap(l1Table[i]);
+
+            byte[] l1TableB = MemoryMarshal.Cast<ulong, byte>(l1Table).ToArray();
             writingStream.Write(l1TableB, 0, l1TableB.Length);
 
             writingStream.Flush();
@@ -279,6 +309,7 @@ namespace Aaru.DiscImages
 
             IsWriting    = false;
             ErrorMessage = "";
+
             return true;
         }
 
@@ -289,12 +320,14 @@ namespace Aaru.DiscImages
         public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
         {
             ErrorMessage = "Writing sectors with tags is not supported.";
+
             return false;
         }
 
         public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
         {
             ErrorMessage = "Writing sectors with tags is not supported.";
+
             return false;
         }
 
diff --git a/Aaru.Images/QCOW2/Constants.cs b/Aaru.Images/QCOW2/Constants.cs
index 851fea3a5..9f83779c4 100644
--- a/Aaru.Images/QCOW2/Constants.cs
+++ b/Aaru.Images/QCOW2/Constants.cs
@@ -34,9 +34,7 @@ namespace Aaru.DiscImages
 {
     public partial class Qcow2
     {
-        /// <summary>
-        ///     Magic number: 'Q', 'F', 'I', 0xFB
-        /// </summary>
+        /// <summary>Magic number: 'Q', 'F', 'I', 0xFB</summary>
         const uint QCOW_MAGIC = 0x514649FB;
         const uint QCOW_VERSION2        = 2;
         const uint QCOW_VERSION3        = 3;
diff --git a/Aaru.Images/QCOW2/Identify.cs b/Aaru.Images/QCOW2/Identify.cs
index a87d801b0..f3d7d7aef 100644
--- a/Aaru.Images/QCOW2/Identify.cs
+++ b/Aaru.Images/QCOW2/Identify.cs
@@ -44,14 +44,15 @@ namespace Aaru.DiscImages
             Stream stream = imageFilter.GetDataForkStream();
             stream.Seek(0, SeekOrigin.Begin);
 
-            if(stream.Length < 512) return false;
+            if(stream.Length < 512)
+                return false;
 
             byte[] qHdrB = new byte[Marshal.SizeOf<QCow2Header>()];
             stream.Read(qHdrB, 0, Marshal.SizeOf<QCow2Header>());
             qHdr = Marshal.SpanToStructureBigEndian<QCow2Header>(qHdrB);
 
             AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.magic = 0x{0:X8}", qHdr.magic);
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.version = {0}",    qHdr.version);
+            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.version = {0}", qHdr.version);
 
             return qHdr.magic == QCOW_MAGIC && (qHdr.version == QCOW_VERSION2 || qHdr.version == QCOW_VERSION3);
         }
diff --git a/Aaru.Images/QCOW2/Properties.cs b/Aaru.Images/QCOW2/Properties.cs
index c0229f3b9..6330d1d62 100644
--- a/Aaru.Images/QCOW2/Properties.cs
+++ b/Aaru.Images/QCOW2/Properties.cs
@@ -43,25 +43,30 @@ namespace Aaru.DiscImages
     {
         public ImageInfo Info => imageInfo;
 
-        public string                     Name                => "QEMU Copy-On-Write disk image v2";
-        public Guid                       Id                  => new Guid("F20107CB-95B3-4398-894B-975261F1E8C5");
-        public string                     Author              => "Natalia Portillo";
-        public string                     Format              => "QEMU Copy-On-Write";
-        public List<DumpHardwareType>     DumpHardware        => null;
-        public CICMMetadataType           CicmMetadata        => null;
-        public IEnumerable<MediaTagType>  SupportedMediaTags  => new MediaTagType[] { };
-        public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[] { };
-        public IEnumerable<MediaType> SupportedMediaTypes =>
-            new[]
-            {
-                MediaType.Unknown, MediaType.GENERIC_HDD, MediaType.FlashDrive, MediaType.CompactFlash,
-                MediaType.CompactFlashType2, MediaType.PCCardTypeI, MediaType.PCCardTypeII, MediaType.PCCardTypeIII,
-                MediaType.PCCardTypeIV
-            };
+        public string                 Name         => "QEMU Copy-On-Write disk image v2";
+        public Guid                   Id           => new Guid("F20107CB-95B3-4398-894B-975261F1E8C5");
+        public string                 Author       => "Natalia Portillo";
+        public string                 Format       => "QEMU Copy-On-Write";
+        public List<DumpHardwareType> DumpHardware => null;
+        public CICMMetadataType       CicmMetadata => null;
+        public IEnumerable<MediaTagType> SupportedMediaTags => new MediaTagType[]
+            {};
+        public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[]
+            {};
+        public IEnumerable<MediaType> SupportedMediaTypes => new[]
+        {
+            MediaType.Unknown, MediaType.GENERIC_HDD, MediaType.FlashDrive, MediaType.CompactFlash,
+            MediaType.CompactFlashType2, MediaType.PCCardTypeI, MediaType.PCCardTypeII, MediaType.PCCardTypeIII,
+            MediaType.PCCardTypeIV
+        };
         public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
-            new (string name, Type type, string description, object @default)[] { };
-        public IEnumerable<string> KnownExtensions => new[] {".qcow2", ".qc2", ".qcow3", ".qc3"};
-        public bool                IsWriting       { get; private set; }
-        public string              ErrorMessage    { get; private set; }
+            new (string name, Type type, string description, object @default)[]
+                {};
+        public IEnumerable<string> KnownExtensions => new[]
+        {
+            ".qcow2", ".qc2", ".qcow3", ".qc3"
+        };
+        public bool   IsWriting    { get; private set; }
+        public string ErrorMessage { get; private set; }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/QCOW2/QCOW2.cs b/Aaru.Images/QCOW2/QCOW2.cs
index 931163924..87d9373b2 100644
--- a/Aaru.Images/QCOW2/QCOW2.cs
+++ b/Aaru.Images/QCOW2/QCOW2.cs
@@ -60,31 +60,18 @@ namespace Aaru.DiscImages
         ulong                      sectorMask;
         FileStream                 writingStream;
 
-        public Qcow2()
+        public Qcow2() => imageInfo = new ImageInfo
         {
-            imageInfo = new ImageInfo
-            {
-                ReadableSectorTags    = new List<SectorTagType>(),
-                ReadableMediaTags     = new List<MediaTagType>(),
-                HasPartitions         = false,
-                HasSessions           = false,
-                Version               = null,
-                Application           = "QEMU",
-                ApplicationVersion    = null,
-                Creator               = null,
-                Comments              = null,
-                MediaManufacturer     = null,
-                MediaModel            = null,
-                MediaSerialNumber     = null,
-                MediaBarcode          = null,
-                MediaPartNumber       = null,
-                MediaSequence         = 0,
-                LastMediaSequence     = 0,
-                DriveManufacturer     = null,
-                DriveModel            = null,
-                DriveSerialNumber     = null,
-                DriveFirmwareRevision = null
-            };
-        }
+            ReadableSectorTags = new List<SectorTagType>(), ReadableMediaTags = new List<MediaTagType>(),
+            HasPartitions      = false, HasSessions                           = false, Version = null,
+            Application        = "QEMU",
+            ApplicationVersion = null, Creator = null, Comments = null,
+            MediaManufacturer  = null,
+            MediaModel         = null, MediaSerialNumber = null, MediaBarcode = null,
+            MediaPartNumber    = null,
+            MediaSequence      = 0, LastMediaSequence = 0, DriveManufacturer = null,
+            DriveModel         = null,
+            DriveSerialNumber  = null, DriveFirmwareRevision = null
+        };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/QCOW2/Read.cs b/Aaru.Images/QCOW2/Read.cs
index 558b45922..c2746606d 100644
--- a/Aaru.Images/QCOW2/Read.cs
+++ b/Aaru.Images/QCOW2/Read.cs
@@ -52,43 +52,48 @@ namespace Aaru.DiscImages
             Stream stream = imageFilter.GetDataForkStream();
             stream.Seek(0, SeekOrigin.Begin);
 
-            if(stream.Length < 512) return false;
+            if(stream.Length < 512)
+                return false;
 
             byte[] qHdrB = new byte[Marshal.SizeOf<QCow2Header>()];
             stream.Read(qHdrB, 0, Marshal.SizeOf<QCow2Header>());
             qHdr = Marshal.SpanToStructureBigEndian<QCow2Header>(qHdrB);
 
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.magic = 0x{0:X8}",            qHdr.magic);
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.version = {0}",               qHdr.version);
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.backing_file_offset = {0}",   qHdr.backing_file_offset);
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.backing_file_size = {0}",     qHdr.backing_file_size);
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.cluster_bits = {0}",          qHdr.cluster_bits);
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.size = {0}",                  qHdr.size);
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.crypt_method = {0}",          qHdr.crypt_method);
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.l1_size = {0}",               qHdr.l1_size);
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.l1_table_offset = {0}",       qHdr.l1_table_offset);
+            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.magic = 0x{0:X8}", qHdr.magic);
+            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.version = {0}", qHdr.version);
+            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.backing_file_offset = {0}", qHdr.backing_file_offset);
+            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.backing_file_size = {0}", qHdr.backing_file_size);
+            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.cluster_bits = {0}", qHdr.cluster_bits);
+            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.size = {0}", qHdr.size);
+            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.crypt_method = {0}", qHdr.crypt_method);
+            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.l1_size = {0}", qHdr.l1_size);
+            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.l1_table_offset = {0}", qHdr.l1_table_offset);
             AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.refcount_table_offset = {0}", qHdr.refcount_table_offset);
+
             AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.refcount_table_clusters = {0}",
-                                      qHdr.refcount_table_clusters);
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.nb_snapshots = {0}",     qHdr.nb_snapshots);
+                                       qHdr.refcount_table_clusters);
+
+            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.nb_snapshots = {0}", qHdr.nb_snapshots);
             AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.snapshots_offset = {0}", qHdr.snapshots_offset);
 
             if(qHdr.version >= QCOW_VERSION3)
             {
-                AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.features = {0:X}",           qHdr.features);
-                AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.compat_features = {0:X}",    qHdr.compat_features);
+                AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.features = {0:X}", qHdr.features);
+                AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.compat_features = {0:X}", qHdr.compat_features);
                 AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.autoclear_features = {0:X}", qHdr.autoclear_features);
-                AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.refcount_order = {0}",       qHdr.refcount_order);
-                AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.header_length = {0}",        qHdr.header_length);
+                AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.refcount_order = {0}", qHdr.refcount_order);
+                AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.header_length = {0}", qHdr.header_length);
 
                 if((qHdr.features & QCOW_FEATURE_MASK) != 0)
                     throw new
                         ImageNotSupportedException($"Unknown incompatible features {qHdr.features & QCOW_FEATURE_MASK:X} enabled, not proceeding.");
             }
 
-            if(qHdr.size <= 1) throw new ArgumentOutOfRangeException(nameof(qHdr.size), "Image size is too small");
+            if(qHdr.size <= 1)
+                throw new ArgumentOutOfRangeException(nameof(qHdr.size), "Image size is too small");
 
-            if(qHdr.cluster_bits < 9 || qHdr.cluster_bits > 16)
+            if(qHdr.cluster_bits < 9 ||
+               qHdr.cluster_bits > 16)
                 throw new ArgumentOutOfRangeException(nameof(qHdr.cluster_bits),
                                                       "Cluster size must be between 512 bytes and 64 Kbytes");
 
@@ -106,18 +111,20 @@ namespace Aaru.DiscImages
             l2Bits         = (int)(qHdr.cluster_bits      - 3);
             l2Size         = 1 << l2Bits;
 
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.clusterSize = {0}",    clusterSize);
+            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.clusterSize = {0}", clusterSize);
             AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.clusterSectors = {0}", clusterSectors);
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.qHdr.l1_size = {0}",   qHdr.l1_size);
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.l2Size = {0}",         l2Size);
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.sectors = {0}",        imageInfo.Sectors);
+            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.qHdr.l1_size = {0}", qHdr.l1_size);
+            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.l2Size = {0}", l2Size);
+            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.sectors = {0}", imageInfo.Sectors);
 
             byte[] l1TableB = new byte[qHdr.l1_size * 8];
             stream.Seek((long)qHdr.l1_table_offset, SeekOrigin.Begin);
             stream.Read(l1TableB, 0, (int)qHdr.l1_size * 8);
             l1Table = MemoryMarshal.Cast<byte, ulong>(l1TableB).ToArray();
             AaruConsole.DebugWriteLine("QCOW plugin", "Reading L1 table");
-            for(long i = 0; i < l1Table.LongLength; i++) l1Table[i] = Swapping.Swap(l1Table[i]);
+
+            for(long i = 0; i < l1Table.LongLength; i++)
+                l1Table[i] = Swapping.Swap(l1Table[i]);
 
             l1Mask = 0;
             int c = 0;
@@ -127,23 +134,28 @@ namespace Aaru.DiscImages
             {
                 l1Mask <<= 1;
 
-                if(c >= 64 - l1Shift) continue;
+                if(c >= 64 - l1Shift)
+                    continue;
 
                 l1Mask += 1;
                 c++;
             }
 
             l2Mask = 0;
-            for(int i = 0; i < l2Bits; i++) l2Mask = (l2Mask << 1) + 1;
+
+            for(int i = 0; i < l2Bits; i++)
+                l2Mask = (l2Mask << 1) + 1;
 
             l2Mask <<= (int)qHdr.cluster_bits;
 
             sectorMask = 0;
-            for(int i = 0; i < qHdr.cluster_bits; i++) sectorMask = (sectorMask << 1) + 1;
 
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.l1Mask = {0:X}",     l1Mask);
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.l1Shift = {0}",      l1Shift);
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.l2Mask = {0:X}",     l2Mask);
+            for(int i = 0; i < qHdr.cluster_bits; i++)
+                sectorMask = (sectorMask << 1) + 1;
+
+            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.l1Mask = {0:X}", l1Mask);
+            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.l1Shift = {0}", l1Shift);
+            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.l2Mask = {0:X}", l2Mask);
             AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.sectorMask = {0:X}", sectorMask);
 
             maxL2TableCache = MAX_CACHE_SIZE / (l2Size * 8);
@@ -179,7 +191,8 @@ namespace Aaru.DiscImages
                                                       $"Sector address {sectorAddress} not found");
 
             // Check cache
-            if(sectorCache.TryGetValue(sectorAddress, out byte[] sector)) return sector;
+            if(sectorCache.TryGetValue(sectorAddress, out byte[] sector))
+                return sector;
 
             ulong byteAddress = sectorAddress * 512;
 
@@ -190,7 +203,8 @@ namespace Aaru.DiscImages
                                                       $"Trying to read past L1 table, position {l1Off} of a max {l1Table.LongLength}");
 
             // TODO: Implement differential images
-            if(l1Table[l1Off] == 0) return new byte[512];
+            if(l1Table[l1Off] == 0)
+                return new byte[512];
 
             if(!l2TableCache.TryGetValue(l1Off, out ulong[] l2Table))
             {
@@ -199,9 +213,12 @@ namespace Aaru.DiscImages
                 imageStream.Read(l2TableB, 0, l2Size * 8);
                 AaruConsole.DebugWriteLine("QCOW plugin", "Reading L2 table #{0}", l1Off);
                 l2Table = MemoryMarshal.Cast<byte, ulong>(l2TableB).ToArray();
-                for(long i = 0; i < l2Table.LongLength; i++) l2Table[i] = Swapping.Swap(l2Table[i]);
 
-                if(l2TableCache.Count >= maxL2TableCache) l2TableCache.Clear();
+                for(long i = 0; i < l2Table.LongLength; i++)
+                    l2Table[i] = Swapping.Swap(l2Table[i]);
+
+                if(l2TableCache.Count >= maxL2TableCache)
+                    l2TableCache.Clear();
 
                 l2TableCache.Add(l1Off, l2Table);
             }
@@ -230,8 +247,7 @@ namespace Aaru.DiscImages
                         imageStream.Seek((long)realOff, SeekOrigin.Begin);
                         imageStream.Read(zCluster, 0, (int)compSize);
 
-                        DeflateStream zStream =
-                            new DeflateStream(new MemoryStream(zCluster), CompressionMode.Decompress);
+                        var zStream = new DeflateStream(new MemoryStream(zCluster), CompressionMode.Decompress);
                         cluster = new byte[clusterSize];
                         int read = zStream.Read(cluster, 0, clusterSize);
 
@@ -246,7 +262,8 @@ namespace Aaru.DiscImages
                         imageStream.Read(cluster, 0, clusterSize);
                     }
 
-                    if(clusterCache.Count >= maxClusterCache) clusterCache.Clear();
+                    if(clusterCache.Count >= maxClusterCache)
+                        clusterCache.Clear();
 
                     clusterCache.Add(offset, cluster);
                 }
@@ -254,7 +271,8 @@ namespace Aaru.DiscImages
                 Array.Copy(cluster, (int)(byteAddress & sectorMask), sector, 0, 512);
             }
 
-            if(sectorCache.Count >= MAX_CACHED_SECTORS) sectorCache.Clear();
+            if(sectorCache.Count >= MAX_CACHED_SECTORS)
+                sectorCache.Clear();
 
             sectorCache.Add(sectorAddress, sector);
 
@@ -270,7 +288,7 @@ namespace Aaru.DiscImages
             if(sectorAddress + length > imageInfo.Sectors)
                 throw new ArgumentOutOfRangeException(nameof(length), "Requested more sectors than available");
 
-            MemoryStream ms = new MemoryStream();
+            var ms = new MemoryStream();
 
             for(uint i = 0; i < length; i++)
             {
diff --git a/Aaru.Images/QCOW2/Structs.cs b/Aaru.Images/QCOW2/Structs.cs
index c26e6c4bc..7e868e5de 100644
--- a/Aaru.Images/QCOW2/Structs.cs
+++ b/Aaru.Images/QCOW2/Structs.cs
@@ -36,9 +36,7 @@ namespace Aaru.DiscImages
 {
     public partial class Qcow2
     {
-        /// <summary>
-        ///     QCOW header, big-endian
-        /// </summary>
+        /// <summary>QCOW header, big-endian</summary>
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct QCow2Header
         {
@@ -46,61 +44,37 @@ namespace Aaru.DiscImages
             ///     <see cref="Qcow2.QCOW_MAGIC" />
             /// </summary>
             public uint magic;
-            /// <summary>
-            ///     Must be 1
-            /// </summary>
+            /// <summary>Must be 1</summary>
             public uint version;
-            /// <summary>
-            ///     Offset inside file to string containing backing file
-            /// </summary>
-            public ulong backing_file_offset;
-            /// <summary>
-            ///     Size of <see cref="backing_file_offset" />
-            /// </summary>
-            public uint backing_file_size;
-            /// <summary>
-            ///     Cluster bits
-            /// </summary>
+            /// <summary>Offset inside file to string containing backing file</summary>
+            public readonly ulong backing_file_offset;
+            /// <summary>Size of <see cref="backing_file_offset" /></summary>
+            public readonly uint backing_file_size;
+            /// <summary>Cluster bits</summary>
             public uint cluster_bits;
-            /// <summary>
-            ///     Size in bytes
-            /// </summary>
+            /// <summary>Size in bytes</summary>
             public ulong size;
-            /// <summary>
-            ///     Encryption method
-            /// </summary>
-            public uint crypt_method;
-            /// <summary>
-            ///     Size of L1 table
-            /// </summary>
+            /// <summary>Encryption method</summary>
+            public readonly uint crypt_method;
+            /// <summary>Size of L1 table</summary>
             public uint l1_size;
-            /// <summary>
-            ///     Offset to L1 table
-            /// </summary>
+            /// <summary>Offset to L1 table</summary>
             public ulong l1_table_offset;
-            /// <summary>
-            ///     Offset to reference count table
-            /// </summary>
+            /// <summary>Offset to reference count table</summary>
             public ulong refcount_table_offset;
-            /// <summary>
-            ///     How many clusters does the refcount table span
-            /// </summary>
+            /// <summary>How many clusters does the refcount table span</summary>
             public uint refcount_table_clusters;
-            /// <summary>
-            ///     Number of snapshots
-            /// </summary>
-            public uint nb_snapshots;
-            /// <summary>
-            ///     Offset to QCowSnapshotHeader
-            /// </summary>
-            public ulong snapshots_offset;
+            /// <summary>Number of snapshots</summary>
+            public readonly uint nb_snapshots;
+            /// <summary>Offset to QCowSnapshotHeader</summary>
+            public readonly ulong snapshots_offset;
 
             // Added in version 3
-            public ulong features;
-            public ulong compat_features;
-            public ulong autoclear_features;
-            public uint  refcount_order;
-            public uint  header_length;
+            public readonly ulong features;
+            public readonly ulong compat_features;
+            public readonly ulong autoclear_features;
+            public readonly uint  refcount_order;
+            public          uint  header_length;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/QCOW2/Write.cs b/Aaru.Images/QCOW2/Write.cs
index f74c37a18..b6216e6e0 100644
--- a/Aaru.Images/QCOW2/Write.cs
+++ b/Aaru.Images/QCOW2/Write.cs
@@ -46,33 +46,43 @@ namespace Aaru.DiscImages
     public partial class Qcow2
     {
         public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
-                           uint   sectorSize)
+                           uint sectorSize)
         {
             if(sectorSize != 512)
             {
                 ErrorMessage = "Unsupported sector size";
+
                 return false;
             }
 
             if(!SupportedMediaTypes.Contains(mediaType))
             {
                 ErrorMessage = $"Unsupport media format {mediaType}";
+
                 return false;
             }
 
             // TODO: Correct this calculation
-            if(sectors * sectorSize / 65536 > uint.MaxValue)
+            if((sectors * sectorSize) / 65536 > uint.MaxValue)
             {
                 ErrorMessage = "Too many sectors for selected cluster size";
+
                 return false;
             }
 
-            imageInfo = new ImageInfo {MediaType = mediaType, SectorSize = sectorSize, Sectors = sectors};
+            imageInfo = new ImageInfo
+            {
+                MediaType = mediaType, SectorSize = sectorSize, Sectors = sectors
+            };
 
-            try { writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None); }
+            try
+            {
+                writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
+            }
             catch(IOException e)
             {
                 ErrorMessage = $"Could not create new image file, exception {e.Message}";
+
                 return false;
             }
 
@@ -81,11 +91,9 @@ namespace Aaru.DiscImages
 
             qHdr = new QCow2Header
             {
-                magic         = QCOW_MAGIC,
-                version       = version3 ? QCOW_VERSION3 : QCOW_VERSION2,
-                size          = sectors * sectorSize,
-                cluster_bits  = 16,
-                header_length = (uint)Marshal.SizeOf<QCow2Header>()
+                magic        = QCOW_MAGIC, version = version3 ? QCOW_VERSION3 : QCOW_VERSION2,
+                size         = sectors * sectorSize,
+                cluster_bits = 16, header_length = (uint)Marshal.SizeOf<QCow2Header>()
             };
 
             clusterSize    = 1 << (int)qHdr.cluster_bits;
@@ -101,48 +109,64 @@ namespace Aaru.DiscImages
             {
                 l1Mask <<= 1;
 
-                if(c >= 64 - l1Shift) continue;
+                if(c >= 64 - l1Shift)
+                    continue;
 
                 l1Mask += 1;
                 c++;
             }
 
             l2Mask = 0;
-            for(int i = 0; i < l2Bits; i++) l2Mask = (l2Mask << 1) + 1;
+
+            for(int i = 0; i < l2Bits; i++)
+                l2Mask = (l2Mask << 1) + 1;
 
             l2Mask <<= (int)qHdr.cluster_bits;
 
             sectorMask = 0;
-            for(int i = 0; i < qHdr.cluster_bits; i++) sectorMask = (sectorMask << 1) + 1;
+
+            for(int i = 0; i < qHdr.cluster_bits; i++)
+                sectorMask = (sectorMask << 1) + 1;
 
             qHdr.l1_size = (uint)(qHdr.size >> l1Shift);
-            if(qHdr.l1_size == 0) qHdr.l1_size = 1;
+
+            if(qHdr.l1_size == 0)
+                qHdr.l1_size = 1;
+
             l1Table = new ulong[qHdr.l1_size];
 
-            ulong clusters                         = qHdr.size    / (ulong)clusterSize;
-            ulong refCountBlocks                   = clusters * 2 / (ulong)clusterSize;
-            if(refCountBlocks == 0) refCountBlocks = 1;
+            ulong clusters       = qHdr.size      / (ulong)clusterSize;
+            ulong refCountBlocks = (clusters * 2) / (ulong)clusterSize;
+
+            if(refCountBlocks == 0)
+                refCountBlocks = 1;
 
             qHdr.refcount_table_offset   = (ulong)clusterSize;
-            qHdr.refcount_table_clusters = (uint)(refCountBlocks * 8 / (ulong)clusterSize);
-            if(qHdr.refcount_table_clusters == 0) qHdr.refcount_table_clusters = 1;
+            qHdr.refcount_table_clusters = (uint)((refCountBlocks * 8) / (ulong)clusterSize);
+
+            if(qHdr.refcount_table_clusters == 0)
+                qHdr.refcount_table_clusters = 1;
+
             refCountTable        = new ulong[refCountBlocks];
             qHdr.l1_table_offset = qHdr.refcount_table_offset + (ulong)(qHdr.refcount_table_clusters * clusterSize);
-            ulong l1TableClusters =
-                qHdr.l1_size * 8 / (ulong)clusterSize;
-            if(l1TableClusters == 0) l1TableClusters = 1;
+            ulong l1TableClusters = (qHdr.l1_size * 8) / (ulong)clusterSize;
 
-            byte[] empty = new byte[qHdr.l1_table_offset + l1TableClusters * (ulong)clusterSize];
+            if(l1TableClusters == 0)
+                l1TableClusters = 1;
+
+            byte[] empty = new byte[qHdr.l1_table_offset + (l1TableClusters * (ulong)clusterSize)];
             writingStream.Write(empty, 0, empty.Length);
 
             IsWriting    = true;
             ErrorMessage = null;
+
             return true;
         }
 
         public bool WriteMediaTag(byte[] data, MediaTagType tag)
         {
             ErrorMessage = "Writing media tags is not supported.";
+
             return false;
         }
 
@@ -151,23 +175,27 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Tried to write on a non-writable image";
+
                 return false;
             }
 
             if(data.Length != imageInfo.SectorSize)
             {
                 ErrorMessage = "Incorrect data size";
+
                 return false;
             }
 
             if(sectorAddress >= imageInfo.Sectors)
             {
                 ErrorMessage = "Tried to write past image size";
+
                 return false;
             }
 
             // Ignore empty sectors
-            if(ArrayHelpers.ArrayIsNullOrEmpty(data)) return true;
+            if(ArrayHelpers.ArrayIsNullOrEmpty(data))
+                return true;
 
             ulong byteAddress = sectorAddress * 512;
 
@@ -190,7 +218,7 @@ namespace Aaru.DiscImages
 
             ulong l2Off = (byteAddress & l2Mask) >> (int)qHdr.cluster_bits;
 
-            writingStream.Seek((long)(l1Table[l1Off] + l2Off * 8), SeekOrigin.Begin);
+            writingStream.Seek((long)(l1Table[l1Off] + (l2Off * 8)), SeekOrigin.Begin);
 
             byte[] entry = new byte[8];
             writingStream.Read(entry, 0, 8);
@@ -201,7 +229,7 @@ namespace Aaru.DiscImages
                 offset = (ulong)writingStream.Length;
                 byte[] cluster = new byte[clusterSize];
                 entry = BigEndianBitConverter.GetBytes(offset);
-                writingStream.Seek((long)(l1Table[l1Off] + l2Off * 8), SeekOrigin.Begin);
+                writingStream.Seek((long)(l1Table[l1Off] + (l2Off * 8)), SeekOrigin.Begin);
                 writingStream.Write(entry, 0, 8);
                 writingStream.Seek(0, SeekOrigin.End);
                 writingStream.Write(cluster, 0, cluster.Length);
@@ -210,9 +238,9 @@ namespace Aaru.DiscImages
             writingStream.Seek((long)(offset + (byteAddress & sectorMask)), SeekOrigin.Begin);
             writingStream.Write(data, 0, data.Length);
 
-            int   refCountBlockEntries = clusterSize * 8                  / 16;
-            ulong refCountBlockIndex   = offset      / (ulong)clusterSize % (ulong)refCountBlockEntries;
-            ulong refCountTableIndex   = offset / (ulong)clusterSize      / (ulong)refCountBlockEntries;
+            int   refCountBlockEntries = (clusterSize * 8)                  / 16;
+            ulong refCountBlockIndex   = (offset      / (ulong)clusterSize) % (ulong)refCountBlockEntries;
+            ulong refCountTableIndex   = offset / (ulong)clusterSize        / (ulong)refCountBlockEntries;
 
             ulong refBlockOffset = refCountTable[refCountTableIndex];
 
@@ -226,9 +254,14 @@ namespace Aaru.DiscImages
             }
 
             writingStream.Seek((long)(refBlockOffset + refCountBlockIndex), SeekOrigin.Begin);
-            writingStream.Write(new byte[] {0, 1}, 0, 2);
+
+            writingStream.Write(new byte[]
+            {
+                0, 1
+            }, 0, 2);
 
             ErrorMessage = "";
+
             return true;
         }
 
@@ -238,44 +271,53 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Tried to write on a non-writable image";
+
                 return false;
             }
 
             if(data.Length % imageInfo.SectorSize != 0)
             {
                 ErrorMessage = "Incorrect data size";
+
                 return false;
             }
 
             if(sectorAddress + length > imageInfo.Sectors)
             {
                 ErrorMessage = "Tried to write past image size";
+
                 return false;
             }
 
             // Ignore empty sectors
-            if(ArrayHelpers.ArrayIsNullOrEmpty(data)) return true;
+            if(ArrayHelpers.ArrayIsNullOrEmpty(data))
+                return true;
 
             for(uint i = 0; i < length; i++)
             {
                 byte[] tmp = new byte[imageInfo.SectorSize];
                 Array.Copy(data, i * imageInfo.SectorSize, tmp, 0, imageInfo.SectorSize);
-                if(!WriteSector(tmp, sectorAddress + i)) return false;
+
+                if(!WriteSector(tmp, sectorAddress + i))
+                    return false;
             }
 
             ErrorMessage = "";
+
             return true;
         }
 
         public bool WriteSectorLong(byte[] data, ulong sectorAddress)
         {
             ErrorMessage = "Writing sectors with tags is not supported.";
+
             return false;
         }
 
         public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
         {
             ErrorMessage = "Writing sectors with tags is not supported.";
+
             return false;
         }
 
@@ -284,40 +326,45 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Image is not opened for writing";
+
                 return false;
             }
 
             writingStream.Seek(0, SeekOrigin.Begin);
-            writingStream.Write(BigEndianBitConverter.GetBytes(qHdr.magic),                   0, 4);
-            writingStream.Write(BigEndianBitConverter.GetBytes(qHdr.version),                 0, 4);
-            writingStream.Write(BigEndianBitConverter.GetBytes(qHdr.backing_file_offset),     0, 8);
-            writingStream.Write(BigEndianBitConverter.GetBytes(qHdr.backing_file_size),       0, 4);
-            writingStream.Write(BigEndianBitConverter.GetBytes(qHdr.cluster_bits),            0, 4);
-            writingStream.Write(BigEndianBitConverter.GetBytes(qHdr.size),                    0, 8);
-            writingStream.Write(BigEndianBitConverter.GetBytes(qHdr.crypt_method),            0, 4);
-            writingStream.Write(BigEndianBitConverter.GetBytes(qHdr.l1_size),                 0, 4);
-            writingStream.Write(BigEndianBitConverter.GetBytes(qHdr.l1_table_offset),         0, 8);
-            writingStream.Write(BigEndianBitConverter.GetBytes(qHdr.refcount_table_offset),   0, 8);
+            writingStream.Write(BigEndianBitConverter.GetBytes(qHdr.magic), 0, 4);
+            writingStream.Write(BigEndianBitConverter.GetBytes(qHdr.version), 0, 4);
+            writingStream.Write(BigEndianBitConverter.GetBytes(qHdr.backing_file_offset), 0, 8);
+            writingStream.Write(BigEndianBitConverter.GetBytes(qHdr.backing_file_size), 0, 4);
+            writingStream.Write(BigEndianBitConverter.GetBytes(qHdr.cluster_bits), 0, 4);
+            writingStream.Write(BigEndianBitConverter.GetBytes(qHdr.size), 0, 8);
+            writingStream.Write(BigEndianBitConverter.GetBytes(qHdr.crypt_method), 0, 4);
+            writingStream.Write(BigEndianBitConverter.GetBytes(qHdr.l1_size), 0, 4);
+            writingStream.Write(BigEndianBitConverter.GetBytes(qHdr.l1_table_offset), 0, 8);
+            writingStream.Write(BigEndianBitConverter.GetBytes(qHdr.refcount_table_offset), 0, 8);
             writingStream.Write(BigEndianBitConverter.GetBytes(qHdr.refcount_table_clusters), 0, 4);
-            writingStream.Write(BigEndianBitConverter.GetBytes(qHdr.nb_snapshots),            0, 4);
-            writingStream.Write(BigEndianBitConverter.GetBytes(qHdr.snapshots_offset),        0, 8);
+            writingStream.Write(BigEndianBitConverter.GetBytes(qHdr.nb_snapshots), 0, 4);
+            writingStream.Write(BigEndianBitConverter.GetBytes(qHdr.snapshots_offset), 0, 8);
+
             if(qHdr.version == QCOW_VERSION3)
             {
-                writingStream.Write(BigEndianBitConverter.GetBytes(qHdr.features),           0, 8);
-                writingStream.Write(BigEndianBitConverter.GetBytes(qHdr.compat_features),    0, 8);
+                writingStream.Write(BigEndianBitConverter.GetBytes(qHdr.features), 0, 8);
+                writingStream.Write(BigEndianBitConverter.GetBytes(qHdr.compat_features), 0, 8);
                 writingStream.Write(BigEndianBitConverter.GetBytes(qHdr.autoclear_features), 0, 8);
-                writingStream.Write(BigEndianBitConverter.GetBytes(qHdr.refcount_order),     0, 4);
-                writingStream.Write(BigEndianBitConverter.GetBytes(qHdr.header_length),      0, 4);
+                writingStream.Write(BigEndianBitConverter.GetBytes(qHdr.refcount_order), 0, 4);
+                writingStream.Write(BigEndianBitConverter.GetBytes(qHdr.header_length), 0, 4);
             }
 
             writingStream.Seek((long)qHdr.refcount_table_offset, SeekOrigin.Begin);
+
             for(long i = 0; i < refCountTable.LongLength; i++)
                 writingStream.Write(BigEndianBitConverter.GetBytes(refCountTable[i]), 0, 8);
 
             writingStream.Seek((long)qHdr.l1_table_offset, SeekOrigin.Begin);
-            for(long i = 0; i < l1Table.LongLength; i++) l1Table[i] = Swapping.Swap(l1Table[i]);
-            byte[] l1TableB =
-                MemoryMarshal.Cast<ulong, byte>(l1Table).ToArray();
+
+            for(long i = 0; i < l1Table.LongLength; i++)
+                l1Table[i] = Swapping.Swap(l1Table[i]);
+
+            byte[] l1TableB = MemoryMarshal.Cast<ulong, byte>(l1Table).ToArray();
             writingStream.Write(l1TableB, 0, l1TableB.Length);
 
             writingStream.Flush();
@@ -325,6 +372,7 @@ namespace Aaru.DiscImages
 
             IsWriting    = false;
             ErrorMessage = "";
+
             return true;
         }
 
@@ -335,12 +383,14 @@ namespace Aaru.DiscImages
         public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
         {
             ErrorMessage = "Writing sectors with tags is not supported.";
+
             return false;
         }
 
         public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
         {
             ErrorMessage = "Writing sectors with tags is not supported.";
+
             return false;
         }
 
diff --git a/Aaru.Images/QED/Constants.cs b/Aaru.Images/QED/Constants.cs
index 7a9b792ca..38c17d804 100644
--- a/Aaru.Images/QED/Constants.cs
+++ b/Aaru.Images/QED/Constants.cs
@@ -34,27 +34,17 @@ namespace Aaru.DiscImages
 {
     public partial class Qed
     {
-        /// <summary>
-        ///     Magic number: 'Q', 'E', 'D', 0x00
-        /// </summary>
+        /// <summary>Magic number: 'Q', 'E', 'D', 0x00</summary>
         const uint QED_MAGIC = 0x00444551;
 
-        /// <summary>
-        ///     Mask of unsupported incompatible features
-        /// </summary>
+        /// <summary>Mask of unsupported incompatible features</summary>
         const ulong QED_FEATURE_MASK = 0xFFFFFFFFFFFFFFF8;
 
-        /// <summary>
-        ///     File is differential (has a backing file)
-        /// </summary>
+        /// <summary>File is differential (has a backing file)</summary>
         const ulong QED_FEATURE_BACKING_FILE = 0x01;
-        /// <summary>
-        ///     Image needs a consistency check before writing
-        /// </summary>
+        /// <summary>Image needs a consistency check before writing</summary>
         const ulong QED_FEATURE_NEEDS_CHECK = 0x02;
-        /// <summary>
-        ///     Backing file is a raw disk image
-        /// </summary>
+        /// <summary>Backing file is a raw disk image</summary>
         const ulong QED_FEATURE_RAW_BACKING = 0x04;
 
         const int  MAX_CACHE_SIZE       = 16777216;
diff --git a/Aaru.Images/QED/Helpers.cs b/Aaru.Images/QED/Helpers.cs
index 6b58cf32e..1e53110df 100644
--- a/Aaru.Images/QED/Helpers.cs
+++ b/Aaru.Images/QED/Helpers.cs
@@ -36,7 +36,9 @@ namespace Aaru.DiscImages
     {
         static bool IsPowerOfTwo(uint x)
         {
-            while((x & 1) == 0 && x > 1) x >>= 1;
+            while((x & 1) == 0 &&
+                  x       > 1)
+                x >>= 1;
 
             return x == 1;
         }
@@ -44,6 +46,7 @@ namespace Aaru.DiscImages
         static int Ctz32(uint val)
         {
             int cnt = 0;
+
             if((val & 0xFFFF) == 0)
             {
                 cnt +=  16;
@@ -74,7 +77,8 @@ namespace Aaru.DiscImages
                 val >>= 1;
             }
 
-            if((val & 0x1) == 0) cnt++;
+            if((val & 0x1) == 0)
+                cnt++;
 
             return cnt;
         }
diff --git a/Aaru.Images/QED/Identify.cs b/Aaru.Images/QED/Identify.cs
index a19b61262..1f0579dd7 100644
--- a/Aaru.Images/QED/Identify.cs
+++ b/Aaru.Images/QED/Identify.cs
@@ -43,7 +43,8 @@ namespace Aaru.DiscImages
             Stream stream = imageFilter.GetDataForkStream();
             stream.Seek(0, SeekOrigin.Begin);
 
-            if(stream.Length < 512) return false;
+            if(stream.Length < 512)
+                return false;
 
             byte[] qHdrB = new byte[68];
             stream.Read(qHdrB, 0, 68);
diff --git a/Aaru.Images/QED/Properties.cs b/Aaru.Images/QED/Properties.cs
index 46d009717..717aac593 100644
--- a/Aaru.Images/QED/Properties.cs
+++ b/Aaru.Images/QED/Properties.cs
@@ -50,20 +50,26 @@ namespace Aaru.DiscImages
         public List<DumpHardwareType> DumpHardware => null;
         public CICMMetadataType       CicmMetadata => null;
 
-        public IEnumerable<MediaTagType>  SupportedMediaTags  => new MediaTagType[] { };
-        public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[] { };
-        public IEnumerable<MediaType> SupportedMediaTypes =>
-            new[]
-            {
-                MediaType.Unknown, MediaType.GENERIC_HDD, MediaType.FlashDrive, MediaType.CompactFlash,
-                MediaType.CompactFlashType2, MediaType.PCCardTypeI, MediaType.PCCardTypeII, MediaType.PCCardTypeIII,
-                MediaType.PCCardTypeIV
-            };
+        public IEnumerable<MediaTagType> SupportedMediaTags => new MediaTagType[]
+            {};
+        public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[]
+            {};
+        public IEnumerable<MediaType> SupportedMediaTypes => new[]
+        {
+            MediaType.Unknown, MediaType.GENERIC_HDD, MediaType.FlashDrive, MediaType.CompactFlash,
+            MediaType.CompactFlashType2, MediaType.PCCardTypeI, MediaType.PCCardTypeII, MediaType.PCCardTypeIII,
+            MediaType.PCCardTypeIV
+        };
+
         // TODO: Add cluster size option
         public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
-            new (string name, Type type, string description, object @default)[] { };
-        public IEnumerable<string> KnownExtensions => new[] {".qed"};
-        public bool                IsWriting       { get; private set; }
-        public string              ErrorMessage    { get; private set; }
+            new (string name, Type type, string description, object @default)[]
+                {};
+        public IEnumerable<string> KnownExtensions => new[]
+        {
+            ".qed"
+        };
+        public bool   IsWriting    { get; private set; }
+        public string ErrorMessage { get; private set; }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/QED/QED.cs b/Aaru.Images/QED/QED.cs
index 5dd4b50c4..e70028c7f 100644
--- a/Aaru.Images/QED/QED.cs
+++ b/Aaru.Images/QED/QED.cs
@@ -58,31 +58,18 @@ namespace Aaru.DiscImages
         uint                       tableSize;
         FileStream                 writingStream;
 
-        public Qed()
+        public Qed() => imageInfo = new ImageInfo
         {
-            imageInfo = new ImageInfo
-            {
-                ReadableSectorTags    = new List<SectorTagType>(),
-                ReadableMediaTags     = new List<MediaTagType>(),
-                HasPartitions         = false,
-                HasSessions           = false,
-                Version               = "1",
-                Application           = "QEMU",
-                ApplicationVersion    = null,
-                Creator               = null,
-                Comments              = null,
-                MediaManufacturer     = null,
-                MediaModel            = null,
-                MediaSerialNumber     = null,
-                MediaBarcode          = null,
-                MediaPartNumber       = null,
-                MediaSequence         = 0,
-                LastMediaSequence     = 0,
-                DriveManufacturer     = null,
-                DriveModel            = null,
-                DriveSerialNumber     = null,
-                DriveFirmwareRevision = null
-            };
-        }
+            ReadableSectorTags = new List<SectorTagType>(), ReadableMediaTags = new List<MediaTagType>(),
+            HasPartitions      = false, HasSessions                           = false, Version = "1",
+            Application        = "QEMU",
+            ApplicationVersion = null, Creator = null, Comments = null,
+            MediaManufacturer  = null,
+            MediaModel         = null, MediaSerialNumber = null, MediaBarcode = null,
+            MediaPartNumber    = null,
+            MediaSequence      = 0, LastMediaSequence = 0, DriveManufacturer = null,
+            DriveModel         = null,
+            DriveSerialNumber  = null, DriveFirmwareRevision = null
+        };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/QED/Read.cs b/Aaru.Images/QED/Read.cs
index 94cf5dc1f..e8ff3c500 100644
--- a/Aaru.Images/QED/Read.cs
+++ b/Aaru.Images/QED/Read.cs
@@ -49,23 +49,24 @@ namespace Aaru.DiscImages
             Stream stream = imageFilter.GetDataForkStream();
             stream.Seek(0, SeekOrigin.Begin);
 
-            if(stream.Length < 512) return false;
+            if(stream.Length < 512)
+                return false;
 
             byte[] qHdrB = new byte[68];
             stream.Read(qHdrB, 0, 68);
             qHdr = Marshal.SpanToStructureLittleEndian<QedHeader>(qHdrB);
 
-            AaruConsole.DebugWriteLine("QED plugin", "qHdr.magic = 0x{0:X8}",          qHdr.magic);
-            AaruConsole.DebugWriteLine("QED plugin", "qHdr.cluster_size = {0}",        qHdr.cluster_size);
-            AaruConsole.DebugWriteLine("QED plugin", "qHdr.table_size = {0}",          qHdr.table_size);
-            AaruConsole.DebugWriteLine("QED plugin", "qHdr.header_size = {0}",         qHdr.header_size);
-            AaruConsole.DebugWriteLine("QED plugin", "qHdr.features = {0}",            qHdr.features);
-            AaruConsole.DebugWriteLine("QED plugin", "qHdr.compat_features = {0}",     qHdr.compat_features);
-            AaruConsole.DebugWriteLine("QED plugin", "qHdr.autoclear_features = {0}",  qHdr.autoclear_features);
-            AaruConsole.DebugWriteLine("QED plugin", "qHdr.l1_table_offset = {0}",     qHdr.l1_table_offset);
-            AaruConsole.DebugWriteLine("QED plugin", "qHdr.image_size = {0}",          qHdr.image_size);
+            AaruConsole.DebugWriteLine("QED plugin", "qHdr.magic = 0x{0:X8}", qHdr.magic);
+            AaruConsole.DebugWriteLine("QED plugin", "qHdr.cluster_size = {0}", qHdr.cluster_size);
+            AaruConsole.DebugWriteLine("QED plugin", "qHdr.table_size = {0}", qHdr.table_size);
+            AaruConsole.DebugWriteLine("QED plugin", "qHdr.header_size = {0}", qHdr.header_size);
+            AaruConsole.DebugWriteLine("QED plugin", "qHdr.features = {0}", qHdr.features);
+            AaruConsole.DebugWriteLine("QED plugin", "qHdr.compat_features = {0}", qHdr.compat_features);
+            AaruConsole.DebugWriteLine("QED plugin", "qHdr.autoclear_features = {0}", qHdr.autoclear_features);
+            AaruConsole.DebugWriteLine("QED plugin", "qHdr.l1_table_offset = {0}", qHdr.l1_table_offset);
+            AaruConsole.DebugWriteLine("QED plugin", "qHdr.image_size = {0}", qHdr.image_size);
             AaruConsole.DebugWriteLine("QED plugin", "qHdr.backing_file_offset = {0}", qHdr.backing_file_offset);
-            AaruConsole.DebugWriteLine("QED plugin", "qHdr.backing_file_size = {0}",   qHdr.backing_file_size);
+            AaruConsole.DebugWriteLine("QED plugin", "qHdr.backing_file_size = {0}", qHdr.backing_file_size);
 
             if(qHdr.image_size <= 1)
                 throw new ArgumentOutOfRangeException(nameof(qHdr.image_size), "Image size is too small");
@@ -73,14 +74,16 @@ namespace Aaru.DiscImages
             if(!IsPowerOfTwo(qHdr.cluster_size))
                 throw new ArgumentOutOfRangeException(nameof(qHdr.cluster_size), "Cluster size must be a power of 2");
 
-            if(qHdr.cluster_size < 4096 || qHdr.cluster_size > 67108864)
+            if(qHdr.cluster_size < 4096 ||
+               qHdr.cluster_size > 67108864)
                 throw new ArgumentOutOfRangeException(nameof(qHdr.cluster_size),
                                                       "Cluster size must be between 4 Kbytes and 64 Mbytes");
 
             if(!IsPowerOfTwo(qHdr.table_size))
                 throw new ArgumentOutOfRangeException(nameof(qHdr.table_size), "Table size must be a power of 2");
 
-            if(qHdr.table_size < 1 || qHdr.table_size > 16)
+            if(qHdr.table_size < 1 ||
+               qHdr.table_size > 16)
                 throw new ArgumentOutOfRangeException(nameof(qHdr.table_size),
                                                       "Table size must be between 1 and 16 clusters");
 
@@ -91,11 +94,11 @@ namespace Aaru.DiscImages
             if((qHdr.features & QED_FEATURE_BACKING_FILE) == QED_FEATURE_BACKING_FILE)
                 throw new NotImplementedException("Differencing images not yet supported");
 
-            clusterSectors = qHdr.cluster_size                   / 512;
-            tableSize      = qHdr.cluster_size * qHdr.table_size / 8;
+            clusterSectors = qHdr.cluster_size                     / 512;
+            tableSize      = (qHdr.cluster_size * qHdr.table_size) / 8;
 
             AaruConsole.DebugWriteLine("QED plugin", "qHdr.clusterSectors = {0}", clusterSectors);
-            AaruConsole.DebugWriteLine("QED plugin", "qHdr.tableSize = {0}",      tableSize);
+            AaruConsole.DebugWriteLine("QED plugin", "qHdr.tableSize = {0}", tableSize);
 
             byte[] l1TableB = new byte[tableSize * 8];
             stream.Seek((long)qHdr.l1_table_offset, SeekOrigin.Begin);
@@ -113,19 +116,22 @@ namespace Aaru.DiscImages
             {
                 l1Mask <<= 1;
 
-                if(c >= 64 - l1Shift) continue;
+                if(c >= 64 - l1Shift)
+                    continue;
 
                 l1Mask += 1;
                 c++;
             }
 
             sectorMask = 0;
-            for(int i = 0; i < clusterBits; i++) sectorMask = (sectorMask << 1) + 1;
 
-            AaruConsole.DebugWriteLine("QED plugin", "qHdr.clusterBits = {0}",  clusterBits);
-            AaruConsole.DebugWriteLine("QED plugin", "qHdr.l1Mask = {0:X}",     l1Mask);
-            AaruConsole.DebugWriteLine("QED plugin", "qHdr.l1Shift = {0}",      l1Shift);
-            AaruConsole.DebugWriteLine("QED plugin", "qHdr.l2Mask = {0:X}",     l2Mask);
+            for(int i = 0; i < clusterBits; i++)
+                sectorMask = (sectorMask << 1) + 1;
+
+            AaruConsole.DebugWriteLine("QED plugin", "qHdr.clusterBits = {0}", clusterBits);
+            AaruConsole.DebugWriteLine("QED plugin", "qHdr.l1Mask = {0:X}", l1Mask);
+            AaruConsole.DebugWriteLine("QED plugin", "qHdr.l1Shift = {0}", l1Shift);
+            AaruConsole.DebugWriteLine("QED plugin", "qHdr.l2Mask = {0:X}", l2Mask);
             AaruConsole.DebugWriteLine("QED plugin", "qHdr.sectorMask = {0:X}", sectorMask);
 
             maxL2TableCache = MAX_CACHE_SIZE / tableSize;
@@ -160,7 +166,8 @@ namespace Aaru.DiscImages
                                                       $"Sector address {sectorAddress} not found");
 
             // Check cache
-            if(sectorCache.TryGetValue(sectorAddress, out byte[] sector)) return sector;
+            if(sectorCache.TryGetValue(sectorAddress, out byte[] sector))
+                return sector;
 
             ulong byteAddress = sectorAddress * 512;
 
@@ -171,7 +178,8 @@ namespace Aaru.DiscImages
                                                       $"Trying to read past L1 table, position {l1Off} of a max {l1Table.LongLength}");
 
             // TODO: Implement differential images
-            if(l1Table[l1Off] == 0) return new byte[512];
+            if(l1Table[l1Off] == 0)
+                return new byte[512];
 
             if(!l2TableCache.TryGetValue(l1Off, out ulong[] l2Table))
             {
@@ -181,7 +189,8 @@ namespace Aaru.DiscImages
                 AaruConsole.DebugWriteLine("QED plugin", "Reading L2 table #{0}", l1Off);
                 l2Table = MemoryMarshal.Cast<byte, ulong>(l2TableB).ToArray();
 
-                if(l2TableCache.Count >= maxL2TableCache) l2TableCache.Clear();
+                if(l2TableCache.Count >= maxL2TableCache)
+                    l2TableCache.Clear();
 
                 l2TableCache.Add(l1Off, l2Table);
             }
@@ -192,7 +201,8 @@ namespace Aaru.DiscImages
 
             sector = new byte[512];
 
-            if(offset != 0 && offset != 1)
+            if(offset != 0 &&
+               offset != 1)
             {
                 if(!clusterCache.TryGetValue(offset, out byte[] cluster))
                 {
@@ -200,7 +210,8 @@ namespace Aaru.DiscImages
                     imageStream.Seek((long)offset, SeekOrigin.Begin);
                     imageStream.Read(cluster, 0, (int)qHdr.cluster_size);
 
-                    if(clusterCache.Count >= maxClusterCache) clusterCache.Clear();
+                    if(clusterCache.Count >= maxClusterCache)
+                        clusterCache.Clear();
 
                     clusterCache.Add(offset, cluster);
                 }
@@ -208,7 +219,8 @@ namespace Aaru.DiscImages
                 Array.Copy(cluster, (int)(byteAddress & sectorMask), sector, 0, 512);
             }
 
-            if(sectorCache.Count >= MAX_CACHED_SECTORS) sectorCache.Clear();
+            if(sectorCache.Count >= MAX_CACHED_SECTORS)
+                sectorCache.Clear();
 
             sectorCache.Add(sectorAddress, sector);
 
@@ -224,7 +236,7 @@ namespace Aaru.DiscImages
             if(sectorAddress + length > imageInfo.Sectors)
                 throw new ArgumentOutOfRangeException(nameof(length), "Requested more sectors than available");
 
-            MemoryStream ms = new MemoryStream();
+            var ms = new MemoryStream();
 
             for(uint i = 0; i < length; i++)
             {
diff --git a/Aaru.Images/QED/Structs.cs b/Aaru.Images/QED/Structs.cs
index e49d5b9c8..b71269a00 100644
--- a/Aaru.Images/QED/Structs.cs
+++ b/Aaru.Images/QED/Structs.cs
@@ -36,9 +36,7 @@ namespace Aaru.DiscImages
 {
     public partial class Qed
     {
-        /// <summary>
-        ///     QED header, big-endian
-        /// </summary>
+        /// <summary>QED header, big-endian</summary>
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct QedHeader
         {
@@ -46,46 +44,26 @@ namespace Aaru.DiscImages
             ///     <see cref="Qed.QED_MAGIC" />
             /// </summary>
             public uint magic;
-            /// <summary>
-            ///     Cluster size in bytes
-            /// </summary>
+            /// <summary>Cluster size in bytes</summary>
             public uint cluster_size;
-            /// <summary>
-            ///     L1 and L2 table size in cluster
-            /// </summary>
+            /// <summary>L1 and L2 table size in cluster</summary>
             public uint table_size;
-            /// <summary>
-            ///     Header size in clusters
-            /// </summary>
+            /// <summary>Header size in clusters</summary>
             public uint header_size;
-            /// <summary>
-            ///     Incompatible features
-            /// </summary>
-            public ulong features;
-            /// <summary>
-            ///     Compatible features
-            /// </summary>
-            public ulong compat_features;
-            /// <summary>
-            ///     Self-resetting features
-            /// </summary>
-            public ulong autoclear_features;
-            /// <summary>
-            ///     Offset to L1 table
-            /// </summary>
+            /// <summary>Incompatible features</summary>
+            public readonly ulong features;
+            /// <summary>Compatible features</summary>
+            public readonly ulong compat_features;
+            /// <summary>Self-resetting features</summary>
+            public readonly ulong autoclear_features;
+            /// <summary>Offset to L1 table</summary>
             public ulong l1_table_offset;
-            /// <summary>
-            ///     Image size
-            /// </summary>
+            /// <summary>Image size</summary>
             public ulong image_size;
-            /// <summary>
-            ///     Offset inside file to string containing backing file
-            /// </summary>
-            public ulong backing_file_offset;
-            /// <summary>
-            ///     Size of <see cref="backing_file_offset" />
-            /// </summary>
-            public uint backing_file_size;
+            /// <summary>Offset inside file to string containing backing file</summary>
+            public readonly ulong backing_file_offset;
+            /// <summary>Size of <see cref="backing_file_offset" /></summary>
+            public readonly uint backing_file_size;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/QED/Write.cs b/Aaru.Images/QED/Write.cs
index 0ceef3374..422bc37f0 100644
--- a/Aaru.Images/QED/Write.cs
+++ b/Aaru.Images/QED/Write.cs
@@ -46,48 +46,54 @@ namespace Aaru.DiscImages
     public partial class Qed
     {
         public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
-                           uint   sectorSize)
+                           uint sectorSize)
         {
             if(sectorSize != 512)
             {
                 ErrorMessage = "Unsupported sector size";
+
                 return false;
             }
 
             if(!SupportedMediaTypes.Contains(mediaType))
             {
                 ErrorMessage = $"Unsupport media format {mediaType}";
+
                 return false;
             }
 
             // TODO: Correct this calculation
-            if(sectors * sectorSize / DEFAULT_CLUSTER_SIZE > uint.MaxValue)
+            if((sectors * sectorSize) / DEFAULT_CLUSTER_SIZE > uint.MaxValue)
             {
                 ErrorMessage = "Too many sectors for selected cluster size";
+
                 return false;
             }
 
-            imageInfo = new ImageInfo {MediaType = mediaType, SectorSize = sectorSize, Sectors = sectors};
+            imageInfo = new ImageInfo
+            {
+                MediaType = mediaType, SectorSize = sectorSize, Sectors = sectors
+            };
 
-            try { writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None); }
+            try
+            {
+                writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
+            }
             catch(IOException e)
             {
                 ErrorMessage = $"Could not create new image file, exception {e.Message}";
+
                 return false;
             }
 
             qHdr = new QedHeader
             {
-                magic           = QED_MAGIC,
-                cluster_size    = DEFAULT_CLUSTER_SIZE,
-                table_size      = DEFAULT_TABLE_SIZE,
-                header_size     = 1,
-                l1_table_offset = DEFAULT_CLUSTER_SIZE,
-                image_size      = sectors * sectorSize
+                magic       = QED_MAGIC, cluster_size = DEFAULT_CLUSTER_SIZE, table_size = DEFAULT_TABLE_SIZE,
+                header_size = 1, l1_table_offset      = DEFAULT_CLUSTER_SIZE, image_size = sectors * sectorSize
             };
 
-            clusterSectors = qHdr.cluster_size                   / 512;
-            tableSize      = qHdr.cluster_size * qHdr.table_size / 8;
+            clusterSectors = qHdr.cluster_size                     / 512;
+            tableSize      = (qHdr.cluster_size * qHdr.table_size) / 8;
 
             l1Table = new ulong[tableSize];
             l1Mask  = 0;
@@ -100,26 +106,31 @@ namespace Aaru.DiscImages
             {
                 l1Mask <<= 1;
 
-                if(c >= 64 - l1Shift) continue;
+                if(c >= 64 - l1Shift)
+                    continue;
 
                 l1Mask += 1;
                 c++;
             }
 
             sectorMask = 0;
-            for(int i = 0; i < clusterBits; i++) sectorMask = (sectorMask << 1) + 1;
 
-            byte[] empty = new byte[qHdr.l1_table_offset + tableSize * 8];
+            for(int i = 0; i < clusterBits; i++)
+                sectorMask = (sectorMask << 1) + 1;
+
+            byte[] empty = new byte[qHdr.l1_table_offset + (tableSize * 8)];
             writingStream.Write(empty, 0, empty.Length);
 
             IsWriting    = true;
             ErrorMessage = null;
+
             return true;
         }
 
         public bool WriteMediaTag(byte[] data, MediaTagType tag)
         {
             ErrorMessage = "Writing media tags is not supported.";
+
             return false;
         }
 
@@ -128,23 +139,27 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Tried to write on a non-writable image";
+
                 return false;
             }
 
             if(data.Length != imageInfo.SectorSize)
             {
                 ErrorMessage = "Incorrect data size";
+
                 return false;
             }
 
             if(sectorAddress >= imageInfo.Sectors)
             {
                 ErrorMessage = "Tried to write past image size";
+
                 return false;
             }
 
             // Ignore empty sectors
-            if(ArrayHelpers.ArrayIsNullOrEmpty(data)) return true;
+            if(ArrayHelpers.ArrayIsNullOrEmpty(data))
+                return true;
 
             ulong byteAddress = sectorAddress * 512;
 
@@ -167,7 +182,7 @@ namespace Aaru.DiscImages
 
             ulong l2Off = (byteAddress & l2Mask) >> clusterBits;
 
-            writingStream.Seek((long)(l1Table[l1Off] + l2Off * 8), SeekOrigin.Begin);
+            writingStream.Seek((long)(l1Table[l1Off] + (l2Off * 8)), SeekOrigin.Begin);
 
             byte[] entry = new byte[8];
             writingStream.Read(entry, 0, 8);
@@ -178,7 +193,7 @@ namespace Aaru.DiscImages
                 offset = (ulong)writingStream.Length;
                 byte[] cluster = new byte[qHdr.cluster_size];
                 entry = BitConverter.GetBytes(offset);
-                writingStream.Seek((long)(l1Table[l1Off] + l2Off * 8), SeekOrigin.Begin);
+                writingStream.Seek((long)(l1Table[l1Off] + (l2Off * 8)), SeekOrigin.Begin);
                 writingStream.Write(entry, 0, 8);
                 writingStream.Seek(0, SeekOrigin.End);
                 writingStream.Write(cluster, 0, cluster.Length);
@@ -188,6 +203,7 @@ namespace Aaru.DiscImages
             writingStream.Write(data, 0, data.Length);
 
             ErrorMessage = "";
+
             return true;
         }
 
@@ -197,44 +213,53 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Tried to write on a non-writable image";
+
                 return false;
             }
 
             if(data.Length % imageInfo.SectorSize != 0)
             {
                 ErrorMessage = "Incorrect data size";
+
                 return false;
             }
 
             if(sectorAddress + length > imageInfo.Sectors)
             {
                 ErrorMessage = "Tried to write past image size";
+
                 return false;
             }
 
             // Ignore empty sectors
-            if(ArrayHelpers.ArrayIsNullOrEmpty(data)) return true;
+            if(ArrayHelpers.ArrayIsNullOrEmpty(data))
+                return true;
 
             for(uint i = 0; i < length; i++)
             {
                 byte[] tmp = new byte[imageInfo.SectorSize];
                 Array.Copy(data, i * imageInfo.SectorSize, tmp, 0, imageInfo.SectorSize);
-                if(!WriteSector(tmp, sectorAddress + i)) return false;
+
+                if(!WriteSector(tmp, sectorAddress + i))
+                    return false;
             }
 
             ErrorMessage = "";
+
             return true;
         }
 
         public bool WriteSectorLong(byte[] data, ulong sectorAddress)
         {
             ErrorMessage = "Writing sectors with tags is not supported.";
+
             return false;
         }
 
         public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
         {
             ErrorMessage = "Writing sectors with tags is not supported.";
+
             return false;
         }
 
@@ -243,6 +268,7 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Image is not opened for writing";
+
                 return false;
             }
 
@@ -261,6 +287,7 @@ namespace Aaru.DiscImages
 
             IsWriting    = false;
             ErrorMessage = "";
+
             return true;
         }
 
@@ -271,12 +298,14 @@ namespace Aaru.DiscImages
         public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
         {
             ErrorMessage = "Writing sectors with tags is not supported.";
+
             return false;
         }
 
         public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
         {
             ErrorMessage = "Writing sectors with tags is not supported.";
+
             return false;
         }
 
diff --git a/Aaru.Images/RayDIM/Enums.cs b/Aaru.Images/RayDIM/Enums.cs
index ab433b6e6..d8dc2f332 100644
--- a/Aaru.Images/RayDIM/Enums.cs
+++ b/Aaru.Images/RayDIM/Enums.cs
@@ -39,11 +39,8 @@ namespace Aaru.DiscImages
         [SuppressMessage("ReSharper", "InconsistentNaming")]
         enum RayDiskTypes : byte
         {
-            Md2dd = 1,
-            Md2hd = 2,
-            Mf2dd = 3,
-            Mf2hd = 4,
-            Mf2ed = 5
+            Md2dd = 1, Md2hd = 2, Mf2dd = 3,
+            Mf2hd = 4, Mf2ed = 5
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/RayDIM/Identify.cs b/Aaru.Images/RayDIM/Identify.cs
index 7eac70577..5b4235cb0 100644
--- a/Aaru.Images/RayDIM/Identify.cs
+++ b/Aaru.Images/RayDIM/Identify.cs
@@ -44,7 +44,8 @@ namespace Aaru.DiscImages
         {
             Stream stream = imageFilter.GetDataForkStream();
 
-            if(stream.Length < Marshal.SizeOf<RayHdr>()) return false;
+            if(stream.Length < Marshal.SizeOf<RayHdr>())
+                return false;
 
             byte[] buffer = new byte[Marshal.SizeOf<RayHdr>()];
             stream.Seek(0, SeekOrigin.Begin);
@@ -55,17 +56,20 @@ namespace Aaru.DiscImages
             string signature = StringHandlers.CToString(header.signature);
 
             AaruConsole.DebugWriteLine("Ray Arachelian's Disk IMage plugin", "header.signature = {0}", signature);
-            AaruConsole.DebugWriteLine("Ray Arachelian's Disk IMage plugin", "header.diskType = {0}",  header.diskType);
-            AaruConsole.DebugWriteLine("Ray Arachelian's Disk IMage plugin", "header.heads = {0}",     header.heads);
-            AaruConsole.DebugWriteLine("Ray Arachelian's Disk IMage plugin", "header.cylinders = {0}", header.cylinders);
-            AaruConsole.DebugWriteLine("Ray Arachelian's Disk IMage plugin", "header.sectorsPerTrack = {0}",
-                                      header.sectorsPerTrack);
+            AaruConsole.DebugWriteLine("Ray Arachelian's Disk IMage plugin", "header.diskType = {0}", header.diskType);
+            AaruConsole.DebugWriteLine("Ray Arachelian's Disk IMage plugin", "header.heads = {0}", header.heads);
 
-            Regex sx = new Regex(REGEX_SIGNATURE);
+            AaruConsole.DebugWriteLine("Ray Arachelian's Disk IMage plugin", "header.cylinders = {0}",
+                                       header.cylinders);
+
+            AaruConsole.DebugWriteLine("Ray Arachelian's Disk IMage plugin", "header.sectorsPerTrack = {0}",
+                                       header.sectorsPerTrack);
+
+            var   sx = new Regex(REGEX_SIGNATURE);
             Match sm = sx.Match(signature);
 
             AaruConsole.DebugWriteLine("Ray Arachelian's Disk IMage plugin", "header.signature matches? = {0}",
-                                      sm.Success);
+                                       sm.Success);
 
             return sm.Success;
         }
diff --git a/Aaru.Images/RayDIM/Properties.cs b/Aaru.Images/RayDIM/Properties.cs
index 559597cb7..95808ab70 100644
--- a/Aaru.Images/RayDIM/Properties.cs
+++ b/Aaru.Images/RayDIM/Properties.cs
@@ -41,32 +41,36 @@ namespace Aaru.DiscImages
 {
     public partial class RayDim
     {
-        public string                     Name                => "Ray Arachelian's Disk IMage";
-        public Guid                       Id                  => new Guid("F541F4E7-C1E3-4A2D-B07F-D863E87AB961");
-        public ImageInfo                  Info                => imageInfo;
-        public string                     Author              => "Natalia Portillo";
-        public string                     Format              => "Ray Arachelian's Disk IMage";
-        public List<DumpHardwareType>     DumpHardware        => null;
-        public CICMMetadataType           CicmMetadata        => null;
-        public IEnumerable<MediaTagType>  SupportedMediaTags  => new MediaTagType[] { };
-        public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[] { };
+        public string                 Name         => "Ray Arachelian's Disk IMage";
+        public Guid                   Id           => new Guid("F541F4E7-C1E3-4A2D-B07F-D863E87AB961");
+        public ImageInfo              Info         => imageInfo;
+        public string                 Author       => "Natalia Portillo";
+        public string                 Format       => "Ray Arachelian's Disk IMage";
+        public List<DumpHardwareType> DumpHardware => null;
+        public CICMMetadataType       CicmMetadata => null;
+        public IEnumerable<MediaTagType> SupportedMediaTags => new MediaTagType[]
+            {};
+        public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[]
+            {};
+
         // TODO: Test with real hardware to see real supported media
-        public IEnumerable<MediaType> SupportedMediaTypes =>
-            new[]
-            {
-                MediaType.Apricot_35, MediaType.ATARI_35_DS_DD, MediaType.ATARI_35_DS_DD_11,
-                MediaType.ATARI_35_SS_DD, MediaType.ATARI_35_SS_DD_11, MediaType.DMF, MediaType.DMF_82,
-                MediaType.DOS_35_DS_DD_8, MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_ED, MediaType.DOS_35_HD,
-                MediaType.DOS_35_SS_DD_8, MediaType.DOS_35_SS_DD_9, MediaType.DOS_525_DS_DD_8,
-                MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_HD, MediaType.DOS_525_SS_DD_8,
-                MediaType.DOS_525_SS_DD_9, MediaType.FDFORMAT_35_DD, MediaType.FDFORMAT_35_HD,
-                MediaType.FDFORMAT_525_DD, MediaType.FDFORMAT_525_HD, MediaType.RX50, MediaType.XDF_35,
-                MediaType.XDF_525
-            };
+        public IEnumerable<MediaType> SupportedMediaTypes => new[]
+        {
+            MediaType.Apricot_35, MediaType.ATARI_35_DS_DD, MediaType.ATARI_35_DS_DD_11, MediaType.ATARI_35_SS_DD,
+            MediaType.ATARI_35_SS_DD_11, MediaType.DMF, MediaType.DMF_82, MediaType.DOS_35_DS_DD_8,
+            MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_ED, MediaType.DOS_35_HD, MediaType.DOS_35_SS_DD_8,
+            MediaType.DOS_35_SS_DD_9, MediaType.DOS_525_DS_DD_8, MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_HD,
+            MediaType.DOS_525_SS_DD_8, MediaType.DOS_525_SS_DD_9, MediaType.FDFORMAT_35_DD, MediaType.FDFORMAT_35_HD,
+            MediaType.FDFORMAT_525_DD, MediaType.FDFORMAT_525_HD, MediaType.RX50, MediaType.XDF_35, MediaType.XDF_525
+        };
         public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
-            new (string name, Type type, string description, object @default)[] { };
-        public IEnumerable<string> KnownExtensions => new[] {".dim"};
-        public bool                IsWriting       { get; private set; }
-        public string              ErrorMessage    { get; private set; }
+            new (string name, Type type, string description, object @default)[]
+                {};
+        public IEnumerable<string> KnownExtensions => new[]
+        {
+            ".dim"
+        };
+        public bool   IsWriting    { get; private set; }
+        public string ErrorMessage { get; private set; }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/RayDIM/RayDIM.cs b/Aaru.Images/RayDIM/RayDIM.cs
index 265bbf440..a61c09f7b 100644
--- a/Aaru.Images/RayDIM/RayDIM.cs
+++ b/Aaru.Images/RayDIM/RayDIM.cs
@@ -44,29 +44,17 @@ namespace Aaru.DiscImages
         ImageInfo    imageInfo;
         FileStream   writingStream;
 
-        public RayDim()
+        public RayDim() => imageInfo = new ImageInfo
         {
-            imageInfo = new ImageInfo
-            {
-                ReadableSectorTags    = new List<SectorTagType>(),
-                ReadableMediaTags     = new List<MediaTagType>(),
-                HasPartitions         = false,
-                HasSessions           = false,
-                Application           = "Ray Arachelian's Disk IMage",
-                Creator               = null,
-                Comments              = null,
-                MediaManufacturer     = null,
-                MediaModel            = null,
-                MediaSerialNumber     = null,
-                MediaBarcode          = null,
-                MediaPartNumber       = null,
-                MediaSequence         = 0,
-                LastMediaSequence     = 0,
-                DriveManufacturer     = null,
-                DriveModel            = null,
-                DriveSerialNumber     = null,
-                DriveFirmwareRevision = null
-            };
-        }
+            ReadableSectorTags    = new List<SectorTagType>(), ReadableMediaTags = new List<MediaTagType>(),
+            HasPartitions         = false, HasSessions                           = false,
+            Application           = "Ray Arachelian's Disk IMage", Creator       = null,
+            Comments              = null, MediaManufacturer                      = null, MediaModel = null,
+            MediaSerialNumber     = null,
+            MediaBarcode          = null, MediaPartNumber = null, MediaSequence = 0,
+            LastMediaSequence     = 0,
+            DriveManufacturer     = null, DriveModel = null, DriveSerialNumber = null,
+            DriveFirmwareRevision = null
+        };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/RayDIM/Read.cs b/Aaru.Images/RayDIM/Read.cs
index ee9c011f7..2e1e56962 100644
--- a/Aaru.Images/RayDIM/Read.cs
+++ b/Aaru.Images/RayDIM/Read.cs
@@ -46,7 +46,8 @@ namespace Aaru.DiscImages
         {
             Stream stream = imageFilter.GetDataForkStream();
 
-            if(stream.Length < Marshal.SizeOf<RayHdr>()) return false;
+            if(stream.Length < Marshal.SizeOf<RayHdr>())
+                return false;
 
             byte[] buffer = new byte[Marshal.SizeOf<RayHdr>()];
             stream.Seek(0, SeekOrigin.Begin);
@@ -56,10 +57,11 @@ namespace Aaru.DiscImages
 
             string signature = StringHandlers.CToString(header.signature);
 
-            Regex sx = new Regex(REGEX_SIGNATURE);
+            var   sx = new Regex(REGEX_SIGNATURE);
             Match sm = sx.Match(signature);
 
-            if(!sm.Success) return false;
+            if(!sm.Success)
+                return false;
 
             imageInfo.ApplicationVersion = $"{sm.Groups["major"].Value}.{sm.Groups["minor"].Value}";
 
@@ -88,13 +90,16 @@ namespace Aaru.DiscImages
                 case MediaType.NEC_525_HD
                     when header.diskType == RayDiskTypes.Mf2hd || header.diskType == RayDiskTypes.Mf2ed:
                     imageInfo.MediaType = MediaType.NEC_35_HD_8;
+
                     break;
                 case MediaType.DOS_525_HD
                     when header.diskType == RayDiskTypes.Mf2hd || header.diskType == RayDiskTypes.Mf2ed:
                     imageInfo.MediaType = MediaType.NEC_35_HD_15;
+
                     break;
                 case MediaType.RX50 when header.diskType == RayDiskTypes.Md2dd || header.diskType == RayDiskTypes.Md2hd:
                     imageInfo.MediaType = MediaType.ATARI_35_SS_DD;
+
                     break;
             }
 
diff --git a/Aaru.Images/RayDIM/Write.cs b/Aaru.Images/RayDIM/Write.cs
index fa1687e16..e69b721cd 100644
--- a/Aaru.Images/RayDIM/Write.cs
+++ b/Aaru.Images/RayDIM/Write.cs
@@ -46,53 +46,60 @@ namespace Aaru.DiscImages
     public partial class RayDim
     {
         public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
-                           uint   sectorSize)
+                           uint sectorSize)
         {
             if(sectorSize != 512)
             {
                 ErrorMessage = "Unsupported sector size";
+
                 return false;
             }
 
             if(sectors > 255 * 255 * 255)
             {
                 ErrorMessage = "Too many sectors";
+
                 return false;
             }
 
             if(!SupportedMediaTypes.Contains(mediaType))
             {
                 ErrorMessage = $"Unsupport media format {mediaType}";
+
                 return false;
             }
 
             (ushort cylinders, byte heads, ushort sectorsPerTrack, uint bytesPerSector, MediaEncoding encoding, bool
                 variableSectorsPerTrack, MediaType type) geometry = Geometry.GetGeometry(mediaType);
+
             imageInfo = new ImageInfo
             {
-                MediaType       = mediaType,
-                SectorSize      = sectorSize,
-                Sectors         = sectors,
-                Cylinders       = geometry.cylinders,
-                Heads           = geometry.heads,
-                SectorsPerTrack = geometry.sectorsPerTrack
+                MediaType = mediaType, SectorSize = sectorSize, Sectors = sectors,
+                Cylinders = geometry.cylinders,
+                Heads     = geometry.heads, SectorsPerTrack = geometry.sectorsPerTrack
             };
 
-            try { writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None); }
+            try
+            {
+                writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
+            }
             catch(IOException e)
             {
                 ErrorMessage = $"Could not create new image file, exception {e.Message}";
+
                 return false;
             }
 
             IsWriting    = true;
             ErrorMessage = null;
+
             return true;
         }
 
         public bool WriteMediaTag(byte[] data, MediaTagType tag)
         {
             ErrorMessage = "Writing media tags is not supported.";
+
             return false;
         }
 
@@ -101,26 +108,31 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Tried to write on a non-writable image";
+
                 return false;
             }
 
             if(data.Length != 512)
             {
                 ErrorMessage = "Incorrect data size";
+
                 return false;
             }
 
             if(sectorAddress >= imageInfo.Sectors)
             {
                 ErrorMessage = "Tried to write past image size";
+
                 return false;
             }
 
-            writingStream.Seek((long)((ulong)Marshal.SizeOf<RayHdr>() + sectorAddress * imageInfo.SectorSize),
+            writingStream.Seek((long)((ulong)Marshal.SizeOf<RayHdr>() + (sectorAddress * imageInfo.SectorSize)),
                                SeekOrigin.Begin);
+
             writingStream.Write(data, 0, data.Length);
 
             ErrorMessage = "";
+
             return true;
         }
 
@@ -129,38 +141,45 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Tried to write on a non-writable image";
+
                 return false;
             }
 
             if(data.Length % 512 != 0)
             {
                 ErrorMessage = "Incorrect data size";
+
                 return false;
             }
 
             if(sectorAddress + length > imageInfo.Sectors)
             {
                 ErrorMessage = "Tried to write past image size";
+
                 return false;
             }
 
-            writingStream.Seek((long)((ulong)Marshal.SizeOf<RayHdr>() + sectorAddress * imageInfo.SectorSize),
+            writingStream.Seek((long)((ulong)Marshal.SizeOf<RayHdr>() + (sectorAddress * imageInfo.SectorSize)),
                                SeekOrigin.Begin);
+
             writingStream.Write(data, 0, data.Length);
 
             ErrorMessage = "";
+
             return true;
         }
 
         public bool WriteSectorLong(byte[] data, ulong sectorAddress)
         {
             ErrorMessage = "Writing sectors with tags is not supported.";
+
             return false;
         }
 
         public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
         {
             ErrorMessage = "Writing sectors with tags is not supported.";
+
             return false;
         }
 
@@ -169,12 +188,14 @@ namespace Aaru.DiscImages
         public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
         {
             ErrorMessage = "Unsupported feature";
+
             return false;
         }
 
         public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
         {
             ErrorMessage = "Unsupported feature";
+
             return false;
         }
 
@@ -187,19 +208,20 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Image is not opened for writing";
+
                 return false;
             }
 
             string headerSignature =
                 $"Disk IMage VER 1.0 Copyright (C) {DateTime.Now.Year:D4} Ray Arachelian, All Rights Reserved. Aaru ";
-            RayHdr header = new RayHdr
+
+            var header = new RayHdr
             {
-                signature       = Encoding.ASCII.GetBytes(headerSignature),
-                cylinders       = (byte)imageInfo.Cylinders,
-                diskType        = RayDiskTypes.Mf2ed,
-                heads           = (byte)imageInfo.Heads,
+                signature       = Encoding.ASCII.GetBytes(headerSignature), cylinders = (byte)imageInfo.Cylinders,
+                diskType        = RayDiskTypes.Mf2ed, heads                           = (byte)imageInfo.Heads,
                 sectorsPerTrack = (byte)imageInfo.SectorsPerTrack
             };
+
             header.signature[0x4A] = 0x00;
 
             byte[] hdr    = new byte[Marshal.SizeOf<RayHdr>()];
@@ -216,6 +238,7 @@ namespace Aaru.DiscImages
 
             IsWriting    = false;
             ErrorMessage = "";
+
             return true;
         }
 
diff --git a/Aaru.Images/Register.cs b/Aaru.Images/Register.cs
index 6f9d4ffca..db6fa4fe3 100644
--- a/Aaru.Images/Register.cs
+++ b/Aaru.Images/Register.cs
@@ -52,34 +52,30 @@ namespace Aaru.DiscImages
 
         public List<Type> GetAllFilterPlugins() => null;
 
-        public List<Type> GetAllFloppyImagePlugins()
-        {
-            return Assembly.GetExecutingAssembly().GetTypes()
-                           .Where(t => t.GetInterfaces().Contains(typeof(IFloppyImage))).Where(t => t.IsClass).ToList();
-        }
+        public List<Type> GetAllFloppyImagePlugins() => Assembly.
+                                                        GetExecutingAssembly().GetTypes().
+                                                        Where(t => t.GetInterfaces().Contains(typeof(IFloppyImage))).
+                                                        Where(t => t.IsClass).ToList();
 
-        public List<Type> GetAllMediaImagePlugins()
-        {
-            return Assembly.GetExecutingAssembly().GetTypes()
-                           .Where(t => t.GetInterfaces().Contains(typeof(IMediaImage))).Where(t => t.IsClass).ToList();
-        }
+        public List<Type> GetAllMediaImagePlugins() => Assembly.
+                                                       GetExecutingAssembly().GetTypes().
+                                                       Where(t => t.GetInterfaces().Contains(typeof(IMediaImage))).
+                                                       Where(t => t.IsClass).ToList();
 
         public List<Type> GetAllPartitionPlugins() => null;
 
         public List<Type> GetAllReadOnlyFilesystemPlugins() => null;
 
-        public List<Type> GetAllWritableFloppyImagePlugins()
-        {
-            return Assembly.GetExecutingAssembly().GetTypes()
-                           .Where(t => t.GetInterfaces().Contains(typeof(IWritableFloppyImage))).Where(t => t.IsClass)
-                           .ToList();
-        }
+        public List<Type> GetAllWritableFloppyImagePlugins() => Assembly.
+                                                                GetExecutingAssembly().GetTypes().
+                                                                Where(t => t.GetInterfaces().
+                                                                             Contains(typeof(IWritableFloppyImage))).
+                                                                Where(t => t.IsClass).ToList();
 
-        public List<Type> GetAllWritableImagePlugins()
-        {
-            return Assembly.GetExecutingAssembly().GetTypes()
-                           .Where(t => t.GetInterfaces().Contains(typeof(IWritableImage))).Where(t => t.IsClass)
-                           .ToList();
-        }
+        public List<Type> GetAllWritableImagePlugins() => Assembly.
+                                                          GetExecutingAssembly().GetTypes().
+                                                          Where(t => t.GetInterfaces().
+                                                                       Contains(typeof(IWritableImage))).
+                                                          Where(t => t.IsClass).ToList();
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/RsIde/Constants.cs b/Aaru.Images/RsIde/Constants.cs
index d454e3cbc..d98634968 100644
--- a/Aaru.Images/RsIde/Constants.cs
+++ b/Aaru.Images/RsIde/Constants.cs
@@ -34,6 +34,9 @@ namespace Aaru.DiscImages
 {
     public partial class RsIde
     {
-        readonly byte[] signature = {0x52, 0x53, 0x2D, 0x49, 0x44, 0x45, 0x1A};
+        readonly byte[] signature =
+        {
+            0x52, 0x53, 0x2D, 0x49, 0x44, 0x45, 0x1A
+        };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/RsIde/Helpers.cs b/Aaru.Images/RsIde/Helpers.cs
index b154f6615..2c326b46f 100644
--- a/Aaru.Images/RsIde/Helpers.cs
+++ b/Aaru.Images/RsIde/Helpers.cs
@@ -40,6 +40,7 @@ namespace Aaru.DiscImages
         static byte[] ScrambleAtaString(string text, int length)
         {
             byte[] inbuf = Encoding.ASCII.GetBytes(text);
+
             if(inbuf.Length % 2 != 0)
             {
                 byte[] tmpbuf = new byte[inbuf.Length + 1];
@@ -56,10 +57,13 @@ namespace Aaru.DiscImages
                 outbuf[i            + 1] = inbuf[i];
             }
 
-            byte[] retBuf                             = new byte[length];
-            for(int i = 0; i < length; i++) retBuf[i] = 0x20;
+            byte[] retBuf = new byte[length];
+
+            for(int i = 0; i < length; i++)
+                retBuf[i] = 0x20;
 
             Array.Copy(outbuf, 0, retBuf, 0, outbuf.Length >= length ? length : outbuf.Length);
+
             return retBuf;
         }
     }
diff --git a/Aaru.Images/RsIde/Properties.cs b/Aaru.Images/RsIde/Properties.cs
index 2a5e8bf6b..f6d1df955 100644
--- a/Aaru.Images/RsIde/Properties.cs
+++ b/Aaru.Images/RsIde/Properties.cs
@@ -41,26 +41,33 @@ namespace Aaru.DiscImages
 {
     public partial class RsIde
     {
-        public string                     Name                => "RS-IDE Hard Disk Image";
-        public Guid                       Id                  => new Guid("47C3E78D-2BE2-4BA5-AA6B-FEE27C86FC65");
-        public ImageInfo                  Info                => imageInfo;
-        public string                     Author              => "Natalia Portillo";
-        public string                     Format              => "RS-IDE disk image";
-        public List<DumpHardwareType>     DumpHardware        => null;
-        public CICMMetadataType           CicmMetadata        => null;
-        public IEnumerable<MediaTagType>  SupportedMediaTags  => new[] {MediaTagType.ATA_IDENTIFY};
-        public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[] { };
-        public IEnumerable<MediaType> SupportedMediaTypes =>
-            new[]
-            {
-                MediaType.GENERIC_HDD, MediaType.Unknown, MediaType.FlashDrive, MediaType.CompactFlash,
-                MediaType.CompactFlashType2, MediaType.PCCardTypeI, MediaType.PCCardTypeII, MediaType.PCCardTypeIII,
-                MediaType.PCCardTypeIV
-            };
+        public string                 Name         => "RS-IDE Hard Disk Image";
+        public Guid                   Id           => new Guid("47C3E78D-2BE2-4BA5-AA6B-FEE27C86FC65");
+        public ImageInfo              Info         => imageInfo;
+        public string                 Author       => "Natalia Portillo";
+        public string                 Format       => "RS-IDE disk image";
+        public List<DumpHardwareType> DumpHardware => null;
+        public CICMMetadataType       CicmMetadata => null;
+        public IEnumerable<MediaTagType> SupportedMediaTags => new[]
+        {
+            MediaTagType.ATA_IDENTIFY
+        };
+        public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[]
+            {};
+        public IEnumerable<MediaType> SupportedMediaTypes => new[]
+        {
+            MediaType.GENERIC_HDD, MediaType.Unknown, MediaType.FlashDrive, MediaType.CompactFlash,
+            MediaType.CompactFlashType2, MediaType.PCCardTypeI, MediaType.PCCardTypeII, MediaType.PCCardTypeIII,
+            MediaType.PCCardTypeIV
+        };
         public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
-            new (string name, Type type, string description, object @default)[] { };
-        public IEnumerable<string> KnownExtensions => new[] {".ide"};
-        public bool                IsWriting       { get; private set; }
-        public string              ErrorMessage    { get; private set; }
+            new (string name, Type type, string description, object @default)[]
+                {};
+        public IEnumerable<string> KnownExtensions => new[]
+        {
+            ".ide"
+        };
+        public bool   IsWriting    { get; private set; }
+        public string ErrorMessage { get; private set; }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/RsIde/Read.cs b/Aaru.Images/RsIde/Read.cs
index c27f0a560..db1327105 100644
--- a/Aaru.Images/RsIde/Read.cs
+++ b/Aaru.Images/RsIde/Read.cs
@@ -73,7 +73,7 @@ namespace Aaru.DiscImages
             {
                 identify = new byte[512];
                 Array.Copy(hdr.identify, 0, identify, 0, hdr.identify.Length);
-                Identify.IdentifyDevice? ataId = global::Aaru.CommonTypes.Structs.Devices.ATA.Identify.Decode(identify);
+                Identify.IdentifyDevice? ataId = CommonTypes.Structs.Devices.ATA.Identify.Decode(identify);
 
                 if(ataId.HasValue)
                 {
diff --git a/Aaru.Images/RsIde/RsIde.cs b/Aaru.Images/RsIde/RsIde.cs
index 6598579c1..1729fc5f1 100644
--- a/Aaru.Images/RsIde/RsIde.cs
+++ b/Aaru.Images/RsIde/RsIde.cs
@@ -46,31 +46,18 @@ namespace Aaru.DiscImages
         IFilter    rsIdeImageFilter;
         FileStream writingStream;
 
-        public RsIde()
+        public RsIde() => imageInfo = new ImageInfo
         {
-            imageInfo = new ImageInfo
-            {
-                ReadableSectorTags    = new List<SectorTagType>(),
-                ReadableMediaTags     = new List<MediaTagType>(),
-                HasPartitions         = false,
-                HasSessions           = false,
-                Version               = null,
-                Application           = null,
-                ApplicationVersion    = null,
-                Creator               = null,
-                Comments              = null,
-                MediaManufacturer     = null,
-                MediaModel            = null,
-                MediaSerialNumber     = null,
-                MediaBarcode          = null,
-                MediaPartNumber       = null,
-                MediaSequence         = 0,
-                LastMediaSequence     = 0,
-                DriveManufacturer     = null,
-                DriveModel            = null,
-                DriveSerialNumber     = null,
-                DriveFirmwareRevision = null
-            };
-        }
+            ReadableSectorTags = new List<SectorTagType>(), ReadableMediaTags = new List<MediaTagType>(),
+            HasPartitions      = false, HasSessions                           = false, Version = null,
+            Application        = null,
+            ApplicationVersion = null, Creator = null, Comments = null,
+            MediaManufacturer  = null,
+            MediaModel         = null, MediaSerialNumber = null, MediaBarcode = null,
+            MediaPartNumber    = null,
+            MediaSequence      = 0, LastMediaSequence = 0, DriveManufacturer = null,
+            DriveModel         = null,
+            DriveSerialNumber  = null, DriveFirmwareRevision = null
+        };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/RsIde/Write.cs b/Aaru.Images/RsIde/Write.cs
index e85bab053..646820a2c 100644
--- a/Aaru.Images/RsIde/Write.cs
+++ b/Aaru.Images/RsIde/Write.cs
@@ -243,22 +243,22 @@ namespace Aaru.DiscImages
                 var ataId = new Identify.IdentifyDevice
                 {
                     GeneralConfiguration =
-                        global::Aaru.CommonTypes.Structs.Devices.ATA.Identify.GeneralConfigurationBit.UltraFastIDE |
-                        global::Aaru.CommonTypes.Structs.Devices.ATA.Identify.GeneralConfigurationBit.Fixed        |
-                        global::Aaru.CommonTypes.Structs.Devices.ATA.Identify.GeneralConfigurationBit.NotMFM       |
-                        global::Aaru.CommonTypes.Structs.Devices.ATA.Identify.GeneralConfigurationBit.SoftSector,
+                        CommonTypes.Structs.Devices.ATA.Identify.GeneralConfigurationBit.UltraFastIDE |
+                        CommonTypes.Structs.Devices.ATA.Identify.GeneralConfigurationBit.Fixed        |
+                        CommonTypes.Structs.Devices.ATA.Identify.GeneralConfigurationBit.NotMFM       |
+                        CommonTypes.Structs.Devices.ATA.Identify.GeneralConfigurationBit.SoftSector,
                     Cylinders       = (ushort)imageInfo.Cylinders, Heads              = (ushort)imageInfo.Heads,
                     SectorsPerTrack = (ushort)imageInfo.SectorsPerTrack, VendorWord47 = 0x80,
-                    Capabilities = global::Aaru.CommonTypes.Structs.Devices.ATA.Identify.CapabilitiesBit.DMASupport |
-                                   global::Aaru.CommonTypes.Structs.Devices.ATA.Identify.CapabilitiesBit.IORDY      |
-                                   global::Aaru.CommonTypes.Structs.Devices.ATA.Identify.CapabilitiesBit.LBASupport,
+                    Capabilities = CommonTypes.Structs.Devices.ATA.Identify.CapabilitiesBit.DMASupport |
+                                   CommonTypes.Structs.Devices.ATA.Identify.CapabilitiesBit.IORDY      |
+                                   CommonTypes.Structs.Devices.ATA.Identify.CapabilitiesBit.LBASupport,
                     ExtendedIdentify =
-                        global::Aaru.CommonTypes.Structs.Devices.ATA.Identify.ExtendedIdentifyBit.Words54to58Valid,
+                        CommonTypes.Structs.Devices.ATA.Identify.ExtendedIdentifyBit.Words54to58Valid,
                     CurrentCylinders       = (ushort)imageInfo.Cylinders, CurrentHeads = (ushort)imageInfo.Heads,
                     CurrentSectorsPerTrack = (ushort)imageInfo.SectorsPerTrack,
                     CurrentSectors         = (uint)imageInfo.Sectors, LBASectors = (uint)imageInfo.Sectors,
-                    DMASupported           = global::Aaru.CommonTypes.Structs.Devices.ATA.Identify.TransferMode.Mode0,
-                    DMAActive              = global::Aaru.CommonTypes.Structs.Devices.ATA.Identify.TransferMode.Mode0
+                    DMASupported           = CommonTypes.Structs.Devices.ATA.Identify.TransferMode.Mode0,
+                    DMAActive              = CommonTypes.Structs.Devices.ATA.Identify.TransferMode.Mode0
                 };
 
                 if(string.IsNullOrEmpty(imageInfo.DriveManufacturer))
diff --git a/Aaru.Images/SaveDskF/Identify.cs b/Aaru.Images/SaveDskF/Identify.cs
index dda03703a..521ebbf1e 100644
--- a/Aaru.Images/SaveDskF/Identify.cs
+++ b/Aaru.Images/SaveDskF/Identify.cs
@@ -42,7 +42,9 @@ namespace Aaru.DiscImages
         {
             Stream stream = imageFilter.GetDataForkStream();
             stream.Seek(0, SeekOrigin.Begin);
-            if(stream.Length < 41) return false;
+
+            if(stream.Length < 41)
+                return false;
 
             byte[] hdr = new byte[40];
             stream.Read(hdr, 0, 40);
diff --git a/Aaru.Images/SaveDskF/Properties.cs b/Aaru.Images/SaveDskF/Properties.cs
index 0912dffe5..72f554cc7 100644
--- a/Aaru.Images/SaveDskF/Properties.cs
+++ b/Aaru.Images/SaveDskF/Properties.cs
@@ -41,31 +41,36 @@ namespace Aaru.DiscImages
 {
     public partial class SaveDskF
     {
-        public string                     Name                => "IBM SaveDskF";
-        public Guid                       Id                  => new Guid("288CE058-1A51-4034-8C45-5A256CAE1461");
-        public ImageInfo                  Info                => imageInfo;
-        public string                     Author              => "Natalia Portillo";
-        public string                     Format              => "IBM SaveDskF";
-        public List<DumpHardwareType>     DumpHardware        => null;
-        public CICMMetadataType           CicmMetadata        => null;
-        public IEnumerable<MediaTagType>  SupportedMediaTags  => new MediaTagType[] { };
-        public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[] { };
+        public string                 Name         => "IBM SaveDskF";
+        public Guid                   Id           => new Guid("288CE058-1A51-4034-8C45-5A256CAE1461");
+        public ImageInfo              Info         => imageInfo;
+        public string                 Author       => "Natalia Portillo";
+        public string                 Format       => "IBM SaveDskF";
+        public List<DumpHardwareType> DumpHardware => null;
+        public CICMMetadataType       CicmMetadata => null;
+        public IEnumerable<MediaTagType> SupportedMediaTags => new MediaTagType[]
+            {};
+        public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[]
+            {};
+
         // TODO: Test with real hardware to see real supported media
-        public IEnumerable<MediaType> SupportedMediaTypes =>
-            new[]
-            {
-                MediaType.ACORN_35_DS_DD, MediaType.ACORN_35_DS_HD, MediaType.Apricot_35, MediaType.ATARI_35_DS_DD,
-                MediaType.ATARI_35_DS_DD_11, MediaType.ATARI_35_SS_DD, MediaType.ATARI_35_SS_DD_11, MediaType.DMF,
-                MediaType.DMF_82, MediaType.DOS_35_DS_DD_8, MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_ED,
-                MediaType.DOS_35_HD, MediaType.DOS_35_SS_DD_8, MediaType.DOS_35_SS_DD_9, MediaType.DOS_525_DS_DD_8,
-                MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_HD, MediaType.DOS_525_SS_DD_8,
-                MediaType.DOS_525_SS_DD_9, MediaType.FDFORMAT_35_DD, MediaType.FDFORMAT_35_HD,
-                MediaType.FDFORMAT_525_DD, MediaType.FDFORMAT_525_HD, MediaType.RX50, MediaType.XDF_35,
-                MediaType.XDF_525
-            };
+        public IEnumerable<MediaType> SupportedMediaTypes => new[]
+        {
+            MediaType.ACORN_35_DS_DD, MediaType.ACORN_35_DS_HD, MediaType.Apricot_35, MediaType.ATARI_35_DS_DD,
+            MediaType.ATARI_35_DS_DD_11, MediaType.ATARI_35_SS_DD, MediaType.ATARI_35_SS_DD_11, MediaType.DMF,
+            MediaType.DMF_82, MediaType.DOS_35_DS_DD_8, MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_ED,
+            MediaType.DOS_35_HD, MediaType.DOS_35_SS_DD_8, MediaType.DOS_35_SS_DD_9, MediaType.DOS_525_DS_DD_8,
+            MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_HD, MediaType.DOS_525_SS_DD_8, MediaType.DOS_525_SS_DD_9,
+            MediaType.FDFORMAT_35_DD, MediaType.FDFORMAT_35_HD, MediaType.FDFORMAT_525_DD, MediaType.FDFORMAT_525_HD,
+            MediaType.RX50, MediaType.XDF_35, MediaType.XDF_525
+        };
         public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
-            new (string name, Type type, string description, object @default)[] { };
-        public IEnumerable<string> KnownExtensions => new[] {".dsk"};
+            new (string name, Type type, string description, object @default)[]
+                {};
+        public IEnumerable<string> KnownExtensions => new[]
+        {
+            ".dsk"
+        };
 
         public bool   IsWriting    { get; private set; }
         public string ErrorMessage { get; private set; }
diff --git a/Aaru.Images/SaveDskF/Read.cs b/Aaru.Images/SaveDskF/Read.cs
index c87734f52..bab128357 100644
--- a/Aaru.Images/SaveDskF/Read.cs
+++ b/Aaru.Images/SaveDskF/Read.cs
@@ -54,46 +54,52 @@ namespace Aaru.DiscImages
             stream.Read(hdr, 0, 40);
             header = Marshal.ByteArrayToStructureLittleEndian<SaveDskFHeader>(hdr);
 
-            AaruConsole.DebugWriteLine("SaveDskF plugin", "header.magic = 0x{0:X4}",      header.magic);
-            AaruConsole.DebugWriteLine("SaveDskF plugin", "header.mediaType = 0x{0:X2}",  header.mediaType);
-            AaruConsole.DebugWriteLine("SaveDskF plugin", "header.sectorSize = {0}",      header.sectorSize);
-            AaruConsole.DebugWriteLine("SaveDskF plugin", "header.clusterMask = {0}",     header.clusterMask);
-            AaruConsole.DebugWriteLine("SaveDskF plugin", "header.clusterShift = {0}",    header.clusterShift);
+            AaruConsole.DebugWriteLine("SaveDskF plugin", "header.magic = 0x{0:X4}", header.magic);
+            AaruConsole.DebugWriteLine("SaveDskF plugin", "header.mediaType = 0x{0:X2}", header.mediaType);
+            AaruConsole.DebugWriteLine("SaveDskF plugin", "header.sectorSize = {0}", header.sectorSize);
+            AaruConsole.DebugWriteLine("SaveDskF plugin", "header.clusterMask = {0}", header.clusterMask);
+            AaruConsole.DebugWriteLine("SaveDskF plugin", "header.clusterShift = {0}", header.clusterShift);
             AaruConsole.DebugWriteLine("SaveDskF plugin", "header.reservedSectors = {0}", header.reservedSectors);
-            AaruConsole.DebugWriteLine("SaveDskF plugin", "header.fatCopies = {0}",       header.fatCopies);
-            AaruConsole.DebugWriteLine("SaveDskF plugin", "header.rootEntries = {0}",     header.rootEntries);
-            AaruConsole.DebugWriteLine("SaveDskF plugin", "header.firstCluster = {0}",    header.firstCluster);
-            AaruConsole.DebugWriteLine("SaveDskF plugin", "header.clustersCopied = {0}",  header.clustersCopied);
-            AaruConsole.DebugWriteLine("SaveDskF plugin", "header.sectorsPerFat = {0}",   header.sectorsPerFat);
-            AaruConsole.DebugWriteLine("SaveDskF plugin", "header.checksum = 0x{0:X8}",   header.checksum);
-            AaruConsole.DebugWriteLine("SaveDskF plugin", "header.cylinders = {0}",       header.cylinders);
-            AaruConsole.DebugWriteLine("SaveDskF plugin", "header.heads = {0}",           header.heads);
+            AaruConsole.DebugWriteLine("SaveDskF plugin", "header.fatCopies = {0}", header.fatCopies);
+            AaruConsole.DebugWriteLine("SaveDskF plugin", "header.rootEntries = {0}", header.rootEntries);
+            AaruConsole.DebugWriteLine("SaveDskF plugin", "header.firstCluster = {0}", header.firstCluster);
+            AaruConsole.DebugWriteLine("SaveDskF plugin", "header.clustersCopied = {0}", header.clustersCopied);
+            AaruConsole.DebugWriteLine("SaveDskF plugin", "header.sectorsPerFat = {0}", header.sectorsPerFat);
+            AaruConsole.DebugWriteLine("SaveDskF plugin", "header.checksum = 0x{0:X8}", header.checksum);
+            AaruConsole.DebugWriteLine("SaveDskF plugin", "header.cylinders = {0}", header.cylinders);
+            AaruConsole.DebugWriteLine("SaveDskF plugin", "header.heads = {0}", header.heads);
             AaruConsole.DebugWriteLine("SaveDskF plugin", "header.sectorsPerTrack = {0}", header.sectorsPerTrack);
-            AaruConsole.DebugWriteLine("SaveDskF plugin", "header.padding = {0}",         header.padding);
-            AaruConsole.DebugWriteLine("SaveDskF plugin", "header.sectorsCopied = {0}",   header.sectorsCopied);
-            AaruConsole.DebugWriteLine("SaveDskF plugin", "header.commentOffset = {0}",   header.commentOffset);
-            AaruConsole.DebugWriteLine("SaveDskF plugin", "header.dataOffset = {0}",      header.dataOffset);
+            AaruConsole.DebugWriteLine("SaveDskF plugin", "header.padding = {0}", header.padding);
+            AaruConsole.DebugWriteLine("SaveDskF plugin", "header.sectorsCopied = {0}", header.sectorsCopied);
+            AaruConsole.DebugWriteLine("SaveDskF plugin", "header.commentOffset = {0}", header.commentOffset);
+            AaruConsole.DebugWriteLine("SaveDskF plugin", "header.dataOffset = {0}", header.dataOffset);
 
-            if(header.dataOffset == 0 && header.magic == SDF_MAGIC_OLD) header.dataOffset = 512;
+            if(header.dataOffset == 0 &&
+               header.magic      == SDF_MAGIC_OLD)
+                header.dataOffset = 512;
 
             byte[] cmt = new byte[header.dataOffset - header.commentOffset];
             stream.Seek(header.commentOffset, SeekOrigin.Begin);
             stream.Read(cmt, 0, cmt.Length);
-            if(cmt.Length > 1) imageInfo.Comments = StringHandlers.CToString(cmt, Encoding.GetEncoding("ibm437"));
+
+            if(cmt.Length > 1)
+                imageInfo.Comments = StringHandlers.CToString(cmt, Encoding.GetEncoding("ibm437"));
 
             calculatedChk = 0;
             stream.Seek(0, SeekOrigin.Begin);
 
             int b;
+
             do
             {
                 b = stream.ReadByte();
-                if(b >= 0) calculatedChk += (uint)b;
-            }
-            while(b >= 0);
+
+                if(b >= 0)
+                    calculatedChk += (uint)b;
+            } while(b >= 0);
 
             AaruConsole.DebugWriteLine("SaveDskF plugin", "Calculated checksum = 0x{0:X8}, {1}", calculatedChk,
-                                      calculatedChk == header.checksum);
+                                       calculatedChk == header.checksum);
 
             imageInfo.Application          = "SaveDskF";
             imageInfo.CreationTime         = imageFilter.GetCreationTime();
@@ -109,6 +115,7 @@ namespace Aaru.DiscImages
             imageInfo.XmlMediaType = XmlMediaType.BlockMedia;
 
             AaruConsole.VerboseWriteLine("SaveDskF image contains a disk of type {0}", imageInfo.MediaType);
+
             if(!string.IsNullOrEmpty(imageInfo.Comments))
                 AaruConsole.VerboseWriteLine("SaveDskF comments: {0}", imageInfo.Comments);
 
diff --git a/Aaru.Images/SaveDskF/SaveDskF.cs b/Aaru.Images/SaveDskF/SaveDskF.cs
index d0cc561e4..0318d68cb 100644
--- a/Aaru.Images/SaveDskF/SaveDskF.cs
+++ b/Aaru.Images/SaveDskF/SaveDskF.cs
@@ -46,31 +46,18 @@ namespace Aaru.DiscImages
         ImageInfo      imageInfo;
         FileStream     writingStream;
 
-        public SaveDskF()
+        public SaveDskF() => imageInfo = new ImageInfo
         {
-            imageInfo = new ImageInfo
-            {
-                ReadableSectorTags    = new List<SectorTagType>(),
-                ReadableMediaTags     = new List<MediaTagType>(),
-                HasPartitions         = false,
-                HasSessions           = false,
-                Version               = null,
-                Application           = null,
-                ApplicationVersion    = null,
-                Creator               = null,
-                Comments              = null,
-                MediaManufacturer     = null,
-                MediaModel            = null,
-                MediaSerialNumber     = null,
-                MediaBarcode          = null,
-                MediaPartNumber       = null,
-                MediaSequence         = 0,
-                LastMediaSequence     = 0,
-                DriveManufacturer     = null,
-                DriveModel            = null,
-                DriveSerialNumber     = null,
-                DriveFirmwareRevision = null
-            };
-        }
+            ReadableSectorTags = new List<SectorTagType>(), ReadableMediaTags = new List<MediaTagType>(),
+            HasPartitions      = false, HasSessions                           = false, Version = null,
+            Application        = null,
+            ApplicationVersion = null, Creator = null, Comments = null,
+            MediaManufacturer  = null,
+            MediaModel         = null, MediaSerialNumber = null, MediaBarcode = null,
+            MediaPartNumber    = null,
+            MediaSequence      = 0, LastMediaSequence = 0, DriveManufacturer = null,
+            DriveModel         = null,
+            DriveSerialNumber  = null, DriveFirmwareRevision = null
+        };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/SaveDskF/Structs.cs b/Aaru.Images/SaveDskF/Structs.cs
index d4c3e8765..faf3fa634 100644
--- a/Aaru.Images/SaveDskF/Structs.cs
+++ b/Aaru.Images/SaveDskF/Structs.cs
@@ -42,27 +42,27 @@ namespace Aaru.DiscImages
             /// <summary>0x00 magic number</summary>
             public ushort magic;
             /// <summary>0x02 media type from FAT</summary>
-            public ushort mediaType;
+            public readonly ushort mediaType;
             /// <summary>0x04 bytes per sector</summary>
             public ushort sectorSize;
             /// <summary>0x06 sectors per cluster - 1</summary>
-            public byte clusterMask;
+            public readonly byte clusterMask;
             /// <summary>0x07 log2(cluster / sector)</summary>
-            public byte clusterShift;
+            public readonly byte clusterShift;
             /// <summary>0x08 reserved sectors</summary>
-            public ushort reservedSectors;
+            public readonly ushort reservedSectors;
             /// <summary>0x0A copies of FAT</summary>
-            public byte fatCopies;
+            public readonly byte fatCopies;
             /// <summary>0x0B entries in root directory</summary>
-            public ushort rootEntries;
+            public readonly ushort rootEntries;
             /// <summary>0x0D first cluster</summary>
-            public ushort firstCluster;
+            public readonly ushort firstCluster;
             /// <summary>0x0F clusters present in image</summary>
-            public ushort clustersCopied;
+            public readonly ushort clustersCopied;
             /// <summary>0x11 sectors per FAT</summary>
-            public byte sectorsPerFat;
+            public readonly byte sectorsPerFat;
             /// <summary>0x12 sector number of root directory</summary>
-            public ushort rootDirectorySector;
+            public readonly ushort rootDirectorySector;
             /// <summary>0x14 sum of all image bytes</summary>
             public uint checksum;
             /// <summary>0x18 cylinders</summary>
@@ -72,7 +72,7 @@ namespace Aaru.DiscImages
             /// <summary>0x1C sectors per track</summary>
             public ushort sectorsPerTrack;
             /// <summary>0x1E always zero</summary>
-            public uint padding;
+            public readonly uint padding;
             /// <summary>0x22 sectors present in image</summary>
             public ushort sectorsCopied;
             /// <summary>0x24 offset to comment</summary>
diff --git a/Aaru.Images/SaveDskF/Write.cs b/Aaru.Images/SaveDskF/Write.cs
index 09088a16d..dbfc43f57 100644
--- a/Aaru.Images/SaveDskF/Write.cs
+++ b/Aaru.Images/SaveDskF/Write.cs
@@ -48,6 +48,7 @@ namespace Aaru.DiscImages
         public bool WriteMediaTag(byte[] data, MediaTagType tag)
         {
             ErrorMessage = "Writing media tags is not supported.";
+
             return false;
         }
 
@@ -56,25 +57,29 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Tried to write on a non-writable image";
+
                 return false;
             }
 
             if(data.Length != imageInfo.SectorSize)
             {
                 ErrorMessage = "Incorrect data size";
+
                 return false;
             }
 
             if(sectorAddress >= imageInfo.Sectors)
             {
                 ErrorMessage = "Tried to write past image size";
+
                 return false;
             }
 
-            writingStream.Seek((long)(512 + sectorAddress * imageInfo.SectorSize), SeekOrigin.Begin);
+            writingStream.Seek((long)(512 + (sectorAddress * imageInfo.SectorSize)), SeekOrigin.Begin);
             writingStream.Write(data, 0, data.Length);
 
             ErrorMessage = "";
+
             return true;
         }
 
@@ -83,37 +88,43 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Tried to write on a non-writable image";
+
                 return false;
             }
 
             if(data.Length % imageInfo.SectorSize != 0)
             {
                 ErrorMessage = "Incorrect data size";
+
                 return false;
             }
 
             if(sectorAddress + length > imageInfo.Sectors)
             {
                 ErrorMessage = "Tried to write past image size";
+
                 return false;
             }
 
-            writingStream.Seek((long)(512 + sectorAddress * imageInfo.SectorSize), SeekOrigin.Begin);
+            writingStream.Seek((long)(512 + (sectorAddress * imageInfo.SectorSize)), SeekOrigin.Begin);
             writingStream.Write(data, 0, data.Length);
 
             ErrorMessage = "";
+
             return true;
         }
 
         public bool WriteSectorLong(byte[] data, ulong sectorAddress)
         {
             ErrorMessage = "Writing sectors with tags is not supported.";
+
             return false;
         }
 
         public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
         {
             ErrorMessage = "Writing sectors with tags is not supported.";
+
             return false;
         }
 
@@ -122,6 +133,7 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Image is not opened for writing";
+
                 return false;
             }
 
@@ -130,9 +142,9 @@ namespace Aaru.DiscImages
                 byte[] commentsBytes = Encoding.GetEncoding("ibm437").GetBytes(imageInfo.Comments);
                 header.commentOffset = (ushort)Marshal.SizeOf<SaveDskFHeader>();
                 writingStream.Seek(header.commentOffset, SeekOrigin.Begin);
+
                 writingStream.Write(commentsBytes, 0,
-                                    commentsBytes.Length >= 512 - header.commentOffset
-                                        ? 512 - header.commentOffset
+                                    commentsBytes.Length >= 512 - header.commentOffset ? 512 - header.commentOffset
                                         : commentsBytes.Length);
             }
 
@@ -149,12 +161,14 @@ namespace Aaru.DiscImages
             writingStream.Seek(0, SeekOrigin.Begin);
 
             int b;
+
             do
             {
                 b = writingStream.ReadByte();
-                if(b >= 0) header.checksum += (uint)b;
-            }
-            while(b >= 0);
+
+                if(b >= 0)
+                    header.checksum += (uint)b;
+            } while(b >= 0);
 
             hdr    = new byte[Marshal.SizeOf<SaveDskFHeader>()];
             hdrPtr = System.Runtime.InteropServices.Marshal.AllocHGlobal(Marshal.SizeOf<SaveDskFHeader>());
@@ -170,42 +184,54 @@ namespace Aaru.DiscImages
 
             IsWriting    = false;
             ErrorMessage = "";
+
             return true;
         }
 
         public bool SetMetadata(ImageInfo metadata)
         {
             imageInfo.Comments = metadata.Comments;
+
             return true;
         }
 
         public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
-                           uint   sectorSize)
+                           uint sectorSize)
         {
             if(sectorSize == 0)
             {
                 ErrorMessage = "Unsupported sector size";
+
                 return false;
             }
 
             if(sectors > ushort.MaxValue)
             {
                 ErrorMessage = "Too many sectors";
+
                 return false;
             }
 
             if(!SupportedMediaTypes.Contains(mediaType))
             {
                 ErrorMessage = $"Unsupport media format {mediaType}";
+
                 return false;
             }
 
-            imageInfo = new ImageInfo {MediaType = mediaType, SectorSize = sectorSize, Sectors = sectors};
+            imageInfo = new ImageInfo
+            {
+                MediaType = mediaType, SectorSize = sectorSize, Sectors = sectors
+            };
 
-            try { writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None); }
+            try
+            {
+                writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
+            }
             catch(IOException e)
             {
                 ErrorMessage = $"Could not create new image file, exception {e.Message}";
+
                 return false;
             }
 
@@ -214,17 +240,14 @@ namespace Aaru.DiscImages
 
             header = new SaveDskFHeader
             {
-                cylinders       = geometry.cylinders,
-                dataOffset      = 512,
-                heads           = geometry.heads,
-                magic           = SDF_MAGIC,
-                sectorsCopied   = (ushort)sectors,
-                sectorsPerTrack = geometry.sectorsPerTrack,
-                sectorSize      = (ushort)sectorSize
+                cylinders     = geometry.cylinders, dataOffset   = 512, heads = geometry.heads, magic = SDF_MAGIC,
+                sectorsCopied = (ushort)sectors, sectorsPerTrack = geometry.sectorsPerTrack,
+                sectorSize    = (ushort)sectorSize
             };
 
             IsWriting    = true;
             ErrorMessage = null;
+
             return true;
         }
 
@@ -233,12 +256,14 @@ namespace Aaru.DiscImages
         public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
         {
             ErrorMessage = "Unsupported feature";
+
             return false;
         }
 
         public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
         {
             ErrorMessage = "Unsupported feature";
+
             return false;
         }
 
diff --git a/Aaru.Images/SuperCardPro/Constants.cs b/Aaru.Images/SuperCardPro/Constants.cs
index 9a6776e98..ccc8ff520 100644
--- a/Aaru.Images/SuperCardPro/Constants.cs
+++ b/Aaru.Images/SuperCardPro/Constants.cs
@@ -34,17 +34,17 @@ namespace Aaru.DiscImages
 {
     public partial class SuperCardPro
     {
-        /// <summary>
-        ///     SuperCardPro footer signature: "FPCS"
-        /// </summary>
+        /// <summary>SuperCardPro footer signature: "FPCS"</summary>
         const uint FOOTER_SIGNATURE = 0x53435046;
-        /// <summary>
-        ///     SuperCardPro header signature: "SCP"
-        /// </summary>
-        readonly byte[] scpSignature = {0x53, 0x43, 0x50};
-        /// <summary>
-        ///     SuperCardPro track header signature: "TRK"
-        /// </summary>
-        readonly byte[] trkSignature = {0x54, 0x52, 0x4B};
+        /// <summary>SuperCardPro header signature: "SCP"</summary>
+        readonly byte[] scpSignature =
+        {
+            0x53, 0x43, 0x50
+        };
+        /// <summary>SuperCardPro track header signature: "TRK"</summary>
+        readonly byte[] trkSignature =
+        {
+            0x54, 0x52, 0x4B
+        };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/SuperCardPro/Enums.cs b/Aaru.Images/SuperCardPro/Enums.cs
index 6d341fd19..8bfe84045 100644
--- a/Aaru.Images/SuperCardPro/Enums.cs
+++ b/Aaru.Images/SuperCardPro/Enums.cs
@@ -38,56 +38,30 @@ namespace Aaru.DiscImages
     {
         public enum ScpDiskType : byte
         {
-            Commodore64    = 0x00,
-            CommodoreAmiga = 0x04,
-            AtariFMSS      = 0x10,
-            AtariFMDS      = 0x11,
-            AtariFSEx      = 0x12,
-            AtariSTSS      = 0x14,
-            AtariSTDS      = 0x15,
-            AppleII        = 0x20,
-            AppleIIPro     = 0x21,
-            Apple400K      = 0x24,
-            Apple800K      = 0x25,
-            Apple144       = 0x26,
-            PC360K         = 0x30,
-            PC720K         = 0x31,
-            PC12M          = 0x32,
-            PC144M         = 0x33,
-            TandySSSD      = 0x40,
-            TandySSDD      = 0x41,
-            TandyDSSD      = 0x42,
-            TandyDSDD      = 0x43,
-            Ti994A         = 0x50,
-            RolandD20      = 0x60
+            Commodore64 = 0x00, CommodoreAmiga = 0x04, AtariFMSS  = 0x10,
+            AtariFMDS   = 0x11, AtariFSEx      = 0x12, AtariSTSS  = 0x14,
+            AtariSTDS   = 0x15, AppleII        = 0x20, AppleIIPro = 0x21,
+            Apple400K   = 0x24, Apple800K      = 0x25, Apple144   = 0x26,
+            PC360K      = 0x30, PC720K         = 0x31, PC12M      = 0x32,
+            PC144M      = 0x33, TandySSSD      = 0x40, TandySSDD  = 0x41,
+            TandyDSSD   = 0x42, TandyDSDD      = 0x43, Ti994A     = 0x50,
+            RolandD20   = 0x60
         }
 
         [Flags]
         public enum ScpFlags : byte
         {
-            /// <summary>
-            ///     If set flux starts at index pulse
-            /// </summary>
+            /// <summary>If set flux starts at index pulse</summary>
             Index = 0x00,
-            /// <summary>
-            ///     If set drive is 96tpi
-            /// </summary>
+            /// <summary>If set drive is 96tpi</summary>
             Tpi = 0x02,
-            /// <summary>
-            ///     If set drive is 360rpm
-            /// </summary>
+            /// <summary>If set drive is 360rpm</summary>
             Rpm = 0x04,
-            /// <summary>
-            ///     If set image contains normalized data
-            /// </summary>
+            /// <summary>If set image contains normalized data</summary>
             Normalized = 0x08,
-            /// <summary>
-            ///     If set image is read/write capable
-            /// </summary>
+            /// <summary>If set image is read/write capable</summary>
             Writable = 0x10,
-            /// <summary>
-            ///     If set, image has footer
-            /// </summary>
+            /// <summary>If set, image has footer</summary>
             HasFooter = 0x20
         }
     }
diff --git a/Aaru.Images/SuperCardPro/Helpers.cs b/Aaru.Images/SuperCardPro/Helpers.cs
index 6383b888b..edd3c9f0c 100644
--- a/Aaru.Images/SuperCardPro/Helpers.cs
+++ b/Aaru.Images/SuperCardPro/Helpers.cs
@@ -40,14 +40,17 @@ namespace Aaru.DiscImages
     {
         static string ReadPStringUtf8(Stream stream, uint position)
         {
-            if(position == 0) return null;
+            if(position == 0)
+                return null;
 
             stream.Position = position;
             byte[] lenB = new byte[2];
             stream.Read(lenB, 0, 2);
             ushort len = BitConverter.ToUInt16(lenB, 0);
 
-            if(len == 0 || len + stream.Position >= stream.Length) return null;
+            if(len                   == 0 ||
+               len + stream.Position >= stream.Length)
+                return null;
 
             byte[] str = new byte[len];
             stream.Read(str, 0, len);
diff --git a/Aaru.Images/SuperCardPro/Identify.cs b/Aaru.Images/SuperCardPro/Identify.cs
index f7f0ce1c0..70ca74eda 100644
--- a/Aaru.Images/SuperCardPro/Identify.cs
+++ b/Aaru.Images/SuperCardPro/Identify.cs
@@ -44,7 +44,9 @@ namespace Aaru.DiscImages
             Header = new ScpHeader();
             Stream stream = imageFilter.GetDataForkStream();
             stream.Seek(0, SeekOrigin.Begin);
-            if(stream.Length < Marshal.SizeOf<ScpHeader>()) return false;
+
+            if(stream.Length < Marshal.SizeOf<ScpHeader>())
+                return false;
 
             byte[] hdr = new byte[Marshal.SizeOf<ScpHeader>()];
             stream.Read(hdr, 0, Marshal.SizeOf<ScpHeader>());
diff --git a/Aaru.Images/SuperCardPro/Read.cs b/Aaru.Images/SuperCardPro/Read.cs
index 765b53970..3f3178e19 100644
--- a/Aaru.Images/SuperCardPro/Read.cs
+++ b/Aaru.Images/SuperCardPro/Read.cs
@@ -48,7 +48,9 @@ namespace Aaru.DiscImages
             Header    = new ScpHeader();
             scpStream = imageFilter.GetDataForkStream();
             scpStream.Seek(0, SeekOrigin.Begin);
-            if(scpStream.Length < Marshal.SizeOf<ScpHeader>()) return false;
+
+            if(scpStream.Length < Marshal.SizeOf<ScpHeader>())
+                return false;
 
             byte[] hdr = new byte[Marshal.SizeOf<ScpHeader>()];
             scpStream.Read(hdr, 0, Marshal.SizeOf<ScpHeader>());
@@ -56,44 +58,54 @@ namespace Aaru.DiscImages
             Header = Marshal.ByteArrayToStructureLittleEndian<ScpHeader>(hdr);
 
             AaruConsole.DebugWriteLine("SuperCardPro plugin", "header.signature = \"{0}\"",
-                                      StringHandlers.CToString(Header.signature));
-            AaruConsole.DebugWriteLine("SuperCardPro plugin", "header.version = {0}.{1}", (Header.version & 0xF0) >> 4,
-                                      Header.version & 0xF);
-            AaruConsole.DebugWriteLine("SuperCardPro plugin", "header.type = {0}",            Header.type);
-            AaruConsole.DebugWriteLine("SuperCardPro plugin", "header.revolutions = {0}",     Header.revolutions);
-            AaruConsole.DebugWriteLine("SuperCardPro plugin", "header.start = {0}",           Header.start);
-            AaruConsole.DebugWriteLine("SuperCardPro plugin", "header.end = {0}",             Header.end);
-            AaruConsole.DebugWriteLine("SuperCardPro plugin", "header.flags = {0}",           Header.flags);
-            AaruConsole.DebugWriteLine("SuperCardPro plugin", "header.bitCellEncoding = {0}", Header.bitCellEncoding);
-            AaruConsole.DebugWriteLine("SuperCardPro plugin", "header.heads = {0}",           Header.heads);
-            AaruConsole.DebugWriteLine("SuperCardPro plugin", "header.reserved = {0}",        Header.reserved);
-            AaruConsole.DebugWriteLine("SuperCardPro plugin", "header.checksum = 0x{0:X8}",   Header.checksum);
+                                       StringHandlers.CToString(Header.signature));
 
-            if(!scpSignature.SequenceEqual(Header.signature)) return false;
+            AaruConsole.DebugWriteLine("SuperCardPro plugin", "header.version = {0}.{1}", (Header.version & 0xF0) >> 4,
+                                       Header.version & 0xF);
+
+            AaruConsole.DebugWriteLine("SuperCardPro plugin", "header.type = {0}", Header.type);
+            AaruConsole.DebugWriteLine("SuperCardPro plugin", "header.revolutions = {0}", Header.revolutions);
+            AaruConsole.DebugWriteLine("SuperCardPro plugin", "header.start = {0}", Header.start);
+            AaruConsole.DebugWriteLine("SuperCardPro plugin", "header.end = {0}", Header.end);
+            AaruConsole.DebugWriteLine("SuperCardPro plugin", "header.flags = {0}", Header.flags);
+            AaruConsole.DebugWriteLine("SuperCardPro plugin", "header.bitCellEncoding = {0}", Header.bitCellEncoding);
+            AaruConsole.DebugWriteLine("SuperCardPro plugin", "header.heads = {0}", Header.heads);
+            AaruConsole.DebugWriteLine("SuperCardPro plugin", "header.reserved = {0}", Header.reserved);
+            AaruConsole.DebugWriteLine("SuperCardPro plugin", "header.checksum = 0x{0:X8}", Header.checksum);
+
+            if(!scpSignature.SequenceEqual(Header.signature))
+                return false;
 
             ScpTracks = new Dictionary<byte, TrackHeader>();
 
             for(byte t = Header.start; t <= Header.end; t++)
             {
-                if(t >= Header.offsets.Length) break;
+                if(t >= Header.offsets.Length)
+                    break;
 
                 scpStream.Position = Header.offsets[t];
-                TrackHeader trk =
-                    new TrackHeader {Signature = new byte[3], Entries = new TrackEntry[Header.revolutions]};
+
+                var trk = new TrackHeader
+                {
+                    Signature = new byte[3], Entries = new TrackEntry[Header.revolutions]
+                };
+
                 scpStream.Read(trk.Signature, 0, trk.Signature.Length);
                 trk.TrackNumber = (byte)scpStream.ReadByte();
 
                 if(!trk.Signature.SequenceEqual(trkSignature))
                 {
                     AaruConsole.DebugWriteLine("SuperCardPro plugin",
-                                              "Track header at {0} contains incorrect signature.", Header.offsets[t]);
+                                               "Track header at {0} contains incorrect signature.", Header.offsets[t]);
+
                     continue;
                 }
 
                 if(trk.TrackNumber != t)
                 {
                     AaruConsole.DebugWriteLine("SuperCardPro plugin", "Track number at {0} should be {1} but is {2}.",
-                                              Header.offsets[t], t, trk.TrackNumber);
+                                               Header.offsets[t], t, trk.TrackNumber);
+
                     continue;
                 }
 
@@ -105,6 +117,7 @@ namespace Aaru.DiscImages
                     scpStream.Read(rev, 0, Marshal.SizeOf<TrackEntry>());
 
                     trk.Entries[r] = Marshal.ByteArrayToStructureLittleEndian<TrackEntry>(rev);
+
                     // De-relative offsets
                     trk.Entries[r].dataOffset += Header.offsets[t];
                 }
@@ -135,32 +148,44 @@ namespace Aaru.DiscImages
                         ScpFooter footer = Marshal.ByteArrayToStructureLittleEndian<ScpFooter>(ftr);
 
                         AaruConsole.DebugWriteLine("SuperCardPro plugin", "footer.manufacturerOffset = 0x{0:X8}",
-                                                  footer.manufacturerOffset);
+                                                   footer.manufacturerOffset);
+
                         AaruConsole.DebugWriteLine("SuperCardPro plugin", "footer.modelOffset = 0x{0:X8}",
-                                                  footer.modelOffset);
+                                                   footer.modelOffset);
+
                         AaruConsole.DebugWriteLine("SuperCardPro plugin", "footer.serialOffset = 0x{0:X8}",
-                                                  footer.serialOffset);
+                                                   footer.serialOffset);
+
                         AaruConsole.DebugWriteLine("SuperCardPro plugin", "footer.creatorOffset = 0x{0:X8}",
-                                                  footer.creatorOffset);
+                                                   footer.creatorOffset);
+
                         AaruConsole.DebugWriteLine("SuperCardPro plugin", "footer.applicationOffset = 0x{0:X8}",
-                                                  footer.applicationOffset);
+                                                   footer.applicationOffset);
+
                         AaruConsole.DebugWriteLine("SuperCardPro plugin", "footer.commentsOffset = 0x{0:X8}",
-                                                  footer.commentsOffset);
+                                                   footer.commentsOffset);
+
                         AaruConsole.DebugWriteLine("SuperCardPro plugin", "footer.creationTime = {0}",
-                                                  footer.creationTime);
+                                                   footer.creationTime);
+
                         AaruConsole.DebugWriteLine("SuperCardPro plugin", "footer.modificationTime = {0}",
-                                                  footer.modificationTime);
+                                                   footer.modificationTime);
+
                         AaruConsole.DebugWriteLine("SuperCardPro plugin", "footer.applicationVersion = {0}.{1}",
-                                                  (footer.applicationVersion & 0xF0) >> 4,
-                                                  footer.applicationVersion & 0xF);
+                                                   (footer.applicationVersion & 0xF0) >> 4,
+                                                   footer.applicationVersion & 0xF);
+
                         AaruConsole.DebugWriteLine("SuperCardPro plugin", "footer.hardwareVersion = {0}.{1}",
-                                                  (footer.hardwareVersion & 0xF0) >> 4, footer.hardwareVersion & 0xF);
+                                                   (footer.hardwareVersion & 0xF0) >> 4, footer.hardwareVersion & 0xF);
+
                         AaruConsole.DebugWriteLine("SuperCardPro plugin", "footer.firmwareVersion = {0}.{1}",
-                                                  (footer.firmwareVersion & 0xF0) >> 4, footer.firmwareVersion & 0xF);
+                                                   (footer.firmwareVersion & 0xF0) >> 4, footer.firmwareVersion & 0xF);
+
                         AaruConsole.DebugWriteLine("SuperCardPro plugin", "footer.imageVersion = {0}.{1}",
-                                                  (footer.imageVersion & 0xF0) >> 4, footer.imageVersion & 0xF);
+                                                   (footer.imageVersion & 0xF0) >> 4, footer.imageVersion & 0xF);
+
                         AaruConsole.DebugWriteLine("SuperCardPro plugin", "footer.signature = \"{0}\"",
-                                                  StringHandlers.CToString(BitConverter.GetBytes(footer.signature)));
+                                                   StringHandlers.CToString(BitConverter.GetBytes(footer.signature)));
 
                         imageInfo.DriveManufacturer = ReadPStringUtf8(scpStream, footer.manufacturerOffset);
                         imageInfo.DriveModel        = ReadPStringUtf8(scpStream, footer.modelOffset);
@@ -170,17 +195,22 @@ namespace Aaru.DiscImages
                         imageInfo.Comments          = ReadPStringUtf8(scpStream, footer.commentsOffset);
 
                         AaruConsole.DebugWriteLine("SuperCardPro plugin", "ImageInfo.driveManufacturer = \"{0}\"",
-                                                  imageInfo.DriveManufacturer);
+                                                   imageInfo.DriveManufacturer);
+
                         AaruConsole.DebugWriteLine("SuperCardPro plugin", "ImageInfo.driveModel = \"{0}\"",
-                                                  imageInfo.DriveModel);
+                                                   imageInfo.DriveModel);
+
                         AaruConsole.DebugWriteLine("SuperCardPro plugin", "ImageInfo.driveSerialNumber = \"{0}\"",
-                                                  imageInfo.DriveSerialNumber);
+                                                   imageInfo.DriveSerialNumber);
+
                         AaruConsole.DebugWriteLine("SuperCardPro plugin", "ImageInfo.imageCreator = \"{0}\"",
-                                                  imageInfo.Creator);
+                                                   imageInfo.Creator);
+
                         AaruConsole.DebugWriteLine("SuperCardPro plugin", "ImageInfo.imageApplication = \"{0}\"",
-                                                  imageInfo.Application);
+                                                   imageInfo.Application);
+
                         AaruConsole.DebugWriteLine("SuperCardPro plugin", "ImageInfo.imageComments = \"{0}\"",
-                                                  imageInfo.Comments);
+                                                   imageInfo.Comments);
 
                         imageInfo.CreationTime = footer.creationTime != 0
                                                      ? DateHandlers.UnixToDateTime(footer.creationTime)
@@ -191,14 +221,17 @@ namespace Aaru.DiscImages
                                                              : imageFilter.GetLastWriteTime();
 
                         AaruConsole.DebugWriteLine("SuperCardPro plugin", "ImageInfo.imageCreationTime = {0}",
-                                                  imageInfo.CreationTime);
+                                                   imageInfo.CreationTime);
+
                         AaruConsole.DebugWriteLine("SuperCardPro plugin", "ImageInfo.imageLastModificationTime = {0}",
-                                                  imageInfo.LastModificationTime);
+                                                   imageInfo.LastModificationTime);
 
                         imageInfo.ApplicationVersion =
                             $"{(footer.applicationVersion & 0xF0) >> 4}.{footer.applicationVersion & 0xF}";
+
                         imageInfo.DriveFirmwareRevision =
                             $"{(footer.firmwareVersion & 0xF0) >> 4}.{footer.firmwareVersion & 0xF}";
+
                         imageInfo.Version = $"{(footer.imageVersion & 0xF0) >> 4}.{footer.imageVersion & 0xF}";
 
                         break;
diff --git a/Aaru.Images/SuperCardPro/Structs.cs b/Aaru.Images/SuperCardPro/Structs.cs
index 995d2ddee..651a6e2eb 100644
--- a/Aaru.Images/SuperCardPro/Structs.cs
+++ b/Aaru.Images/SuperCardPro/Structs.cs
@@ -74,19 +74,19 @@ namespace Aaru.DiscImages
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct ScpFooter
         {
-            public uint manufacturerOffset;
-            public uint modelOffset;
-            public uint serialOffset;
-            public uint creatorOffset;
-            public uint applicationOffset;
-            public uint commentsOffset;
-            public long creationTime;
-            public long modificationTime;
-            public byte applicationVersion;
-            public byte hardwareVersion;
-            public byte firmwareVersion;
-            public byte imageVersion;
-            public uint signature;
+            public readonly uint manufacturerOffset;
+            public readonly uint modelOffset;
+            public readonly uint serialOffset;
+            public readonly uint creatorOffset;
+            public readonly uint applicationOffset;
+            public readonly uint commentsOffset;
+            public readonly long creationTime;
+            public readonly long modificationTime;
+            public readonly byte applicationVersion;
+            public readonly byte hardwareVersion;
+            public readonly byte firmwareVersion;
+            public readonly byte imageVersion;
+            public readonly uint signature;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/SuperCardPro/SuperCardPro.cs b/Aaru.Images/SuperCardPro/SuperCardPro.cs
index ae92de9f8..0ae9997e1 100644
--- a/Aaru.Images/SuperCardPro/SuperCardPro.cs
+++ b/Aaru.Images/SuperCardPro/SuperCardPro.cs
@@ -46,31 +46,18 @@ namespace Aaru.DiscImages
         Stream                               scpStream;
         public Dictionary<byte, TrackHeader> ScpTracks;
 
-        public SuperCardPro()
+        public SuperCardPro() => imageInfo = new ImageInfo
         {
-            imageInfo = new ImageInfo
-            {
-                ReadableSectorTags    = new List<SectorTagType>(),
-                ReadableMediaTags     = new List<MediaTagType>(),
-                HasPartitions         = false,
-                HasSessions           = false,
-                Version               = null,
-                Application           = null,
-                ApplicationVersion    = null,
-                Creator               = null,
-                Comments              = null,
-                MediaManufacturer     = null,
-                MediaModel            = null,
-                MediaSerialNumber     = null,
-                MediaBarcode          = null,
-                MediaPartNumber       = null,
-                MediaSequence         = 0,
-                LastMediaSequence     = 0,
-                DriveManufacturer     = null,
-                DriveModel            = null,
-                DriveSerialNumber     = null,
-                DriveFirmwareRevision = null
-            };
-        }
+            ReadableSectorTags = new List<SectorTagType>(), ReadableMediaTags = new List<MediaTagType>(),
+            HasPartitions      = false, HasSessions                           = false, Version = null,
+            Application        = null,
+            ApplicationVersion = null, Creator = null, Comments = null,
+            MediaManufacturer  = null,
+            MediaModel         = null, MediaSerialNumber = null, MediaBarcode = null,
+            MediaPartNumber    = null,
+            MediaSequence      = 0, LastMediaSequence = 0, DriveManufacturer = null,
+            DriveModel         = null,
+            DriveSerialNumber  = null, DriveFirmwareRevision = null
+        };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/SuperCardPro/Verify.cs b/Aaru.Images/SuperCardPro/Verify.cs
index e08049c0c..7bc49c163 100644
--- a/Aaru.Images/SuperCardPro/Verify.cs
+++ b/Aaru.Images/SuperCardPro/Verify.cs
@@ -39,7 +39,8 @@ namespace Aaru.DiscImages
     {
         public bool? VerifyMediaImage()
         {
-            if(Header.flags.HasFlag(ScpFlags.Writable)) return null;
+            if(Header.flags.HasFlag(ScpFlags.Writable))
+                return null;
 
             byte[] wholeFile = new byte[scpStream.Length];
             uint   sum       = 0;
@@ -47,7 +48,8 @@ namespace Aaru.DiscImages
             scpStream.Position = 0;
             scpStream.Read(wholeFile, 0, wholeFile.Length);
 
-            for(int i = 0x10; i < wholeFile.Length; i++) sum += wholeFile[i];
+            for(int i = 0x10; i < wholeFile.Length; i++)
+                sum += wholeFile[i];
 
             return Header.checksum == sum;
         }
@@ -55,7 +57,7 @@ namespace Aaru.DiscImages
         public bool? VerifySector(ulong sectorAddress) =>
             throw new NotImplementedException("Flux decoding is not yet implemented.");
 
-        public bool? VerifySectors(ulong           sectorAddress, uint length, out List<ulong> failingLbas,
+        public bool? VerifySectors(ulong sectorAddress, uint length, out List<ulong> failingLbas,
                                    out List<ulong> unknownLbas) =>
             throw new NotImplementedException("Flux decoding is not yet implemented.");
     }
diff --git a/Aaru.Images/T98/Identify.cs b/Aaru.Images/T98/Identify.cs
index 2a3811eea..72825e761 100644
--- a/Aaru.Images/T98/Identify.cs
+++ b/Aaru.Images/T98/Identify.cs
@@ -44,7 +44,8 @@ namespace Aaru.DiscImages
             Stream stream = imageFilter.GetDataForkStream();
             stream.Seek(0, SeekOrigin.Begin);
 
-            if(stream.Length % 256 != 0) return false;
+            if(stream.Length % 256 != 0)
+                return false;
 
             byte[] hdrB = new byte[256];
             stream.Read(hdrB, 0, hdrB.Length);
@@ -59,7 +60,7 @@ namespace Aaru.DiscImages
 
             // This format is expanding, so length can be smaller
             // Just grow it, I won't risk false positives...
-            return stream.Length == cylinders * 8 * 33 * 256 + 256;
+            return stream.Length == (cylinders * 8 * 33 * 256) + 256;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/T98/Properties.cs b/Aaru.Images/T98/Properties.cs
index 8ad0a9810..9bf324c06 100644
--- a/Aaru.Images/T98/Properties.cs
+++ b/Aaru.Images/T98/Properties.cs
@@ -41,26 +41,31 @@ namespace Aaru.DiscImages
 {
     public partial class T98
     {
-        public string                     Name                => "T98 Hard Disk Image";
-        public Guid                       Id                  => new Guid("0410003E-6E7B-40E6-9328-BA5651ADF6B7");
-        public ImageInfo                  Info                => imageInfo;
-        public string                     Author              => "Natalia Portillo";
-        public string                     Format              => "T98 disk image";
-        public List<DumpHardwareType>     DumpHardware        => null;
-        public CICMMetadataType           CicmMetadata        => null;
-        public IEnumerable<MediaTagType>  SupportedMediaTags  => new MediaTagType[] { };
-        public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[] { };
-        public IEnumerable<MediaType> SupportedMediaTypes =>
-            new[]
-            {
-                MediaType.GENERIC_HDD, MediaType.Unknown, MediaType.FlashDrive, MediaType.CompactFlash,
-                MediaType.CompactFlashType2, MediaType.PCCardTypeI, MediaType.PCCardTypeII, MediaType.PCCardTypeIII,
-                MediaType.PCCardTypeIV
-            };
+        public string                 Name         => "T98 Hard Disk Image";
+        public Guid                   Id           => new Guid("0410003E-6E7B-40E6-9328-BA5651ADF6B7");
+        public ImageInfo              Info         => imageInfo;
+        public string                 Author       => "Natalia Portillo";
+        public string                 Format       => "T98 disk image";
+        public List<DumpHardwareType> DumpHardware => null;
+        public CICMMetadataType       CicmMetadata => null;
+        public IEnumerable<MediaTagType> SupportedMediaTags => new MediaTagType[]
+            {};
+        public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[]
+            {};
+        public IEnumerable<MediaType> SupportedMediaTypes => new[]
+        {
+            MediaType.GENERIC_HDD, MediaType.Unknown, MediaType.FlashDrive, MediaType.CompactFlash,
+            MediaType.CompactFlashType2, MediaType.PCCardTypeI, MediaType.PCCardTypeII, MediaType.PCCardTypeIII,
+            MediaType.PCCardTypeIV
+        };
         public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
-            new (string name, Type type, string description, object @default)[] { };
-        public IEnumerable<string> KnownExtensions => new[] {".t98"};
-        public bool                IsWriting       { get; private set; }
-        public string              ErrorMessage    { get; private set; }
+            new (string name, Type type, string description, object @default)[]
+                {};
+        public IEnumerable<string> KnownExtensions => new[]
+        {
+            ".t98"
+        };
+        public bool   IsWriting    { get; private set; }
+        public string ErrorMessage { get; private set; }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/T98/Read.cs b/Aaru.Images/T98/Read.cs
index 7b4913d3a..e3b5250ca 100644
--- a/Aaru.Images/T98/Read.cs
+++ b/Aaru.Images/T98/Read.cs
@@ -45,7 +45,8 @@ namespace Aaru.DiscImages
             Stream stream = imageFilter.GetDataForkStream();
             stream.Seek(0, SeekOrigin.Begin);
 
-            if(stream.Length % 256 != 0) return false;
+            if(stream.Length % 256 != 0)
+                return false;
 
             byte[] hdrB = new byte[256];
             stream.Read(hdrB, 0, hdrB.Length);
@@ -62,7 +63,7 @@ namespace Aaru.DiscImages
             imageInfo.CreationTime         = imageFilter.GetCreationTime();
             imageInfo.LastModificationTime = imageFilter.GetLastWriteTime();
             imageInfo.MediaTitle           = Path.GetFileNameWithoutExtension(imageFilter.GetFilename());
-            imageInfo.Sectors              = (ulong)(stream.Length / 256 - 1);
+            imageInfo.Sectors              = (ulong)((stream.Length / 256) - 1);
             imageInfo.XmlMediaType         = XmlMediaType.BlockMedia;
             imageInfo.SectorSize           = 256;
             imageInfo.Cylinders            = (uint)cylinders;
@@ -88,7 +89,7 @@ namespace Aaru.DiscImages
 
             Stream stream = t98ImageFilter.GetDataForkStream();
 
-            stream.Seek((long)(256 + sectorAddress * imageInfo.SectorSize), SeekOrigin.Begin);
+            stream.Seek((long)(256 + (sectorAddress * imageInfo.SectorSize)), SeekOrigin.Begin);
 
             stream.Read(buffer, 0, (int)(length * imageInfo.SectorSize));
 
diff --git a/Aaru.Images/T98/T98.cs b/Aaru.Images/T98/T98.cs
index 1b996efb4..1a9a4d952 100644
--- a/Aaru.Images/T98/T98.cs
+++ b/Aaru.Images/T98/T98.cs
@@ -44,31 +44,18 @@ namespace Aaru.DiscImages
         IFilter    t98ImageFilter;
         FileStream writingStream;
 
-        public T98()
+        public T98() => imageInfo = new ImageInfo
         {
-            imageInfo = new ImageInfo
-            {
-                ReadableSectorTags    = new List<SectorTagType>(),
-                ReadableMediaTags     = new List<MediaTagType>(),
-                HasPartitions         = false,
-                HasSessions           = false,
-                Version               = null,
-                Application           = null,
-                ApplicationVersion    = null,
-                Creator               = null,
-                Comments              = null,
-                MediaManufacturer     = null,
-                MediaModel            = null,
-                MediaSerialNumber     = null,
-                MediaBarcode          = null,
-                MediaPartNumber       = null,
-                MediaSequence         = 0,
-                LastMediaSequence     = 0,
-                DriveManufacturer     = null,
-                DriveModel            = null,
-                DriveSerialNumber     = null,
-                DriveFirmwareRevision = null
-            };
-        }
+            ReadableSectorTags = new List<SectorTagType>(), ReadableMediaTags = new List<MediaTagType>(),
+            HasPartitions      = false, HasSessions                           = false, Version = null,
+            Application        = null,
+            ApplicationVersion = null, Creator = null, Comments = null,
+            MediaManufacturer  = null,
+            MediaModel         = null, MediaSerialNumber = null, MediaBarcode = null,
+            MediaPartNumber    = null,
+            MediaSequence      = 0, LastMediaSequence = 0, DriveManufacturer = null,
+            DriveModel         = null,
+            DriveSerialNumber  = null, DriveFirmwareRevision = null
+        };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/T98/Write.cs b/Aaru.Images/T98/Write.cs
index e12b2d64d..996139635 100644
--- a/Aaru.Images/T98/Write.cs
+++ b/Aaru.Images/T98/Write.cs
@@ -44,37 +44,48 @@ namespace Aaru.DiscImages
     public partial class T98
     {
         public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
-                           uint   sectorSize)
+                           uint sectorSize)
         {
             if(sectorSize != 256)
             {
                 ErrorMessage = "Unsupported sector size";
+
                 return false;
             }
 
             if(!SupportedMediaTypes.Contains(mediaType))
             {
                 ErrorMessage = $"Unsupport media format {mediaType}";
+
                 return false;
             }
 
-            imageInfo = new ImageInfo {MediaType = mediaType, SectorSize = sectorSize, Sectors = sectors};
+            imageInfo = new ImageInfo
+            {
+                MediaType = mediaType, SectorSize = sectorSize, Sectors = sectors
+            };
 
-            try { writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None); }
+            try
+            {
+                writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
+            }
             catch(IOException e)
             {
                 ErrorMessage = $"Could not create new image file, exception {e.Message}";
+
                 return false;
             }
 
             IsWriting    = true;
             ErrorMessage = null;
+
             return true;
         }
 
         public bool WriteMediaTag(byte[] data, MediaTagType tag)
         {
             ErrorMessage = "Writing media tags is not supported.";
+
             return false;
         }
 
@@ -83,25 +94,29 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Tried to write on a non-writable image";
+
                 return false;
             }
 
             if(data.Length != imageInfo.SectorSize)
             {
                 ErrorMessage = "Incorrect data size";
+
                 return false;
             }
 
             if(sectorAddress >= imageInfo.Sectors)
             {
                 ErrorMessage = "Tried to write past image size";
+
                 return false;
             }
 
-            writingStream.Seek((long)(256 + sectorAddress * 256), SeekOrigin.Begin);
+            writingStream.Seek((long)(256 + (sectorAddress * 256)), SeekOrigin.Begin);
             writingStream.Write(data, 0, data.Length);
 
             ErrorMessage = "";
+
             return true;
         }
 
@@ -110,37 +125,43 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Tried to write on a non-writable image";
+
                 return false;
             }
 
             if(data.Length % imageInfo.SectorSize != 0)
             {
                 ErrorMessage = "Incorrect data size";
+
                 return false;
             }
 
             if(sectorAddress + length > imageInfo.Sectors)
             {
                 ErrorMessage = "Tried to write past image size";
+
                 return false;
             }
 
-            writingStream.Seek((long)(256 + sectorAddress * 256), SeekOrigin.Begin);
+            writingStream.Seek((long)(256 + (sectorAddress * 256)), SeekOrigin.Begin);
             writingStream.Write(data, 0, data.Length);
 
             ErrorMessage = "";
+
             return true;
         }
 
         public bool WriteSectorLong(byte[] data, ulong sectorAddress)
         {
             ErrorMessage = "Writing sectors with tags is not supported.";
+
             return false;
         }
 
         public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
         {
             ErrorMessage = "Writing sectors with tags is not supported.";
+
             return false;
         }
 
@@ -149,6 +170,7 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Image is not opened for writing";
+
                 return false;
             }
 
@@ -161,6 +183,7 @@ namespace Aaru.DiscImages
 
             IsWriting    = false;
             ErrorMessage = "";
+
             return true;
         }
 
@@ -169,12 +192,14 @@ namespace Aaru.DiscImages
         public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
         {
             ErrorMessage = "Unsupported feature";
+
             return false;
         }
 
         public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
         {
             ErrorMessage = "Unsupported feature";
+
             return false;
         }
 
diff --git a/Aaru.Images/TeleDisk/Constants.cs b/Aaru.Images/TeleDisk/Constants.cs
index 079c9ebce..40ef4ea5c 100644
--- a/Aaru.Images/TeleDisk/Constants.cs
+++ b/Aaru.Images/TeleDisk/Constants.cs
@@ -36,6 +36,7 @@ namespace Aaru.DiscImages
     {
         // "TD" as little endian uint.
         const ushort TD_MAGIC = 0x4454;
+
         // "td" as little endian uint. Means whole file is compressed (aka Advanced Compression)
         const ushort TD_ADV_COMP_MAGIC = 0x6474;
 
@@ -57,6 +58,7 @@ namespace Aaru.DiscImages
         const byte STEPPING_SINGLE    = 0x00;
         const byte STEPPING_DOUBLE    = 0x01;
         const byte STEPPING_EVEN_ONLY = 0x02;
+
         // If this bit is set, there is a comment block
         const byte COMMENT_BLOCK_PRESENT = 0x80;
 
@@ -75,22 +77,29 @@ namespace Aaru.DiscImages
         // Flags
         // Address mark repeats inside same track
         const byte FLAGS_SECTOR_DUPLICATE = 0x01;
+
         // Sector gave CRC error on reading
         const byte FLAGS_SECTOR_CRC_ERROR = 0x02;
+
         // Address mark indicates deleted sector
         const byte FLAGS_SECTOR_DELETED = 0x04;
+
         // Sector skipped as FAT said it's unused
         const byte FLAGS_SECTOR_SKIPPED = 0x10;
+
         // There was an address mark, but no data following
         const byte FLAGS_SECTOR_DATALESS = 0x20;
+
         // There was data without address mark
         const byte FLAGS_SECTOR_NO_ID = 0x40;
 
         // Data block encodings
         // Data is copied as is
         const byte DATA_BLOCK_COPY = 0x00;
+
         // Data is encoded as a pair of len.value uint16s
         const byte DATA_BLOCK_PATTERN = 0x01;
+
         // Data is encoded as RLE
         const byte DATA_BLOCK_RLE = 0x02;
 
diff --git a/Aaru.Images/TeleDisk/Helpers.cs b/Aaru.Images/TeleDisk/Helpers.cs
index ac78b889f..6c4467db9 100644
--- a/Aaru.Images/TeleDisk/Helpers.cs
+++ b/Aaru.Images/TeleDisk/Helpers.cs
@@ -41,9 +41,9 @@ namespace Aaru.DiscImages
     {
         (ushort cylinder, byte head, byte sector) LbaToChs(ulong lba)
         {
-            ushort cylinder = (ushort)(lba                           / (imageInfo.Heads * imageInfo.SectorsPerTrack));
-            byte   head     = (byte)(lba / imageInfo.SectorsPerTrack % imageInfo.Heads);
-            byte   sector   = (byte)(lba % imageInfo.SectorsPerTrack + 1);
+            ushort cylinder = (ushort)(lba / (imageInfo.Heads * imageInfo.SectorsPerTrack));
+            byte   head     = (byte)((lba                     / imageInfo.SectorsPerTrack) % imageInfo.Heads);
+            byte   sector   = (byte)((lba                     % imageInfo.SectorsPerTrack) + 1);
 
             return (cylinder, head, sector);
         }
@@ -71,28 +71,36 @@ namespace Aaru.DiscImages
         static byte[] DecodeTeleDiskData(byte sectorSize, byte encodingType, byte[] encodedData)
         {
             byte[] decodedData;
+
             switch(sectorSize)
             {
                 case SECTOR_SIZE_128:
                     decodedData = new byte[128];
+
                     break;
                 case SECTOR_SIZE_256:
                     decodedData = new byte[256];
+
                     break;
                 case SECTOR_SIZE_512:
                     decodedData = new byte[512];
+
                     break;
                 case SECTOR_SIZE_1K:
                     decodedData = new byte[1024];
+
                     break;
                 case SECTOR_SIZE_2K:
                     decodedData = new byte[2048];
+
                     break;
                 case SECTOR_SIZE_4K:
                     decodedData = new byte[4096];
+
                     break;
                 case SECTOR_SIZE_8K:
                     decodedData = new byte[8192];
+
                     break;
                 default: throw new ImageNotSupportedException($"Sector size {sectorSize} is incorrect.");
             }
@@ -101,11 +109,13 @@ namespace Aaru.DiscImages
             {
                 case DATA_BLOCK_COPY:
                     Array.Copy(encodedData, decodedData, decodedData.Length);
+
                     break;
                 case DATA_BLOCK_PATTERN:
                 {
                     int ins  = 0;
                     int outs = 0;
+
                     while(ins < encodedData.Length)
                     {
                         byte[] repeatValue = new byte[2];
@@ -120,24 +130,31 @@ namespace Aaru.DiscImages
                     }
 
                     AaruConsole.DebugWriteLine("TeleDisk plugin", "(Block pattern decoder): Input data size: {0} bytes",
-                                              encodedData.Length);
+                                               encodedData.Length);
+
                     AaruConsole.DebugWriteLine("TeleDisk plugin", "(Block pattern decoder): Processed input: {0} bytes",
-                                              ins);
-                    AaruConsole.DebugWriteLine("TeleDisk plugin", "(Block pattern decoder): Output data size: {0} bytes",
-                                              decodedData.Length);
-                    AaruConsole.DebugWriteLine("TeleDisk plugin", "(Block pattern decoder): Processed Output: {0} bytes",
-                                              outs);
+                                               ins);
+
+                    AaruConsole.DebugWriteLine("TeleDisk plugin",
+                                               "(Block pattern decoder): Output data size: {0} bytes",
+                                               decodedData.Length);
+
+                    AaruConsole.DebugWriteLine("TeleDisk plugin",
+                                               "(Block pattern decoder): Processed Output: {0} bytes", outs);
+
                     break;
                 }
                 case DATA_BLOCK_RLE:
                 {
                     int ins  = 0;
                     int outs = 0;
+
                     while(ins < encodedData.Length)
                     {
                         byte length;
 
                         byte encoding = encodedData[ins];
+
                         if(encoding == 0x00)
                         {
                             length = encodedData[ins + 1];
@@ -160,10 +177,13 @@ namespace Aaru.DiscImages
                     }
 
                     AaruConsole.DebugWriteLine("TeleDisk plugin", "(RLE decoder): Input data size: {0} bytes",
-                                              encodedData.Length);
+                                               encodedData.Length);
+
                     AaruConsole.DebugWriteLine("TeleDisk plugin", "(RLE decoder): Processed input: {0} bytes", ins);
+
                     AaruConsole.DebugWriteLine("TeleDisk plugin", "(RLE decoder): Output data size: {0} bytes",
-                                              decodedData.Length);
+                                               decodedData.Length);
+
                     AaruConsole.DebugWriteLine("TeleDisk plugin", "(RLE decoder): Processed Output: {0} bytes", outs);
 
                     break;
@@ -187,8 +207,7 @@ namespace Aaru.DiscImages
                         case 163840:
                         {
                             // Acorn disk uses 256 bytes/sector
-                            return imageInfo.SectorSize == 256
-                                       ? MediaType.ACORN_525_SS_DD_40
+                            return imageInfo.SectorSize == 256 ? MediaType.ACORN_525_SS_DD_40
                                        : MediaType.DOS_525_SS_DD_8;
 
                             // DOS disks use 512 bytes/sector
@@ -203,8 +222,7 @@ namespace Aaru.DiscImages
                         case 327680:
                         {
                             // Acorn disk uses 256 bytes/sector
-                            return imageInfo.SectorSize == 256
-                                       ? MediaType.ACORN_525_SS_DD_80
+                            return imageInfo.SectorSize == 256 ? MediaType.ACORN_525_SS_DD_80
                                        : MediaType.DOS_525_DS_DD_8;
 
                             // DOS disks use 512 bytes/sector
@@ -229,7 +247,8 @@ namespace Aaru.DiscImages
                         default:
                         {
                             AaruConsole.DebugWriteLine("TeleDisk plugin", "Unknown 5,25\" disk with {0} bytes",
-                                                      totalDiskSize);
+                                                       totalDiskSize);
+
                             return MediaType.Unknown;
                         }
                     }
@@ -261,7 +280,8 @@ namespace Aaru.DiscImages
                         default:
                         {
                             AaruConsole.DebugWriteLine("TeleDisk plugin", "Unknown 3,5\" disk with {0} bytes",
-                                                      totalDiskSize);
+                                                       totalDiskSize);
+
                             return MediaType.Unknown;
                         }
                     }
@@ -296,15 +316,17 @@ namespace Aaru.DiscImages
                         default:
                         {
                             AaruConsole.DebugWriteLine("TeleDisk plugin", "Unknown 8\" disk with {0} bytes",
-                                                      totalDiskSize);
+                                                       totalDiskSize);
+
                             return MediaType.Unknown;
                         }
                     }
                 }
                 default:
                 {
-                    AaruConsole.DebugWriteLine("TeleDisk plugin", "Unknown drive type {1} with {0} bytes", totalDiskSize,
-                                              header.DriveType);
+                    AaruConsole.DebugWriteLine("TeleDisk plugin", "Unknown drive type {1} with {0} bytes",
+                                               totalDiskSize, header.DriveType);
+
                     return MediaType.Unknown;
                 }
             }
diff --git a/Aaru.Images/TeleDisk/Identify.cs b/Aaru.Images/TeleDisk/Identify.cs
index b709ad128..72aa5c031 100644
--- a/Aaru.Images/TeleDisk/Identify.cs
+++ b/Aaru.Images/TeleDisk/Identify.cs
@@ -50,7 +50,9 @@ namespace Aaru.DiscImages
 
             header.Signature = BitConverter.ToUInt16(headerBytes, 0);
 
-            if(header.Signature != TD_MAGIC && header.Signature != TD_ADV_COMP_MAGIC) return false;
+            if(header.Signature != TD_MAGIC &&
+               header.Signature != TD_ADV_COMP_MAGIC)
+                return false;
 
             header.Sequence      = headerBytes[2];
             header.DiskSet       = headerBytes[3];
@@ -66,28 +68,32 @@ namespace Aaru.DiscImages
             Array.Copy(headerBytes, headerBytesForCrc, 10);
             ushort calculatedHeaderCrc = TeleDiskCrc(0x0000, headerBytesForCrc);
 
-            AaruConsole.DebugWriteLine("TeleDisk plugin", "header.signature = 0x{0:X4}",      header.Signature);
-            AaruConsole.DebugWriteLine("TeleDisk plugin", "header.sequence = 0x{0:X2}",       header.Sequence);
-            AaruConsole.DebugWriteLine("TeleDisk plugin", "header.diskSet = 0x{0:X2}",        header.DiskSet);
-            AaruConsole.DebugWriteLine("TeleDisk plugin", "header.version = 0x{0:X2}",        header.Version);
-            AaruConsole.DebugWriteLine("TeleDisk plugin", "header.dataRate = 0x{0:X2}",       header.DataRate);
-            AaruConsole.DebugWriteLine("TeleDisk plugin", "header.driveType = 0x{0:X2}",      header.DriveType);
-            AaruConsole.DebugWriteLine("TeleDisk plugin", "header.stepping = 0x{0:X2}",       header.Stepping);
-            AaruConsole.DebugWriteLine("TeleDisk plugin", "header.dosAllocation = 0x{0:X2}",  header.DosAllocation);
-            AaruConsole.DebugWriteLine("TeleDisk plugin", "header.sides = 0x{0:X2}",          header.Sides);
-            AaruConsole.DebugWriteLine("TeleDisk plugin", "header.crc = 0x{0:X4}",            header.Crc);
+            AaruConsole.DebugWriteLine("TeleDisk plugin", "header.signature = 0x{0:X4}", header.Signature);
+            AaruConsole.DebugWriteLine("TeleDisk plugin", "header.sequence = 0x{0:X2}", header.Sequence);
+            AaruConsole.DebugWriteLine("TeleDisk plugin", "header.diskSet = 0x{0:X2}", header.DiskSet);
+            AaruConsole.DebugWriteLine("TeleDisk plugin", "header.version = 0x{0:X2}", header.Version);
+            AaruConsole.DebugWriteLine("TeleDisk plugin", "header.dataRate = 0x{0:X2}", header.DataRate);
+            AaruConsole.DebugWriteLine("TeleDisk plugin", "header.driveType = 0x{0:X2}", header.DriveType);
+            AaruConsole.DebugWriteLine("TeleDisk plugin", "header.stepping = 0x{0:X2}", header.Stepping);
+            AaruConsole.DebugWriteLine("TeleDisk plugin", "header.dosAllocation = 0x{0:X2}", header.DosAllocation);
+            AaruConsole.DebugWriteLine("TeleDisk plugin", "header.sides = 0x{0:X2}", header.Sides);
+            AaruConsole.DebugWriteLine("TeleDisk plugin", "header.crc = 0x{0:X4}", header.Crc);
             AaruConsole.DebugWriteLine("TeleDisk plugin", "calculated header crc = 0x{0:X4}", calculatedHeaderCrc);
 
             // We need more checks as the magic is too simply.
             // This may deny legal images
 
             // That would be much of a coincidence
-            if(header.Crc == calculatedHeaderCrc) return true;
+            if(header.Crc == calculatedHeaderCrc)
+                return true;
 
-            if(header.Sequence != 0x00) return false;
+            if(header.Sequence != 0x00)
+                return false;
 
-            if(header.DataRate != DATA_RATE_250KBPS && header.DataRate != DATA_RATE_300KBPS &&
-               header.DataRate != DATA_RATE_500KBPS) return false;
+            if(header.DataRate != DATA_RATE_250KBPS &&
+               header.DataRate != DATA_RATE_300KBPS &&
+               header.DataRate != DATA_RATE_500KBPS)
+                return false;
 
             return header.DriveType == DRIVE_TYPE_35_DD  || header.DriveType == DRIVE_TYPE_35_ED          ||
                    header.DriveType == DRIVE_TYPE_35_HD  || header.DriveType == DRIVE_TYPE_525_DD         ||
diff --git a/Aaru.Images/TeleDisk/Read.cs b/Aaru.Images/TeleDisk/Read.cs
index 2665ac83f..2efe89cdb 100644
--- a/Aaru.Images/TeleDisk/Read.cs
+++ b/Aaru.Images/TeleDisk/Read.cs
@@ -48,7 +48,7 @@ namespace Aaru.DiscImages
             header = new TeleDiskHeader();
             byte[] headerBytes = new byte[12];
             inStream = imageFilter.GetDataForkStream();
-            MemoryStream stream = new MemoryStream();
+            var stream = new MemoryStream();
             inStream.Seek(0, SeekOrigin.Begin);
 
             inStream.Read(headerBytes, 0, 12);
@@ -56,7 +56,9 @@ namespace Aaru.DiscImages
 
             header.Signature = BitConverter.ToUInt16(headerBytes, 0);
 
-            if(header.Signature != TD_MAGIC && header.Signature != TD_ADV_COMP_MAGIC) return false;
+            if(header.Signature != TD_MAGIC &&
+               header.Signature != TD_ADV_COMP_MAGIC)
+                return false;
 
             header.Sequence      = headerBytes[2];
             header.DiskSet       = headerBytes[3];
@@ -76,16 +78,16 @@ namespace Aaru.DiscImages
             Array.Copy(headerBytes, headerBytesForCrc, 10);
             ushort calculatedHeaderCrc = TeleDiskCrc(0x0000, headerBytesForCrc);
 
-            AaruConsole.DebugWriteLine("TeleDisk plugin", "header.signature = 0x{0:X4}",      header.Signature);
-            AaruConsole.DebugWriteLine("TeleDisk plugin", "header.sequence = 0x{0:X2}",       header.Sequence);
-            AaruConsole.DebugWriteLine("TeleDisk plugin", "header.diskSet = 0x{0:X2}",        header.DiskSet);
-            AaruConsole.DebugWriteLine("TeleDisk plugin", "header.version = 0x{0:X2}",        header.Version);
-            AaruConsole.DebugWriteLine("TeleDisk plugin", "header.dataRate = 0x{0:X2}",       header.DataRate);
-            AaruConsole.DebugWriteLine("TeleDisk plugin", "header.driveType = 0x{0:X2}",      header.DriveType);
-            AaruConsole.DebugWriteLine("TeleDisk plugin", "header.stepping = 0x{0:X2}",       header.Stepping);
-            AaruConsole.DebugWriteLine("TeleDisk plugin", "header.dosAllocation = 0x{0:X2}",  header.DosAllocation);
-            AaruConsole.DebugWriteLine("TeleDisk plugin", "header.sides = 0x{0:X2}",          header.Sides);
-            AaruConsole.DebugWriteLine("TeleDisk plugin", "header.crc = 0x{0:X4}",            header.Crc);
+            AaruConsole.DebugWriteLine("TeleDisk plugin", "header.signature = 0x{0:X4}", header.Signature);
+            AaruConsole.DebugWriteLine("TeleDisk plugin", "header.sequence = 0x{0:X2}", header.Sequence);
+            AaruConsole.DebugWriteLine("TeleDisk plugin", "header.diskSet = 0x{0:X2}", header.DiskSet);
+            AaruConsole.DebugWriteLine("TeleDisk plugin", "header.version = 0x{0:X2}", header.Version);
+            AaruConsole.DebugWriteLine("TeleDisk plugin", "header.dataRate = 0x{0:X2}", header.DataRate);
+            AaruConsole.DebugWriteLine("TeleDisk plugin", "header.driveType = 0x{0:X2}", header.DriveType);
+            AaruConsole.DebugWriteLine("TeleDisk plugin", "header.stepping = 0x{0:X2}", header.Stepping);
+            AaruConsole.DebugWriteLine("TeleDisk plugin", "header.dosAllocation = 0x{0:X2}", header.DosAllocation);
+            AaruConsole.DebugWriteLine("TeleDisk plugin", "header.sides = 0x{0:X2}", header.Sides);
+            AaruConsole.DebugWriteLine("TeleDisk plugin", "header.crc = 0x{0:X4}", header.Crc);
             AaruConsole.DebugWriteLine("TeleDisk plugin", "calculated header crc = 0x{0:X4}", calculatedHeaderCrc);
 
             // We need more checks as the magic is too simply.
@@ -98,22 +100,30 @@ namespace Aaru.DiscImages
                 AaruConsole.DebugWriteLine("TeleDisk plugin", "Calculated CRC does not coincide with stored one.");
             }
 
-            if(header.Sequence != 0x00) return false;
+            if(header.Sequence != 0x00)
+                return false;
 
-            if(header.DataRate != DATA_RATE_250KBPS && header.DataRate != DATA_RATE_300KBPS &&
-               header.DataRate != DATA_RATE_500KBPS) return false;
+            if(header.DataRate != DATA_RATE_250KBPS &&
+               header.DataRate != DATA_RATE_300KBPS &&
+               header.DataRate != DATA_RATE_500KBPS)
+                return false;
 
-            if(header.DriveType != DRIVE_TYPE_35_DD  && header.DriveType != DRIVE_TYPE_35_ED          &&
-               header.DriveType != DRIVE_TYPE_35_HD  && header.DriveType != DRIVE_TYPE_525_DD         &&
-               header.DriveType != DRIVE_TYPE_525_HD && header.DriveType != DRIVE_TYPE_525_HD_DD_DISK &&
-               header.DriveType != DRIVE_TYPE_8_INCH) return false;
+            if(header.DriveType != DRIVE_TYPE_35_DD          &&
+               header.DriveType != DRIVE_TYPE_35_ED          &&
+               header.DriveType != DRIVE_TYPE_35_HD          &&
+               header.DriveType != DRIVE_TYPE_525_DD         &&
+               header.DriveType != DRIVE_TYPE_525_HD         &&
+               header.DriveType != DRIVE_TYPE_525_HD_DD_DISK &&
+               header.DriveType != DRIVE_TYPE_8_INCH)
+                return false;
 
             if(header.Signature == TD_ADV_COMP_MAGIC)
             {
                 int rd;
                 inStream.Seek(12, SeekOrigin.Begin);
                 stream.Seek(12, SeekOrigin.Begin);
-                TeleDiskLzh lzh = new TeleDiskLzh(inStream);
+                var lzh = new TeleDiskLzh(inStream);
+
                 do
                     if((rd = lzh.Decode(out byte[] obuf, BUFSZ)) > 0)
                         stream.Write(obuf, 0, rd);
@@ -154,25 +164,28 @@ namespace Aaru.DiscImages
 
                 byte[] commentBlockForCrc = new byte[commentHeader.Length + 8];
                 Array.Copy(commentHeaderBytes, 2, commentBlockForCrc, 0, 8);
-                Array.Copy(commentBlock,       0, commentBlockForCrc, 8, commentHeader.Length);
+                Array.Copy(commentBlock, 0, commentBlockForCrc, 8, commentHeader.Length);
 
                 ushort cmtcrc = TeleDiskCrc(0, commentBlockForCrc);
 
                 AaruConsole.DebugWriteLine("TeleDisk plugin", "Comment header");
                 AaruConsole.DebugWriteLine("TeleDisk plugin", "\tcommentheader.crc = 0x{0:X4}", commentHeader.Crc);
-                AaruConsole.DebugWriteLine("TeleDisk plugin", "\tCalculated CRC = 0x{0:X4}",    cmtcrc);
+                AaruConsole.DebugWriteLine("TeleDisk plugin", "\tCalculated CRC = 0x{0:X4}", cmtcrc);
+
                 AaruConsole.DebugWriteLine("TeleDisk plugin", "\tcommentheader.length = {0} bytes",
-                                          commentHeader.Length);
-                AaruConsole.DebugWriteLine("TeleDisk plugin", "\tcommentheader.year = {0}",   commentHeader.Year);
-                AaruConsole.DebugWriteLine("TeleDisk plugin", "\tcommentheader.month = {0}",  commentHeader.Month);
-                AaruConsole.DebugWriteLine("TeleDisk plugin", "\tcommentheader.day = {0}",    commentHeader.Day);
-                AaruConsole.DebugWriteLine("TeleDisk plugin", "\tcommentheader.hour = {0}",   commentHeader.Hour);
+                                           commentHeader.Length);
+
+                AaruConsole.DebugWriteLine("TeleDisk plugin", "\tcommentheader.year = {0}", commentHeader.Year);
+                AaruConsole.DebugWriteLine("TeleDisk plugin", "\tcommentheader.month = {0}", commentHeader.Month);
+                AaruConsole.DebugWriteLine("TeleDisk plugin", "\tcommentheader.day = {0}", commentHeader.Day);
+                AaruConsole.DebugWriteLine("TeleDisk plugin", "\tcommentheader.hour = {0}", commentHeader.Hour);
                 AaruConsole.DebugWriteLine("TeleDisk plugin", "\tcommentheader.minute = {0}", commentHeader.Minute);
                 AaruConsole.DebugWriteLine("TeleDisk plugin", "\tcommentheader.second = {0}", commentHeader.Second);
 
                 aDiskCrcHasFailed |= cmtcrc != commentHeader.Crc;
 
                 for(int i = 0; i < commentBlock.Length; i++)
+
                     // Replace NULLs, used by TeleDisk as newline markers, with UNIX newline marker
                     if(commentBlock[i] == 0x00)
                         commentBlock[i] = 0x0A;
@@ -187,10 +200,12 @@ namespace Aaru.DiscImages
                                                       commentHeader.Second, DateTimeKind.Unspecified);
             }
 
-            if(imageInfo.CreationTime == DateTime.MinValue) imageInfo.CreationTime = imageFilter.GetCreationTime();
+            if(imageInfo.CreationTime == DateTime.MinValue)
+                imageInfo.CreationTime = imageFilter.GetCreationTime();
+
             imageInfo.LastModificationTime = imageFilter.GetLastWriteTime();
 
-            AaruConsole.DebugWriteLine("TeleDisk plugin", "Image created on {0}",  imageInfo.CreationTime);
+            AaruConsole.DebugWriteLine("TeleDisk plugin", "Image created on {0}", imageInfo.CreationTime);
             AaruConsole.DebugWriteLine("TeleDisk plugin", "Image modified on {0}", imageInfo.LastModificationTime);
 
             AaruConsole.DebugWriteLine("TeleDisk plugin", "Parsing image");
@@ -209,25 +224,26 @@ namespace Aaru.DiscImages
             // Count cylinders
             while(true)
             {
-                TeleDiskTrackHeader teleDiskTrack = new TeleDiskTrackHeader
+                var teleDiskTrack = new TeleDiskTrackHeader
                 {
-                    Sectors  = (byte)stream.ReadByte(),
-                    Cylinder = (byte)stream.ReadByte(),
-                    Head     = (byte)stream.ReadByte(),
-                    Crc      = (byte)stream.ReadByte()
+                    Sectors = (byte)stream.ReadByte(), Cylinder = (byte)stream.ReadByte(),
+                    Head    = (byte)stream.ReadByte(), Crc      = (byte)stream.ReadByte()
                 };
 
-                if(teleDiskTrack.Cylinder > totalCylinders) totalCylinders = teleDiskTrack.Cylinder;
-                if(teleDiskTrack.Head     > totalHeads) totalHeads         = teleDiskTrack.Head;
+                if(teleDiskTrack.Cylinder > totalCylinders)
+                    totalCylinders = teleDiskTrack.Cylinder;
+
+                if(teleDiskTrack.Head > totalHeads)
+                    totalHeads = teleDiskTrack.Head;
 
                 if(teleDiskTrack.Sectors == 0xFF) // End of disk image
                     break;
 
                 for(byte processedSectors = 0; processedSectors < teleDiskTrack.Sectors; processedSectors++)
                 {
-                    TeleDiskSectorHeader teleDiskSector = new TeleDiskSectorHeader();
-                    TeleDiskDataHeader   teleDiskData   = new TeleDiskDataHeader();
-                    byte[]               dataSizeBytes  = new byte[2];
+                    var    teleDiskSector = new TeleDiskSectorHeader();
+                    var    teleDiskData   = new TeleDiskDataHeader();
+                    byte[] dataSizeBytes  = new byte[2];
 
                     teleDiskSector.Cylinder     = (byte)stream.ReadByte();
                     teleDiskSector.Head         = (byte)stream.ReadByte();
@@ -236,7 +252,8 @@ namespace Aaru.DiscImages
                     teleDiskSector.Flags        = (byte)stream.ReadByte();
                     teleDiskSector.Crc          = (byte)stream.ReadByte();
 
-                    if(teleDiskSector.SectorNumber > maxSector) maxSector = teleDiskSector.SectorNumber;
+                    if(teleDiskSector.SectorNumber > maxSector)
+                        maxSector = teleDiskSector.SectorNumber;
 
                     if((teleDiskSector.Flags & FLAGS_SECTOR_DATALESS) != FLAGS_SECTOR_DATALESS &&
                        (teleDiskSector.Flags & FLAGS_SECTOR_SKIPPED)  != FLAGS_SECTOR_SKIPPED)
@@ -259,7 +276,8 @@ namespace Aaru.DiscImages
             totalCylinders++;
             totalHeads++;
 
-            if(totalCylinders <= 0 || totalHeads <= 0)
+            if(totalCylinders <= 0 ||
+               totalHeads     <= 0)
                 throw new ImageNotSupportedException("No cylinders or heads found");
 
             bool hasLeadOutOnHead0 = false;
@@ -269,14 +287,13 @@ namespace Aaru.DiscImages
 
             // Count sectors per track
             stream.Seek(currentPos, SeekOrigin.Begin);
+
             while(true)
             {
-                TeleDiskTrackHeader teleDiskTrack = new TeleDiskTrackHeader
+                var teleDiskTrack = new TeleDiskTrackHeader
                 {
-                    Sectors  = (byte)stream.ReadByte(),
-                    Cylinder = (byte)stream.ReadByte(),
-                    Head     = (byte)stream.ReadByte(),
-                    Crc      = (byte)stream.ReadByte()
+                    Sectors = (byte)stream.ReadByte(), Cylinder = (byte)stream.ReadByte(),
+                    Head    = (byte)stream.ReadByte(), Crc      = (byte)stream.ReadByte()
                 };
 
                 if(teleDiskTrack.Sectors == 0xFF) // End of disk image
@@ -287,16 +304,18 @@ namespace Aaru.DiscImages
                     {
                         hasLeadOutOnHead0 |= teleDiskTrack.Head == 0;
                         hasLeadOutOnHead1 |= teleDiskTrack.Head == 1;
-                        if(imageInfo.Cylinders == totalCylinders) imageInfo.Cylinders--;
+
+                        if(imageInfo.Cylinders == totalCylinders)
+                            imageInfo.Cylinders--;
                     }
                     else
                         imageInfo.SectorsPerTrack = teleDiskTrack.Sectors;
 
                 for(byte processedSectors = 0; processedSectors < teleDiskTrack.Sectors; processedSectors++)
                 {
-                    TeleDiskSectorHeader teleDiskSector = new TeleDiskSectorHeader();
-                    TeleDiskDataHeader   teleDiskData   = new TeleDiskDataHeader();
-                    byte[]               dataSizeBytes  = new byte[2];
+                    var    teleDiskSector = new TeleDiskSectorHeader();
+                    var    teleDiskData   = new TeleDiskDataHeader();
+                    byte[] dataSizeBytes  = new byte[2];
 
                     teleDiskSector.Cylinder     = (byte)stream.ReadByte();
                     teleDiskSector.Head         = (byte)stream.ReadByte();
@@ -306,7 +325,8 @@ namespace Aaru.DiscImages
                     teleDiskSector.Crc          = (byte)stream.ReadByte();
 
                     if((teleDiskSector.Flags & FLAGS_SECTOR_DATALESS) == FLAGS_SECTOR_DATALESS ||
-                       (teleDiskSector.Flags & FLAGS_SECTOR_SKIPPED)  == FLAGS_SECTOR_SKIPPED) continue;
+                       (teleDiskSector.Flags & FLAGS_SECTOR_SKIPPED)  == FLAGS_SECTOR_SKIPPED)
+                        continue;
 
                     stream.Read(dataSizeBytes, 0, 2);
                     teleDiskData.DataSize = BitConverter.ToUInt16(dataSizeBytes, 0);
@@ -318,12 +338,13 @@ namespace Aaru.DiscImages
             }
 
             sectorsData = new byte[totalCylinders][][][];
+
             // Total sectors per track
             uint[][] spts = new uint[totalCylinders][];
 
             AaruConsole.DebugWriteLine("TeleDisk plugin",
-                                      "Found {0} cylinders and {1} heads with a maximum sector number of {2}",
-                                      totalCylinders, totalHeads, maxSector);
+                                       "Found {0} cylinders and {1} heads with a maximum sector number of {2}",
+                                       totalCylinders, totalHeads, maxSector);
 
             // Create heads
             for(int i = 0; i < totalCylinders; i++)
@@ -331,15 +352,17 @@ namespace Aaru.DiscImages
                 sectorsData[i] = new byte[totalHeads][][];
                 spts[i]        = new uint[totalHeads];
 
-                for(int j = 0; j < totalHeads; j++) sectorsData[i][j] = new byte[maxSector + 1][];
+                for(int j = 0; j < totalHeads; j++)
+                    sectorsData[i][j] = new byte[maxSector + 1][];
             }
 
             // Decode the image
             stream.Seek(currentPos, SeekOrigin.Begin);
+
             while(true)
             {
-                TeleDiskTrackHeader teleDiskTrack = new TeleDiskTrackHeader();
-                byte[]              tdTrackForCrc = new byte[3];
+                var    teleDiskTrack = new TeleDiskTrackHeader();
+                byte[] tdTrackForCrc = new byte[3];
 
                 teleDiskTrack.Sectors  = (byte)stream.ReadByte();
                 teleDiskTrack.Cylinder = (byte)stream.ReadByte();
@@ -353,29 +376,31 @@ namespace Aaru.DiscImages
                 byte tdTrackCalculatedCrc = (byte)(TeleDiskCrc(0, tdTrackForCrc) & 0xFF);
 
                 AaruConsole.DebugWriteLine("TeleDisk plugin", "Track follows");
-                AaruConsole.DebugWriteLine("TeleDisk plugin", "\tTrack cylinder: {0}\t",   teleDiskTrack.Cylinder);
-                AaruConsole.DebugWriteLine("TeleDisk plugin", "\tTrack head: {0}\t",       teleDiskTrack.Head);
+                AaruConsole.DebugWriteLine("TeleDisk plugin", "\tTrack cylinder: {0}\t", teleDiskTrack.Cylinder);
+                AaruConsole.DebugWriteLine("TeleDisk plugin", "\tTrack head: {0}\t", teleDiskTrack.Head);
                 AaruConsole.DebugWriteLine("TeleDisk plugin", "\tSectors in track: {0}\t", teleDiskTrack.Sectors);
+
                 AaruConsole.DebugWriteLine("TeleDisk plugin", "\tTrack header CRC: 0x{0:X2} (calculated 0x{1:X2})\t",
-                                          teleDiskTrack.Crc, tdTrackCalculatedCrc);
+                                           teleDiskTrack.Crc, tdTrackCalculatedCrc);
 
                 aDiskCrcHasFailed |= tdTrackCalculatedCrc != teleDiskTrack.Crc;
 
                 if(teleDiskTrack.Sectors == 0xFF) // End of disk image
                 {
                     AaruConsole.DebugWriteLine("TeleDisk plugin", "End of disk image arrived");
+
                     AaruConsole.DebugWriteLine("TeleDisk plugin", "Total of {0} data sectors, for {1} bytes",
-                                              totalSectors, totalDiskSize);
+                                               totalSectors, totalDiskSize);
 
                     break;
                 }
 
                 for(byte processedSectors = 0; processedSectors < teleDiskTrack.Sectors; processedSectors++)
                 {
-                    TeleDiskSectorHeader teleDiskSector = new TeleDiskSectorHeader();
-                    TeleDiskDataHeader   teleDiskData   = new TeleDiskDataHeader();
-                    byte[]               dataSizeBytes  = new byte[2];
-                    byte[]               decodedData;
+                    var    teleDiskSector = new TeleDiskSectorHeader();
+                    var    teleDiskData   = new TeleDiskDataHeader();
+                    byte[] dataSizeBytes  = new byte[2];
+                    byte[] decodedData;
 
                     teleDiskSector.Cylinder     = (byte)stream.ReadByte();
                     teleDiskSector.Head         = (byte)stream.ReadByte();
@@ -385,20 +410,25 @@ namespace Aaru.DiscImages
                     teleDiskSector.Crc          = (byte)stream.ReadByte();
 
                     AaruConsole.DebugWriteLine("TeleDisk plugin", "\tSector follows");
-                    AaruConsole.DebugWriteLine("TeleDisk plugin", "\t\tAddressMark cylinder: {0}",
-                                              teleDiskSector.Cylinder);
-                    AaruConsole.DebugWriteLine("TeleDisk plugin", "\t\tAddressMark head: {0}", teleDiskSector.Head);
-                    AaruConsole.DebugWriteLine("TeleDisk plugin", "\t\tAddressMark sector number: {0}",
-                                              teleDiskSector.SectorNumber);
-                    AaruConsole.DebugWriteLine("TeleDisk plugin", "\t\tSector size: {0}",
-                                              teleDiskSector.SectorSize);
-                    AaruConsole.DebugWriteLine("TeleDisk plugin", "\t\tSector flags: 0x{0:X2}", teleDiskSector.Flags);
-                    AaruConsole.DebugWriteLine("TeleDisk plugin", "\t\tSector CRC (plus headers): 0x{0:X2}",
-                                              teleDiskSector.Crc);
 
-                    uint lba = (uint)(teleDiskSector.Cylinder * header.Sides * imageInfo.SectorsPerTrack +
-                                      teleDiskSector.Head                    * imageInfo.SectorsPerTrack +
+                    AaruConsole.DebugWriteLine("TeleDisk plugin", "\t\tAddressMark cylinder: {0}",
+                                               teleDiskSector.Cylinder);
+
+                    AaruConsole.DebugWriteLine("TeleDisk plugin", "\t\tAddressMark head: {0}", teleDiskSector.Head);
+
+                    AaruConsole.DebugWriteLine("TeleDisk plugin", "\t\tAddressMark sector number: {0}",
+                                               teleDiskSector.SectorNumber);
+
+                    AaruConsole.DebugWriteLine("TeleDisk plugin", "\t\tSector size: {0}", teleDiskSector.SectorSize);
+                    AaruConsole.DebugWriteLine("TeleDisk plugin", "\t\tSector flags: 0x{0:X2}", teleDiskSector.Flags);
+
+                    AaruConsole.DebugWriteLine("TeleDisk plugin", "\t\tSector CRC (plus headers): 0x{0:X2}",
+                                               teleDiskSector.Crc);
+
+                    uint lba = (uint)((teleDiskSector.Cylinder * header.Sides * imageInfo.SectorsPerTrack) +
+                                      (teleDiskSector.Head                    * imageInfo.SectorsPerTrack) +
                                       (teleDiskSector.SectorNumber - 1));
+
                     if((teleDiskSector.Flags & FLAGS_SECTOR_DATALESS) != FLAGS_SECTOR_DATALESS &&
                        (teleDiskSector.Flags & FLAGS_SECTOR_SKIPPED)  != FLAGS_SECTOR_SKIPPED)
                     {
@@ -409,10 +439,12 @@ namespace Aaru.DiscImages
                         teleDiskData.DataEncoding =  (byte)stream.ReadByte();
                         byte[] data = new byte[teleDiskData.DataSize];
                         stream.Read(data, 0, teleDiskData.DataSize);
+
                         AaruConsole.DebugWriteLine("TeleDisk plugin", "\t\tData size (in-image): {0}",
-                                                  teleDiskData.DataSize);
+                                                   teleDiskData.DataSize);
+
                         AaruConsole.DebugWriteLine("TeleDisk plugin", "\t\tData encoding: 0x{0:X2}",
-                                                  teleDiskData.DataEncoding);
+                                                   teleDiskData.DataEncoding);
 
                         decodedData = DecodeTeleDiskData(teleDiskSector.SectorSize, teleDiskData.DataEncoding, data);
 
@@ -421,42 +453,49 @@ namespace Aaru.DiscImages
                         if(tdSectorCalculatedCrc != teleDiskSector.Crc)
                         {
                             AaruConsole.DebugWriteLine("TeleDisk plugin",
-                                                      "Sector {0}:{3}:{4} calculated CRC 0x{1:X2} differs from stored CRC 0x{2:X2}",
-                                                      teleDiskTrack.Cylinder, tdSectorCalculatedCrc, teleDiskSector.Crc,
-                                                      teleDiskTrack.Cylinder, teleDiskSector.SectorNumber);
+                                                       "Sector {0}:{3}:{4} calculated CRC 0x{1:X2} differs from stored CRC 0x{2:X2}",
+                                                       teleDiskTrack.Cylinder, tdSectorCalculatedCrc,
+                                                       teleDiskSector.Crc, teleDiskTrack.Cylinder,
+                                                       teleDiskSector.SectorNumber);
+
                             if((teleDiskSector.Flags & FLAGS_SECTOR_NO_ID) != FLAGS_SECTOR_NO_ID)
                                 sectorsWhereCrcHasFailed.Add(lba);
                         }
                     }
-                    else decodedData = new byte[128 << teleDiskSector.SectorSize];
+                    else
+                        decodedData = new byte[128 << teleDiskSector.SectorSize];
 
                     AaruConsole.DebugWriteLine("TeleDisk plugin", "\t\tLBA: {0}", lba);
 
-                    if((teleDiskSector.Flags & FLAGS_SECTOR_NO_ID) == FLAGS_SECTOR_NO_ID) continue;
+                    if((teleDiskSector.Flags & FLAGS_SECTOR_NO_ID) == FLAGS_SECTOR_NO_ID)
+                        continue;
 
                     if(sectorsData[teleDiskTrack.Cylinder][teleDiskTrack.Head][teleDiskSector.SectorNumber] != null)
                         AaruConsole.DebugWriteLine("TeleDisk plugin",
-                                                  (teleDiskSector.Flags & FLAGS_SECTOR_DUPLICATE) ==
-                                                  FLAGS_SECTOR_DUPLICATE
-                                                      ? "\t\tSector {0} on cylinder {1} head {2} is duplicate, and marked so"
-                                                      : "\t\tSector {0} on cylinder {1} head {2} is duplicate, but is not marked so",
-                                                  teleDiskSector.SectorNumber, teleDiskSector.Cylinder,
-                                                  teleDiskSector.Head);
+                                                   (teleDiskSector.Flags & FLAGS_SECTOR_DUPLICATE) ==
+                                                   FLAGS_SECTOR_DUPLICATE
+                                                       ? "\t\tSector {0} on cylinder {1} head {2} is duplicate, and marked so"
+                                                       : "\t\tSector {0} on cylinder {1} head {2} is duplicate, but is not marked so",
+                                                   teleDiskSector.SectorNumber, teleDiskSector.Cylinder,
+                                                   teleDiskSector.Head);
                     else
                     {
                         sectorsData[teleDiskTrack.Cylinder][teleDiskTrack.Head][teleDiskSector.SectorNumber] =
                             decodedData;
+
                         totalDiskSize += (uint)decodedData.Length;
                     }
                 }
             }
 
-            MemoryStream leadOutMs = new MemoryStream();
+            var leadOutMs = new MemoryStream();
+
             if(hasLeadOutOnHead0)
                 for(int i = 0; i < sectorsData[totalCylinders - 1][0].Length; i++)
                     if(sectorsData[totalCylinders - 1][0][i] != null)
                         leadOutMs.Write(sectorsData[totalCylinders - 1][0][i], 0,
                                         sectorsData[totalCylinders - 1][0][i].Length);
+
             if(hasLeadOutOnHead1)
                 for(int i = 0; i < sectorsData[totalCylinders - 1][1].Length; i++)
                     if(sectorsData[totalCylinders - 1][1][i] != null)
@@ -475,6 +514,7 @@ namespace Aaru.DiscImages
             imageInfo.XmlMediaType = XmlMediaType.BlockMedia;
 
             AaruConsole.VerboseWriteLine("TeleDisk image contains a disk of type {0}", imageInfo.MediaType);
+
             if(!string.IsNullOrEmpty(imageInfo.Comments))
                 AaruConsole.VerboseWriteLine("TeleDisk comments: {0}", imageInfo.Comments);
 
@@ -508,7 +548,8 @@ namespace Aaru.DiscImages
             if(sectorAddress + length > imageInfo.Sectors)
                 throw new ArgumentOutOfRangeException(nameof(length), "Requested more sectors than available");
 
-            MemoryStream buffer = new MemoryStream();
+            var buffer = new MemoryStream();
+
             for(uint i = 0; i < length; i++)
             {
                 byte[] sector = ReadSector(sectorAddress + i) ?? new byte[imageInfo.SectorSize];
@@ -527,7 +568,8 @@ namespace Aaru.DiscImages
             if(tag != MediaTagType.Floppy_LeadOut)
                 throw new FeatureUnsupportedImageException("Feature not supported by image format");
 
-            if(leadOut != null) return leadOut;
+            if(leadOut != null)
+                return leadOut;
 
             throw new FeatureNotPresentImageException("Lead-out not present in disk image");
         }
diff --git a/Aaru.Images/TeleDisk/TeleDisk.cs b/Aaru.Images/TeleDisk/TeleDisk.cs
index 4ad981e73..3b141cbdd 100644
--- a/Aaru.Images/TeleDisk/TeleDisk.cs
+++ b/Aaru.Images/TeleDisk/TeleDisk.cs
@@ -42,6 +42,7 @@ namespace Aaru.DiscImages
     // http://www.classiccmp.org/dunfield/img54306/td0notes.txt
     public partial class TeleDisk : IMediaImage, IVerifiableImage, IVerifiableSectorsImage
     {
+        readonly List<ulong>       sectorsWhereCrcHasFailed;
         bool                       aDiskCrcHasFailed;
         byte[]                     commentBlock;
         TeleDiskCommentBlockHeader commentHeader;
@@ -49,9 +50,10 @@ namespace Aaru.DiscImages
         ImageInfo                  imageInfo;
         Stream                     inStream;
         byte[]                     leadOut;
+
         // Cylinder by head, sector data matrix
         byte[][][][] sectorsData;
-        List<ulong>  sectorsWhereCrcHasFailed;
+
         // LBA, data
         uint totalDiskSize;
 
@@ -59,25 +61,17 @@ namespace Aaru.DiscImages
         {
             imageInfo = new ImageInfo
             {
-                ReadableSectorTags    = new List<SectorTagType>(),
-                ReadableMediaTags     = new List<MediaTagType>(),
-                HasPartitions         = false,
-                HasSessions           = false,
-                Application           = "Sydex TeleDisk",
-                Comments              = null,
-                Creator               = null,
-                MediaManufacturer     = null,
-                MediaModel            = null,
+                ReadableSectorTags    = new List<SectorTagType>(), ReadableMediaTags = new List<MediaTagType>(),
+                HasPartitions         = false, HasSessions                           = false,
+                Application           = "Sydex TeleDisk", Comments                   = null,
+                Creator               = null, MediaManufacturer                      = null, MediaModel = null,
                 MediaSerialNumber     = null,
-                MediaBarcode          = null,
-                MediaPartNumber       = null,
-                MediaSequence         = 0,
+                MediaBarcode          = null, MediaPartNumber = null, MediaSequence = 0,
                 LastMediaSequence     = 0,
-                DriveManufacturer     = null,
-                DriveModel            = null,
-                DriveSerialNumber     = null,
+                DriveManufacturer     = null, DriveModel = null, DriveSerialNumber = null,
                 DriveFirmwareRevision = null
             };
+
             aDiskCrcHasFailed        = false;
             sectorsWhereCrcHasFailed = new List<ulong>();
         }
diff --git a/Aaru.Images/TeleDisk/Verify.cs b/Aaru.Images/TeleDisk/Verify.cs
index 5674c53bf..b27a208c3 100644
--- a/Aaru.Images/TeleDisk/Verify.cs
+++ b/Aaru.Images/TeleDisk/Verify.cs
@@ -40,7 +40,7 @@ namespace Aaru.DiscImages
 
         public bool? VerifySector(ulong sectorAddress) => !sectorsWhereCrcHasFailed.Contains(sectorAddress);
 
-        public bool? VerifySectors(ulong           sectorAddress, uint length, out List<ulong> failingLbas,
+        public bool? VerifySectors(ulong sectorAddress, uint length, out List<ulong> failingLbas,
                                    out List<ulong> unknownLbas)
         {
             failingLbas = new List<ulong>();
diff --git a/Aaru.Images/UDIF/Identify.cs b/Aaru.Images/UDIF/Identify.cs
index 04d14cafa..22c7b58b4 100644
--- a/Aaru.Images/UDIF/Identify.cs
+++ b/Aaru.Images/UDIF/Identify.cs
@@ -42,7 +42,8 @@ namespace Aaru.DiscImages
         {
             Stream stream = imageFilter.GetDataForkStream();
 
-            if(stream.Length < 512) return false;
+            if(stream.Length < 512)
+                return false;
 
             stream.Seek(-Marshal.SizeOf<UdifFooter>(), SeekOrigin.End);
             byte[] footerB = new byte[Marshal.SizeOf<UdifFooter>()];
@@ -50,7 +51,8 @@ namespace Aaru.DiscImages
             stream.Read(footerB, 0, Marshal.SizeOf<UdifFooter>());
             footer = Marshal.ByteArrayToStructureBigEndian<UdifFooter>(footerB);
 
-            if(footer.signature == UDIF_SIGNATURE) return true;
+            if(footer.signature == UDIF_SIGNATURE)
+                return true;
 
             // Old UDIF as created by DiskCopy 6.5 using "OBSOLETE" format. (DiskCopy 5 rumored format?)
             stream.Seek(0, SeekOrigin.Begin);
diff --git a/Aaru.Images/UDIF/Properties.cs b/Aaru.Images/UDIF/Properties.cs
index 0eb694f58..7da183f6b 100644
--- a/Aaru.Images/UDIF/Properties.cs
+++ b/Aaru.Images/UDIF/Properties.cs
@@ -43,25 +43,30 @@ namespace Aaru.DiscImages
     {
         public ImageInfo Info => imageInfo;
 
-        public string                     Name                => "Apple Universal Disk Image Format";
-        public Guid                       Id                  => new Guid("5BEB9002-CF3D-429C-8E06-9A96F49203FF");
-        public string                     Author              => "Natalia Portillo";
-        public string                     Format              => "Apple Universal Disk Image Format";
-        public List<DumpHardwareType>     DumpHardware        => null;
-        public CICMMetadataType           CicmMetadata        => null;
-        public IEnumerable<MediaTagType>  SupportedMediaTags  => new MediaTagType[] { };
-        public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[] { };
-        public IEnumerable<MediaType> SupportedMediaTypes =>
-            new[]
-            {
-                MediaType.Unknown, MediaType.GENERIC_HDD, MediaType.FlashDrive, MediaType.CompactFlash,
-                MediaType.CompactFlashType2, MediaType.PCCardTypeI, MediaType.PCCardTypeII, MediaType.PCCardTypeIII,
-                MediaType.PCCardTypeIV
-            };
+        public string                 Name         => "Apple Universal Disk Image Format";
+        public Guid                   Id           => new Guid("5BEB9002-CF3D-429C-8E06-9A96F49203FF");
+        public string                 Author       => "Natalia Portillo";
+        public string                 Format       => "Apple Universal Disk Image Format";
+        public List<DumpHardwareType> DumpHardware => null;
+        public CICMMetadataType       CicmMetadata => null;
+        public IEnumerable<MediaTagType> SupportedMediaTags => new MediaTagType[]
+            {};
+        public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[]
+            {};
+        public IEnumerable<MediaType> SupportedMediaTypes => new[]
+        {
+            MediaType.Unknown, MediaType.GENERIC_HDD, MediaType.FlashDrive, MediaType.CompactFlash,
+            MediaType.CompactFlashType2, MediaType.PCCardTypeI, MediaType.PCCardTypeII, MediaType.PCCardTypeIII,
+            MediaType.PCCardTypeIV
+        };
         public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
-            new (string name, Type type, string description, object @default)[] { };
-        public IEnumerable<string> KnownExtensions => new[] {".dmg"};
-        public bool                IsWriting       { get; private set; }
-        public string              ErrorMessage    { get; private set; }
+            new (string name, Type type, string description, object @default)[]
+                {};
+        public IEnumerable<string> KnownExtensions => new[]
+        {
+            ".dmg"
+        };
+        public bool   IsWriting    { get; private set; }
+        public string ErrorMessage { get; private set; }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/UDIF/Read.cs b/Aaru.Images/UDIF/Read.cs
index d0bc1879c..666ed1208 100644
--- a/Aaru.Images/UDIF/Read.cs
+++ b/Aaru.Images/UDIF/Read.cs
@@ -34,8 +34,6 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using Claunia.PropertyList;
-using Claunia.RsrcFork;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Exceptions;
@@ -43,6 +41,8 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Compression;
 using Aaru.Console;
 using Aaru.Helpers;
+using Claunia.PropertyList;
+using Claunia.RsrcFork;
 using Ionic.Zlib;
 using SharpCompress.Compressors.ADC;
 using SharpCompress.Compressors.BZip2;
@@ -56,7 +56,8 @@ namespace Aaru.DiscImages
         {
             Stream stream = imageFilter.GetDataForkStream();
 
-            if(stream.Length < 512) return false;
+            if(stream.Length < 512)
+                return false;
 
             stream.Seek(-Marshal.SizeOf<UdifFooter>(), SeekOrigin.End);
             byte[] footerB = new byte[Marshal.SizeOf<UdifFooter>()];
@@ -72,41 +73,46 @@ namespace Aaru.DiscImages
                 stream.Read(footerB, 0, Marshal.SizeOf<UdifFooter>());
                 footer = Marshal.ByteArrayToStructureBigEndian<UdifFooter>(footerB);
 
-                if(footer.signature != UDIF_SIGNATURE) throw new Exception("Unable to find UDIF signature.");
+                if(footer.signature != UDIF_SIGNATURE)
+                    throw new Exception("Unable to find UDIF signature.");
 
                 AaruConsole.VerboseWriteLine("Found obsolete UDIF format.");
             }
 
-            AaruConsole.DebugWriteLine("UDIF plugin", "footer.signature = 0x{0:X8}",     footer.signature);
-            AaruConsole.DebugWriteLine("UDIF plugin", "footer.version = {0}",            footer.version);
-            AaruConsole.DebugWriteLine("UDIF plugin", "footer.headerSize = {0}",         footer.headerSize);
-            AaruConsole.DebugWriteLine("UDIF plugin", "footer.flags = {0}",              footer.flags);
+            AaruConsole.DebugWriteLine("UDIF plugin", "footer.signature = 0x{0:X8}", footer.signature);
+            AaruConsole.DebugWriteLine("UDIF plugin", "footer.version = {0}", footer.version);
+            AaruConsole.DebugWriteLine("UDIF plugin", "footer.headerSize = {0}", footer.headerSize);
+            AaruConsole.DebugWriteLine("UDIF plugin", "footer.flags = {0}", footer.flags);
             AaruConsole.DebugWriteLine("UDIF plugin", "footer.runningDataForkOff = {0}", footer.runningDataForkOff);
-            AaruConsole.DebugWriteLine("UDIF plugin", "footer.dataForkOff = {0}",        footer.dataForkOff);
-            AaruConsole.DebugWriteLine("UDIF plugin", "footer.dataForkLen = {0}",        footer.dataForkLen);
-            AaruConsole.DebugWriteLine("UDIF plugin", "footer.rsrcForkOff = {0}",        footer.rsrcForkOff);
-            AaruConsole.DebugWriteLine("UDIF plugin", "footer.rsrcForkLen = {0}",        footer.rsrcForkLen);
-            AaruConsole.DebugWriteLine("UDIF plugin", "footer.segmentNumber = {0}",      footer.segmentNumber);
-            AaruConsole.DebugWriteLine("UDIF plugin", "footer.segmentCount = {0}",       footer.segmentCount);
-            AaruConsole.DebugWriteLine("UDIF plugin", "footer.segmentId = {0}",          footer.segmentId);
-            AaruConsole.DebugWriteLine("UDIF plugin", "footer.dataForkChkType = {0}",    footer.dataForkChkType);
-            AaruConsole.DebugWriteLine("UDIF plugin", "footer.dataForkLen = {0}",        footer.dataForkLen);
-            AaruConsole.DebugWriteLine("UDIF plugin", "footer.dataForkChk = 0x{0:X8}",   footer.dataForkChk);
-            AaruConsole.DebugWriteLine("UDIF plugin", "footer.plistOff = {0}",           footer.plistOff);
-            AaruConsole.DebugWriteLine("UDIF plugin", "footer.plistLen = {0}",           footer.plistLen);
-            AaruConsole.DebugWriteLine("UDIF plugin", "footer.masterChkType = {0}",      footer.masterChkType);
-            AaruConsole.DebugWriteLine("UDIF plugin", "footer.masterChkLen = {0}",       footer.masterChkLen);
-            AaruConsole.DebugWriteLine("UDIF plugin", "footer.masterChk = 0x{0:X8}",     footer.masterChk);
-            AaruConsole.DebugWriteLine("UDIF plugin", "footer.imageVariant = {0}",       footer.imageVariant);
-            AaruConsole.DebugWriteLine("UDIF plugin", "footer.sectorCount = {0}",        footer.sectorCount);
+            AaruConsole.DebugWriteLine("UDIF plugin", "footer.dataForkOff = {0}", footer.dataForkOff);
+            AaruConsole.DebugWriteLine("UDIF plugin", "footer.dataForkLen = {0}", footer.dataForkLen);
+            AaruConsole.DebugWriteLine("UDIF plugin", "footer.rsrcForkOff = {0}", footer.rsrcForkOff);
+            AaruConsole.DebugWriteLine("UDIF plugin", "footer.rsrcForkLen = {0}", footer.rsrcForkLen);
+            AaruConsole.DebugWriteLine("UDIF plugin", "footer.segmentNumber = {0}", footer.segmentNumber);
+            AaruConsole.DebugWriteLine("UDIF plugin", "footer.segmentCount = {0}", footer.segmentCount);
+            AaruConsole.DebugWriteLine("UDIF plugin", "footer.segmentId = {0}", footer.segmentId);
+            AaruConsole.DebugWriteLine("UDIF plugin", "footer.dataForkChkType = {0}", footer.dataForkChkType);
+            AaruConsole.DebugWriteLine("UDIF plugin", "footer.dataForkLen = {0}", footer.dataForkLen);
+            AaruConsole.DebugWriteLine("UDIF plugin", "footer.dataForkChk = 0x{0:X8}", footer.dataForkChk);
+            AaruConsole.DebugWriteLine("UDIF plugin", "footer.plistOff = {0}", footer.plistOff);
+            AaruConsole.DebugWriteLine("UDIF plugin", "footer.plistLen = {0}", footer.plistLen);
+            AaruConsole.DebugWriteLine("UDIF plugin", "footer.masterChkType = {0}", footer.masterChkType);
+            AaruConsole.DebugWriteLine("UDIF plugin", "footer.masterChkLen = {0}", footer.masterChkLen);
+            AaruConsole.DebugWriteLine("UDIF plugin", "footer.masterChk = 0x{0:X8}", footer.masterChk);
+            AaruConsole.DebugWriteLine("UDIF plugin", "footer.imageVariant = {0}", footer.imageVariant);
+            AaruConsole.DebugWriteLine("UDIF plugin", "footer.sectorCount = {0}", footer.sectorCount);
+
             AaruConsole.DebugWriteLine("UDIF plugin", "footer.reserved1 is empty? = {0}",
-                                      ArrayHelpers.ArrayIsNullOrEmpty(footer.reserved1));
+                                       ArrayHelpers.ArrayIsNullOrEmpty(footer.reserved1));
+
             AaruConsole.DebugWriteLine("UDIF plugin", "footer.reserved2 is empty? = {0}",
-                                      ArrayHelpers.ArrayIsNullOrEmpty(footer.reserved2));
+                                       ArrayHelpers.ArrayIsNullOrEmpty(footer.reserved2));
+
             AaruConsole.DebugWriteLine("UDIF plugin", "footer.reserved3 is empty? = {0}",
-                                      ArrayHelpers.ArrayIsNullOrEmpty(footer.reserved3));
+                                       ArrayHelpers.ArrayIsNullOrEmpty(footer.reserved3));
+
             AaruConsole.DebugWriteLine("UDIF plugin", "footer.reserved4 is empty? = {0}",
-                                      ArrayHelpers.ArrayIsNullOrEmpty(footer.reserved4));
+                                       ArrayHelpers.ArrayIsNullOrEmpty(footer.reserved4));
 
             // Block chunks and headers
             List<byte[]> blkxList = new List<byte[]>();
@@ -116,14 +122,15 @@ namespace Aaru.DiscImages
 
             byte[] vers = null;
 
-            if(footer.plistLen == 0 && footer.rsrcForkLen != 0)
+            if(footer.plistLen    == 0 &&
+               footer.rsrcForkLen != 0)
             {
                 AaruConsole.DebugWriteLine("UDIF plugin", "Reading resource fork.");
                 byte[] rsrcB = new byte[footer.rsrcForkLen];
                 stream.Seek((long)footer.rsrcForkOff, SeekOrigin.Begin);
                 stream.Read(rsrcB, 0, rsrcB.Length);
 
-                ResourceFork rsrc = new ResourceFork(rsrcB);
+                var rsrc = new ResourceFork(rsrcB);
 
                 if(!rsrc.ContainsKey(BLOCK_OS_TYPE))
                     throw new
@@ -143,7 +150,8 @@ namespace Aaru.DiscImages
 
                 Resource versRez = rsrc.GetResource(0x76657273);
 
-                if(versRez != null) vers = versRez.GetResource(versRez.GetIds()[0]);
+                if(versRez != null)
+                    vers = versRez.GetResource(versRez.GetIds()[0]);
             }
             else if(footer.plistLen != 0)
             {
@@ -153,13 +161,15 @@ namespace Aaru.DiscImages
                 stream.Read(plistB, 0, plistB.Length);
 
                 AaruConsole.DebugWriteLine("UDIF plugin", "Parsing property list.");
-                NSDictionary plist = (NSDictionary)XmlPropertyListParser.Parse(plistB);
-                if(plist == null) throw new Exception("Could not parse property list.");
+                var plist = (NSDictionary)XmlPropertyListParser.Parse(plistB);
+
+                if(plist == null)
+                    throw new Exception("Could not parse property list.");
 
                 if(!plist.TryGetValue(RESOURCE_FORK_KEY, out NSObject rsrcObj))
                     throw new Exception("Could not retrieve resource fork.");
 
-                NSDictionary rsrc = (NSDictionary)rsrcObj;
+                var rsrc = (NSDictionary)rsrcObj;
 
                 if(!rsrc.TryGetValue(BLOCK_KEY, out NSObject blkxObj))
                     throw new Exception("Could not retrieve block chunks array.");
@@ -168,31 +178,33 @@ namespace Aaru.DiscImages
 
                 foreach(NSDictionary part in blkx.Cast<NSDictionary>())
                 {
-                    if(!part.TryGetValue("Name", out _)) throw new Exception("Could not retrieve Name");
+                    if(!part.TryGetValue("Name", out _))
+                        throw new Exception("Could not retrieve Name");
 
-                    if(!part.TryGetValue("Data", out NSObject dataObj)) throw new Exception("Could not retrieve Data");
+                    if(!part.TryGetValue("Data", out NSObject dataObj))
+                        throw new Exception("Could not retrieve Data");
 
                     blkxList.Add(((NSData)dataObj).Bytes);
                 }
 
                 if(rsrc.TryGetValue("vers", out NSObject versObj))
                 {
-                    NSObject[] versArray           = ((NSArray)versObj).GetArray();
-                    if(versArray.Length >= 1) vers = ((NSData)versArray[0]).Bytes;
+                    NSObject[] versArray = ((NSArray)versObj).GetArray();
+
+                    if(versArray.Length >= 1)
+                        vers = ((NSData)versArray[0]).Bytes;
                 }
             }
             else
             {
                 // Obsolete read-only UDIF only prepended the header and then put the image without any kind of block references.
                 // So let's falsify a block chunk
-                BlockChunk bChnk = new BlockChunk
+                var bChnk = new BlockChunk
                 {
-                    length  = footer.dataForkLen,
-                    offset  = footer.dataForkOff,
-                    sector  = 0,
-                    sectors = footer.sectorCount,
-                    type    = CHUNK_TYPE_COPY
+                    length = footer.dataForkLen, offset = footer.dataForkOff, sector = 0, sectors = footer.sectorCount,
+                    type   = CHUNK_TYPE_COPY
                 };
+
                 imageInfo.Sectors = footer.sectorCount;
                 chunks.Add(bChnk.sector, bChnk);
                 buffersize      = 2048 * SECTOR_SIZE;
@@ -201,45 +213,58 @@ namespace Aaru.DiscImages
 
             if(vers != null)
             {
-                Version version = new Version(vers);
+                var version = new Version(vers);
 
                 string release = null;
                 string dev     = null;
                 string pre     = null;
 
-                string major                              = $"{version.MajorVersion}";
-                string minor                              = $".{version.MinorVersion / 10}";
-                if(version.MinorVersion % 10 > 0) release = $".{version.MinorVersion % 10}";
+                string major = $"{version.MajorVersion}";
+                string minor = $".{version.MinorVersion / 10}";
+
+                if(version.MinorVersion % 10 > 0)
+                    release = $".{version.MinorVersion % 10}";
+
                 switch(version.DevStage)
                 {
                     case Version.DevelopmentStage.Alpha:
                         dev = "a";
+
                         break;
                     case Version.DevelopmentStage.Beta:
                         dev = "b";
+
                         break;
                     case Version.DevelopmentStage.PreAlpha:
                         dev = "d";
+
                         break;
                 }
 
-                if(dev == null && version.PreReleaseVersion > 0) dev = "f";
+                if(dev                       == null &&
+                   version.PreReleaseVersion > 0)
+                    dev = "f";
 
-                if(dev != null) pre = $"{version.PreReleaseVersion}";
+                if(dev != null)
+                    pre = $"{version.PreReleaseVersion}";
 
                 imageInfo.ApplicationVersion = $"{major}{minor}{release}{dev}{pre}";
                 imageInfo.Application        = version.VersionString;
                 imageInfo.Comments           = version.VersionMessage;
 
-                if(version.MajorVersion      == 3) imageInfo.Application = "ShrinkWrap™";
-                else if(version.MajorVersion == 6) imageInfo.Application = "DiskCopy";
+                if(version.MajorVersion == 3)
+                    imageInfo.Application = "ShrinkWrap™";
+                else if(version.MajorVersion == 6)
+                    imageInfo.Application = "DiskCopy";
             }
-            else imageInfo.Application = "DiskCopy";
+            else
+                imageInfo.Application = "DiskCopy";
 
             AaruConsole.DebugWriteLine("UDIF plugin", "Image application = {0} version {1}", imageInfo.Application,
-                                      imageInfo.ApplicationVersion);
+                                       imageInfo.ApplicationVersion);
 
             imageInfo.Sectors = 0;
+
             if(!fakeBlockChunks)
             {
                 if(blkxList.Count == 0)
@@ -250,49 +275,54 @@ namespace Aaru.DiscImages
 
                 foreach(byte[] blkxBytes in blkxList)
                 {
-                    BlockHeader bHdr  = new BlockHeader();
-                    byte[]      bHdrB = new byte[Marshal.SizeOf<BlockHeader>()];
+                    var    bHdr  = new BlockHeader();
+                    byte[] bHdrB = new byte[Marshal.SizeOf<BlockHeader>()];
                     Array.Copy(blkxBytes, 0, bHdrB, 0, Marshal.SizeOf<BlockHeader>());
                     bHdr = Marshal.ByteArrayToStructureBigEndian<BlockHeader>(bHdrB);
 
-                    AaruConsole.DebugWriteLine("UDIF plugin", "bHdr.signature = 0x{0:X8}",  bHdr.signature);
-                    AaruConsole.DebugWriteLine("UDIF plugin", "bHdr.version = {0}",         bHdr.version);
-                    AaruConsole.DebugWriteLine("UDIF plugin", "bHdr.sectorStart = {0}",     bHdr.sectorStart);
-                    AaruConsole.DebugWriteLine("UDIF plugin", "bHdr.sectorCount = {0}",     bHdr.sectorCount);
-                    AaruConsole.DebugWriteLine("UDIF plugin", "bHdr.dataOffset = {0}",      bHdr.dataOffset);
-                    AaruConsole.DebugWriteLine("UDIF plugin", "bHdr.buffers = {0}",         bHdr.buffers);
+                    AaruConsole.DebugWriteLine("UDIF plugin", "bHdr.signature = 0x{0:X8}", bHdr.signature);
+                    AaruConsole.DebugWriteLine("UDIF plugin", "bHdr.version = {0}", bHdr.version);
+                    AaruConsole.DebugWriteLine("UDIF plugin", "bHdr.sectorStart = {0}", bHdr.sectorStart);
+                    AaruConsole.DebugWriteLine("UDIF plugin", "bHdr.sectorCount = {0}", bHdr.sectorCount);
+                    AaruConsole.DebugWriteLine("UDIF plugin", "bHdr.dataOffset = {0}", bHdr.dataOffset);
+                    AaruConsole.DebugWriteLine("UDIF plugin", "bHdr.buffers = {0}", bHdr.buffers);
                     AaruConsole.DebugWriteLine("UDIF plugin", "bHdr.descriptor = 0x{0:X8}", bHdr.descriptor);
-                    AaruConsole.DebugWriteLine("UDIF plugin", "bHdr.reserved1 = {0}",       bHdr.reserved1);
-                    AaruConsole.DebugWriteLine("UDIF plugin", "bHdr.reserved2 = {0}",       bHdr.reserved2);
-                    AaruConsole.DebugWriteLine("UDIF plugin", "bHdr.reserved3 = {0}",       bHdr.reserved3);
-                    AaruConsole.DebugWriteLine("UDIF plugin", "bHdr.reserved4 = {0}",       bHdr.reserved4);
-                    AaruConsole.DebugWriteLine("UDIF plugin", "bHdr.reserved5 = {0}",       bHdr.reserved5);
-                    AaruConsole.DebugWriteLine("UDIF plugin", "bHdr.reserved6 = {0}",       bHdr.reserved6);
-                    AaruConsole.DebugWriteLine("UDIF plugin", "bHdr.checksumType = {0}",    bHdr.checksumType);
-                    AaruConsole.DebugWriteLine("UDIF plugin", "bHdr.checksumLen = {0}",     bHdr.checksumLen);
-                    AaruConsole.DebugWriteLine("UDIF plugin", "bHdr.checksum = 0x{0:X8}",   bHdr.checksum);
-                    AaruConsole.DebugWriteLine("UDIF plugin", "bHdr.chunks = {0}",          bHdr.chunks);
-                    AaruConsole.DebugWriteLine("UDIF plugin", "bHdr.reservedChk is empty? = {0}",
-                                              ArrayHelpers.ArrayIsNullOrEmpty(bHdr.reservedChk));
+                    AaruConsole.DebugWriteLine("UDIF plugin", "bHdr.reserved1 = {0}", bHdr.reserved1);
+                    AaruConsole.DebugWriteLine("UDIF plugin", "bHdr.reserved2 = {0}", bHdr.reserved2);
+                    AaruConsole.DebugWriteLine("UDIF plugin", "bHdr.reserved3 = {0}", bHdr.reserved3);
+                    AaruConsole.DebugWriteLine("UDIF plugin", "bHdr.reserved4 = {0}", bHdr.reserved4);
+                    AaruConsole.DebugWriteLine("UDIF plugin", "bHdr.reserved5 = {0}", bHdr.reserved5);
+                    AaruConsole.DebugWriteLine("UDIF plugin", "bHdr.reserved6 = {0}", bHdr.reserved6);
+                    AaruConsole.DebugWriteLine("UDIF plugin", "bHdr.checksumType = {0}", bHdr.checksumType);
+                    AaruConsole.DebugWriteLine("UDIF plugin", "bHdr.checksumLen = {0}", bHdr.checksumLen);
+                    AaruConsole.DebugWriteLine("UDIF plugin", "bHdr.checksum = 0x{0:X8}", bHdr.checksum);
+                    AaruConsole.DebugWriteLine("UDIF plugin", "bHdr.chunks = {0}", bHdr.chunks);
 
-                    if(bHdr.buffers > buffersize) buffersize = bHdr.buffers * SECTOR_SIZE;
+                    AaruConsole.DebugWriteLine("UDIF plugin", "bHdr.reservedChk is empty? = {0}",
+                                               ArrayHelpers.ArrayIsNullOrEmpty(bHdr.reservedChk));
+
+                    if(bHdr.buffers > buffersize)
+                        buffersize = bHdr.buffers * SECTOR_SIZE;
 
                     for(int i = 0; i < bHdr.chunks; i++)
                     {
-                        BlockChunk bChnk  = new BlockChunk();
-                        byte[]     bChnkB = new byte[Marshal.SizeOf<BlockChunk>()];
-                        Array.Copy(blkxBytes, Marshal.SizeOf<BlockHeader>() + Marshal.SizeOf<BlockChunk>() * i, bChnkB,
-                                   0, Marshal.SizeOf<BlockChunk>());
+                        var    bChnk  = new BlockChunk();
+                        byte[] bChnkB = new byte[Marshal.SizeOf<BlockChunk>()];
+
+                        Array.Copy(blkxBytes, Marshal.SizeOf<BlockHeader>() + (Marshal.SizeOf<BlockChunk>() * i),
+                                   bChnkB, 0, Marshal.SizeOf<BlockChunk>());
+
                         bChnk = Marshal.ByteArrayToStructureBigEndian<BlockChunk>(bChnkB);
 
                         AaruConsole.DebugWriteLine("UDIF plugin", "bHdr.chunk[{0}].type = 0x{1:X8}", i, bChnk.type);
-                        AaruConsole.DebugWriteLine("UDIF plugin", "bHdr.chunk[{0}].comment = {1}",   i, bChnk.comment);
-                        AaruConsole.DebugWriteLine("UDIF plugin", "bHdr.chunk[{0}].sector = {1}",    i, bChnk.sector);
-                        AaruConsole.DebugWriteLine("UDIF plugin", "bHdr.chunk[{0}].sectors = {1}",   i, bChnk.sectors);
-                        AaruConsole.DebugWriteLine("UDIF plugin", "bHdr.chunk[{0}].offset = {1}",    i, bChnk.offset);
-                        AaruConsole.DebugWriteLine("UDIF plugin", "bHdr.chunk[{0}].length = {1}",    i, bChnk.length);
+                        AaruConsole.DebugWriteLine("UDIF plugin", "bHdr.chunk[{0}].comment = {1}", i, bChnk.comment);
+                        AaruConsole.DebugWriteLine("UDIF plugin", "bHdr.chunk[{0}].sector = {1}", i, bChnk.sector);
+                        AaruConsole.DebugWriteLine("UDIF plugin", "bHdr.chunk[{0}].sectors = {1}", i, bChnk.sectors);
+                        AaruConsole.DebugWriteLine("UDIF plugin", "bHdr.chunk[{0}].offset = {1}", i, bChnk.offset);
+                        AaruConsole.DebugWriteLine("UDIF plugin", "bHdr.chunk[{0}].length = {1}", i, bChnk.length);
 
-                        if(bChnk.type == CHUNK_TYPE_END) break;
+                        if(bChnk.type == CHUNK_TYPE_END)
+                            break;
 
                         imageInfo.Sectors += bChnk.sectors;
 
@@ -304,6 +334,7 @@ namespace Aaru.DiscImages
                         {
                             // TODO: Handle comments
                             case CHUNK_TYPE_COMMNT: continue;
+
                             // TODO: Handle compressed chunks
                             case CHUNK_TYPE_KENCODE:
                                 throw new
@@ -316,11 +347,12 @@ namespace Aaru.DiscImages
                                     ImageNotSupportedException("Chunks compressed with lzfse are not yet supported.");
                         }
 
-                        if(bChnk.type > CHUNK_TYPE_NOCOPY && bChnk.type < CHUNK_TYPE_COMMNT ||
-                           bChnk.type > CHUNK_TYPE_LZFSE  && bChnk.type < CHUNK_TYPE_END)
+                        if((bChnk.type > CHUNK_TYPE_NOCOPY && bChnk.type < CHUNK_TYPE_COMMNT) ||
+                           (bChnk.type > CHUNK_TYPE_LZFSE  && bChnk.type < CHUNK_TYPE_END))
                             throw new ImageNotSupportedException($"Unsupported chunk type 0x{bChnk.type:X8} found");
 
-                        if(bChnk.sectors > 0) chunks.Add(bChnk.sector, bChnk);
+                        if(bChnk.sectors > 0)
+                            chunks.Add(bChnk.sector, bChnk);
                     }
                 }
             }
@@ -352,11 +384,12 @@ namespace Aaru.DiscImages
                 throw new ArgumentOutOfRangeException(nameof(sectorAddress),
                                                       $"Sector address {sectorAddress} not found");
 
-            if(sectorCache.TryGetValue(sectorAddress, out byte[] sector)) return sector;
+            if(sectorCache.TryGetValue(sectorAddress, out byte[] sector))
+                return sector;
 
-            BlockChunk readChunk        = new BlockChunk();
-            bool       chunkFound       = false;
-            ulong      chunkStartSector = 0;
+            var   readChunk        = new BlockChunk();
+            bool  chunkFound       = false;
+            ulong chunkStartSector = 0;
 
             foreach(KeyValuePair<ulong, BlockChunk> kvp in chunks.Where(kvp => sectorAddress >= kvp.Key))
             {
@@ -382,32 +415,36 @@ namespace Aaru.DiscImages
                     byte[] cmpBuffer = new byte[readChunk.length];
                     imageStream.Seek((long)readChunk.offset, SeekOrigin.Begin);
                     imageStream.Read(cmpBuffer, 0, cmpBuffer.Length);
-                    MemoryStream cmpMs     = new MemoryStream(cmpBuffer);
-                    Stream       decStream = null;
+                    var    cmpMs     = new MemoryStream(cmpBuffer);
+                    Stream decStream = null;
 
                     switch(readChunk.type)
                     {
                         case CHUNK_TYPE_ADC:
                             decStream = new ADCStream(cmpMs);
+
                             break;
                         case CHUNK_TYPE_ZLIB:
                             decStream = new ZlibStream(cmpMs, CompressionMode.Decompress);
+
                             break;
                         case CHUNK_TYPE_BZIP:
                             decStream = new BZip2Stream(cmpMs, SharpCompress.Compressors.CompressionMode.Decompress,
                                                         false);
+
                             break;
                         case CHUNK_TYPE_RLE: break;
                         default:
                             throw new ImageNotSupportedException($"Unsupported chunk type 0x{readChunk.type:X8} found");
                     }
 
-                    #if DEBUG
+                #if DEBUG
                     try
                     {
-                        #endif
+                    #endif
                         byte[] tmpBuffer;
                         int    realSize;
+
                         switch(readChunk.type)
                         {
                             case CHUNK_TYPE_ADC:
@@ -426,15 +463,19 @@ namespace Aaru.DiscImages
 
                                 chunkCache.Add(chunkStartSector, buffer);
                                 currentChunkCacheSize += (uint)realSize;
+
                                 break;
                             case CHUNK_TYPE_RLE:
                                 tmpBuffer = new byte[buffersize];
                                 realSize  = 0;
-                                AppleRle rle = new AppleRle(cmpMs);
+                                var rle = new AppleRle(cmpMs);
+
                                 for(int i = 0; i < buffersize; i++)
                                 {
                                     int b = rle.ProduceByte();
-                                    if(b == -1) break;
+
+                                    if(b == -1)
+                                        break;
 
                                     tmpBuffer[i] = (byte)b;
                                     realSize++;
@@ -442,22 +483,25 @@ namespace Aaru.DiscImages
 
                                 buffer = new byte[realSize];
                                 Array.Copy(tmpBuffer, 0, buffer, 0, realSize);
+
                                 break;
                         }
-                        #if DEBUG
+                    #if DEBUG
                     }
                     catch(ZlibException)
                     {
                         AaruConsole.WriteLine("zlib exception on chunk starting at sector {0}", readChunk.sector);
+
                         throw;
                     }
-                    #endif
+                #endif
                 }
 
                 sector = new byte[SECTOR_SIZE];
                 Array.Copy(buffer, relOff, sector, 0, SECTOR_SIZE);
 
-                if(sectorCache.Count >= MAX_CACHED_SECTORS) sectorCache.Clear();
+                if(sectorCache.Count >= MAX_CACHED_SECTORS)
+                    sectorCache.Clear();
 
                 sectorCache.Add(sectorAddress, sector);
 
@@ -470,18 +514,22 @@ namespace Aaru.DiscImages
                 case CHUNK_TYPE_ZERO:
                     sector = new byte[SECTOR_SIZE];
 
-                    if(sectorCache.Count >= MAX_CACHED_SECTORS) sectorCache.Clear();
+                    if(sectorCache.Count >= MAX_CACHED_SECTORS)
+                        sectorCache.Clear();
 
                     sectorCache.Add(sectorAddress, sector);
+
                     return sector;
                 case CHUNK_TYPE_COPY:
                     imageStream.Seek((long)readChunk.offset + relOff, SeekOrigin.Begin);
                     sector = new byte[SECTOR_SIZE];
                     imageStream.Read(sector, 0, sector.Length);
 
-                    if(sectorCache.Count >= MAX_CACHED_SECTORS) sectorCache.Clear();
+                    if(sectorCache.Count >= MAX_CACHED_SECTORS)
+                        sectorCache.Clear();
 
                     sectorCache.Add(sectorAddress, sector);
+
                     return sector;
             }
 
@@ -497,7 +545,7 @@ namespace Aaru.DiscImages
             if(sectorAddress + length > imageInfo.Sectors)
                 throw new ArgumentOutOfRangeException(nameof(length), "Requested more sectors than available");
 
-            MemoryStream ms = new MemoryStream();
+            var ms = new MemoryStream();
 
             for(uint i = 0; i < length; i++)
             {
diff --git a/Aaru.Images/UDIF/Structs.cs b/Aaru.Images/UDIF/Structs.cs
index fcce80e15..666306b38 100644
--- a/Aaru.Images/UDIF/Structs.cs
+++ b/Aaru.Images/UDIF/Structs.cs
@@ -40,71 +40,71 @@ namespace Aaru.DiscImages
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct UdifFooter
         {
-            public uint  signature;
-            public uint  version;
-            public uint  headerSize;
-            public uint  flags;
-            public ulong runningDataForkOff;
-            public ulong dataForkOff;
-            public ulong dataForkLen;
-            public ulong rsrcForkOff;
-            public ulong rsrcForkLen;
-            public uint  segmentNumber;
-            public uint  segmentCount;
-            public Guid  segmentId;
-            public uint  dataForkChkType;
-            public uint  dataForkChkLen;
-            public uint  dataForkChk;
+            public          uint  signature;
+            public          uint  version;
+            public          uint  headerSize;
+            public          uint  flags;
+            public readonly ulong runningDataForkOff;
+            public readonly ulong dataForkOff;
+            public          ulong dataForkLen;
+            public readonly ulong rsrcForkOff;
+            public readonly ulong rsrcForkLen;
+            public          uint  segmentNumber;
+            public          uint  segmentCount;
+            public          Guid  segmentId;
+            public          uint  dataForkChkType;
+            public          uint  dataForkChkLen;
+            public          uint  dataForkChk;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 124)]
-            public byte[] reserved1;
+            public readonly byte[] reserved1;
             public ulong plistOff;
             public ulong plistLen;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 120)]
-            public byte[] reserved2;
-            public uint masterChkType;
-            public uint masterChkLen;
-            public uint masterChk;
+            public readonly byte[] reserved2;
+            public readonly uint masterChkType;
+            public readonly uint masterChkLen;
+            public readonly uint masterChk;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 124)]
-            public byte[] reserved3;
+            public readonly byte[] reserved3;
             public uint  imageVariant;
             public ulong sectorCount;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 12)]
-            public byte[] reserved4;
+            public readonly byte[] reserved4;
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct BlockHeader
         {
-            public uint  signature;
-            public uint  version;
-            public ulong sectorStart;
-            public ulong sectorCount;
-            public ulong dataOffset;
-            public uint  buffers;
-            public uint  descriptor;
-            public uint  reserved1;
-            public uint  reserved2;
-            public uint  reserved3;
-            public uint  reserved4;
-            public uint  reserved5;
-            public uint  reserved6;
-            public uint  checksumType;
-            public uint  checksumLen;
-            public uint  checksum;
+            public          uint  signature;
+            public          uint  version;
+            public readonly ulong sectorStart;
+            public          ulong sectorCount;
+            public readonly ulong dataOffset;
+            public readonly uint  buffers;
+            public readonly uint  descriptor;
+            public readonly uint  reserved1;
+            public readonly uint  reserved2;
+            public readonly uint  reserved3;
+            public readonly uint  reserved4;
+            public readonly uint  reserved5;
+            public readonly uint  reserved6;
+            public          uint  checksumType;
+            public          uint  checksumLen;
+            public          uint  checksum;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 124)]
-            public byte[] reservedChk;
+            public readonly byte[] reservedChk;
             public uint chunks;
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct BlockChunk
         {
-            public uint  type;
-            public uint  comment;
-            public ulong sector;
-            public ulong sectors;
-            public ulong offset;
-            public ulong length;
+            public          uint  type;
+            public readonly uint  comment;
+            public          ulong sector;
+            public          ulong sectors;
+            public          ulong offset;
+            public          ulong length;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/UDIF/UDIF.cs b/Aaru.Images/UDIF/UDIF.cs
index 18bc18d01..c2c8e4dd0 100644
--- a/Aaru.Images/UDIF/UDIF.cs
+++ b/Aaru.Images/UDIF/UDIF.cs
@@ -57,31 +57,18 @@ namespace Aaru.DiscImages
         Dictionary<ulong, byte[]>     sectorCache;
         FileStream                    writingStream;
 
-        public Udif()
+        public Udif() => imageInfo = new ImageInfo
         {
-            imageInfo = new ImageInfo
-            {
-                ReadableSectorTags    = new List<SectorTagType>(),
-                ReadableMediaTags     = new List<MediaTagType>(),
-                HasPartitions         = false,
-                HasSessions           = false,
-                Version               = null,
-                Application           = null,
-                ApplicationVersion    = null,
-                Creator               = null,
-                Comments              = null,
-                MediaManufacturer     = null,
-                MediaModel            = null,
-                MediaSerialNumber     = null,
-                MediaBarcode          = null,
-                MediaPartNumber       = null,
-                MediaSequence         = 0,
-                LastMediaSequence     = 0,
-                DriveManufacturer     = null,
-                DriveModel            = null,
-                DriveSerialNumber     = null,
-                DriveFirmwareRevision = null
-            };
-        }
+            ReadableSectorTags = new List<SectorTagType>(), ReadableMediaTags = new List<MediaTagType>(),
+            HasPartitions      = false, HasSessions                           = false, Version = null,
+            Application        = null,
+            ApplicationVersion = null, Creator = null, Comments = null,
+            MediaManufacturer  = null,
+            MediaModel         = null, MediaSerialNumber = null, MediaBarcode = null,
+            MediaPartNumber    = null,
+            MediaSequence      = 0, LastMediaSequence = 0, DriveManufacturer = null,
+            DriveModel         = null,
+            DriveSerialNumber  = null, DriveFirmwareRevision = null
+        };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/UDIF/Write.cs b/Aaru.Images/UDIF/Write.cs
index d52c986c6..de404273b 100644
--- a/Aaru.Images/UDIF/Write.cs
+++ b/Aaru.Images/UDIF/Write.cs
@@ -35,11 +35,11 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text;
-using Claunia.PropertyList;
 using Aaru.Checksums;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Structs;
+using Claunia.PropertyList;
 using Schemas;
 
 namespace Aaru.DiscImages
@@ -47,26 +47,35 @@ namespace Aaru.DiscImages
     public partial class Udif
     {
         public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
-                           uint   sectorSize)
+                           uint sectorSize)
         {
             if(sectorSize != 512)
             {
                 ErrorMessage = "Unsupported sector size";
+
                 return false;
             }
 
             if(!SupportedMediaTypes.Contains(mediaType))
             {
                 ErrorMessage = $"Unsupport media format {mediaType}";
+
                 return false;
             }
 
-            imageInfo = new ImageInfo {MediaType = mediaType, SectorSize = sectorSize, Sectors = sectors};
+            imageInfo = new ImageInfo
+            {
+                MediaType = mediaType, SectorSize = sectorSize, Sectors = sectors
+            };
 
-            try { writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None); }
+            try
+            {
+                writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
+            }
             catch(IOException e)
             {
                 ErrorMessage = $"Could not create new image file, exception {e.Message}";
+
                 return false;
             }
 
@@ -78,12 +87,14 @@ namespace Aaru.DiscImages
 
             IsWriting    = true;
             ErrorMessage = null;
+
             return true;
         }
 
         public bool WriteMediaTag(byte[] data, MediaTagType tag)
         {
             ErrorMessage = "Writing media tags is not supported.";
+
             return false;
         }
 
@@ -92,24 +103,28 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Tried to write on a non-writable image";
+
                 return false;
             }
 
             if(data.Length != imageInfo.SectorSize)
             {
                 ErrorMessage = "Incorrect data size";
+
                 return false;
             }
 
             if(sectorAddress >= imageInfo.Sectors)
             {
                 ErrorMessage = "Tried to write past image size";
+
                 return false;
             }
 
             if(sectorAddress < currentSector)
             {
                 ErrorMessage = "Tried to rewind, this format rewinded on writing";
+
                 return false;
             }
 
@@ -121,16 +136,18 @@ namespace Aaru.DiscImages
             {
                 case CHUNK_TYPE_ZERO:
                     currentChunk.type = isEmpty ? CHUNK_TYPE_NOCOPY : CHUNK_TYPE_COPY;
+
                     break;
                 case CHUNK_TYPE_NOCOPY when !isEmpty:
                 case CHUNK_TYPE_COPY when isEmpty:
                     chunks.Add(currentChunk.sector, currentChunk);
+
                     currentChunk = new BlockChunk
                     {
-                        type   = isEmpty ? CHUNK_TYPE_NOCOPY : CHUNK_TYPE_COPY,
-                        sector = currentSector,
+                        type   = isEmpty ? CHUNK_TYPE_NOCOPY : CHUNK_TYPE_COPY, sector = currentSector,
                         offset = (ulong)(isEmpty ? 0 : writingStream.Position)
                     };
+
                     break;
             }
 
@@ -145,6 +162,7 @@ namespace Aaru.DiscImages
             }
 
             ErrorMessage = "";
+
             return true;
         }
 
@@ -154,18 +172,21 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Tried to write on a non-writable image";
+
                 return false;
             }
 
             if(data.Length % imageInfo.SectorSize != 0)
             {
                 ErrorMessage = "Incorrect data size";
+
                 return false;
             }
 
             if(sectorAddress + length > imageInfo.Sectors)
             {
                 ErrorMessage = "Tried to write past image size";
+
                 return false;
             }
 
@@ -175,7 +196,11 @@ namespace Aaru.DiscImages
                 if(currentChunk.type == CHUNK_TYPE_COPY)
                 {
                     chunks.Add(currentChunk.sector, currentChunk);
-                    currentChunk = new BlockChunk {type = CHUNK_TYPE_NOCOPY, sector = currentSector};
+
+                    currentChunk = new BlockChunk
+                    {
+                        type = CHUNK_TYPE_NOCOPY, sector = currentSector
+                    };
                 }
 
                 currentChunk.sectors += (ulong)(data.Length / imageInfo.SectorSize);
@@ -183,6 +208,7 @@ namespace Aaru.DiscImages
                 masterChecksum.Update(data);
 
                 ErrorMessage = "";
+
                 return true;
             }
 
@@ -190,22 +216,27 @@ namespace Aaru.DiscImages
             {
                 byte[] tmp = new byte[imageInfo.SectorSize];
                 Array.Copy(data, i * imageInfo.SectorSize, tmp, 0, imageInfo.SectorSize);
-                if(!WriteSector(tmp, sectorAddress + i)) return false;
+
+                if(!WriteSector(tmp, sectorAddress + i))
+                    return false;
             }
 
             ErrorMessage = "";
+
             return true;
         }
 
         public bool WriteSectorLong(byte[] data, ulong sectorAddress)
         {
             ErrorMessage = "Writing sectors with tags is not supported.";
+
             return false;
         }
 
         public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
         {
             ErrorMessage = "Writing sectors with tags is not supported.";
+
             return false;
         }
 
@@ -214,77 +245,82 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Image is not opened for writing";
+
                 return false;
             }
 
-            if(currentChunk.type != CHUNK_TYPE_NOCOPY) currentChunk.length = currentChunk.sectors * 512;
+            if(currentChunk.type != CHUNK_TYPE_NOCOPY)
+                currentChunk.length = currentChunk.sectors * 512;
+
             chunks.Add(currentChunk.sector, currentChunk);
 
-            chunks.Add(imageInfo.Sectors, new BlockChunk {type = CHUNK_TYPE_END, sector = imageInfo.Sectors});
-
-            BlockHeader bHdr = new BlockHeader
+            chunks.Add(imageInfo.Sectors, new BlockChunk
             {
-                signature    = CHUNK_SIGNATURE,
-                version      = 1,
-                sectorCount  = imageInfo.Sectors,
-                checksumType = UDIF_CHECKSUM_TYPE_CRC32,
-                checksumLen  = 32,
+                type = CHUNK_TYPE_END, sector = imageInfo.Sectors
+            });
+
+            var bHdr = new BlockHeader
+            {
+                signature    = CHUNK_SIGNATURE, version              = 1, sectorCount = imageInfo.Sectors,
+                checksumType = UDIF_CHECKSUM_TYPE_CRC32, checksumLen = 32,
                 checksum     = BitConverter.ToUInt32(dataForkChecksum.Final().Reverse().ToArray(), 0),
                 chunks       = (uint)chunks.Count
             };
 
-            MemoryStream chunkMs = new MemoryStream();
-            chunkMs.Write(BigEndianBitConverter.GetBytes(bHdr.signature),    0, 4);
-            chunkMs.Write(BigEndianBitConverter.GetBytes(bHdr.version),      0, 4);
-            chunkMs.Write(BigEndianBitConverter.GetBytes(bHdr.sectorStart),  0, 8);
-            chunkMs.Write(BigEndianBitConverter.GetBytes(bHdr.sectorCount),  0, 8);
-            chunkMs.Write(BigEndianBitConverter.GetBytes(bHdr.dataOffset),   0, 8);
-            chunkMs.Write(BigEndianBitConverter.GetBytes(bHdr.buffers),      0, 4);
-            chunkMs.Write(BigEndianBitConverter.GetBytes(bHdr.descriptor),   0, 4);
-            chunkMs.Write(BigEndianBitConverter.GetBytes(bHdr.reserved1),    0, 4);
-            chunkMs.Write(BigEndianBitConverter.GetBytes(bHdr.reserved2),    0, 4);
-            chunkMs.Write(BigEndianBitConverter.GetBytes(bHdr.reserved3),    0, 4);
-            chunkMs.Write(BigEndianBitConverter.GetBytes(bHdr.reserved4),    0, 4);
-            chunkMs.Write(BigEndianBitConverter.GetBytes(bHdr.reserved5),    0, 4);
-            chunkMs.Write(BigEndianBitConverter.GetBytes(bHdr.reserved6),    0, 4);
+            var chunkMs = new MemoryStream();
+            chunkMs.Write(BigEndianBitConverter.GetBytes(bHdr.signature), 0, 4);
+            chunkMs.Write(BigEndianBitConverter.GetBytes(bHdr.version), 0, 4);
+            chunkMs.Write(BigEndianBitConverter.GetBytes(bHdr.sectorStart), 0, 8);
+            chunkMs.Write(BigEndianBitConverter.GetBytes(bHdr.sectorCount), 0, 8);
+            chunkMs.Write(BigEndianBitConverter.GetBytes(bHdr.dataOffset), 0, 8);
+            chunkMs.Write(BigEndianBitConverter.GetBytes(bHdr.buffers), 0, 4);
+            chunkMs.Write(BigEndianBitConverter.GetBytes(bHdr.descriptor), 0, 4);
+            chunkMs.Write(BigEndianBitConverter.GetBytes(bHdr.reserved1), 0, 4);
+            chunkMs.Write(BigEndianBitConverter.GetBytes(bHdr.reserved2), 0, 4);
+            chunkMs.Write(BigEndianBitConverter.GetBytes(bHdr.reserved3), 0, 4);
+            chunkMs.Write(BigEndianBitConverter.GetBytes(bHdr.reserved4), 0, 4);
+            chunkMs.Write(BigEndianBitConverter.GetBytes(bHdr.reserved5), 0, 4);
+            chunkMs.Write(BigEndianBitConverter.GetBytes(bHdr.reserved6), 0, 4);
             chunkMs.Write(BigEndianBitConverter.GetBytes(bHdr.checksumType), 0, 4);
-            chunkMs.Write(BigEndianBitConverter.GetBytes(bHdr.checksumLen),  0, 4);
-            chunkMs.Write(BigEndianBitConverter.GetBytes(bHdr.checksum),     0, 4);
-            chunkMs.Write(new byte[124],                                     0, 124);
-            chunkMs.Write(BigEndianBitConverter.GetBytes(bHdr.chunks),       0, 4);
+            chunkMs.Write(BigEndianBitConverter.GetBytes(bHdr.checksumLen), 0, 4);
+            chunkMs.Write(BigEndianBitConverter.GetBytes(bHdr.checksum), 0, 4);
+            chunkMs.Write(new byte[124], 0, 124);
+            chunkMs.Write(BigEndianBitConverter.GetBytes(bHdr.chunks), 0, 4);
 
             foreach(BlockChunk chunk in chunks.Values)
             {
-                chunkMs.Write(BigEndianBitConverter.GetBytes(chunk.type),    0, 4);
+                chunkMs.Write(BigEndianBitConverter.GetBytes(chunk.type), 0, 4);
                 chunkMs.Write(BigEndianBitConverter.GetBytes(chunk.comment), 0, 4);
-                chunkMs.Write(BigEndianBitConverter.GetBytes(chunk.sector),  0, 8);
+                chunkMs.Write(BigEndianBitConverter.GetBytes(chunk.sector), 0, 8);
                 chunkMs.Write(BigEndianBitConverter.GetBytes(chunk.sectors), 0, 8);
-                chunkMs.Write(BigEndianBitConverter.GetBytes(chunk.offset),  0, 8);
-                chunkMs.Write(BigEndianBitConverter.GetBytes(chunk.length),  0, 8);
+                chunkMs.Write(BigEndianBitConverter.GetBytes(chunk.offset), 0, 8);
+                chunkMs.Write(BigEndianBitConverter.GetBytes(chunk.length), 0, 8);
             }
 
             byte[] plist = Encoding.UTF8.GetBytes(new NSDictionary
             {
                 {
-                    "resource-fork",
-                    new NSDictionary
+                    "resource-fork", new NSDictionary
                     {
                         {
-                            "blkx",
-                            new NSArray
+                            "blkx", new NSArray
                             {
                                 new NSDictionary
                                 {
-                                    {"Attributes", "0x0050"},
                                     {
-                                        "CFName",
-                                        "whole disk (Aaru : 0)"
+                                        "Attributes", "0x0050"
                                     },
-                                    {"Data", chunkMs.ToArray()},
-                                    {"ID", "0"},
                                     {
-                                        "Name",
-                                        "whole disk (Aaru : 0)"
+                                        "CFName", "whole disk (Aaru : 0)"
+                                    },
+                                    {
+                                        "Data", chunkMs.ToArray()
+                                    },
+                                    {
+                                        "ID", "0"
+                                    },
+                                    {
+                                        "Name", "whole disk (Aaru : 0)"
                                     }
                                 }
                             }
@@ -295,61 +331,56 @@ namespace Aaru.DiscImages
 
             footer = new UdifFooter
             {
-                signature       = UDIF_SIGNATURE,
-                version         = 4,
-                headerSize      = 512,
-                flags           = 1,
-                dataForkLen     = (ulong)writingStream.Length,
-                segmentNumber   = 1,
-                segmentCount    = 1,
-                segmentId       = Guid.NewGuid(),
-                dataForkChkType = UDIF_CHECKSUM_TYPE_CRC32,
-                dataForkChkLen  = 32,
-                dataForkChk     = BitConverter.ToUInt32(dataForkChecksum.Final().Reverse().ToArray(), 0),
-                plistOff        = (ulong)writingStream.Length,
-                plistLen        = (ulong)plist.Length,
+                signature      = UDIF_SIGNATURE, version                    = 4,
+                headerSize     = 512, flags                                 = 1,
+                dataForkLen    = (ulong)writingStream.Length, segmentNumber = 1, segmentCount = 1,
+                segmentId      = Guid.NewGuid(), dataForkChkType            = UDIF_CHECKSUM_TYPE_CRC32,
+                dataForkChkLen = 32,
+                dataForkChk    = BitConverter.ToUInt32(dataForkChecksum.Final().Reverse().ToArray(), 0),
+                plistOff       = (ulong)writingStream.Length, plistLen = (ulong)plist.Length,
+
                 // TODO: Find how is this calculated
                 /*masterChkType   = 2,
                 masterChkLen    = 32,
                 masterChk       = BitConverter.ToUInt32(masterChecksum.Final().Reverse().ToArray(), 0),*/
-                imageVariant = 2,
-                sectorCount  = imageInfo.Sectors
+                imageVariant = 2, sectorCount = imageInfo.Sectors
             };
 
             writingStream.Seek(0, SeekOrigin.End);
-            writingStream.Write(plist,                                                     0, plist.Length);
-            writingStream.Write(BigEndianBitConverter.GetBytes(footer.signature),          0, 4);
-            writingStream.Write(BigEndianBitConverter.GetBytes(footer.version),            0, 4);
-            writingStream.Write(BigEndianBitConverter.GetBytes(footer.headerSize),         0, 4);
-            writingStream.Write(BigEndianBitConverter.GetBytes(footer.flags),              0, 4);
+            writingStream.Write(plist, 0, plist.Length);
+            writingStream.Write(BigEndianBitConverter.GetBytes(footer.signature), 0, 4);
+            writingStream.Write(BigEndianBitConverter.GetBytes(footer.version), 0, 4);
+            writingStream.Write(BigEndianBitConverter.GetBytes(footer.headerSize), 0, 4);
+            writingStream.Write(BigEndianBitConverter.GetBytes(footer.flags), 0, 4);
             writingStream.Write(BigEndianBitConverter.GetBytes(footer.runningDataForkOff), 0, 8);
-            writingStream.Write(BigEndianBitConverter.GetBytes(footer.dataForkOff),        0, 8);
-            writingStream.Write(BigEndianBitConverter.GetBytes(footer.dataForkLen),        0, 8);
-            writingStream.Write(BigEndianBitConverter.GetBytes(footer.rsrcForkOff),        0, 8);
-            writingStream.Write(BigEndianBitConverter.GetBytes(footer.rsrcForkLen),        0, 8);
-            writingStream.Write(BigEndianBitConverter.GetBytes(footer.segmentNumber),      0, 4);
-            writingStream.Write(BigEndianBitConverter.GetBytes(footer.segmentCount),       0, 4);
-            writingStream.Write(footer.segmentId.ToByteArray(),                            0, 16);
-            writingStream.Write(BigEndianBitConverter.GetBytes(footer.dataForkChkType),    0, 4);
-            writingStream.Write(BigEndianBitConverter.GetBytes(footer.dataForkChkLen),     0, 4);
-            writingStream.Write(BigEndianBitConverter.GetBytes(footer.dataForkChk),        0, 4);
-            writingStream.Write(new byte[124],                                             0, 124);
-            writingStream.Write(BigEndianBitConverter.GetBytes(footer.plistOff),           0, 8);
-            writingStream.Write(BigEndianBitConverter.GetBytes(footer.plistLen),           0, 8);
-            writingStream.Write(new byte[120],                                             0, 120);
-            writingStream.Write(BigEndianBitConverter.GetBytes(footer.masterChkType),      0, 4);
-            writingStream.Write(BigEndianBitConverter.GetBytes(footer.masterChkLen),       0, 4);
-            writingStream.Write(BigEndianBitConverter.GetBytes(footer.masterChk),          0, 4);
-            writingStream.Write(new byte[124],                                             0, 124);
-            writingStream.Write(BigEndianBitConverter.GetBytes(footer.imageVariant),       0, 4);
-            writingStream.Write(BigEndianBitConverter.GetBytes(footer.sectorCount),        0, 8);
-            writingStream.Write(new byte[12],                                              0, 12);
+            writingStream.Write(BigEndianBitConverter.GetBytes(footer.dataForkOff), 0, 8);
+            writingStream.Write(BigEndianBitConverter.GetBytes(footer.dataForkLen), 0, 8);
+            writingStream.Write(BigEndianBitConverter.GetBytes(footer.rsrcForkOff), 0, 8);
+            writingStream.Write(BigEndianBitConverter.GetBytes(footer.rsrcForkLen), 0, 8);
+            writingStream.Write(BigEndianBitConverter.GetBytes(footer.segmentNumber), 0, 4);
+            writingStream.Write(BigEndianBitConverter.GetBytes(footer.segmentCount), 0, 4);
+            writingStream.Write(footer.segmentId.ToByteArray(), 0, 16);
+            writingStream.Write(BigEndianBitConverter.GetBytes(footer.dataForkChkType), 0, 4);
+            writingStream.Write(BigEndianBitConverter.GetBytes(footer.dataForkChkLen), 0, 4);
+            writingStream.Write(BigEndianBitConverter.GetBytes(footer.dataForkChk), 0, 4);
+            writingStream.Write(new byte[124], 0, 124);
+            writingStream.Write(BigEndianBitConverter.GetBytes(footer.plistOff), 0, 8);
+            writingStream.Write(BigEndianBitConverter.GetBytes(footer.plistLen), 0, 8);
+            writingStream.Write(new byte[120], 0, 120);
+            writingStream.Write(BigEndianBitConverter.GetBytes(footer.masterChkType), 0, 4);
+            writingStream.Write(BigEndianBitConverter.GetBytes(footer.masterChkLen), 0, 4);
+            writingStream.Write(BigEndianBitConverter.GetBytes(footer.masterChk), 0, 4);
+            writingStream.Write(new byte[124], 0, 124);
+            writingStream.Write(BigEndianBitConverter.GetBytes(footer.imageVariant), 0, 4);
+            writingStream.Write(BigEndianBitConverter.GetBytes(footer.sectorCount), 0, 8);
+            writingStream.Write(new byte[12], 0, 12);
 
             writingStream.Flush();
             writingStream.Close();
 
             IsWriting    = false;
             ErrorMessage = "";
+
             return true;
         }
 
@@ -361,12 +392,14 @@ namespace Aaru.DiscImages
         public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
         {
             ErrorMessage = "Writing sectors with tags is not supported.";
+
             return false;
         }
 
         public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
         {
             ErrorMessage = "Writing sectors with tags is not supported.";
+
             return false;
         }
 
diff --git a/Aaru.Images/UkvFdi/Constants.cs b/Aaru.Images/UkvFdi/Constants.cs
index 6ad1ddda4..776a461ef 100644
--- a/Aaru.Images/UkvFdi/Constants.cs
+++ b/Aaru.Images/UkvFdi/Constants.cs
@@ -34,6 +34,9 @@ namespace Aaru.DiscImages
 {
     public partial class UkvFdi
     {
-        readonly byte[] signature = {0x46, 0x44, 0x49};
+        readonly byte[] signature =
+        {
+            0x46, 0x44, 0x49
+        };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/UkvFdi/Enums.cs b/Aaru.Images/UkvFdi/Enums.cs
index a3f675874..13d98058c 100644
--- a/Aaru.Images/UkvFdi/Enums.cs
+++ b/Aaru.Images/UkvFdi/Enums.cs
@@ -45,12 +45,8 @@ namespace Aaru.DiscImages
         [Flags]
         enum SectorFlags : byte
         {
-            CrcOk128  = 0x01,
-            CrcOk256  = 0x02,
-            CrcOk512  = 0x04,
-            CrcOk1024 = 0x08,
-            CrcOk2048 = 0x10,
-            CrcOk4096 = 0x20,
+            CrcOk128  = 0x01, CrcOk256  = 0x02, CrcOk512  = 0x04,
+            CrcOk1024 = 0x08, CrcOk2048 = 0x10, CrcOk4096 = 0x20,
             Deleted   = 0x80
         }
     }
diff --git a/Aaru.Images/UkvFdi/Helpers.cs b/Aaru.Images/UkvFdi/Helpers.cs
index f9553ae85..d002b36b2 100644
--- a/Aaru.Images/UkvFdi/Helpers.cs
+++ b/Aaru.Images/UkvFdi/Helpers.cs
@@ -36,9 +36,9 @@ namespace Aaru.DiscImages
     {
         (ushort cylinder, byte head, byte sector) LbaToChs(ulong lba)
         {
-            ushort cylinder = (ushort)(lba                           / (imageInfo.Heads * imageInfo.SectorsPerTrack));
-            byte   head     = (byte)(lba / imageInfo.SectorsPerTrack % imageInfo.Heads);
-            byte   sector   = (byte)(lba % imageInfo.SectorsPerTrack + 1);
+            ushort cylinder = (ushort)(lba / (imageInfo.Heads * imageInfo.SectorsPerTrack));
+            byte   head     = (byte)((lba                     / imageInfo.SectorsPerTrack) % imageInfo.Heads);
+            byte   sector   = (byte)((lba                     % imageInfo.SectorsPerTrack) + 1);
 
             return (cylinder, head, sector);
         }
diff --git a/Aaru.Images/UkvFdi/Identify.cs b/Aaru.Images/UkvFdi/Identify.cs
index 3a2e3c1d6..538996fcb 100644
--- a/Aaru.Images/UkvFdi/Identify.cs
+++ b/Aaru.Images/UkvFdi/Identify.cs
@@ -44,9 +44,10 @@ namespace Aaru.DiscImages
             Stream stream = imageFilter.GetDataForkStream();
             stream.Seek(0, SeekOrigin.Begin);
 
-            FdiHeader hdr = new FdiHeader();
+            var hdr = new FdiHeader();
 
-            if(stream.Length < Marshal.SizeOf<FdiHeader>()) return false;
+            if(stream.Length < Marshal.SizeOf<FdiHeader>())
+                return false;
 
             byte[] hdrB = new byte[Marshal.SizeOf<FdiHeader>()];
             stream.Read(hdrB, 0, hdrB.Length);
diff --git a/Aaru.Images/UkvFdi/Read.cs b/Aaru.Images/UkvFdi/Read.cs
index 1810ea75c..626c0bd25 100644
--- a/Aaru.Images/UkvFdi/Read.cs
+++ b/Aaru.Images/UkvFdi/Read.cs
@@ -47,9 +47,10 @@ namespace Aaru.DiscImages
             Stream stream = imageFilter.GetDataForkStream();
             stream.Seek(0, SeekOrigin.Begin);
 
-            FdiHeader hdr = new FdiHeader();
+            var hdr = new FdiHeader();
 
-            if(stream.Length < Marshal.SizeOf<FdiHeader>()) return false;
+            if(stream.Length < Marshal.SizeOf<FdiHeader>())
+                return false;
 
             byte[] hdrB = new byte[Marshal.SizeOf<FdiHeader>()];
             stream.Read(hdrB, 0, hdrB.Length);
@@ -57,11 +58,11 @@ namespace Aaru.DiscImages
             hdr = Marshal.ByteArrayToStructureLittleEndian<FdiHeader>(hdrB);
 
             AaruConsole.DebugWriteLine("UkvFdi plugin", "hdr.addInfoLen = {0}", hdr.addInfoLen);
-            AaruConsole.DebugWriteLine("UkvFdi plugin", "hdr.cylinders = {0}",  hdr.cylinders);
-            AaruConsole.DebugWriteLine("UkvFdi plugin", "hdr.dataOff = {0}",    hdr.dataOff);
-            AaruConsole.DebugWriteLine("UkvFdi plugin", "hdr.descOff = {0}",    hdr.descOff);
-            AaruConsole.DebugWriteLine("UkvFdi plugin", "hdr.flags = {0}",      hdr.flags);
-            AaruConsole.DebugWriteLine("UkvFdi plugin", "hdr.heads = {0}",      hdr.heads);
+            AaruConsole.DebugWriteLine("UkvFdi plugin", "hdr.cylinders = {0}", hdr.cylinders);
+            AaruConsole.DebugWriteLine("UkvFdi plugin", "hdr.dataOff = {0}", hdr.dataOff);
+            AaruConsole.DebugWriteLine("UkvFdi plugin", "hdr.descOff = {0}", hdr.descOff);
+            AaruConsole.DebugWriteLine("UkvFdi plugin", "hdr.flags = {0}", hdr.flags);
+            AaruConsole.DebugWriteLine("UkvFdi plugin", "hdr.heads = {0}", hdr.heads);
 
             stream.Seek(hdr.descOff, SeekOrigin.Begin);
             byte[] description = new byte[hdr.dataOff - hdr.descOff];
@@ -93,40 +94,44 @@ namespace Aaru.DiscImages
                     byte sectors = (byte)stream.ReadByte();
                     uint trkOff  = BitConverter.ToUInt32(sctB, 0);
 
-                    AaruConsole.DebugWriteLine("UkvFdi plugin", "trkhdr.c = {0}",       cyl);
-                    AaruConsole.DebugWriteLine("UkvFdi plugin", "trkhdr.h = {0}",       head);
+                    AaruConsole.DebugWriteLine("UkvFdi plugin", "trkhdr.c = {0}", cyl);
+                    AaruConsole.DebugWriteLine("UkvFdi plugin", "trkhdr.h = {0}", head);
                     AaruConsole.DebugWriteLine("UkvFdi plugin", "trkhdr.sectors = {0}", sectors);
-                    AaruConsole.DebugWriteLine("UkvFdi plugin", "trkhdr.off = {0}",     trkOff);
+                    AaruConsole.DebugWriteLine("UkvFdi plugin", "trkhdr.off = {0}", trkOff);
 
                     sectorsOff[cyl][head]  = new uint[sectors];
                     sectorsData[cyl][head] = new byte[sectors][];
 
-                    if(sectors < spt && sectors > 0) spt = sectors;
+                    if(sectors < spt &&
+                       sectors > 0)
+                        spt = sectors;
 
                     for(ushort sec = 0; sec < sectors; sec++)
                     {
-                        byte        c    = (byte)stream.ReadByte();
-                        byte        h    = (byte)stream.ReadByte();
-                        byte        r    = (byte)stream.ReadByte();
-                        byte        n    = (byte)stream.ReadByte();
-                        SectorFlags f    = (SectorFlags)stream.ReadByte();
-                        byte[]      offB = new byte[2];
+                        byte   c    = (byte)stream.ReadByte();
+                        byte   h    = (byte)stream.ReadByte();
+                        byte   r    = (byte)stream.ReadByte();
+                        byte   n    = (byte)stream.ReadByte();
+                        var    f    = (SectorFlags)stream.ReadByte();
+                        byte[] offB = new byte[2];
                         stream.Read(offB, 0, 2);
                         ushort secOff = BitConverter.ToUInt16(offB, 0);
 
-                        AaruConsole.DebugWriteLine("UkvFdi plugin", "sechdr.c = {0}",       c);
-                        AaruConsole.DebugWriteLine("UkvFdi plugin", "sechdr.h = {0}",       h);
-                        AaruConsole.DebugWriteLine("UkvFdi plugin", "sechdr.r = {0}",       r);
+                        AaruConsole.DebugWriteLine("UkvFdi plugin", "sechdr.c = {0}", c);
+                        AaruConsole.DebugWriteLine("UkvFdi plugin", "sechdr.h = {0}", h);
+                        AaruConsole.DebugWriteLine("UkvFdi plugin", "sechdr.r = {0}", r);
                         AaruConsole.DebugWriteLine("UkvFdi plugin", "sechdr.n = {0} ({1})", n, 128 << n);
-                        AaruConsole.DebugWriteLine("UkvFdi plugin", "sechdr.f = {0}",       f);
+                        AaruConsole.DebugWriteLine("UkvFdi plugin", "sechdr.f = {0}", f);
+
                         AaruConsole.DebugWriteLine("UkvFdi plugin", "sechdr.off = {0} ({1})", secOff,
-                                                  secOff + trkOff + hdr.dataOff);
+                                                   secOff + trkOff + hdr.dataOff);
 
                         // TODO: This assumes sequential sectors.
                         sectorsOff[cyl][head][sec]  = secOff + trkOff + hdr.dataOff;
                         sectorsData[cyl][head][sec] = new byte[128 << n];
 
-                        if(128 << n > imageInfo.SectorSize) imageInfo.SectorSize = (uint)(128 << n);
+                        if(128 << n > imageInfo.SectorSize)
+                            imageInfo.SectorSize = (uint)(128 << n);
                     }
                 }
             }
@@ -145,20 +150,27 @@ namespace Aaru.DiscImages
                     }
 
                     // For empty cylinders
-                    if(sectorsOff[cyl][head].Length != 0) continue;
+                    if(sectorsOff[cyl][head].Length != 0)
+                        continue;
 
                     if(cyl + 1 == hdr.cylinders ||
+
                        // Next cylinder is also empty
-                       sectorsOff[cyl + 1][head].Length == 0) emptyCyl = true;
+                       sectorsOff[cyl + 1][head].Length == 0)
+                        emptyCyl = true;
+
                     // Create empty sectors
                     else
                     {
                         sectorsData[cyl][head] = new byte[spt][];
-                        for(int i = 0; i < spt; i++) sectorsData[cyl][head][i] = new byte[imageInfo.SectorSize];
+
+                        for(int i = 0; i < spt; i++)
+                            sectorsData[cyl][head][i] = new byte[imageInfo.SectorSize];
                     }
                 }
 
-                if(emptyCyl) imageInfo.Cylinders--;
+                if(emptyCyl)
+                    imageInfo.Cylinders--;
             }
 
             // TODO: What about double sided, half track pitch compact floppies?
@@ -198,7 +210,8 @@ namespace Aaru.DiscImages
             if(sectorAddress + length > imageInfo.Sectors)
                 throw new ArgumentOutOfRangeException(nameof(length), "Requested more sectors than available");
 
-            MemoryStream buffer = new MemoryStream();
+            var buffer = new MemoryStream();
+
             for(uint i = 0; i < length; i++)
             {
                 byte[] sector = ReadSector(sectorAddress + i);
diff --git a/Aaru.Images/UkvFdi/Structs.cs b/Aaru.Images/UkvFdi/Structs.cs
index 4dad76b2d..25901a749 100644
--- a/Aaru.Images/UkvFdi/Structs.cs
+++ b/Aaru.Images/UkvFdi/Structs.cs
@@ -40,13 +40,13 @@ namespace Aaru.DiscImages
         struct FdiHeader
         {
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
-            public byte[] magic;
-            public DiskFlags flags;
-            public ushort    cylinders;
-            public ushort    heads;
-            public ushort    descOff;
-            public ushort    dataOff;
-            public ushort    addInfoLen;
+            public readonly byte[] magic;
+            public readonly DiskFlags flags;
+            public readonly ushort    cylinders;
+            public readonly ushort    heads;
+            public readonly ushort    descOff;
+            public readonly ushort    dataOff;
+            public readonly ushort    addInfoLen;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/UkvFdi/UkvFdi.cs b/Aaru.Images/UkvFdi/UkvFdi.cs
index 4d75c50ef..c2b8731b3 100644
--- a/Aaru.Images/UkvFdi/UkvFdi.cs
+++ b/Aaru.Images/UkvFdi/UkvFdi.cs
@@ -40,34 +40,22 @@ namespace Aaru.DiscImages
     public partial class UkvFdi : IMediaImage
     {
         ImageInfo imageInfo;
+
         // Cylinder by head, sector data matrix
         byte[][][][] sectorsData;
 
-        public UkvFdi()
+        public UkvFdi() => imageInfo = new ImageInfo
         {
-            imageInfo = new ImageInfo
-            {
-                ReadableSectorTags    = new List<SectorTagType>(),
-                ReadableMediaTags     = new List<MediaTagType>(),
-                HasPartitions         = false,
-                HasSessions           = false,
-                Version               = null,
-                Application           = null,
-                ApplicationVersion    = null,
-                Creator               = null,
-                Comments              = null,
-                MediaManufacturer     = null,
-                MediaModel            = null,
-                MediaSerialNumber     = null,
-                MediaBarcode          = null,
-                MediaPartNumber       = null,
-                MediaSequence         = 0,
-                LastMediaSequence     = 0,
-                DriveManufacturer     = null,
-                DriveModel            = null,
-                DriveSerialNumber     = null,
-                DriveFirmwareRevision = null
-            };
-        }
+            ReadableSectorTags = new List<SectorTagType>(), ReadableMediaTags = new List<MediaTagType>(),
+            HasPartitions      = false, HasSessions                           = false, Version = null,
+            Application        = null,
+            ApplicationVersion = null, Creator = null, Comments = null,
+            MediaManufacturer  = null,
+            MediaModel         = null, MediaSerialNumber = null, MediaBarcode = null,
+            MediaPartNumber    = null,
+            MediaSequence      = 0, LastMediaSequence = 0, DriveManufacturer = null,
+            DriveModel         = null,
+            DriveSerialNumber  = null, DriveFirmwareRevision = null
+        };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/VDI/Constants.cs b/Aaru.Images/VDI/Constants.cs
index 5fdc2ba73..38334e136 100644
--- a/Aaru.Images/VDI/Constants.cs
+++ b/Aaru.Images/VDI/Constants.cs
@@ -43,8 +43,8 @@ namespace Aaru.DiscImages
         const string SUN_VDI         = "<<< Sun VirtualBox Disk Image >>>\n";
         const string INNOTEK_VDI     = "<<< innotek VirtualBox Disk Image >>>\n";
         const string INNOTEK_OLD_VDI = "<<< InnoTek VirtualBox Disk Image >>>\n";
-        const string DIC_VDI = "<<< DiscImageChef VirtualBox Disk Image >>>\n";
-        const string DIC_AARU = "<<< Aaru VirtualBox Disk Image >>>\n";
+        const string DIC_VDI         = "<<< DiscImageChef VirtualBox Disk Image >>>\n";
+        const string DIC_AARU        = "<<< Aaru VirtualBox Disk Image >>>\n";
 
         const uint MAX_CACHE_SIZE     = 16777216;
         const uint MAX_CACHED_SECTORS = MAX_CACHE_SIZE / 512;
diff --git a/Aaru.Images/VDI/Enums.cs b/Aaru.Images/VDI/Enums.cs
index 519980bff..b03094936 100644
--- a/Aaru.Images/VDI/Enums.cs
+++ b/Aaru.Images/VDI/Enums.cs
@@ -54,8 +54,8 @@ namespace Aaru.DiscImages
         enum VdiImageFlags : uint
         {
             /// <summary>
-            ///     Fill new blocks with zeroes while expanding image file. Only valid for newly created images, never set
-            ///     for opened existing images.
+            ///     Fill new blocks with zeroes while expanding image file. Only valid for newly created images, never set for
+            ///     opened existing images.
             /// </summary>
             ZeroExpand = 0x100
         }
diff --git a/Aaru.Images/VDI/Identify.cs b/Aaru.Images/VDI/Identify.cs
index 362adbc12..360decf8f 100644
--- a/Aaru.Images/VDI/Identify.cs
+++ b/Aaru.Images/VDI/Identify.cs
@@ -43,7 +43,8 @@ namespace Aaru.DiscImages
             Stream stream = imageFilter.GetDataForkStream();
             stream.Seek(0, SeekOrigin.Begin);
 
-            if(stream.Length < 512) return false;
+            if(stream.Length < 512)
+                return false;
 
             byte[] vHdrB = new byte[Marshal.SizeOf<VdiHeader>()];
             stream.Read(vHdrB, 0, Marshal.SizeOf<VdiHeader>());
diff --git a/Aaru.Images/VDI/Properties.cs b/Aaru.Images/VDI/Properties.cs
index 8f1478411..1d8fda53f 100644
--- a/Aaru.Images/VDI/Properties.cs
+++ b/Aaru.Images/VDI/Properties.cs
@@ -43,26 +43,32 @@ namespace Aaru.DiscImages
     {
         public ImageInfo Info => imageInfo;
 
-        public string                     Name                => "VirtualBox Disk Image";
-        public Guid                       Id                  => new Guid("E314DE35-C103-48A3-AD36-990F68523C46");
-        public string                     Author              => "Natalia Portillo";
-        public string                     Format              => "VDI";
-        public List<DumpHardwareType>     DumpHardware        => null;
-        public CICMMetadataType           CicmMetadata        => null;
-        public IEnumerable<MediaTagType>  SupportedMediaTags  => new MediaTagType[] { };
-        public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[] { };
-        public IEnumerable<MediaType> SupportedMediaTypes =>
-            new[]
-            {
-                MediaType.Unknown, MediaType.GENERIC_HDD, MediaType.FlashDrive, MediaType.CompactFlash,
-                MediaType.CompactFlashType2, MediaType.PCCardTypeI, MediaType.PCCardTypeII, MediaType.PCCardTypeIII,
-                MediaType.PCCardTypeIV
-            };
+        public string                 Name         => "VirtualBox Disk Image";
+        public Guid                   Id           => new Guid("E314DE35-C103-48A3-AD36-990F68523C46");
+        public string                 Author       => "Natalia Portillo";
+        public string                 Format       => "VDI";
+        public List<DumpHardwareType> DumpHardware => null;
+        public CICMMetadataType       CicmMetadata => null;
+        public IEnumerable<MediaTagType> SupportedMediaTags => new MediaTagType[]
+            {};
+        public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[]
+            {};
+        public IEnumerable<MediaType> SupportedMediaTypes => new[]
+        {
+            MediaType.Unknown, MediaType.GENERIC_HDD, MediaType.FlashDrive, MediaType.CompactFlash,
+            MediaType.CompactFlashType2, MediaType.PCCardTypeI, MediaType.PCCardTypeII, MediaType.PCCardTypeIII,
+            MediaType.PCCardTypeIV
+        };
+
         // TODO: Add cluster size option
         public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
-            new (string name, Type type, string description, object @default)[] { };
-        public IEnumerable<string> KnownExtensions => new[] {".vdi"};
-        public bool                IsWriting       { get; private set; }
-        public string              ErrorMessage    { get; private set; }
+            new (string name, Type type, string description, object @default)[]
+                {};
+        public IEnumerable<string> KnownExtensions => new[]
+        {
+            ".vdi"
+        };
+        public bool   IsWriting    { get; private set; }
+        public string ErrorMessage { get; private set; }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/VDI/Read.cs b/Aaru.Images/VDI/Read.cs
index 73771d90b..96944cae3 100644
--- a/Aaru.Images/VDI/Read.cs
+++ b/Aaru.Images/VDI/Read.cs
@@ -50,35 +50,38 @@ namespace Aaru.DiscImages
             Stream stream = imageFilter.GetDataForkStream();
             stream.Seek(0, SeekOrigin.Begin);
 
-            if(stream.Length < 512) return false;
+            if(stream.Length < 512)
+                return false;
 
             byte[] vHdrB = new byte[Marshal.SizeOf<VdiHeader>()];
             stream.Read(vHdrB, 0, Marshal.SizeOf<VdiHeader>());
             vHdr = Marshal.ByteArrayToStructureLittleEndian<VdiHeader>(vHdrB);
 
             AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.creator = {0}", vHdr.creator);
-            AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.magic = {0}",   vHdr.magic);
+            AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.magic = {0}", vHdr.magic);
+
             AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.version = {0}.{1}", vHdr.majorVersion,
-                                      vHdr.minorVersion);
-            AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.headerSize = {0}",      vHdr.headerSize);
-            AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.imageType = {0}",       vHdr.imageType);
-            AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.imageFlags = {0}",      vHdr.imageFlags);
-            AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.description = {0}",     vHdr.comments);
-            AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.offsetBlocks = {0}",    vHdr.offsetBlocks);
-            AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.offsetData = {0}",      vHdr.offsetData);
-            AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.cylinders = {0}",       vHdr.cylinders);
-            AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.heads = {0}",           vHdr.heads);
-            AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.spt = {0}",             vHdr.spt);
-            AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.sectorSize = {0}",      vHdr.sectorSize);
-            AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.size = {0}",            vHdr.size);
-            AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.blockSize = {0}",       vHdr.blockSize);
-            AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.blockExtraData = {0}",  vHdr.blockExtraData);
-            AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.blocks = {0}",          vHdr.blocks);
+                                       vHdr.minorVersion);
+
+            AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.headerSize = {0}", vHdr.headerSize);
+            AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.imageType = {0}", vHdr.imageType);
+            AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.imageFlags = {0}", vHdr.imageFlags);
+            AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.description = {0}", vHdr.comments);
+            AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.offsetBlocks = {0}", vHdr.offsetBlocks);
+            AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.offsetData = {0}", vHdr.offsetData);
+            AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.cylinders = {0}", vHdr.cylinders);
+            AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.heads = {0}", vHdr.heads);
+            AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.spt = {0}", vHdr.spt);
+            AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.sectorSize = {0}", vHdr.sectorSize);
+            AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.size = {0}", vHdr.size);
+            AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.blockSize = {0}", vHdr.blockSize);
+            AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.blockExtraData = {0}", vHdr.blockExtraData);
+            AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.blocks = {0}", vHdr.blocks);
             AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.allocatedBlocks = {0}", vHdr.allocatedBlocks);
-            AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.uuid = {0}",            vHdr.uuid);
-            AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.snapshotUuid = {0}",    vHdr.snapshotUuid);
-            AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.linkUuid = {0}",        vHdr.linkUuid);
-            AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.parentUuid = {0}",      vHdr.parentUuid);
+            AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.uuid = {0}", vHdr.uuid);
+            AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.snapshotUuid = {0}", vHdr.snapshotUuid);
+            AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.linkUuid = {0}", vHdr.linkUuid);
+            AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.parentUuid = {0}", vHdr.parentUuid);
 
             if(vHdr.imageType != VdiImageType.Normal)
                 throw new
@@ -91,8 +94,9 @@ namespace Aaru.DiscImages
             stream.Read(ibmB, 0, ibmB.Length);
             ibm = MemoryMarshal.Cast<byte, uint>(ibmB).ToArray();
             DateTime end = DateTime.UtcNow;
+
             AaruConsole.DebugWriteLine("VirtualBox plugin", "Reading Image Block Map took {0} ms",
-                                      (end - start).TotalMilliseconds);
+                                       (end - start).TotalMilliseconds);
 
             sectorCache = new Dictionary<ulong, byte[]>();
 
@@ -111,25 +115,32 @@ namespace Aaru.DiscImages
             {
                 case SUN_VDI:
                     imageInfo.Application = "Sun VirtualBox";
+
                     break;
                 case SUN_OLD_VDI:
                     imageInfo.Application = "Sun xVM";
+
                     break;
                 case ORACLE_VDI:
                     imageInfo.Application = "Oracle VirtualBox";
+
                     break;
                 case QEMUVDI:
                     imageInfo.Application = "QEMU";
+
                     break;
                 case INNOTEK_VDI:
                 case INNOTEK_OLD_VDI:
                     imageInfo.Application = "innotek VirtualBox";
+
                     break;
                 case DIC_VDI:
                     imageInfo.Application = "DiscImageChef";
+
                     break;
                 case DIC_AARU:
                     imageInfo.Application = "Aaru";
+
                     break;
             }
 
@@ -148,16 +159,18 @@ namespace Aaru.DiscImages
                 throw new ArgumentOutOfRangeException(nameof(sectorAddress),
                                                       $"Sector address {sectorAddress} not found");
 
-            if(sectorCache.TryGetValue(sectorAddress, out byte[] sector)) return sector;
+            if(sectorCache.TryGetValue(sectorAddress, out byte[] sector))
+                return sector;
 
-            ulong index  = sectorAddress * vHdr.sectorSize / vHdr.blockSize;
-            ulong secOff = sectorAddress * vHdr.sectorSize % vHdr.blockSize;
+            ulong index  = (sectorAddress * vHdr.sectorSize) / vHdr.blockSize;
+            ulong secOff = (sectorAddress * vHdr.sectorSize) % vHdr.blockSize;
 
             uint ibmOff = ibm[(int)index];
 
-            if(ibmOff == VDI_EMPTY) return new byte[vHdr.sectorSize];
+            if(ibmOff == VDI_EMPTY)
+                return new byte[vHdr.sectorSize];
 
-            ulong imageOff = vHdr.offsetData + ibmOff * vHdr.blockSize;
+            ulong imageOff = vHdr.offsetData + (ibmOff * vHdr.blockSize);
 
             byte[] cluster = new byte[vHdr.blockSize];
             imageStream.Seek((long)imageOff, SeekOrigin.Begin);
@@ -165,7 +178,8 @@ namespace Aaru.DiscImages
             sector = new byte[vHdr.sectorSize];
             Array.Copy(cluster, (int)secOff, sector, 0, vHdr.sectorSize);
 
-            if(sectorCache.Count > MAX_CACHED_SECTORS) sectorCache.Clear();
+            if(sectorCache.Count > MAX_CACHED_SECTORS)
+                sectorCache.Clear();
 
             sectorCache.Add(sectorAddress, sector);
 
@@ -182,7 +196,7 @@ namespace Aaru.DiscImages
                 throw new ArgumentOutOfRangeException(nameof(length),
                                                       $"Requested more sectors ({sectorAddress} + {length}) than available ({imageInfo.Sectors})");
 
-            MemoryStream ms = new MemoryStream();
+            var ms = new MemoryStream();
 
             for(uint i = 0; i < length; i++)
             {
diff --git a/Aaru.Images/VDI/Structs.cs b/Aaru.Images/VDI/Structs.cs
index 3521dfe1b..4f32b1410 100644
--- a/Aaru.Images/VDI/Structs.cs
+++ b/Aaru.Images/VDI/Structs.cs
@@ -37,44 +37,38 @@ namespace Aaru.DiscImages
 {
     public partial class Vdi
     {
-        /// <summary>
-        ///     VDI disk image header, little-endian
-        /// </summary>
+        /// <summary>VDI disk image header, little-endian</summary>
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct VdiHeader
         {
             [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 64)]
             public string creator;
-            /// <summary>
-            ///     Magic, <see cref="Vdi.VDI_MAGIC" />
-            /// </summary>
+            /// <summary>Magic, <see cref="Vdi.VDI_MAGIC" /></summary>
             public uint magic;
-            /// <summary>
-            ///     Version
-            /// </summary>
+            /// <summary>Version</summary>
             public ushort majorVersion;
-            public ushort        minorVersion;
-            public int           headerSize;
-            public VdiImageType  imageType;
-            public VdiImageFlags imageFlags;
+            public          ushort        minorVersion;
+            public          int           headerSize;
+            public          VdiImageType  imageType;
+            public readonly VdiImageFlags imageFlags;
             [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 256)]
             public string comments;
-            public uint  offsetBlocks;
-            public uint  offsetData;
-            public uint  cylinders;
-            public uint  heads;
-            public uint  spt;
-            public uint  sectorSize;
-            public uint  unused;
-            public ulong size;
-            public uint  blockSize;
-            public uint  blockExtraData;
-            public uint  blocks;
-            public uint  allocatedBlocks;
-            public Guid  uuid;
-            public Guid  snapshotUuid;
-            public Guid  linkUuid;
-            public Guid  parentUuid;
+            public          uint  offsetBlocks;
+            public          uint  offsetData;
+            public          uint  cylinders;
+            public          uint  heads;
+            public          uint  spt;
+            public          uint  sectorSize;
+            public readonly uint  unused;
+            public          ulong size;
+            public          uint  blockSize;
+            public readonly uint  blockExtraData;
+            public          uint  blocks;
+            public          uint  allocatedBlocks;
+            public          Guid  uuid;
+            public          Guid  snapshotUuid;
+            public readonly Guid  linkUuid;
+            public readonly Guid  parentUuid;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/VDI/VDI.cs b/Aaru.Images/VDI/VDI.cs
index 73e04cd17..744418b21 100644
--- a/Aaru.Images/VDI/VDI.cs
+++ b/Aaru.Images/VDI/VDI.cs
@@ -51,31 +51,18 @@ namespace Aaru.DiscImages
         VdiHeader                 vHdr;
         FileStream                writingStream;
 
-        public Vdi()
+        public Vdi() => imageInfo = new ImageInfo
         {
-            imageInfo = new ImageInfo
-            {
-                ReadableSectorTags    = new List<SectorTagType>(),
-                ReadableMediaTags     = new List<MediaTagType>(),
-                HasPartitions         = false,
-                HasSessions           = false,
-                Version               = null,
-                Application           = null,
-                ApplicationVersion    = null,
-                Creator               = null,
-                Comments              = null,
-                MediaManufacturer     = null,
-                MediaModel            = null,
-                MediaSerialNumber     = null,
-                MediaBarcode          = null,
-                MediaPartNumber       = null,
-                MediaSequence         = 0,
-                LastMediaSequence     = 0,
-                DriveManufacturer     = null,
-                DriveModel            = null,
-                DriveSerialNumber     = null,
-                DriveFirmwareRevision = null
-            };
-        }
+            ReadableSectorTags = new List<SectorTagType>(), ReadableMediaTags = new List<MediaTagType>(),
+            HasPartitions      = false, HasSessions                           = false, Version = null,
+            Application        = null,
+            ApplicationVersion = null, Creator = null, Comments = null,
+            MediaManufacturer  = null,
+            MediaModel         = null, MediaSerialNumber = null, MediaBarcode = null,
+            MediaPartNumber    = null,
+            MediaSequence      = 0, LastMediaSequence = 0, DriveManufacturer = null,
+            DriveModel         = null,
+            DriveSerialNumber  = null, DriveFirmwareRevision = null
+        };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/VDI/Write.cs b/Aaru.Images/VDI/Write.cs
index 368a870c5..54be8a441 100644
--- a/Aaru.Images/VDI/Write.cs
+++ b/Aaru.Images/VDI/Write.cs
@@ -46,71 +46,83 @@ namespace Aaru.DiscImages
     public partial class Vdi
     {
         public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
-                           uint   sectorSize)
+                           uint sectorSize)
         {
             if(sectorSize != 512)
             {
                 ErrorMessage = "Unsupported sector size";
+
                 return false;
             }
 
             if(!SupportedMediaTypes.Contains(mediaType))
             {
                 ErrorMessage = $"Unsupport media format {mediaType}";
+
                 return false;
             }
 
-            if(sectors * sectorSize / DEFAULT_BLOCK_SIZE > uint.MaxValue)
+            if((sectors * sectorSize) / DEFAULT_BLOCK_SIZE > uint.MaxValue)
             {
                 ErrorMessage = "Too many sectors for selected cluster size";
+
                 return false;
             }
 
-            imageInfo = new ImageInfo {MediaType = mediaType, SectorSize = sectorSize, Sectors = sectors};
+            imageInfo = new ImageInfo
+            {
+                MediaType = mediaType, SectorSize = sectorSize, Sectors = sectors
+            };
 
-            try { writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None); }
+            try
+            {
+                writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
+            }
             catch(IOException e)
             {
                 ErrorMessage = $"Could not create new image file, exception {e.Message}";
+
                 return false;
             }
 
-            uint ibmEntries = (uint)(sectors * sectorSize / DEFAULT_BLOCK_SIZE);
-            if(sectors * sectorSize % DEFAULT_BLOCK_SIZE > 0) ibmEntries++;
+            uint ibmEntries = (uint)((sectors * sectorSize) / DEFAULT_BLOCK_SIZE);
+
+            if((sectors * sectorSize) % DEFAULT_BLOCK_SIZE > 0)
+                ibmEntries++;
+
+            uint headerSectors = 1 + ((ibmEntries * 4) / sectorSize);
+
+            if((ibmEntries * 4) % sectorSize != 0)
+                headerSectors++;
 
-            uint headerSectors = 1 + ibmEntries * 4 / sectorSize;
-            if(ibmEntries * 4 % sectorSize != 0) headerSectors++;
             ibm                    = new uint[ibmEntries];
             currentWritingPosition = headerSectors * sectorSize;
 
             vHdr = new VdiHeader
             {
-                creator      = DIC_AARU,
-                magic        = VDI_MAGIC,
-                majorVersion = 1,
+                creator      = DIC_AARU, magic = VDI_MAGIC, majorVersion = 1,
                 minorVersion = 1,
-                headerSize   = Marshal.SizeOf<VdiHeader>() - 72,
-                imageType    = VdiImageType.Normal,
-                offsetBlocks = sectorSize,
-                offsetData   = currentWritingPosition,
+                headerSize   = Marshal.SizeOf<VdiHeader>() - 72, imageType = VdiImageType.Normal,
+                offsetBlocks = sectorSize, offsetData                      = currentWritingPosition,
                 sectorSize   = sectorSize,
-                size         = sectors * sectorSize,
-                blockSize    = DEFAULT_BLOCK_SIZE,
-                blocks       = ibmEntries,
-                uuid         = Guid.NewGuid(),
+                size         = sectors * sectorSize, blockSize = DEFAULT_BLOCK_SIZE,
+                blocks       = ibmEntries, uuid                = Guid.NewGuid(),
                 snapshotUuid = Guid.NewGuid()
             };
 
-            for(uint i = 0; i < ibmEntries; i++) ibm[i] = VDI_EMPTY;
+            for(uint i = 0; i < ibmEntries; i++)
+                ibm[i] = VDI_EMPTY;
 
             IsWriting    = true;
             ErrorMessage = null;
+
             return true;
         }
 
         public bool WriteMediaTag(byte[] data, MediaTagType tag)
         {
             ErrorMessage = "Writing media tags is not supported.";
+
             return false;
         }
 
@@ -119,26 +131,30 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Tried to write on a non-writable image";
+
                 return false;
             }
 
             if(data.Length != imageInfo.SectorSize)
             {
                 ErrorMessage = "Incorrect data size";
+
                 return false;
             }
 
             if(sectorAddress >= imageInfo.Sectors)
             {
                 ErrorMessage = "Tried to write past image size";
+
                 return false;
             }
 
             // Ignore empty sectors
-            if(ArrayHelpers.ArrayIsNullOrEmpty(data)) return true;
+            if(ArrayHelpers.ArrayIsNullOrEmpty(data))
+                return true;
 
-            ulong index  = sectorAddress * vHdr.sectorSize / vHdr.blockSize;
-            ulong secOff = sectorAddress * vHdr.sectorSize % vHdr.blockSize;
+            ulong index  = (sectorAddress * vHdr.sectorSize) / vHdr.blockSize;
+            ulong secOff = (sectorAddress * vHdr.sectorSize) % vHdr.blockSize;
 
             uint ibmOff = ibm[index];
 
@@ -150,13 +166,14 @@ namespace Aaru.DiscImages
                 vHdr.allocatedBlocks++;
             }
 
-            ulong imageOff = vHdr.offsetData + ibmOff * vHdr.blockSize;
+            ulong imageOff = vHdr.offsetData + (ibmOff * vHdr.blockSize);
 
             writingStream.Seek((long)imageOff, SeekOrigin.Begin);
-            writingStream.Seek((long)secOff,   SeekOrigin.Current);
+            writingStream.Seek((long)secOff, SeekOrigin.Current);
             writingStream.Write(data, 0, data.Length);
 
             ErrorMessage = "";
+
             return true;
         }
 
@@ -166,44 +183,53 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Tried to write on a non-writable image";
+
                 return false;
             }
 
             if(data.Length % imageInfo.SectorSize != 0)
             {
                 ErrorMessage = "Incorrect data size";
+
                 return false;
             }
 
             if(sectorAddress + length > imageInfo.Sectors)
             {
                 ErrorMessage = "Tried to write past image size";
+
                 return false;
             }
 
             // Ignore empty sectors
-            if(ArrayHelpers.ArrayIsNullOrEmpty(data)) return true;
+            if(ArrayHelpers.ArrayIsNullOrEmpty(data))
+                return true;
 
             for(uint i = 0; i < length; i++)
             {
                 byte[] tmp = new byte[imageInfo.SectorSize];
                 Array.Copy(data, i * imageInfo.SectorSize, tmp, 0, imageInfo.SectorSize);
-                if(!WriteSector(tmp, sectorAddress + i)) return false;
+
+                if(!WriteSector(tmp, sectorAddress + i))
+                    return false;
             }
 
             ErrorMessage = "";
+
             return true;
         }
 
         public bool WriteSectorLong(byte[] data, ulong sectorAddress)
         {
             ErrorMessage = "Writing sectors with tags is not supported.";
+
             return false;
         }
 
         public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
         {
             ErrorMessage = "Writing sectors with tags is not supported.";
+
             return false;
         }
 
@@ -212,12 +238,12 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Image is not opened for writing";
+
                 return false;
             }
 
             if(!string.IsNullOrEmpty(imageInfo.Comments))
-                vHdr.comments = imageInfo.Comments.Length > 255
-                                    ? imageInfo.Comments.Substring(0, 255)
+                vHdr.comments = imageInfo.Comments.Length > 255 ? imageInfo.Comments.Substring(0, 255)
                                     : imageInfo.Comments;
 
             if(vHdr.cylinders == 0)
@@ -238,7 +264,10 @@ namespace Aaru.DiscImages
 
                     vHdr.cylinders = (uint)(imageInfo.Sectors / vHdr.heads / vHdr.spt);
 
-                    if(vHdr.cylinders == 0 && vHdr.heads == 0 && vHdr.spt == 0) break;
+                    if(vHdr.cylinders == 0 &&
+                       vHdr.heads     == 0 &&
+                       vHdr.spt       == 0)
+                        break;
                 }
             }
 
@@ -259,12 +288,14 @@ namespace Aaru.DiscImages
 
             IsWriting    = false;
             ErrorMessage = "";
+
             return true;
         }
 
         public bool SetMetadata(ImageInfo metadata)
         {
             imageInfo.Comments = metadata.Comments;
+
             return true;
         }
 
@@ -273,18 +304,21 @@ namespace Aaru.DiscImages
             vHdr.cylinders = cylinders;
             vHdr.heads     = heads;
             vHdr.spt       = sectorsPerTrack;
+
             return true;
         }
 
         public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
         {
             ErrorMessage = "Writing sectors with tags is not supported.";
+
             return false;
         }
 
         public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
         {
             ErrorMessage = "Writing sectors with tags is not supported.";
+
             return false;
         }
 
diff --git a/Aaru.Images/VHD/Constants.cs b/Aaru.Images/VHD/Constants.cs
index eb5a555f3..61c8c9281 100644
--- a/Aaru.Images/VHD/Constants.cs
+++ b/Aaru.Images/VHD/Constants.cs
@@ -34,143 +34,77 @@ namespace Aaru.DiscImages
 {
     public partial class Vhd
     {
-        /// <summary>
-        ///     File magic number, "conectix"
-        /// </summary>
+        /// <summary>File magic number, "conectix"</summary>
         const ulong IMAGE_COOKIE = 0x636F6E6563746978;
-        /// <summary>
-        ///     Dynamic disk header magic, "cxsparse"
-        /// </summary>
+        /// <summary>Dynamic disk header magic, "cxsparse"</summary>
         const ulong DYNAMIC_COOKIE = 0x6378737061727365;
 
-        /// <summary>
-        ///     Disk image is candidate for deletion on shutdown
-        /// </summary>
+        /// <summary>Disk image is candidate for deletion on shutdown</summary>
         const uint FEATURES_TEMPORARY = 0x00000001;
-        /// <summary>
-        ///     Unknown, set from Virtual PC for Mac 7 onwards
-        /// </summary>
+        /// <summary>Unknown, set from Virtual PC for Mac 7 onwards</summary>
         const uint FEATURES_RESERVED = 0x00000002;
-        /// <summary>
-        ///     Unknown
-        /// </summary>
+        /// <summary>Unknown</summary>
         const uint FEATURES_UNKNOWN = 0x00000100;
 
-        /// <summary>
-        ///     Only known version
-        /// </summary>
+        /// <summary>Only known version</summary>
         const uint VERSION1 = 0x00010000;
 
-        /// <summary>
-        ///     Created by Virtual PC, "vpc "
-        /// </summary>
+        /// <summary>Created by Virtual PC, "vpc "</summary>
         const uint CREATOR_VIRTUAL_PC = 0x76706320;
-        /// <summary>
-        ///     Created by Virtual Server, "vs  "
-        /// </summary>
+        /// <summary>Created by Virtual Server, "vs  "</summary>
         const uint CREATOR_VIRTUAL_SERVER = 0x76732020;
-        /// <summary>
-        ///     Created by QEMU, "qemu"
-        /// </summary>
+        /// <summary>Created by QEMU, "qemu"</summary>
         const uint CREATOR_QEMU = 0x71656D75;
-        /// <summary>
-        ///     Created by VirtualBox, "vbox"
-        /// </summary>
+        /// <summary>Created by VirtualBox, "vbox"</summary>
         const uint CREATOR_VIRTUAL_BOX = 0x76626F78;
-        /// <summary>
-        ///     Created by DiscImageChef, "dic "
-        /// </summary>
+        /// <summary>Created by DiscImageChef, "dic "</summary>
         const uint CREATOR_DISCIMAGECHEF = 0x64696320;
-        /// <summary>
-        ///     Created by Aaru, "aaru"
-        /// </summary>
+        /// <summary>Created by Aaru, "aaru"</summary>
         const uint CREATOR_AARU = 0x61617275;
-        /// <summary>
-        ///     Disk image created by Virtual Server 2004
-        /// </summary>
+        /// <summary>Disk image created by Virtual Server 2004</summary>
         const uint VERSION_VIRTUAL_SERVER2004 = 0x00010000;
-        /// <summary>
-        ///     Disk image created by Virtual PC 2004
-        /// </summary>
+        /// <summary>Disk image created by Virtual PC 2004</summary>
         const uint VERSION_VIRTUAL_PC2004 = 0x00050000;
-        /// <summary>
-        ///     Disk image created by Virtual PC 2007
-        /// </summary>
+        /// <summary>Disk image created by Virtual PC 2007</summary>
         const uint VERSION_VIRTUAL_PC2007 = 0x00050003;
-        /// <summary>
-        ///     Disk image created by Virtual PC for Mac 5, 6 or 7
-        /// </summary>
+        /// <summary>Disk image created by Virtual PC for Mac 5, 6 or 7</summary>
         const uint VERSION_VIRTUAL_PC_MAC = 0x00040000;
 
-        /// <summary>
-        ///     Disk image created in Windows, "Wi2k"
-        /// </summary>
+        /// <summary>Disk image created in Windows, "Wi2k"</summary>
         const uint CREATOR_WINDOWS = 0x5769326B;
-        /// <summary>
-        ///     Disk image created in Macintosh, "Mac "
-        /// </summary>
+        /// <summary>Disk image created in Macintosh, "Mac "</summary>
         const uint CREATOR_MACINTOSH = 0x4D616320;
-        /// <summary>
-        ///     Seen in Virtual PC for Mac for dynamic and fixed images
-        /// </summary>
+        /// <summary>Seen in Virtual PC for Mac for dynamic and fixed images</summary>
         const uint CREATOR_MACINTOSH_OLD = 0x00000000;
 
-        /// <summary>
-        ///     Disk image type is none, useless?
-        /// </summary>
+        /// <summary>Disk image type is none, useless?</summary>
         const uint TYPE_NONE = 0;
-        /// <summary>
-        ///     Deprecated disk image type
-        /// </summary>
+        /// <summary>Deprecated disk image type</summary>
         const uint TYPE_DEPRECATED1 = 1;
-        /// <summary>
-        ///     Fixed disk image type
-        /// </summary>
+        /// <summary>Fixed disk image type</summary>
         const uint TYPE_FIXED = 2;
-        /// <summary>
-        ///     Dynamic disk image type
-        /// </summary>
+        /// <summary>Dynamic disk image type</summary>
         const uint TYPE_DYNAMIC = 3;
-        /// <summary>
-        ///     Differencing disk image type
-        /// </summary>
+        /// <summary>Differencing disk image type</summary>
         const uint TYPE_DIFFERENCING = 4;
-        /// <summary>
-        ///     Deprecated disk image type
-        /// </summary>
+        /// <summary>Deprecated disk image type</summary>
         const uint TYPE_DEPRECATED2 = 5;
-        /// <summary>
-        ///     Deprecated disk image type
-        /// </summary>
+        /// <summary>Deprecated disk image type</summary>
         const uint TYPE_DEPRECATED3 = 6;
 
-        /// <summary>
-        ///     Means platform locator is unused
-        /// </summary>
+        /// <summary>Means platform locator is unused</summary>
         const uint PLATFORM_CODE_UNUSED = 0x00000000;
-        /// <summary>
-        ///     Stores a relative path string for Windows, unknown locale used, deprecated, "Wi2r"
-        /// </summary>
+        /// <summary>Stores a relative path string for Windows, unknown locale used, deprecated, "Wi2r"</summary>
         const uint PLATFORM_CODE_WINDOWS_RELATIVE = 0x57693272;
-        /// <summary>
-        ///     Stores an absolute path string for Windows, unknown locale used, deprecated, "Wi2k"
-        /// </summary>
+        /// <summary>Stores an absolute path string for Windows, unknown locale used, deprecated, "Wi2k"</summary>
         const uint PLATFORM_CODE_WINDOWS_ABSOLUTE = 0x5769326B;
-        /// <summary>
-        ///     Stores a relative path string for Windows in UTF-16, "W2ru"
-        /// </summary>
+        /// <summary>Stores a relative path string for Windows in UTF-16, "W2ru"</summary>
         const uint PLATFORM_CODE_WINDOWS_RELATIVE_U = 0x57327275;
-        /// <summary>
-        ///     Stores an absolute path string for Windows in UTF-16, "W2ku"
-        /// </summary>
+        /// <summary>Stores an absolute path string for Windows in UTF-16, "W2ku"</summary>
         const uint PLATFORM_CODE_WINDOWS_ABSOLUTE_U = 0x57326B75;
-        /// <summary>
-        ///     Stores a Mac OS alias as a blob, "Mac "
-        /// </summary>
+        /// <summary>Stores a Mac OS alias as a blob, "Mac "</summary>
         const uint PLATFORM_CODE_MACINTOSH_ALIAS = 0x4D616320;
-        /// <summary>
-        ///     Stores a Mac OS X URI (RFC-2396) absolute path in UTF-8, "MacX"
-        /// </summary>
+        /// <summary>Stores a Mac OS X URI (RFC-2396) absolute path in UTF-8, "MacX"</summary>
         const uint PLATFORM_CODE_MACINTOSH_URI = 0x4D616358;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/VHD/Identify.cs b/Aaru.Images/VHD/Identify.cs
index 51bc53bfd..bcf782129 100644
--- a/Aaru.Images/VHD/Identify.cs
+++ b/Aaru.Images/VHD/Identify.cs
@@ -44,8 +44,10 @@ namespace Aaru.DiscImages
             byte[] headerCookieBytes = new byte[8];
             byte[] footerCookieBytes = new byte[8];
 
-            if(imageStream.Length % 2 == 0) imageStream.Seek(-512, SeekOrigin.End);
-            else imageStream.Seek(-511,                            SeekOrigin.End);
+            if(imageStream.Length % 2 == 0)
+                imageStream.Seek(-512, SeekOrigin.End);
+            else
+                imageStream.Seek(-511, SeekOrigin.End);
 
             imageStream.Read(footerCookieBytes, 0, 8);
             imageStream.Seek(0, SeekOrigin.Begin);
diff --git a/Aaru.Images/VHD/Properties.cs b/Aaru.Images/VHD/Properties.cs
index ee5dda7a5..0ded1baa2 100644
--- a/Aaru.Images/VHD/Properties.cs
+++ b/Aaru.Images/VHD/Properties.cs
@@ -46,6 +46,7 @@ namespace Aaru.DiscImages
         public string Name   => "VirtualPC";
         public Guid   Id     => new Guid("8014d88f-64cd-4484-9441-7635c632958a");
         public string Author => "Natalia Portillo";
+
         public string Format
         {
             get
@@ -59,22 +60,29 @@ namespace Aaru.DiscImages
                 }
             }
         }
-        public List<DumpHardwareType>     DumpHardware        => null;
-        public CICMMetadataType           CicmMetadata        => null;
-        public IEnumerable<MediaTagType>  SupportedMediaTags  => new MediaTagType[] { };
-        public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[] { };
-        public IEnumerable<MediaType> SupportedMediaTypes =>
-            new[]
-            {
-                MediaType.GENERIC_HDD, MediaType.Unknown, MediaType.FlashDrive, MediaType.CompactFlash,
-                MediaType.CompactFlashType2, MediaType.PCCardTypeI, MediaType.PCCardTypeII, MediaType.PCCardTypeIII,
-                MediaType.PCCardTypeIV
-            };
+
+        public List<DumpHardwareType> DumpHardware => null;
+        public CICMMetadataType       CicmMetadata => null;
+        public IEnumerable<MediaTagType> SupportedMediaTags => new MediaTagType[]
+            {};
+        public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[]
+            {};
+        public IEnumerable<MediaType> SupportedMediaTypes => new[]
+        {
+            MediaType.GENERIC_HDD, MediaType.Unknown, MediaType.FlashDrive, MediaType.CompactFlash,
+            MediaType.CompactFlashType2, MediaType.PCCardTypeI, MediaType.PCCardTypeII, MediaType.PCCardTypeIII,
+            MediaType.PCCardTypeIV
+        };
+
         // TODO: Support dynamic images
         public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
-            new (string name, Type type, string description, object @default)[] { };
-        public IEnumerable<string> KnownExtensions => new[] {".vhd"};
-        public bool                IsWriting       { get; private set; }
-        public string              ErrorMessage    { get; private set; }
+            new (string name, Type type, string description, object @default)[]
+                {};
+        public IEnumerable<string> KnownExtensions => new[]
+        {
+            ".vhd"
+        };
+        public bool   IsWriting    { get; private set; }
+        public string ErrorMessage { get; private set; }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/VHD/Read.cs b/Aaru.Images/VHD/Read.cs
index c37764fab..8522f23ae 100644
--- a/Aaru.Images/VHD/Read.cs
+++ b/Aaru.Images/VHD/Read.cs
@@ -85,19 +85,22 @@ namespace Aaru.DiscImages
             uint footerCalculatedChecksum = VhdChecksum(footer);
 
             AaruConsole.DebugWriteLine("VirtualPC plugin", "Header checksum = 0x{0:X8}, calculated = 0x{1:X8}",
-                                      headerChecksum, headerCalculatedChecksum);
+                                       headerChecksum, headerCalculatedChecksum);
+
             AaruConsole.DebugWriteLine("VirtualPC plugin", "Header checksum = 0x{0:X8}, calculated = 0x{1:X8}",
-                                      footerChecksum, footerCalculatedChecksum);
+                                       footerChecksum, footerCalculatedChecksum);
 
             byte[] usableHeader;
             uint   usableChecksum;
 
-            if(headerCookie == IMAGE_COOKIE && headerChecksum == headerCalculatedChecksum)
+            if(headerCookie   == IMAGE_COOKIE &&
+               headerChecksum == headerCalculatedChecksum)
             {
                 usableHeader   = header;
                 usableChecksum = headerChecksum;
             }
-            else if(footerCookie == IMAGE_COOKIE && footerChecksum == footerCalculatedChecksum)
+            else if(footerCookie   == IMAGE_COOKIE &&
+                    footerChecksum == footerCalculatedChecksum)
             {
                 usableHeader   = footer;
                 usableChecksum = footerChecksum;
@@ -119,49 +122,56 @@ namespace Aaru.DiscImages
                 OriginalSize       = BigEndianBitConverter.ToUInt64(usableHeader, 0x28),
                 CurrentSize        = BigEndianBitConverter.ToUInt64(usableHeader, 0x30),
                 DiskGeometry       = BigEndianBitConverter.ToUInt32(usableHeader, 0x38),
-                DiskType           = BigEndianBitConverter.ToUInt32(usableHeader, 0x3C),
-                Checksum           = usableChecksum,
-                UniqueId           = BigEndianBitConverter.ToGuid(usableHeader, 0x44),
-                SavedState         = usableHeader[0x54],
+                DiskType           = BigEndianBitConverter.ToUInt32(usableHeader, 0x3C), Checksum = usableChecksum,
+                UniqueId           = BigEndianBitConverter.ToGuid(usableHeader, 0x44), SavedState = usableHeader[0x54],
                 Reserved           = new byte[usableHeader.Length - 0x55]
             };
+
             Array.Copy(usableHeader, 0x55, thisFooter.Reserved, 0, usableHeader.Length - 0x55);
 
             thisDateTime = new DateTime(2000, 1, 1, 0, 0, 0, DateTimeKind.Utc);
             thisDateTime = thisDateTime.AddSeconds(thisFooter.Timestamp);
 
-            Sha1Context sha1Ctx = new Sha1Context();
+            var sha1Ctx = new Sha1Context();
             sha1Ctx.Update(thisFooter.Reserved);
 
-            AaruConsole.DebugWriteLine("VirtualPC plugin", "footer.cookie = 0x{0:X8}",   thisFooter.Cookie);
+            AaruConsole.DebugWriteLine("VirtualPC plugin", "footer.cookie = 0x{0:X8}", thisFooter.Cookie);
             AaruConsole.DebugWriteLine("VirtualPC plugin", "footer.features = 0x{0:X8}", thisFooter.Features);
-            AaruConsole.DebugWriteLine("VirtualPC plugin", "footer.version = 0x{0:X8}",  thisFooter.Version);
-            AaruConsole.DebugWriteLine("VirtualPC plugin", "footer.offset = {0}",        thisFooter.Offset);
+            AaruConsole.DebugWriteLine("VirtualPC plugin", "footer.version = 0x{0:X8}", thisFooter.Version);
+            AaruConsole.DebugWriteLine("VirtualPC plugin", "footer.offset = {0}", thisFooter.Offset);
+
             AaruConsole.DebugWriteLine("VirtualPC plugin", "footer.timestamp = 0x{0:X8} ({1})", thisFooter.Timestamp,
-                                      thisDateTime);
+                                       thisDateTime);
+
             AaruConsole.DebugWriteLine("VirtualPC plugin", "footer.creatorApplication = 0x{0:X8} (\"{1}\")",
-                                      thisFooter.CreatorApplication,
-                                      Encoding.ASCII.GetString(BigEndianBitConverter.GetBytes(thisFooter
-                                                                                                 .CreatorApplication)));
+                                       thisFooter.CreatorApplication,
+                                       Encoding.ASCII.GetString(BigEndianBitConverter.GetBytes(thisFooter.
+                                                                                                   CreatorApplication)));
+
             AaruConsole.DebugWriteLine("VirtualPC plugin", "footer.creatorVersion = 0x{0:X8}",
-                                      thisFooter.CreatorVersion);
+                                       thisFooter.CreatorVersion);
+
             AaruConsole.DebugWriteLine("VirtualPC plugin", "footer.creatorHostOS = 0x{0:X8} (\"{1}\")",
-                                      thisFooter.CreatorHostOs,
-                                      Encoding.ASCII.GetString(BigEndianBitConverter
-                                                                  .GetBytes(thisFooter.CreatorHostOs)));
+                                       thisFooter.CreatorHostOs,
+                                       Encoding.ASCII.GetString(BigEndianBitConverter.
+                                                                    GetBytes(thisFooter.CreatorHostOs)));
+
             AaruConsole.DebugWriteLine("VirtualPC plugin", "footer.originalSize = {0}", thisFooter.OriginalSize);
-            AaruConsole.DebugWriteLine("VirtualPC plugin", "footer.currentSize = {0}",  thisFooter.CurrentSize);
+            AaruConsole.DebugWriteLine("VirtualPC plugin", "footer.currentSize = {0}", thisFooter.CurrentSize);
+
             AaruConsole.DebugWriteLine("VirtualPC plugin", "footer.diskGeometry = 0x{0:X8} (C/H/S: {1}/{2}/{3})",
-                                      thisFooter.DiskGeometry, (thisFooter.DiskGeometry & 0xFFFF0000) >> 16,
-                                      (thisFooter.DiskGeometry                          & 0xFF00)     >> 8,
-                                      thisFooter.DiskGeometry & 0xFF);
-            AaruConsole.DebugWriteLine("VirtualPC plugin", "footer.diskType = 0x{0:X8}",     thisFooter.DiskType);
-            AaruConsole.DebugWriteLine("VirtualPC plugin", "footer.checksum = 0x{0:X8}",     thisFooter.Checksum);
-            AaruConsole.DebugWriteLine("VirtualPC plugin", "footer.uniqueId = {0}",          thisFooter.UniqueId);
-            AaruConsole.DebugWriteLine("VirtualPC plugin", "footer.savedState = 0x{0:X2}",   thisFooter.SavedState);
+                                       thisFooter.DiskGeometry, (thisFooter.DiskGeometry & 0xFFFF0000) >> 16,
+                                       (thisFooter.DiskGeometry                          & 0xFF00)     >> 8,
+                                       thisFooter.DiskGeometry & 0xFF);
+
+            AaruConsole.DebugWriteLine("VirtualPC plugin", "footer.diskType = 0x{0:X8}", thisFooter.DiskType);
+            AaruConsole.DebugWriteLine("VirtualPC plugin", "footer.checksum = 0x{0:X8}", thisFooter.Checksum);
+            AaruConsole.DebugWriteLine("VirtualPC plugin", "footer.uniqueId = {0}", thisFooter.UniqueId);
+            AaruConsole.DebugWriteLine("VirtualPC plugin", "footer.savedState = 0x{0:X2}", thisFooter.SavedState);
             AaruConsole.DebugWriteLine("VirtualPC plugin", "footer.reserved's SHA1 = 0x{0}", sha1Ctx.End());
 
-            if(thisFooter.Version == VERSION1) imageInfo.Version = "1.0";
+            if(thisFooter.Version == VERSION1)
+                imageInfo.Version = "1.0";
             else
                 throw new
                     ImageNotSupportedException($"(VirtualPC plugin): Unknown image type {thisFooter.DiskType} found. Please submit a bug with an example image.");
@@ -171,6 +181,7 @@ namespace Aaru.DiscImages
                 case CREATOR_QEMU:
                 {
                     imageInfo.Application = "QEMU";
+
                     // QEMU always set same version
                     imageInfo.ApplicationVersion = "Unknown";
 
@@ -181,19 +192,23 @@ namespace Aaru.DiscImages
                 {
                     imageInfo.ApplicationVersion =
                         $"{(thisFooter.CreatorVersion & 0xFFFF0000) >> 16}.{thisFooter.CreatorVersion & 0x0000FFFF:D2}";
+
                     switch(thisFooter.CreatorHostOs)
                     {
                         case CREATOR_MACINTOSH:
                         case CREATOR_MACINTOSH_OLD:
                             imageInfo.Application = "VirtualBox for Mac";
+
                             break;
                         case CREATOR_WINDOWS:
                             // VirtualBox uses Windows creator for any other OS
                             imageInfo.Application = "VirtualBox";
+
                             break;
                         default:
                             imageInfo.Application =
                                 $"VirtualBox for unknown OS \"{Encoding.ASCII.GetString(BigEndianBitConverter.GetBytes(thisFooter.CreatorHostOs))}\"";
+
                             break;
                     }
 
@@ -203,13 +218,16 @@ namespace Aaru.DiscImages
                 case CREATOR_VIRTUAL_SERVER:
                 {
                     imageInfo.Application = "Microsoft Virtual Server";
+
                     switch(thisFooter.CreatorVersion)
                     {
                         case VERSION_VIRTUAL_SERVER2004:
                             imageInfo.ApplicationVersion = "2004";
+
                             break;
                         default:
                             imageInfo.ApplicationVersion = $"Unknown version 0x{thisFooter.CreatorVersion:X8}";
+
                             break;
                     }
 
@@ -227,9 +245,11 @@ namespace Aaru.DiscImages
                                 case VERSION_VIRTUAL_PC_MAC:
                                     imageInfo.Application        = "Connectix Virtual PC";
                                     imageInfo.ApplicationVersion = "5, 6 or 7";
+
                                     break;
                                 default:
                                     imageInfo.ApplicationVersion = $"Unknown version 0x{thisFooter.CreatorVersion:X8}";
+
                                     break;
                             }
 
@@ -240,17 +260,21 @@ namespace Aaru.DiscImages
                                 case VERSION_VIRTUAL_PC_MAC:
                                     imageInfo.Application        = "Connectix Virtual PC";
                                     imageInfo.ApplicationVersion = "5, 6 or 7";
+
                                     break;
                                 case VERSION_VIRTUAL_PC2004:
                                     imageInfo.Application        = "Microsoft Virtual PC";
                                     imageInfo.ApplicationVersion = "2004";
+
                                     break;
                                 case VERSION_VIRTUAL_PC2007:
                                     imageInfo.Application        = "Microsoft Virtual PC";
                                     imageInfo.ApplicationVersion = "2007";
+
                                     break;
                                 default:
                                     imageInfo.ApplicationVersion = $"Unknown version 0x{thisFooter.CreatorVersion:X8}";
+
                                     break;
                             }
 
@@ -258,7 +282,9 @@ namespace Aaru.DiscImages
                         default:
                             imageInfo.Application =
                                 $"Virtual PC for unknown OS \"{Encoding.ASCII.GetString(BigEndianBitConverter.GetBytes(thisFooter.CreatorHostOs))}\"";
+
                             imageInfo.ApplicationVersion = $"Unknown version 0x{thisFooter.CreatorVersion:X8}";
+
                             break;
                     }
 
@@ -268,23 +294,29 @@ namespace Aaru.DiscImages
                 case CREATOR_DISCIMAGECHEF:
                 {
                     imageInfo.Application = "DiscImageChef";
+
                     imageInfo.ApplicationVersion =
                         $"{(thisFooter.CreatorVersion & 0xFF000000) >> 24}.{(thisFooter.CreatorVersion & 0xFF0000) >> 16}.{(thisFooter.CreatorVersion & 0xFF00) >> 8}.{thisFooter.CreatorVersion & 0xFF}";
                 }
+
                     break;
 
                 case CREATOR_AARU:
                 {
                     imageInfo.Application = "Aaru";
+
                     imageInfo.ApplicationVersion =
                         $"{(thisFooter.CreatorVersion & 0xFF000000) >> 24}.{(thisFooter.CreatorVersion & 0xFF0000) >> 16}.{(thisFooter.CreatorVersion & 0xFF00) >> 8}.{thisFooter.CreatorVersion & 0xFF}";
                 }
+
                     break;
                 default:
                 {
                     imageInfo.Application =
                         $"Unknown application \"{Encoding.ASCII.GetString(BigEndianBitConverter.GetBytes(thisFooter.CreatorHostOs))}\"";
+
                     imageInfo.ApplicationVersion = $"Unknown version 0x{thisFooter.CreatorVersion:X8}";
+
                     break;
                 }
             }
@@ -302,7 +334,8 @@ namespace Aaru.DiscImages
             imageInfo.Heads           = (thisFooter.DiskGeometry & 0xFF00)     >> 8;
             imageInfo.SectorsPerTrack = thisFooter.DiskGeometry & 0xFF;
 
-            if(thisFooter.DiskType == TYPE_DYNAMIC || thisFooter.DiskType == TYPE_DIFFERENCING)
+            if(thisFooter.DiskType == TYPE_DYNAMIC ||
+               thisFooter.DiskType == TYPE_DIFFERENCING)
             {
                 imageStream.Seek((long)thisFooter.Offset, SeekOrigin.Begin);
                 byte[] dynamicBytes = new byte[1024];
@@ -318,17 +351,20 @@ namespace Aaru.DiscImages
                 uint dynamicChecksumCalculated = VhdChecksum(dynamicBytes);
 
                 AaruConsole.DebugWriteLine("VirtualPC plugin",
-                                          "Dynamic header checksum = 0x{0:X8}, calculated = 0x{1:X8}", dynamicChecksum,
-                                          dynamicChecksumCalculated);
+                                           "Dynamic header checksum = 0x{0:X8}, calculated = 0x{1:X8}", dynamicChecksum,
+                                           dynamicChecksumCalculated);
 
                 if(dynamicChecksum != dynamicChecksumCalculated)
                     throw new
                         ImageNotSupportedException("(VirtualPC plugin): Both header and footer are corrupt, image cannot be opened.");
 
-                thisDynamic =
-                    new DynamicDiskHeader {LocatorEntries = new ParentLocatorEntry[8], Reserved2 = new byte[256]};
+                thisDynamic = new DynamicDiskHeader
+                {
+                    LocatorEntries = new ParentLocatorEntry[8], Reserved2 = new byte[256]
+                };
 
-                for(int i = 0; i < 8; i++) thisDynamic.LocatorEntries[i] = new ParentLocatorEntry();
+                for(int i = 0; i < 8; i++)
+                    thisDynamic.LocatorEntries[i] = new ParentLocatorEntry();
 
                 thisDynamic.Cookie          = BigEndianBitConverter.ToUInt64(dynamicBytes, 0x00);
                 thisDynamic.DataOffset      = BigEndianBitConverter.ToUInt64(dynamicBytes, 0x08);
@@ -345,15 +381,19 @@ namespace Aaru.DiscImages
                 for(int i = 0; i < 8; i++)
                 {
                     thisDynamic.LocatorEntries[i].PlatformCode =
-                        BigEndianBitConverter.ToUInt32(dynamicBytes, 0x240 + 0x00 + 24 * i);
+                        BigEndianBitConverter.ToUInt32(dynamicBytes, 0x240 + 0x00 + (24 * i));
+
                     thisDynamic.LocatorEntries[i].PlatformDataSpace =
-                        BigEndianBitConverter.ToUInt32(dynamicBytes, 0x240 + 0x04 + 24 * i);
+                        BigEndianBitConverter.ToUInt32(dynamicBytes, 0x240 + 0x04 + (24 * i));
+
                     thisDynamic.LocatorEntries[i].PlatformDataLength =
-                        BigEndianBitConverter.ToUInt32(dynamicBytes, 0x240 + 0x08 + 24 * i);
+                        BigEndianBitConverter.ToUInt32(dynamicBytes, 0x240 + 0x08 + (24 * i));
+
                     thisDynamic.LocatorEntries[i].Reserved =
-                        BigEndianBitConverter.ToUInt32(dynamicBytes, 0x240 + 0x0C + 24 * i);
+                        BigEndianBitConverter.ToUInt32(dynamicBytes, 0x240 + 0x0C + (24 * i));
+
                     thisDynamic.LocatorEntries[i].PlatformDataOffset =
-                        BigEndianBitConverter.ToUInt64(dynamicBytes, 0x240 + 0x10 + 24 * i);
+                        BigEndianBitConverter.ToUInt64(dynamicBytes, 0x240 + 0x10 + (24 * i));
                 }
 
                 Array.Copy(dynamicBytes, 0x300, thisDynamic.Reserved2, 0, 256);
@@ -365,40 +405,51 @@ namespace Aaru.DiscImages
                 sha1Ctx.Update(thisDynamic.Reserved2);
 
                 AaruConsole.DebugWriteLine("VirtualPC plugin", "dynamic.cookie = 0x{0:X8}", thisDynamic.Cookie);
-                AaruConsole.DebugWriteLine("VirtualPC plugin", "dynamic.dataOffset = {0}",  thisDynamic.DataOffset);
+                AaruConsole.DebugWriteLine("VirtualPC plugin", "dynamic.dataOffset = {0}", thisDynamic.DataOffset);
                 AaruConsole.DebugWriteLine("VirtualPC plugin", "dynamic.tableOffset = {0}", thisDynamic.TableOffset);
+
                 AaruConsole.DebugWriteLine("VirtualPC plugin", "dynamic.headerVersion = 0x{0:X8}",
-                                          thisDynamic.HeaderVersion);
+                                           thisDynamic.HeaderVersion);
+
                 AaruConsole.DebugWriteLine("VirtualPC plugin", "dynamic.maxTableEntries = {0}",
-                                          thisDynamic.MaxTableEntries);
-                AaruConsole.DebugWriteLine("VirtualPC plugin", "dynamic.blockSize = {0}",     thisDynamic.BlockSize);
+                                           thisDynamic.MaxTableEntries);
+
+                AaruConsole.DebugWriteLine("VirtualPC plugin", "dynamic.blockSize = {0}", thisDynamic.BlockSize);
                 AaruConsole.DebugWriteLine("VirtualPC plugin", "dynamic.checksum = 0x{0:X8}", thisDynamic.Checksum);
-                AaruConsole.DebugWriteLine("VirtualPC plugin", "dynamic.parentID = {0}",      thisDynamic.ParentId);
+                AaruConsole.DebugWriteLine("VirtualPC plugin", "dynamic.parentID = {0}", thisDynamic.ParentId);
+
                 AaruConsole.DebugWriteLine("VirtualPC plugin", "dynamic.parentTimestamp = 0x{0:X8} ({1})",
-                                          thisDynamic.ParentTimestamp, parentDateTime);
+                                           thisDynamic.ParentTimestamp, parentDateTime);
+
                 AaruConsole.DebugWriteLine("VirtualPC plugin", "dynamic.reserved = 0x{0:X8}", thisDynamic.Reserved);
+
                 for(int i = 0; i < 8; i++)
                 {
                     AaruConsole.DebugWriteLine("VirtualPC plugin",
-                                              "dynamic.locatorEntries[{0}].platformCode = 0x{1:X8} (\"{2}\")", i,
-                                              thisDynamic.LocatorEntries[i].PlatformCode,
-                                              Encoding.ASCII.GetString(BigEndianBitConverter.GetBytes(thisDynamic
-                                                                                                     .LocatorEntries[i]
-                                                                                                     .PlatformCode)));
-                    AaruConsole.DebugWriteLine("VirtualPC plugin", "dynamic.locatorEntries[{0}].platformDataSpace = {1}",
-                                              i, thisDynamic.LocatorEntries[i].PlatformDataSpace);
+                                               "dynamic.locatorEntries[{0}].platformCode = 0x{1:X8} (\"{2}\")", i,
+                                               thisDynamic.LocatorEntries[i].PlatformCode,
+                                               Encoding.ASCII.GetString(BigEndianBitConverter.GetBytes(thisDynamic.
+                                                                                                       LocatorEntries
+                                                                                                           [i].
+                                                                                                       PlatformCode)));
+
                     AaruConsole.DebugWriteLine("VirtualPC plugin",
-                                              "dynamic.locatorEntries[{0}].platformDataLength = {1}", i,
-                                              thisDynamic.LocatorEntries[i].PlatformDataLength);
+                                               "dynamic.locatorEntries[{0}].platformDataSpace = {1}", i,
+                                               thisDynamic.LocatorEntries[i].PlatformDataSpace);
+
+                    AaruConsole.DebugWriteLine("VirtualPC plugin",
+                                               "dynamic.locatorEntries[{0}].platformDataLength = {1}", i,
+                                               thisDynamic.LocatorEntries[i].PlatformDataLength);
+
                     AaruConsole.DebugWriteLine("VirtualPC plugin", "dynamic.locatorEntries[{0}].reserved = 0x{1:X8}", i,
-                                              thisDynamic.LocatorEntries[i].Reserved);
+                                               thisDynamic.LocatorEntries[i].Reserved);
+
                     AaruConsole.DebugWriteLine("VirtualPC plugin",
-                                              "dynamic.locatorEntries[{0}].platformDataOffset = {1}", i,
-                                              thisDynamic.LocatorEntries[i].PlatformDataOffset);
+                                               "dynamic.locatorEntries[{0}].platformDataOffset = {1}", i,
+                                               thisDynamic.LocatorEntries[i].PlatformDataOffset);
                 }
 
-                AaruConsole.DebugWriteLine("VirtualPC plugin", "dynamic.parentName = \"{0}\"",
-                                          thisDynamic.ParentName);
+                AaruConsole.DebugWriteLine("VirtualPC plugin", "dynamic.parentName = \"{0}\"", thisDynamic.ParentName);
                 AaruConsole.DebugWriteLine("VirtualPC plugin", "dynamic.reserved2's SHA1 = 0x{0}", sha1Ctx.End());
 
                 if(thisDynamic.HeaderVersion != VERSION1)
@@ -410,27 +461,33 @@ namespace Aaru.DiscImages
                 blockAllocationTable = new uint[thisDynamic.MaxTableEntries];
 
                 // How many sectors uses the BAT
-                int batSectorCount = (int)Math.Ceiling((double)thisDynamic.MaxTableEntries * 4 / 512);
+                int batSectorCount = (int)Math.Ceiling(((double)thisDynamic.MaxTableEntries * 4) / 512);
 
                 byte[] bat = new byte[thisDynamic.MaxTableEntries * 4];
                 imageStream.Seek((long)thisDynamic.TableOffset, SeekOrigin.Begin);
                 imageStream.Read(bat, 0, batSectorCount);
 
                 ReadOnlySpan<byte> span = bat;
+
                 blockAllocationTable =
                     MemoryMarshal.Cast<byte, uint>(span).Slice(0, (int)thisDynamic.MaxTableEntries).ToArray();
+
                 for(int i = 0; i < blockAllocationTable.Length; i++)
                     blockAllocationTable[i] = Swapping.Swap(blockAllocationTable[i]);
 
                 DateTime endTime = DateTime.UtcNow;
+
                 AaruConsole.DebugWriteLine("VirtualPC plugin", "Filling the BAT took {0} seconds",
-                                          (endTime - startTime).TotalSeconds);
+                                           (endTime - startTime).TotalSeconds);
 
                 bitmapSize = (uint)Math.Ceiling((double)thisDynamic.BlockSize / 512
+
                                                                                 // 1 bit per sector on the bitmap
                                                                               / 8
+
                                                                                 // and aligned to 512 byte boundary
                                                                               / 512);
+
                 AaruConsole.DebugWriteLine("VirtualPC plugin", "Bitmap is {0} sectors", bitmapSize);
             }
 
@@ -448,11 +505,13 @@ namespace Aaru.DiscImages
                 case TYPE_DIFFERENCING:
                 {
                     locatorEntriesData = new byte[8][];
+
                     for(int i = 0; i < 8; i++)
                         if(thisDynamic.LocatorEntries[i].PlatformCode != 0x00000000)
                         {
                             locatorEntriesData[i] = new byte[thisDynamic.LocatorEntries[i].PlatformDataLength];
                             imageStream.Seek((long)thisDynamic.LocatorEntries[i].PlatformDataOffset, SeekOrigin.Begin);
+
                             imageStream.Read(locatorEntriesData[i], 0,
                                              (int)thisDynamic.LocatorEntries[i].PlatformDataLength);
 
@@ -461,24 +520,28 @@ namespace Aaru.DiscImages
                                 case PLATFORM_CODE_WINDOWS_ABSOLUTE:
                                 case PLATFORM_CODE_WINDOWS_RELATIVE:
                                     AaruConsole.DebugWriteLine("VirtualPC plugin",
-                                                              "dynamic.locatorEntries[{0}] = \"{1}\"", i,
-                                                              Encoding.ASCII.GetString(locatorEntriesData[i]));
+                                                               "dynamic.locatorEntries[{0}] = \"{1}\"", i,
+                                                               Encoding.ASCII.GetString(locatorEntriesData[i]));
+
                                     break;
                                 case PLATFORM_CODE_WINDOWS_ABSOLUTE_U:
                                 case PLATFORM_CODE_WINDOWS_RELATIVE_U:
                                     AaruConsole.DebugWriteLine("VirtualPC plugin",
-                                                              "dynamic.locatorEntries[{0}] = \"{1}\"", i,
-                                                              Encoding.BigEndianUnicode
-                                                                      .GetString(locatorEntriesData[i]));
+                                                               "dynamic.locatorEntries[{0}] = \"{1}\"", i,
+                                                               Encoding.BigEndianUnicode.
+                                                                        GetString(locatorEntriesData[i]));
+
                                     break;
                                 case PLATFORM_CODE_MACINTOSH_URI:
                                     AaruConsole.DebugWriteLine("VirtualPC plugin",
-                                                              "dynamic.locatorEntries[{0}] = \"{1}\"", i,
-                                                              Encoding.UTF8.GetString(locatorEntriesData[i]));
+                                                               "dynamic.locatorEntries[{0}] = \"{1}\"", i,
+                                                               Encoding.UTF8.GetString(locatorEntriesData[i]));
+
                                     break;
                                 default:
                                     AaruConsole.DebugWriteLine("VirtualPC plugin", "dynamic.locatorEntries[{0}] =", i);
                                     PrintHex.PrintHexArray(locatorEntriesData[i], 64);
+
                                     break;
                             }
                         }
@@ -487,28 +550,33 @@ namespace Aaru.DiscImages
                     bool   locatorFound   = false;
                     string parentPath     = null;
 
-                    while(!locatorFound && currentLocator < 8)
+                    while(!locatorFound &&
+                          currentLocator < 8)
                     {
                         switch(thisDynamic.LocatorEntries[currentLocator].PlatformCode)
                         {
                             case PLATFORM_CODE_WINDOWS_ABSOLUTE:
                             case PLATFORM_CODE_WINDOWS_RELATIVE:
                                 parentPath = Encoding.ASCII.GetString(locatorEntriesData[currentLocator]);
+
                                 break;
                             case PLATFORM_CODE_WINDOWS_ABSOLUTE_U:
                             case PLATFORM_CODE_WINDOWS_RELATIVE_U:
                                 parentPath = Encoding.BigEndianUnicode.GetString(locatorEntriesData[currentLocator]);
+
                                 break;
                             case PLATFORM_CODE_MACINTOSH_URI:
                                 parentPath =
                                     Uri.UnescapeDataString(Encoding.UTF8.GetString(locatorEntriesData[currentLocator]));
+
                                 if(parentPath.StartsWith("file://localhost", StringComparison.InvariantCulture))
                                     parentPath = parentPath.Remove(0, 16);
                                 else
                                 {
                                     AaruConsole.DebugWriteLine("VirtualPC plugin",
-                                                              "Unsupported protocol classified found in URI parent path: \"{0}\"",
-                                                              parentPath);
+                                                               "Unsupported protocol classified found in URI parent path: \"{0}\"",
+                                                               parentPath);
+
                                     parentPath = null;
                                 }
 
@@ -518,12 +586,15 @@ namespace Aaru.DiscImages
                         if(parentPath != null)
                         {
                             AaruConsole.DebugWriteLine("VirtualPC plugin", "Possible parent path: \"{0}\"", parentPath);
+
                             IFilter parentFilter =
                                 new FiltersList().GetFilter(Path.Combine(imageFilter.GetParentFolder(), parentPath));
 
-                            if(parentFilter != null) locatorFound = true;
+                            if(parentFilter != null)
+                                locatorFound = true;
 
-                            if(!locatorFound) parentPath = null;
+                            if(!locatorFound)
+                                parentPath = null;
                         }
 
                         currentLocator++;
@@ -535,6 +606,7 @@ namespace Aaru.DiscImages
 
                     {
                         parentImage = new Vhd();
+
                         IFilter parentFilter =
                             new FiltersList().GetFilter(Path.Combine(imageFilter.GetParentFolder(), parentPath));
 
@@ -589,10 +661,12 @@ namespace Aaru.DiscImages
                 {
                     // Block number for BAT searching
                     uint blockNumber = (uint)Math.Floor(sectorAddress / (thisDynamic.BlockSize / 512.0));
+
                     // Sector number inside of block
                     uint sectorInBlock = (uint)(sectorAddress % (thisDynamic.BlockSize / 512));
 
-                    if(blockAllocationTable[blockNumber] == 0xFFFFFFFF) return new byte[512];
+                    if(blockAllocationTable[blockNumber] == 0xFFFFFFFF)
+                        return new byte[512];
 
                     byte[] bitmap = new byte[bitmapSize * 512];
 
@@ -624,7 +698,8 @@ namespace Aaru.DiscImages
                     */
 
                     // Sector has been written, read from child image
-                    if(!dirty) return parentImage.ReadSector(sectorAddress);
+                    if(!dirty)
+                        return parentImage.ReadSector(sectorAddress);
                     /* Too noisy
                         AaruConsole.DebugWriteLine("VirtualPC plugin", "Sector {0} is dirty", sectorAddress);
                         */
@@ -672,10 +747,12 @@ namespace Aaru.DiscImages
                 {
                     // Block number for BAT searching
                     uint blockNumber = (uint)Math.Floor(sectorAddress / (thisDynamic.BlockSize / 512.0));
+
                     // Sector number inside of block
                     uint sectorInBlock = (uint)(sectorAddress % (thisDynamic.BlockSize / 512));
+
                     // How many sectors before reaching end of block
-                    uint remainingInBlock = thisDynamic.BlockSize / 512 - sectorInBlock;
+                    uint remainingInBlock = (thisDynamic.BlockSize / 512) - sectorInBlock;
 
                     // Data that needs to be read from another block
                     byte[] suffix = null;
@@ -689,10 +766,12 @@ namespace Aaru.DiscImages
                         suffix            = ReadSectors(sectorAddress + remainingInBlock, length - remainingInBlock);
                         sectorsToReadHere = remainingInBlock;
                     }
-                    else sectorsToReadHere = length;
+                    else
+                        sectorsToReadHere = length;
 
                     // Offset of sector in file
                     uint sectorOffset = blockAllocationTable[blockNumber] + bitmapSize + sectorInBlock;
+
                     // Data that can be read in this block
                     byte[] prefix = new byte[sectorsToReadHere * 512];
 
@@ -703,15 +782,19 @@ namespace Aaru.DiscImages
                         thisStream.Seek(sectorOffset * 512, SeekOrigin.Begin);
                         thisStream.Read(prefix, 0, (int)(512 * sectorsToReadHere));
                     }
+
                     // If it is unallocated, just fill with zeroes
-                    else Array.Clear(prefix, 0, prefix.Length);
+                    else
+                        Array.Clear(prefix, 0, prefix.Length);
 
                     // If we needed to read from another block, join all the data
-                    if(suffix == null) return prefix;
+                    if(suffix == null)
+                        return prefix;
 
                     byte[] data = new byte[512 * length];
-                    Array.Copy(prefix, 0, data, 0,             prefix.Length);
+                    Array.Copy(prefix, 0, data, 0, prefix.Length);
                     Array.Copy(suffix, 0, data, prefix.Length, suffix.Length);
+
                     return data;
                 }
 
@@ -720,6 +803,7 @@ namespace Aaru.DiscImages
                     // As on differencing images, each independent sector can be read from child or parent
                     // image, we must read sector one by one
                     byte[] fullData = new byte[512 * length];
+
                     for(ulong i = 0; i < length; i++)
                     {
                         byte[] oneSector = ReadSector(sectorAddress + i);
diff --git a/Aaru.Images/VHD/Structs.cs b/Aaru.Images/VHD/Structs.cs
index 2ad463730..7071578bd 100644
--- a/Aaru.Images/VHD/Structs.cs
+++ b/Aaru.Images/VHD/Structs.cs
@@ -38,154 +38,81 @@ namespace Aaru.DiscImages
     {
         struct HardDiskFooter
         {
-            /// <summary>
-            ///     Offset 0x00, File magic number, <see cref="Vhd.IMAGE_COOKIE" />
-            /// </summary>
+            /// <summary>Offset 0x00, File magic number, <see cref="Vhd.IMAGE_COOKIE" /></summary>
             public ulong Cookie;
-            /// <summary>
-            ///     Offset 0x08, Specific feature support
-            /// </summary>
+            /// <summary>Offset 0x08, Specific feature support</summary>
             public uint Features;
-            /// <summary>
-            ///     Offset 0x0C, File format version
-            /// </summary>
+            /// <summary>Offset 0x0C, File format version</summary>
             public uint Version;
-            /// <summary>
-            ///     Offset 0x10, Offset from beginning of file to next structure
-            /// </summary>
+            /// <summary>Offset 0x10, Offset from beginning of file to next structure</summary>
             public ulong Offset;
-            /// <summary>
-            ///     Offset 0x18, Creation date seconds since 2000/01/01 00:00:00 UTC
-            /// </summary>
+            /// <summary>Offset 0x18, Creation date seconds since 2000/01/01 00:00:00 UTC</summary>
             public uint Timestamp;
-            /// <summary>
-            ///     Offset 0x1C, Application that created this disk image
-            /// </summary>
+            /// <summary>Offset 0x1C, Application that created this disk image</summary>
             public uint CreatorApplication;
-            /// <summary>
-            ///     Offset 0x20, Version of the application that created this disk image
-            /// </summary>
+            /// <summary>Offset 0x20, Version of the application that created this disk image</summary>
             public uint CreatorVersion;
-            /// <summary>
-            ///     Offset 0x24, Host operating system of the application that created this disk image
-            /// </summary>
+            /// <summary>Offset 0x24, Host operating system of the application that created this disk image</summary>
             public uint CreatorHostOs;
-            /// <summary>
-            ///     Offset 0x28, Original hard disk size, in bytes
-            /// </summary>
+            /// <summary>Offset 0x28, Original hard disk size, in bytes</summary>
             public ulong OriginalSize;
-            /// <summary>
-            ///     Offset 0x30, Current hard disk size, in bytes
-            /// </summary>
+            /// <summary>Offset 0x30, Current hard disk size, in bytes</summary>
             public ulong CurrentSize;
-            /// <summary>
-            ///     Offset 0x38, CHS geometry
-            ///     Cylinder mask = 0xFFFF0000
-            ///     Heads mask = 0x0000FF00
-            ///     Sectors mask = 0x000000FF
-            /// </summary>
+            /// <summary>Offset 0x38, CHS geometry Cylinder mask = 0xFFFF0000 Heads mask = 0x0000FF00 Sectors mask = 0x000000FF</summary>
             public uint DiskGeometry;
-            /// <summary>
-            ///     Offset 0x3C, Disk image type
-            /// </summary>
+            /// <summary>Offset 0x3C, Disk image type</summary>
             public uint DiskType;
-            /// <summary>
-            ///     Offset 0x40, Checksum for this structure
-            /// </summary>
+            /// <summary>Offset 0x40, Checksum for this structure</summary>
             public uint Checksum;
-            /// <summary>
-            ///     Offset 0x44, UUID, used to associate parent with differencing disk images
-            /// </summary>
+            /// <summary>Offset 0x44, UUID, used to associate parent with differencing disk images</summary>
             public Guid UniqueId;
-            /// <summary>
-            ///     Offset 0x54, If set, system is saved, so compaction and expansion cannot be performed
-            /// </summary>
+            /// <summary>Offset 0x54, If set, system is saved, so compaction and expansion cannot be performed</summary>
             public byte SavedState;
-            /// <summary>
-            ///     Offset 0x55, 427 bytes reserved, should contain zeros.
-            /// </summary>
+            /// <summary>Offset 0x55, 427 bytes reserved, should contain zeros.</summary>
             public byte[] Reserved;
         }
 
         struct ParentLocatorEntry
         {
-            /// <summary>
-            ///     Offset 0x00, Describes the platform specific type this entry belongs to
-            /// </summary>
+            /// <summary>Offset 0x00, Describes the platform specific type this entry belongs to</summary>
             public uint PlatformCode;
-            /// <summary>
-            ///     Offset 0x04, Describes the number of 512 bytes sectors used by this entry
-            /// </summary>
+            /// <summary>Offset 0x04, Describes the number of 512 bytes sectors used by this entry</summary>
             public uint PlatformDataSpace;
-            /// <summary>
-            ///     Offset 0x08, Describes this entry's size in bytes
-            /// </summary>
+            /// <summary>Offset 0x08, Describes this entry's size in bytes</summary>
             public uint PlatformDataLength;
-            /// <summary>
-            ///     Offset 0x0c, Reserved
-            /// </summary>
+            /// <summary>Offset 0x0c, Reserved</summary>
             public uint Reserved;
-            /// <summary>
-            ///     Offset 0x10, Offset on disk image this entry resides on
-            /// </summary>
+            /// <summary>Offset 0x10, Offset on disk image this entry resides on</summary>
             public ulong PlatformDataOffset;
         }
 
         struct DynamicDiskHeader
         {
-            /// <summary>
-            ///     Offset 0x00, Header magic, <see cref="Vhd.DYNAMIC_COOKIE" />
-            /// </summary>
+            /// <summary>Offset 0x00, Header magic, <see cref="Vhd.DYNAMIC_COOKIE" /></summary>
             public ulong Cookie;
-            /// <summary>
-            ///     Offset 0x08, Offset to next structure on disk image.
-            ///     Currently unused, 0xFFFFFFFF
-            /// </summary>
+            /// <summary>Offset 0x08, Offset to next structure on disk image. Currently unused, 0xFFFFFFFF</summary>
             public ulong DataOffset;
-            /// <summary>
-            ///     Offset 0x10, Offset of the Block Allocation Table (BAT)
-            /// </summary>
+            /// <summary>Offset 0x10, Offset of the Block Allocation Table (BAT)</summary>
             public ulong TableOffset;
-            /// <summary>
-            ///     Offset 0x18, Version of this header
-            /// </summary>
+            /// <summary>Offset 0x18, Version of this header</summary>
             public uint HeaderVersion;
-            /// <summary>
-            ///     Offset 0x1C, Maximum entries present in the BAT
-            /// </summary>
+            /// <summary>Offset 0x1C, Maximum entries present in the BAT</summary>
             public uint MaxTableEntries;
-            /// <summary>
-            ///     Offset 0x20, Size of a block in bytes
-            ///     Should always be a power of two of 512
-            /// </summary>
+            /// <summary>Offset 0x20, Size of a block in bytes Should always be a power of two of 512</summary>
             public uint BlockSize;
-            /// <summary>
-            ///     Offset 0x24, Checksum of this header
-            /// </summary>
+            /// <summary>Offset 0x24, Checksum of this header</summary>
             public uint Checksum;
-            /// <summary>
-            ///     Offset 0x28, UUID of parent disk image for differencing type
-            /// </summary>
+            /// <summary>Offset 0x28, UUID of parent disk image for differencing type</summary>
             public Guid ParentId;
-            /// <summary>
-            ///     Offset 0x38, Timestamp of parent disk image
-            /// </summary>
+            /// <summary>Offset 0x38, Timestamp of parent disk image</summary>
             public uint ParentTimestamp;
-            /// <summary>
-            ///     Offset 0x3C, Reserved
-            /// </summary>
+            /// <summary>Offset 0x3C, Reserved</summary>
             public uint Reserved;
-            /// <summary>
-            ///     Offset 0x40, 512 bytes UTF-16 of parent disk image filename
-            /// </summary>
+            /// <summary>Offset 0x40, 512 bytes UTF-16 of parent disk image filename</summary>
             public string ParentName;
-            /// <summary>
-            ///     Offset 0x240, Parent disk image locator entry, <see cref="ParentLocatorEntry" />
-            /// </summary>
+            /// <summary>Offset 0x240, Parent disk image locator entry, <see cref="ParentLocatorEntry" /></summary>
             public ParentLocatorEntry[] LocatorEntries;
-            /// <summary>
-            ///     Offset 0x300, 256 reserved bytes
-            /// </summary>
+            /// <summary>Offset 0x300, 256 reserved bytes</summary>
             public byte[] Reserved2;
         }
     }
diff --git a/Aaru.Images/VHD/VHD.cs b/Aaru.Images/VHD/VHD.cs
index a49ee893f..2b85f6f32 100644
--- a/Aaru.Images/VHD/VHD.cs
+++ b/Aaru.Images/VHD/VHD.cs
@@ -41,10 +41,9 @@ namespace Aaru.DiscImages
 {
     /// <inheritdoc />
     /// <summary>
-    ///     Supports Connectix/Microsoft Virtual PC hard disk image format
-    ///     Until Virtual PC 5 there existed no format, and the hard disk image was
-    ///     merely a sector by sector (RAW) image with a resource fork giving
-    ///     information to Virtual PC itself.
+    ///     Supports Connectix/Microsoft Virtual PC hard disk image format Until Virtual PC 5 there existed no format, and
+    ///     the hard disk image was merely a sector by sector (RAW) image with a resource fork giving information to Virtual PC
+    ///     itself.
     /// </summary>
     public partial class Vhd : IWritableImage
     {
@@ -60,31 +59,18 @@ namespace Aaru.DiscImages
         HardDiskFooter    thisFooter;
         FileStream        writingStream;
 
-        public Vhd()
+        public Vhd() => imageInfo = new ImageInfo
         {
-            imageInfo = new ImageInfo
-            {
-                ReadableSectorTags    = new List<SectorTagType>(),
-                ReadableMediaTags     = new List<MediaTagType>(),
-                HasPartitions         = false,
-                HasSessions           = false,
-                Version               = null,
-                Application           = null,
-                ApplicationVersion    = null,
-                Creator               = null,
-                Comments              = null,
-                MediaManufacturer     = null,
-                MediaModel            = null,
-                MediaSerialNumber     = null,
-                MediaBarcode          = null,
-                MediaPartNumber       = null,
-                MediaSequence         = 0,
-                LastMediaSequence     = 0,
-                DriveManufacturer     = null,
-                DriveModel            = null,
-                DriveSerialNumber     = null,
-                DriveFirmwareRevision = null
-            };
-        }
+            ReadableSectorTags = new List<SectorTagType>(), ReadableMediaTags = new List<MediaTagType>(),
+            HasPartitions      = false, HasSessions                           = false, Version = null,
+            Application        = null,
+            ApplicationVersion = null, Creator = null, Comments = null,
+            MediaManufacturer  = null,
+            MediaModel         = null, MediaSerialNumber = null, MediaBarcode = null,
+            MediaPartNumber    = null,
+            MediaSequence      = 0, LastMediaSequence = 0, DriveManufacturer = null,
+            DriveModel         = null,
+            DriveSerialNumber  = null, DriveFirmwareRevision = null
+        };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/VHD/Write.cs b/Aaru.Images/VHD/Write.cs
index 5c23eae28..4b2a184cc 100644
--- a/Aaru.Images/VHD/Write.cs
+++ b/Aaru.Images/VHD/Write.cs
@@ -47,37 +47,48 @@ namespace Aaru.DiscImages
     public partial class Vhd
     {
         public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
-                           uint   sectorSize)
+                           uint sectorSize)
         {
             if(sectorSize != 512)
             {
                 ErrorMessage = "Unsupported sector size";
+
                 return false;
             }
 
             if(!SupportedMediaTypes.Contains(mediaType))
             {
                 ErrorMessage = $"Unsupport media format {mediaType}";
+
                 return false;
             }
 
-            imageInfo = new ImageInfo {MediaType = mediaType, SectorSize = sectorSize, Sectors = sectors};
+            imageInfo = new ImageInfo
+            {
+                MediaType = mediaType, SectorSize = sectorSize, Sectors = sectors
+            };
 
-            try { writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None); }
+            try
+            {
+                writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
+            }
             catch(IOException e)
             {
                 ErrorMessage = $"Could not create new image file, exception {e.Message}";
+
                 return false;
             }
 
             IsWriting    = true;
             ErrorMessage = null;
+
             return true;
         }
 
         public bool WriteMediaTag(byte[] data, MediaTagType tag)
         {
             ErrorMessage = "Writing media tags is not supported.";
+
             return false;
         }
 
@@ -86,25 +97,29 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Tried to write on a non-writable image";
+
                 return false;
             }
 
             if(data.Length != 512)
             {
                 ErrorMessage = "Incorrect data size";
+
                 return false;
             }
 
             if(sectorAddress >= imageInfo.Sectors)
             {
                 ErrorMessage = "Tried to write past image size";
+
                 return false;
             }
 
-            writingStream.Seek((long)(0 + sectorAddress * 512), SeekOrigin.Begin);
+            writingStream.Seek((long)(0 + (sectorAddress * 512)), SeekOrigin.Begin);
             writingStream.Write(data, 0, data.Length);
 
             ErrorMessage = "";
+
             return true;
         }
 
@@ -114,37 +129,43 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Tried to write on a non-writable image";
+
                 return false;
             }
 
             if(data.Length % 512 != 0)
             {
                 ErrorMessage = "Incorrect data size";
+
                 return false;
             }
 
             if(sectorAddress + length > imageInfo.Sectors)
             {
                 ErrorMessage = "Tried to write past image size";
+
                 return false;
             }
 
-            writingStream.Seek((long)(0 + sectorAddress * 512), SeekOrigin.Begin);
+            writingStream.Seek((long)(0 + (sectorAddress * 512)), SeekOrigin.Begin);
             writingStream.Write(data, 0, data.Length);
 
             ErrorMessage = "";
+
             return true;
         }
 
         public bool WriteSectorLong(byte[] data, ulong sectorAddress)
         {
             ErrorMessage = "Writing sectors with tags is not supported.";
+
             return false;
         }
 
         public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
         {
             ErrorMessage = "Writing sectors with tags is not supported.";
+
             return false;
         }
 
@@ -153,6 +174,7 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Image is not opened for writing";
+
                 return false;
             }
 
@@ -176,47 +198,44 @@ namespace Aaru.DiscImages
 
                     imageInfo.Cylinders = (uint)(imageInfo.Sectors / imageInfo.Heads / imageInfo.SectorsPerTrack);
 
-                    if(imageInfo.Cylinders == 0 && imageInfo.Heads == 0 && imageInfo.SectorsPerTrack == 0) break;
+                    if(imageInfo.Cylinders       == 0 &&
+                       imageInfo.Heads           == 0 &&
+                       imageInfo.SectorsPerTrack == 0)
+                        break;
                 }
             }
 
-            HardDiskFooter footer = new HardDiskFooter
+            var footer = new HardDiskFooter
             {
-                Cookie   = IMAGE_COOKIE,
-                Features = FEATURES_RESERVED,
-                Version  = VERSION1,
+                Cookie = IMAGE_COOKIE, Features = FEATURES_RESERVED, Version = VERSION1,
                 Timestamp =
                     (uint)(DateTime.Now - new DateTime(2000, 1, 1, 0, 0, 0, DateTimeKind.Utc)).TotalSeconds,
                 CreatorApplication = CREATOR_AARU,
-                CreatorVersion =
-                    (uint)(((thisVersion.Major & 0xFF) << 24) + ((thisVersion.Minor & 0xFF) << 16) +
-                           ((thisVersion.Build & 0xFF) << 8)  + (thisVersion.Revision & 0xFF)),
-                CreatorHostOs =
-                    DetectOS.GetRealPlatformID() == PlatformID.MacOSX ? CREATOR_MACINTOSH : CREATOR_WINDOWS,
-                DiskType = TYPE_FIXED,
-                UniqueId = Guid.NewGuid(),
-                DiskGeometry =
-                    ((imageInfo.Cylinders & 0xFFFF) << 16) + ((imageInfo.Heads & 0xFF) << 8) +
-                    (imageInfo.SectorsPerTrack & 0xFF),
-                OriginalSize = imageInfo.Sectors * 512,
-                CurrentSize  = imageInfo.Sectors * 512
+                CreatorVersion = (uint)(((thisVersion.Major & 0xFF) << 24) + ((thisVersion.Minor & 0xFF) << 16) +
+                                        ((thisVersion.Build & 0xFF) << 8)  + (thisVersion.Revision & 0xFF)),
+                CreatorHostOs = DetectOS.GetRealPlatformID() == PlatformID.MacOSX ? CREATOR_MACINTOSH : CREATOR_WINDOWS,
+                DiskType      = TYPE_FIXED, UniqueId = Guid.NewGuid(),
+                DiskGeometry = ((imageInfo.Cylinders & 0xFFFF) << 16) + ((imageInfo.Heads & 0xFF) << 8) +
+                               (imageInfo.SectorsPerTrack & 0xFF),
+                OriginalSize = imageInfo.Sectors * 512, CurrentSize = imageInfo.Sectors * 512
             };
+
             footer.Offset = footer.DiskType == TYPE_FIXED ? ulong.MaxValue : 512;
 
             byte[] footerBytes = new byte[512];
-            Array.Copy(BigEndianBitConverter.GetBytes(footer.Cookie),             0, footerBytes, 0x00, 8);
-            Array.Copy(BigEndianBitConverter.GetBytes(footer.Features),           0, footerBytes, 0x08, 4);
-            Array.Copy(BigEndianBitConverter.GetBytes(footer.Version),            0, footerBytes, 0x0C, 4);
-            Array.Copy(BigEndianBitConverter.GetBytes(footer.Offset),             0, footerBytes, 0x10, 8);
-            Array.Copy(BigEndianBitConverter.GetBytes(footer.Timestamp),          0, footerBytes, 0x18, 4);
+            Array.Copy(BigEndianBitConverter.GetBytes(footer.Cookie), 0, footerBytes, 0x00, 8);
+            Array.Copy(BigEndianBitConverter.GetBytes(footer.Features), 0, footerBytes, 0x08, 4);
+            Array.Copy(BigEndianBitConverter.GetBytes(footer.Version), 0, footerBytes, 0x0C, 4);
+            Array.Copy(BigEndianBitConverter.GetBytes(footer.Offset), 0, footerBytes, 0x10, 8);
+            Array.Copy(BigEndianBitConverter.GetBytes(footer.Timestamp), 0, footerBytes, 0x18, 4);
             Array.Copy(BigEndianBitConverter.GetBytes(footer.CreatorApplication), 0, footerBytes, 0x1C, 4);
-            Array.Copy(BigEndianBitConverter.GetBytes(footer.CreatorVersion),     0, footerBytes, 0x20, 4);
-            Array.Copy(BigEndianBitConverter.GetBytes(footer.CreatorHostOs),      0, footerBytes, 0x24, 4);
-            Array.Copy(BigEndianBitConverter.GetBytes(footer.OriginalSize),       0, footerBytes, 0x28, 8);
-            Array.Copy(BigEndianBitConverter.GetBytes(footer.CurrentSize),        0, footerBytes, 0x30, 8);
-            Array.Copy(BigEndianBitConverter.GetBytes(footer.DiskGeometry),       0, footerBytes, 0x38, 4);
-            Array.Copy(BigEndianBitConverter.GetBytes(footer.DiskType),           0, footerBytes, 0x3C, 4);
-            Array.Copy(footer.UniqueId.ToByteArray(),                             0, footerBytes, 0x44, 4);
+            Array.Copy(BigEndianBitConverter.GetBytes(footer.CreatorVersion), 0, footerBytes, 0x20, 4);
+            Array.Copy(BigEndianBitConverter.GetBytes(footer.CreatorHostOs), 0, footerBytes, 0x24, 4);
+            Array.Copy(BigEndianBitConverter.GetBytes(footer.OriginalSize), 0, footerBytes, 0x28, 8);
+            Array.Copy(BigEndianBitConverter.GetBytes(footer.CurrentSize), 0, footerBytes, 0x30, 8);
+            Array.Copy(BigEndianBitConverter.GetBytes(footer.DiskGeometry), 0, footerBytes, 0x38, 4);
+            Array.Copy(BigEndianBitConverter.GetBytes(footer.DiskType), 0, footerBytes, 0x3C, 4);
+            Array.Copy(footer.UniqueId.ToByteArray(), 0, footerBytes, 0x44, 4);
 
             footer.Checksum = VhdChecksum(footerBytes);
             Array.Copy(BigEndianBitConverter.GetBytes(footer.Checksum), 0, footerBytes, 0x40, 4);
@@ -229,6 +248,7 @@ namespace Aaru.DiscImages
 
             IsWriting    = false;
             ErrorMessage = "";
+
             return true;
         }
 
@@ -239,18 +259,21 @@ namespace Aaru.DiscImages
             if(cylinders > 0xFFFF)
             {
                 ErrorMessage = "Too many cylinders.";
+
                 return false;
             }
 
             if(heads > 0xFF)
             {
                 ErrorMessage = "Too many heads.";
+
                 return false;
             }
 
             if(sectorsPerTrack > 0xFF)
             {
                 ErrorMessage = "Too many sectors per track.";
+
                 return false;
             }
 
@@ -264,12 +287,14 @@ namespace Aaru.DiscImages
         public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
         {
             ErrorMessage = "Unsupported feature";
+
             return false;
         }
 
         public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
         {
             ErrorMessage = "Unsupported feature";
+
             return false;
         }
 
diff --git a/Aaru.Images/VHDX/Helpers.cs b/Aaru.Images/VHDX/Helpers.cs
index e1192cde1..5712c6668 100644
--- a/Aaru.Images/VHDX/Helpers.cs
+++ b/Aaru.Images/VHDX/Helpers.cs
@@ -43,7 +43,8 @@ namespace Aaru.DiscImages
             int  shift = (int)(sectorAddress  % 8);
             byte val   = (byte)(1 << shift);
 
-            if(index > sectorBitmap.LongLength) return false;
+            if(index > sectorBitmap.LongLength)
+                return false;
 
             return (sectorBitmap[index] & val) == val;
         }
diff --git a/Aaru.Images/VHDX/Identify.cs b/Aaru.Images/VHDX/Identify.cs
index 9087456f1..ed4572117 100644
--- a/Aaru.Images/VHDX/Identify.cs
+++ b/Aaru.Images/VHDX/Identify.cs
@@ -43,7 +43,8 @@ namespace Aaru.DiscImages
             Stream stream = imageFilter.GetDataForkStream();
             stream.Seek(0, SeekOrigin.Begin);
 
-            if(stream.Length < 512) return false;
+            if(stream.Length < 512)
+                return false;
 
             byte[] vhdxIdB = new byte[Marshal.SizeOf<VhdxIdentifier>()];
             stream.Read(vhdxIdB, 0, Marshal.SizeOf<VhdxIdentifier>());
diff --git a/Aaru.Images/VHDX/Read.cs b/Aaru.Images/VHDX/Read.cs
index 07cd39b95..53506d9bf 100644
--- a/Aaru.Images/VHDX/Read.cs
+++ b/Aaru.Images/VHDX/Read.cs
@@ -50,13 +50,15 @@ namespace Aaru.DiscImages
             Stream stream = imageFilter.GetDataForkStream();
             stream.Seek(0, SeekOrigin.Begin);
 
-            if(stream.Length < 512) return false;
+            if(stream.Length < 512)
+                return false;
 
             byte[] vhdxIdB = new byte[Marshal.SizeOf<VhdxIdentifier>()];
             stream.Read(vhdxIdB, 0, Marshal.SizeOf<VhdxIdentifier>());
             vhdxId = Marshal.ByteArrayToStructureLittleEndian<VhdxIdentifier>(vhdxIdB);
 
-            if(vhdxId.signature != VHDX_SIGNATURE) return false;
+            if(vhdxId.signature != VHDX_SIGNATURE)
+                return false;
 
             imageInfo.Application = Encoding.Unicode.GetString(vhdxId.creator);
 
@@ -72,7 +74,8 @@ namespace Aaru.DiscImages
                 stream.Read(vHdrB, 0, Marshal.SizeOf<VhdxHeader>());
                 vHdr = Marshal.ByteArrayToStructureLittleEndian<VhdxHeader>(vHdrB);
 
-                if(vHdr.Signature != VHDX_HEADER_SIG) throw new ImageNotSupportedException("VHDX header not found");
+                if(vHdr.Signature != VHDX_HEADER_SIG)
+                    throw new ImageNotSupportedException("VHDX header not found");
             }
 
             stream.Seek(192 * 1024, SeekOrigin.Begin);
@@ -92,6 +95,7 @@ namespace Aaru.DiscImages
             }
 
             vRegs = new VhdxRegionTableEntry[vRegHdr.entries];
+
             for(int i = 0; i < vRegs.Length; i++)
             {
                 byte[] vRegB = new byte[System.Runtime.InteropServices.Marshal.SizeOf(vRegs[i])];
@@ -107,9 +111,11 @@ namespace Aaru.DiscImages
                         ImageNotSupportedException($"Found unsupported and required region Guid {vRegs[i].guid}, not proceeding with image.");
             }
 
-            if(batOffset == 0) throw new Exception("BAT not found, cannot continue.");
+            if(batOffset == 0)
+                throw new Exception("BAT not found, cannot continue.");
 
-            if(metadataOffset == 0) throw new Exception("Metadata not found, cannot continue.");
+            if(metadataOffset == 0)
+                throw new Exception("Metadata not found, cannot continue.");
 
             uint fileParamsOff = 0, vdSizeOff = 0, p83Off = 0, logOff = 0, physOff = 0, parentOff = 0;
 
@@ -119,6 +125,7 @@ namespace Aaru.DiscImages
             vMetHdr = Marshal.ByteArrayToStructureLittleEndian<VhdxMetadataTableHeader>(metTableB);
 
             vMets = new VhdxMetadataTableEntry[vMetHdr.entries];
+
             for(int i = 0; i < vMets.Length; i++)
             {
                 byte[] vMetB = new byte[System.Runtime.InteropServices.Marshal.SizeOf(vMets[i])];
@@ -149,12 +156,14 @@ namespace Aaru.DiscImages
                 stream.Seek(fileParamsOff + metadataOffset, SeekOrigin.Begin);
                 tmp = new byte[8];
                 stream.Read(tmp, 0, 8);
+
                 vFileParms = new VhdxFileParameters
                 {
                     blockSize = BitConverter.ToUInt32(tmp, 0), flags = BitConverter.ToUInt32(tmp, 4)
                 };
             }
-            else throw new Exception("File parameters not found.");
+            else
+                throw new Exception("File parameters not found.");
 
             if(vdSizeOff != 0)
             {
@@ -163,7 +172,8 @@ namespace Aaru.DiscImages
                 stream.Read(tmp, 0, 8);
                 virtualDiskSize = BitConverter.ToUInt64(tmp, 0);
             }
-            else throw new Exception("Virtual disk size not found.");
+            else
+                throw new Exception("Virtual disk size not found.");
 
             if(p83Off != 0)
             {
@@ -180,7 +190,8 @@ namespace Aaru.DiscImages
                 stream.Read(tmp, 0, 4);
                 logicalSectorSize = BitConverter.ToUInt32(tmp, 0);
             }
-            else throw new Exception("Logical sector size not found.");
+            else
+                throw new Exception("Logical sector size not found.");
 
             if(physOff != 0)
             {
@@ -189,9 +200,11 @@ namespace Aaru.DiscImages
                 stream.Read(tmp, 0, 4);
                 physicalSectorSize = BitConverter.ToUInt32(tmp, 0);
             }
-            else throw new Exception("Physical sector size not found.");
+            else
+                throw new Exception("Physical sector size not found.");
 
-            if(parentOff != 0 && (vFileParms.flags & FILE_FLAGS_HAS_PARENT) == FILE_FLAGS_HAS_PARENT)
+            if(parentOff                                  != 0 &&
+               (vFileParms.flags & FILE_FLAGS_HAS_PARENT) == FILE_FLAGS_HAS_PARENT)
             {
                 stream.Seek(parentOff + metadataOffset, SeekOrigin.Begin);
                 byte[] vParHdrB = new byte[Marshal.SizeOf<VhdxParentLocatorHeader>()];
@@ -203,6 +216,7 @@ namespace Aaru.DiscImages
                         ImageNotSupportedException($"Found unsupported and required parent locator type {vParHdr.locatorType}, not proceeding with image.");
 
                 vPars = new VhdxParentLocatorEntry[vParHdr.keyValueCount];
+
                 for(int i = 0; i < vPars.Length; i++)
                 {
                     byte[] vParB = new byte[System.Runtime.InteropServices.Marshal.SizeOf(vPars[i])];
@@ -227,6 +241,7 @@ namespace Aaru.DiscImages
                     string entryType = Encoding.Unicode.GetString(tmpKey);
 
                     IFilter parentFilter;
+
                     if(string.Compare(entryType, RELATIVE_PATH_KEY, StringComparison.OrdinalIgnoreCase) == 0)
                     {
                         stream.Seek(parentEntry.valueOffset + metadataOffset, SeekOrigin.Begin);
@@ -238,13 +253,19 @@ namespace Aaru.DiscImages
                         {
                             parentFilter =
                                 new FiltersList().GetFilter(Path.Combine(imageFilter.GetParentFolder(), entryValue));
-                            if(parentFilter != null && parentImage.Open(parentFilter))
+
+                            if(parentFilter != null &&
+                               parentImage.Open(parentFilter))
                             {
                                 parentWorks = true;
+
                                 break;
                             }
                         }
-                        catch { parentWorks = false; }
+                        catch
+                        {
+                            parentWorks = false;
+                        }
 
                         string relEntry = Path.Combine(Path.GetDirectoryName(imageFilter.GetPath()), entryValue);
 
@@ -252,9 +273,13 @@ namespace Aaru.DiscImages
                         {
                             parentFilter =
                                 new FiltersList().GetFilter(Path.Combine(imageFilter.GetParentFolder(), relEntry));
-                            if(parentFilter == null || !parentImage.Open(parentFilter)) continue;
+
+                            if(parentFilter == null ||
+                               !parentImage.Open(parentFilter))
+                                continue;
 
                             parentWorks = true;
+
                             break;
                         }
                         catch
@@ -275,9 +300,13 @@ namespace Aaru.DiscImages
                         {
                             parentFilter =
                                 new FiltersList().GetFilter(Path.Combine(imageFilter.GetParentFolder(), entryValue));
-                            if(parentFilter == null || !parentImage.Open(parentFilter)) continue;
+
+                            if(parentFilter == null ||
+                               !parentImage.Open(parentFilter))
+                                continue;
 
                             parentWorks = true;
+
                             break;
                         }
                         catch
@@ -287,25 +316,33 @@ namespace Aaru.DiscImages
                     }
                 }
 
-                if(!parentWorks) throw new Exception("Image is differential but parent cannot be opened.");
+                if(!parentWorks)
+                    throw new Exception("Image is differential but parent cannot be opened.");
 
                 hasParent = true;
             }
 
-            chunkRatio = (long)(Math.Pow(2, 23) * logicalSectorSize / vFileParms.blockSize);
+            chunkRatio = (long)((Math.Pow(2, 23) * logicalSectorSize) / vFileParms.blockSize);
             dataBlocks = virtualDiskSize / vFileParms.blockSize;
-            if(virtualDiskSize           % vFileParms.blockSize > 0) dataBlocks++;
+
+            if(virtualDiskSize % vFileParms.blockSize > 0)
+                dataBlocks++;
 
             long batEntries;
+
             if(hasParent)
             {
                 long sectorBitmapBlocks = (long)dataBlocks / chunkRatio;
-                if(dataBlocks % (ulong)chunkRatio > 0) sectorBitmapBlocks++;
+
+                if(dataBlocks % (ulong)chunkRatio > 0)
+                    sectorBitmapBlocks++;
+
                 sectorBitmapPointers = new ulong[sectorBitmapBlocks];
 
                 batEntries = sectorBitmapBlocks * (chunkRatio - 1);
             }
-            else batEntries = (long)(dataBlocks + (dataBlocks - 1) / (ulong)chunkRatio);
+            else
+                batEntries = (long)(dataBlocks + ((dataBlocks - 1) / (ulong)chunkRatio));
 
             AaruConsole.DebugWriteLine("VHDX plugin", "Reading BAT");
 
@@ -316,18 +353,19 @@ namespace Aaru.DiscImages
             stream.Read(batB, 0, batB.Length);
 
             ulong skipSize = 0;
+
             for(ulong i = 0; i < dataBlocks; i++)
                 if(readChunks == chunkRatio)
                 {
                     if(hasParent)
-                        sectorBitmapPointers[skipSize / 8] = BitConverter.ToUInt64(batB, (int)(i * 8 + skipSize));
+                        sectorBitmapPointers[skipSize / 8] = BitConverter.ToUInt64(batB, (int)((i * 8) + skipSize));
 
                     readChunks =  0;
                     skipSize   += 8;
                 }
                 else
                 {
-                    blockAllocationTable[i] = BitConverter.ToUInt64(batB, (int)(i * 8 + skipSize));
+                    blockAllocationTable[i] = BitConverter.ToUInt64(batB, (int)((i * 8) + skipSize));
                     readChunks++;
                 }
 
@@ -335,18 +373,21 @@ namespace Aaru.DiscImages
             {
                 AaruConsole.DebugWriteLine("VHDX plugin", "Reading Sector Bitmap");
 
-                MemoryStream sectorBmpMs = new MemoryStream();
+                var sectorBmpMs = new MemoryStream();
+
                 foreach(ulong pt in sectorBitmapPointers)
                     switch(pt & BAT_FLAGS_MASK)
                     {
                         case SECTOR_BITMAP_NOT_PRESENT:
                             sectorBmpMs.Write(new byte[1048576], 0, 1048576);
+
                             break;
                         case SECTOR_BITMAP_PRESENT:
                             stream.Seek((long)((pt & BAT_FILE_OFFSET_MASK) * 1048576), SeekOrigin.Begin);
                             byte[] bmp = new byte[1048576];
                             stream.Read(bmp, 0, bmp.Length);
                             sectorBmpMs.Write(bmp, 0, bmp.Length);
+
                             break;
                         default:
                             if((pt & BAT_FLAGS_MASK) != 0)
@@ -393,10 +434,11 @@ namespace Aaru.DiscImages
                 throw new ArgumentOutOfRangeException(nameof(sectorAddress),
                                                       $"Sector address {sectorAddress} not found");
 
-            if(sectorCache.TryGetValue(sectorAddress, out byte[] sector)) return sector;
+            if(sectorCache.TryGetValue(sectorAddress, out byte[] sector))
+                return sector;
 
-            ulong index  = sectorAddress * logicalSectorSize / vFileParms.blockSize;
-            ulong secOff = sectorAddress * logicalSectorSize % vFileParms.blockSize;
+            ulong index  = (sectorAddress * logicalSectorSize) / vFileParms.blockSize;
+            ulong secOff = (sectorAddress * logicalSectorSize) % vFileParms.blockSize;
 
             ulong blkPtr   = blockAllocationTable[index];
             ulong blkFlags = blkPtr & BAT_FLAGS_MASK;
@@ -417,7 +459,10 @@ namespace Aaru.DiscImages
             bool partialBlock;
             partialBlock = (blkFlags & BAT_FLAGS_MASK) == PAYLOAD_BLOCK_PARTIALLY_PRESENT;
 
-            if(partialBlock && hasParent && !CheckBitmap(sectorAddress)) return parentImage.ReadSector(sectorAddress);
+            if(partialBlock &&
+               hasParent    &&
+               !CheckBitmap(sectorAddress))
+                return parentImage.ReadSector(sectorAddress);
 
             if(!blockCache.TryGetValue(blkPtr & BAT_FILE_OFFSET_MASK, out byte[] block))
             {
@@ -425,7 +470,8 @@ namespace Aaru.DiscImages
                 imageStream.Seek((long)(blkPtr & BAT_FILE_OFFSET_MASK), SeekOrigin.Begin);
                 imageStream.Read(block, 0, block.Length);
 
-                if(blockCache.Count >= maxBlockCache) blockCache.Clear();
+                if(blockCache.Count >= maxBlockCache)
+                    blockCache.Clear();
 
                 blockCache.Add(blkPtr & BAT_FILE_OFFSET_MASK, block);
             }
@@ -433,7 +479,8 @@ namespace Aaru.DiscImages
             sector = new byte[logicalSectorSize];
             Array.Copy(block, (int)secOff, sector, 0, sector.Length);
 
-            if(sectorCache.Count >= maxSectorCache) sectorCache.Clear();
+            if(sectorCache.Count >= maxSectorCache)
+                sectorCache.Clear();
 
             sectorCache.Add(sectorAddress, sector);
 
@@ -450,7 +497,7 @@ namespace Aaru.DiscImages
                 throw new ArgumentOutOfRangeException(nameof(length),
                                                       $"Requested more sectors ({sectorAddress + length}) than available ({imageInfo.Sectors})");
 
-            MemoryStream ms = new MemoryStream();
+            var ms = new MemoryStream();
 
             for(uint i = 0; i < length; i++)
             {
diff --git a/Aaru.Images/VHDX/Structs.cs b/Aaru.Images/VHDX/Structs.cs
index 2b708b3b3..2ea509d20 100644
--- a/Aaru.Images/VHDX/Structs.cs
+++ b/Aaru.Images/VHDX/Structs.cs
@@ -40,60 +40,36 @@ namespace Aaru.DiscImages
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct VhdxIdentifier
         {
-            /// <summary>
-            ///     Signature, <see cref="Vhdx.VHDX_SIGNATURE" />
-            /// </summary>
-            public ulong signature;
-            /// <summary>
-            ///     UTF-16 string containing creator
-            /// </summary>
+            /// <summary>Signature, <see cref="Vhdx.VHDX_SIGNATURE" /></summary>
+            public readonly ulong signature;
+            /// <summary>UTF-16 string containing creator</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 512)]
-            public byte[] creator;
+            public readonly byte[] creator;
         }
 
         #pragma warning disable 649
         #pragma warning disable 169
         struct VhdxHeader
         {
-            /// <summary>
-            ///     Signature, <see cref="Vhdx.VHDX_HEADER_SIG" />
-            /// </summary>
+            /// <summary>Signature, <see cref="Vhdx.VHDX_HEADER_SIG" /></summary>
             public uint Signature;
-            /// <summary>
-            ///     CRC-32C of whole 4096 bytes header with this field set to 0
-            /// </summary>
+            /// <summary>CRC-32C of whole 4096 bytes header with this field set to 0</summary>
             public uint Checksum;
-            /// <summary>
-            ///     Sequence number
-            /// </summary>
+            /// <summary>Sequence number</summary>
             public ulong Sequence;
-            /// <summary>
-            ///     Unique identifier for file contents, must be changed on first write to metadata
-            /// </summary>
+            /// <summary>Unique identifier for file contents, must be changed on first write to metadata</summary>
             public Guid FileWriteGuid;
-            /// <summary>
-            ///     Unique identifier for disk contents, must be changed on first write to metadata or data
-            /// </summary>
+            /// <summary>Unique identifier for disk contents, must be changed on first write to metadata or data</summary>
             public Guid DataWriteGuid;
-            /// <summary>
-            ///     Unique identifier for log entries
-            /// </summary>
+            /// <summary>Unique identifier for log entries</summary>
             public Guid LogGuid;
-            /// <summary>
-            ///     Version of log format
-            /// </summary>
+            /// <summary>Version of log format</summary>
             public ushort LogVersion;
-            /// <summary>
-            ///     Version of VHDX format
-            /// </summary>
+            /// <summary>Version of VHDX format</summary>
             public ushort Version;
-            /// <summary>
-            ///     Length in bytes of the log
-            /// </summary>
+            /// <summary>Length in bytes of the log</summary>
             public uint LogLength;
-            /// <summary>
-            ///     Offset from image start to the log
-            /// </summary>
+            /// <summary>Offset from image start to the log</summary>
             public ulong LogOffset;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4016)]
             public byte[] Reserved;
@@ -104,138 +80,88 @@ namespace Aaru.DiscImages
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct VhdxRegionTableHeader
         {
-            /// <summary>
-            ///     Signature, <see cref="Vhdx.VHDX_REGION_SIG" />
-            /// </summary>
-            public uint signature;
-            /// <summary>
-            ///     CRC-32C of whole 64Kb table with this field set to 0
-            /// </summary>
-            public uint checksum;
-            /// <summary>
-            ///     How many entries follow this table
-            /// </summary>
-            public uint entries;
-            /// <summary>
-            ///     Reserved
-            /// </summary>
-            public uint reserved;
+            /// <summary>Signature, <see cref="Vhdx.VHDX_REGION_SIG" /></summary>
+            public readonly uint signature;
+            /// <summary>CRC-32C of whole 64Kb table with this field set to 0</summary>
+            public readonly uint checksum;
+            /// <summary>How many entries follow this table</summary>
+            public readonly uint entries;
+            /// <summary>Reserved</summary>
+            public readonly uint reserved;
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct VhdxRegionTableEntry
         {
-            /// <summary>
-            ///     Object identifier
-            /// </summary>
-            public Guid guid;
-            /// <summary>
-            ///     Offset in image of the object
-            /// </summary>
-            public ulong offset;
-            /// <summary>
-            ///     Length in bytes of the object
-            /// </summary>
-            public uint length;
-            /// <summary>
-            ///     Flags
-            /// </summary>
-            public uint flags;
+            /// <summary>Object identifier</summary>
+            public readonly Guid guid;
+            /// <summary>Offset in image of the object</summary>
+            public readonly ulong offset;
+            /// <summary>Length in bytes of the object</summary>
+            public readonly uint length;
+            /// <summary>Flags</summary>
+            public readonly uint flags;
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct VhdxMetadataTableHeader
         {
-            /// <summary>
-            ///     Signature
-            /// </summary>
-            public ulong signature;
-            /// <summary>
-            ///     Reserved
-            /// </summary>
-            public ushort reserved;
-            /// <summary>
-            ///     How many entries are in the table
-            /// </summary>
-            public ushort entries;
-            /// <summary>
-            ///     Reserved
-            /// </summary>
+            /// <summary>Signature</summary>
+            public readonly ulong signature;
+            /// <summary>Reserved</summary>
+            public readonly ushort reserved;
+            /// <summary>How many entries are in the table</summary>
+            public readonly ushort entries;
+            /// <summary>Reserved</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 5)]
-            public uint[] reserved2;
+            public readonly uint[] reserved2;
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct VhdxMetadataTableEntry
         {
-            /// <summary>
-            ///     Metadata ID
-            /// </summary>
-            public Guid itemId;
-            /// <summary>
-            ///     Offset relative to start of metadata region
-            /// </summary>
-            public uint offset;
-            /// <summary>
-            ///     Length in bytes
-            /// </summary>
-            public uint length;
-            /// <summary>
-            ///     Flags
-            /// </summary>
-            public uint flags;
-            /// <summary>
-            ///     Reserved
-            /// </summary>
-            public uint reserved;
+            /// <summary>Metadata ID</summary>
+            public readonly Guid itemId;
+            /// <summary>Offset relative to start of metadata region</summary>
+            public readonly uint offset;
+            /// <summary>Length in bytes</summary>
+            public readonly uint length;
+            /// <summary>Flags</summary>
+            public readonly uint flags;
+            /// <summary>Reserved</summary>
+            public readonly uint reserved;
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct VhdxFileParameters
         {
-            /// <summary>
-            ///     Block size in bytes
-            /// </summary>
+            /// <summary>Block size in bytes</summary>
             public uint blockSize;
-            /// <summary>
-            ///     Flags
-            /// </summary>
+            /// <summary>Flags</summary>
             public uint flags;
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct VhdxParentLocatorHeader
         {
-            /// <summary>
-            ///     Type of parent virtual disk
-            /// </summary>
-            public Guid locatorType;
-            public ushort reserved;
-            /// <summary>
-            ///     How many KVPs are in this parent locator
-            /// </summary>
-            public ushort keyValueCount;
+            /// <summary>Type of parent virtual disk</summary>
+            public readonly Guid locatorType;
+            public readonly ushort reserved;
+            /// <summary>How many KVPs are in this parent locator</summary>
+            public readonly ushort keyValueCount;
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct VhdxParentLocatorEntry
         {
-            /// <summary>
-            ///     Offset from metadata to key
-            /// </summary>
-            public uint keyOffset;
-            /// <summary>
-            ///     Offset from metadata to value
-            /// </summary>
-            public uint valueOffset;
-            /// <summary>
-            ///     Size of key
-            /// </summary>
-            public ushort keyLength;
-            /// <summary>
-            ///     Size of value
-            /// </summary>
-            public ushort valueLength;
+            /// <summary>Offset from metadata to key</summary>
+            public readonly uint keyOffset;
+            /// <summary>Offset from metadata to value</summary>
+            public readonly uint valueOffset;
+            /// <summary>Size of key</summary>
+            public readonly ushort keyLength;
+            /// <summary>Size of value</summary>
+            public readonly ushort valueLength;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/VHDX/VHDX.cs b/Aaru.Images/VHDX/VHDX.cs
index 0352c870f..afb46b838 100644
--- a/Aaru.Images/VHDX/VHDX.cs
+++ b/Aaru.Images/VHDX/VHDX.cs
@@ -70,31 +70,18 @@ namespace Aaru.DiscImages
         VhdxRegionTableHeader     vRegHdr;
         VhdxRegionTableEntry[]    vRegs;
 
-        public Vhdx()
+        public Vhdx() => imageInfo = new ImageInfo
         {
-            imageInfo = new ImageInfo
-            {
-                ReadableSectorTags    = new List<SectorTagType>(),
-                ReadableMediaTags     = new List<MediaTagType>(),
-                HasPartitions         = false,
-                HasSessions           = false,
-                Version               = null,
-                Application           = null,
-                ApplicationVersion    = null,
-                Creator               = null,
-                Comments              = null,
-                MediaManufacturer     = null,
-                MediaModel            = null,
-                MediaSerialNumber     = null,
-                MediaBarcode          = null,
-                MediaPartNumber       = null,
-                MediaSequence         = 0,
-                LastMediaSequence     = 0,
-                DriveManufacturer     = null,
-                DriveModel            = null,
-                DriveSerialNumber     = null,
-                DriveFirmwareRevision = null
-            };
-        }
+            ReadableSectorTags = new List<SectorTagType>(), ReadableMediaTags = new List<MediaTagType>(),
+            HasPartitions      = false, HasSessions                           = false, Version = null,
+            Application        = null,
+            ApplicationVersion = null, Creator = null, Comments = null,
+            MediaManufacturer  = null,
+            MediaModel         = null, MediaSerialNumber = null, MediaBarcode = null,
+            MediaPartNumber    = null,
+            MediaSequence      = 0, LastMediaSequence = 0, DriveManufacturer = null,
+            DriveModel         = null,
+            DriveSerialNumber  = null, DriveFirmwareRevision = null
+        };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/VMware/Constants.cs b/Aaru.Images/VMware/Constants.cs
index ba84d8105..f5f8e99db 100644
--- a/Aaru.Images/VMware/Constants.cs
+++ b/Aaru.Images/VMware/Constants.cs
@@ -86,8 +86,8 @@ namespace Aaru.DiscImages
         const uint MAX_CACHED_SECTORS = MAX_CACHE_SIZE / SECTOR_SIZE;
         readonly byte[] ddfMagicBytes =
         {
-            0x23, 0x20, 0x44, 0x69, 0x73, 0x6B, 0x20, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6F, 0x72,
-            0x46, 0x69, 0x6C, 0x65
+            0x23, 0x20, 0x44, 0x69, 0x73, 0x6B, 0x20, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6F, 0x72, 0x46,
+            0x69, 0x6C, 0x65
         };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/VMware/Identify.cs b/Aaru.Images/VMware/Identify.cs
index 7bce9964a..c773513cc 100644
--- a/Aaru.Images/VMware/Identify.cs
+++ b/Aaru.Images/VMware/Identify.cs
@@ -56,6 +56,7 @@ namespace Aaru.DiscImages
                 stream.Read(ddfMagic, 0, 0x15);
 
                 vmCHdr = new VMwareCowHeader();
+
                 if(stream.Length <= Marshal.SizeOf<VMwareCowHeader>())
                     return ddfMagicBytes.SequenceEqual(ddfMagic) || vmEHdr.magic == VMWARE_EXTENT_MAGIC ||
                            vmCHdr.magic                                          == VMWARE_COW_MAGIC;
diff --git a/Aaru.Images/VMware/Properties.cs b/Aaru.Images/VMware/Properties.cs
index 6d0f1c299..e5f749c5e 100644
--- a/Aaru.Images/VMware/Properties.cs
+++ b/Aaru.Images/VMware/Properties.cs
@@ -43,32 +43,35 @@ namespace Aaru.DiscImages
     {
         public ImageInfo Info => imageInfo;
 
-        public string                     Name                => "VMware disk image";
-        public Guid                       Id                  => new Guid("E314DE35-C103-48A3-AD36-990F68523C46");
-        public string                     Author              => "Natalia Portillo";
-        public string                     Format              => "VMware";
-        public List<DumpHardwareType>     DumpHardware        => null;
-        public CICMMetadataType           CicmMetadata        => null;
-        public IEnumerable<MediaTagType>  SupportedMediaTags  => new MediaTagType[] { };
-        public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[] { };
-        public IEnumerable<MediaType> SupportedMediaTypes =>
-            new[]
-            {
-                MediaType.GENERIC_HDD, MediaType.Unknown, MediaType.FlashDrive, MediaType.CompactFlash,
-                MediaType.CompactFlashType2, MediaType.PCCardTypeI, MediaType.PCCardTypeII, MediaType.PCCardTypeIII,
-                MediaType.PCCardTypeIV
-            };
-        public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
-            new[]
-            {
-                ("adapter_type", typeof(string),
-                 "Type of adapter type. Possible values: ide, lsilogic, buslogic, legacyESX.", "ide"),
-                ("hwversion", typeof(uint), "VDMK hardware version.", 4),
-                ("sparse", typeof(bool), "Use sparse extents.", (object)false),
-                ("split", typeof(bool), "Split data file at 2GiB.", (object)false)
-            };
-        public IEnumerable<string> KnownExtensions => new[] {".vmdk"};
-        public bool                IsWriting       { get; private set; }
-        public string              ErrorMessage    { get; private set; }
+        public string                 Name         => "VMware disk image";
+        public Guid                   Id           => new Guid("E314DE35-C103-48A3-AD36-990F68523C46");
+        public string                 Author       => "Natalia Portillo";
+        public string                 Format       => "VMware";
+        public List<DumpHardwareType> DumpHardware => null;
+        public CICMMetadataType       CicmMetadata => null;
+        public IEnumerable<MediaTagType> SupportedMediaTags => new MediaTagType[]
+            {};
+        public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[]
+            {};
+        public IEnumerable<MediaType> SupportedMediaTypes => new[]
+        {
+            MediaType.GENERIC_HDD, MediaType.Unknown, MediaType.FlashDrive, MediaType.CompactFlash,
+            MediaType.CompactFlashType2, MediaType.PCCardTypeI, MediaType.PCCardTypeII, MediaType.PCCardTypeIII,
+            MediaType.PCCardTypeIV
+        };
+        public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions => new[]
+        {
+            ("adapter_type", typeof(string),
+             "Type of adapter type. Possible values: ide, lsilogic, buslogic, legacyESX.", "ide"),
+            ("hwversion", typeof(uint), "VDMK hardware version.", 4),
+            ("sparse", typeof(bool), "Use sparse extents.", (object)false),
+            ("split", typeof(bool), "Split data file at 2GiB.", (object)false)
+        };
+        public IEnumerable<string> KnownExtensions => new[]
+        {
+            ".vmdk"
+        };
+        public bool   IsWriting    { get; private set; }
+        public string ErrorMessage { get; private set; }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/VMware/Read.cs b/Aaru.Images/VMware/Read.cs
index 10593a050..a1061aedd 100644
--- a/Aaru.Images/VMware/Read.cs
+++ b/Aaru.Images/VMware/Read.cs
@@ -71,16 +71,17 @@ namespace Aaru.DiscImages
                 vmCHdr = Marshal.ByteArrayToStructureLittleEndian<VMwareCowHeader>(vmCHdrB);
             }
 
-            MemoryStream ddfStream = new MemoryStream();
-            bool         vmEHdrSet = false;
-            bool         cowD      = false;
+            var  ddfStream = new MemoryStream();
+            bool vmEHdrSet = false;
+            bool cowD      = false;
 
             if(vmEHdr.magic == VMWARE_EXTENT_MAGIC)
             {
                 vmEHdrSet = true;
                 gdFilter  = imageFilter;
 
-                if(vmEHdr.descriptorOffset == 0 || vmEHdr.descriptorSize == 0)
+                if(vmEHdr.descriptorOffset == 0 ||
+                   vmEHdr.descriptorSize   == 0)
                     throw new Exception("Please open VMDK descriptor.");
 
                 byte[] ddfEmbed = new byte[vmEHdr.descriptorSize * SECTOR_SIZE];
@@ -102,7 +103,8 @@ namespace Aaru.DiscImages
                 stream.Seek(0, SeekOrigin.Begin);
                 stream.Read(ddfMagic, 0, 0x15);
 
-                if(!ddfMagicBytes.SequenceEqual(ddfMagic)) throw new Exception("Not a descriptor.");
+                if(!ddfMagicBytes.SequenceEqual(ddfMagic))
+                    throw new Exception("Not a descriptor.");
 
                 stream.Seek(0, SeekOrigin.Begin);
                 byte[] ddfExternal = new byte[imageFilter.GetDataForkLength()];
@@ -123,42 +125,45 @@ namespace Aaru.DiscImages
                 while(true)
                 {
                     string curPath;
-                    if(cowCount == 1) curPath = basePath + ".vmdk";
-                    else curPath              = $"{basePath}-{cowCount:D2}.vmdk";
 
-                    if(!File.Exists(curPath)) break;
+                    if(cowCount == 1)
+                        curPath = basePath + ".vmdk";
+                    else
+                        curPath = $"{basePath}-{cowCount:D2}.vmdk";
+
+                    if(!File.Exists(curPath))
+                        break;
 
                     IFilter extentFilter = new FiltersList().GetFilter(curPath);
                     Stream  extentStream = extentFilter.GetDataForkStream();
 
                     if(stream.Length > Marshal.SizeOf<VMwareCowHeader>())
                     {
-                        VMwareCowHeader extHdrCow = new VMwareCowHeader();
+                        var extHdrCow = new VMwareCowHeader();
                         extentStream.Seek(0, SeekOrigin.Begin);
                         byte[] vmCHdrB = new byte[Marshal.SizeOf<VMwareCowHeader>()];
                         extentStream.Read(vmCHdrB, 0, Marshal.SizeOf<VMwareCowHeader>());
                         extHdrCow = Marshal.ByteArrayToStructureLittleEndian<VMwareCowHeader>(vmCHdrB);
 
-                        if(extHdrCow.magic != VMWARE_COW_MAGIC) break;
+                        if(extHdrCow.magic != VMWARE_COW_MAGIC)
+                            break;
 
-                        VMwareExtent newExtent = new VMwareExtent
+                        var newExtent = new VMwareExtent
                         {
-                            Access   = "RW",
-                            Filter   = extentFilter,
-                            Filename = extentFilter.GetFilename(),
-                            Offset   = 0,
-                            Sectors  = extHdrCow.sectors,
-                            Type     = "SPARSE"
+                            Access  = "RW", Filter = extentFilter, Filename = extentFilter.GetFilename(),
+                            Offset  = 0,
+                            Sectors = extHdrCow.sectors, Type = "SPARSE"
                         };
 
                         AaruConsole.DebugWriteLine("VMware plugin", "{0} {1} {2} \"{3}\" {4}", newExtent.Access,
-                                                  newExtent.Sectors, newExtent.Type, newExtent.Filename,
-                                                  newExtent.Offset);
+                                                   newExtent.Sectors, newExtent.Type, newExtent.Filename,
+                                                   newExtent.Offset);
 
                         extents.Add(currentSector, newExtent);
                         currentSector += newExtent.Sectors;
                     }
-                    else break;
+                    else
+                        break;
 
                     cowCount++;
                 }
@@ -169,17 +174,17 @@ namespace Aaru.DiscImages
             {
                 ddfStream.Seek(0, SeekOrigin.Begin);
 
-                Regex regexVersion   = new Regex(REGEX_VERSION);
-                Regex regexCid       = new Regex(REGEX_CID);
-                Regex regexParentCid = new Regex(REGEX_CID_PARENT);
-                Regex regexType      = new Regex(REGEX_TYPE);
-                Regex regexExtent    = new Regex(REGEX_EXTENT);
-                Regex regexParent    = new Regex(PARENT_REGEX);
-                Regex regexCylinders = new Regex(REGEX_DDB_CYLINDERS);
-                Regex regexHeads     = new Regex(REGEX_DDB_HEADS);
-                Regex regexSectors   = new Regex(REGEX_DDB_SECTORS);
+                var regexVersion   = new Regex(REGEX_VERSION);
+                var regexCid       = new Regex(REGEX_CID);
+                var regexParentCid = new Regex(REGEX_CID_PARENT);
+                var regexType      = new Regex(REGEX_TYPE);
+                var regexExtent    = new Regex(REGEX_EXTENT);
+                var regexParent    = new Regex(PARENT_REGEX);
+                var regexCylinders = new Regex(REGEX_DDB_CYLINDERS);
+                var regexHeads     = new Regex(REGEX_DDB_HEADS);
+                var regexSectors   = new Regex(REGEX_DDB_SECTORS);
 
-                StreamReader ddfStreamRdr = new StreamReader(ddfStream);
+                var ddfStreamRdr = new StreamReader(ddfStream);
 
                 while(ddfStreamRdr.Peek() >= 0)
                 {
@@ -217,19 +222,26 @@ namespace Aaru.DiscImages
                     }
                     else if(matchExtent.Success)
                     {
-                        VMwareExtent newExtent = new VMwareExtent {Access = matchExtent.Groups["access"].Value};
+                        var newExtent = new VMwareExtent
+                        {
+                            Access = matchExtent.Groups["access"].Value
+                        };
+
                         if(!embedded)
                             newExtent.Filter =
-                                new FiltersList()
-                                   .GetFilter(Path.Combine(Path.GetDirectoryName(imageFilter.GetBasePath()),
+                                new FiltersList().
+                                    GetFilter(Path.Combine(Path.GetDirectoryName(imageFilter.GetBasePath()),
                                                            matchExtent.Groups["filename"].Value));
-                        else newExtent.Filter = imageFilter;
-                        uint.TryParse(matchExtent.Groups["offset"].Value,  out newExtent.Offset);
+                        else
+                            newExtent.Filter = imageFilter;
+
+                        uint.TryParse(matchExtent.Groups["offset"].Value, out newExtent.Offset);
                         uint.TryParse(matchExtent.Groups["sectors"].Value, out newExtent.Sectors);
                         newExtent.Type = matchExtent.Groups["type"].Value;
+
                         AaruConsole.DebugWriteLine("VMware plugin", "{0} {1} {2} \"{3}\" {4}", newExtent.Access,
-                                                  newExtent.Sectors, newExtent.Type, newExtent.Filename,
-                                                  newExtent.Offset);
+                                                   newExtent.Sectors, newExtent.Type, newExtent.Filename,
+                                                   newExtent.Offset);
 
                         extents.Add(currentSector, newExtent);
                         currentSector += newExtent.Sectors;
@@ -258,7 +270,8 @@ namespace Aaru.DiscImages
                 }
             }
 
-            if(extents.Count == 0) throw new Exception("Did not find any extent");
+            if(extents.Count == 0)
+                throw new Exception("Did not find any extent");
 
             switch(imageType)
             {
@@ -289,16 +302,23 @@ namespace Aaru.DiscImages
 
             foreach(VMwareExtent extent in extents.Values)
             {
-                if(extent.Filter == null) throw new Exception($"Extent file {extent.Filename} not found.");
+                if(extent.Filter == null)
+                    throw new Exception($"Extent file {extent.Filename} not found.");
 
-                if(extent.Access == "NOACCESS") throw new Exception("Cannot access NOACCESS extents ;).");
+                if(extent.Access == "NOACCESS")
+                    throw new Exception("Cannot access NOACCESS extents ;).");
 
-                if(extent.Type == "FLAT" || extent.Type == "ZERO" || extent.Type == "VMFS" || cowD) continue;
+                if(extent.Type == "FLAT" ||
+                   extent.Type == "ZERO" ||
+                   extent.Type == "VMFS" ||
+                   cowD)
+                    continue;
 
                 Stream extentStream = extent.Filter.GetDataForkStream();
                 extentStream.Seek(0, SeekOrigin.Begin);
 
-                if(extentStream.Length < SECTOR_SIZE) throw new Exception($"Extent {extent.Filename} is too small.");
+                if(extentStream.Length < SECTOR_SIZE)
+                    throw new Exception($"Extent {extent.Filename} is too small.");
 
                 byte[] extentHdrB = new byte[Marshal.SizeOf<VMwareExtentHeader>()];
                 extentStream.Read(extentHdrB, 0, Marshal.SizeOf<VMwareExtentHeader>());
@@ -325,7 +345,9 @@ namespace Aaru.DiscImages
                 oneNoFlat = true;
             }
 
-            if(oneNoFlat && !vmEHdrSet && !cowD)
+            if(oneNoFlat  &&
+               !vmEHdrSet &&
+               !cowD)
                 throw new
                     Exception("There are sparse extents but there is no header to find the grain tables, cannot proceed.");
 
@@ -338,25 +360,30 @@ namespace Aaru.DiscImages
 
             if(oneNoFlat && !cowD)
             {
-                AaruConsole.DebugWriteLine("VMware plugin", "vmEHdr.magic = 0x{0:X8}",       vmEHdr.magic);
-                AaruConsole.DebugWriteLine("VMware plugin", "vmEHdr.version = {0}",          vmEHdr.version);
-                AaruConsole.DebugWriteLine("VMware plugin", "vmEHdr.flags = 0x{0:X8}",       vmEHdr.flags);
-                AaruConsole.DebugWriteLine("VMware plugin", "vmEHdr.capacity = {0}",         vmEHdr.capacity);
-                AaruConsole.DebugWriteLine("VMware plugin", "vmEHdr.grainSize = {0}",        vmEHdr.grainSize);
+                AaruConsole.DebugWriteLine("VMware plugin", "vmEHdr.magic = 0x{0:X8}", vmEHdr.magic);
+                AaruConsole.DebugWriteLine("VMware plugin", "vmEHdr.version = {0}", vmEHdr.version);
+                AaruConsole.DebugWriteLine("VMware plugin", "vmEHdr.flags = 0x{0:X8}", vmEHdr.flags);
+                AaruConsole.DebugWriteLine("VMware plugin", "vmEHdr.capacity = {0}", vmEHdr.capacity);
+                AaruConsole.DebugWriteLine("VMware plugin", "vmEHdr.grainSize = {0}", vmEHdr.grainSize);
                 AaruConsole.DebugWriteLine("VMware plugin", "vmEHdr.descriptorOffset = {0}", vmEHdr.descriptorOffset);
-                AaruConsole.DebugWriteLine("VMware plugin", "vmEHdr.descriptorSize = {0}",   vmEHdr.descriptorSize);
-                AaruConsole.DebugWriteLine("VMware plugin", "vmEHdr.GTEsPerGT = {0}",        vmEHdr.GTEsPerGT);
-                AaruConsole.DebugWriteLine("VMware plugin", "vmEHdr.rgdOffset = {0}",        vmEHdr.rgdOffset);
-                AaruConsole.DebugWriteLine("VMware plugin", "vmEHdr.gdOffset = {0}",         vmEHdr.gdOffset);
-                AaruConsole.DebugWriteLine("VMware plugin", "vmEHdr.overhead = {0}",         vmEHdr.overhead);
-                AaruConsole.DebugWriteLine("VMware plugin", "vmEHdr.uncleanShutdown = {0}",  vmEHdr.uncleanShutdown);
+                AaruConsole.DebugWriteLine("VMware plugin", "vmEHdr.descriptorSize = {0}", vmEHdr.descriptorSize);
+                AaruConsole.DebugWriteLine("VMware plugin", "vmEHdr.GTEsPerGT = {0}", vmEHdr.GTEsPerGT);
+                AaruConsole.DebugWriteLine("VMware plugin", "vmEHdr.rgdOffset = {0}", vmEHdr.rgdOffset);
+                AaruConsole.DebugWriteLine("VMware plugin", "vmEHdr.gdOffset = {0}", vmEHdr.gdOffset);
+                AaruConsole.DebugWriteLine("VMware plugin", "vmEHdr.overhead = {0}", vmEHdr.overhead);
+                AaruConsole.DebugWriteLine("VMware plugin", "vmEHdr.uncleanShutdown = {0}", vmEHdr.uncleanShutdown);
+
                 AaruConsole.DebugWriteLine("VMware plugin", "vmEHdr.singleEndLineChar = 0x{0:X2}",
-                                          vmEHdr.singleEndLineChar);
+                                           vmEHdr.singleEndLineChar);
+
                 AaruConsole.DebugWriteLine("VMware plugin", "vmEHdr.nonEndLineChar = 0x{0:X2}", vmEHdr.nonEndLineChar);
+
                 AaruConsole.DebugWriteLine("VMware plugin", "vmEHdr.doubleEndLineChar1 = 0x{0:X2}",
-                                          vmEHdr.doubleEndLineChar1);
+                                           vmEHdr.doubleEndLineChar1);
+
                 AaruConsole.DebugWriteLine("VMware plugin", "vmEHdr.doubleEndLineChar2 = 0x{0:X2}",
-                                          vmEHdr.doubleEndLineChar2);
+                                           vmEHdr.doubleEndLineChar2);
+
                 AaruConsole.DebugWriteLine("VMware plugin", "vmEHdr.compression = 0x{0:X4}", vmEHdr.compression);
 
                 grainSize = vmEHdr.grainSize;
@@ -365,27 +392,29 @@ namespace Aaru.DiscImages
                 gtEsPerGt = vmEHdr.GTEsPerGT;
 
                 if((vmEHdr.flags & FLAGS_USE_REDUNDANT_TABLE) == FLAGS_USE_REDUNDANT_TABLE)
-                    gdOffset  = (long)vmEHdr.rgdOffset;
-                else gdOffset = (long)vmEHdr.gdOffset;
+                    gdOffset = (long)vmEHdr.rgdOffset;
+                else
+                    gdOffset = (long)vmEHdr.gdOffset;
             }
             else if(oneNoFlat && cowD)
             {
-                AaruConsole.DebugWriteLine("VMware plugin", "vmCHdr.magic = 0x{0:X8}",   vmCHdr.magic);
-                AaruConsole.DebugWriteLine("VMware plugin", "vmCHdr.version = {0}",      vmCHdr.version);
-                AaruConsole.DebugWriteLine("VMware plugin", "vmCHdr.flags = 0x{0:X8}",   vmCHdr.flags);
-                AaruConsole.DebugWriteLine("VMware plugin", "vmCHdr.sectors = {0}",      vmCHdr.sectors);
-                AaruConsole.DebugWriteLine("VMware plugin", "vmCHdr.grainSize = {0}",    vmCHdr.grainSize);
-                AaruConsole.DebugWriteLine("VMware plugin", "vmCHdr.gdOffset = {0}",     vmCHdr.gdOffset);
+                AaruConsole.DebugWriteLine("VMware plugin", "vmCHdr.magic = 0x{0:X8}", vmCHdr.magic);
+                AaruConsole.DebugWriteLine("VMware plugin", "vmCHdr.version = {0}", vmCHdr.version);
+                AaruConsole.DebugWriteLine("VMware plugin", "vmCHdr.flags = 0x{0:X8}", vmCHdr.flags);
+                AaruConsole.DebugWriteLine("VMware plugin", "vmCHdr.sectors = {0}", vmCHdr.sectors);
+                AaruConsole.DebugWriteLine("VMware plugin", "vmCHdr.grainSize = {0}", vmCHdr.grainSize);
+                AaruConsole.DebugWriteLine("VMware plugin", "vmCHdr.gdOffset = {0}", vmCHdr.gdOffset);
                 AaruConsole.DebugWriteLine("VMware plugin", "vmCHdr.numGDEntries = {0}", vmCHdr.numGDEntries);
-                AaruConsole.DebugWriteLine("VMware plugin", "vmCHdr.freeSector = {0}",   vmCHdr.freeSector);
-                AaruConsole.DebugWriteLine("VMware plugin", "vmCHdr.cylinders = {0}",    vmCHdr.cylinders);
-                AaruConsole.DebugWriteLine("VMware plugin", "vmCHdr.heads = {0}",        vmCHdr.heads);
-                AaruConsole.DebugWriteLine("VMware plugin", "vmCHdr.spt = {0}",          vmCHdr.spt);
-                AaruConsole.DebugWriteLine("VMware plugin", "vmCHdr.generation = {0}",   vmCHdr.generation);
-                AaruConsole.DebugWriteLine("VMware plugin", "vmCHdr.name = {0}",
-                                          StringHandlers.CToString(vmCHdr.name));
+                AaruConsole.DebugWriteLine("VMware plugin", "vmCHdr.freeSector = {0}", vmCHdr.freeSector);
+                AaruConsole.DebugWriteLine("VMware plugin", "vmCHdr.cylinders = {0}", vmCHdr.cylinders);
+                AaruConsole.DebugWriteLine("VMware plugin", "vmCHdr.heads = {0}", vmCHdr.heads);
+                AaruConsole.DebugWriteLine("VMware plugin", "vmCHdr.spt = {0}", vmCHdr.spt);
+                AaruConsole.DebugWriteLine("VMware plugin", "vmCHdr.generation = {0}", vmCHdr.generation);
+                AaruConsole.DebugWriteLine("VMware plugin", "vmCHdr.name = {0}", StringHandlers.CToString(vmCHdr.name));
+
                 AaruConsole.DebugWriteLine("VMware plugin", "vmCHdr.description = {0}",
-                                          StringHandlers.CToString(vmCHdr.description));
+                                           StringHandlers.CToString(vmCHdr.description));
+
                 AaruConsole.DebugWriteLine("VMware plugin", "vmCHdr.savedGeneration = {0}", vmCHdr.savedGeneration);
                 AaruConsole.DebugWriteLine("VMware plugin", "vmCHdr.uncleanShutdown = {0}", vmCHdr.uncleanShutdown);
 
@@ -401,10 +430,12 @@ namespace Aaru.DiscImages
 
             if(oneNoFlat)
             {
-                if(grains == 0 || gdEntries == 0) throw new Exception("Some error ocurred setting GD sizes");
+                if(grains    == 0 ||
+                   gdEntries == 0)
+                    throw new Exception("Some error ocurred setting GD sizes");
 
-                AaruConsole.DebugWriteLine("VMware plugin", "{0} sectors in {1} grains in {2} tables", imageInfo.Sectors,
-                                          grains, gdEntries);
+                AaruConsole.DebugWriteLine("VMware plugin", "{0} sectors in {1} grains in {2} tables",
+                                           imageInfo.Sectors, grains, gdEntries);
 
                 Stream gdStream = gdFilter.GetDataForkStream();
 
@@ -418,6 +449,7 @@ namespace Aaru.DiscImages
                 AaruConsole.DebugWriteLine("VMware plugin", "Reading grain tables");
                 uint currentGrain = 0;
                 gTable = new uint[grains];
+
                 foreach(uint gtOff in gd)
                 {
                     byte[] gtBytes = new byte[gtEsPerGt * 4];
@@ -447,11 +479,14 @@ namespace Aaru.DiscImages
             {
                 IFilter parentFilter =
                     new FiltersList().GetFilter(Path.Combine(imageFilter.GetParentFolder(), parentName));
-                if(parentFilter == null) throw new Exception($"Cannot find parent \"{parentName}\".");
+
+                if(parentFilter == null)
+                    throw new Exception($"Cannot find parent \"{parentName}\".");
 
                 parentImage = new VMware();
 
-                if(!parentImage.Open(parentFilter)) throw new Exception($"Cannot open parent \"{parentName}\".");
+                if(!parentImage.Open(parentFilter))
+                    throw new Exception($"Cannot open parent \"{parentName}\".");
             }
 
             sectorCache = new Dictionary<ulong, byte[]>();
@@ -463,6 +498,7 @@ namespace Aaru.DiscImages
             imageInfo.XmlMediaType         = XmlMediaType.BlockMedia;
             imageInfo.MediaType            = MediaType.GENERIC_HDD;
             imageInfo.ImageSize            = imageInfo.Sectors * SECTOR_SIZE;
+
             // VMDK version 1 started on VMware 4, so there is a previous version, "COWD"
             imageInfo.Version = cowD ? $"{version}" : $"{version + 3}";
 
@@ -472,7 +508,9 @@ namespace Aaru.DiscImages
                 imageInfo.Heads           = vmCHdr.heads;
                 imageInfo.SectorsPerTrack = vmCHdr.spt;
             }
-            else if(!matchedCyls || !matchedHds || !matchedSpt)
+            else if(!matchedCyls ||
+                    !matchedHds  ||
+                    !matchedSpt)
             {
                 imageInfo.Cylinders       = (uint)(imageInfo.Sectors / 16 / 63);
                 imageInfo.Heads           = 16;
@@ -488,11 +526,12 @@ namespace Aaru.DiscImages
                 throw new ArgumentOutOfRangeException(nameof(sectorAddress),
                                                       $"Sector address {sectorAddress} not found");
 
-            if(sectorCache.TryGetValue(sectorAddress, out byte[] sector)) return sector;
+            if(sectorCache.TryGetValue(sectorAddress, out byte[] sector))
+                return sector;
 
-            VMwareExtent currentExtent     = new VMwareExtent();
-            bool         extentFound       = false;
-            ulong        extentStartSector = 0;
+            var   currentExtent     = new VMwareExtent();
+            bool  extentFound       = false;
+            ulong extentStartSector = 0;
 
             foreach(KeyValuePair<ulong, VMwareExtent> kvp in extents.Where(kvp => sectorAddress >= kvp.Key))
             {
@@ -512,38 +551,48 @@ namespace Aaru.DiscImages
                 case "ZERO":
                     sector = new byte[SECTOR_SIZE];
 
-                    if(sectorCache.Count >= MAX_CACHED_SECTORS) sectorCache.Clear();
+                    if(sectorCache.Count >= MAX_CACHED_SECTORS)
+                        sectorCache.Clear();
 
                     sectorCache.Add(sectorAddress, sector);
+
                     return sector;
                 case "FLAT":
                 case "VMFS":
                     dataStream = currentExtent.Filter.GetDataForkStream();
+
                     dataStream.Seek((long)((currentExtent.Offset + (sectorAddress - extentStartSector)) * SECTOR_SIZE),
                                     SeekOrigin.Begin);
+
                     sector = new byte[SECTOR_SIZE];
                     dataStream.Read(sector, 0, sector.Length);
 
-                    if(sectorCache.Count >= MAX_CACHED_SECTORS) sectorCache.Clear();
+                    if(sectorCache.Count >= MAX_CACHED_SECTORS)
+                        sectorCache.Clear();
 
                     sectorCache.Add(sectorAddress, sector);
+
                     return sector;
             }
 
-            ulong index  = sectorAddress             / grainSize;
-            ulong secOff = sectorAddress % grainSize * SECTOR_SIZE;
+            ulong index  = sectorAddress               / grainSize;
+            ulong secOff = (sectorAddress % grainSize) * SECTOR_SIZE;
 
             uint grainOff = gTable[index];
 
-            if(grainOff == 0 && hasParent) return parentImage.ReadSector(sectorAddress);
+            if(grainOff == 0 && hasParent)
+                return parentImage.ReadSector(sectorAddress);
 
-            if(grainOff == 0 || grainOff == 1)
+            if(grainOff == 0 ||
+               grainOff == 1)
             {
                 sector = new byte[SECTOR_SIZE];
 
-                if(sectorCache.Count >= MAX_CACHED_SECTORS) sectorCache.Clear();
+                if(sectorCache.Count >= MAX_CACHED_SECTORS)
+                    sectorCache.Clear();
 
                 sectorCache.Add(sectorAddress, sector);
+
                 return sector;
             }
 
@@ -554,7 +603,8 @@ namespace Aaru.DiscImages
                 dataStream.Seek((long)((grainOff - extentStartSector) * SECTOR_SIZE), SeekOrigin.Begin);
                 dataStream.Read(grain, 0, grain.Length);
 
-                if(grainCache.Count >= maxCachedGrains) grainCache.Clear();
+                if(grainCache.Count >= maxCachedGrains)
+                    grainCache.Clear();
 
                 grainCache.Add(grainOff, grain);
             }
@@ -562,7 +612,8 @@ namespace Aaru.DiscImages
             sector = new byte[SECTOR_SIZE];
             Array.Copy(grain, (int)secOff, sector, 0, SECTOR_SIZE);
 
-            if(sectorCache.Count > MAX_CACHED_SECTORS) sectorCache.Clear();
+            if(sectorCache.Count > MAX_CACHED_SECTORS)
+                sectorCache.Clear();
 
             sectorCache.Add(sectorAddress, sector);
 
@@ -578,7 +629,7 @@ namespace Aaru.DiscImages
             if(sectorAddress + length > imageInfo.Sectors)
                 throw new ArgumentOutOfRangeException(nameof(length), "Requested more sectors than available");
 
-            MemoryStream ms = new MemoryStream();
+            var ms = new MemoryStream();
 
             for(uint i = 0; i < length; i++)
             {
diff --git a/Aaru.Images/VMware/Structs.cs b/Aaru.Images/VMware/Structs.cs
index 249886b7e..f33cf5aa6 100644
--- a/Aaru.Images/VMware/Structs.cs
+++ b/Aaru.Images/VMware/Structs.cs
@@ -40,58 +40,59 @@ namespace Aaru.DiscImages
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct VMwareExtentHeader
         {
-            public uint  magic;
-            public uint  version;
-            public uint  flags;
-            public ulong capacity;
-            public ulong grainSize;
-            public ulong descriptorOffset;
-            public ulong descriptorSize;
-            public uint  GTEsPerGT;
-            public ulong rgdOffset;
-            public ulong gdOffset;
-            public ulong overhead;
+            public readonly uint  magic;
+            public readonly uint  version;
+            public readonly uint  flags;
+            public readonly ulong capacity;
+            public readonly ulong grainSize;
+            public readonly ulong descriptorOffset;
+            public readonly ulong descriptorSize;
+            public readonly uint  GTEsPerGT;
+            public readonly ulong rgdOffset;
+            public readonly ulong gdOffset;
+            public readonly ulong overhead;
             [MarshalAs(UnmanagedType.U1)]
-            public bool uncleanShutdown;
-            public byte   singleEndLineChar;
-            public byte   nonEndLineChar;
-            public byte   doubleEndLineChar1;
-            public byte   doubleEndLineChar2;
-            public ushort compression;
+            public readonly bool uncleanShutdown;
+            public readonly byte   singleEndLineChar;
+            public readonly byte   nonEndLineChar;
+            public readonly byte   doubleEndLineChar1;
+            public readonly byte   doubleEndLineChar2;
+            public readonly ushort compression;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 433)]
-            public byte[] padding;
+            public readonly byte[] padding;
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct VMwareCowHeader
         {
-            public uint magic;
-            public uint version;
-            public uint flags;
-            public uint sectors;
-            public uint grainSize;
-            public uint gdOffset;
-            public uint numGDEntries;
-            public uint freeSector;
-            public uint cylinders;
-            public uint heads;
-            public uint spt;
+            public readonly uint magic;
+            public readonly uint version;
+            public readonly uint flags;
+            public readonly uint sectors;
+            public readonly uint grainSize;
+            public readonly uint gdOffset;
+            public readonly uint numGDEntries;
+            public readonly uint freeSector;
+            public readonly uint cylinders;
+            public readonly uint heads;
+            public readonly uint spt;
+
             // It stats on cylinders, above, but, don't care
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 1024 - 12)]
-            public byte[] parentFileName;
-            public uint parentGeneration;
-            public uint generation;
+            public readonly byte[] parentFileName;
+            public readonly uint parentGeneration;
+            public readonly uint generation;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 60)]
-            public byte[] name;
+            public readonly byte[] name;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 512)]
-            public byte[] description;
-            public uint savedGeneration;
+            public readonly byte[] description;
+            public readonly uint savedGeneration;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public byte[] reserved;
+            public readonly byte[] reserved;
             [MarshalAs(UnmanagedType.U1)]
-            public bool uncleanShutdown;
+            public readonly bool uncleanShutdown;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 396)]
-            public byte[] padding;
+            public readonly byte[] padding;
         }
 
         struct VMwareExtent
diff --git a/Aaru.Images/VMware/VMware.cs b/Aaru.Images/VMware/VMware.cs
index 075ba3524..3b2aa24cb 100644
--- a/Aaru.Images/VMware/VMware.cs
+++ b/Aaru.Images/VMware/VMware.cs
@@ -63,31 +63,18 @@ namespace Aaru.DiscImages
         string                          writingBaseName;
         FileStream                      writingStream;
 
-        public VMware()
+        public VMware() => imageInfo = new ImageInfo
         {
-            imageInfo = new ImageInfo
-            {
-                ReadableSectorTags    = new List<SectorTagType>(),
-                ReadableMediaTags     = new List<MediaTagType>(),
-                HasPartitions         = false,
-                HasSessions           = false,
-                Version               = null,
-                Application           = "VMware",
-                ApplicationVersion    = null,
-                Creator               = null,
-                Comments              = null,
-                MediaManufacturer     = null,
-                MediaModel            = null,
-                MediaSerialNumber     = null,
-                MediaBarcode          = null,
-                MediaPartNumber       = null,
-                MediaSequence         = 0,
-                LastMediaSequence     = 0,
-                DriveManufacturer     = null,
-                DriveModel            = null,
-                DriveSerialNumber     = null,
-                DriveFirmwareRevision = null
-            };
-        }
+            ReadableSectorTags = new List<SectorTagType>(), ReadableMediaTags = new List<MediaTagType>(),
+            HasPartitions      = false, HasSessions                           = false, Version = null,
+            Application        = "VMware",
+            ApplicationVersion = null, Creator = null, Comments = null,
+            MediaManufacturer  = null,
+            MediaModel         = null, MediaSerialNumber = null, MediaBarcode = null,
+            MediaPartNumber    = null,
+            MediaSequence      = 0, LastMediaSequence = 0, DriveManufacturer = null,
+            DriveModel         = null,
+            DriveSerialNumber  = null, DriveFirmwareRevision = null
+        };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/VMware/Write.cs b/Aaru.Images/VMware/Write.cs
index 70bff9ba2..0fea18bfa 100644
--- a/Aaru.Images/VMware/Write.cs
+++ b/Aaru.Images/VMware/Write.cs
@@ -45,7 +45,7 @@ namespace Aaru.DiscImages
     public partial class VMware
     {
         public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
-                           uint   sectorSize)
+                           uint sectorSize)
         {
             if(options != null)
             {
@@ -56,37 +56,45 @@ namespace Aaru.DiscImages
                         case "lsilogic":
                         case "buslogic":
                             adapter_type = adapter_type.ToLowerInvariant();
+
                             break;
                         case "legacyesx":
                             adapter_type = "legacyESX";
+
                             break;
                         default:
                             ErrorMessage = $"Invalid adapter type {adapter_type}";
+
                             return false;
                     }
-                else adapter_type = "ide";
+                else
+                    adapter_type = "ide";
 
                 if(options.TryGetValue("hwversion", out string tmpValue))
                 {
                     if(!uint.TryParse(tmpValue, out hwversion))
                     {
                         ErrorMessage = "Invalid value for hwversion option";
+
                         return false;
                     }
                 }
-                else hwversion = 4;
+                else
+                    hwversion = 4;
 
                 if(options.TryGetValue("split", out tmpValue))
                 {
                     if(!bool.TryParse(tmpValue, out bool tmpBool))
                     {
                         ErrorMessage = "Invalid value for split option";
+
                         return false;
                     }
 
                     if(tmpBool)
                     {
                         ErrorMessage = "Splitted images not yet implemented";
+
                         return false;
                     }
                 }
@@ -96,12 +104,14 @@ namespace Aaru.DiscImages
                     if(!bool.TryParse(tmpValue, out bool tmpBool))
                     {
                         ErrorMessage = "Invalid value for sparse option";
+
                         return false;
                     }
 
                     if(tmpBool)
                     {
                         ErrorMessage = "Sparse images not yet implemented";
+
                         return false;
                     }
                 }
@@ -115,21 +125,27 @@ namespace Aaru.DiscImages
             if(sectorSize != 512)
             {
                 ErrorMessage = "Unsupported sector size";
+
                 return false;
             }
 
             if(!SupportedMediaTypes.Contains(mediaType))
             {
                 ErrorMessage = $"Unsupport media format {mediaType}";
+
                 return false;
             }
 
-            imageInfo = new ImageInfo {MediaType = mediaType, SectorSize = sectorSize, Sectors = sectors};
+            imageInfo = new ImageInfo
+            {
+                MediaType = mediaType, SectorSize = sectorSize, Sectors = sectors
+            };
 
             try
             {
                 writingBaseName  = Path.Combine(Path.GetDirectoryName(path), Path.GetFileNameWithoutExtension(path));
                 descriptorStream = new StreamWriter(path, false, Encoding.ASCII);
+
                 // TODO: Support split
                 writingStream = new FileStream(writingBaseName + "-flat.vmdk", FileMode.OpenOrCreate,
                                                FileAccess.ReadWrite, FileShare.None);
@@ -137,17 +153,20 @@ namespace Aaru.DiscImages
             catch(IOException e)
             {
                 ErrorMessage = $"Could not create new image file, exception {e.Message}";
+
                 return false;
             }
 
             IsWriting    = true;
             ErrorMessage = null;
+
             return true;
         }
 
         public bool WriteMediaTag(byte[] data, MediaTagType tag)
         {
             ErrorMessage = "Writing media tags is not supported.";
+
             return false;
         }
 
@@ -156,18 +175,21 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Tried to write on a non-writable image";
+
                 return false;
             }
 
             if(data.Length != 512)
             {
                 ErrorMessage = "Incorrect data size";
+
                 return false;
             }
 
             if(sectorAddress >= imageInfo.Sectors)
             {
                 ErrorMessage = "Tried to write past image size";
+
                 return false;
             }
 
@@ -175,6 +197,7 @@ namespace Aaru.DiscImages
             writingStream.Write(data, 0, data.Length);
 
             ErrorMessage = "";
+
             return true;
         }
 
@@ -184,18 +207,21 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Tried to write on a non-writable image";
+
                 return false;
             }
 
             if(data.Length % 512 != 0)
             {
                 ErrorMessage = "Incorrect data size";
+
                 return false;
             }
 
             if(sectorAddress + length > imageInfo.Sectors)
             {
                 ErrorMessage = "Tried to write past image size";
+
                 return false;
             }
 
@@ -203,18 +229,21 @@ namespace Aaru.DiscImages
             writingStream.Write(data, 0, data.Length);
 
             ErrorMessage = "";
+
             return true;
         }
 
         public bool WriteSectorLong(byte[] data, ulong sectorAddress)
         {
             ErrorMessage = "Writing sectors with tags is not supported.";
+
             return false;
         }
 
         public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
         {
             ErrorMessage = "Writing sectors with tags is not supported.";
+
             return false;
         }
 
@@ -224,6 +253,7 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Image is not opened for writing";
+
                 return false;
             }
 
@@ -248,7 +278,10 @@ namespace Aaru.DiscImages
 
                     imageInfo.Cylinders = (uint)(imageInfo.Sectors / imageInfo.Heads / imageInfo.SectorsPerTrack);
 
-                    if(imageInfo.Cylinders == 0 && imageInfo.Heads == 0 && imageInfo.SectorsPerTrack == 0) break;
+                    if(imageInfo.Cylinders       == 0 &&
+                       imageInfo.Heads           == 0 &&
+                       imageInfo.SectorsPerTrack == 0)
+                        break;
                 }
             }
 
@@ -275,6 +308,7 @@ namespace Aaru.DiscImages
 
             IsWriting    = false;
             ErrorMessage = "";
+
             return true;
         }
 
@@ -285,18 +319,21 @@ namespace Aaru.DiscImages
             if(cylinders > ushort.MaxValue)
             {
                 ErrorMessage = "Too many cylinders.";
+
                 return false;
             }
 
             if(heads > byte.MaxValue)
             {
                 ErrorMessage = "Too many heads.";
+
                 return false;
             }
 
             if(sectorsPerTrack > byte.MaxValue)
             {
                 ErrorMessage = "Too many sectors per track.";
+
                 return false;
             }
 
@@ -310,12 +347,14 @@ namespace Aaru.DiscImages
         public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
         {
             ErrorMessage = "Unsupported feature";
+
             return false;
         }
 
         public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
         {
             ErrorMessage = "Unsupported feature";
+
             return false;
         }
 
diff --git a/Aaru.Images/Virtual98/Constants.cs b/Aaru.Images/Virtual98/Constants.cs
index 9be053415..8ab946db0 100644
--- a/Aaru.Images/Virtual98/Constants.cs
+++ b/Aaru.Images/Virtual98/Constants.cs
@@ -34,6 +34,9 @@ namespace Aaru.DiscImages
 {
     public partial class Virtual98
     {
-        readonly byte[] signature = {0x56, 0x48, 0x44, 0x31, 0x2E, 0x30, 0x30, 0x00};
+        readonly byte[] signature =
+        {
+            0x56, 0x48, 0x44, 0x31, 0x2E, 0x30, 0x30, 0x00
+        };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/Virtual98/Identify.cs b/Aaru.Images/Virtual98/Identify.cs
index 42cc9ab9c..e7aec460f 100644
--- a/Aaru.Images/Virtual98/Identify.cs
+++ b/Aaru.Images/Virtual98/Identify.cs
@@ -45,29 +45,34 @@ namespace Aaru.DiscImages
         {
             Stream stream = imageFilter.GetDataForkStream();
             stream.Seek(0, SeekOrigin.Begin);
-            // Even if comment is supposedly ASCII, I'm pretty sure most emulators allow Shift-JIS to be used :p
-            Encoding shiftjis = Encoding.GetEncoding("shift_jis");
 
-            if(stream.Length < Marshal.SizeOf<Virtual98Header>()) return false;
+            // Even if comment is supposedly ASCII, I'm pretty sure most emulators allow Shift-JIS to be used :p
+            var shiftjis = Encoding.GetEncoding("shift_jis");
+
+            if(stream.Length < Marshal.SizeOf<Virtual98Header>())
+                return false;
 
             byte[] hdrB = new byte[Marshal.SizeOf<Virtual98Header>()];
             stream.Read(hdrB, 0, hdrB.Length);
 
             v98Hdr = Marshal.ByteArrayToStructureLittleEndian<Virtual98Header>(hdrB);
 
-            if(!v98Hdr.signature.SequenceEqual(signature)) return false;
+            if(!v98Hdr.signature.SequenceEqual(signature))
+                return false;
 
             AaruConsole.DebugWriteLine("Virtual98 plugin", "v98hdr.signature = \"{0}\"",
-                                      StringHandlers.CToString(v98Hdr.signature, shiftjis));
+                                       StringHandlers.CToString(v98Hdr.signature, shiftjis));
+
             AaruConsole.DebugWriteLine("Virtual98 plugin", "v98hdr.comment = \"{0}\"",
-                                      StringHandlers.CToString(v98Hdr.comment, shiftjis));
-            AaruConsole.DebugWriteLine("Virtual98 plugin", "v98hdr.padding = {0}",    v98Hdr.padding);
-            AaruConsole.DebugWriteLine("Virtual98 plugin", "v98hdr.mbsize = {0}",     v98Hdr.mbsize);
+                                       StringHandlers.CToString(v98Hdr.comment, shiftjis));
+
+            AaruConsole.DebugWriteLine("Virtual98 plugin", "v98hdr.padding = {0}", v98Hdr.padding);
+            AaruConsole.DebugWriteLine("Virtual98 plugin", "v98hdr.mbsize = {0}", v98Hdr.mbsize);
             AaruConsole.DebugWriteLine("Virtual98 plugin", "v98hdr.sectorsize = {0}", v98Hdr.sectorsize);
-            AaruConsole.DebugWriteLine("Virtual98 plugin", "v98hdr.sectors = {0}",    v98Hdr.sectors);
-            AaruConsole.DebugWriteLine("Virtual98 plugin", "v98hdr.surfaces = {0}",   v98Hdr.surfaces);
-            AaruConsole.DebugWriteLine("Virtual98 plugin", "v98hdr.cylinders = {0}",  v98Hdr.cylinders);
-            AaruConsole.DebugWriteLine("Virtual98 plugin", "v98hdr.totals = {0}",     v98Hdr.totals);
+            AaruConsole.DebugWriteLine("Virtual98 plugin", "v98hdr.sectors = {0}", v98Hdr.sectors);
+            AaruConsole.DebugWriteLine("Virtual98 plugin", "v98hdr.surfaces = {0}", v98Hdr.surfaces);
+            AaruConsole.DebugWriteLine("Virtual98 plugin", "v98hdr.cylinders = {0}", v98Hdr.cylinders);
+            AaruConsole.DebugWriteLine("Virtual98 plugin", "v98hdr.totals = {0}", v98Hdr.totals);
 
             return true;
         }
diff --git a/Aaru.Images/Virtual98/Properties.cs b/Aaru.Images/Virtual98/Properties.cs
index ac96ec539..1a3bad9cd 100644
--- a/Aaru.Images/Virtual98/Properties.cs
+++ b/Aaru.Images/Virtual98/Properties.cs
@@ -41,26 +41,31 @@ namespace Aaru.DiscImages
 {
     public partial class Virtual98
     {
-        public ImageInfo                  Info                => imageInfo;
-        public string                     Name                => "Virtual98 Disk Image";
-        public Guid                       Id                  => new Guid("C0CDE13D-04D0-4913-8740-AFAA44D0A107");
-        public string                     Author              => "Natalia Portillo";
-        public string                     Format              => "Virtual98 disk image";
-        public List<DumpHardwareType>     DumpHardware        => null;
-        public CICMMetadataType           CicmMetadata        => null;
-        public IEnumerable<MediaTagType>  SupportedMediaTags  => new MediaTagType[] { };
-        public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[] { };
-        public IEnumerable<MediaType> SupportedMediaTypes =>
-            new[]
-            {
-                MediaType.GENERIC_HDD, MediaType.Unknown, MediaType.FlashDrive, MediaType.CompactFlash,
-                MediaType.CompactFlashType2, MediaType.PCCardTypeI, MediaType.PCCardTypeII, MediaType.PCCardTypeIII,
-                MediaType.PCCardTypeIV
-            };
+        public ImageInfo              Info         => imageInfo;
+        public string                 Name         => "Virtual98 Disk Image";
+        public Guid                   Id           => new Guid("C0CDE13D-04D0-4913-8740-AFAA44D0A107");
+        public string                 Author       => "Natalia Portillo";
+        public string                 Format       => "Virtual98 disk image";
+        public List<DumpHardwareType> DumpHardware => null;
+        public CICMMetadataType       CicmMetadata => null;
+        public IEnumerable<MediaTagType> SupportedMediaTags => new MediaTagType[]
+            {};
+        public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[]
+            {};
+        public IEnumerable<MediaType> SupportedMediaTypes => new[]
+        {
+            MediaType.GENERIC_HDD, MediaType.Unknown, MediaType.FlashDrive, MediaType.CompactFlash,
+            MediaType.CompactFlashType2, MediaType.PCCardTypeI, MediaType.PCCardTypeII, MediaType.PCCardTypeIII,
+            MediaType.PCCardTypeIV
+        };
         public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
-            new (string name, Type type, string description, object @default)[] { };
-        public IEnumerable<string> KnownExtensions => new[] {".v98"};
-        public bool                IsWriting       { get; private set; }
-        public string              ErrorMessage    { get; private set; }
+            new (string name, Type type, string description, object @default)[]
+                {};
+        public IEnumerable<string> KnownExtensions => new[]
+        {
+            ".v98"
+        };
+        public bool   IsWriting    { get; private set; }
+        public string ErrorMessage { get; private set; }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/Virtual98/Read.cs b/Aaru.Images/Virtual98/Read.cs
index 0c11d0417..107c2e46d 100644
--- a/Aaru.Images/Virtual98/Read.cs
+++ b/Aaru.Images/Virtual98/Read.cs
@@ -46,10 +46,12 @@ namespace Aaru.DiscImages
         {
             Stream stream = imageFilter.GetDataForkStream();
             stream.Seek(0, SeekOrigin.Begin);
-            // Even if comment is supposedly ASCII, I'm pretty sure most emulators allow Shift-JIS to be used :p
-            Encoding shiftjis = Encoding.GetEncoding("shift_jis");
 
-            if(stream.Length < Marshal.SizeOf<Virtual98Header>()) return false;
+            // Even if comment is supposedly ASCII, I'm pretty sure most emulators allow Shift-JIS to be used :p
+            var shiftjis = Encoding.GetEncoding("shift_jis");
+
+            if(stream.Length < Marshal.SizeOf<Virtual98Header>())
+                return false;
 
             byte[] hdrB = new byte[Marshal.SizeOf<Virtual98Header>()];
             stream.Read(hdrB, 0, hdrB.Length);
@@ -90,13 +92,15 @@ namespace Aaru.DiscImages
             Stream stream = nhdImageFilter.GetDataForkStream();
 
             // V98 are lazy allocated
-            if((long)(0xDC + sectorAddress * imageInfo.SectorSize) >= stream.Length) return buffer;
+            if((long)(0xDC + (sectorAddress * imageInfo.SectorSize)) >= stream.Length)
+                return buffer;
 
-            stream.Seek((long)(0xDC + sectorAddress * imageInfo.SectorSize), SeekOrigin.Begin);
+            stream.Seek((long)(0xDC + (sectorAddress * imageInfo.SectorSize)), SeekOrigin.Begin);
 
             int toRead = (int)(length * imageInfo.SectorSize);
 
-            if(toRead + stream.Position > stream.Length) toRead = (int)(stream.Length - stream.Position);
+            if(toRead + stream.Position > stream.Length)
+                toRead = (int)(stream.Length - stream.Position);
 
             stream.Read(buffer, 0, toRead);
 
diff --git a/Aaru.Images/Virtual98/Structs.cs b/Aaru.Images/Virtual98/Structs.cs
index 46e19ec45..6ab20d236 100644
--- a/Aaru.Images/Virtual98/Structs.cs
+++ b/Aaru.Images/Virtual98/Structs.cs
@@ -43,13 +43,13 @@ namespace Aaru.DiscImages
             public byte[] signature;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 128)]
             public byte[] comment;
-            public uint   padding;
-            public ushort mbsize;
-            public ushort sectorsize;
-            public byte   sectors;
-            public byte   surfaces;
-            public ushort cylinders;
-            public uint   totals;
+            public readonly uint   padding;
+            public readonly ushort mbsize;
+            public          ushort sectorsize;
+            public          byte   sectors;
+            public          byte   surfaces;
+            public          ushort cylinders;
+            public          uint   totals;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 0x44)]
             public byte[] padding2;
         }
diff --git a/Aaru.Images/Virtual98/Virtual98.cs b/Aaru.Images/Virtual98/Virtual98.cs
index fa8889450..0b6c02e5e 100644
--- a/Aaru.Images/Virtual98/Virtual98.cs
+++ b/Aaru.Images/Virtual98/Virtual98.cs
@@ -46,31 +46,18 @@ namespace Aaru.DiscImages
         Virtual98Header v98Hdr;
         FileStream      writingStream;
 
-        public Virtual98()
+        public Virtual98() => imageInfo = new ImageInfo
         {
-            imageInfo = new ImageInfo
-            {
-                ReadableSectorTags    = new List<SectorTagType>(),
-                ReadableMediaTags     = new List<MediaTagType>(),
-                HasPartitions         = false,
-                HasSessions           = false,
-                Version               = null,
-                Application           = null,
-                ApplicationVersion    = null,
-                Creator               = null,
-                Comments              = null,
-                MediaManufacturer     = null,
-                MediaModel            = null,
-                MediaSerialNumber     = null,
-                MediaBarcode          = null,
-                MediaPartNumber       = null,
-                MediaSequence         = 0,
-                LastMediaSequence     = 0,
-                DriveManufacturer     = null,
-                DriveModel            = null,
-                DriveSerialNumber     = null,
-                DriveFirmwareRevision = null
-            };
-        }
+            ReadableSectorTags = new List<SectorTagType>(), ReadableMediaTags = new List<MediaTagType>(),
+            HasPartitions      = false, HasSessions                           = false, Version = null,
+            Application        = null,
+            ApplicationVersion = null, Creator = null, Comments = null,
+            MediaManufacturer  = null,
+            MediaModel         = null, MediaSerialNumber = null, MediaBarcode = null,
+            MediaPartNumber    = null,
+            MediaSequence      = 0, LastMediaSequence = 0, DriveManufacturer = null,
+            DriveModel         = null,
+            DriveSerialNumber  = null, DriveFirmwareRevision = null
+        };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/Virtual98/Write.cs b/Aaru.Images/Virtual98/Write.cs
index a51907616..d815a6cca 100644
--- a/Aaru.Images/Virtual98/Write.cs
+++ b/Aaru.Images/Virtual98/Write.cs
@@ -46,43 +46,55 @@ namespace Aaru.DiscImages
     public partial class Virtual98
     {
         public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
-                           uint   sectorSize)
+                           uint sectorSize)
         {
             if(sectorSize != 512)
             {
                 ErrorMessage = "Unsupported sector size";
+
                 return false;
             }
 
             if(sectors > uint.MaxValue)
             {
                 ErrorMessage = "Too many sectors";
+
                 return false;
             }
 
             if(!SupportedMediaTypes.Contains(mediaType))
             {
                 ErrorMessage = $"Unsupport media format {mediaType}";
+
                 return false;
             }
 
-            imageInfo = new ImageInfo {MediaType = mediaType, SectorSize = sectorSize, Sectors = sectors};
+            imageInfo = new ImageInfo
+            {
+                MediaType = mediaType, SectorSize = sectorSize, Sectors = sectors
+            };
 
-            try { writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None); }
+            try
+            {
+                writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
+            }
             catch(IOException e)
             {
                 ErrorMessage = $"Could not create new image file, exception {e.Message}";
+
                 return false;
             }
 
             IsWriting    = true;
             ErrorMessage = null;
+
             return true;
         }
 
         public bool WriteMediaTag(byte[] data, MediaTagType tag)
         {
             ErrorMessage = "Writing media tags is not supported.";
+
             return false;
         }
 
@@ -91,25 +103,29 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Tried to write on a non-writable image";
+
                 return false;
             }
 
             if(data.Length != 512)
             {
                 ErrorMessage = "Incorrect data size";
+
                 return false;
             }
 
             if(sectorAddress >= imageInfo.Sectors)
             {
                 ErrorMessage = "Tried to write past image size";
+
                 return false;
             }
 
-            writingStream.Seek((long)(0xDC + sectorAddress * 512), SeekOrigin.Begin);
+            writingStream.Seek((long)(0xDC + (sectorAddress * 512)), SeekOrigin.Begin);
             writingStream.Write(data, 0, data.Length);
 
             ErrorMessage = "";
+
             return true;
         }
 
@@ -118,37 +134,43 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Tried to write on a non-writable image";
+
                 return false;
             }
 
             if(data.Length % 512 != 0)
             {
                 ErrorMessage = "Incorrect data size";
+
                 return false;
             }
 
             if(sectorAddress + length > imageInfo.Sectors)
             {
                 ErrorMessage = "Tried to write past image size";
+
                 return false;
             }
 
-            writingStream.Seek((long)(0xDC + sectorAddress * 512), SeekOrigin.Begin);
+            writingStream.Seek((long)(0xDC + (sectorAddress * 512)), SeekOrigin.Begin);
             writingStream.Write(data, 0, data.Length);
 
             ErrorMessage = "";
+
             return true;
         }
 
         public bool WriteSectorLong(byte[] data, ulong sectorAddress)
         {
             ErrorMessage = "Writing sectors with tags is not supported.";
+
             return false;
         }
 
         public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
         {
             ErrorMessage = "Writing sectors with tags is not supported.";
+
             return false;
         }
 
@@ -157,6 +179,7 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Image is not opened for writing";
+
                 return false;
             }
 
@@ -178,24 +201,25 @@ namespace Aaru.DiscImages
 
                     imageInfo.Cylinders = (uint)(imageInfo.Sectors / imageInfo.Heads / imageInfo.SectorsPerTrack);
 
-                    if(imageInfo.Cylinders == 0 && imageInfo.Heads == 0 && imageInfo.SectorsPerTrack == 0) break;
+                    if(imageInfo.Cylinders       == 0 &&
+                       imageInfo.Heads           == 0 &&
+                       imageInfo.SectorsPerTrack == 0)
+                        break;
                 }
             }
 
             byte[] commentsBytes = null;
+
             if(!string.IsNullOrEmpty(imageInfo.Comments))
                 commentsBytes = Encoding.GetEncoding("shift_jis").GetBytes(imageInfo.Comments);
 
             v98Hdr = new Virtual98Header
             {
-                comment    = new byte[128],
-                cylinders  = (ushort)imageInfo.Cylinders,
-                padding2   = new byte[0x44],
-                sectors    = (byte)imageInfo.SectorsPerTrack,
-                sectorsize = (ushort)imageInfo.SectorSize,
-                signature  = signature,
-                surfaces   = (byte)imageInfo.Heads,
-                totals     = (uint)imageInfo.Sectors
+                comment   = new byte[128], cylinders = (ushort)imageInfo.Cylinders,
+                padding2  = new byte[0x44],
+                sectors   = (byte)imageInfo.SectorsPerTrack, sectorsize = (ushort)imageInfo.SectorSize,
+                signature = signature, surfaces                         = (byte)imageInfo.Heads,
+                totals    = (uint)imageInfo.Sectors
             };
 
             if(commentsBytes != null)
@@ -216,12 +240,14 @@ namespace Aaru.DiscImages
 
             IsWriting    = false;
             ErrorMessage = "";
+
             return true;
         }
 
         public bool SetMetadata(ImageInfo metadata)
         {
             imageInfo.Comments = metadata.Comments;
+
             return true;
         }
 
@@ -230,18 +256,21 @@ namespace Aaru.DiscImages
             if(cylinders > ushort.MaxValue)
             {
                 ErrorMessage = "Too many cylinders.";
+
                 return false;
             }
 
             if(heads > byte.MaxValue)
             {
                 ErrorMessage = "Too many heads.";
+
                 return false;
             }
 
             if(sectorsPerTrack > byte.MaxValue)
             {
                 ErrorMessage = "Too many sectors per track.";
+
                 return false;
             }
 
@@ -255,12 +284,14 @@ namespace Aaru.DiscImages
         public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
         {
             ErrorMessage = "Unsupported feature";
+
             return false;
         }
 
         public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
         {
             ErrorMessage = "Unsupported feature";
+
             return false;
         }
 
diff --git a/Aaru.Images/WCDiskImage/Identify.cs b/Aaru.Images/WCDiskImage/Identify.cs
index 70fd988ad..64b9226aa 100644
--- a/Aaru.Images/WCDiskImage/Identify.cs
+++ b/Aaru.Images/WCDiskImage/Identify.cs
@@ -45,7 +45,8 @@ namespace Aaru.DiscImages
             Stream stream = imageFilter.GetDataForkStream();
             stream.Seek(0, SeekOrigin.Begin);
 
-            if(stream.Length < 32) return false;
+            if(stream.Length < 32)
+                return false;
 
             byte[] header = new byte[32];
             stream.Read(header, 0, 32);
@@ -53,21 +54,33 @@ namespace Aaru.DiscImages
             WCDiskImageFileHeader fheader = Marshal.ByteArrayToStructureLittleEndian<WCDiskImageFileHeader>(header);
 
             /* check the signature */
-            if(Encoding.ASCII.GetString(fheader.signature).TrimEnd('\x00') != fileSignature) return false;
+            if(Encoding.ASCII.GetString(fheader.signature).TrimEnd('\x00') != fileSignature)
+                return false;
 
             /* Some sanity checks on the values we just read. */
-            if(fheader.version > 1) return false;
+            if(fheader.version > 1)
+                return false;
 
-            if(fheader.heads < 1 || fheader.heads > 2) return false;
+            if(fheader.heads < 1 ||
+               fheader.heads > 2)
+                return false;
 
-            if(fheader.sectorsPerTrack < 8 || fheader.sectorsPerTrack > 18) return false;
+            if(fheader.sectorsPerTrack < 8 ||
+               fheader.sectorsPerTrack > 18)
+                return false;
 
-            if(fheader.cylinders < 1 || fheader.cylinders > 80) return false;
+            if(fheader.cylinders < 1 ||
+               fheader.cylinders > 80)
+                return false;
 
-            if(fheader.extraTracks[0] > 1 || fheader.extraTracks[1] > 1 || fheader.extraTracks[2] > 1 ||
-               fheader.extraTracks[3] > 1) return false;
+            if(fheader.extraTracks[0] > 1 ||
+               fheader.extraTracks[1] > 1 ||
+               fheader.extraTracks[2] > 1 ||
+               fheader.extraTracks[3] > 1)
+                return false;
 
-            if(((byte)fheader.extraFlags & ~0x03) != 0) return false;
+            if(((byte)fheader.extraFlags & ~0x03) != 0)
+                return false;
 
             // TODO: validate all sectors
             // For now, having a valid header will suffice.
diff --git a/Aaru.Images/WCDiskImage/Read.cs b/Aaru.Images/WCDiskImage/Read.cs
index 872d8e169..724b64d86 100644
--- a/Aaru.Images/WCDiskImage/Read.cs
+++ b/Aaru.Images/WCDiskImage/Read.cs
@@ -57,8 +57,8 @@ namespace Aaru.DiscImages
             WCDiskImageFileHeader fheader = Marshal.ByteArrayToStructureLittleEndian<WCDiskImageFileHeader>(header);
 
             AaruConsole.DebugWriteLine("d2f plugin",
-                                      "Detected WC DISK IMAGE with {0} heads, {1} tracks and {2} sectors per track.",
-                                      fheader.heads, fheader.cylinders, fheader.sectorsPerTrack);
+                                       "Detected WC DISK IMAGE with {0} heads, {1} tracks and {2} sectors per track.",
+                                       fheader.heads, fheader.cylinders, fheader.sectorsPerTrack);
 
             imageInfo.Cylinders       = fheader.cylinders;
             imageInfo.SectorsPerTrack = fheader.sectorsPerTrack;
@@ -175,7 +175,7 @@ namespace Aaru.DiscImages
             if(badSectors[(cylinderNumber, headNumber, sectorNumber)])
             {
                 AaruConsole.DebugWriteLine("d2f plugin", "reading bad sector {0} ({1},{2},{3})", sectorAddress,
-                                          cylinderNumber, headNumber, sectorNumber);
+                                           cylinderNumber, headNumber, sectorNumber);
 
                 /* if we have sector data, return that */
                 if(sectorCache.ContainsKey((cylinderNumber, headNumber, sectorNumber)))
@@ -248,8 +248,8 @@ namespace Aaru.DiscImages
 
                         if(calculatedCRC != sheader.crc)
                             AaruConsole.DebugWriteLine("d2f plugin",
-                                                      "CHS {0},{1},{2}: CRC mismatch: stored CRC=0x{3:x4}, calculated CRC=0x{4:x4}",
-                                                      cyl, head, sect, sheader.crc, calculatedCRC);
+                                                       "CHS {0},{1},{2}: CRC mismatch: stored CRC=0x{3:x4}, calculated CRC=0x{4:x4}",
+                                                       cyl, head, sect, sheader.crc, calculatedCRC);
 
                         break;
                     case SectorFlag.BadSector:
diff --git a/Aaru.Images/WCDiskImage/Structs.cs b/Aaru.Images/WCDiskImage/Structs.cs
index 2d5212267..693d297e5 100644
--- a/Aaru.Images/WCDiskImage/Structs.cs
+++ b/Aaru.Images/WCDiskImage/Structs.cs
@@ -37,137 +37,92 @@ namespace Aaru.DiscImages
 {
     public partial class WCDiskImage
     {
-        /// <summary>
-        ///     The expected signature of a proper image file.
-        /// </summary>
+        /// <summary>The expected signature of a proper image file.</summary>
         const string fileSignature = "WC DISK IMAGE\x1a\x1a";
 
-        /// <summary>
-        ///     The global header of a WCDiskImage file
-        /// </summary>
+        /// <summary>The global header of a WCDiskImage file</summary>
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct WCDiskImageFileHeader
         {
-            /// <summary>
-            ///     The signature should be "WC DISK IMAGE\0x1a\0x1a\0x00"
-            /// </summary>
+            /// <summary>The signature should be "WC DISK IMAGE\0x1a\0x1a\0x00"</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public byte[] signature;
+            public readonly byte[] signature;
+
+            /// <summary>Version (currently only version 0 and 1 is known)</summary>
+            public readonly byte version;
+
+            /// <summary>The number of heads. Only 1 or 2 is supported</summary>
+            public readonly byte heads;
+
+            /// <summary>Sectors per track, maximum is 18</summary>
+            public readonly byte sectorsPerTrack;
+
+            /// <summary>The number of tracks/cylinders. 80 is the maximum</summary>
+            public readonly byte cylinders;
 
             /// <summary>
-            ///     Version (currently only version 0 and 1 is known)
-            /// </summary>
-            public byte version;
-
-            /// <summary>
-            ///     The number of heads. Only 1 or 2 is supported
-            /// </summary>
-            public byte heads;
-
-            /// <summary>
-            ///     Sectors per track, maximum is 18
-            /// </summary>
-            public byte sectorsPerTrack;
-
-            /// <summary>
-            ///     The number of tracks/cylinders. 80 is the maximum
-            /// </summary>
-            public byte cylinders;
-
-            /// <summary>
-            ///     The "extra tracks" that are present. What this means is that the
-            ///     tracks 81 and 82 might contain data (on an 80-track disk) and that
-            ///     this data was dumped too. The order is head0extra1, head1extra1,
-            ///     head0extra2, head1extra2. 1 means track is present.
+            ///     The "extra tracks" that are present. What this means is that the tracks 81 and 82 might contain data (on an
+            ///     80-track disk) and that this data was dumped too. The order is head0extra1, head1extra1, head0extra2, head1extra2.
+            ///     1 means track is present.
             /// </summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
-            public byte[] extraTracks;
+            public readonly byte[] extraTracks;
 
-            /// <summary>
-            ///     Additional metadata present flags.
-            /// </summary>
-            public ExtraFlag extraFlags;
+            /// <summary>Additional metadata present flags.</summary>
+            public readonly ExtraFlag extraFlags;
 
-            /// <summary>
-            ///     Padding to make the header 32 bytes.
-            /// </summary>
+            /// <summary>Padding to make the header 32 bytes.</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 7)]
-            public byte[] reserved;
+            public readonly byte[] reserved;
         }
 
         enum ExtraFlag : byte
         {
-            /// <summary>
-            ///     Set if a Comment is present after the image
-            /// </summary>
+            /// <summary>Set if a Comment is present after the image</summary>
             Comment = 0x01,
 
-            /// <summary>
-            ///     Set if a directory listing is present after the image
-            /// </summary>
+            /// <summary>Set if a directory listing is present after the image</summary>
             Directory = 0x02
         }
 
-        /// <summary>
-        ///     The Sector header that precedes each sector
-        /// </summary>
+        /// <summary>The Sector header that precedes each sector</summary>
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct WCDiskImageSectorHeader
         {
-            /// <summary>
-            ///     The sector flag (i.e. type)
-            /// </summary>
-            public SectorFlag flag;
+            /// <summary>The sector flag (i.e. type)</summary>
+            public readonly SectorFlag flag;
 
-            /// <summary>
-            ///     The head this sector belongs to.
-            /// </summary>
-            public byte head;
+            /// <summary>The head this sector belongs to.</summary>
+            public readonly byte head;
 
-            /// <summary>
-            ///     The sector number within the track. Must be consecutive.
-            /// </summary>
-            public byte sector;
+            /// <summary>The sector number within the track. Must be consecutive.</summary>
+            public readonly byte sector;
 
-            /// <summary>
-            ///     The cylinder number this sector belongs to.
-            /// </summary>
-            public byte cylinder;
+            /// <summary>The cylinder number this sector belongs to.</summary>
+            public readonly byte cylinder;
 
-            /// <summary>
-            ///     A simple CRC16 over the data, to detect errors.
-            /// </summary>
-            public short crc;
+            /// <summary>A simple CRC16 over the data, to detect errors.</summary>
+            public readonly short crc;
         }
 
         enum SectorFlag : byte
         {
-            /// <summary>
-            ///     A normal sector
-            /// </summary>
+            /// <summary>A normal sector</summary>
             Normal = 0x00,
 
-            /// <summary>
-            ///     A bad sector that could not be read
-            /// </summary>
+            /// <summary>A bad sector that could not be read</summary>
             BadSector = 0x01,
 
-            /// <summary>
-            ///     A sector filled with a repeating byte value. The value
-            ///     is encoded in the LSB of the <c>crc</c> field.
-            /// </summary>
+            /// <summary>A sector filled with a repeating byte value. The value is encoded in the LSB of the <c>crc</c> field.</summary>
             RepeatByte = 0x02,
 
             /// <summary>
-            ///     Not a sector but a comment. Must come after all user data.
-            ///     The <c>crc</c> field is the length of the comment data.
+            ///     Not a sector but a comment. Must come after all user data. The <c>crc</c> field is the length of the comment
+            ///     data.
             /// </summary>
             Comment = 0x03,
 
-            /// <summary>
-            ///     Not a sector but the directory information.
-            ///     The <c>crc</c> field is the length of the data.
-            /// </summary>
+            /// <summary>Not a sector but the directory information. The <c>crc</c> field is the length of the data.</summary>
             Directory = 0x04
         }
     }
diff --git a/Aaru.Images/WCDiskImage/WCDiskImage.cs b/Aaru.Images/WCDiskImage/WCDiskImage.cs
index 36c2701b4..ce752159d 100644
--- a/Aaru.Images/WCDiskImage/WCDiskImage.cs
+++ b/Aaru.Images/WCDiskImage/WCDiskImage.cs
@@ -42,9 +42,7 @@ namespace Aaru.DiscImages
     {
         public Dictionary<(int cylinder, int head, int sector), bool> badSectors =
             new Dictionary<(int cylinder, int head, int sector), bool>();
-        /// <summary>
-        ///     The file header after the image has been opened
-        /// </summary>
+        /// <summary>The file header after the image has been opened</summary>
         WCDiskImageFileHeader fileHeader;
         ImageInfo imageInfo;
 
@@ -52,36 +50,21 @@ namespace Aaru.DiscImages
         public Dictionary<(int cylinder, int head, int sector), byte[]> sectorCache =
             new Dictionary<(int cylinder, int head, int sector), byte[]>();
 
-        /// <summary>
-        ///     The ImageFilter we're reading from, after the file has been opened
-        /// </summary>
+        /// <summary>The ImageFilter we're reading from, after the file has been opened</summary>
         IFilter wcImageFilter;
 
-        public WCDiskImage()
+        public WCDiskImage() => imageInfo = new ImageInfo
         {
-            imageInfo = new ImageInfo
-            {
-                ReadableSectorTags    = new List<SectorTagType>(),
-                ReadableMediaTags     = new List<MediaTagType>(),
-                HasPartitions         = false,
-                HasSessions           = false,
-                Version               = null,
-                Application           = null,
-                ApplicationVersion    = null,
-                Creator               = null,
-                Comments              = null,
-                MediaManufacturer     = null,
-                MediaModel            = null,
-                MediaSerialNumber     = null,
-                MediaBarcode          = null,
-                MediaPartNumber       = null,
-                MediaSequence         = 0,
-                LastMediaSequence     = 0,
-                DriveManufacturer     = null,
-                DriveModel            = null,
-                DriveSerialNumber     = null,
-                DriveFirmwareRevision = null
-            };
-        }
+            ReadableSectorTags = new List<SectorTagType>(), ReadableMediaTags = new List<MediaTagType>(),
+            HasPartitions      = false, HasSessions                           = false, Version = null,
+            Application        = null,
+            ApplicationVersion = null, Creator = null, Comments = null,
+            MediaManufacturer  = null,
+            MediaModel         = null, MediaSerialNumber = null, MediaBarcode = null,
+            MediaPartNumber    = null,
+            MediaSequence      = 0, LastMediaSequence = 0, DriveManufacturer = null,
+            DriveModel         = null,
+            DriveSerialNumber  = null, DriveFirmwareRevision = null
+        };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/ZZZRawImage/Constants.cs b/Aaru.Images/ZZZRawImage/Constants.cs
index 29828f8c4..d6626fe32 100644
--- a/Aaru.Images/ZZZRawImage/Constants.cs
+++ b/Aaru.Images/ZZZRawImage/Constants.cs
@@ -36,15 +36,17 @@ namespace Aaru.DiscImages
 {
     public partial class ZZZRawImage
     {
-        readonly byte[] cdSync = {0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00};
+        readonly byte[] cdSync =
+        {
+            0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00
+        };
         readonly (MediaTagType tag, string name)[] readWriteSidecars =
         {
             (MediaTagType.ATA_IDENTIFY, ".identify.bin"), (MediaTagType.BD_DI, ".di.bin"),
             (MediaTagType.CD_ATIP, ".atip.bin"), (MediaTagType.CD_FullTOC, ".toc.bin"),
             (MediaTagType.CD_FirstTrackPregap, ".leadin.bin"), (MediaTagType.CD_PMA, ".pma.bin"),
-            (MediaTagType.CD_TEXT, ".cdtext.bin"), (MediaTagType.DCB, ".dcb.bin"),
-            (MediaTagType.DVD_ADIP, ".adip.bin"), (MediaTagType.DVD_BCA, ".bca.bin"),
-            (MediaTagType.DVD_CMI, ".cmi.bin"), (MediaTagType.DVD_DMI, ".dmi.bin"),
+            (MediaTagType.CD_TEXT, ".cdtext.bin"), (MediaTagType.DCB, ".dcb.bin"), (MediaTagType.DVD_ADIP, ".adip.bin"),
+            (MediaTagType.DVD_BCA, ".bca.bin"), (MediaTagType.DVD_CMI, ".cmi.bin"), (MediaTagType.DVD_DMI, ".dmi.bin"),
             (MediaTagType.DVD_MediaIdentifier, ".mid.bin"), (MediaTagType.DVD_PFI, ".pfi.bin"),
             (MediaTagType.DVDRAM_DDS, ".dds.bin"), (MediaTagType.DVDRAM_SpareArea, ".sai.bin"),
             (MediaTagType.DVDR_PFI, ".pfir.bin"), (MediaTagType.DVDR_PreRecordedInfo, ".pri.bin"),
@@ -61,10 +63,9 @@ namespace Aaru.DiscImages
         readonly (MediaTagType tag, string name)[] writeOnlySidecars =
         {
             (MediaTagType.ATAPI_IDENTIFY, ".identify.bin"), (MediaTagType.BD_BCA, ".bca.bin"),
-            (MediaTagType.BD_DDS, ".dds.bin"), (MediaTagType.BD_DI, ".di.bin"),
-            (MediaTagType.BD_SpareArea, ".sai.bin"), (MediaTagType.CD_LeadOut, ".leadout.bin"),
-            (MediaTagType.MMC_CID, ".cid.bin"), (MediaTagType.MMC_CSD, ".csd.bin"),
-            (MediaTagType.MMC_OCR, ".ocr.bin")
+            (MediaTagType.BD_DDS, ".dds.bin"), (MediaTagType.BD_DI, ".di.bin"), (MediaTagType.BD_SpareArea, ".sai.bin"),
+            (MediaTagType.CD_LeadOut, ".leadout.bin"), (MediaTagType.MMC_CID, ".cid.bin"),
+            (MediaTagType.MMC_CSD, ".csd.bin"), (MediaTagType.MMC_OCR, ".ocr.bin")
         };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/ZZZRawImage/Identify.cs b/Aaru.Images/ZZZRawImage/Identify.cs
index 53ea18d68..3bc30f79d 100644
--- a/Aaru.Images/ZZZRawImage/Identify.cs
+++ b/Aaru.Images/ZZZRawImage/Identify.cs
@@ -41,20 +41,24 @@ namespace Aaru.DiscImages
         public bool Identify(IFilter imageFilter)
         {
             // Check if file is not multiple of 512
-            if(imageFilter.GetDataForkLength() % 512 == 0) return true;
+            if(imageFilter.GetDataForkLength() % 512 == 0)
+                return true;
 
             extension = Path.GetExtension(imageFilter.GetFilename())?.ToLower();
 
-            if(extension == ".hdf" && imageFilter.GetDataForkLength() % 256 == 0) return true;
+            if(extension                             == ".hdf" &&
+               imageFilter.GetDataForkLength() % 256 == 0)
+                return true;
 
             // Only for single track data CDs
-            if(imageFilter.GetDataForkLength() % 2352 == 0 && imageFilter.GetDataForkLength() <= 846720000 ||
-               imageFilter.GetDataForkLength() % 2448 == 0 && imageFilter.GetDataForkLength() <= 881280000)
+            if((imageFilter.GetDataForkLength() % 2352 == 0 && imageFilter.GetDataForkLength() <= 846720000) ||
+               (imageFilter.GetDataForkLength() % 2448 == 0 && imageFilter.GetDataForkLength() <= 881280000))
             {
                 byte[] sync   = new byte[12];
                 Stream stream = imageFilter.GetDataForkStream();
                 stream.Position = 0;
                 stream.Read(sync, 0, 12);
+
                 return cdSync.SequenceEqual(sync);
             }
 
diff --git a/Aaru.Images/ZZZRawImage/Properties.cs b/Aaru.Images/ZZZRawImage/Properties.cs
index dc1f23a8e..b55a0a983 100644
--- a/Aaru.Images/ZZZRawImage/Properties.cs
+++ b/Aaru.Images/ZZZRawImage/Properties.cs
@@ -45,6 +45,7 @@ namespace Aaru.DiscImages
     public partial class ZZZRawImage
     {
         public string Name => "Raw Disk Image";
+
         // Non-random UUID to recognize this specific plugin
         public Guid      Id     => new Guid("12345678-AAAA-BBBB-CCCC-123456789000");
         public ImageInfo Info   => imageInfo;
@@ -55,32 +56,33 @@ namespace Aaru.DiscImages
         {
             get
             {
-                if(imageInfo.XmlMediaType != XmlMediaType.OpticalDisc) return null;
+                if(imageInfo.XmlMediaType != XmlMediaType.OpticalDisc)
+                    return null;
 
-                Track trk = new Track
+                var trk = new Track
                 {
-                    TrackBytesPerSector = rawCompactDisc
-                                              ? mode2
-                                                    ? 2336
-                                                    : 2048
-                                              : (int)imageInfo.SectorSize,
+                    TrackBytesPerSector = rawCompactDisc ? mode2
+                                                               ? 2336
+                                                               : 2048 : (int)imageInfo.SectorSize,
                     TrackEndSector         = imageInfo.Sectors - 1,
                     TrackFile              = rawImageFilter.GetFilename(),
                     TrackFileOffset        = 0,
                     TrackFileType          = "BINARY",
-                    TrackRawBytesPerSector = rawCompactDisc ? 2352 : (int)imageInfo.SectorSize,
-                    TrackSequence          = 1,
+                    TrackRawBytesPerSector = rawCompactDisc ? 2352 : (int)imageInfo.SectorSize, TrackSequence = 1,
                     TrackStartSector       = 0,
                     TrackSubchannelType =
                         hasSubchannel ? TrackSubchannelType.RawInterleaved : TrackSubchannelType.None,
-                    TrackType = rawCompactDisc
-                                    ? mode2
-                                          ? TrackType.CdMode2Formless
-                                          : TrackType.CdMode1
-                                    : TrackType.Data,
+                    TrackType = rawCompactDisc ? mode2
+                                                     ? TrackType.CdMode2Formless
+                                                     : TrackType.CdMode1 : TrackType.Data,
                     TrackSession = 1
                 };
-                List<Track> lst = new List<Track> {trk};
+
+                List<Track> lst = new List<Track>
+                {
+                    trk
+                };
+
                 return lst;
             }
         }
@@ -92,15 +94,17 @@ namespace Aaru.DiscImages
                 if(imageInfo.XmlMediaType != XmlMediaType.OpticalDisc)
                     throw new FeatureUnsupportedImageException("Feature not supported by image format");
 
-                Session sess = new Session
+                var sess = new Session
                 {
-                    EndSector       = imageInfo.Sectors - 1,
-                    EndTrack        = 1,
-                    SessionSequence = 1,
-                    StartSector     = 0,
-                    StartTrack      = 1
+                    EndSector  = imageInfo.Sectors - 1, EndTrack = 1, SessionSequence = 1, StartSector = 0,
+                    StartTrack = 1
                 };
-                List<Session> lst = new List<Session> {sess};
+
+                List<Session> lst = new List<Session>
+                {
+                    sess
+                };
+
                 return lst;
             }
         }
@@ -109,15 +113,14 @@ namespace Aaru.DiscImages
         {
             get
             {
-                if(imageInfo.XmlMediaType != XmlMediaType.OpticalDisc) return null;
+                if(imageInfo.XmlMediaType != XmlMediaType.OpticalDisc)
+                    return null;
 
                 List<Partition> parts = new List<Partition>();
-                Partition part = new Partition
+
+                var part = new Partition
                 {
-                    Start    = 0,
-                    Length   = imageInfo.Sectors,
-                    Offset   = 0,
-                    Sequence = 0,
+                    Start = 0, Length = imageInfo.Sectors, Offset = 0, Sequence = 0,
                     Type = rawCompactDisc
                                ? mode2
                                      ? "MODE2/2352"
@@ -127,21 +130,28 @@ namespace Aaru.DiscImages
                                    : "MODE1/2048",
                     Size = imageInfo.Sectors * imageInfo.SectorSize
                 };
+
                 parts.Add(part);
+
                 return parts;
             }
         }
+
         public List<DumpHardwareType> DumpHardware => null;
         public CICMMetadataType       CicmMetadata { get; private set; }
-        public IEnumerable<MediaTagType> SupportedMediaTags =>
-            readWriteSidecars.Concat(writeOnlySidecars).OrderBy(t => t.tag).Select(t => t.tag).ToArray();
+        public IEnumerable<MediaTagType> SupportedMediaTags => readWriteSidecars.
+                                                               Concat(writeOnlySidecars).OrderBy(t => t.tag).
+                                                               Select(t => t.tag).ToArray();
+
+        public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[]
+            {};
 
-        public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[] { };
         public IEnumerable<MediaType> SupportedMediaTypes
         {
             get
             {
                 List<MediaType> types = new List<MediaType>();
+
                 foreach(MediaType type in Enum.GetValues(typeof(MediaType)))
                     switch(type)
                     {
@@ -164,6 +174,7 @@ namespace Aaru.DiscImages
                         case MediaType.ECMA_78: continue;
                         default:
                             types.Add(type);
+
                             break;
                     }
 
@@ -172,9 +183,12 @@ namespace Aaru.DiscImages
         }
 
         public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
-            new (string name, Type type, string description, object @default)[] { };
-        public IEnumerable<string> KnownExtensions =>
-            new[] {".adf", ".adl", ".d81", ".dsk", ".hdf", ".ima", ".img", ".iso", ".ssd", ".st"};
+            new (string name, Type type, string description, object @default)[]
+                {};
+        public IEnumerable<string> KnownExtensions => new[]
+        {
+            ".adf", ".adl", ".d81", ".dsk", ".hdf", ".ima", ".img", ".iso", ".ssd", ".st"
+        };
         public bool   IsWriting    { get; private set; }
         public string ErrorMessage { get; private set; }
     }
diff --git a/Aaru.Images/ZZZRawImage/Read.cs b/Aaru.Images/ZZZRawImage/Read.cs
index 223bd0f6b..d858df0c5 100644
--- a/Aaru.Images/ZZZRawImage/Read.cs
+++ b/Aaru.Images/ZZZRawImage/Read.cs
@@ -65,11 +65,11 @@ namespace Aaru.DiscImages
 
             switch(extension)
             {
-                case".iso" when imageFilter.GetDataForkLength() % 2048 == 0:
+                case ".iso" when imageFilter.GetDataForkLength() % 2048 == 0:
                     imageInfo.SectorSize = 2048;
 
                     break;
-                case".d81" when imageFilter.GetDataForkLength() == 819200:
+                case ".d81" when imageFilter.GetDataForkLength() == 819200:
                     imageInfo.SectorSize = 256;
 
                     break;
@@ -326,7 +326,7 @@ namespace Aaru.DiscImages
                     filter.GetDataForkStream().Read(data, 0, data.Length);
                     mediaTags.Add(sidecar.tag, data);
                 }
-                catch(IOException) { }
+                catch(IOException) {}
 
             // If there are INQUIRY and IDENTIFY tags, it's ATAPI
             if(mediaTags.ContainsKey(MediaTagType.SCSI_INQUIRY))
@@ -1001,7 +1001,7 @@ namespace Aaru.DiscImages
             // It's ATA, check tags
             if(mediaTags.TryGetValue(MediaTagType.ATA_IDENTIFY, out byte[] identifyBuf))
             {
-                Identify.IdentifyDevice? ataId = global::Aaru.CommonTypes.Structs.Devices.ATA.Identify.Decode(identifyBuf);
+                Identify.IdentifyDevice? ataId = CommonTypes.Structs.Devices.ATA.Identify.Decode(identifyBuf);
 
                 if(ataId.HasValue)
                 {
diff --git a/Aaru.Images/ZZZRawImage/Verify.cs b/Aaru.Images/ZZZRawImage/Verify.cs
index 06f4aaeb4..88667975b 100644
--- a/Aaru.Images/ZZZRawImage/Verify.cs
+++ b/Aaru.Images/ZZZRawImage/Verify.cs
@@ -40,13 +40,15 @@ namespace Aaru.DiscImages
     {
         public bool? VerifySector(ulong sectorAddress)
         {
-            if(!rawCompactDisc) return null;
+            if(!rawCompactDisc)
+                return null;
 
             byte[] buffer = ReadSectorLong(sectorAddress);
+
             return CdChecksums.CheckCdSector(buffer);
         }
 
-        public bool? VerifySectors(ulong           sectorAddress, uint length, out List<ulong> failingLbas,
+        public bool? VerifySectors(ulong sectorAddress, uint length, out List<ulong> failingLbas,
                                    out List<ulong> unknownLbas)
         {
             if(!rawCompactDisc)
@@ -54,7 +56,8 @@ namespace Aaru.DiscImages
                 failingLbas = new List<ulong>();
                 unknownLbas = new List<ulong>();
 
-                for(ulong i = sectorAddress; i < sectorAddress + length; i++) unknownLbas.Add(i);
+                for(ulong i = sectorAddress; i < sectorAddress + length; i++)
+                    unknownLbas.Add(i);
 
                 return null;
             }
@@ -74,19 +77,22 @@ namespace Aaru.DiscImages
                 {
                     case null:
                         unknownLbas.Add((ulong)i + sectorAddress);
+
                         break;
                     case false:
                         failingLbas.Add((ulong)i + sectorAddress);
+
                         break;
                 }
             }
 
-            if(unknownLbas.Count > 0) return null;
+            if(unknownLbas.Count > 0)
+                return null;
 
             return failingLbas.Count <= 0;
         }
 
-        public bool? VerifySectors(ulong           sectorAddress, uint length, uint track, out List<ulong> failingLbas,
+        public bool? VerifySectors(ulong sectorAddress, uint length, uint track, out List<ulong> failingLbas,
                                    out List<ulong> unknownLbas)
         {
             if(!rawCompactDisc)
@@ -94,7 +100,8 @@ namespace Aaru.DiscImages
                 failingLbas = new List<ulong>();
                 unknownLbas = new List<ulong>();
 
-                for(ulong i = sectorAddress; i < sectorAddress + length; i++) unknownLbas.Add(i);
+                for(ulong i = sectorAddress; i < sectorAddress + length; i++)
+                    unknownLbas.Add(i);
 
                 return null;
             }
@@ -114,23 +121,28 @@ namespace Aaru.DiscImages
                 {
                     case null:
                         unknownLbas.Add((ulong)i + sectorAddress);
+
                         break;
                     case false:
                         failingLbas.Add((ulong)i + sectorAddress);
+
                         break;
                 }
             }
 
-            if(unknownLbas.Count > 0) return null;
+            if(unknownLbas.Count > 0)
+                return null;
 
             return failingLbas.Count <= 0;
         }
 
         public bool? VerifySector(ulong sectorAddress, uint track)
         {
-            if(!rawCompactDisc) return null;
+            if(!rawCompactDisc)
+                return null;
 
             byte[] buffer = ReadSectorLong(sectorAddress, track);
+
             return CdChecksums.CheckCdSector(buffer);
         }
     }
diff --git a/Aaru.Images/ZZZRawImage/Write.cs b/Aaru.Images/ZZZRawImage/Write.cs
index f99a8375e..ec7ab43fd 100644
--- a/Aaru.Images/ZZZRawImage/Write.cs
+++ b/Aaru.Images/ZZZRawImage/Write.cs
@@ -43,26 +43,35 @@ namespace Aaru.DiscImages
     public partial class ZZZRawImage
     {
         public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
-                           uint   sectorSize)
+                           uint sectorSize)
         {
             if(sectorSize == 0)
             {
                 ErrorMessage = "Unsupported sector size";
+
                 return false;
             }
 
             if(!SupportedMediaTypes.Contains(mediaType))
             {
                 ErrorMessage = $"Unsupport media format {mediaType}";
+
                 return false;
             }
 
-            imageInfo = new ImageInfo {MediaType = mediaType, SectorSize = sectorSize, Sectors = sectors};
+            imageInfo = new ImageInfo
+            {
+                MediaType = mediaType, SectorSize = sectorSize, Sectors = sectors
+            };
 
-            try { writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None); }
+            try
+            {
+                writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
+            }
             catch(IOException e)
             {
                 ErrorMessage = $"Could not create new image file, exception {e.Message}";
+
                 return false;
             }
 
@@ -71,6 +80,7 @@ namespace Aaru.DiscImages
 
             IsWriting    = true;
             ErrorMessage = null;
+
             return true;
         }
 
@@ -79,12 +89,14 @@ namespace Aaru.DiscImages
         public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
         {
             ErrorMessage = "Unsupported feature";
+
             return false;
         }
 
         public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
         {
             ErrorMessage = "Unsupported feature";
+
             return false;
         }
 
@@ -97,12 +109,15 @@ namespace Aaru.DiscImages
             if(!SupportedMediaTags.Contains(tag))
             {
                 ErrorMessage = $"Tried to write unsupported media tag {tag}.";
+
                 return false;
             }
 
-            if(mediaTags.ContainsKey(tag)) mediaTags.Remove(tag);
+            if(mediaTags.ContainsKey(tag))
+                mediaTags.Remove(tag);
 
             mediaTags.Add(tag, data);
+
             return true;
         }
 
@@ -111,18 +126,21 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Tried to write on a non-writable image";
+
                 return false;
             }
 
             if(data.Length != imageInfo.SectorSize)
             {
                 ErrorMessage = "Incorrect data size";
+
                 return false;
             }
 
             if(sectorAddress >= imageInfo.Sectors)
             {
                 ErrorMessage = "Tried to write past image size";
+
                 return false;
             }
 
@@ -130,6 +148,7 @@ namespace Aaru.DiscImages
             writingStream.Write(data, 0, data.Length);
 
             ErrorMessage = "";
+
             return true;
         }
 
@@ -138,18 +157,21 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Tried to write on a non-writable image";
+
                 return false;
             }
 
             if(data.Length % imageInfo.SectorSize != 0)
             {
                 ErrorMessage = "Incorrect data size";
+
                 return false;
             }
 
             if(sectorAddress + length > imageInfo.Sectors)
             {
                 ErrorMessage = "Tried to write past image size";
+
                 return false;
             }
 
@@ -157,26 +179,31 @@ namespace Aaru.DiscImages
             writingStream.Write(data, 0, data.Length);
 
             ErrorMessage = "";
+
             return true;
         }
 
         public bool WriteSectorLong(byte[] data, ulong sectorAddress)
         {
             ErrorMessage = "Writing sectors with tags is not supported.";
+
             return false;
         }
 
         public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
         {
             ErrorMessage = "Writing sectors with tags is not supported.";
+
             return false;
         }
 
         public bool SetTracks(List<Track> tracks)
         {
-            if(tracks.Count <= 1) return true;
+            if(tracks.Count <= 1)
+                return true;
 
             ErrorMessage = "This format supports only 1 track";
+
             return false;
         }
 
@@ -185,6 +212,7 @@ namespace Aaru.DiscImages
             if(!IsWriting)
             {
                 ErrorMessage = "Image is not opened for writing";
+
                 return false;
             }
 
@@ -194,13 +222,15 @@ namespace Aaru.DiscImages
 
             foreach(KeyValuePair<MediaTagType, byte[]> tag in mediaTags)
             {
-                string suffix = readWriteSidecars.Concat(writeOnlySidecars).Where(t => t.tag == tag.Key)
-                                                 .Select(t => t.name).FirstOrDefault();
+                string suffix = readWriteSidecars.Concat(writeOnlySidecars).Where(t => t.tag == tag.Key).
+                                                  Select(t => t.name).FirstOrDefault();
 
-                if(suffix == null) continue;
+                if(suffix == null)
+                    continue;
+
+                var tagStream = new FileStream(basepath + suffix, FileMode.Create, FileAccess.ReadWrite,
+                                               FileShare.None);
 
-                FileStream tagStream =
-                    new FileStream(basepath + suffix, FileMode.Create, FileAccess.ReadWrite, FileShare.None);
                 tagStream.Write(tag.Value, 0, tag.Value.Length);
                 tagStream.Close();
             }
diff --git a/Aaru.Images/ZZZRawImage/ZZZRawImage.cs b/Aaru.Images/ZZZRawImage/ZZZRawImage.cs
index 44919e68b..f08e4cb65 100644
--- a/Aaru.Images/ZZZRawImage/ZZZRawImage.cs
+++ b/Aaru.Images/ZZZRawImage/ZZZRawImage.cs
@@ -51,31 +51,18 @@ namespace Aaru.DiscImages
         IFilter                          rawImageFilter;
         FileStream                       writingStream;
 
-        public ZZZRawImage()
+        public ZZZRawImage() => imageInfo = new ImageInfo
         {
-            imageInfo = new ImageInfo
-            {
-                ReadableSectorTags    = new List<SectorTagType>(),
-                ReadableMediaTags     = new List<MediaTagType>(),
-                HasPartitions         = false,
-                HasSessions           = false,
-                Version               = null,
-                Application           = null,
-                ApplicationVersion    = null,
-                Creator               = null,
-                Comments              = null,
-                MediaManufacturer     = null,
-                MediaModel            = null,
-                MediaSerialNumber     = null,
-                MediaBarcode          = null,
-                MediaPartNumber       = null,
-                MediaSequence         = 0,
-                LastMediaSequence     = 0,
-                DriveManufacturer     = null,
-                DriveModel            = null,
-                DriveSerialNumber     = null,
-                DriveFirmwareRevision = null
-            };
-        }
+            ReadableSectorTags = new List<SectorTagType>(), ReadableMediaTags = new List<MediaTagType>(),
+            HasPartitions      = false, HasSessions                           = false, Version = null,
+            Application        = null,
+            ApplicationVersion = null, Creator = null, Comments = null,
+            MediaManufacturer  = null,
+            MediaModel         = null, MediaSerialNumber = null, MediaBarcode = null,
+            MediaPartNumber    = null,
+            MediaSequence      = 0, LastMediaSequence = 0, DriveManufacturer = null,
+            DriveModel         = null,
+            DriveSerialNumber  = null, DriveFirmwareRevision = null
+        };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Interop/Aaru.Interop.csproj b/Aaru.Interop/Aaru.Interop.csproj
deleted file mode 100644
index 508a77a32..000000000
--- a/Aaru.Interop/Aaru.Interop.csproj
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{9183F2E0-A879-4F23-9EE3-C6908F1332B2}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <RootNamespace>Aaru.Interop</RootNamespace>
-    <AssemblyName>Aaru.Interop</AssemblyName>
-    <ReleaseVersion>$(Version)</ReleaseVersion>
-    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
-    <TargetFramework>net461</TargetFramework>
-    <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-    <Version>4.5.99.1693</Version>
-    <Company>Claunia.com</Company>
-    <Copyright>Copyright © 2011-2018 Natalia Portillo</Copyright>
-    <Product>Aaru Data Preservation Suite</Product>
-    <Title>Aaru.Interop</Title>
-    <ApplicationVersion>$(Version)</ApplicationVersion>
-  </PropertyGroup>
-  <PropertyGroup>
-    <NrtRevisionFormat>$(Version)-{chash:8} built by {mname} in $(Configuration){!:, modified}</NrtRevisionFormat>
-    <NrtResolveSimpleAttributes>true</NrtResolveSimpleAttributes>
-    <NrtShowRevision>true</NrtShowRevision>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>full</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="DetectOS.cs" />
-    <Compile Include="PlatformID.cs" />
-    <Compile Include="Version.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="..\LICENSE.MIT">
-      <Link>LICENSE.MIT</Link>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Unclassified.NetRevisionTask" Version="0.2.2-beta" />
-  </ItemGroup>
-  <ProjectExtensions>
-    <MonoDevelop>
-      <Properties>
-        <Policies>
-          <StandardHeader IncludeInNewFiles="True" Text="/***************************************************************************&#xA;Aaru Data Preservation Suite&#xA;----------------------------------------------------------------------------&#xA; &#xA;Filename       : ${FileName}&#xA;Author(s)      : ${AuthorName} &lt;${AuthorEmail}&gt;&#xA;&#xA;Component      : Component&#xA; &#xA;--[ Description ] ----------------------------------------------------------&#xA; &#xA;    Description&#xA; &#xA;--[ License ] --------------------------------------------------------------&#xA; &#xA;    Permission is hereby granted, free of charge, to any person obtaining a&#xA;    copy of this software and associated documentation files (the&#xA;    &quot;Software&quot;), to deal in the Software without restriction, including&#xA;    without limitation the rights to use, copy, modify, merge, publish,&#xA;    distribute, sublicense, and/or sell copies of the Software, and to&#xA;    permit persons to whom the Software is furnished to do so, subject to&#xA;    the following conditions:&#xA;&#xA;    The above copyright notice and this permission notice shall be included&#xA;    in all copies or substantial portions of the Software.&#xA;&#xA;    THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND, EXPRESS&#xA;    OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF&#xA;    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.&#xA;    IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY&#xA;    CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,&#xA;    TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE&#xA;    SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.&#xA;&#xA;----------------------------------------------------------------------------&#xA;Copyright © 2011-${Year} ${CopyrightHolder}&#xA;****************************************************************************/" />
-          <TextStylePolicy FileWidth="120" TabWidth="4" IndentWidth="4" RemoveTrailingWhitespace="True" NoTabsAfterNonTabs="False" EolMarker="Native" TabsToSpaces="True" scope="text/x-csharp" />
-          <CSharpFormattingPolicy IndentBlock="True" IndentBraces="False" IndentSwitchSection="True" IndentSwitchCaseSection="True" LabelPositioning="OneLess" NewLinesForBracesInTypes="True" NewLinesForBracesInMethods="True" NewLinesForBracesInProperties="True" NewLinesForBracesInAccessors="True" NewLinesForBracesInAnonymousMethods="True" NewLinesForBracesInControlBlocks="True" NewLinesForBracesInAnonymousTypes="True" NewLinesForBracesInObjectCollectionArrayInitializers="True" NewLinesForBracesInLambdaExpressionBody="True" NewLineForElse="True" NewLineForCatch="True" NewLineForFinally="True" NewLineForMembersInObjectInit="True" NewLineForMembersInAnonymousTypes="True" NewLineForClausesInQuery="True" SpacingAfterMethodDeclarationName="False" SpaceWithinMethodDeclarationParenthesis="False" SpaceBetweenEmptyMethodDeclarationParentheses="False" SpaceAfterMethodCallName="False" SpaceWithinMethodCallParentheses="False" SpaceBetweenEmptyMethodCallParentheses="False" SpaceWithinExpressionParentheses="False" SpaceWithinCastParentheses="False" SpaceWithinOtherParentheses="False" SpaceAfterCast="False" SpacesIgnoreAroundVariableDeclaration="False" SpaceBeforeOpenSquareBracket="False" SpaceBetweenEmptySquareBrackets="False" SpaceWithinSquareBrackets="False" SpaceAfterColonInBaseTypeDeclaration="True" SpaceAfterComma="True" SpaceAfterDot="False" SpaceAfterSemicolonsInForStatement="True" SpaceBeforeColonInBaseTypeDeclaration="True" SpaceBeforeComma="False" SpaceBeforeDot="False" SpaceBeforeSemicolonsInForStatement="False" SpacingAroundBinaryOperator="Single" WrappingPreserveSingleLine="True" WrappingKeepStatementsOnSingleLine="True" PlaceSystemDirectiveFirst="True" SpaceAfterControlFlowStatementKeyword="False" scope="text/x-csharp" />
-        </Policies>
-      </Properties>
-    </MonoDevelop>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/Aaru.Metadata/Aaru.Metadata.csproj b/Aaru.Metadata/Aaru.Metadata.csproj
deleted file mode 100644
index f6201c1d1..000000000
--- a/Aaru.Metadata/Aaru.Metadata.csproj
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{9F213318-5CB8-4066-A757-074489C9F818}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <RootNamespace>Aaru.Metadata</RootNamespace>
-    <AssemblyName>Aaru.Metadata</AssemblyName>
-    <ReleaseVersion>$(Version)</ReleaseVersion>
-    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
-    <TargetFramework>net461</TargetFramework>
-    <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-    <Version>4.5.99.1693</Version>
-    <Company>Claunia.com</Company>
-    <Copyright>Copyright © 2011-2018 Natalia Portillo</Copyright>
-    <Product>Aaru Data Preservation Suite</Product>
-    <Title>Aaru.Metadata</Title>
-    <ApplicationVersion>$(Version)</ApplicationVersion>
-  </PropertyGroup>
-  <PropertyGroup>
-    <NrtRevisionFormat>$(Version)-{chash:8} built by {mname} in $(Configuration){!:, modified}</NrtRevisionFormat>
-    <NrtResolveSimpleAttributes>true</NrtResolveSimpleAttributes>
-    <NrtShowRevision>true</NrtShowRevision>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>full</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\CICMMetadata\dotnet\cicm.cs">
-      <Link>cicm.cs</Link>
-    </Compile>
-    <Compile Include="Dimensions.cs" />
-    <Compile Include="MediaType.cs" />
-    <Compile Include="DeviceReport.cs" />
-    <Compile Include="Statistics.cs" />
-    <Compile Include="Resume.cs" />
-    <Compile Include="ExtentsConverter.cs" />
-    <Compile Include="Version.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Aaru.CommonTypes\Aaru.CommonTypes.csproj">
-      <Project>{F2B84194-26EB-4227-B1C5-6602517E85AE}</Project>
-      <Name>Aaru.CommonTypes</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Aaru.Decoders\Aaru.Decoders.csproj">
-      <Project>{0BEB3088-B634-4289-AE17-CDF2D25D00D5}</Project>
-      <Name>Aaru.Decoders</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Aaru.Helpers\Aaru.Helpers.csproj">
-      <Project>{F8BDF57B-1571-4CD0-84B3-B422088D359A}</Project>
-      <Name>Aaru.Helpers</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Aaru.Interop\Aaru.Interop.csproj">
-      <Project>{9183f2e0-a879-4f23-9ee3-c6908f1332b2}</Project>
-      <Name>Aaru.Interop</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="..\LICENSE.LGPL">
-      <Link>LICENSE.LGPL</Link>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Unclassified.NetRevisionTask" Version="0.2.2-beta" />
-  </ItemGroup>
-  <ProjectExtensions>
-    <MonoDevelop>
-      <Properties>
-        <Policies>
-          <StandardHeader IncludeInNewFiles="True" Text="/***************************************************************************&#xA;Aaru Data Preservation Suite&#xA;----------------------------------------------------------------------------&#xA; &#xA;Filename       : ${FileName}&#xA;Author(s)      : ${AuthorName} &lt;${AuthorEmail}&gt;&#xA;&#xA;Component      : Component&#xA; &#xA;--[ Description ] ----------------------------------------------------------&#xA; &#xA;    Description&#xA; &#xA;--[ License ] --------------------------------------------------------------&#xA; &#xA;    This library is free software; you can redistribute it and/or modify&#xA;    it under the terms of the GNU Lesser General Public License as&#xA;    published by the Free Software Foundation; either version 2.1 of the&#xA;    License, or (at your option) any later version.&#xA;&#xA;    This library is distributed in the hope that it will be useful, but&#xA;    WITHOUT ANY WARRANTY; without even the implied warranty of&#xA;    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU&#xA;    Lesser General Public License for more details.&#xA;&#xA;    You should have received a copy of the GNU Lesser General Public&#xA;    License along with this library; if not, see &lt;http://www.gnu.org/licenses/&gt;.&#xA;&#xA;----------------------------------------------------------------------------&#xA;Copyright © 2011-${Year} ${CopyrightHolder}&#xA;****************************************************************************/" />
-          <TextStylePolicy FileWidth="120" TabWidth="4" IndentWidth="4" RemoveTrailingWhitespace="True" NoTabsAfterNonTabs="False" EolMarker="Native" TabsToSpaces="True" scope="text/x-csharp" />
-          <CSharpFormattingPolicy IndentBlock="True" IndentBraces="False" IndentSwitchSection="True" IndentSwitchCaseSection="True" LabelPositioning="OneLess" NewLinesForBracesInTypes="True" NewLinesForBracesInMethods="True" NewLinesForBracesInProperties="True" NewLinesForBracesInAccessors="True" NewLinesForBracesInAnonymousMethods="True" NewLinesForBracesInControlBlocks="True" NewLinesForBracesInAnonymousTypes="True" NewLinesForBracesInObjectCollectionArrayInitializers="True" NewLinesForBracesInLambdaExpressionBody="True" NewLineForElse="True" NewLineForCatch="True" NewLineForFinally="True" NewLineForMembersInObjectInit="True" NewLineForMembersInAnonymousTypes="True" NewLineForClausesInQuery="True" SpacingAfterMethodDeclarationName="False" SpaceWithinMethodDeclarationParenthesis="False" SpaceBetweenEmptyMethodDeclarationParentheses="False" SpaceAfterMethodCallName="False" SpaceWithinMethodCallParentheses="False" SpaceBetweenEmptyMethodCallParentheses="False" SpaceWithinExpressionParentheses="False" SpaceWithinCastParentheses="False" SpaceWithinOtherParentheses="False" SpaceAfterCast="False" SpacesIgnoreAroundVariableDeclaration="False" SpaceBeforeOpenSquareBracket="False" SpaceBetweenEmptySquareBrackets="False" SpaceWithinSquareBrackets="False" SpaceAfterColonInBaseTypeDeclaration="True" SpaceAfterComma="True" SpaceAfterDot="False" SpaceAfterSemicolonsInForStatement="True" SpaceBeforeColonInBaseTypeDeclaration="True" SpaceBeforeComma="False" SpaceBeforeDot="False" SpaceBeforeSemicolonsInForStatement="False" SpacingAroundBinaryOperator="Single" WrappingPreserveSingleLine="True" WrappingKeepStatementsOnSingleLine="True" PlaceSystemDirectiveFirst="True" SpaceAfterControlFlowStatementKeyword="False" scope="text/x-csharp" />
-        </Policies>
-      </Properties>
-    </MonoDevelop>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/Aaru.Partitions/Acorn.cs b/Aaru.Partitions/Acorn.cs
index 462e3ac1b..5bd5566c7 100644
--- a/Aaru.Partitions/Acorn.cs
+++ b/Aaru.Partitions/Acorn.cs
@@ -62,25 +62,32 @@ namespace Aaru.Partitions
             ulong sbSector;
 
             // RISC OS always checks for the partition on 0. Afaik no emulator chains it.
-            if(sectorOffset != 0) return false;
+            if(sectorOffset != 0)
+                return false;
 
-            if(imagePlugin.Info.SectorSize > ADFS_SB_POS) sbSector = 0;
-            else sbSector                                          = ADFS_SB_POS / imagePlugin.Info.SectorSize;
+            if(imagePlugin.Info.SectorSize > ADFS_SB_POS)
+                sbSector = 0;
+            else
+                sbSector = ADFS_SB_POS / imagePlugin.Info.SectorSize;
 
             byte[] sector = imagePlugin.ReadSector(sbSector);
 
-            if(sector.Length < 512) return false;
+            if(sector.Length < 512)
+                return false;
 
             AcornBootBlock bootBlock = Marshal.ByteArrayToStructureLittleEndian<AcornBootBlock>(sector);
 
-            int checksum                            = 0;
-            for(int i = 0; i < 0x1FF; i++) checksum = (checksum & 0xFF) + (checksum >> 8) + sector[i];
+            int checksum = 0;
+
+            for(int i = 0; i < 0x1FF; i++)
+                checksum = (checksum & 0xFF) + (checksum >> 8) + sector[i];
 
             int heads     = bootBlock.discRecord.heads + ((bootBlock.discRecord.lowsector >> 6) & 1);
             int secCyl    = bootBlock.discRecord.spt * heads;
             int mapSector = bootBlock.startCylinder  * secCyl;
 
-            if((ulong)mapSector >= imagePlugin.Info.Sectors) return false;
+            if((ulong)mapSector >= imagePlugin.Info.Sectors)
+                return false;
 
             byte[] map = imagePlugin.ReadSector((ulong)mapSector);
 
@@ -88,17 +95,15 @@ namespace Aaru.Partitions
 
             if(checksum == bootBlock.checksum)
             {
-                Partition part = new Partition
+                var part = new Partition
                 {
-                    Size =
-                        (ulong)bootBlock.discRecord.disc_size_high * 0x100000000 + bootBlock.discRecord.disc_size,
-                    Length =
-                        ((ulong)bootBlock.discRecord.disc_size_high * 0x100000000 +
-                         bootBlock.discRecord.disc_size) / imagePlugin.Info.SectorSize,
+                    Size = ((ulong)bootBlock.discRecord.disc_size_high * 0x100000000) + bootBlock.discRecord.disc_size,
+                    Length = (((ulong)bootBlock.discRecord.disc_size_high * 0x100000000) +
+                              bootBlock.discRecord.disc_size) / imagePlugin.Info.SectorSize,
                     Type = "ADFS",
-                    Name = StringHandlers.CToString(bootBlock.discRecord.disc_name,
-                                                    Encoding.GetEncoding("iso-8859-1"))
+                    Name = StringHandlers.CToString(bootBlock.discRecord.disc_name, Encoding.GetEncoding("iso-8859-1"))
                 };
+
                 if(part.Size > 0)
                 {
                     partitions.Add(part);
@@ -114,16 +119,17 @@ namespace Aaru.Partitions
 
                     foreach(LinuxEntry entry in table.entries)
                     {
-                        Partition part = new Partition
+                        var part = new Partition
                         {
-                            Start    = (ulong)(mapSector + entry.start),
-                            Size     = entry.size,
-                            Length   = (ulong)(entry.size * sector.Length),
-                            Sequence = counter,
-                            Scheme   = Name
+                            Start  = (ulong)(mapSector + entry.start), Size        = entry.size,
+                            Length = (ulong)(entry.size * sector.Length), Sequence = counter, Scheme = Name
                         };
+
                         part.Offset = part.Start * (ulong)sector.Length;
-                        if(entry.magic != LINUX_MAGIC && entry.magic != SWAP_MAGIC) continue;
+
+                        if(entry.magic != LINUX_MAGIC &&
+                           entry.magic != SWAP_MAGIC)
+                            continue;
 
                         partitions.Add(part);
                         counter++;
@@ -139,17 +145,18 @@ namespace Aaru.Partitions
                     if(table.magic == RISCIX_MAGIC)
                         foreach(RiscIxEntry entry in table.partitions)
                         {
-                            Partition part = new Partition
+                            var part = new Partition
                             {
-                                Start    = (ulong)(mapSector + entry.start),
-                                Size     = entry.length,
+                                Start    = (ulong)(mapSector + entry.start), Size = entry.length,
                                 Length   = (ulong)(entry.length * sector.Length),
                                 Name     = StringHandlers.CToString(entry.name, Encoding.GetEncoding("iso-8859-1")),
-                                Sequence = counter,
-                                Scheme   = Name
+                                Sequence = counter, Scheme = Name
                             };
+
                             part.Offset = part.Start * (ulong)sector.Length;
-                            if(entry.length <= 0) continue;
+
+                            if(entry.length <= 0)
+                                continue;
 
                             partitions.Add(part);
                             counter++;
@@ -165,77 +172,77 @@ namespace Aaru.Partitions
         [StructLayout(LayoutKind.Sequential)]
         struct DiscRecord
         {
-            public byte   log2secsize;
-            public byte   spt;
-            public byte   heads;
-            public byte   density;
-            public byte   idlen;
-            public byte   log2bpmb;
-            public byte   skew;
-            public byte   bootoption;
-            public byte   lowsector;
-            public byte   nzones;
-            public ushort zone_spare;
-            public uint   root;
-            public uint   disc_size;
-            public ushort disc_id;
+            public readonly byte   log2secsize;
+            public readonly byte   spt;
+            public readonly byte   heads;
+            public readonly byte   density;
+            public readonly byte   idlen;
+            public readonly byte   log2bpmb;
+            public readonly byte   skew;
+            public readonly byte   bootoption;
+            public readonly byte   lowsector;
+            public readonly byte   nzones;
+            public readonly ushort zone_spare;
+            public readonly uint   root;
+            public readonly uint   disc_size;
+            public readonly ushort disc_id;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 10)]
-            public byte[] disc_name;
-            public uint disc_type;
-            public uint disc_size_high;
-            public byte flags;
-            public byte nzones_high;
-            public uint format_version;
-            public uint root_size;
+            public readonly byte[] disc_name;
+            public readonly uint disc_type;
+            public readonly uint disc_size_high;
+            public readonly byte flags;
+            public readonly byte nzones_high;
+            public readonly uint format_version;
+            public readonly uint root_size;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public byte[] reserved;
+            public readonly byte[] reserved;
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct AcornBootBlock
         {
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 0x1C0)]
-            public byte[] spare;
-            public DiscRecord discRecord;
-            public byte       flags;
-            public ushort     startCylinder;
-            public byte       checksum;
+            public readonly byte[] spare;
+            public readonly DiscRecord discRecord;
+            public readonly byte       flags;
+            public readonly ushort     startCylinder;
+            public readonly byte       checksum;
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct LinuxTable
         {
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 42)]
-            public LinuxEntry[] entries;
+            public readonly LinuxEntry[] entries;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public byte[] padding;
+            public readonly byte[] padding;
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct LinuxEntry
         {
-            public uint magic;
-            public uint start;
-            public uint size;
+            public readonly uint magic;
+            public readonly uint start;
+            public readonly uint size;
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct RiscIxTable
         {
-            public uint magic;
-            public uint date;
+            public readonly uint magic;
+            public readonly uint date;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public RiscIxEntry[] partitions;
+            public readonly RiscIxEntry[] partitions;
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct RiscIxEntry
         {
-            public uint start;
-            public uint length;
-            public uint one;
+            public readonly uint start;
+            public readonly uint length;
+            public readonly uint one;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public byte[] name;
+            public readonly byte[] name;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Partitions/AppleMap.cs b/Aaru.Partitions/AppleMap.cs
index b0fe16d1b..138f88aab 100644
--- a/Aaru.Partitions/AppleMap.cs
+++ b/Aaru.Partitions/AppleMap.cs
@@ -62,14 +62,16 @@ namespace Aaru.Partitions
         {
             uint sectorSize;
 
-            if(imagePlugin.Info.SectorSize == 2352 || imagePlugin.Info.SectorSize == 2448) sectorSize = 2048;
+            if(imagePlugin.Info.SectorSize == 2352 ||
+               imagePlugin.Info.SectorSize == 2448)
+                sectorSize = 2048;
             else
-                sectorSize =
-                    imagePlugin.Info.SectorSize;
+                sectorSize = imagePlugin.Info.SectorSize;
 
             partitions = new List<Partition>();
 
-            if(sectorOffset + 2 >= imagePlugin.Info.Sectors) return false;
+            if(sectorOffset + 2 >= imagePlugin.Info.Sectors)
+                return false;
 
             byte[] ddmSector = imagePlugin.ReadSector(sectorOffset);
 
@@ -82,15 +84,16 @@ namespace Aaru.Partitions
                 ddmSector  = tmp;
                 maxDrivers = 29;
             }
-            else if(sectorSize < 256) return false;
+            else if(sectorSize < 256)
+                return false;
 
             AppleDriverDescriptorMap ddm = Marshal.ByteArrayToStructureBigEndian<AppleDriverDescriptorMap>(ddmSector);
 
-            AaruConsole.DebugWriteLine("AppleMap Plugin", "ddm.sbSig = 0x{0:X4}",  ddm.sbSig);
+            AaruConsole.DebugWriteLine("AppleMap Plugin", "ddm.sbSig = 0x{0:X4}", ddm.sbSig);
             AaruConsole.DebugWriteLine("AppleMap Plugin", "ddm.sbBlockSize = {0}", ddm.sbBlockSize);
-            AaruConsole.DebugWriteLine("AppleMap Plugin", "ddm.sbBlocks = {0}",    ddm.sbBlocks);
-            AaruConsole.DebugWriteLine("AppleMap Plugin", "ddm.sbDevType = {0}",   ddm.sbDevType);
-            AaruConsole.DebugWriteLine("AppleMap Plugin", "ddm.sbDevId = {0}",     ddm.sbDevId);
+            AaruConsole.DebugWriteLine("AppleMap Plugin", "ddm.sbBlocks = {0}", ddm.sbBlocks);
+            AaruConsole.DebugWriteLine("AppleMap Plugin", "ddm.sbDevType = {0}", ddm.sbDevType);
+            AaruConsole.DebugWriteLine("AppleMap Plugin", "ddm.sbDevId = {0}", ddm.sbDevId);
             AaruConsole.DebugWriteLine("AppleMap Plugin", "ddm.sbData = 0x{0:X8}", ddm.sbData);
             AaruConsole.DebugWriteLine("AppleMap Plugin", "ddm.sbDrvrCount = {0}", ddm.sbDrvrCount);
 
@@ -100,31 +103,36 @@ namespace Aaru.Partitions
                 if(ddm.sbDrvrCount < maxDrivers)
                 {
                     ddm.sbMap = new AppleDriverEntry[ddm.sbDrvrCount];
+
                     for(int i = 0; i < ddm.sbDrvrCount; i++)
                     {
                         byte[] tmp = new byte[8];
-                        Array.Copy(ddmSector, 18 + i * 8, tmp, 0, 8);
+                        Array.Copy(ddmSector, 18 + (i * 8), tmp, 0, 8);
                         ddm.sbMap[i] = Marshal.ByteArrayToStructureBigEndian<AppleDriverEntry>(tmp);
+
                         AaruConsole.DebugWriteLine("AppleMap Plugin", "ddm.sbMap[{1}].ddBlock = {0}",
-                                                  ddm.sbMap[i].ddBlock, i);
-                        AaruConsole.DebugWriteLine("AppleMap Plugin", "ddm.sbMap[{1}].ddSize = {0}", ddm.sbMap[i].ddSize,
-                                                  i);
-                        AaruConsole.DebugWriteLine("AppleMap Plugin", "ddm.sbMap[{1}].ddType = {0}", ddm.sbMap[i].ddType,
-                                                  i);
+                                                   ddm.sbMap[i].ddBlock, i);
 
-                        if(ddm.sbMap[i].ddSize == 0) continue;
+                        AaruConsole.DebugWriteLine("AppleMap Plugin", "ddm.sbMap[{1}].ddSize = {0}",
+                                                   ddm.sbMap[i].ddSize, i);
 
-                        Partition part = new Partition
+                        AaruConsole.DebugWriteLine("AppleMap Plugin", "ddm.sbMap[{1}].ddType = {0}",
+                                                   ddm.sbMap[i].ddType, i);
+
+                        if(ddm.sbMap[i].ddSize == 0)
+                            continue;
+
+                        var part = new Partition
                         {
-                            Size     = (ulong)(ddm.sbMap[i].ddSize       * 512),
-                            Length   = (ulong)(ddm.sbMap[i].ddSize * 512 / sectorSize),
-                            Sequence = sequence,
-                            Offset   = ddm.sbMap[i].ddBlock * sectorSize,
-                            Start    = ddm.sbMap[i].ddBlock + sectorOffset,
-                            Type     = "Apple_Driver"
+                            Size   = (ulong)(ddm.sbMap[i].ddSize         * 512),
+                            Length = (ulong)((ddm.sbMap[i].ddSize * 512) / sectorSize), Sequence = sequence,
+                            Offset = ddm.sbMap[i].ddBlock * sectorSize,
+                            Start  = ddm.sbMap[i].ddBlock + sectorOffset,
+                            Type   = "Apple_Driver"
                         };
 
-                        if(ddm.sbMap[i].ddSize * 512 % sectorSize > 0) part.Length++;
+                        if((ddm.sbMap[i].ddSize * 512) % sectorSize > 0)
+                            part.Length++;
 
                         partitions.Add(part);
 
@@ -133,6 +141,7 @@ namespace Aaru.Partitions
                 }
 
             byte[] partSector = imagePlugin.ReadSector(1 + sectorOffset);
+
             AppleOldDevicePartitionMap oldMap =
                 Marshal.ByteArrayToStructureBigEndian<AppleOldDevicePartitionMap>(partSector);
 
@@ -143,31 +152,35 @@ namespace Aaru.Partitions
                 {
                     byte[] tmp = new byte[12];
                     Array.Copy(partSector, i, tmp, 0, 12);
+
                     AppleMapOldPartitionEntry oldEntry =
                         Marshal.ByteArrayToStructureBigEndian<AppleMapOldPartitionEntry>(tmp);
-                    AaruConsole.DebugWriteLine("AppleMap Plugin", "old_map.sbMap[{1}].pdStart = {0}", oldEntry.pdStart,
-                                              (i - 2) / 12);
-                    AaruConsole.DebugWriteLine("AppleMap Plugin", "old_map.sbMap[{1}].pdSize = {0}", oldEntry.pdSize,
-                                              (i - 2) / 12);
-                    AaruConsole.DebugWriteLine("AppleMap Plugin", "old_map.sbMap[{1}].pdFSID = 0x{0:X8}",
-                                              oldEntry.pdFSID, (i - 2) / 12);
 
-                    if(oldEntry.pdSize == 0 && oldEntry.pdFSID == 0)
+                    AaruConsole.DebugWriteLine("AppleMap Plugin", "old_map.sbMap[{1}].pdStart = {0}", oldEntry.pdStart,
+                                               (i - 2) / 12);
+
+                    AaruConsole.DebugWriteLine("AppleMap Plugin", "old_map.sbMap[{1}].pdSize = {0}", oldEntry.pdSize,
+                                               (i - 2) / 12);
+
+                    AaruConsole.DebugWriteLine("AppleMap Plugin", "old_map.sbMap[{1}].pdFSID = 0x{0:X8}",
+                                               oldEntry.pdFSID, (i - 2) / 12);
+
+                    if(oldEntry.pdSize == 0 &&
+                       oldEntry.pdFSID == 0)
                     {
-                        if(oldEntry.pdStart == 0) break;
+                        if(oldEntry.pdStart == 0)
+                            break;
 
                         continue;
                     }
 
-                    Partition part = new Partition
+                    var part = new Partition
                     {
-                        Size     = oldEntry.pdStart                   * ddm.sbBlockSize,
-                        Length   = oldEntry.pdStart * ddm.sbBlockSize / sectorSize,
-                        Sequence = sequence,
-                        Offset   = oldEntry.pdSize                   * ddm.sbBlockSize,
-                        Start    = oldEntry.pdSize * ddm.sbBlockSize / sectorSize,
-                        Scheme   = Name,
-                        Type     = oldEntry.pdFSID == HFS_MAGIC_OLD ? "Apple_HFS" : $"0x{oldEntry.pdFSID:X8}"
+                        Size   = oldEntry.pdStart                     * ddm.sbBlockSize,
+                        Length = (oldEntry.pdStart * ddm.sbBlockSize) / sectorSize, Sequence = sequence,
+                        Offset = oldEntry.pdSize                      * ddm.sbBlockSize,
+                        Start  = (oldEntry.pdSize * ddm.sbBlockSize)  / sectorSize, Scheme = Name,
+                        Type   = oldEntry.pdFSID == HFS_MAGIC_OLD ? "Apple_HFS" : $"0x{oldEntry.pdFSID:X8}"
                     };
 
                     partitions.Add(part);
@@ -190,6 +203,7 @@ namespace Aaru.Partitions
                 byte[] tmp = new byte[512];
                 Array.Copy(ddmSector, 512, tmp, 0, 512);
                 entry = Marshal.ByteArrayToStructureBigEndian<AppleMapPartitionEntry>(tmp);
+
                 // Check for a partition entry that's 512-byte aligned
                 if(entry.signature == APM_MAGIC)
                 {
@@ -197,11 +211,12 @@ namespace Aaru.Partitions
                     entrySize     = 512;
                     entryCount    = entry.entries;
                     skipDdm       = 512;
-                    sectorsToRead = (entryCount + 1) * 512 / sectorSize + 1;
+                    sectorsToRead = (((entryCount + 1) * 512) / sectorSize) + 1;
                 }
                 else
                 {
                     entry = Marshal.ByteArrayToStructureBigEndian<AppleMapPartitionEntry>(partSector);
+
                     if(entry.signature == APM_MAGIC)
                     {
                         AaruConsole.DebugWriteLine("AppleMap Plugin", "Found aligned entry.");
@@ -210,12 +225,14 @@ namespace Aaru.Partitions
                         skipDdm       = sectorSize;
                         sectorsToRead = entryCount + 2;
                     }
-                    else return partitions.Count > 0;
+                    else
+                        return partitions.Count > 0;
                 }
             }
             else
             {
                 entry = Marshal.ByteArrayToStructureBigEndian<AppleMapPartitionEntry>(partSector);
+
                 if(entry.signature == APM_MAGIC)
                 {
                     AaruConsole.DebugWriteLine("AppleMap Plugin", "Found aligned entry.");
@@ -224,13 +241,14 @@ namespace Aaru.Partitions
                     skipDdm       = sectorSize;
                     sectorsToRead = entryCount + 2;
                 }
-                else return partitions.Count > 0;
+                else
+                    return partitions.Count > 0;
             }
 
             byte[] entries = imagePlugin.ReadSectors(sectorOffset, sectorsToRead);
-            AaruConsole.DebugWriteLine("AppleMap Plugin", "entry_size = {0}",      entrySize);
-            AaruConsole.DebugWriteLine("AppleMap Plugin", "entry_count = {0}",     entryCount);
-            AaruConsole.DebugWriteLine("AppleMap Plugin", "skip_ddm = {0}",        skipDdm);
+            AaruConsole.DebugWriteLine("AppleMap Plugin", "entry_size = {0}", entrySize);
+            AaruConsole.DebugWriteLine("AppleMap Plugin", "entry_count = {0}", entryCount);
+            AaruConsole.DebugWriteLine("AppleMap Plugin", "skip_ddm = {0}", skipDdm);
             AaruConsole.DebugWriteLine("AppleMap Plugin", "sectors_to_read = {0}", sectorsToRead);
 
             byte[] copy = new byte[entries.Length - skipDdm];
@@ -242,67 +260,96 @@ namespace Aaru.Partitions
                 byte[] tmp = new byte[entrySize];
                 Array.Copy(entries, i * entrySize, tmp, 0, entrySize);
                 entry = Marshal.ByteArrayToStructureBigEndian<AppleMapPartitionEntry>(tmp);
-                if(entry.signature != APM_MAGIC) continue;
+
+                if(entry.signature != APM_MAGIC)
+                    continue;
 
                 AaruConsole.DebugWriteLine("AppleMap Plugin", "dpme[{0}].signature = 0x{1:X4}", i, entry.signature);
                 AaruConsole.DebugWriteLine("AppleMap Plugin", "dpme[{0}].reserved1 = 0x{1:X4}", i, entry.reserved1);
-                AaruConsole.DebugWriteLine("AppleMap Plugin", "dpme[{0}].entries = {1}",        i, entry.entries);
-                AaruConsole.DebugWriteLine("AppleMap Plugin", "dpme[{0}].start = {1}",          i, entry.start);
-                AaruConsole.DebugWriteLine("AppleMap Plugin", "dpme[{0}].sectors = {1}",        i, entry.sectors);
-                AaruConsole.DebugWriteLine("AppleMap Plugin", "dpme[{0}].name = \"{1}\"", i,
-                                          StringHandlers.CToString(entry.name));
-                AaruConsole.DebugWriteLine("AppleMap Plugin", "dpme[{0}].type = \"{1}\"", i,
-                                          StringHandlers.CToString(entry.type));
-                AaruConsole.DebugWriteLine("AppleMap Plugin", "dpme[{0}].first_data_block = {1}", i,
-                                          entry.first_data_block);
-                AaruConsole.DebugWriteLine("AppleMap Plugin", "dpme[{0}].data_sectors = {1}", i, entry.data_sectors);
-                AaruConsole.DebugWriteLine("AppleMap Plugin", "dpme[{0}].flags = {1}", i,
-                                          (AppleMapFlags)entry.flags);
-                AaruConsole.DebugWriteLine("AppleMap Plugin", "dpme[{0}].first_boot_block = {1}", i,
-                                          entry.first_boot_block);
-                AaruConsole.DebugWriteLine("AppleMap Plugin", "dpme[{0}].boot_size = {1}", i, entry.boot_size);
-                AaruConsole.DebugWriteLine("AppleMap Plugin", "dpme[{0}].load_address = 0x{1:X8}", i,
-                                          entry.load_address);
-                AaruConsole.DebugWriteLine("AppleMap Plugin", "dpme[{0}].load_address2 = 0x{1:X8}", i,
-                                          entry.load_address2);
-                AaruConsole.DebugWriteLine("AppleMap Plugin", "dpme[{0}].entry_point = 0x{1:X8}", i, entry.entry_point);
-                AaruConsole.DebugWriteLine("AppleMap Plugin", "dpme[{0}].entry_point2 = 0x{1:X8}", i,
-                                          entry.entry_point2);
-                AaruConsole.DebugWriteLine("AppleMap Plugin", "dpme[{0}].checksum = 0x{1:X8}", i, entry.checksum);
-                AaruConsole.DebugWriteLine("AppleMap Plugin", "dpme[{0}].processor = \"{1}\"", i,
-                                          StringHandlers.CToString(entry.processor));
+                AaruConsole.DebugWriteLine("AppleMap Plugin", "dpme[{0}].entries = {1}", i, entry.entries);
+                AaruConsole.DebugWriteLine("AppleMap Plugin", "dpme[{0}].start = {1}", i, entry.start);
+                AaruConsole.DebugWriteLine("AppleMap Plugin", "dpme[{0}].sectors = {1}", i, entry.sectors);
 
-                AppleMapFlags flags = (AppleMapFlags)entry.flags;
+                AaruConsole.DebugWriteLine("AppleMap Plugin", "dpme[{0}].name = \"{1}\"", i,
+                                           StringHandlers.CToString(entry.name));
+
+                AaruConsole.DebugWriteLine("AppleMap Plugin", "dpme[{0}].type = \"{1}\"", i,
+                                           StringHandlers.CToString(entry.type));
+
+                AaruConsole.DebugWriteLine("AppleMap Plugin", "dpme[{0}].first_data_block = {1}", i,
+                                           entry.first_data_block);
+
+                AaruConsole.DebugWriteLine("AppleMap Plugin", "dpme[{0}].data_sectors = {1}", i, entry.data_sectors);
+                AaruConsole.DebugWriteLine("AppleMap Plugin", "dpme[{0}].flags = {1}", i, (AppleMapFlags)entry.flags);
+
+                AaruConsole.DebugWriteLine("AppleMap Plugin", "dpme[{0}].first_boot_block = {1}", i,
+                                           entry.first_boot_block);
+
+                AaruConsole.DebugWriteLine("AppleMap Plugin", "dpme[{0}].boot_size = {1}", i, entry.boot_size);
+
+                AaruConsole.DebugWriteLine("AppleMap Plugin", "dpme[{0}].load_address = 0x{1:X8}", i,
+                                           entry.load_address);
+
+                AaruConsole.DebugWriteLine("AppleMap Plugin", "dpme[{0}].load_address2 = 0x{1:X8}", i,
+                                           entry.load_address2);
+
+                AaruConsole.DebugWriteLine("AppleMap Plugin", "dpme[{0}].entry_point = 0x{1:X8}", i, entry.entry_point);
+
+                AaruConsole.DebugWriteLine("AppleMap Plugin", "dpme[{0}].entry_point2 = 0x{1:X8}", i,
+                                           entry.entry_point2);
+
+                AaruConsole.DebugWriteLine("AppleMap Plugin", "dpme[{0}].checksum = 0x{1:X8}", i, entry.checksum);
+
+                AaruConsole.DebugWriteLine("AppleMap Plugin", "dpme[{0}].processor = \"{1}\"", i,
+                                           StringHandlers.CToString(entry.processor));
+
+                var flags = (AppleMapFlags)entry.flags;
 
                 // BeOS doesn't mark its partitions as valid
                 //if(flags.HasFlag(AppleMapFlags.Valid) &&
-                if(StringHandlers.CToString(entry.type) == "Apple_partition_map" || entry.sectors <= 0) continue;
+                if(StringHandlers.CToString(entry.type) == "Apple_partition_map" ||
+                   entry.sectors                        <= 0)
+                    continue;
 
-                StringBuilder sb = new StringBuilder();
+                var sb = new StringBuilder();
 
-                Partition partition = new Partition
+                var partition = new Partition
                 {
-                    Sequence = sequence,
-                    Type     = StringHandlers.CToString(entry.type),
-                    Name     = StringHandlers.CToString(entry.name),
-                    Offset   = entry.start   * entrySize,
-                    Size     = entry.sectors * entrySize,
-                    Start    = entry.start * entrySize / sectorSize + sectorOffset,
-                    Length   = entry.sectors           * entrySize / sectorSize,
-                    Scheme   = Name
+                    Sequence = sequence, Type                               = StringHandlers.CToString(entry.type),
+                    Name     = StringHandlers.CToString(entry.name), Offset = entry.start * entrySize,
+                    Size     = entry.sectors                                              * entrySize,
+                    Start    = ((entry.start * entrySize) / sectorSize) + sectorOffset,
+                    Length =
+                        (entry.sectors *
+                         entrySize) / sectorSize,
+                    Scheme = Name
                 };
+
                 sb.AppendLine("Partition flags:");
-                if(flags.HasFlag(AppleMapFlags.Valid)) sb.AppendLine("Partition is valid.");
-                if(flags.HasFlag(AppleMapFlags.Allocated)) sb.AppendLine("Partition entry is allocated.");
-                if(flags.HasFlag(AppleMapFlags.InUse)) sb.AppendLine("Partition is in use.");
-                if(flags.HasFlag(AppleMapFlags.Bootable)) sb.AppendLine("Partition is bootable.");
-                if(flags.HasFlag(AppleMapFlags.Readable)) sb.AppendLine("Partition is readable.");
-                if(flags.HasFlag(AppleMapFlags.Writable)) sb.AppendLine("Partition is writable.");
+
+                if(flags.HasFlag(AppleMapFlags.Valid))
+                    sb.AppendLine("Partition is valid.");
+
+                if(flags.HasFlag(AppleMapFlags.Allocated))
+                    sb.AppendLine("Partition entry is allocated.");
+
+                if(flags.HasFlag(AppleMapFlags.InUse))
+                    sb.AppendLine("Partition is in use.");
+
+                if(flags.HasFlag(AppleMapFlags.Bootable))
+                    sb.AppendLine("Partition is bootable.");
+
+                if(flags.HasFlag(AppleMapFlags.Readable))
+                    sb.AppendLine("Partition is readable.");
+
+                if(flags.HasFlag(AppleMapFlags.Writable))
+                    sb.AppendLine("Partition is writable.");
 
                 if(flags.HasFlag(AppleMapFlags.Bootable))
                 {
-                    sb.AppendFormat("First boot sector: {0}", entry.first_boot_block * entrySize / sectorSize)
-                      .AppendLine();
+                    sb.AppendFormat("First boot sector: {0}", (entry.first_boot_block * entrySize) / sectorSize).
+                       AppendLine();
+
                     sb.AppendFormat("Boot is {0} bytes.", entry.boot_size).AppendLine();
                     sb.AppendFormat("Boot load address: 0x{0:X8}", entry.load_address).AppendLine();
                     sb.AppendFormat("Boot entry point: 0x{0:X8}", entry.entry_point).AppendLine();
@@ -314,24 +361,29 @@ namespace Aaru.Partitions
                 }
 
                 partition.Description = sb.ToString();
-                if(partition.Start < imagePlugin.Info.Sectors && partition.End < imagePlugin.Info.Sectors)
+
+                if(partition.Start < imagePlugin.Info.Sectors &&
+                   partition.End   < imagePlugin.Info.Sectors)
                 {
                     partitions.Add(partition);
                     sequence++;
                 }
+
                 // Some CD and DVDs end with an Apple_Free that expands beyond the disc size...
                 else if(partition.Start < imagePlugin.Info.Sectors)
                 {
-                    AaruConsole.DebugWriteLine("AppleMap Plugin", "Cutting last partition end ({0}) to media size ({1})",
-                                              partition.End, imagePlugin.Info.Sectors - 1);
+                    AaruConsole.DebugWriteLine("AppleMap Plugin",
+                                               "Cutting last partition end ({0}) to media size ({1})", partition.End,
+                                               imagePlugin.Info.Sectors - 1);
+
                     partition.Length = imagePlugin.Info.Sectors - partition.Start;
                     partitions.Add(partition);
                     sequence++;
                 }
                 else
                     AaruConsole.DebugWriteLine("AppleMap Plugin",
-                                              "Not adding partition becaus start ({0}) is outside media size ({1})",
-                                              partition.Start, imagePlugin.Info.Sectors - 1);
+                                               "Not adding partition becaus start ({0}) is outside media size ({1})",
+                                               partition.Start, imagePlugin.Info.Sectors - 1);
             }
 
             return partitions.Count > 0;
diff --git a/Aaru.Partitions/Apricot.cs b/Aaru.Partitions/Apricot.cs
index baac31264..d67b7f6b8 100644
--- a/Aaru.Partitions/Apricot.cs
+++ b/Aaru.Partitions/Apricot.cs
@@ -42,7 +42,10 @@ namespace Aaru.Partitions
 {
     public class Apricot : IPartition
     {
-        readonly int[] baudRates = {50, 75, 110, 134, 150, 300, 600, 1200, 1800, 2400, 3600, 4800, 7200, 9600, 19200};
+        readonly int[] baudRates =
+        {
+            50, 75, 110, 134, 150, 300, 600, 1200, 1800, 2400, 3600, 4800, 7200, 9600, 19200
+        };
         readonly string[] bootTypeCodes =
         {
             "Non-bootable", "Apricot & XI RAM BIOS", "Generic ROM BIOS", "Apricot & XI ROM BIOS",
@@ -52,12 +55,30 @@ namespace Aaru.Partitions
         {
             "MF1DD 70-track", "MF1DD", "MF2DD", "Winchester 5M", "Winchester 10M", "Winchester 20M"
         };
-        readonly int[]    lineModes            = {256, 200};
-        readonly int[]    lineWidths           = {80, 40};
-        readonly string[] operatingSystemCodes = {"Invalid", "MS-DOS", "UCSD Pascal", "CP/M", "Concurrent CP/M"};
-        readonly string[] parityTypes          = {"None", "Odd", "Even", "Mark", "Space"};
-        readonly string[] printDevices         = {"Parallel", "Serial"};
-        readonly double[] stopBits             = {1, 1.5, 2};
+        readonly int[] lineModes =
+        {
+            256, 200
+        };
+        readonly int[] lineWidths =
+        {
+            80, 40
+        };
+        readonly string[] operatingSystemCodes =
+        {
+            "Invalid", "MS-DOS", "UCSD Pascal", "CP/M", "Concurrent CP/M"
+        };
+        readonly string[] parityTypes =
+        {
+            "None", "Odd", "Even", "Mark", "Space"
+        };
+        readonly string[] printDevices =
+        {
+            "Parallel", "Serial"
+        };
+        readonly double[] stopBits =
+        {
+            1, 1.5, 2
+        };
 
         public string Name   => "ACT Apricot partitions";
         public Guid   Id     => new Guid("8CBF5864-7B5A-47A0-8CEB-199C74FA22DE");
@@ -68,194 +89,248 @@ namespace Aaru.Partitions
             partitions = new List<Partition>();
 
             // I think Apricot can't chain partitions so.
-            if(sectorOffset != 0) return false;
+            if(sectorOffset != 0)
+                return false;
 
             byte[] sector = imagePlugin.ReadSector(0);
 
-            if(sector.Length < 512) return false;
+            if(sector.Length < 512)
+                return false;
 
             ApricotLabel label = Marshal.ByteArrayToStructureLittleEndian<ApricotLabel>(sector);
 
             // Not much to check but...
             ulong deviceSectors              = imagePlugin.Info.Sectors;
             ulong deviceSizeAccordingToLabel = label.cylinders * label.heads * label.spt;
-            if(label.operatingSystem      > 4             || label.bootType       > 5 || label.partitionCount > 8 ||
-               deviceSizeAccordingToLabel > deviceSectors || label.firstDataBlock > deviceSectors) return false;
+
+            if(label.operatingSystem      > 4             ||
+               label.bootType             > 5             ||
+               label.partitionCount       > 8             ||
+               deviceSizeAccordingToLabel > deviceSectors ||
+               label.firstDataBlock       > deviceSectors)
+                return false;
 
             AaruConsole.DebugWriteLine("Apricot partitions", "label.version = \"{0}\"",
-                                      StringHandlers.CToString(label.version));
+                                       StringHandlers.CToString(label.version));
+
             AaruConsole.DebugWriteLine("Apricot partitions", "label.operatingSystem = {0} ({1})", label.operatingSystem,
-                                      label.operatingSystem < operatingSystemCodes.Length
-                                          ? operatingSystemCodes[label.operatingSystem]
-                                          : "Unknown");
+                                       label.operatingSystem < operatingSystemCodes.Length
+                                           ? operatingSystemCodes[label.operatingSystem] : "Unknown");
+
             AaruConsole.DebugWriteLine("Apricot partitions", "label.writeProtected = {0}", label.writeProtected);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.copyProtected = {0}",  label.copyProtected);
+            AaruConsole.DebugWriteLine("Apricot partitions", "label.copyProtected = {0}", label.copyProtected);
+
             AaruConsole.DebugWriteLine("Apricot partitions", "label.bootType = {0} ({1})", label.bootType,
-                                      label.bootType < bootTypeCodes.Length
-                                          ? bootTypeCodes[label.bootType]
-                                          : "Unknown");
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.partitionCount = {0}",   label.partitionCount);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.winchester = {0}",       label.winchester);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.sectorSize = {0}",       label.sectorSize);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.spt = {0}",              label.spt);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.cylinders = {0}",        label.cylinders);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.heads = {0}",            label.heads);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.interleave = {0}",       label.interleave);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.skew = {0}",             label.skew);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.bootLocation = {0}",     label.bootLocation);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.bootSize = {0}",         label.bootSize);
+                                       label.bootType < bootTypeCodes.Length ? bootTypeCodes[label.bootType]
+                                           : "Unknown");
+
+            AaruConsole.DebugWriteLine("Apricot partitions", "label.partitionCount = {0}", label.partitionCount);
+            AaruConsole.DebugWriteLine("Apricot partitions", "label.winchester = {0}", label.winchester);
+            AaruConsole.DebugWriteLine("Apricot partitions", "label.sectorSize = {0}", label.sectorSize);
+            AaruConsole.DebugWriteLine("Apricot partitions", "label.spt = {0}", label.spt);
+            AaruConsole.DebugWriteLine("Apricot partitions", "label.cylinders = {0}", label.cylinders);
+            AaruConsole.DebugWriteLine("Apricot partitions", "label.heads = {0}", label.heads);
+            AaruConsole.DebugWriteLine("Apricot partitions", "label.interleave = {0}", label.interleave);
+            AaruConsole.DebugWriteLine("Apricot partitions", "label.skew = {0}", label.skew);
+            AaruConsole.DebugWriteLine("Apricot partitions", "label.bootLocation = {0}", label.bootLocation);
+            AaruConsole.DebugWriteLine("Apricot partitions", "label.bootSize = {0}", label.bootSize);
             AaruConsole.DebugWriteLine("Apricot partitions", "label.bootAddress = 0x{0:X8}", label.bootAddress);
+
             AaruConsole.DebugWriteLine("Apricot partitions", "label.bootOffset:label.bootSegment = {0:X4}:{1:X4}",
-                                      label.bootOffset, label.bootSegment);
+                                       label.bootOffset, label.bootSegment);
+
             AaruConsole.DebugWriteLine("Apricot partitions", "label.firstDataBlock = {0}", label.firstDataBlock);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.generation = {0}",     label.generation);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.copyCount = {0}",      label.copyCount);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.maxCopies = {0}",      label.maxCopies);
+            AaruConsole.DebugWriteLine("Apricot partitions", "label.generation = {0}", label.generation);
+            AaruConsole.DebugWriteLine("Apricot partitions", "label.copyCount = {0}", label.copyCount);
+            AaruConsole.DebugWriteLine("Apricot partitions", "label.maxCopies = {0}", label.maxCopies);
+
             AaruConsole.DebugWriteLine("Apricot partitions", "label.serialNumber = \"{0}\"",
-                                      StringHandlers.CToString(label.serialNumber));
+                                       StringHandlers.CToString(label.serialNumber));
+
             AaruConsole.DebugWriteLine("Apricot partitions", "label.partNumber = \"{0}\"",
-                                      StringHandlers.CToString(label.partNumber));
+                                       StringHandlers.CToString(label.partNumber));
+
             AaruConsole.DebugWriteLine("Apricot partitions", "label.copyright = \"{0}\"",
-                                      StringHandlers.CToString(label.copyright));
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.mainBPB.bps = {0}",      label.mainBPB.bps);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.mainBPB.spc = {0}",      label.mainBPB.spc);
+                                       StringHandlers.CToString(label.copyright));
+
+            AaruConsole.DebugWriteLine("Apricot partitions", "label.mainBPB.bps = {0}", label.mainBPB.bps);
+            AaruConsole.DebugWriteLine("Apricot partitions", "label.mainBPB.spc = {0}", label.mainBPB.spc);
             AaruConsole.DebugWriteLine("Apricot partitions", "label.mainBPB.rsectors = {0}", label.mainBPB.rsectors);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.mainBPB.fats_no = {0}",  label.mainBPB.fats_no);
+            AaruConsole.DebugWriteLine("Apricot partitions", "label.mainBPB.fats_no = {0}", label.mainBPB.fats_no);
             AaruConsole.DebugWriteLine("Apricot partitions", "label.mainBPB.root_ent = {0}", label.mainBPB.root_ent);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.mainBPB.sectors = {0}",  label.mainBPB.sectors);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.mainBPB.media = {0}",    label.mainBPB.media);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.mainBPB.spfat = {0}",    label.mainBPB.spfat);
+            AaruConsole.DebugWriteLine("Apricot partitions", "label.mainBPB.sectors = {0}", label.mainBPB.sectors);
+            AaruConsole.DebugWriteLine("Apricot partitions", "label.mainBPB.media = {0}", label.mainBPB.media);
+            AaruConsole.DebugWriteLine("Apricot partitions", "label.mainBPB.spfat = {0}", label.mainBPB.spfat);
+
             AaruConsole.DebugWriteLine("Apricot partitions", "label.mainBPB.diskType = {0} ({1})",
-                                      label.mainBPB.diskType,
-                                      label.mainBPB.diskType < diskTypeCodes.Length
-                                          ? diskTypeCodes[label.mainBPB.diskType]
-                                          : "Unknown");
+                                       label.mainBPB.diskType,
+                                       label.mainBPB.diskType < diskTypeCodes.Length
+                                           ? diskTypeCodes[label.mainBPB.diskType] : "Unknown");
+
             AaruConsole.DebugWriteLine("Apricot partitions", "label.mainBPB.startSector = {0}",
-                                      label.mainBPB.startSector);
+                                       label.mainBPB.startSector);
+
             AaruConsole.DebugWriteLine("Apricot partitions", "label.fontName = \"{0}\"",
-                                      StringHandlers.CToString(label.fontName));
+                                       StringHandlers.CToString(label.fontName));
+
             AaruConsole.DebugWriteLine("Apricot partitions", "label.keyboardName = \"{0}\"",
-                                      StringHandlers.CToString(label.keyboardName));
+                                       StringHandlers.CToString(label.keyboardName));
+
             AaruConsole.DebugWriteLine("Apricot partitions", "label.biosMajorVersion = {0}", label.biosMajorVersion);
             AaruConsole.DebugWriteLine("Apricot partitions", "label.biosMinorVersion = {0}", label.biosMinorVersion);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.diagnosticsFlag = {0}",  label.diagnosticsFlag);
+            AaruConsole.DebugWriteLine("Apricot partitions", "label.diagnosticsFlag = {0}", label.diagnosticsFlag);
+
             AaruConsole.DebugWriteLine("Apricot partitions", "label.prnDevice = {0} ({1})", label.prnDevice,
-                                      label.prnDevice < printDevices.Length
-                                          ? printDevices[label.prnDevice]
-                                          : "Unknown");
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.bellVolume = {0}",         label.bellVolume);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.enableCache = {0}",        label.enableCache);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.enableGraphics = {0}",     label.enableGraphics);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.dosLength = {0}",          label.dosLength);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.fontLength = {0}",         label.fontLength);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.keyboardLength = {0}",     label.keyboardLength);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.dosStart = {0}",           label.dosStart);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.fontStart = {0}",          label.fontStart);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.keyboardStart = {0}",      label.keyboardStart);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.keyboardVolume = {0}",     label.keyboardVolume);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.autorepeat = {0}",         label.autorepeat);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.autorepeatLeadIn = {0}",   label.autorepeatLeadIn);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.autorepeatInterval = {0}", label.autorepeatInterval);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.microscreenMode = {0}",    label.microscreenMode);
+                                       label.prnDevice < printDevices.Length ? printDevices[label.prnDevice]
+                                           : "Unknown");
+
+            AaruConsole.DebugWriteLine("Apricot partitions", "label.bellVolume = {0}", label.bellVolume);
+            AaruConsole.DebugWriteLine("Apricot partitions", "label.enableCache = {0}", label.enableCache);
+            AaruConsole.DebugWriteLine("Apricot partitions", "label.enableGraphics = {0}", label.enableGraphics);
+            AaruConsole.DebugWriteLine("Apricot partitions", "label.dosLength = {0}", label.dosLength);
+            AaruConsole.DebugWriteLine("Apricot partitions", "label.fontLength = {0}", label.fontLength);
+            AaruConsole.DebugWriteLine("Apricot partitions", "label.keyboardLength = {0}", label.keyboardLength);
+            AaruConsole.DebugWriteLine("Apricot partitions", "label.dosStart = {0}", label.dosStart);
+            AaruConsole.DebugWriteLine("Apricot partitions", "label.fontStart = {0}", label.fontStart);
+            AaruConsole.DebugWriteLine("Apricot partitions", "label.keyboardStart = {0}", label.keyboardStart);
+            AaruConsole.DebugWriteLine("Apricot partitions", "label.keyboardVolume = {0}", label.keyboardVolume);
+            AaruConsole.DebugWriteLine("Apricot partitions", "label.autorepeat = {0}", label.autorepeat);
+            AaruConsole.DebugWriteLine("Apricot partitions", "label.autorepeatLeadIn = {0}", label.autorepeatLeadIn);
+
+            AaruConsole.DebugWriteLine("Apricot partitions", "label.autorepeatInterval = {0}",
+                                       label.autorepeatInterval);
+
+            AaruConsole.DebugWriteLine("Apricot partitions", "label.microscreenMode = {0}", label.microscreenMode);
+
             AaruConsole.DebugWriteLine("Apricot partitions", "label.spareKeyboard is null? = {0}",
-                                      ArrayHelpers.ArrayIsNullOrEmpty(label.spareKeyboard));
+                                       ArrayHelpers.ArrayIsNullOrEmpty(label.spareKeyboard));
+
             AaruConsole.DebugWriteLine("Apricot partitions", "label.lineMode = {0} ({1} lines)", label.lineMode,
-                                      label.lineMode < lineModes.Length ? lineModes[label.lineMode] : 0);
+                                       label.lineMode < lineModes.Length ? lineModes[label.lineMode] : 0);
+
             AaruConsole.DebugWriteLine("Apricot partitions", "label.lineWidth = {0} ({1} columns)", label.lineWidth,
-                                      label.lineWidth < lineWidths.Length ? lineWidths[label.lineWidth] : 0);
+                                       label.lineWidth < lineWidths.Length ? lineWidths[label.lineWidth] : 0);
+
             AaruConsole.DebugWriteLine("Apricot partitions", "label.imageOff = {0}", label.imageOff);
+
             AaruConsole.DebugWriteLine("Apricot partitions", "label.spareScreen is null? = {0}",
-                                      ArrayHelpers.ArrayIsNullOrEmpty(label.spareScreen));
+                                       ArrayHelpers.ArrayIsNullOrEmpty(label.spareScreen));
+
             AaruConsole.DebugWriteLine("Apricot partitions", "label.txBaudRate = {0} ({1} bps)", label.txBaudRate,
-                                      label.txBaudRate < baudRates.Length ? baudRates[label.txBaudRate] : 0);
+                                       label.txBaudRate < baudRates.Length ? baudRates[label.txBaudRate] : 0);
+
             AaruConsole.DebugWriteLine("Apricot partitions", "label.rxBaudRate = {0} ({1} bps)", label.rxBaudRate,
-                                      label.rxBaudRate < baudRates.Length ? baudRates[label.rxBaudRate] : 0);
+                                       label.rxBaudRate < baudRates.Length ? baudRates[label.rxBaudRate] : 0);
+
             AaruConsole.DebugWriteLine("Apricot partitions", "label.txBits = {0}", label.txBits);
             AaruConsole.DebugWriteLine("Apricot partitions", "label.rxBits = {0}", label.rxBits);
+
             AaruConsole.DebugWriteLine("Apricot partitions", "label.stopBits = {0} ({1} bits)", label.stopBits,
-                                      label.stopBits < stopBits.Length ? stopBits[label.stopBits] : 0);
+                                       label.stopBits < stopBits.Length ? stopBits[label.stopBits] : 0);
+
             AaruConsole.DebugWriteLine("Apricot partitions", "label.parityCheck = {0}", label.parityCheck);
+
             AaruConsole.DebugWriteLine("Apricot partitions", "label.parityType = {0} ({1})", label.parityType,
-                                      label.parityType < parityTypes.Length
-                                          ? parityTypes[label.parityType]
-                                          : "Unknown");
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.txXonXoff = {0}",       label.txXonXoff);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.rxXonXoff = {0}",       label.rxXonXoff);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.xonCharacter = {0}",    label.xonCharacter);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.xoffCharacter = {0}",   label.xoffCharacter);
+                                       label.parityType < parityTypes.Length ? parityTypes[label.parityType]
+                                           : "Unknown");
+
+            AaruConsole.DebugWriteLine("Apricot partitions", "label.txXonXoff = {0}", label.txXonXoff);
+            AaruConsole.DebugWriteLine("Apricot partitions", "label.rxXonXoff = {0}", label.rxXonXoff);
+            AaruConsole.DebugWriteLine("Apricot partitions", "label.xonCharacter = {0}", label.xonCharacter);
+            AaruConsole.DebugWriteLine("Apricot partitions", "label.xoffCharacter = {0}", label.xoffCharacter);
             AaruConsole.DebugWriteLine("Apricot partitions", "label.rxXonXoffBuffer = {0}", label.rxXonXoffBuffer);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.dtrDsr = {0}",          label.dtrDsr);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.ctsRts = {0}",          label.ctsRts);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.nullsAfterCr = {0}",    label.nullsAfterCr);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.nullsAfterFF = {0}",    label.nullsAfterFF);
+            AaruConsole.DebugWriteLine("Apricot partitions", "label.dtrDsr = {0}", label.dtrDsr);
+            AaruConsole.DebugWriteLine("Apricot partitions", "label.ctsRts = {0}", label.ctsRts);
+            AaruConsole.DebugWriteLine("Apricot partitions", "label.nullsAfterCr = {0}", label.nullsAfterCr);
+            AaruConsole.DebugWriteLine("Apricot partitions", "label.nullsAfterFF = {0}", label.nullsAfterFF);
             AaruConsole.DebugWriteLine("Apricot partitions", "label.lfAfterCRSerial = {0}", label.lfAfterCRSerial);
+
             AaruConsole.DebugWriteLine("Apricot partitions", "label.biosErrorReportSerial = {0}",
-                                      label.biosErrorReportSerial);
+                                       label.biosErrorReportSerial);
+
             AaruConsole.DebugWriteLine("Apricot partitions", "label.spareSerial is null? = {0}",
-                                      ArrayHelpers.ArrayIsNullOrEmpty(label.spareSerial));
+                                       ArrayHelpers.ArrayIsNullOrEmpty(label.spareSerial));
+
             AaruConsole.DebugWriteLine("Apricot partitions", "label.lfAfterCrParallel = {0}", label.lfAfterCrParallel);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.selectLine = {0}",        label.selectLine);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.paperEmpty = {0}",        label.paperEmpty);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.faultLine = {0}",         label.faultLine);
+            AaruConsole.DebugWriteLine("Apricot partitions", "label.selectLine = {0}", label.selectLine);
+            AaruConsole.DebugWriteLine("Apricot partitions", "label.paperEmpty = {0}", label.paperEmpty);
+            AaruConsole.DebugWriteLine("Apricot partitions", "label.faultLine = {0}", label.faultLine);
+
             AaruConsole.DebugWriteLine("Apricot partitions", "label.biosErrorReportParallel = {0}",
-                                      label.biosErrorReportParallel);
+                                       label.biosErrorReportParallel);
+
             AaruConsole.DebugWriteLine("Apricot partitions", "label.spareParallel is null? = {0}",
-                                      ArrayHelpers.ArrayIsNullOrEmpty(label.spareParallel));
+                                       ArrayHelpers.ArrayIsNullOrEmpty(label.spareParallel));
+
             AaruConsole.DebugWriteLine("Apricot partitions", "label.spareWinchester is null? = {0}",
-                                      ArrayHelpers.ArrayIsNullOrEmpty(label.spareWinchester));
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.parkingEnabled = {0}",   label.parkingEnabled);
+                                       ArrayHelpers.ArrayIsNullOrEmpty(label.spareWinchester));
+
+            AaruConsole.DebugWriteLine("Apricot partitions", "label.parkingEnabled = {0}", label.parkingEnabled);
             AaruConsole.DebugWriteLine("Apricot partitions", "label.formatProtection = {0}", label.formatProtection);
+
             AaruConsole.DebugWriteLine("Apricot partitions", "label.spareRamDisk is null? = {0}",
-                                      ArrayHelpers.ArrayIsNullOrEmpty(label.spareRamDisk));
+                                       ArrayHelpers.ArrayIsNullOrEmpty(label.spareRamDisk));
+
             for(int i = 0; i < 32; i++)
                 AaruConsole.DebugWriteLine("Apricot partitions", "label.badBlocks[{1}] = {0}", label.badBlocks[i], i);
+
             for(int i = 0; i < 8; i++)
             {
                 AaruConsole.DebugWriteLine("Apricot partitions", "label.partitions[{1}].bps = {0}",
-                                          label.partitions[i].bps, i);
+                                           label.partitions[i].bps, i);
+
                 AaruConsole.DebugWriteLine("Apricot partitions", "label.partitions[{1}].spc = {0}",
-                                          label.partitions[i].spc, i);
+                                           label.partitions[i].spc, i);
+
                 AaruConsole.DebugWriteLine("Apricot partitions", "label.partitions[{1}].rsectors = {0}",
-                                          label.partitions[i].rsectors, i);
+                                           label.partitions[i].rsectors, i);
+
                 AaruConsole.DebugWriteLine("Apricot partitions", "label.partitions[{1}].fats_no = {0}",
-                                          label.partitions[i].fats_no, i);
+                                           label.partitions[i].fats_no, i);
+
                 AaruConsole.DebugWriteLine("Apricot partitions", "label.partitions[{1}].root_ent = {0}",
-                                          label.partitions[i].root_ent, i);
+                                           label.partitions[i].root_ent, i);
+
                 AaruConsole.DebugWriteLine("Apricot partitions", "label.partitions[{1}].sectors = {0}",
-                                          label.partitions[i].sectors, i);
+                                           label.partitions[i].sectors, i);
+
                 AaruConsole.DebugWriteLine("Apricot partitions", "label.partitions[{1}].media = {0}",
-                                          label.partitions[i].media, i);
+                                           label.partitions[i].media, i);
+
                 AaruConsole.DebugWriteLine("Apricot partitions", "label.partitions[{1}].spfat = {0}",
-                                          label.partitions[i].spfat, i);
+                                           label.partitions[i].spfat, i);
+
                 AaruConsole.DebugWriteLine("Apricot partitions", "label.partitions[{1}].diskType = {0} ({2})",
-                                          label.partitions[i].diskType, i,
-                                          label.partitions[i].diskType < diskTypeCodes.Length
-                                              ? diskTypeCodes[label.partitions[i].diskType]
-                                              : "Unknown");
+                                           label.partitions[i].diskType, i,
+                                           label.partitions[i].diskType < diskTypeCodes.Length
+                                               ? diskTypeCodes[label.partitions[i].diskType] : "Unknown");
+
                 AaruConsole.DebugWriteLine("Apricot partitions", "label.partitions[{1}].startSector = {0}",
-                                          label.partitions[i].startSector, i);
+                                           label.partitions[i].startSector, i);
             }
 
             AaruConsole.DebugWriteLine("Apricot partitions", "label.spare is null? = {0}",
-                                      ArrayHelpers.ArrayIsNullOrEmpty(label.spare));
+                                       ArrayHelpers.ArrayIsNullOrEmpty(label.spare));
+
             AaruConsole.DebugWriteLine("Apricot partitions", "label.cpmDoubleSided = {0}", label.cpmDoubleSided);
 
             // Only hard disks can contain partitions
-            if(!label.winchester) return false;
+            if(!label.winchester)
+                return false;
 
             for(byte i = 0; i < label.partitionCount; i++)
             {
-                Partition part = new Partition
+                var part = new Partition
                 {
-                    Start    = label.partitions[i].startSector,
-                    Size     = (ulong)(label.partitions[i].sectors * label.sectorSize),
-                    Length   = label.partitions[i].sectors,
-                    Type     = "ACT Apricot partition",
-                    Sequence = i,
-                    Scheme   = Name,
-                    Offset   = (ulong)(label.partitions[i].startSector * label.sectorSize)
+                    Start  = label.partitions[i].startSector,
+                    Size   = (ulong)(label.partitions[i].sectors * label.sectorSize),
+                    Length = label.partitions[i].sectors, Type = "ACT Apricot partition", Sequence = i, Scheme = Name,
+                    Offset = (ulong)(label.partitions[i].startSector * label.sectorSize)
                 };
-                if(part.Start < deviceSectors && part.End < deviceSectors) partitions.Add(part);
+
+                if(part.Start < deviceSectors &&
+                   part.End   < deviceSectors)
+                    partitions.Add(part);
             }
 
             return partitions.Count > 0;
@@ -267,234 +342,234 @@ namespace Aaru.Partitions
         {
             /// <summary>Version of format which created disk</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public byte[] version;
+            public readonly byte[] version;
             /// <summary>Operating system.</summary>
-            public byte operatingSystem;
+            public readonly byte operatingSystem;
             /// <summary>Software write protection.</summary>
             [MarshalAs(UnmanagedType.U1)]
-            public bool writeProtected;
+            public readonly bool writeProtected;
             /// <summary>Copy protected.</summary>
             [MarshalAs(UnmanagedType.U1)]
-            public bool copyProtected;
+            public readonly bool copyProtected;
             /// <summary>Boot type.</summary>
-            public byte bootType;
+            public readonly byte bootType;
             /// <summary>Partitions.</summary>
-            public byte partitionCount;
+            public readonly byte partitionCount;
             /// <summary>Is hard disk?.</summary>
             [MarshalAs(UnmanagedType.U1)]
-            public bool winchester;
+            public readonly bool winchester;
             /// <summary>Sector size.</summary>
-            public ushort sectorSize;
+            public readonly ushort sectorSize;
             /// <summary>Sectors per track.</summary>
-            public ushort spt;
+            public readonly ushort spt;
             /// <summary>Tracks per side.</summary>
-            public uint cylinders;
+            public readonly uint cylinders;
             /// <summary>Sides.</summary>
-            public byte heads;
+            public readonly byte heads;
             /// <summary>Interleave factor.</summary>
-            public byte interleave;
+            public readonly byte interleave;
             /// <summary>Skew factor.</summary>
-            public ushort skew;
+            public readonly ushort skew;
             /// <summary>Sector where boot code starts.</summary>
-            public uint bootLocation;
+            public readonly uint bootLocation;
             /// <summary>Size in sectors of boot code.</summary>
-            public ushort bootSize;
+            public readonly ushort bootSize;
             /// <summary>Address at which to load boot code.</summary>
-            public uint bootAddress;
+            public readonly uint bootAddress;
             /// <summary>Offset where to jump to boot.</summary>
-            public ushort bootOffset;
+            public readonly ushort bootOffset;
             /// <summary>Segment where to jump to boot.</summary>
-            public ushort bootSegment;
+            public readonly ushort bootSegment;
             /// <summary>First data sector.</summary>
-            public uint firstDataBlock;
+            public readonly uint firstDataBlock;
             /// <summary>Generation.</summary>
-            public ushort generation;
+            public readonly ushort generation;
             /// <summary>Copy count.</summary>
-            public ushort copyCount;
+            public readonly ushort copyCount;
             /// <summary>Maximum number of copies.</summary>
-            public ushort maxCopies;
+            public readonly ushort maxCopies;
             /// <summary>Serial number.</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public byte[] serialNumber;
+            public readonly byte[] serialNumber;
             /// <summary>Part number.</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public byte[] partNumber;
+            public readonly byte[] partNumber;
             /// <summary>Copyright.</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 14)]
-            public byte[] copyright;
+            public readonly byte[] copyright;
             /// <summary>BPB for whole disk.</summary>
-            public ApricotParameterBlock mainBPB;
+            public readonly ApricotParameterBlock mainBPB;
             /// <summary>Name of FONT file.</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public byte[] fontName;
+            public readonly byte[] fontName;
             /// <summary>Name of KEYBOARD file.</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public byte[] keyboardName;
+            public readonly byte[] keyboardName;
             /// <summary>Minor BIOS version.</summary>
-            public byte biosMinorVersion;
+            public readonly byte biosMinorVersion;
             /// <summary>Major BIOS version.</summary>
-            public byte biosMajorVersion;
+            public readonly byte biosMajorVersion;
             /// <summary>Diagnostics enabled?.</summary>
             [MarshalAs(UnmanagedType.U1)]
-            public bool diagnosticsFlag;
+            public readonly bool diagnosticsFlag;
             /// <summary>Printer device.</summary>
-            public byte prnDevice;
+            public readonly byte prnDevice;
             /// <summary>Bell volume.</summary>
-            public byte bellVolume;
+            public readonly byte bellVolume;
             /// <summary>Cache enabled?.</summary>
             [MarshalAs(UnmanagedType.U1)]
-            public bool enableCache;
+            public readonly bool enableCache;
             /// <summary>Graphics enabled?.</summary>
             [MarshalAs(UnmanagedType.U1)]
-            public bool enableGraphics;
+            public readonly bool enableGraphics;
             /// <summary>Length in sectors of DOS.</summary>
-            public byte dosLength;
+            public readonly byte dosLength;
             /// <summary>Length in sectors of FONT file.</summary>
-            public byte fontLength;
+            public readonly byte fontLength;
             /// <summary>Length in sectors of KEYBOARD file.</summary>
-            public byte keyboardLength;
+            public readonly byte keyboardLength;
             /// <summary>Starting sector of DOS.</summary>
-            public ushort dosStart;
+            public readonly ushort dosStart;
             /// <summary>Starting sector of FONT file.</summary>
-            public ushort fontStart;
+            public readonly ushort fontStart;
             /// <summary>Starting sector of KEYBOARD file.</summary>
-            public ushort keyboardStart;
+            public readonly ushort keyboardStart;
             /// <summary>Keyboard click volume.</summary>
-            public byte keyboardVolume;
+            public readonly byte keyboardVolume;
             /// <summary>Auto-repeat enabled?.</summary>
             [MarshalAs(UnmanagedType.U1)]
-            public bool autorepeat;
+            public readonly bool autorepeat;
             /// <summary>Auto-repeat lead-in.</summary>
-            public byte autorepeatLeadIn;
+            public readonly byte autorepeatLeadIn;
             /// <summary>Auto-repeat interval.</summary>
-            public byte autorepeatInterval;
+            public readonly byte autorepeatInterval;
             /// <summary>Microscreen mode.</summary>
-            public byte microscreenMode;
+            public readonly byte microscreenMode;
             /// <summary>Spare area for keyboard values expansion.</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 11)]
-            public byte[] spareKeyboard;
+            public readonly byte[] spareKeyboard;
             /// <summary>Screen line mode.</summary>
-            public byte lineMode;
+            public readonly byte lineMode;
             /// <summary>Screen line width.</summary>
-            public byte lineWidth;
+            public readonly byte lineWidth;
             /// <summary>Screen disabled?.</summary>
             [MarshalAs(UnmanagedType.U1)]
-            public bool imageOff;
+            public readonly bool imageOff;
             /// <summary>Spare area for screen values expansion.</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 13)]
-            public byte[] spareScreen;
+            public readonly byte[] spareScreen;
             /// <summary>TX baud rate.</summary>
-            public byte txBaudRate;
+            public readonly byte txBaudRate;
             /// <summary>RX baud rate.</summary>
-            public byte rxBaudRate;
+            public readonly byte rxBaudRate;
             /// <summary>TX bits.</summary>
-            public byte txBits;
+            public readonly byte txBits;
             /// <summary>RX bits.</summary>
-            public byte rxBits;
+            public readonly byte rxBits;
             /// <summary>Stop bits.</summary>
-            public byte stopBits;
+            public readonly byte stopBits;
             /// <summary>Parity enabled?.</summary>
             [MarshalAs(UnmanagedType.U1)]
-            public bool parityCheck;
+            public readonly bool parityCheck;
             /// <summary>Parity type.</summary>
-            public byte parityType;
+            public readonly byte parityType;
             /// <summary>Xon/Xoff enabled on TX.</summary>
             [MarshalAs(UnmanagedType.U1)]
-            public bool txXonXoff;
+            public readonly bool txXonXoff;
             /// <summary>Xon/Xoff enabled on RX.</summary>
             [MarshalAs(UnmanagedType.U1)]
-            public bool rxXonXoff;
+            public readonly bool rxXonXoff;
             /// <summary>Xon character.</summary>
-            public byte xonCharacter;
+            public readonly byte xonCharacter;
             /// <summary>Xoff character.</summary>
-            public byte xoffCharacter;
+            public readonly byte xoffCharacter;
             /// <summary>Xon/Xoff buffer on RX.</summary>
-            public ushort rxXonXoffBuffer;
+            public readonly ushort rxXonXoffBuffer;
             /// <summary>DTR/DSR enabled?.</summary>
             [MarshalAs(UnmanagedType.U1)]
-            public bool dtrDsr;
+            public readonly bool dtrDsr;
             /// <summary>CTS/RTS enabled?.</summary>
             [MarshalAs(UnmanagedType.U1)]
-            public bool ctsRts;
+            public readonly bool ctsRts;
             /// <summary>NULLs after CR.</summary>
-            public byte nullsAfterCr;
+            public readonly byte nullsAfterCr;
             /// <summary>NULLs after 0xFF.</summary>
-            public byte nullsAfterFF;
+            public readonly byte nullsAfterFF;
             /// <summary>Send LF after CR in serial port.</summary>
             [MarshalAs(UnmanagedType.U1)]
-            public bool lfAfterCRSerial;
+            public readonly bool lfAfterCRSerial;
             /// <summary>BIOS error report in serial port.</summary>
             [MarshalAs(UnmanagedType.U1)]
-            public bool biosErrorReportSerial;
+            public readonly bool biosErrorReportSerial;
             /// <summary>Spare area for serial port values expansion.</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 13)]
-            public byte[] spareSerial;
+            public readonly byte[] spareSerial;
             /// <summary>Send LF after CR in parallel port.</summary>
             [MarshalAs(UnmanagedType.U1)]
-            public bool lfAfterCrParallel;
+            public readonly bool lfAfterCrParallel;
             /// <summary>Select line supported?.</summary>
             [MarshalAs(UnmanagedType.U1)]
-            public bool selectLine;
+            public readonly bool selectLine;
             /// <summary>Paper empty supported?.</summary>
             [MarshalAs(UnmanagedType.U1)]
-            public bool paperEmpty;
+            public readonly bool paperEmpty;
             /// <summary>Fault line supported?.</summary>
             [MarshalAs(UnmanagedType.U1)]
-            public bool faultLine;
+            public readonly bool faultLine;
             /// <summary>BIOS error report in parallel port.</summary>
             [MarshalAs(UnmanagedType.U1)]
-            public bool biosErrorReportParallel;
+            public readonly bool biosErrorReportParallel;
             /// <summary>Spare area for parallel port values expansion.</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 11)]
-            public byte[] spareParallel;
+            public readonly byte[] spareParallel;
             /// <summary>Spare area for Winchester values expansion.</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 14)]
-            public byte[] spareWinchester;
+            public readonly byte[] spareWinchester;
             /// <summary>Parking enabled?.</summary>
             [MarshalAs(UnmanagedType.U1)]
-            public bool parkingEnabled;
+            public readonly bool parkingEnabled;
             /// <summary>Format protection?.</summary>
             [MarshalAs(UnmanagedType.U1)]
-            public bool formatProtection;
+            public readonly bool formatProtection;
             /// <summary>Spare area for RAM disk values expansion.</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public byte[] spareRamDisk;
+            public readonly byte[] spareRamDisk;
             /// <summary>List of bad blocks.</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
-            public ushort[] badBlocks;
+            public readonly ushort[] badBlocks;
             /// <summary>Array of partition BPBs.</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public ApricotParameterBlock[] partitions;
+            public readonly ApricotParameterBlock[] partitions;
             /// <summary>Spare area.</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 63)]
-            public byte[] spare;
+            public readonly byte[] spare;
             /// <summary>CP/M double side indicator?.</summary>
-            public bool cpmDoubleSided;
+            public readonly bool cpmDoubleSided;
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct ApricotParameterBlock
         {
             /// <summary>Bytes per sector</summary>
-            public ushort bps;
+            public readonly ushort bps;
             /// <summary>Sectors per cluster</summary>
-            public byte spc;
+            public readonly byte spc;
             /// <summary>Reserved sectors between BPB and FAT</summary>
-            public ushort rsectors;
+            public readonly ushort rsectors;
             /// <summary>Number of FATs</summary>
-            public byte fats_no;
+            public readonly byte fats_no;
             /// <summary>Number of entries on root directory</summary>
-            public ushort root_ent;
+            public readonly ushort root_ent;
             /// <summary>Sectors in volume</summary>
-            public ushort sectors;
+            public readonly ushort sectors;
             /// <summary>Media descriptor</summary>
-            public byte media;
+            public readonly byte media;
             /// <summary>Sectors per FAT</summary>
-            public ushort spfat;
+            public readonly ushort spfat;
             /// <summary>Disk type</summary>
-            public byte diskType;
+            public readonly byte diskType;
             /// <summary>Volume starting sector</summary>
-            public ushort startSector;
+            public readonly ushort startSector;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Partitions/Atari.cs b/Aaru.Partitions/Atari.cs
index 746e19433..0cd3cd60c 100644
--- a/Aaru.Partitions/Atari.cs
+++ b/Aaru.Partitions/Atari.cs
@@ -65,23 +65,21 @@ namespace Aaru.Partitions
 
             byte[] sector = imagePlugin.ReadSector(sectorOffset);
 
-            if(sector.Length < 512) return false;
+            if(sector.Length < 512)
+                return false;
 
-            AtariTable table = new AtariTable
+            var table = new AtariTable
             {
-                boot       = new byte[342],
-                icdEntries = new AtariEntry[8],
-                unused     = new byte[12],
-                entries    = new AtariEntry[4]
+                boot = new byte[342], icdEntries = new AtariEntry[8], unused = new byte[12], entries = new AtariEntry[4]
             };
 
             Array.Copy(sector, 0, table.boot, 0, 342);
 
             for(int i = 0; i < 8; i++)
             {
-                table.icdEntries[i].type   = BigEndianBitConverter.ToUInt32(sector, 342 + i * 12 + 0);
-                table.icdEntries[i].start  = BigEndianBitConverter.ToUInt32(sector, 342 + i * 12 + 4);
-                table.icdEntries[i].length = BigEndianBitConverter.ToUInt32(sector, 342 + i * 12 + 8);
+                table.icdEntries[i].type   = BigEndianBitConverter.ToUInt32(sector, 342 + (i * 12) + 0);
+                table.icdEntries[i].start  = BigEndianBitConverter.ToUInt32(sector, 342 + (i * 12) + 4);
+                table.icdEntries[i].length = BigEndianBitConverter.ToUInt32(sector, 342 + (i * 12) + 8);
             }
 
             Array.Copy(sector, 438, table.unused, 0, 12);
@@ -90,29 +88,32 @@ namespace Aaru.Partitions
 
             for(int i = 0; i < 4; i++)
             {
-                table.entries[i].type   = BigEndianBitConverter.ToUInt32(sector, 454 + i * 12 + 0);
-                table.entries[i].start  = BigEndianBitConverter.ToUInt32(sector, 454 + i * 12 + 4);
-                table.entries[i].length = BigEndianBitConverter.ToUInt32(sector, 454 + i * 12 + 8);
+                table.entries[i].type   = BigEndianBitConverter.ToUInt32(sector, 454 + (i * 12) + 0);
+                table.entries[i].start  = BigEndianBitConverter.ToUInt32(sector, 454 + (i * 12) + 4);
+                table.entries[i].length = BigEndianBitConverter.ToUInt32(sector, 454 + (i * 12) + 8);
             }
 
             table.badStart  = BigEndianBitConverter.ToUInt32(sector, 502);
             table.badLength = BigEndianBitConverter.ToUInt32(sector, 506);
             table.checksum  = BigEndianBitConverter.ToUInt16(sector, 510);
 
-            Sha1Context sha1Ctx = new Sha1Context();
+            var sha1Ctx = new Sha1Context();
             sha1Ctx.Update(table.boot);
             AaruConsole.DebugWriteLine("Atari partition plugin", "Boot code SHA1: {0}", sha1Ctx.End());
 
             for(int i = 0; i < 8; i++)
             {
                 AaruConsole.DebugWriteLine("Atari partition plugin", "table.icdEntries[{0}].flag = 0x{1:X2}", i,
-                                          (table.icdEntries[i].type & 0xFF000000) >> 24);
+                                           (table.icdEntries[i].type & 0xFF000000) >> 24);
+
                 AaruConsole.DebugWriteLine("Atari partition plugin", "table.icdEntries[{0}].type = 0x{1:X6}", i,
-                                          table.icdEntries[i].type & 0x00FFFFFF);
+                                           table.icdEntries[i].type & 0x00FFFFFF);
+
                 AaruConsole.DebugWriteLine("Atari partition plugin", "table.icdEntries[{0}].start = {1}", i,
-                                          table.icdEntries[i].start);
+                                           table.icdEntries[i].start);
+
                 AaruConsole.DebugWriteLine("Atari partition plugin", "table.icdEntries[{0}].length = {1}", i,
-                                          table.icdEntries[i].length);
+                                           table.icdEntries[i].length);
             }
 
             AaruConsole.DebugWriteLine("Atari partition plugin", "table.size = {0}", table.size);
@@ -120,21 +121,25 @@ namespace Aaru.Partitions
             for(int i = 0; i < 4; i++)
             {
                 AaruConsole.DebugWriteLine("Atari partition plugin", "table.entries[{0}].flag = 0x{1:X2}", i,
-                                          (table.entries[i].type & 0xFF000000) >> 24);
+                                           (table.entries[i].type & 0xFF000000) >> 24);
+
                 AaruConsole.DebugWriteLine("Atari partition plugin", "table.entries[{0}].type = 0x{1:X6}", i,
-                                          table.entries[i].type & 0x00FFFFFF);
+                                           table.entries[i].type & 0x00FFFFFF);
+
                 AaruConsole.DebugWriteLine("Atari partition plugin", "table.entries[{0}].start = {1}", i,
-                                          table.entries[i].start);
+                                           table.entries[i].start);
+
                 AaruConsole.DebugWriteLine("Atari partition plugin", "table.entries[{0}].length = {1}", i,
-                                          table.entries[i].length);
+                                           table.entries[i].length);
             }
 
-            AaruConsole.DebugWriteLine("Atari partition plugin", "table.badStart = {0}",      table.badStart);
-            AaruConsole.DebugWriteLine("Atari partition plugin", "table.badLength = {0}",     table.badLength);
+            AaruConsole.DebugWriteLine("Atari partition plugin", "table.badStart = {0}", table.badStart);
+            AaruConsole.DebugWriteLine("Atari partition plugin", "table.badLength = {0}", table.badLength);
             AaruConsole.DebugWriteLine("Atari partition plugin", "table.checksum = 0x{0:X4}", table.checksum);
 
             bool  validTable        = false;
             ulong partitionSequence = 0;
+
             for(int i = 0; i < 4; i++)
             {
                 uint type = table.entries[i].type & 0x00FFFFFF;
@@ -158,62 +163,74 @@ namespace Aaru.Partitions
                         {
                             if(table.entries[i].start + table.entries[i].length > imagePlugin.Info.Sectors)
                                 AaruConsole.DebugWriteLine("Atari partition plugin",
-                                                          "WARNING: End of partition goes beyond device size");
+                                                           "WARNING: End of partition goes beyond device size");
 
-                            ulong sectorSize                                        = imagePlugin.Info.SectorSize;
-                            if(sectorSize == 2448 || sectorSize == 2352) sectorSize = 2048;
+                            ulong sectorSize = imagePlugin.Info.SectorSize;
+
+                            if(sectorSize == 2448 ||
+                               sectorSize == 2352)
+                                sectorSize = 2048;
 
                             byte[] partType = new byte[3];
                             partType[0] = (byte)((type & 0xFF0000) >> 16);
                             partType[1] = (byte)((type & 0x00FF00) >> 8);
                             partType[2] = (byte)(type & 0x0000FF);
 
-                            Partition part = new Partition
+                            var part = new Partition
                             {
-                                Size     = table.entries[i].length * sectorSize,
-                                Length   = table.entries[i].length,
-                                Sequence = partitionSequence,
-                                Name     = "",
+                                Size     = table.entries[i].length * sectorSize, Length = table.entries[i].length,
+                                Sequence = partitionSequence, Name                      = "",
                                 Offset   = table.entries[i].start * sectorSize,
                                 Start    = table.entries[i].start,
-                                Type     = Encoding.ASCII.GetString(partType),
-                                Scheme   = Name
+                                Type     = Encoding.ASCII.GetString(partType), Scheme = Name
                             };
+
                             switch(type)
                             {
                                 case TypeGEMDOS:
                                     part.Description = "Atari GEMDOS partition";
+
                                     break;
                                 case TypeBigGEMDOS:
                                     part.Description = "Atari GEMDOS partition bigger than 32 MiB";
+
                                     break;
                                 case TypeLinux:
                                     part.Description = "Linux partition";
+
                                     break;
                                 case TypeSwap:
                                     part.Description = "Swap partition";
+
                                     break;
                                 case TypeRAW:
                                     part.Description = "RAW partition";
+
                                     break;
                                 case TypeNetBSD:
                                     part.Description = "NetBSD partition";
+
                                     break;
                                 case TypeNetBSDSwap:
                                     part.Description = "NetBSD swap partition";
+
                                     break;
                                 case TypeSysV:
                                     part.Description = "Atari UNIX partition";
+
                                     break;
                                 case TypeMac:
                                     part.Description = "Macintosh partition";
+
                                     break;
                                 case TypeMinix:
                                 case TypeMinix2:
                                     part.Description = "MINIX partition";
+
                                     break;
                                 default:
                                     part.Description = "Unknown partition type";
+
                                     break;
                             }
 
@@ -223,94 +240,115 @@ namespace Aaru.Partitions
 
                         break;
                     case TypeExtended:
-                        byte[]     extendedSector = imagePlugin.ReadSector(table.entries[i].start);
-                        AtariTable extendedTable  = new AtariTable();
+                        byte[] extendedSector = imagePlugin.ReadSector(table.entries[i].start);
+                        var    extendedTable  = new AtariTable();
                         extendedTable.entries = new AtariEntry[4];
 
                         for(int j = 0; j < 4; j++)
                         {
                             extendedTable.entries[j].type =
-                                BigEndianBitConverter.ToUInt32(extendedSector, 454 + j * 12 + 0);
+                                BigEndianBitConverter.ToUInt32(extendedSector, 454 + (j * 12) + 0);
+
                             extendedTable.entries[j].start =
-                                BigEndianBitConverter.ToUInt32(extendedSector, 454 + j * 12 + 4);
+                                BigEndianBitConverter.ToUInt32(extendedSector, 454 + (j * 12) + 4);
+
                             extendedTable.entries[j].length =
-                                BigEndianBitConverter.ToUInt32(extendedSector, 454 + j * 12 + 8);
+                                BigEndianBitConverter.ToUInt32(extendedSector, 454 + (j * 12) + 8);
                         }
 
                         for(int j = 0; j < 4; j++)
                         {
                             uint extendedType = extendedTable.entries[j].type & 0x00FFFFFF;
 
-                            if(extendedType != TypeGEMDOS && extendedType != TypeBigGEMDOS &&
-                               extendedType != TypeLinux  && extendedType != TypeSwap      &&
-                               extendedType != TypeRAW    &&
-                               extendedType != TypeNetBSD && extendedType != TypeNetBSDSwap &&
-                               extendedType != TypeSysV   && extendedType != TypeMac        &&
-                               extendedType != TypeMinix  &&
-                               extendedType != TypeMinix2) continue;
+                            if(extendedType != TypeGEMDOS     &&
+                               extendedType != TypeBigGEMDOS  &&
+                               extendedType != TypeLinux      &&
+                               extendedType != TypeSwap       &&
+                               extendedType != TypeRAW        &&
+                               extendedType != TypeNetBSD     &&
+                               extendedType != TypeNetBSDSwap &&
+                               extendedType != TypeSysV       &&
+                               extendedType != TypeMac        &&
+                               extendedType != TypeMinix      &&
+                               extendedType != TypeMinix2)
+                                continue;
 
                             validTable = true;
-                            if(extendedTable.entries[j].start > imagePlugin.Info.Sectors) continue;
+
+                            if(extendedTable.entries[j].start > imagePlugin.Info.Sectors)
+                                continue;
 
                             if(extendedTable.entries[j].start + extendedTable.entries[j].length >
                                imagePlugin.Info.Sectors)
                                 AaruConsole.DebugWriteLine("Atari partition plugin",
-                                                          "WARNING: End of partition goes beyond device size");
+                                                           "WARNING: End of partition goes beyond device size");
 
-                            ulong sectorSize                                        = imagePlugin.Info.SectorSize;
-                            if(sectorSize == 2448 || sectorSize == 2352) sectorSize = 2048;
+                            ulong sectorSize = imagePlugin.Info.SectorSize;
+
+                            if(sectorSize == 2448 ||
+                               sectorSize == 2352)
+                                sectorSize = 2048;
 
                             byte[] partType = new byte[3];
                             partType[0] = (byte)((extendedType & 0xFF0000) >> 16);
                             partType[1] = (byte)((extendedType & 0x00FF00) >> 8);
                             partType[2] = (byte)(extendedType & 0x0000FF);
 
-                            Partition part = new Partition
+                            var part = new Partition
                             {
-                                Size     = extendedTable.entries[j].length * sectorSize,
-                                Length   = extendedTable.entries[j].length,
-                                Sequence = partitionSequence,
-                                Name     = "",
-                                Offset   = extendedTable.entries[j].start * sectorSize,
-                                Start    = extendedTable.entries[j].start,
-                                Type     = Encoding.ASCII.GetString(partType),
-                                Scheme   = Name
+                                Size   = extendedTable.entries[j].length * sectorSize,
+                                Length = extendedTable.entries[j].length, Sequence = partitionSequence, Name = "",
+                                Offset = extendedTable.entries[j].start * sectorSize,
+                                Start  = extendedTable.entries[j].start, Type = Encoding.ASCII.GetString(partType),
+                                Scheme = Name
                             };
+
                             switch(extendedType)
                             {
                                 case TypeGEMDOS:
                                     part.Description = "Atari GEMDOS partition";
+
                                     break;
                                 case TypeBigGEMDOS:
                                     part.Description = "Atari GEMDOS partition bigger than 32 MiB";
+
                                     break;
                                 case TypeLinux:
                                     part.Description = "Linux partition";
+
                                     break;
                                 case TypeSwap:
                                     part.Description = "Swap partition";
+
                                     break;
                                 case TypeRAW:
                                     part.Description = "RAW partition";
+
                                     break;
                                 case TypeNetBSD:
                                     part.Description = "NetBSD partition";
+
                                     break;
                                 case TypeNetBSDSwap:
                                     part.Description = "NetBSD swap partition";
+
                                     break;
                                 case TypeSysV:
                                     part.Description = "Atari UNIX partition";
+
                                     break;
                                 case TypeMac:
                                     part.Description = "Macintosh partition";
+
                                     break;
                                 case TypeMinix:
                                 case TypeMinix2:
                                     part.Description = "MINIX partition";
+
                                     break;
                                 default:
                                     part.Description = "Unknown partition type";
+
                                     break;
                             }
 
@@ -322,76 +360,99 @@ namespace Aaru.Partitions
                 }
             }
 
-            if(!validTable) return partitions.Count > 0;
+            if(!validTable)
+                return partitions.Count > 0;
 
             for(int i = 0; i < 8; i++)
             {
                 uint type = table.icdEntries[i].type & 0x00FFFFFF;
 
-                if(type != TypeGEMDOS && type != TypeBigGEMDOS && type != TypeLinux      && type != TypeSwap &&
-                   type != TypeRAW    && type != TypeNetBSD    && type != TypeNetBSDSwap && type != TypeSysV &&
-                   type != TypeMac    && type != TypeMinix     && type != TypeMinix2) continue;
+                if(type != TypeGEMDOS     &&
+                   type != TypeBigGEMDOS  &&
+                   type != TypeLinux      &&
+                   type != TypeSwap       &&
+                   type != TypeRAW        &&
+                   type != TypeNetBSD     &&
+                   type != TypeNetBSDSwap &&
+                   type != TypeSysV       &&
+                   type != TypeMac        &&
+                   type != TypeMinix      &&
+                   type != TypeMinix2)
+                    continue;
 
-                if(table.icdEntries[i].start > imagePlugin.Info.Sectors) continue;
+                if(table.icdEntries[i].start > imagePlugin.Info.Sectors)
+                    continue;
 
                 if(table.icdEntries[i].start + table.icdEntries[i].length > imagePlugin.Info.Sectors)
                     AaruConsole.DebugWriteLine("Atari partition plugin",
-                                              "WARNING: End of partition goes beyond device size");
+                                               "WARNING: End of partition goes beyond device size");
 
-                ulong sectorSize                                        = imagePlugin.Info.SectorSize;
-                if(sectorSize == 2448 || sectorSize == 2352) sectorSize = 2048;
+                ulong sectorSize = imagePlugin.Info.SectorSize;
+
+                if(sectorSize == 2448 ||
+                   sectorSize == 2352)
+                    sectorSize = 2048;
 
                 byte[] partType = new byte[3];
                 partType[0] = (byte)((type & 0xFF0000) >> 16);
                 partType[1] = (byte)((type & 0x00FF00) >> 8);
                 partType[2] = (byte)(type & 0x0000FF);
 
-                Partition part = new Partition
+                var part = new Partition
                 {
-                    Size     = table.icdEntries[i].length * sectorSize,
-                    Length   = table.icdEntries[i].length,
-                    Sequence = partitionSequence,
-                    Name     = "",
+                    Size     = table.icdEntries[i].length * sectorSize, Length = table.icdEntries[i].length,
+                    Sequence = partitionSequence, Name                         = "",
                     Offset   = table.icdEntries[i].start * sectorSize,
-                    Start    = table.icdEntries[i].start,
-                    Type     = Encoding.ASCII.GetString(partType),
+                    Start    = table.icdEntries[i].start, Type = Encoding.ASCII.GetString(partType),
                     Scheme   = Name
                 };
+
                 switch(type)
                 {
                     case TypeGEMDOS:
                         part.Description = "Atari GEMDOS partition";
+
                         break;
                     case TypeBigGEMDOS:
                         part.Description = "Atari GEMDOS partition bigger than 32 MiB";
+
                         break;
                     case TypeLinux:
                         part.Description = "Linux partition";
+
                         break;
                     case TypeSwap:
                         part.Description = "Swap partition";
+
                         break;
                     case TypeRAW:
                         part.Description = "RAW partition";
+
                         break;
                     case TypeNetBSD:
                         part.Description = "NetBSD partition";
+
                         break;
                     case TypeNetBSDSwap:
                         part.Description = "NetBSD swap partition";
+
                         break;
                     case TypeSysV:
                         part.Description = "Atari UNIX partition";
+
                         break;
                     case TypeMac:
                         part.Description = "Macintosh partition";
+
                         break;
                     case TypeMinix:
                     case TypeMinix2:
                         part.Description = "MINIX partition";
+
                         break;
                     default:
                         part.Description = "Unknown partition type";
+
                         break;
                 }
 
@@ -402,60 +463,34 @@ namespace Aaru.Partitions
             return partitions.Count > 0;
         }
 
-        /// <summary>
-        ///     Atari partition entry
-        /// </summary>
+        /// <summary>Atari partition entry</summary>
         struct AtariEntry
         {
-            /// <summary>
-            ///     First byte flag, three bytes type in ASCII.
-            ///     Flag bit 0 = active
-            ///     Flag bit 7 = bootable
-            /// </summary>
+            /// <summary>First byte flag, three bytes type in ASCII. Flag bit 0 = active Flag bit 7 = bootable</summary>
             public uint type;
-            /// <summary>
-            ///     Starting sector
-            /// </summary>
+            /// <summary>Starting sector</summary>
             public uint start;
-            /// <summary>
-            ///     Length in sectors
-            /// </summary>
+            /// <summary>Length in sectors</summary>
             public uint length;
         }
 
         struct AtariTable
         {
-            /// <summary>
-            ///     Boot code for 342 bytes
-            /// </summary>
+            /// <summary>Boot code for 342 bytes</summary>
             public byte[] boot;
-            /// <summary>
-            ///     8 extra entries for ICDPro driver
-            /// </summary>
+            /// <summary>8 extra entries for ICDPro driver</summary>
             public AtariEntry[] icdEntries;
-            /// <summary>
-            ///     Unused, 12 bytes
-            /// </summary>
+            /// <summary>Unused, 12 bytes</summary>
             public byte[] unused;
-            /// <summary>
-            ///     Disk size in sectors
-            /// </summary>
+            /// <summary>Disk size in sectors</summary>
             public uint size;
-            /// <summary>
-            ///     4 partition entries
-            /// </summary>
+            /// <summary>4 partition entries</summary>
             public AtariEntry[] entries;
-            /// <summary>
-            ///     Starting sector of bad block list
-            /// </summary>
+            /// <summary>Starting sector of bad block list</summary>
             public uint badStart;
-            /// <summary>
-            ///     Length in sectors of bad block list
-            /// </summary>
+            /// <summary>Length in sectors of bad block list</summary>
             public uint badLength;
-            /// <summary>
-            ///     Checksum for bootable disks
-            /// </summary>
+            /// <summary>Checksum for bootable disks</summary>
             public ushort checksum;
         }
     }
diff --git a/Aaru.Partitions/BSD.cs b/Aaru.Partitions/BSD.cs
index 572c1099d..d1c7b758b 100644
--- a/Aaru.Partitions/BSD.cs
+++ b/Aaru.Partitions/BSD.cs
@@ -48,9 +48,15 @@ namespace Aaru.Partitions
         /// <summary>Maximum size of a disklabel with 22 partitions</summary>
         const uint MAX_LABEL_SIZE = 500;
         /// <summary>Known sector locations for BSD disklabel</summary>
-        readonly ulong[] labelLocations = {0, 1, 2, 9};
+        readonly ulong[] labelLocations =
+        {
+            0, 1, 2, 9
+        };
         /// <summary>Known byte offsets for BSD disklabel</summary>
-        readonly uint[] labelOffsets = {0, 9, 64, 128, 516};
+        readonly uint[] labelOffsets =
+        {
+            0, 9, 64, 128, 516
+        };
 
         public string Name   => "BSD disklabel";
         public Guid   Id     => new Guid("246A6D93-4F1A-1F8A-344D-50187A5513A9");
@@ -60,78 +66,89 @@ namespace Aaru.Partitions
         {
             partitions = new List<Partition>();
             uint run = (MAX_LABEL_SIZE + labelOffsets.Last()) / imagePlugin.Info.SectorSize;
-            if((MAX_LABEL_SIZE + labelOffsets.Last()) % imagePlugin.Info.SectorSize > 0) run++;
 
-            DiskLabel dl    = new DiskLabel();
-            bool      found = false;
+            if((MAX_LABEL_SIZE + labelOffsets.Last()) % imagePlugin.Info.SectorSize > 0)
+                run++;
+
+            var  dl    = new DiskLabel();
+            bool found = false;
 
             foreach(ulong location in labelLocations)
             {
-                if(location + run + sectorOffset >= imagePlugin.Info.Sectors) return false;
+                if(location + run + sectorOffset >= imagePlugin.Info.Sectors)
+                    return false;
 
                 byte[] tmp = imagePlugin.ReadSectors(location + sectorOffset, run);
+
                 foreach(uint offset in labelOffsets)
                 {
                     byte[] sector = new byte[MAX_LABEL_SIZE];
 
-                    if(offset + MAX_LABEL_SIZE > tmp.Length) break;
+                    if(offset + MAX_LABEL_SIZE > tmp.Length)
+                        break;
 
                     Array.Copy(tmp, offset, sector, 0, MAX_LABEL_SIZE);
                     dl = Marshal.ByteArrayToStructureLittleEndian<DiskLabel>(sector);
+
                     AaruConsole.DebugWriteLine("BSD plugin",
-                                              "dl.magic on sector {0} at offset {1} = 0x{2:X8} (expected 0x{3:X8})",
-                                              location + sectorOffset, offset, dl.d_magic, DISKMAGIC);
+                                               "dl.magic on sector {0} at offset {1} = 0x{2:X8} (expected 0x{3:X8})",
+                                               location + sectorOffset, offset, dl.d_magic, DISKMAGIC);
+
                     if((dl.d_magic != DISKMAGIC || dl.d_magic2 != DISKMAGIC) &&
-                       (dl.d_magic != DISKCIGAM || dl.d_magic2 != DISKCIGAM)) continue;
+                       (dl.d_magic != DISKCIGAM || dl.d_magic2 != DISKCIGAM))
+                        continue;
 
                     found = true;
+
                     break;
                 }
 
-                if(found) break;
+                if(found)
+                    break;
             }
 
-            if(!found) return false;
+            if(!found)
+                return false;
 
-            if(dl.d_magic == DISKCIGAM && dl.d_magic2 == DISKCIGAM) dl = SwapDiskLabel(dl);
+            if(dl.d_magic  == DISKCIGAM &&
+               dl.d_magic2 == DISKCIGAM)
+                dl = SwapDiskLabel(dl);
 
-            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_type = {0}",    dl.d_type);
+            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_type = {0}", dl.d_type);
             AaruConsole.DebugWriteLine("BSD plugin", "dl.d_subtype = {0}", dl.d_subtype);
-            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_typename = {0}",
-                                      StringHandlers.CToString(dl.d_typename));
-            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_packname = {0}",
-                                      StringHandlers.CToString(dl.d_packname));
-            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_secsize = {0}",        dl.d_secsize);
-            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_nsectors = {0}",       dl.d_nsectors);
-            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_ntracks = {0}",        dl.d_ntracks);
-            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_ncylinders = {0}",     dl.d_ncylinders);
-            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_secpercyl = {0}",      dl.d_secpercyl);
-            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_secperunit = {0}",     dl.d_secperunit);
+            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_typename = {0}", StringHandlers.CToString(dl.d_typename));
+            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_packname = {0}", StringHandlers.CToString(dl.d_packname));
+            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_secsize = {0}", dl.d_secsize);
+            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_nsectors = {0}", dl.d_nsectors);
+            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_ntracks = {0}", dl.d_ntracks);
+            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_ncylinders = {0}", dl.d_ncylinders);
+            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_secpercyl = {0}", dl.d_secpercyl);
+            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_secperunit = {0}", dl.d_secperunit);
             AaruConsole.DebugWriteLine("BSD plugin", "dl.d_sparespertrack = {0}", dl.d_sparespertrack);
-            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_sparespercyl = {0}",   dl.d_sparespercyl);
-            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_acylinders = {0}",     dl.d_acylinders);
-            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_rpm = {0}",            dl.d_rpm);
-            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_interleave = {0}",     dl.d_interleave);
-            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_trackskew = {0}",      dl.d_trackskew);
-            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_cylskeew = {0}",       dl.d_cylskeew);
-            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_headswitch = {0}",     dl.d_headswitch);
-            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_trkseek = {0}",        dl.d_trkseek);
-            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_flags = {0}",          dl.d_flags);
-            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_drivedata[0] = {0}",   dl.d_drivedata[0]);
-            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_drivedata[1] = {0}",   dl.d_drivedata[1]);
-            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_drivedata[2] = {0}",   dl.d_drivedata[2]);
-            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_drivedata[3] = {0}",   dl.d_drivedata[3]);
-            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_drivedata[4] = {0}",   dl.d_drivedata[4]);
-            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_spare[0] = {0}",       dl.d_spare[0]);
-            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_spare[1] = {0}",       dl.d_spare[1]);
-            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_spare[2] = {0}",       dl.d_spare[2]);
-            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_spare[3] = {0}",       dl.d_spare[3]);
-            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_spare[4] = {0}",       dl.d_spare[4]);
-            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_magic2 = 0x{0:X8}",    dl.d_magic2);
-            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_checksum = 0x{0:X8}",  dl.d_checksum);
-            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_npartitions = {0}",    dl.d_npartitions);
-            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_bbsize = {0}",         dl.d_bbsize);
-            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_sbsize = {0}",         dl.d_sbsize);
+            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_sparespercyl = {0}", dl.d_sparespercyl);
+            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_acylinders = {0}", dl.d_acylinders);
+            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_rpm = {0}", dl.d_rpm);
+            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_interleave = {0}", dl.d_interleave);
+            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_trackskew = {0}", dl.d_trackskew);
+            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_cylskeew = {0}", dl.d_cylskeew);
+            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_headswitch = {0}", dl.d_headswitch);
+            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_trkseek = {0}", dl.d_trkseek);
+            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_flags = {0}", dl.d_flags);
+            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_drivedata[0] = {0}", dl.d_drivedata[0]);
+            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_drivedata[1] = {0}", dl.d_drivedata[1]);
+            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_drivedata[2] = {0}", dl.d_drivedata[2]);
+            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_drivedata[3] = {0}", dl.d_drivedata[3]);
+            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_drivedata[4] = {0}", dl.d_drivedata[4]);
+            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_spare[0] = {0}", dl.d_spare[0]);
+            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_spare[1] = {0}", dl.d_spare[1]);
+            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_spare[2] = {0}", dl.d_spare[2]);
+            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_spare[3] = {0}", dl.d_spare[3]);
+            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_spare[4] = {0}", dl.d_spare[4]);
+            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_magic2 = 0x{0:X8}", dl.d_magic2);
+            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_checksum = 0x{0:X8}", dl.d_checksum);
+            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_npartitions = {0}", dl.d_npartitions);
+            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_bbsize = {0}", dl.d_bbsize);
+            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_sbsize = {0}", dl.d_sbsize);
 
             ulong counter         = 0;
             bool  addSectorOffset = false;
@@ -139,24 +156,30 @@ namespace Aaru.Partitions
             for(int i = 0; i < dl.d_npartitions && i < 22; i++)
             {
                 AaruConsole.DebugWriteLine("BSD plugin", "dl.d_partitions[i].p_offset = {0}",
-                                          dl.d_partitions[i].p_offset);
+                                           dl.d_partitions[i].p_offset);
+
                 AaruConsole.DebugWriteLine("BSD plugin", "dl.d_partitions[i].p_size = {0}", dl.d_partitions[i].p_size);
+
                 AaruConsole.DebugWriteLine("BSD plugin", "dl.d_partitions[i].p_fstype = {0} ({1})",
-                                          dl.d_partitions[i].p_fstype, fsTypeToString(dl.d_partitions[i].p_fstype));
-                Partition part = new Partition
+                                           dl.d_partitions[i].p_fstype, fsTypeToString(dl.d_partitions[i].p_fstype));
+
+                var part = new Partition
                 {
-                    Start    = dl.d_partitions[i].p_offset * dl.d_secsize / imagePlugin.Info.SectorSize,
-                    Offset   = dl.d_partitions[i].p_offset                * dl.d_secsize,
-                    Length   = dl.d_partitions[i].p_size * dl.d_secsize   / imagePlugin.Info.SectorSize,
-                    Size     = dl.d_partitions[i].p_size                  * dl.d_secsize,
+                    Start    = (dl.d_partitions[i].p_offset * dl.d_secsize) / imagePlugin.Info.SectorSize,
+                    Offset   = dl.d_partitions[i].p_offset                  * dl.d_secsize,
+                    Length   = (dl.d_partitions[i].p_size * dl.d_secsize)   / imagePlugin.Info.SectorSize,
+                    Size     = dl.d_partitions[i].p_size                    * dl.d_secsize,
                     Type     = fsTypeToString(dl.d_partitions[i].p_fstype),
-                    Sequence = counter,
-                    Scheme   = Name
+                    Sequence = counter, Scheme = Name
                 };
-                if(dl.d_partitions[i].p_fstype == fsType.Unused) continue;
+
+                if(dl.d_partitions[i].p_fstype == fsType.Unused)
+                    continue;
 
                 // Crude and dirty way to know if the disklabel is relative to its parent partition...
-                if(dl.d_partitions[i].p_offset < sectorOffset && !addSectorOffset) addSectorOffset = true;
+                if(dl.d_partitions[i].p_offset < sectorOffset &&
+                   !addSectorOffset)
+                    addSectorOffset = true;
 
                 if(addSectorOffset)
                 {
@@ -213,8 +236,13 @@ namespace Aaru.Partitions
         static DiskLabel SwapDiskLabel(DiskLabel dl)
         {
             dl = (DiskLabel)Marshal.SwapStructureMembersEndian(dl);
-            for(int i = 0; i < dl.d_drivedata.Length; i++) dl.d_drivedata[i] = Swapping.Swap(dl.d_drivedata[i]);
-            for(int i = 0; i < dl.d_spare.Length; i++) dl.d_spare[i]         = Swapping.Swap(dl.d_spare[i]);
+
+            for(int i = 0; i < dl.d_drivedata.Length; i++)
+                dl.d_drivedata[i] = Swapping.Swap(dl.d_drivedata[i]);
+
+            for(int i = 0; i < dl.d_spare.Length; i++)
+                dl.d_spare[i] = Swapping.Swap(dl.d_spare[i]);
+
             for(int i = 0; i < dl.d_partitions.Length; i++)
                 dl.d_partitions[i] = (BSDPartition)Marshal.SwapStructureMembersEndian(dl.d_partitions[i]);
 
@@ -349,9 +377,7 @@ namespace Aaru.Partitions
             NANDFS = 30
         }
 
-        /// <summary>
-        ///     Drive flags
-        /// </summary>
+        /// <summary>Drive flags</summary>
         [Flags]
         enum dFlags : uint
         {
diff --git a/Aaru.Partitions/DEC.cs b/Aaru.Partitions/DEC.cs
index c6b8480b0..f2df46de5 100644
--- a/Aaru.Partitions/DEC.cs
+++ b/Aaru.Partitions/DEC.cs
@@ -53,23 +53,26 @@ namespace Aaru.Partitions
         {
             partitions = new List<Partition>();
 
-            if(31 + sectorOffset >= imagePlugin.Info.Sectors) return false;
+            if(31 + sectorOffset >= imagePlugin.Info.Sectors)
+                return false;
 
             byte[] sector = imagePlugin.ReadSector(31 + sectorOffset);
-            if(sector.Length < 512) return false;
+
+            if(sector.Length < 512)
+                return false;
 
             DECLabel table = Marshal.ByteArrayToStructureLittleEndian<DECLabel>(sector);
 
-            if(table.pt_magic != PT_MAGIC || table.pt_valid != PT_VALID) return false;
+            if(table.pt_magic != PT_MAGIC ||
+               table.pt_valid != PT_VALID)
+                return false;
 
             ulong counter = 0;
 
             foreach(Partition part in table.pt_part.Select(entry => new Partition
             {
-                Start    = entry.pi_blkoff,
-                Offset   = (ulong)(entry.pi_blkoff * sector.Length),
-                Size     = (ulong)entry.pi_nblocks,
-                Length   = (ulong)(entry.pi_nblocks * sector.Length),
+                Start    = entry.pi_blkoff, Offset         = (ulong)(entry.pi_blkoff  * sector.Length),
+                Size     = (ulong)entry.pi_nblocks, Length = (ulong)(entry.pi_nblocks * sector.Length),
                 Sequence = counter,
                 Scheme   = Name
             }).Where(part => part.Size > 0))
@@ -85,18 +88,18 @@ namespace Aaru.Partitions
         struct DECLabel
         {
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 440)]
-            public byte[] padding;
-            public int pt_magic;
-            public int pt_valid;
+            public readonly byte[] padding;
+            public readonly int pt_magic;
+            public readonly int pt_valid;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public DECPartition[] pt_part;
+            public readonly DECPartition[] pt_part;
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct DECPartition
         {
-            public int  pi_nblocks;
-            public uint pi_blkoff;
+            public readonly int  pi_nblocks;
+            public readonly uint pi_blkoff;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Partitions/DragonFlyBSD.cs b/Aaru.Partitions/DragonFlyBSD.cs
index 186083669..fac327c49 100644
--- a/Aaru.Partitions/DragonFlyBSD.cs
+++ b/Aaru.Partitions/DragonFlyBSD.cs
@@ -51,39 +51,47 @@ namespace Aaru.Partitions
         {
             partitions = new List<Partition>();
             uint nSectors = 2048 / imagePlugin.Info.SectorSize;
-            if(2048 % imagePlugin.Info.SectorSize > 0) nSectors++;
 
-            if(sectorOffset + nSectors >= imagePlugin.Info.Sectors) return false;
+            if(2048 % imagePlugin.Info.SectorSize > 0)
+                nSectors++;
+
+            if(sectorOffset + nSectors >= imagePlugin.Info.Sectors)
+                return false;
 
             byte[] sectors = imagePlugin.ReadSectors(sectorOffset, nSectors);
-            if(sectors.Length < 2048) return false;
+
+            if(sectors.Length < 2048)
+                return false;
 
             Disklabel64 disklabel = Marshal.ByteArrayToStructureLittleEndian<Disklabel64>(sectors);
 
-            if(disklabel.d_magic != 0xC4464C59) return false;
+            if(disklabel.d_magic != 0xC4464C59)
+                return false;
 
             ulong counter = 0;
 
             foreach(Partition64 entry in disklabel.d_partitions)
             {
-                Partition part = new Partition
+                var part = new Partition
                 {
-                    Start = entry.p_boffset / imagePlugin.Info.SectorSize + sectorOffset,
+                    Start = (entry.p_boffset / imagePlugin.Info.SectorSize) + sectorOffset,
                     Offset = entry.p_boffset +
-                               sectorOffset * imagePlugin.Info.SectorSize,
+                               (sectorOffset * imagePlugin.Info.SectorSize),
                     Size     = entry.p_bsize,
                     Length   = entry.p_bsize / imagePlugin.Info.SectorSize,
                     Name     = entry.p_stor_uuid.ToString(),
                     Sequence = counter,
                     Scheme   = Name,
-                    Type = (BSD.fsType)entry.p_fstype == BSD.fsType.Other
-                               ? entry.p_type_uuid.ToString()
+                    Type = (BSD.fsType)entry.p_fstype == BSD.fsType.Other ? entry.p_type_uuid.ToString()
                                : BSD.fsTypeToString((BSD.fsType)entry.p_fstype)
                 };
 
-                if(entry.p_bsize % imagePlugin.Info.SectorSize > 0) part.Length++;
+                if(entry.p_bsize % imagePlugin.Info.SectorSize > 0)
+                    part.Length++;
 
-                if(entry.p_bsize <= 0 || entry.p_boffset <= 0) continue;
+                if(entry.p_bsize   <= 0 ||
+                   entry.p_boffset <= 0)
+                    continue;
 
                 partitions.Add(part);
                 counter++;
@@ -96,39 +104,39 @@ namespace Aaru.Partitions
         struct Disklabel64
         {
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 512)]
-            public byte[] d_reserved0;
-            public uint  d_magic;
-            public uint  d_crc;
-            public uint  d_align;
-            public uint  d_npartitions;
-            public Guid  d_stor_uuid;
-            public ulong d_total_size;
-            public ulong d_bbase;
-            public ulong d_pbase;
-            public ulong d_pstop;
-            public ulong d_abase;
+            public readonly byte[] d_reserved0;
+            public readonly uint  d_magic;
+            public readonly uint  d_crc;
+            public readonly uint  d_align;
+            public readonly uint  d_npartitions;
+            public readonly Guid  d_stor_uuid;
+            public readonly ulong d_total_size;
+            public readonly ulong d_bbase;
+            public readonly ulong d_pbase;
+            public readonly ulong d_pstop;
+            public readonly ulong d_abase;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 64)]
-            public byte[] d_packname;
+            public readonly byte[] d_packname;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 64)]
-            public byte[] d_reserved;
+            public readonly byte[] d_reserved;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public Partition64[] d_partitions;
+            public readonly Partition64[] d_partitions;
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct Partition64
         {
-            public ulong p_boffset;
-            public ulong p_bsize;
-            public byte  p_fstype;
-            public byte  p_unused01;
-            public byte  p_unused02;
-            public byte  p_unused03;
-            public uint  p_unused04;
-            public uint  p_unused05;
-            public uint  p_unused06;
-            public Guid  p_type_uuid;
-            public Guid  p_stor_uuid;
+            public readonly ulong p_boffset;
+            public readonly ulong p_bsize;
+            public readonly byte  p_fstype;
+            public readonly byte  p_unused01;
+            public readonly byte  p_unused02;
+            public readonly byte  p_unused03;
+            public readonly uint  p_unused04;
+            public readonly uint  p_unused05;
+            public readonly uint  p_unused06;
+            public readonly Guid  p_type_uuid;
+            public readonly Guid  p_stor_uuid;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Partitions/GPT.cs b/Aaru.Partitions/GPT.cs
index e3c13fc48..e8f3e20bd 100644
--- a/Aaru.Partitions/GPT.cs
+++ b/Aaru.Partitions/GPT.cs
@@ -55,7 +55,8 @@ namespace Aaru.Partitions
         {
             partitions = new List<Partition>();
 
-            if(sectorOffset + 2 >= imagePlugin.Info.Sectors) return false;
+            if(sectorOffset + 2 >= imagePlugin.Info.Sectors)
+                return false;
 
             byte[]    hdrBytes = imagePlugin.ReadSector(1 + sectorOffset);
             GptHeader hdr;
@@ -71,6 +72,7 @@ namespace Aaru.Partitions
                     hdrBytes  = imagePlugin.ReadSector(sectorOffset);
                     signature = BitConverter.ToUInt64(hdrBytes, 512);
                     AaruConsole.DebugWriteLine("GPT Plugin", "hdr.signature @ 0x200 = 0x{0:X16}", signature);
+
                     if(signature == GPT_MAGIC)
                     {
                         AaruConsole.DebugWriteLine("GPT Plugin", "Found unaligned signature", signature);
@@ -79,31 +81,40 @@ namespace Aaru.Partitions
                         hdrBytes   = real;
                         misaligned = true;
                     }
-                    else return false;
+                    else
+                        return false;
                 }
                 else
                     return false;
 
-            try { hdr = Marshal.ByteArrayToStructureLittleEndian<GptHeader>(hdrBytes); }
-            catch { return false; }
+            try
+            {
+                hdr = Marshal.ByteArrayToStructureLittleEndian<GptHeader>(hdrBytes);
+            }
+            catch
+            {
+                return false;
+            }
 
-            AaruConsole.DebugWriteLine("GPT Plugin", "hdr.revision = 0x{0:X8}",   hdr.revision);
-            AaruConsole.DebugWriteLine("GPT Plugin", "hdr.headerSize = {0}",      hdr.headerSize);
-            AaruConsole.DebugWriteLine("GPT Plugin", "hdr.headerCrc = 0x{0:X8}",  hdr.headerCrc);
-            AaruConsole.DebugWriteLine("GPT Plugin", "hdr.reserved = 0x{0:X8}",   hdr.reserved);
-            AaruConsole.DebugWriteLine("GPT Plugin", "hdr.myLBA = {0}",           hdr.myLBA);
-            AaruConsole.DebugWriteLine("GPT Plugin", "hdr.alternateLBA = {0}",    hdr.alternateLBA);
-            AaruConsole.DebugWriteLine("GPT Plugin", "hdr.firstUsableLBA = {0}",  hdr.firstUsableLBA);
-            AaruConsole.DebugWriteLine("GPT Plugin", "hdr.lastUsableLBA = {0}",   hdr.lastUsableLBA);
-            AaruConsole.DebugWriteLine("GPT Plugin", "hdr.diskGuid = {0}",        hdr.diskGuid);
-            AaruConsole.DebugWriteLine("GPT Plugin", "hdr.entryLBA = {0}",        hdr.entryLBA);
-            AaruConsole.DebugWriteLine("GPT Plugin", "hdr.entries = {0}",         hdr.entries);
-            AaruConsole.DebugWriteLine("GPT Plugin", "hdr.entriesSize = {0}",     hdr.entriesSize);
+            AaruConsole.DebugWriteLine("GPT Plugin", "hdr.revision = 0x{0:X8}", hdr.revision);
+            AaruConsole.DebugWriteLine("GPT Plugin", "hdr.headerSize = {0}", hdr.headerSize);
+            AaruConsole.DebugWriteLine("GPT Plugin", "hdr.headerCrc = 0x{0:X8}", hdr.headerCrc);
+            AaruConsole.DebugWriteLine("GPT Plugin", "hdr.reserved = 0x{0:X8}", hdr.reserved);
+            AaruConsole.DebugWriteLine("GPT Plugin", "hdr.myLBA = {0}", hdr.myLBA);
+            AaruConsole.DebugWriteLine("GPT Plugin", "hdr.alternateLBA = {0}", hdr.alternateLBA);
+            AaruConsole.DebugWriteLine("GPT Plugin", "hdr.firstUsableLBA = {0}", hdr.firstUsableLBA);
+            AaruConsole.DebugWriteLine("GPT Plugin", "hdr.lastUsableLBA = {0}", hdr.lastUsableLBA);
+            AaruConsole.DebugWriteLine("GPT Plugin", "hdr.diskGuid = {0}", hdr.diskGuid);
+            AaruConsole.DebugWriteLine("GPT Plugin", "hdr.entryLBA = {0}", hdr.entryLBA);
+            AaruConsole.DebugWriteLine("GPT Plugin", "hdr.entries = {0}", hdr.entries);
+            AaruConsole.DebugWriteLine("GPT Plugin", "hdr.entriesSize = {0}", hdr.entriesSize);
             AaruConsole.DebugWriteLine("GPT Plugin", "hdr.entriesCrc = 0x{0:X8}", hdr.entriesCrc);
 
-            if(hdr.signature != GPT_MAGIC) return false;
+            if(hdr.signature != GPT_MAGIC)
+                return false;
 
-            if(hdr.myLBA != 1 + sectorOffset) return false;
+            if(hdr.myLBA != 1 + sectorOffset)
+                return false;
 
             uint divisor, modulo, sectorSize;
 
@@ -120,11 +131,13 @@ namespace Aaru.Partitions
                 sectorSize = imagePlugin.Info.SectorSize;
             }
 
-            uint totalEntriesSectors = hdr.entries * hdr.entriesSize / imagePlugin.Info.SectorSize;
-            if(hdr.entries * hdr.entriesSize % imagePlugin.Info.SectorSize > 0) totalEntriesSectors++;
+            uint totalEntriesSectors = (hdr.entries * hdr.entriesSize) / imagePlugin.Info.SectorSize;
+
+            if((hdr.entries * hdr.entriesSize) % imagePlugin.Info.SectorSize > 0)
+                totalEntriesSectors++;
 
             byte[] temp         = imagePlugin.ReadSectors(hdr.entryLBA / divisor, totalEntriesSectors + modulo);
-            byte[] entriesBytes = new byte[temp.Length - modulo * 512];
+            byte[] entriesBytes = new byte[temp.Length - (modulo       * 512)];
             Array.Copy(temp, modulo * 512, entriesBytes, 0, entriesBytes.Length);
             List<GptEntry> entries = new List<GptEntry>();
 
@@ -144,35 +157,36 @@ namespace Aaru.Partitions
                 #pragma warning restore RECS0022 // A catch clause that catches System.Exception and has an empty body
             }
 
-            if(entries.Count == 0) return false;
+            if(entries.Count == 0)
+                return false;
 
             ulong pseq = 0;
 
             foreach(GptEntry entry in entries.Where(entry => entry.partitionType != Guid.Empty &&
                                                              entry.partitionId   != Guid.Empty))
             {
-                AaruConsole.DebugWriteLine("GPT Plugin", "entry.partitionType = {0}",    entry.partitionType);
-                AaruConsole.DebugWriteLine("GPT Plugin", "entry.partitionId = {0}",      entry.partitionId);
-                AaruConsole.DebugWriteLine("GPT Plugin", "entry.startLBA = {0}",         entry.startLBA);
-                AaruConsole.DebugWriteLine("GPT Plugin", "entry.endLBA = {0}",           entry.endLBA);
+                AaruConsole.DebugWriteLine("GPT Plugin", "entry.partitionType = {0}", entry.partitionType);
+                AaruConsole.DebugWriteLine("GPT Plugin", "entry.partitionId = {0}", entry.partitionId);
+                AaruConsole.DebugWriteLine("GPT Plugin", "entry.startLBA = {0}", entry.startLBA);
+                AaruConsole.DebugWriteLine("GPT Plugin", "entry.endLBA = {0}", entry.endLBA);
                 AaruConsole.DebugWriteLine("GPT Plugin", "entry.attributes = 0x{0:X16}", entry.attributes);
-                AaruConsole.DebugWriteLine("GPT Plugin", "entry.name = {0}",             entry.name);
+                AaruConsole.DebugWriteLine("GPT Plugin", "entry.name = {0}", entry.name);
 
                 if(entry.startLBA / divisor > imagePlugin.Info.Sectors ||
-                   entry.endLBA   / divisor > imagePlugin.Info.Sectors) return false;
+                   entry.endLBA   / divisor > imagePlugin.Info.Sectors)
+                    return false;
 
-                Partition part = new Partition
+                var part = new Partition
                 {
-                    Description = $"ID: {entry.partitionId}",
-                    Size        = (entry.endLBA - entry.startLBA + 1) * sectorSize,
-                    Name        = entry.name,
-                    Length      = (entry.endLBA - entry.startLBA + 1) / divisor,
+                    Description = $"ID: {entry.partitionId}", Size = ((entry.endLBA - entry.startLBA) + 1) * sectorSize,
+                    Name        = entry.name, Length               = ((entry.endLBA - entry.startLBA) + 1) / divisor,
                     Sequence    = pseq++,
                     Offset      = entry.startLBA * sectorSize,
                     Start       = entry.startLBA / divisor,
                     Type        = GetGuidTypeName(entry.partitionType),
                     Scheme      = Name
                 };
+
                 AaruConsole.DebugWriteLine("GPT Plugin", "part.PartitionType = {0}", part.Type);
                 partitions.Add(part);
             }
@@ -183,6 +197,7 @@ namespace Aaru.Partitions
         static string GetGuidTypeName(Guid type)
         {
             string strType = type.ToString().ToUpperInvariant();
+
             switch(strType)
             {
                 case "024DEE41-33E7-11D3-9D69-0008C781F39F": return "MBR scheme";
@@ -291,32 +306,32 @@ namespace Aaru.Partitions
         [StructLayout(LayoutKind.Sequential)]
         struct GptHeader
         {
-            public ulong signature;
-            public uint  revision;
-            public uint  headerSize;
-            public uint  headerCrc;
-            public uint  reserved;
-            public ulong myLBA;
-            public ulong alternateLBA;
-            public ulong firstUsableLBA;
-            public ulong lastUsableLBA;
-            public Guid  diskGuid;
-            public ulong entryLBA;
-            public uint  entries;
-            public uint  entriesSize;
-            public uint  entriesCrc;
+            public readonly ulong signature;
+            public readonly uint  revision;
+            public readonly uint  headerSize;
+            public readonly uint  headerCrc;
+            public readonly uint  reserved;
+            public readonly ulong myLBA;
+            public readonly ulong alternateLBA;
+            public readonly ulong firstUsableLBA;
+            public readonly ulong lastUsableLBA;
+            public readonly Guid  diskGuid;
+            public readonly ulong entryLBA;
+            public readonly uint  entries;
+            public readonly uint  entriesSize;
+            public readonly uint  entriesCrc;
         }
 
         [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
         struct GptEntry
         {
-            public Guid  partitionType;
-            public Guid  partitionId;
-            public ulong startLBA;
-            public ulong endLBA;
-            public ulong attributes;
+            public readonly Guid  partitionType;
+            public readonly Guid  partitionId;
+            public readonly ulong startLBA;
+            public readonly ulong endLBA;
+            public readonly ulong attributes;
             [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 36)]
-            public string name;
+            public readonly string name;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Partitions/Human68k.cs b/Aaru.Partitions/Human68k.cs
index 7fee84c18..b3519bbec 100644
--- a/Aaru.Partitions/Human68k.cs
+++ b/Aaru.Partitions/Human68k.cs
@@ -58,21 +58,25 @@ namespace Aaru.Partitions
 
             AaruConsole.DebugWriteLine("Human68k plugin", "sectorSize = {0}", imagePlugin.Info.SectorSize);
 
-            if(sectorOffset + 4 >= imagePlugin.Info.Sectors) return false;
+            if(sectorOffset + 4 >= imagePlugin.Info.Sectors)
+                return false;
 
             switch(imagePlugin.Info.SectorSize)
             {
                 case 256:
                     sector       = imagePlugin.ReadSector(4 + sectorOffset);
                     sectsPerUnit = 1;
+
                     break;
                 case 512:
                     sector       = imagePlugin.ReadSector(4 + sectorOffset);
                     sectsPerUnit = 2;
+
                     break;
                 case 1024:
                     sector       = imagePlugin.ReadSector(2 + sectorOffset);
                     sectsPerUnit = 1;
+
                     break;
                 default: return false;
             }
@@ -81,13 +85,14 @@ namespace Aaru.Partitions
 
             AaruConsole.DebugWriteLine("Human68k plugin", "table.magic = {0:X4}", table.magic);
 
-            if(table.magic != X68K_MAGIC) return false;
+            if(table.magic != X68K_MAGIC)
+                return false;
 
             for(int i = 0; i < table.entries.Length; i++)
                 table.entries[i] = (X68kEntry)Marshal.SwapStructureMembersEndian(table.entries[i]);
 
-            AaruConsole.DebugWriteLine("Human68k plugin", "table.size = {0:X4}",    table.size);
-            AaruConsole.DebugWriteLine("Human68k plugin", "table.size2 = {0:X4}",   table.size2);
+            AaruConsole.DebugWriteLine("Human68k plugin", "table.size = {0:X4}", table.size);
+            AaruConsole.DebugWriteLine("Human68k plugin", "table.size2 = {0:X4}", table.size2);
             AaruConsole.DebugWriteLine("Human68k plugin", "table.unknown = {0:X4}", table.unknown);
 
             ulong counter = 0;
@@ -95,23 +100,27 @@ namespace Aaru.Partitions
             foreach(X68kEntry entry in table.entries)
             {
                 AaruConsole.DebugWriteLine("Human68k plugin", "entry.name = {0}",
-                                          StringHandlers.CToString(entry.name, Encoding.GetEncoding(932)));
-                AaruConsole.DebugWriteLine("Human68k plugin", "entry.stateStart = {0}", entry.stateStart);
-                AaruConsole.DebugWriteLine("Human68k plugin", "entry.length = {0}",     entry.length);
-                AaruConsole.DebugWriteLine("Human68k plugin", "sectsPerUnit = {0} {1}", sectsPerUnit,
-                                          imagePlugin.Info.SectorSize);
+                                           StringHandlers.CToString(entry.name, Encoding.GetEncoding(932)));
 
-                Partition part = new Partition
+                AaruConsole.DebugWriteLine("Human68k plugin", "entry.stateStart = {0}", entry.stateStart);
+                AaruConsole.DebugWriteLine("Human68k plugin", "entry.length = {0}", entry.length);
+
+                AaruConsole.DebugWriteLine("Human68k plugin", "sectsPerUnit = {0} {1}", sectsPerUnit,
+                                           imagePlugin.Info.SectorSize);
+
+                var part = new Partition
                 {
-                    Start    = (entry.stateStart & 0xFFFFFF) * sectsPerUnit,
-                    Length   = entry.length                  * sectsPerUnit,
-                    Type     = StringHandlers.CToString(entry.name, Encoding.GetEncoding(932)),
-                    Sequence = counter,
-                    Scheme   = Name
+                    Start  = (entry.stateStart & 0xFFFFFF) * sectsPerUnit,
+                    Length = entry.length                  * sectsPerUnit,
+                    Type   = StringHandlers.CToString(entry.name, Encoding.GetEncoding(932)), Sequence = counter,
+                    Scheme = Name
                 };
+
                 part.Offset = part.Start  * (ulong)sector.Length;
                 part.Size   = part.Length * (ulong)sector.Length;
-                if(entry.length <= 0) continue;
+
+                if(entry.length <= 0)
+                    continue;
 
                 partitions.Add(part);
                 counter++;
@@ -123,21 +132,21 @@ namespace Aaru.Partitions
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct X68kTable
         {
-            public uint magic;
-            public uint size;
-            public uint size2;
-            public uint unknown;
+            public readonly uint magic;
+            public readonly uint size;
+            public readonly uint size2;
+            public readonly uint unknown;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public X68kEntry[] entries;
+            public readonly X68kEntry[] entries;
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct X68kEntry
         {
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public byte[] name;
-            public uint stateStart;
-            public uint length;
+            public readonly byte[] name;
+            public readonly uint stateStart;
+            public readonly uint length;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Partitions/MBR.cs b/Aaru.Partitions/MBR.cs
index 0f1b1bb6f..4f5d8aa60 100644
--- a/Aaru.Partitions/MBR.cs
+++ b/Aaru.Partitions/MBR.cs
@@ -55,133 +55,196 @@ namespace Aaru.Partitions
         {
             // 0x00
             "Empty", "FAT12", "XENIX root", "XENIX /usr",
+
             // 0x04
             "FAT16 < 32 MiB", "Extended", "FAT16", "IFS (HPFS/NTFS)",
+
             // 0x08
             "AIX boot, OS/2, Commodore DOS", "AIX data, Coherent, QNX", "Coherent swap, OPUS, OS/2 Boot Manager",
             "FAT32",
+
             // 0x0C
             "FAT32 (LBA)", "Unknown", "FAT16 (LBA)", "Extended (LBA)",
+
             // 0x10
             "OPUS", "Hidden FAT12", "Compaq diagnostics, recovery partition", "Unknown",
+
             // 0x14
             "Hidden FAT16 < 32 MiB, AST-DOS", "Unknown", "Hidden FAT16", "Hidden IFS (HPFS/NTFS)",
+
             // 0x18
             "AST-Windows swap", "Willowtech Photon coS", "Unknown", "Hidden FAT32",
+
             // 0x1C
             "Hidden FAT32 (LBA)", "Unknown", "Hidden FAT16 (LBA)", "Unknown",
+
             // 0x20
             "Willowsoft Overture File System", "Oxygen FSo2", "Oxygen Extended ", "SpeedStor reserved",
+
             // 0x24
             "NEC-DOS", "Unknown", "SpeedStor reserved", "Hidden NTFS",
+
             // 0x28
             "Unknown", "Unknown", "Unknown", "Unknown",
+
             // 0x2C
             "Unknown", "Unknown", "Unknown", "Unknown",
+
             // 0x30
             "Unknown", "SpeedStor reserved", "Unknown", "SpeedStor reserved",
+
             // 0x34
             "SpeedStor reserved", "Unknown", "SpeedStor reserved", "Unknown",
+
             // 0x38
             "Theos", "Plan 9", "Unknown", "Unknown",
+
             // 0x3C
             "Partition Magic", "Hidden NetWare", "Unknown", "Unknown",
+
             // 0x40
             "VENIX 80286", "PReP Boot", "Secure File System", "PTS-DOS",
+
             // 0x44
             "Unknown", "Priam, EUMEL/Elan", "EUMEL/Elan", "EUMEL/Elan",
+
             // 0x48
             "EUMEL/Elan", "Unknown", "ALFS/THIN lightweight filesystem for DOS", "Unknown",
+
             // 0x4C
             "Unknown", "QNX 4", "QNX 4", "QNX 4, Oberon",
+
             // 0x50
             "Ontrack DM, R/O, FAT", "Ontrack DM, R/W, FAT", "CP/M, Microport UNIX", "Ontrack DM 6",
+
             // 0x54
             "Ontrack DM 6", "EZ-Drive", "Golden Bow VFeature", "Unknown",
+
             // 0x58
             "Unknown", "Unknown", "Unknown", "Unknown",
+
             // 0x5C
             "Priam EDISK", "Unknown", "Unknown", "Unknown",
+
             // 0x60
             "Unknown", "SpeedStor", "Unknown", "GNU Hurd, System V, 386/ix",
+
             // 0x64
             "NetWare 286", "NetWare", "NetWare 386", "NetWare",
+
             // 0x68
             "NetWare", "NetWare NSS", "Unknown", "Unknown",
+
             // 0x6C
             "Unknown", "Unknown", "Unknown", "Unknown",
+
             // 0x70
             "DiskSecure Multi-Boot", "Unknown", "UNIX 7th Edition", "Unknown",
+
             // 0x74
             "Unknown", "IBM PC/IX", "Unknown", "Unknown",
+
             // 0x78
             "Unknown", "Unknown", "Unknown", "Unknown",
+
             // 0x7C
             "Unknown", "Unknown", "Unknown", "Unknown",
+
             // 0x80
             "Old MINIX", "MINIX, Old Linux", "Linux swap, Solaris", "Linux",
+
             // 0x84
             "Hidden by OS/2, APM hibernation", "Linux extended", "NT Stripe Set", "NT Stripe Set",
+
             // 0x88
             "Linux Plaintext", "Unknown", "Unknown", "Unknown",
+
             // 0x8C
             "Unknown", "Unknown", "Linux LVM", "Unknown",
+
             // 0x90
             "Unknown", "Unknown", "Unknown", "Amoeba, Hidden Linux",
+
             // 0x94
             "Amoeba bad blocks", "Unknown", "Unknown", "Unknown",
+
             // 0x98
             "Unknown", "Mylex EISA SCSI", "Unknown", "Unknown",
+
             // 0x9C
             "Unknown", "Unknown", "Unknown", "BSD/OS",
+
             // 0xA0
             "Hibernation", "HP Volume Expansion", "Unknown", "HP Volume Expansion",
+
             // 0xA4
             "HP Volume Expansion", "FreeBSD", "OpenBSD", "NeXTStep",
+
             // 0xA8
             "Apple UFS", "NetBSD", "Olivetti DOS FAT12", "Apple Boot",
+
             // 0xAC
             "Unknown", "Unknown", "Unknown", "Apple HFS",
+
             // 0xB0
             "BootStar", "HP Volume Expansion", "Unknown", "HP Volume Expansion",
+
             // 0xB4
             "HP Volume Expansion", "Unknown", "HP Volume Expansion", "BSDi",
+
             // 0xB8
             "BSDi swap", "Unknown", "Unknown", "PTS BootWizard",
+
             // 0xBC
             "Unknown", "Unknown", "Solaris boot", "Solaris",
+
             // 0xC0
             "Novell DOS, DR-DOS secured", "DR-DOS secured FAT12", "DR-DOS reserved", "DR-DOS reserved",
+
             // 0xC4
             "DR-DOS secured FAT16 < 32 MiB", "Unknown", "DR-DOS secured FAT16", "Syrinx",
+
             // 0xC8
             "DR-DOS reserved", "DR-DOS reserved", "DR-DOS reserved", "DR-DOS secured FAT32",
+
             // 0xCC
             "DR-DOS secured FAT32 (LBA)", "DR-DOS reserved", "DR-DOS secured FAT16 (LBA)",
             "DR-DOS secured extended (LBA)",
+
             // 0xD0
             "Multiuser DOS secured FAT12", "Multiuser DOS secured FAT12", "Unknown", "Unknown",
+
             // 0xD4
             "Multiuser DOS secured FAT16 < 32 MiB", "Multiuser DOS secured extended", "Multiuser DOS secured FAT16",
             "Unknown",
+
             // 0xD8
             "CP/M", "Unknown", "Filesystem-less data", "CP/M, CCP/M, CTOS",
+
             // 0xDC
             "Unknown", "Unknown", "Dell partition", "BootIt EMBRM",
+
             // 0xE0
             "Unknown", "SpeedStor", "DOS read/only", "SpeedStor",
+
             // 0xE4
             "SpeedStor", "Tandy DOS", "SpeedStor", "Unknown",
+
             // 0xE8
             "Unknown", "Unknown", "Unknown", "BeOS",
+
             // 0xEC
             "Unknown", "Spryt*x", "Guid Partition Table", "EFI system partition",
+
             // 0xF0
             "Linux boot", "SpeedStor", "DOS 3.3 secondary, Unisys DOS", "SpeedStor",
+
             // 0xF4
             "SpeedStor", "Prologue", "SpeedStor", "Unknown",
+
             // 0xF8
             "Unknown", "Unknown", "Unknown", "VMWare VMFS",
+
             // 0xFC
             "VMWare VMKCORE", "Linux RAID, FreeDOS", "SpeedStor, LANStep, PS/2 IML", "Xenix bad block"
         };
@@ -196,9 +259,11 @@ namespace Aaru.Partitions
 
             partitions = new List<Partition>();
 
-            if(imagePlugin.Info.SectorSize < 512) return false;
+            if(imagePlugin.Info.SectorSize < 512)
+                return false;
 
             uint sectorSize = imagePlugin.Info.SectorSize;
+
             // Divider of sector size in MBR between real sector size
             ulong divider = 1;
 
@@ -212,17 +277,21 @@ namespace Aaru.Partitions
 
             MasterBootRecord      mbr     = Marshal.ByteArrayToStructureLittleEndian<MasterBootRecord>(sector);
             TimedMasterBootRecord mbrTime = Marshal.ByteArrayToStructureLittleEndian<TimedMasterBootRecord>(sector);
+
             SerializedMasterBootRecord mbrSerial =
                 Marshal.ByteArrayToStructureLittleEndian<SerializedMasterBootRecord>(sector);
+
             ModernMasterBootRecord mbrModern = Marshal.ByteArrayToStructureLittleEndian<ModernMasterBootRecord>(sector);
             NecMasterBootRecord    mbrNec    = Marshal.ByteArrayToStructureLittleEndian<NecMasterBootRecord>(sector);
+
             DiskManagerMasterBootRecord mbrOntrack =
                 Marshal.ByteArrayToStructureLittleEndian<DiskManagerMasterBootRecord>(sector);
 
-            AaruConsole.DebugWriteLine("MBR plugin", "xmlmedia = {0}",     imagePlugin.Info.XmlMediaType);
+            AaruConsole.DebugWriteLine("MBR plugin", "xmlmedia = {0}", imagePlugin.Info.XmlMediaType);
             AaruConsole.DebugWriteLine("MBR plugin", "mbr.magic = {0:X4}", mbr.magic);
 
-            if(mbr.magic != MBR_MAGIC) return false; // Not MBR
+            if(mbr.magic != MBR_MAGIC)
+                return false; // Not MBR
 
             byte[] hdrBytes = imagePlugin.ReadSector(1 + sectorOffset);
 
@@ -230,21 +299,28 @@ namespace Aaru.Partitions
 
             AaruConsole.DebugWriteLine("MBR Plugin", "gpt.signature = 0x{0:X16}", signature);
 
-            if(signature == GPT_MAGIC) return false;
+            if(signature == GPT_MAGIC)
+                return false;
 
-            if(signature != GPT_MAGIC && imagePlugin.Info.XmlMediaType == XmlMediaType.OpticalDisc)
+            if(signature                     != GPT_MAGIC &&
+               imagePlugin.Info.XmlMediaType == XmlMediaType.OpticalDisc)
             {
                 hdrBytes  = imagePlugin.ReadSector(sectorOffset);
                 signature = BitConverter.ToUInt64(hdrBytes, 512);
                 AaruConsole.DebugWriteLine("MBR Plugin", "gpt.signature @ 0x200 = 0x{0:X16}", signature);
-                if(signature == GPT_MAGIC) return false;
+
+                if(signature == GPT_MAGIC)
+                    return false;
             }
 
             MbrPartitionEntry[] entries;
 
-            if(mbrOntrack.dm_magic   == DM_MAGIC) entries  = mbrOntrack.entries;
-            else if(mbrNec.nec_magic == NEC_MAGIC) entries = mbrNec.entries;
-            else entries                                   = mbr.entries;
+            if(mbrOntrack.dm_magic == DM_MAGIC)
+                entries = mbrOntrack.entries;
+            else if(mbrNec.nec_magic == NEC_MAGIC)
+                entries = mbrNec.entries;
+            else
+                entries = mbr.entries;
 
             foreach(MbrPartitionEntry entry in entries)
             {
@@ -261,12 +337,22 @@ namespace Aaru.Partitions
                 bool extended = false;
                 bool minix    = false;
 
-                if(entry.status != 0x00 && entry.status != 0x80) return false; // Maybe a FAT filesystem
+                if(entry.status != 0x00 &&
+                   entry.status != 0x80)
+                    return false; // Maybe a FAT filesystem
 
                 valid &= entry.type != 0x00;
-                if(entry.type == 0x05 || entry.type == 0x0F || entry.type == 0x15 || entry.type == 0x1F ||
-                   entry.type == 0x85 || entry.type == 0x91 || entry.type == 0x9B || entry.type == 0xC5 ||
-                   entry.type == 0xCF || entry.type == 0xD5)
+
+                if(entry.type == 0x05 ||
+                   entry.type == 0x0F ||
+                   entry.type == 0x15 ||
+                   entry.type == 0x1F ||
+                   entry.type == 0x85 ||
+                   entry.type == 0x91 ||
+                   entry.type == 0x9B ||
+                   entry.type == 0xC5 ||
+                   entry.type == 0xCF ||
+                   entry.type == 0xD5)
                 {
                     valid    = false;
                     extended = true; // Extended partition
@@ -277,10 +363,14 @@ namespace Aaru.Partitions
                 valid &= entry.lba_start  != 0 || entry.lba_sectors  != 0 || entry.start_cylinder != 0 ||
                          entry.start_head != 0 || entry.start_sector != 0 || entry.end_cylinder   != 0 ||
                          entry.end_head   != 0 || entry.end_sector   != 0;
-                if(entry.lba_start == 0 && entry.lba_sectors == 0 && valid)
+
+                if(entry.lba_start   == 0 &&
+                   entry.lba_sectors == 0 &&
+                   valid)
                 {
                     lbaStart = CHS.ToLBA(startCylinder, entry.start_head, startSector, imagePlugin.Info.Heads,
                                          imagePlugin.Info.SectorsPerTrack);
+
                     lbaSectors = CHS.ToLBA(endCylinder, entry.end_head, entry.end_sector, imagePlugin.Info.Heads,
                                            imagePlugin.Info.SectorsPerTrack) - lbaStart;
                 }
@@ -289,7 +379,8 @@ namespace Aaru.Partitions
                 lbaStart   /= divider;
                 lbaSectors /= divider;
 
-                if(minix && lbaStart == sectorOffset) minix = false;
+                if(minix && lbaStart == sectorOffset)
+                    minix = false;
 
                 if(lbaStart > imagePlugin.Info.Sectors)
                 {
@@ -298,22 +389,23 @@ namespace Aaru.Partitions
                 }
 
                 // Some buggy implementations do some rounding errors getting a few sectors beyond device size
-                if(lbaStart + lbaSectors > imagePlugin.Info.Sectors) lbaSectors = imagePlugin.Info.Sectors - lbaStart;
+                if(lbaStart + lbaSectors > imagePlugin.Info.Sectors)
+                    lbaSectors = imagePlugin.Info.Sectors - lbaStart;
 
-                AaruConsole.DebugWriteLine("MBR plugin", "entry.status {0}",         entry.status);
-                AaruConsole.DebugWriteLine("MBR plugin", "entry.type {0}",           entry.type);
-                AaruConsole.DebugWriteLine("MBR plugin", "entry.lba_start {0}",      entry.lba_start);
-                AaruConsole.DebugWriteLine("MBR plugin", "entry.lba_sectors {0}",    entry.lba_sectors);
+                AaruConsole.DebugWriteLine("MBR plugin", "entry.status {0}", entry.status);
+                AaruConsole.DebugWriteLine("MBR plugin", "entry.type {0}", entry.type);
+                AaruConsole.DebugWriteLine("MBR plugin", "entry.lba_start {0}", entry.lba_start);
+                AaruConsole.DebugWriteLine("MBR plugin", "entry.lba_sectors {0}", entry.lba_sectors);
                 AaruConsole.DebugWriteLine("MBR plugin", "entry.start_cylinder {0}", startCylinder);
-                AaruConsole.DebugWriteLine("MBR plugin", "entry.start_head {0}",     entry.start_head);
-                AaruConsole.DebugWriteLine("MBR plugin", "entry.start_sector {0}",   startSector);
-                AaruConsole.DebugWriteLine("MBR plugin", "entry.end_cylinder {0}",   endCylinder);
-                AaruConsole.DebugWriteLine("MBR plugin", "entry.end_head {0}",       entry.end_head);
-                AaruConsole.DebugWriteLine("MBR plugin", "entry.end_sector {0}",     endSector);
+                AaruConsole.DebugWriteLine("MBR plugin", "entry.start_head {0}", entry.start_head);
+                AaruConsole.DebugWriteLine("MBR plugin", "entry.start_sector {0}", startSector);
+                AaruConsole.DebugWriteLine("MBR plugin", "entry.end_cylinder {0}", endCylinder);
+                AaruConsole.DebugWriteLine("MBR plugin", "entry.end_head {0}", entry.end_head);
+                AaruConsole.DebugWriteLine("MBR plugin", "entry.end_sector {0}", endSector);
 
                 AaruConsole.DebugWriteLine("MBR plugin", "entry.minix = {0}", minix);
 
-                AaruConsole.DebugWriteLine("MBR plugin", "lba_start {0}",   lbaStart);
+                AaruConsole.DebugWriteLine("MBR plugin", "lba_start {0}", lbaStart);
                 AaruConsole.DebugWriteLine("MBR plugin", "lba_sectors {0}", lbaSectors);
 
                 if(valid && minix) // Let's mix the fun
@@ -324,15 +416,18 @@ namespace Aaru.Partitions
 
                 if(valid && !minix)
                 {
-                    Partition part = new Partition();
-                    if((lbaStart > 0 || imagePlugin.Info.XmlMediaType == XmlMediaType.OpticalDisc) && lbaSectors > 0)
+                    var part = new Partition();
+
+                    if((lbaStart > 0 || imagePlugin.Info.XmlMediaType == XmlMediaType.OpticalDisc) &&
+                       lbaSectors > 0)
                     {
                         part.Start  = lbaStart + sectorOffset;
                         part.Length = lbaSectors;
                         part.Offset = part.Start  * sectorSize;
                         part.Size   = part.Length * sectorSize;
                     }
-                    else valid = false;
+                    else
+                        valid = false;
 
                     if(valid)
                     {
@@ -350,7 +445,8 @@ namespace Aaru.Partitions
 
                 AaruConsole.DebugWriteLine("MBR plugin", "entry.extended = {0}", extended);
 
-                if(!extended) continue;
+                if(!extended)
+                    continue;
 
                 bool  processingExtended = true;
                 ulong chainStart         = lbaStart;
@@ -363,7 +459,8 @@ namespace Aaru.Partitions
 
                     AaruConsole.DebugWriteLine("MBR plugin", "ebr.magic == MBR_Magic = {0}", ebr.magic == MBR_MAGIC);
 
-                    if(ebr.magic != MBR_MAGIC) break;
+                    if(ebr.magic != MBR_MAGIC)
+                        break;
 
                     ulong nextStart = 0;
 
@@ -378,28 +475,33 @@ namespace Aaru.Partitions
                         ulong extSectors = ebrEntry.lba_sectors;
                         bool  extMinix   = false;
 
-                        AaruConsole.DebugWriteLine("MBR plugin", "ebr_entry.status {0}",         ebrEntry.status);
-                        AaruConsole.DebugWriteLine("MBR plugin", "ebr_entry.type {0}",           ebrEntry.type);
-                        AaruConsole.DebugWriteLine("MBR plugin", "ebr_entry.lba_start {0}",      ebrEntry.lba_start);
-                        AaruConsole.DebugWriteLine("MBR plugin", "ebr_entry.lba_sectors {0}",    ebrEntry.lba_sectors);
+                        AaruConsole.DebugWriteLine("MBR plugin", "ebr_entry.status {0}", ebrEntry.status);
+                        AaruConsole.DebugWriteLine("MBR plugin", "ebr_entry.type {0}", ebrEntry.type);
+                        AaruConsole.DebugWriteLine("MBR plugin", "ebr_entry.lba_start {0}", ebrEntry.lba_start);
+                        AaruConsole.DebugWriteLine("MBR plugin", "ebr_entry.lba_sectors {0}", ebrEntry.lba_sectors);
                         AaruConsole.DebugWriteLine("MBR plugin", "ebr_entry.start_cylinder {0}", startCylinder);
-                        AaruConsole.DebugWriteLine("MBR plugin", "ebr_entry.start_head {0}",     ebrEntry.start_head);
-                        AaruConsole.DebugWriteLine("MBR plugin", "ebr_entry.start_sector {0}",   startSector);
-                        AaruConsole.DebugWriteLine("MBR plugin", "ebr_entry.end_cylinder {0}",   endCylinder);
-                        AaruConsole.DebugWriteLine("MBR plugin", "ebr_entry.end_head {0}",       ebrEntry.end_head);
-                        AaruConsole.DebugWriteLine("MBR plugin", "ebr_entry.end_sector {0}",     endSector);
+                        AaruConsole.DebugWriteLine("MBR plugin", "ebr_entry.start_head {0}", ebrEntry.start_head);
+                        AaruConsole.DebugWriteLine("MBR plugin", "ebr_entry.start_sector {0}", startSector);
+                        AaruConsole.DebugWriteLine("MBR plugin", "ebr_entry.end_cylinder {0}", endCylinder);
+                        AaruConsole.DebugWriteLine("MBR plugin", "ebr_entry.end_head {0}", ebrEntry.end_head);
+                        AaruConsole.DebugWriteLine("MBR plugin", "ebr_entry.end_sector {0}", endSector);
 
                         // Let's start the fun...
                         extValid &= ebrEntry.status == 0x00 || ebrEntry.status == 0x80;
                         extValid &= ebrEntry.type != 0x00;
+
                         extValid &= ebrEntry.lba_start      != 0 || ebrEntry.lba_sectors  != 0 ||
                                     ebrEntry.start_cylinder != 0 || ebrEntry.start_head   != 0 ||
                                     ebrEntry.start_sector   != 0 || ebrEntry.end_cylinder != 0 ||
                                     ebrEntry.end_head       != 0 || ebrEntry.end_sector   != 0;
-                        if(ebrEntry.lba_start == 0 && ebrEntry.lba_sectors == 0 && extValid)
+
+                        if(ebrEntry.lba_start   == 0 &&
+                           ebrEntry.lba_sectors == 0 &&
+                           extValid)
                         {
                             extStart = CHS.ToLBA(startCylinder, ebrEntry.start_head, startSector,
                                                  imagePlugin.Info.Heads, imagePlugin.Info.SectorsPerTrack);
+
                             extSectors = CHS.ToLBA(endCylinder, ebrEntry.end_head, ebrEntry.end_sector,
                                                    imagePlugin.Info.Heads, imagePlugin.Info.SectorsPerTrack) - extStart;
                         }
@@ -410,12 +512,18 @@ namespace Aaru.Partitions
                         extStart   /= divider;
                         extSectors /= divider;
 
-                        AaruConsole.DebugWriteLine("MBR plugin", "ext_start {0}",   extStart);
+                        AaruConsole.DebugWriteLine("MBR plugin", "ext_start {0}", extStart);
                         AaruConsole.DebugWriteLine("MBR plugin", "ext_sectors {0}", extSectors);
 
-                        if(ebrEntry.type == 0x05 || ebrEntry.type == 0x0F || ebrEntry.type == 0x15 ||
-                           ebrEntry.type == 0x1F || ebrEntry.type == 0x85 || ebrEntry.type == 0x91 ||
-                           ebrEntry.type == 0x9B || ebrEntry.type == 0xC5 || ebrEntry.type == 0xCF ||
+                        if(ebrEntry.type == 0x05 ||
+                           ebrEntry.type == 0x0F ||
+                           ebrEntry.type == 0x15 ||
+                           ebrEntry.type == 0x1F ||
+                           ebrEntry.type == 0x85 ||
+                           ebrEntry.type == 0x91 ||
+                           ebrEntry.type == 0x9B ||
+                           ebrEntry.type == 0xC5 ||
+                           ebrEntry.type == 0xCF ||
                            ebrEntry.type == 0xD5)
                         {
                             extValid  = false;
@@ -436,19 +544,24 @@ namespace Aaru.Partitions
                             else
                                 extMinix = false;
 
-                        if(!extValid || extMinix) continue;
+                        if(!extValid || extMinix)
+                            continue;
 
-                        Partition part = new Partition();
-                        if(extStart > 0 && extSectors > 0)
+                        var part = new Partition();
+
+                        if(extStart   > 0 &&
+                           extSectors > 0)
                         {
                             part.Start  = extStart + sectorOffset;
                             part.Length = extSectors;
                             part.Offset = part.Start  * sectorSize;
                             part.Size   = part.Length * sectorSize;
                         }
-                        else extValid = false;
+                        else
+                            extValid = false;
 
-                        if(!extValid) continue;
+                        if(!extValid)
+                            continue;
 
                         part.Type        = $"0x{ebrEntry.type:X2}";
                         part.Name        = DecodeMbrType(ebrEntry.type);
@@ -471,8 +584,7 @@ namespace Aaru.Partitions
             return partitions.Count != 0;
         }
 
-        static bool GetMinix(IMediaImage         imagePlugin, ulong start, ulong divider, ulong sectorOffset,
-                             uint                sectorSize,
+        static bool GetMinix(IMediaImage imagePlugin, ulong start, ulong divider, ulong sectorOffset, uint sectorSize,
                              out List<Partition> partitions)
         {
             partitions = new List<Partition>();
@@ -483,7 +595,8 @@ namespace Aaru.Partitions
 
             AaruConsole.DebugWriteLine("MBR plugin", "mnx.magic == MBR_Magic = {0}", mnx.magic == MBR_MAGIC);
 
-            if(mnx.magic != MBR_MAGIC) return false;
+            if(mnx.magic != MBR_MAGIC)
+                return false;
 
             bool anyMnx = false;
 
@@ -497,26 +610,31 @@ namespace Aaru.Partitions
                 ulong  mnxStart      = mnxEntry.lba_start;
                 ulong  mnxSectors    = mnxEntry.lba_sectors;
 
-                AaruConsole.DebugWriteLine("MBR plugin", "mnx_entry.status {0}",         mnxEntry.status);
-                AaruConsole.DebugWriteLine("MBR plugin", "mnx_entry.type {0}",           mnxEntry.type);
-                AaruConsole.DebugWriteLine("MBR plugin", "mnx_entry.lba_start {0}",      mnxEntry.lba_start);
-                AaruConsole.DebugWriteLine("MBR plugin", "mnx_entry.lba_sectors {0}",    mnxEntry.lba_sectors);
+                AaruConsole.DebugWriteLine("MBR plugin", "mnx_entry.status {0}", mnxEntry.status);
+                AaruConsole.DebugWriteLine("MBR plugin", "mnx_entry.type {0}", mnxEntry.type);
+                AaruConsole.DebugWriteLine("MBR plugin", "mnx_entry.lba_start {0}", mnxEntry.lba_start);
+                AaruConsole.DebugWriteLine("MBR plugin", "mnx_entry.lba_sectors {0}", mnxEntry.lba_sectors);
                 AaruConsole.DebugWriteLine("MBR plugin", "mnx_entry.start_cylinder {0}", startCylinder);
-                AaruConsole.DebugWriteLine("MBR plugin", "mnx_entry.start_head {0}",     mnxEntry.start_head);
-                AaruConsole.DebugWriteLine("MBR plugin", "mnx_entry.start_sector {0}",   startSector);
-                AaruConsole.DebugWriteLine("MBR plugin", "mnx_entry.end_cylinder {0}",   endCylinder);
-                AaruConsole.DebugWriteLine("MBR plugin", "mnx_entry.end_head {0}",       mnxEntry.end_head);
-                AaruConsole.DebugWriteLine("MBR plugin", "mnx_entry.end_sector {0}",     endSector);
+                AaruConsole.DebugWriteLine("MBR plugin", "mnx_entry.start_head {0}", mnxEntry.start_head);
+                AaruConsole.DebugWriteLine("MBR plugin", "mnx_entry.start_sector {0}", startSector);
+                AaruConsole.DebugWriteLine("MBR plugin", "mnx_entry.end_cylinder {0}", endCylinder);
+                AaruConsole.DebugWriteLine("MBR plugin", "mnx_entry.end_head {0}", mnxEntry.end_head);
+                AaruConsole.DebugWriteLine("MBR plugin", "mnx_entry.end_sector {0}", endSector);
 
                 mnxValid &= mnxEntry.status == 0x00 || mnxEntry.status == 0x80;
                 mnxValid &= mnxEntry.type   == 0x81 || mnxEntry.type   == 0x80;
+
                 mnxValid &= mnxEntry.lba_start  != 0 || mnxEntry.lba_sectors  != 0 || mnxEntry.start_cylinder != 0 ||
                             mnxEntry.start_head != 0 || mnxEntry.start_sector != 0 || mnxEntry.end_cylinder   != 0 ||
                             mnxEntry.end_head   != 0 || mnxEntry.end_sector   != 0;
-                if(mnxEntry.lba_start == 0 && mnxEntry.lba_sectors == 0 && mnxValid)
+
+                if(mnxEntry.lba_start   == 0 &&
+                   mnxEntry.lba_sectors == 0 &&
+                   mnxValid)
                 {
                     mnxStart = CHS.ToLBA(startCylinder, mnxEntry.start_head, startSector, imagePlugin.Info.Heads,
                                          imagePlugin.Info.SectorsPerTrack);
+
                     mnxSectors = CHS.ToLBA(endCylinder, mnxEntry.end_head, mnxEntry.end_sector, imagePlugin.Info.Heads,
                                            imagePlugin.Info.SectorsPerTrack) - mnxStart;
                 }
@@ -525,22 +643,27 @@ namespace Aaru.Partitions
                 mnxStart   /= divider;
                 mnxSectors /= divider;
 
-                AaruConsole.DebugWriteLine("MBR plugin", "mnx_start {0}",   mnxStart);
+                AaruConsole.DebugWriteLine("MBR plugin", "mnx_start {0}", mnxStart);
                 AaruConsole.DebugWriteLine("MBR plugin", "mnx_sectors {0}", mnxSectors);
 
-                if(!mnxValid) continue;
+                if(!mnxValid)
+                    continue;
 
-                Partition part = new Partition();
-                if(mnxStart > 0 && mnxSectors > 0)
+                var part = new Partition();
+
+                if(mnxStart   > 0 &&
+                   mnxSectors > 0)
                 {
                     part.Start  = mnxStart + sectorOffset;
                     part.Length = mnxSectors;
                     part.Offset = part.Start  * sectorSize;
                     part.Size   = part.Length * sectorSize;
                 }
-                else mnxValid = false;
+                else
+                    mnxValid = false;
 
-                if(!mnxValid) continue;
+                if(!mnxValid)
+                    continue;
 
                 anyMnx           = true;
                 part.Type        = "MINIX";
@@ -561,14 +684,14 @@ namespace Aaru.Partitions
         {
             /// <summary>Boot code</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 446)]
-            public byte[] boot_code;
+            public readonly byte[] boot_code;
             /// <summary>Partitions</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
-            public MbrPartitionEntry[] entries;
+            public readonly MbrPartitionEntry[] entries;
             /// <summary>
             ///     <see cref="MBR.MBR_MAGIC" />
             /// </summary>
-            public ushort magic;
+            public readonly ushort magic;
         }
 
         // TODO: IBM Boot Manager
@@ -577,14 +700,14 @@ namespace Aaru.Partitions
         {
             /// <summary>Boot code, almost always unused</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 446)]
-            public byte[] boot_code;
+            public readonly byte[] boot_code;
             /// <summary>Partitions or pointers</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
-            public MbrPartitionEntry[] entries;
+            public readonly MbrPartitionEntry[] entries;
             /// <summary>
             ///     <see cref="MBR.MBR_MAGIC" />
             /// </summary>
-            public ushort magic;
+            public readonly ushort magic;
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
@@ -592,27 +715,27 @@ namespace Aaru.Partitions
         {
             /// <summary>Boot code</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 218)]
-            public byte[] boot_code;
+            public readonly byte[] boot_code;
             /// <summary>Set to 0</summary>
-            public ushort zero;
+            public readonly ushort zero;
             /// <summary>Original physical drive</summary>
-            public byte drive;
+            public readonly byte drive;
             /// <summary>Disk timestamp, seconds</summary>
-            public byte seconds;
+            public readonly byte seconds;
             /// <summary>Disk timestamp, minutes</summary>
-            public byte minutes;
+            public readonly byte minutes;
             /// <summary>Disk timestamp, hours</summary>
-            public byte hours;
+            public readonly byte hours;
             /// <summary>Boot code, continuation</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 222)]
-            public byte[] boot_code2;
+            public readonly byte[] boot_code2;
             /// <summary>Partitions</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
-            public MbrPartitionEntry[] entries;
+            public readonly MbrPartitionEntry[] entries;
             /// <summary>
             ///     <see cref="MBR.MBR_MAGIC" />
             /// </summary>
-            public ushort magic;
+            public readonly ushort magic;
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
@@ -620,18 +743,18 @@ namespace Aaru.Partitions
         {
             /// <summary>Boot code</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 440)]
-            public byte[] boot_code;
+            public readonly byte[] boot_code;
             /// <summary>Disk serial number</summary>
-            public uint serial;
+            public readonly uint serial;
             /// <summary>Set to 0</summary>
-            public ushort zero;
+            public readonly ushort zero;
             /// <summary>Partitions</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
-            public MbrPartitionEntry[] entries;
+            public readonly MbrPartitionEntry[] entries;
             /// <summary>
             ///     <see cref="MBR.MBR_MAGIC" />
             /// </summary>
-            public ushort magic;
+            public readonly ushort magic;
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
@@ -639,31 +762,31 @@ namespace Aaru.Partitions
         {
             /// <summary>Boot code</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 218)]
-            public byte[] boot_code;
+            public readonly byte[] boot_code;
             /// <summary>Set to 0</summary>
-            public ushort zero;
+            public readonly ushort zero;
             /// <summary>Original physical drive</summary>
-            public byte drive;
+            public readonly byte drive;
             /// <summary>Disk timestamp, seconds</summary>
-            public byte seconds;
+            public readonly byte seconds;
             /// <summary>Disk timestamp, minutes</summary>
-            public byte minutes;
+            public readonly byte minutes;
             /// <summary>Disk timestamp, hours</summary>
-            public byte hours;
+            public readonly byte hours;
             /// <summary>Boot code, continuation</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 216)]
-            public byte[] boot_code2;
+            public readonly byte[] boot_code2;
             /// <summary>Disk serial number</summary>
-            public uint serial;
+            public readonly uint serial;
             /// <summary>Set to 0</summary>
-            public ushort zero2;
+            public readonly ushort zero2;
             /// <summary>Partitions</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
-            public MbrPartitionEntry[] entries;
+            public readonly MbrPartitionEntry[] entries;
             /// <summary>
             ///     <see cref="MBR.MBR_MAGIC" />
             /// </summary>
-            public ushort magic;
+            public readonly ushort magic;
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
@@ -671,18 +794,18 @@ namespace Aaru.Partitions
         {
             /// <summary>Boot code</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 380)]
-            public byte[] boot_code;
+            public readonly byte[] boot_code;
             /// <summary>
             ///     <see cref="MBR.NEC_MAGIC" />
             /// </summary>
-            public ushort nec_magic;
+            public readonly ushort nec_magic;
             /// <summary>Partitions</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public MbrPartitionEntry[] entries;
+            public readonly MbrPartitionEntry[] entries;
             /// <summary>
             ///     <see cref="MBR.MBR_MAGIC" />
             /// </summary>
-            public ushort magic;
+            public readonly ushort magic;
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
@@ -690,43 +813,43 @@ namespace Aaru.Partitions
         {
             /// <summary>Boot code</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 252)]
-            public byte[] boot_code;
+            public readonly byte[] boot_code;
             /// <summary>
             ///     <see cref="MBR.DM_MAGIC" />
             /// </summary>
-            public ushort dm_magic;
+            public readonly ushort dm_magic;
             /// <summary>Partitions</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public MbrPartitionEntry[] entries;
+            public readonly MbrPartitionEntry[] entries;
             /// <summary>
             ///     <see cref="MBR.MBR_MAGIC" />
             /// </summary>
-            public ushort magic;
+            public readonly ushort magic;
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct MbrPartitionEntry
         {
             /// <summary>Partition status, 0x80 or 0x00, else invalid</summary>
-            public byte status;
+            public readonly byte status;
             /// <summary>Starting head [0,254]</summary>
-            public byte start_head;
+            public readonly byte start_head;
             /// <summary>Starting sector [1,63]</summary>
-            public byte start_sector;
+            public readonly byte start_sector;
             /// <summary>Starting cylinder [0,1023]</summary>
-            public byte start_cylinder;
+            public readonly byte start_cylinder;
             /// <summary>Partition type</summary>
-            public byte type;
+            public readonly byte type;
             /// <summary>Ending head [0,254]</summary>
-            public byte end_head;
+            public readonly byte end_head;
             /// <summary>Ending sector [1,63]</summary>
-            public byte end_sector;
+            public readonly byte end_sector;
             /// <summary>Ending cylinder [0,1023]</summary>
-            public byte end_cylinder;
+            public readonly byte end_cylinder;
             /// <summary>Starting absolute sector</summary>
-            public uint lba_start;
+            public readonly uint lba_start;
             /// <summary>Total sectors</summary>
-            public uint lba_sectors;
+            public readonly uint lba_sectors;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Partitions/NeXT.cs b/Aaru.Partitions/NeXT.cs
index 2efe1a449..d5b02139f 100644
--- a/Aaru.Partitions/NeXT.cs
+++ b/Aaru.Partitions/NeXT.cs
@@ -67,30 +67,42 @@ namespace Aaru.Partitions
 
             uint sectorSize;
 
-            if(imagePlugin.Info.SectorSize == 2352 || imagePlugin.Info.SectorSize == 2448) sectorSize = 2048;
+            if(imagePlugin.Info.SectorSize == 2352 ||
+               imagePlugin.Info.SectorSize == 2448)
+                sectorSize = 2048;
             else
-                sectorSize =
-                    imagePlugin.Info.SectorSize;
+                sectorSize = imagePlugin.Info.SectorSize;
 
             partitions = new List<Partition>();
 
             ulong labelPosition = 0;
 
-            foreach(ulong i in new ulong[] {0, 4, 15, 16}.TakeWhile(i => i + sectorOffset < imagePlugin.Info.Sectors))
+            foreach(ulong i in new ulong[]
+            {
+                0, 4, 15, 16
+            }.TakeWhile(i => i + sectorOffset < imagePlugin.Info.Sectors))
             {
                 labelSector = imagePlugin.ReadSector(i + sectorOffset);
                 uint magic = BigEndianBitConverter.ToUInt32(labelSector, 0x00);
-                if(magic != NEXT_MAGIC1 && magic != NEXT_MAGIC2 && magic != NEXT_MAGIC3) continue;
+
+                if(magic != NEXT_MAGIC1 &&
+                   magic != NEXT_MAGIC2 &&
+                   magic != NEXT_MAGIC3)
+                    continue;
 
                 magicFound    = true;
                 labelPosition = i + sectorOffset;
+
                 break;
             }
 
-            if(!magicFound) return false;
+            if(!magicFound)
+                return false;
 
             uint sectorsToRead = 7680 / imagePlugin.Info.SectorSize;
-            if(7680 % imagePlugin.Info.SectorSize > 0) sectorsToRead++;
+
+            if(7680 % imagePlugin.Info.SectorSize > 0)
+                sectorsToRead++;
 
             labelSector = imagePlugin.ReadSectors(labelPosition, sectorsToRead);
 
@@ -101,84 +113,107 @@ namespace Aaru.Partitions
             label.dl_dt.d_partitions = new NeXTEntry[8];
 
             AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_version = 0x{0:X8}", label.dl_version);
-            AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_label_blkno = {0}",  label.dl_label_blkno);
-            AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_size = {0}",         label.dl_size);
+            AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_label_blkno = {0}", label.dl_label_blkno);
+            AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_size = {0}", label.dl_size);
+
             AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_label = \"{0}\"",
-                                      StringHandlers.CToString(label.dl_label));
-            AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_flags = {0}",    label.dl_flags);
+                                       StringHandlers.CToString(label.dl_label));
+
+            AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_flags = {0}", label.dl_flags);
             AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_tag = 0x{0:X8}", label.dl_tag);
+
             AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_name = \"{0}\"",
-                                      StringHandlers.CToString(label.dl_dt.d_name));
+                                       StringHandlers.CToString(label.dl_dt.d_name));
+
             AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_type = \"{0}\"",
-                                      StringHandlers.CToString(label.dl_dt.d_type));
-            AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_secsize = {0}",    label.dl_dt.d_secsize);
-            AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_ntracks = {0}",    label.dl_dt.d_ntracks);
-            AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_nsectors = {0}",   label.dl_dt.d_nsectors);
+                                       StringHandlers.CToString(label.dl_dt.d_type));
+
+            AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_secsize = {0}", label.dl_dt.d_secsize);
+            AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_ntracks = {0}", label.dl_dt.d_ntracks);
+            AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_nsectors = {0}", label.dl_dt.d_nsectors);
             AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_ncylinders = {0}", label.dl_dt.d_ncylinders);
-            AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_rpm = {0}",        label.dl_dt.d_rpm);
-            AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_front = {0}",      label.dl_dt.d_front);
-            AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_back = {0}",       label.dl_dt.d_back);
-            AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_ngroups = {0}",    label.dl_dt.d_ngroups);
-            AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_ag_size = {0}",    label.dl_dt.d_ag_size);
-            AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_ag_alts = {0}",    label.dl_dt.d_ag_alts);
-            AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_ag_off = {0}",     label.dl_dt.d_ag_off);
+            AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_rpm = {0}", label.dl_dt.d_rpm);
+            AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_front = {0}", label.dl_dt.d_front);
+            AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_back = {0}", label.dl_dt.d_back);
+            AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_ngroups = {0}", label.dl_dt.d_ngroups);
+            AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_ag_size = {0}", label.dl_dt.d_ag_size);
+            AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_ag_alts = {0}", label.dl_dt.d_ag_alts);
+            AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_ag_off = {0}", label.dl_dt.d_ag_off);
+
             AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_boot0_blkno[0] = {0}",
-                                      label.dl_dt.d_boot0_blkno[0]);
+                                       label.dl_dt.d_boot0_blkno[0]);
+
             AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_boot0_blkno[1] = {0}",
-                                      label.dl_dt.d_boot0_blkno[1]);
+                                       label.dl_dt.d_boot0_blkno[1]);
+
             AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_bootfile = \"{0}\"",
-                                      StringHandlers.CToString(label.dl_dt.d_bootfile));
+                                       StringHandlers.CToString(label.dl_dt.d_bootfile));
+
             AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_hostname = \"{0}\"",
-                                      StringHandlers.CToString(label.dl_dt.d_hostname));
+                                       StringHandlers.CToString(label.dl_dt.d_hostname));
+
             AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_rootpartition = {0}", label.dl_dt.d_rootpartition);
-            AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_rwpartition = {0}",   label.dl_dt.d_rwpartition);
+            AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_rwpartition = {0}", label.dl_dt.d_rwpartition);
 
             for(int i = 0; i < 8; i++)
             {
                 byte[] partB = new byte[44];
-                Array.Copy(labelSector, 44 + 146 + 44 * i, partB, 0, 44);
+                Array.Copy(labelSector, 44 + 146 + (44 * i), partB, 0, 44);
                 label.dl_dt.d_partitions[i] = Marshal.ByteArrayToStructureBigEndian<NeXTEntry>(partB);
+
                 AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_partitions[{0}].p_base = {1}", i,
-                                          label.dl_dt.d_partitions[i].p_base);
+                                           label.dl_dt.d_partitions[i].p_base);
+
                 AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_partitions[{0}].p_size = {1}", i,
-                                          label.dl_dt.d_partitions[i].p_size);
+                                           label.dl_dt.d_partitions[i].p_size);
+
                 AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_partitions[{0}].p_bsize = {1}", i,
-                                          label.dl_dt.d_partitions[i].p_bsize);
+                                           label.dl_dt.d_partitions[i].p_bsize);
+
                 AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_partitions[{0}].p_fsize = {1}", i,
-                                          label.dl_dt.d_partitions[i].p_fsize);
+                                           label.dl_dt.d_partitions[i].p_fsize);
+
                 AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_partitions[{0}].p_opt = {1}", i,
-                                          label.dl_dt.d_partitions[i].p_opt);
+                                           label.dl_dt.d_partitions[i].p_opt);
+
                 AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_partitions[{0}].p_cpg = {1}", i,
-                                          label.dl_dt.d_partitions[i].p_cpg);
+                                           label.dl_dt.d_partitions[i].p_cpg);
+
                 AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_partitions[{0}].p_density = {1}", i,
-                                          label.dl_dt.d_partitions[i].p_density);
+                                           label.dl_dt.d_partitions[i].p_density);
+
                 AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_partitions[{0}].p_minfree = {1}", i,
-                                          label.dl_dt.d_partitions[i].p_minfree);
+                                           label.dl_dt.d_partitions[i].p_minfree);
+
                 AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_partitions[{0}].p_newfs = {1}", i,
-                                          label.dl_dt.d_partitions[i].p_newfs);
+                                           label.dl_dt.d_partitions[i].p_newfs);
+
                 AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_partitions[{0}].p_mountpt = \"{1}\"", i,
-                                          StringHandlers.CToString(label.dl_dt.d_partitions[i].p_mountpt));
+                                           StringHandlers.CToString(label.dl_dt.d_partitions[i].p_mountpt));
+
                 AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_partitions[{0}].p_automnt = {1}", i,
-                                          label.dl_dt.d_partitions[i].p_automnt);
+                                           label.dl_dt.d_partitions[i].p_automnt);
+
                 AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_partitions[{0}].p_type = \"{1}\"", i,
-                                          StringHandlers.CToString(label.dl_dt.d_partitions[i].p_type));
+                                           StringHandlers.CToString(label.dl_dt.d_partitions[i].p_type));
 
-                if(label.dl_dt.d_partitions[i].p_size  <= 0 || label.dl_dt.d_partitions[i].p_base < 0 ||
-                   label.dl_dt.d_partitions[i].p_bsize < 0) continue;
+                if(label.dl_dt.d_partitions[i].p_size  <= 0 ||
+                   label.dl_dt.d_partitions[i].p_base  < 0  ||
+                   label.dl_dt.d_partitions[i].p_bsize < 0)
+                    continue;
 
-                StringBuilder sb = new StringBuilder();
+                var sb = new StringBuilder();
 
-                Partition part = new Partition
+                var part = new Partition
                 {
                     Size = (ulong)(label.dl_dt.d_partitions[i].p_size * label.dl_dt.d_secsize),
                     Offset =
                         (ulong)((label.dl_dt.d_partitions[i].p_base + label.dl_dt.d_front) * label.dl_dt.d_secsize),
-                    Type     = StringHandlers.CToString(label.dl_dt.d_partitions[i].p_type),
-                    Sequence = (ulong)i,
-                    Name     = StringHandlers.CToString(label.dl_dt.d_partitions[i].p_mountpt),
-                    Length   = (ulong)(label.dl_dt.d_partitions[i].p_size * label.dl_dt.d_secsize / sectorSize),
-                    Start = (ulong)((label.dl_dt.d_partitions[i].p_base + label.dl_dt.d_front) *
-                                    label.dl_dt.d_secsize / sectorSize),
+                    Type   = StringHandlers.CToString(label.dl_dt.d_partitions[i].p_type), Sequence = (ulong)i,
+                    Name   = StringHandlers.CToString(label.dl_dt.d_partitions[i].p_mountpt),
+                    Length = (ulong)((label.dl_dt.d_partitions[i].p_size * label.dl_dt.d_secsize) / sectorSize),
+                    Start = (ulong)(((label.dl_dt.d_partitions[i].p_base + label.dl_dt.d_front) *
+                                     label.dl_dt.d_secsize) / sectorSize),
                     Scheme = Name
                 };
 
@@ -187,20 +222,30 @@ namespace Aaru.Partitions
                     AaruConsole.DebugWriteLine("NeXT Plugin", "Partition bigger than device, reducing...");
                     part.Length = imagePlugin.Info.Sectors - part.Start;
                     part.Size   = part.Length * sectorSize;
+
                     AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_partitions[{0}].p_size = {1}", i,
-                                              part.Length);
+                                               part.Length);
                 }
 
                 sb.AppendFormat("{0} bytes per block", label.dl_dt.d_partitions[i].p_bsize).AppendLine();
                 sb.AppendFormat("{0} bytes per fragment", label.dl_dt.d_partitions[i].p_fsize).AppendLine();
-                if(label.dl_dt.d_partitions[i].p_opt      == 's') sb.AppendLine("Space optimized");
-                else if(label.dl_dt.d_partitions[i].p_opt == 't') sb.AppendLine("Time optimized");
-                else sb.AppendFormat("Unknown optimization {0:X2}", label.dl_dt.d_partitions[i].p_opt).AppendLine();
+
+                if(label.dl_dt.d_partitions[i].p_opt == 's')
+                    sb.AppendLine("Space optimized");
+                else if(label.dl_dt.d_partitions[i].p_opt == 't')
+                    sb.AppendLine("Time optimized");
+                else
+                    sb.AppendFormat("Unknown optimization {0:X2}", label.dl_dt.d_partitions[i].p_opt).AppendLine();
+
                 sb.AppendFormat("{0} cylinders per group", label.dl_dt.d_partitions[i].p_cpg).AppendLine();
                 sb.AppendFormat("{0} bytes per inode", label.dl_dt.d_partitions[i].p_density).AppendLine();
-                sb.AppendFormat("{0}% of space must be free at minimum", label.dl_dt.d_partitions[i].p_minfree)
-                  .AppendLine();
-                if(label.dl_dt.d_partitions[i].p_newfs != 1) sb.AppendLine("Filesystem should be formatted at start");
+
+                sb.AppendFormat("{0}% of space must be free at minimum", label.dl_dt.d_partitions[i].p_minfree).
+                   AppendLine();
+
+                if(label.dl_dt.d_partitions[i].p_newfs != 1)
+                    sb.AppendLine("Filesystem should be formatted at start");
+
                 if(label.dl_dt.d_partitions[i].p_automnt == 1)
                     sb.AppendLine("Filesystem should be automatically mounted");
 
@@ -212,9 +257,7 @@ namespace Aaru.Partitions
             return true;
         }
 
-        /// <summary>
-        ///     NeXT v3 disklabel, 544 bytes
-        /// </summary>
+        /// <summary>NeXT v3 disklabel, 544 bytes</summary>
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct NeXTLabel
         {
@@ -237,9 +280,7 @@ namespace Aaru.Partitions
             public readonly ushort dl_v3_checksum;
         }
 
-        /// <summary>
-        ///     NeXT v1 and v2 disklabel, 7224 bytes
-        /// </summary>
+        /// <summary>NeXT v1 and v2 disklabel, 7224 bytes</summary>
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct NeXTLabelOld
         {
@@ -265,9 +306,7 @@ namespace Aaru.Partitions
             public readonly ushort dl_checksum;
         }
 
-        /// <summary>
-        ///     NeXT disktab and partitions, 498 bytes
-        /// </summary>
+        /// <summary>NeXT disktab and partitions, 498 bytes</summary>
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct NeXTDiskTab
         {
@@ -317,9 +356,7 @@ namespace Aaru.Partitions
             public NeXTEntry[] d_partitions;
         }
 
-        /// <summary>
-        ///     Partition entries, 44 bytes each
-        /// </summary>
+        /// <summary>Partition entries, 44 bytes each</summary>
         [StructLayout(LayoutKind.Sequential, Pack = 2)]
         struct NeXTEntry
         {
diff --git a/Aaru.Partitions/PC98.cs b/Aaru.Partitions/PC98.cs
index cdefbbbc9..3164d700b 100644
--- a/Aaru.Partitions/PC98.cs
+++ b/Aaru.Partitions/PC98.cs
@@ -52,14 +52,19 @@ namespace Aaru.Partitions
         {
             partitions = new List<Partition>();
 
-            if(sectorOffset != 0) return false;
+            if(sectorOffset != 0)
+                return false;
 
             byte[] bootSector = imagePlugin.ReadSector(0);
             byte[] sector     = imagePlugin.ReadSector(1);
-            if(bootSector[bootSector.Length - 2] != 0x55 || bootSector[bootSector.Length - 1] != 0xAA) return false;
+
+            if(bootSector[bootSector.Length - 2] != 0x55 ||
+               bootSector[bootSector.Length - 1] != 0xAA)
+                return false;
 
             // Prevent false positives with some FAT BPBs
-            if(Encoding.ASCII.GetString(bootSector, 0x36, 3) == "FAT") return false;
+            if(Encoding.ASCII.GetString(bootSector, 0x36, 3) == "FAT")
+                return false;
 
             PC98Table table = Marshal.ByteArrayToStructureLittleEndian<PC98Table>(sector);
 
@@ -67,53 +72,61 @@ namespace Aaru.Partitions
 
             foreach(PC98Partition entry in table.entries)
             {
-                AaruConsole.DebugWriteLine("PC98 plugin", "entry.dp_mid = {0}",      entry.dp_mid);
-                AaruConsole.DebugWriteLine("PC98 plugin", "entry.dp_sid = {0}",      entry.dp_sid);
-                AaruConsole.DebugWriteLine("PC98 plugin", "entry.dp_dum1 = {0}",     entry.dp_dum1);
-                AaruConsole.DebugWriteLine("PC98 plugin", "entry.dp_dum2 = {0}",     entry.dp_dum2);
-                AaruConsole.DebugWriteLine("PC98 plugin", "entry.dp_ipl_sct = {0}",  entry.dp_ipl_sct);
+                AaruConsole.DebugWriteLine("PC98 plugin", "entry.dp_mid = {0}", entry.dp_mid);
+                AaruConsole.DebugWriteLine("PC98 plugin", "entry.dp_sid = {0}", entry.dp_sid);
+                AaruConsole.DebugWriteLine("PC98 plugin", "entry.dp_dum1 = {0}", entry.dp_dum1);
+                AaruConsole.DebugWriteLine("PC98 plugin", "entry.dp_dum2 = {0}", entry.dp_dum2);
+                AaruConsole.DebugWriteLine("PC98 plugin", "entry.dp_ipl_sct = {0}", entry.dp_ipl_sct);
                 AaruConsole.DebugWriteLine("PC98 plugin", "entry.dp_ipl_head = {0}", entry.dp_ipl_head);
-                AaruConsole.DebugWriteLine("PC98 plugin", "entry.dp_ipl_cyl = {0}",  entry.dp_ipl_cyl);
-                AaruConsole.DebugWriteLine("PC98 plugin", "entry.dp_ssect = {0}",    entry.dp_ssect);
-                AaruConsole.DebugWriteLine("PC98 plugin", "entry.dp_shd = {0}",      entry.dp_shd);
-                AaruConsole.DebugWriteLine("PC98 plugin", "entry.dp_scyl = {0}",     entry.dp_scyl);
-                AaruConsole.DebugWriteLine("PC98 plugin", "entry.dp_esect = {0}",    entry.dp_esect);
-                AaruConsole.DebugWriteLine("PC98 plugin", "entry.dp_ehd = {0}",      entry.dp_ehd);
-                AaruConsole.DebugWriteLine("PC98 plugin", "entry.dp_ecyl = {0}",     entry.dp_ecyl);
+                AaruConsole.DebugWriteLine("PC98 plugin", "entry.dp_ipl_cyl = {0}", entry.dp_ipl_cyl);
+                AaruConsole.DebugWriteLine("PC98 plugin", "entry.dp_ssect = {0}", entry.dp_ssect);
+                AaruConsole.DebugWriteLine("PC98 plugin", "entry.dp_shd = {0}", entry.dp_shd);
+                AaruConsole.DebugWriteLine("PC98 plugin", "entry.dp_scyl = {0}", entry.dp_scyl);
+                AaruConsole.DebugWriteLine("PC98 plugin", "entry.dp_esect = {0}", entry.dp_esect);
+                AaruConsole.DebugWriteLine("PC98 plugin", "entry.dp_ehd = {0}", entry.dp_ehd);
+                AaruConsole.DebugWriteLine("PC98 plugin", "entry.dp_ecyl = {0}", entry.dp_ecyl);
+
                 AaruConsole.DebugWriteLine("PC98 plugin", "entry.dp_name = \"{0}\"",
-                                          StringHandlers.CToString(entry.dp_name, Encoding.GetEncoding(932)));
+                                           StringHandlers.CToString(entry.dp_name, Encoding.GetEncoding(932)));
 
-                if(entry.dp_scyl  == entry.dp_ecyl             || entry.dp_ecyl <= 0 ||
-                   entry.dp_scyl  > imagePlugin.Info.Cylinders ||
-                   entry.dp_ecyl  > imagePlugin.Info.Cylinders || entry.dp_shd   > imagePlugin.Info.Heads           ||
-                   entry.dp_ehd   > imagePlugin.Info.Heads     || entry.dp_ssect > imagePlugin.Info.SectorsPerTrack ||
-                   entry.dp_esect > imagePlugin.Info.SectorsPerTrack) continue;
+                if(entry.dp_scyl  == entry.dp_ecyl                   ||
+                   entry.dp_ecyl  <= 0                               ||
+                   entry.dp_scyl  > imagePlugin.Info.Cylinders       ||
+                   entry.dp_ecyl  > imagePlugin.Info.Cylinders       ||
+                   entry.dp_shd   > imagePlugin.Info.Heads           ||
+                   entry.dp_ehd   > imagePlugin.Info.Heads           ||
+                   entry.dp_ssect > imagePlugin.Info.SectorsPerTrack ||
+                   entry.dp_esect > imagePlugin.Info.SectorsPerTrack)
+                    continue;
 
-                Partition part = new Partition
+                var part = new Partition
                 {
-                    Start = CHS.ToLBA(entry.dp_scyl, entry.dp_shd, (uint)(entry.dp_ssect + 1),
-                                      imagePlugin.Info.Heads, imagePlugin.Info.SectorsPerTrack),
+                    Start = CHS.ToLBA(entry.dp_scyl, entry.dp_shd, (uint)(entry.dp_ssect + 1), imagePlugin.Info.Heads,
+                                      imagePlugin.Info.SectorsPerTrack),
                     Type     = DecodePC98Sid(entry.dp_sid),
                     Name     = StringHandlers.CToString(entry.dp_name, Encoding.GetEncoding(932)).Trim(),
-                    Sequence = counter,
-                    Scheme   = Name
+                    Sequence = counter, Scheme = Name
                 };
+
                 part.Offset = part.Start * imagePlugin.Info.SectorSize;
+
                 part.Length = CHS.ToLBA(entry.dp_ecyl, entry.dp_ehd, (uint)(entry.dp_esect + 1), imagePlugin.Info.Heads,
                                         imagePlugin.Info.SectorsPerTrack) - part.Start;
+
                 part.Size = part.Length * imagePlugin.Info.SectorSize;
 
-                AaruConsole.DebugWriteLine("PC98 plugin", "part.Start = {0}",    part.Start);
-                AaruConsole.DebugWriteLine("PC98 plugin", "part.Type = {0}",     part.Type);
-                AaruConsole.DebugWriteLine("PC98 plugin", "part.Name = {0}",     part.Name);
+                AaruConsole.DebugWriteLine("PC98 plugin", "part.Start = {0}", part.Start);
+                AaruConsole.DebugWriteLine("PC98 plugin", "part.Type = {0}", part.Type);
+                AaruConsole.DebugWriteLine("PC98 plugin", "part.Name = {0}", part.Name);
                 AaruConsole.DebugWriteLine("PC98 plugin", "part.Sequence = {0}", part.Sequence);
-                AaruConsole.DebugWriteLine("PC98 plugin", "part.Offset = {0}",   part.Offset);
-                AaruConsole.DebugWriteLine("PC98 plugin", "part.Length = {0}",   part.Length);
-                AaruConsole.DebugWriteLine("PC98 plugin", "part.Size = {0}",     part.Size);
+                AaruConsole.DebugWriteLine("PC98 plugin", "part.Offset = {0}", part.Offset);
+                AaruConsole.DebugWriteLine("PC98 plugin", "part.Length = {0}", part.Length);
+                AaruConsole.DebugWriteLine("PC98 plugin", "part.Size = {0}", part.Size);
 
-                if((entry.dp_mid & 0x20) != 0x20 && (entry.dp_mid & 0x44) != 0x44 ||
-                   part.Start >= imagePlugin.Info.Sectors                         ||
-                   part.End   > imagePlugin.Info.Sectors) continue;
+                if(((entry.dp_mid & 0x20) != 0x20 && (entry.dp_mid & 0x44) != 0x44) ||
+                   part.Start >= imagePlugin.Info.Sectors                           ||
+                   part.End   > imagePlugin.Info.Sectors)
+                    continue;
 
                 partitions.Add(part);
                 counter++;
@@ -129,6 +142,7 @@ namespace Aaru.Partitions
                 case 0x01: return "FAT12";
                 case 0x04: return "PC-UX";
                 case 0x06: return "N88-BASIC(86)";
+
                 // Supposedly for FAT16 < 32 MiB, seen in bigger partitions
                 case 0x11:
                 case 0x21: return "FAT16";
@@ -146,33 +160,29 @@ namespace Aaru.Partitions
         struct PC98Table
         {
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public PC98Partition[] entries;
+            public readonly PC98Partition[] entries;
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct PC98Partition
         {
-            /// <summary>
-            ///     Some ID, if 0x80 bit is set, it is bootable
-            /// </summary>
-            public byte dp_mid;
-            /// <summary>
-            ///     Some ID, if 0x80 bit is set, it is active
-            /// </summary>
-            public byte dp_sid;
-            public byte   dp_dum1;
-            public byte   dp_dum2;
-            public byte   dp_ipl_sct;
-            public byte   dp_ipl_head;
-            public ushort dp_ipl_cyl;
-            public byte   dp_ssect;
-            public byte   dp_shd;
-            public ushort dp_scyl;
-            public byte   dp_esect;
-            public byte   dp_ehd;
-            public ushort dp_ecyl;
+            /// <summary>Some ID, if 0x80 bit is set, it is bootable</summary>
+            public readonly byte dp_mid;
+            /// <summary>Some ID, if 0x80 bit is set, it is active</summary>
+            public readonly byte dp_sid;
+            public readonly byte   dp_dum1;
+            public readonly byte   dp_dum2;
+            public readonly byte   dp_ipl_sct;
+            public readonly byte   dp_ipl_head;
+            public readonly ushort dp_ipl_cyl;
+            public readonly byte   dp_ssect;
+            public readonly byte   dp_shd;
+            public readonly ushort dp_scyl;
+            public readonly byte   dp_esect;
+            public readonly byte   dp_ehd;
+            public readonly ushort dp_ecyl;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public byte[] dp_name;
+            public readonly byte[] dp_name;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Partitions/Plan9.cs b/Aaru.Partitions/Plan9.cs
index 4e3b8bb25..38022f312 100644
--- a/Aaru.Partitions/Plan9.cs
+++ b/Aaru.Partitions/Plan9.cs
@@ -53,26 +53,28 @@ namespace Aaru.Partitions
         {
             partitions = new List<Partition>();
 
-            if(sectorOffset + 2 >= imagePlugin.Info.Sectors) return false;
+            if(sectorOffset + 2 >= imagePlugin.Info.Sectors)
+                return false;
 
             byte[] sector = imagePlugin.ReadSector(sectorOffset + 1);
+
             // While all of Plan9 is supposedly UTF-8, it uses ASCII strcmp for reading its partition table
             string[] really = StringHandlers.CToString(sector).Split('\n');
 
-            foreach(string[] tokens in really.TakeWhile(part => part.Length >= 5 && part.Substring(0, 5) == "part ")
-                                             .Select(part => part.Split(' ')).TakeWhile(tokens => tokens.Length == 4))
+            foreach(string[] tokens in really.TakeWhile(part => part.Length >= 5 && part.Substring(0, 5) == "part ").
+                                              Select(part => part.Split(' ')).TakeWhile(tokens => tokens.Length == 4))
             {
-                if(!ulong.TryParse(tokens[2], out ulong start) || !ulong.TryParse(tokens[3], out ulong end)) break;
+                if(!ulong.TryParse(tokens[2], out ulong start) ||
+                   !ulong.TryParse(tokens[3], out ulong end))
+                    break;
 
-                Partition part = new Partition
+                var part = new Partition
                 {
-                    Length   = end - start + 1,
-                    Offset   = (start + sectorOffset) * imagePlugin.Info.SectorSize,
-                    Scheme   = Name,
-                    Sequence = (ulong)partitions.Count,
-                    Size     = (end - start + 1) * imagePlugin.Info.SectorSize,
-                    Start    = start + sectorOffset,
-                    Type     = tokens[1]
+                    Length = (end   - start) + 1,
+                    Offset = (start + sectorOffset) * imagePlugin.Info.SectorSize,
+                    Scheme = Name, Sequence                                           = (ulong)partitions.Count,
+                    Size   = ((end - start) + 1) * imagePlugin.Info.SectorSize, Start = start + sectorOffset,
+                    Type   = tokens[1]
                 };
 
                 partitions.Add(part);
diff --git a/Aaru.Partitions/RDB.cs b/Aaru.Partitions/RDB.cs
index 0ef90987e..0ab037d42 100644
--- a/Aaru.Partitions/RDB.cs
+++ b/Aaru.Partitions/RDB.cs
@@ -43,236 +43,122 @@ namespace Aaru.Partitions
 {
     public class AmigaRigidDiskBlock : IPartition
     {
-        /// <summary>
-        ///     RDB magic number "RDSK"
-        /// </summary>
+        /// <summary>RDB magic number "RDSK"</summary>
         const uint RIGID_DISK_BLOCK_MAGIC = 0x5244534B;
-        /// <summary>
-        ///     Bad block list magic number "BADB"
-        /// </summary>
+        /// <summary>Bad block list magic number "BADB"</summary>
         const uint BAD_BLOCK_LIST_MAGIC = 0x42414442;
-        /// <summary>
-        ///     Partition entry magic number "PART"
-        /// </summary>
+        /// <summary>Partition entry magic number "PART"</summary>
         const uint PARTITION_BLOCK_MAGIC = 0x50415254;
-        /// <summary>
-        ///     Filesystem header magic number "FSHD"
-        /// </summary>
+        /// <summary>Filesystem header magic number "FSHD"</summary>
         const uint FILESYSTEM_HEADER_MAGIC = 0x46534844;
-        /// <summary>
-        ///     LoadSeg block magic number "LSEG"
-        /// </summary>
+        /// <summary>LoadSeg block magic number "LSEG"</summary>
         const uint LOAD_SEG_MAGIC = 0x4C534547;
 
-        /// <summary>
-        ///     Type ID for Amiga Original File System, "DOS\0"
-        /// </summary>
+        /// <summary>Type ID for Amiga Original File System, "DOS\0"</summary>
         const uint TYPEID_OFS = 0x444F5300;
-        /// <summary>
-        ///     Type ID for Amiga Fast File System, "DOS\1"
-        /// </summary>
+        /// <summary>Type ID for Amiga Fast File System, "DOS\1"</summary>
         const uint TYPEID_FFS = 0x444F5301;
-        /// <summary>
-        ///     Type ID for Amiga Original File System with international characters, "DOS\2"
-        /// </summary>
+        /// <summary>Type ID for Amiga Original File System with international characters, "DOS\2"</summary>
         const uint TYPEID_OFS_INTL = 0x444F5302;
-        /// <summary>
-        ///     Type ID for Amiga Fast File System with international characters, "DOS\3"
-        /// </summary>
+        /// <summary>Type ID for Amiga Fast File System with international characters, "DOS\3"</summary>
         const uint TYPEID_FFS_INTL = 0x444F5303;
-        /// <summary>
-        ///     Type ID for Amiga Original File System with directory cache, "DOS\4"
-        /// </summary>
+        /// <summary>Type ID for Amiga Original File System with directory cache, "DOS\4"</summary>
         const uint TYPEID_OFS_CACHE = 0x444F5304;
-        /// <summary>
-        ///     Type ID for Amiga Fast File System with directory cache, "DOS\5"
-        /// </summary>
+        /// <summary>Type ID for Amiga Fast File System with directory cache, "DOS\5"</summary>
         const uint TYPEID_FFS_CACHE = 0x444F5305;
-        /// <summary>
-        ///     Type ID for Amiga Original File System with long filenames, "DOS\6"
-        /// </summary>
+        /// <summary>Type ID for Amiga Original File System with long filenames, "DOS\6"</summary>
         const uint TYPEID_OFS2 = 0x444F5306;
-        /// <summary>
-        ///     Type ID for Amiga Fast File System with long filenames, "DOS\7"
-        /// </summary>
+        /// <summary>Type ID for Amiga Fast File System with long filenames, "DOS\7"</summary>
         const uint TYPEID_FFS2 = 0x444F5307;
-        /// <summary>
-        ///     Type ID for Amiga UNIX boot filesystem
-        /// </summary>
+        /// <summary>Type ID for Amiga UNIX boot filesystem</summary>
         const uint TYPEID_AMIX_BOOT = 0x554E4900;
-        /// <summary>
-        ///     Type ID for Amiga UNIX System V filesystem
-        /// </summary>
+        /// <summary>Type ID for Amiga UNIX System V filesystem</summary>
         const uint TYPEID_AMIX_SYSV = 0x554E4901;
-        /// <summary>
-        ///     Type ID for Amiga UNIX BSD filesystem
-        /// </summary>
+        /// <summary>Type ID for Amiga UNIX BSD filesystem</summary>
         const uint TYPEID_AMIX_FFS = 0x554E4902;
-        /// <summary>
-        ///     Type ID for Amiga UNIX Reserved partition (swap)
-        /// </summary>
+        /// <summary>Type ID for Amiga UNIX Reserved partition (swap)</summary>
         const uint TYPEID_AMIX_RESERVED = 0x72657376;
-        /// <summary>
-        ///     Type ID for ProfessionalFileSystem, "PFS\1"
-        /// </summary>
+        /// <summary>Type ID for ProfessionalFileSystem, "PFS\1"</summary>
         const uint TYPEID_PFS = 0x50465301;
-        /// <summary>
-        ///     Type ID for ProfessionalFileSystem, "PFS\2"
-        /// </summary>
+        /// <summary>Type ID for ProfessionalFileSystem, "PFS\2"</summary>
         const uint TYPEID_PFS2 = 0x50465302;
-        /// <summary>
-        ///     Type ID for ProfessionalFileSystem, "muAF"
-        /// </summary>
+        /// <summary>Type ID for ProfessionalFileSystem, "muAF"</summary>
         const uint TYPEID_PFS_MUSER = 0x6D754146;
-        /// <summary>
-        ///     Type ID for ProfessionalFileSystem, "AFS\1"
-        /// </summary>
+        /// <summary>Type ID for ProfessionalFileSystem, "AFS\1"</summary>
         const uint TYPEID_AFS = 0x41465301;
-        /// <summary>
-        ///     Type ID for SmartFileSystem v1, "SFS\0"
-        /// </summary>
+        /// <summary>Type ID for SmartFileSystem v1, "SFS\0"</summary>
         const uint TYPEID_SFS = 0x53465300;
-        /// <summary>
-        ///     Type ID for SmartFileSystem v2, "SFS\2"
-        /// </summary>
+        /// <summary>Type ID for SmartFileSystem v2, "SFS\2"</summary>
         const uint TYPEID_SFS2 = 0x53465302;
-        /// <summary>
-        ///     Type ID for JXFS, "JXF\4"
-        /// </summary>
+        /// <summary>Type ID for JXFS, "JXF\4"</summary>
         const uint TYPEID_JXFS = 0x4A584604;
-        /// <summary>
-        ///     Type ID for FAT, as set by CrossDOS, "MSD\0"
-        /// </summary>
+        /// <summary>Type ID for FAT, as set by CrossDOS, "MSD\0"</summary>
         const uint TYPEID_CROSS_DOS = 0x4D534400;
-        /// <summary>
-        ///     Type ID for HFS, as set by CrossMac, "MAC\0"
-        /// </summary>
+        /// <summary>Type ID for HFS, as set by CrossMac, "MAC\0"</summary>
         const uint TYPEID_CROSS_MAC = 0x4D414300;
-        /// <summary>
-        ///     Type ID for 4.2UFS, for BFFS, "BFFS"
-        /// </summary>
+        /// <summary>Type ID for 4.2UFS, for BFFS, "BFFS"</summary>
         const uint TYPEID_BFFS = 0x42464653;
-        /// <summary>
-        ///     Type ID for Amiga Original File System with multi-user patches, "muF\0"
-        /// </summary>
+        /// <summary>Type ID for Amiga Original File System with multi-user patches, "muF\0"</summary>
         const uint TYPEID_OFS_MUSER = 0x6D754600;
-        /// <summary>
-        ///     Type ID for Amiga Fast File System with multi-user patches, "muF\1"
-        /// </summary>
+        /// <summary>Type ID for Amiga Fast File System with multi-user patches, "muF\1"</summary>
         const uint TYPEID_FFS_MUSER = 0x6D754601;
-        /// <summary>
-        ///     Type ID for Amiga Original File System with international characters and multi-user patches, "muF\2"
-        /// </summary>
+        /// <summary>Type ID for Amiga Original File System with international characters and multi-user patches, "muF\2"</summary>
         const uint TYPEID_OFS_INTL_MUSER = 0x6D754602;
-        /// <summary>
-        ///     Type ID for Amiga Fast File System with international characters and multi-user patches, "muF\3"
-        /// </summary>
+        /// <summary>Type ID for Amiga Fast File System with international characters and multi-user patches, "muF\3"</summary>
         const uint TYPEID_FFS_INTL_MUSER = 0x6D754603;
-        /// <summary>
-        ///     Type ID for Amiga Original File System with directory cache and multi-user patches, "muF\4"
-        /// </summary>
+        /// <summary>Type ID for Amiga Original File System with directory cache and multi-user patches, "muF\4"</summary>
         const uint TYPEID_OFS_CACHE_MUSER = 0x6D754604;
-        /// <summary>
-        ///     Type ID for Amiga Fast File System with directory cache and multi-user patches, "muF\5"
-        /// </summary>
+        /// <summary>Type ID for Amiga Fast File System with directory cache and multi-user patches, "muF\5"</summary>
         const uint TYPEID_FFS_CACHE_MUSER = 0x6D754605;
-        /// <summary>
-        ///     Type ID for BSD unused, "BSD\0"
-        /// </summary>
+        /// <summary>Type ID for BSD unused, "BSD\0"</summary>
         const uint TYPEID_OLD_BSD_UNUSED = 0x42534400;
-        /// <summary>
-        ///     Type ID for BSD swap, "BSD\1"
-        /// </summary>
+        /// <summary>Type ID for BSD swap, "BSD\1"</summary>
         const uint TYPEID_OLD_BSD_SWAP = 0x42534401;
-        /// <summary>
-        ///     Type ID for BSD 4.2 FFS, "BSD\7"
-        /// </summary>
+        /// <summary>Type ID for BSD 4.2 FFS, "BSD\7"</summary>
         const uint TYPEID_OLD_BSD42_FFS = 0x42534407;
-        /// <summary>
-        ///     Type ID for BSD 4.4 LFS, "BSD\9"
-        /// </summary>
+        /// <summary>Type ID for BSD 4.4 LFS, "BSD\9"</summary>
         const uint TYPEID_OLD_BSD44_LFS = 0x42534409;
-        /// <summary>
-        ///     Type ID for NetBSD unused root partition, "NBR\0"
-        /// </summary>
+        /// <summary>Type ID for NetBSD unused root partition, "NBR\0"</summary>
         const uint TYPEID_NETBSD_ROOT_UNUSED = 0x4E425200;
-        /// <summary>
-        ///     Type ID for NetBSD 4.2 FFS root partition, "NBR\7"
-        /// </summary>
+        /// <summary>Type ID for NetBSD 4.2 FFS root partition, "NBR\7"</summary>
         const uint TYPEID_NETBSD_ROOT_42FFS = 0x4E425207;
-        /// <summary>
-        ///     Type ID for NetBSD 4.4 LFS root partition, "NBR\9"
-        /// </summary>
+        /// <summary>Type ID for NetBSD 4.4 LFS root partition, "NBR\9"</summary>
         const uint TYPEID_NETBSD_ROOT_44LFS = 0x4E425209;
-        /// <summary>
-        ///     Type ID for NetBSD unused user partition, "NBR\0"
-        /// </summary>
+        /// <summary>Type ID for NetBSD unused user partition, "NBR\0"</summary>
         const uint TYPEID_NETBSD_USER_UNUSED = 0x4E425500;
-        /// <summary>
-        ///     Type ID for NetBSD 4.2 FFS user partition, "NBR\7"
-        /// </summary>
+        /// <summary>Type ID for NetBSD 4.2 FFS user partition, "NBR\7"</summary>
         const uint TYPEID_NETBSD_USER_42FFS = 0x4E425507;
-        /// <summary>
-        ///     Type ID for NetBSD 4.4 LFS user partition, "NBR\9"
-        /// </summary>
+        /// <summary>Type ID for NetBSD 4.4 LFS user partition, "NBR\9"</summary>
         const uint TYPEID_NETBSD_USER_44LFS = 0x4E425509;
-        /// <summary>
-        ///     Type ID for NetBSD swap partition
-        /// </summary>
+        /// <summary>Type ID for NetBSD swap partition</summary>
         const uint TYPEID_NETBSD_SWAP = 0x4E425300;
-        /// <summary>
-        ///     Type ID for Linux filesystem partition, "LNX\0"
-        /// </summary>
+        /// <summary>Type ID for Linux filesystem partition, "LNX\0"</summary>
         const uint TYPEID_LINUX = 0x4C4E5800;
-        /// <summary>
-        ///     Type ID for Linux swap partition, "SWP\0"
-        /// </summary>
+        /// <summary>Type ID for Linux swap partition, "SWP\0"</summary>
         const uint TYPEID_LINUX_SWAP = 0x53575000;
-        /// <summary>
-        ///     Type ID for RaidFrame partition, "RAID"
-        /// </summary>
+        /// <summary>Type ID for RaidFrame partition, "RAID"</summary>
         const uint TYPEID_RAID_FRAME = 0x52414944;
-        /// <summary>
-        ///     Type ID for RaidFrame partition, "RAI\0"
-        /// </summary>
+        /// <summary>Type ID for RaidFrame partition, "RAI\0"</summary>
         const uint TYPEID_RAID_FRAME0 = 0x52414900;
 
-        /// <summary>
-        ///     No disks to be configured after this one
-        /// </summary>
+        /// <summary>No disks to be configured after this one</summary>
         const uint FLAGS_NO_DISKS = 0x00000001;
-        /// <summary>
-        ///     No LUNs to be configured after this one
-        /// </summary>
+        /// <summary>No LUNs to be configured after this one</summary>
         const uint FLAGS_NO_LUNS = 0x00000002;
-        /// <summary>
-        ///     No target IDs to be configured after this one
-        /// </summary>
+        /// <summary>No target IDs to be configured after this one</summary>
         const uint FLAGS_NO_TARGETS = 0x00000004;
-        /// <summary>
-        ///     Don't try to perform reselection with this drive
-        /// </summary>
+        /// <summary>Don't try to perform reselection with this drive</summary>
         const uint FLAGS_NO_RESELECTION = 0x00000008;
-        /// <summary>
-        ///     Disk identification is valid
-        /// </summary>
+        /// <summary>Disk identification is valid</summary>
         const uint FLAGS_VALID_DISK_ID = 0x00000010;
-        /// <summary>
-        ///     Controller identification is valid
-        /// </summary>
+        /// <summary>Controller identification is valid</summary>
         const uint FLAGS_VALID_CONTROLLER_ID = 0x00000020;
-        /// <summary>
-        ///     Drive supports synchronous SCSI mode
-        /// </summary>
+        /// <summary>Drive supports synchronous SCSI mode</summary>
         const uint FLAGS_SYNCH_SCSI = 0x00000040;
 
-        /// <summary>
-        ///     Partition is bootable
-        /// </summary>
+        /// <summary>Partition is bootable</summary>
         const uint FLAGS_BOOTABLE = 0x00000001;
-        /// <summary>
-        ///     Partition should not be mounted automatically
-        /// </summary>
+        /// <summary>Partition should not be mounted automatically</summary>
         const uint FLAGS_NO_AUTOMOUNT = 0x00000002;
 
         public string Name   => "Amiga Rigid Disk Block";
@@ -287,32 +173,36 @@ namespace Aaru.Partitions
 
             while(rdbBlock < 16)
             {
-                if(imagePlugin.Info.Sectors <= rdbBlock) return false;
+                if(imagePlugin.Info.Sectors <= rdbBlock)
+                    return false;
 
-                if(rdbBlock + sectorOffset >= imagePlugin.Info.Sectors) break;
+                if(rdbBlock + sectorOffset >= imagePlugin.Info.Sectors)
+                    break;
 
                 byte[] tmpSector = imagePlugin.ReadSector(rdbBlock + sectorOffset);
                 uint   magic     = BigEndianBitConverter.ToUInt32(tmpSector, 0);
 
                 AaruConsole.DebugWriteLine("Amiga RDB plugin", "Possible magic at block {0} is 0x{1:X8}", rdbBlock,
-                                          magic);
+                                           magic);
 
                 if(magic == RIGID_DISK_BLOCK_MAGIC)
                 {
                     AaruConsole.DebugWriteLine("Amiga RDB plugin", "Found RDB magic at block {0}", rdbBlock);
 
                     foundRdb = true;
+
                     break;
                 }
 
                 rdbBlock++;
             }
 
-            if(!foundRdb) return false;
+            if(!foundRdb)
+                return false;
 
             rdbBlock += sectorOffset;
 
-            RigidDiskBlock rdb = new RigidDiskBlock();
+            var rdb = new RigidDiskBlock();
 
             byte[] sector = imagePlugin.ReadSector(rdbBlock);
 
@@ -388,78 +278,80 @@ namespace Aaru.Partitions
             rdb.Reserved24 = BigEndianBitConverter.ToUInt32(sector, 0xF8);
             rdb.Reserved25 = BigEndianBitConverter.ToUInt32(sector, 0xFC);
 
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.magic = 0x{0:X8}",             rdb.Magic);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.size = {0} longs, {1} bytes",  rdb.Size, rdb.Size * 4);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.checksum = 0x{0:X8}",          rdb.Checksum);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.targetID = {0}",               rdb.TargetId);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.block_size = {0}",             rdb.BlockSize);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.badblock_ptr = {0}",           rdb.BadblockPtr);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.partition_ptr = {0}",          rdb.PartitionPtr);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.fsheader_ptr = {0}",           rdb.FsheaderPtr);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.driveinitcode = {0}",          rdb.Driveinitcode);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved1 = 0x{0:X8}",         rdb.Reserved1);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved2 = 0x{0:X8}",         rdb.Reserved2);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved3 = 0x{0:X8}",         rdb.Reserved3);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved4 = 0x{0:X8}",         rdb.Reserved4);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved5 = 0x{0:X8}",         rdb.Reserved5);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved6 = 0x{0:X8}",         rdb.Reserved6);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.cylinders = {0}",              rdb.Cylinders);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.spt = {0}",                    rdb.Spt);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.heads = {0}",                  rdb.Heads);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.interleave = {0}",             rdb.Interleave);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.parking = {0}",                rdb.Parking);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved7 = 0x{0:X8}",         rdb.Reserved7);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved8 = 0x{0:X8}",         rdb.Reserved8);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved9 = 0x{0:X8}",         rdb.Reserved9);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.writeprecomp = {0}",           rdb.Writeprecomp);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reducedwrite = {0}",           rdb.Reducedwrite);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.steprate = {0}",               rdb.Steprate);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved10 = 0x{0:X8}",        rdb.Reserved10);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved11 = 0x{0:X8}",        rdb.Reserved11);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved12 = 0x{0:X8}",        rdb.Reserved12);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved13 = 0x{0:X8}",        rdb.Reserved13);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved14 = 0x{0:X8}",        rdb.Reserved14);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.RDBBlockLow = {0}",            rdb.RdbBlockLow);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.RDBBlockHigh = {0}",           rdb.RdbBlockHigh);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.LowCylinder = {0}",            rdb.LowCylinder);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.HighCylinder = {0}",           rdb.HighCylinder);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.CylBlocks = {0}",              rdb.CylBlocks);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.AutoParkSeconds = {0}",        rdb.AutoParkSeconds);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.HighCylinder = {0}",           rdb.HighCylinder);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved15 = 0x{0:X8}",        rdb.Reserved15);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.diskVendor = \"{0}\"",         rdb.DiskVendor);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.diskProduct = \"{0}\"",        rdb.DiskProduct);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.diskRevision = \"{0}\"",       rdb.DiskRevision);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.controllerVendor = \"{0}\"",   rdb.ControllerVendor);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.controllerProduct = \"{0}\"",  rdb.ControllerProduct);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.magic = 0x{0:X8}", rdb.Magic);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.size = {0} longs, {1} bytes", rdb.Size, rdb.Size * 4);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.checksum = 0x{0:X8}", rdb.Checksum);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.targetID = {0}", rdb.TargetId);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.block_size = {0}", rdb.BlockSize);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.badblock_ptr = {0}", rdb.BadblockPtr);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.partition_ptr = {0}", rdb.PartitionPtr);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.fsheader_ptr = {0}", rdb.FsheaderPtr);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.driveinitcode = {0}", rdb.Driveinitcode);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved1 = 0x{0:X8}", rdb.Reserved1);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved2 = 0x{0:X8}", rdb.Reserved2);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved3 = 0x{0:X8}", rdb.Reserved3);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved4 = 0x{0:X8}", rdb.Reserved4);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved5 = 0x{0:X8}", rdb.Reserved5);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved6 = 0x{0:X8}", rdb.Reserved6);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.cylinders = {0}", rdb.Cylinders);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.spt = {0}", rdb.Spt);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.heads = {0}", rdb.Heads);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.interleave = {0}", rdb.Interleave);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.parking = {0}", rdb.Parking);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved7 = 0x{0:X8}", rdb.Reserved7);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved8 = 0x{0:X8}", rdb.Reserved8);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved9 = 0x{0:X8}", rdb.Reserved9);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.writeprecomp = {0}", rdb.Writeprecomp);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reducedwrite = {0}", rdb.Reducedwrite);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.steprate = {0}", rdb.Steprate);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved10 = 0x{0:X8}", rdb.Reserved10);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved11 = 0x{0:X8}", rdb.Reserved11);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved12 = 0x{0:X8}", rdb.Reserved12);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved13 = 0x{0:X8}", rdb.Reserved13);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved14 = 0x{0:X8}", rdb.Reserved14);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.RDBBlockLow = {0}", rdb.RdbBlockLow);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.RDBBlockHigh = {0}", rdb.RdbBlockHigh);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.LowCylinder = {0}", rdb.LowCylinder);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.HighCylinder = {0}", rdb.HighCylinder);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.CylBlocks = {0}", rdb.CylBlocks);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.AutoParkSeconds = {0}", rdb.AutoParkSeconds);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.HighCylinder = {0}", rdb.HighCylinder);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved15 = 0x{0:X8}", rdb.Reserved15);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.diskVendor = \"{0}\"", rdb.DiskVendor);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.diskProduct = \"{0}\"", rdb.DiskProduct);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.diskRevision = \"{0}\"", rdb.DiskRevision);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.controllerVendor = \"{0}\"", rdb.ControllerVendor);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.controllerProduct = \"{0}\"", rdb.ControllerProduct);
             AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.controllerRevision = \"{0}\"", rdb.ControllerRevision);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved16 = 0x{0:X8}",        rdb.Reserved16);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved17 = 0x{0:X8}",        rdb.Reserved17);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved18 = 0x{0:X8}",        rdb.Reserved18);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved19 = 0x{0:X8}",        rdb.Reserved19);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved20 = 0x{0:X8}",        rdb.Reserved20);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved21 = 0x{0:X8}",        rdb.Reserved21);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved22 = 0x{0:X8}",        rdb.Reserved22);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved23 = 0x{0:X8}",        rdb.Reserved23);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved24 = 0x{0:X8}",        rdb.Reserved24);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved25 = 0x{0:X8}",        rdb.Reserved25);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved16 = 0x{0:X8}", rdb.Reserved16);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved17 = 0x{0:X8}", rdb.Reserved17);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved18 = 0x{0:X8}", rdb.Reserved18);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved19 = 0x{0:X8}", rdb.Reserved19);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved20 = 0x{0:X8}", rdb.Reserved20);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved21 = 0x{0:X8}", rdb.Reserved21);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved22 = 0x{0:X8}", rdb.Reserved22);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved23 = 0x{0:X8}", rdb.Reserved23);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved24 = 0x{0:X8}", rdb.Reserved24);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved25 = 0x{0:X8}", rdb.Reserved25);
 
             // Reading BadBlock list
             List<BadBlockList> badBlockChain = new List<BadBlockList>();
             ulong              nextBlock     = rdb.BadblockPtr;
+
             while(nextBlock != 0xFFFFFFFF)
             {
                 AaruConsole.DebugWriteLine("Amiga RDB plugin", "Going to block {0} in search of a BadBlock block",
-                                          nextBlock);
+                                           nextBlock);
 
                 sector = imagePlugin.ReadSector(nextBlock);
                 uint magic = BigEndianBitConverter.ToUInt32(sector, 0);
 
-                if(magic != BAD_BLOCK_LIST_MAGIC) break;
+                if(magic != BAD_BLOCK_LIST_MAGIC)
+                    break;
 
                 AaruConsole.DebugWriteLine("Amiga RDB plugin", "Found BadBlock block");
 
-                BadBlockList chainEntry = new BadBlockList
+                var chainEntry = new BadBlockList
                 {
                     Magic    = BigEndianBitConverter.ToUInt32(sector, 0x00),
                     Size     = BigEndianBitConverter.ToUInt32(sector, 0x04),
@@ -468,25 +360,30 @@ namespace Aaru.Partitions
                     NextPtr  = BigEndianBitConverter.ToUInt32(sector, 0x10),
                     Reserved = BigEndianBitConverter.ToUInt32(sector, 0x14)
                 };
+
                 ulong entries = (chainEntry.Size - 6) / 2;
                 chainEntry.BlockPairs = new BadBlockEntry[entries];
 
                 AaruConsole.DebugWriteLine("Amiga RDB plugin", "chainEntry.magic = 0x{0:X8}", chainEntry.Magic);
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "chainEntry.size = {0} longs, {1} bytes", chainEntry.Size,
-                                          chainEntry.Size * 4);
+
+                AaruConsole.DebugWriteLine("Amiga RDB plugin", "chainEntry.size = {0} longs, {1} bytes",
+                                           chainEntry.Size, chainEntry.Size * 4);
+
                 AaruConsole.DebugWriteLine("Amiga RDB plugin", "chainEntry.checksum = 0x{0:X8}", chainEntry.Checksum);
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "chainEntry.targetID = {0}",      chainEntry.TargetId);
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "chainEntry.next_ptr = {0}",      chainEntry.NextPtr);
+                AaruConsole.DebugWriteLine("Amiga RDB plugin", "chainEntry.targetID = {0}", chainEntry.TargetId);
+                AaruConsole.DebugWriteLine("Amiga RDB plugin", "chainEntry.next_ptr = {0}", chainEntry.NextPtr);
                 AaruConsole.DebugWriteLine("Amiga RDB plugin", "chainEntry.reserved = 0x{0:X8}", chainEntry.Reserved);
 
                 for(ulong i = 0; i < entries; i++)
                 {
-                    chainEntry.BlockPairs[i].BadBlock = BigEndianBitConverter.ToUInt32(sector, (int)(0x18 + i * 8 + 0));
+                    chainEntry.BlockPairs[i].BadBlock =
+                        BigEndianBitConverter.ToUInt32(sector, (int)(0x18 + (i * 8) + 0));
+
                     chainEntry.BlockPairs[i].GoodBlock =
-                        BigEndianBitConverter.ToUInt32(sector, (int)(0x18 + i * 8 + 4));
+                        BigEndianBitConverter.ToUInt32(sector, (int)(0x18 + (i * 8) + 4));
 
                     AaruConsole.DebugWriteLine("Amiga RDB plugin", "Bad block at {0} replaced with good block at {1}",
-                                              chainEntry.BlockPairs[i].BadBlock, chainEntry.BlockPairs[i].GoodBlock);
+                                               chainEntry.BlockPairs[i].BadBlock, chainEntry.BlockPairs[i].GoodBlock);
                 }
 
                 badBlockChain.Add(chainEntry);
@@ -496,46 +393,46 @@ namespace Aaru.Partitions
             // Reading BadBlock list
             List<PartitionEntry> partitionEntries = new List<PartitionEntry>();
             nextBlock = rdb.PartitionPtr;
+
             while(nextBlock != 0xFFFFFFFF)
             {
                 AaruConsole.DebugWriteLine("Amiga RDB plugin", "Going to block {0} in search of a PartitionEntry block",
-                                          nextBlock + sectorOffset);
+                                           nextBlock + sectorOffset);
 
                 sector = imagePlugin.ReadSector(nextBlock + sectorOffset);
                 uint magic = BigEndianBitConverter.ToUInt32(sector, 0);
 
-                if(magic != PARTITION_BLOCK_MAGIC) break;
+                if(magic != PARTITION_BLOCK_MAGIC)
+                    break;
 
                 AaruConsole.DebugWriteLine("Amiga RDB plugin", "Found PartitionEntry block");
 
-                PartitionEntry partEntry = new PartitionEntry
+                var partEntry = new PartitionEntry
                 {
-                    Magic        = BigEndianBitConverter.ToUInt32(sector, 0x00),
-                    Size         = BigEndianBitConverter.ToUInt32(sector, 0x04),
-                    Checksum     = BigEndianBitConverter.ToInt32(sector, 0x08),
-                    TargetId     = BigEndianBitConverter.ToUInt32(sector, 0x0C),
-                    NextPtr      = BigEndianBitConverter.ToUInt32(sector, 0x10),
-                    Flags        = BigEndianBitConverter.ToUInt32(sector, 0x14),
-                    Reserved1    = BigEndianBitConverter.ToUInt32(sector, 0x18),
-                    Reserved2    = BigEndianBitConverter.ToUInt32(sector, 0x1C),
-                    DevFlags     = BigEndianBitConverter.ToUInt32(sector, 0x20),
-                    DriveNameLen = sector[0x24],
-                    Reserved3    = BigEndianBitConverter.ToUInt32(sector, 0x44),
-                    Reserved4    = BigEndianBitConverter.ToUInt32(sector, 0x48),
-                    Reserved5    = BigEndianBitConverter.ToUInt32(sector, 0x4C),
-                    Reserved6    = BigEndianBitConverter.ToUInt32(sector, 0x50),
-                    Reserved7    = BigEndianBitConverter.ToUInt32(sector, 0x54),
-                    Reserved8    = BigEndianBitConverter.ToUInt32(sector, 0x58),
-                    Reserved9    = BigEndianBitConverter.ToUInt32(sector, 0x5C),
-                    Reserved10   = BigEndianBitConverter.ToUInt32(sector, 0x60),
-                    Reserved11   = BigEndianBitConverter.ToUInt32(sector, 0x64),
-                    Reserved12   = BigEndianBitConverter.ToUInt32(sector, 0x68),
-                    Reserved13   = BigEndianBitConverter.ToUInt32(sector, 0x6C),
-                    Reserved14   = BigEndianBitConverter.ToUInt32(sector, 0x70),
-                    Reserved15   = BigEndianBitConverter.ToUInt32(sector, 0x74),
-                    Reserved16   = BigEndianBitConverter.ToUInt32(sector, 0x78),
-                    Reserved17   = BigEndianBitConverter.ToUInt32(sector, 0x7C),
-                    DosEnvVec = new DosEnvironmentVector
+                    Magic      = BigEndianBitConverter.ToUInt32(sector, 0x00),
+                    Size       = BigEndianBitConverter.ToUInt32(sector, 0x04),
+                    Checksum   = BigEndianBitConverter.ToInt32(sector, 0x08),
+                    TargetId   = BigEndianBitConverter.ToUInt32(sector, 0x0C),
+                    NextPtr    = BigEndianBitConverter.ToUInt32(sector, 0x10),
+                    Flags      = BigEndianBitConverter.ToUInt32(sector, 0x14),
+                    Reserved1  = BigEndianBitConverter.ToUInt32(sector, 0x18),
+                    Reserved2  = BigEndianBitConverter.ToUInt32(sector, 0x1C),
+                    DevFlags   = BigEndianBitConverter.ToUInt32(sector, 0x20), DriveNameLen = sector[0x24],
+                    Reserved3  = BigEndianBitConverter.ToUInt32(sector, 0x44),
+                    Reserved4  = BigEndianBitConverter.ToUInt32(sector, 0x48),
+                    Reserved5  = BigEndianBitConverter.ToUInt32(sector, 0x4C),
+                    Reserved6  = BigEndianBitConverter.ToUInt32(sector, 0x50),
+                    Reserved7  = BigEndianBitConverter.ToUInt32(sector, 0x54),
+                    Reserved8  = BigEndianBitConverter.ToUInt32(sector, 0x58),
+                    Reserved9  = BigEndianBitConverter.ToUInt32(sector, 0x5C),
+                    Reserved10 = BigEndianBitConverter.ToUInt32(sector, 0x60),
+                    Reserved11 = BigEndianBitConverter.ToUInt32(sector, 0x64),
+                    Reserved12 = BigEndianBitConverter.ToUInt32(sector, 0x68),
+                    Reserved13 = BigEndianBitConverter.ToUInt32(sector, 0x6C),
+                    Reserved14 = BigEndianBitConverter.ToUInt32(sector, 0x70),
+                    Reserved15 = BigEndianBitConverter.ToUInt32(sector, 0x74),
+                    Reserved16 = BigEndianBitConverter.ToUInt32(sector, 0x78),
+                    Reserved17 = BigEndianBitConverter.ToUInt32(sector, 0x7C), DosEnvVec = new DosEnvironmentVector
                     {
                         Size           = BigEndianBitConverter.ToUInt32(sector, 0x80),
                         BlockSize      = BigEndianBitConverter.ToUInt32(sector, 0x84),
@@ -565,25 +462,26 @@ namespace Aaru.Partitions
                 partEntry.DriveName = StringHandlers.PascalToString(driveName, Encoding.GetEncoding("iso-8859-1"));
 
                 AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.magic = 0x{0:X8}", partEntry.Magic);
+
                 AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.size = {0} longs, {1} bytes", partEntry.Size,
-                                          partEntry.Size * 4);
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.checksum = 0x{0:X8}",  partEntry.Checksum);
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.targetID = {0}",       partEntry.TargetId);
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.next_ptr = {0}",       partEntry.NextPtr);
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.flags = 0x{0:X8}",     partEntry.Flags);
+                                           partEntry.Size * 4);
+
+                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.checksum = 0x{0:X8}", partEntry.Checksum);
+                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.targetID = {0}", partEntry.TargetId);
+                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.next_ptr = {0}", partEntry.NextPtr);
+                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.flags = 0x{0:X8}", partEntry.Flags);
                 AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.reserved1 = 0x{0:X8}", partEntry.Reserved1);
                 AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.reserved2 = 0x{0:X8}", partEntry.Reserved2);
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.devFlags = 0x{0:X8}",  partEntry.DevFlags);
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.driveNameLen = {0}",
-                                          partEntry.DriveNameLen);
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.driveName = \"{0}\"",   partEntry.DriveName);
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.reserved3 = 0x{0:X8}",  partEntry.Reserved3);
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.reserved4 = 0x{0:X8}",  partEntry.Reserved4);
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.reserved5 = 0x{0:X8}",  partEntry.Reserved5);
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.reserved6 = 0x{0:X8}",  partEntry.Reserved6);
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.reserved7 = 0x{0:X8}",  partEntry.Reserved7);
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.reserved8 = 0x{0:X8}",  partEntry.Reserved8);
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.reserved9 = 0x{0:X8}",  partEntry.Reserved9);
+                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.devFlags = 0x{0:X8}", partEntry.DevFlags);
+                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.driveNameLen = {0}", partEntry.DriveNameLen);
+                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.driveName = \"{0}\"", partEntry.DriveName);
+                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.reserved3 = 0x{0:X8}", partEntry.Reserved3);
+                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.reserved4 = 0x{0:X8}", partEntry.Reserved4);
+                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.reserved5 = 0x{0:X8}", partEntry.Reserved5);
+                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.reserved6 = 0x{0:X8}", partEntry.Reserved6);
+                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.reserved7 = 0x{0:X8}", partEntry.Reserved7);
+                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.reserved8 = 0x{0:X8}", partEntry.Reserved8);
+                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.reserved9 = 0x{0:X8}", partEntry.Reserved9);
                 AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.reserved10 = 0x{0:X8}", partEntry.Reserved10);
                 AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.reserved11 = 0x{0:X8}", partEntry.Reserved11);
                 AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.reserved12 = 0x{0:X8}", partEntry.Reserved12);
@@ -594,43 +492,64 @@ namespace Aaru.Partitions
                 AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.reserved17 = 0x{0:X8}", partEntry.Reserved17);
 
                 AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.dosEnvVec.size = {0} longs, {1} bytes",
-                                          partEntry.DosEnvVec.Size, partEntry.DosEnvVec.Size * 4);
+                                           partEntry.DosEnvVec.Size, partEntry.DosEnvVec.Size * 4);
+
                 AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.dosEnvVec.block_size = {0} longs, {1} bytes",
-                                          partEntry.DosEnvVec.BlockSize, partEntry.DosEnvVec.BlockSize * 4);
+                                           partEntry.DosEnvVec.BlockSize, partEntry.DosEnvVec.BlockSize * 4);
+
                 AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.dosEnvVec.sec_org = 0x{0:X8}",
-                                          partEntry.DosEnvVec.SecOrg);
+                                           partEntry.DosEnvVec.SecOrg);
+
                 AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.dosEnvVec.surfaces = {0}",
-                                          partEntry.DosEnvVec.Surfaces);
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.dosEnvVec.spb = {0}", partEntry.DosEnvVec.Spb);
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.dosEnvVec.bpt = {0}", partEntry.DosEnvVec.Bpt);
+                                           partEntry.DosEnvVec.Surfaces);
+
+                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.dosEnvVec.spb = {0}",
+                                           partEntry.DosEnvVec.Spb);
+
+                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.dosEnvVec.bpt = {0}",
+                                           partEntry.DosEnvVec.Bpt);
+
                 AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.dosEnvVec.reservedblocks = {0}",
-                                          partEntry.DosEnvVec.Reservedblocks);
+                                           partEntry.DosEnvVec.Reservedblocks);
+
                 AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.dosEnvVec.prealloc = {0}",
-                                          partEntry.DosEnvVec.Prealloc);
+                                           partEntry.DosEnvVec.Prealloc);
+
                 AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.dosEnvVec.interleave = {0}",
-                                          partEntry.DosEnvVec.Interleave);
+                                           partEntry.DosEnvVec.Interleave);
+
                 AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.dosEnvVec.lowCylinder = {0}",
-                                          partEntry.DosEnvVec.LowCylinder);
+                                           partEntry.DosEnvVec.LowCylinder);
+
                 AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.dosEnvVec.highCylinder = {0}",
-                                          partEntry.DosEnvVec.HighCylinder);
+                                           partEntry.DosEnvVec.HighCylinder);
+
                 AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.dosEnvVec.numBuffer = {0}",
-                                          partEntry.DosEnvVec.NumBuffer);
+                                           partEntry.DosEnvVec.NumBuffer);
+
                 AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.dosEnvVec.bufMemType = {0}",
-                                          partEntry.DosEnvVec.BufMemType);
+                                           partEntry.DosEnvVec.BufMemType);
+
                 AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.dosEnvVec.maxTransfer = {0}",
-                                          partEntry.DosEnvVec.MaxTransfer);
+                                           partEntry.DosEnvVec.MaxTransfer);
+
                 AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.dosEnvVec.Mask = 0x{0:X8}",
-                                          partEntry.DosEnvVec.Mask);
+                                           partEntry.DosEnvVec.Mask);
+
                 AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.dosEnvVec.bootPriority = {0}",
-                                          partEntry.DosEnvVec.BootPriority);
+                                           partEntry.DosEnvVec.BootPriority);
+
                 AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.dosEnvVec.dosType = {0}",
-                                          AmigaDosTypeToString(partEntry.DosEnvVec.DosType));
+                                           AmigaDosTypeToString(partEntry.DosEnvVec.DosType));
+
                 AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.dosEnvVec.baud = {0}",
-                                          partEntry.DosEnvVec.Baud);
+                                           partEntry.DosEnvVec.Baud);
+
                 AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.dosEnvVec.control = 0x{0:X8}",
-                                          partEntry.DosEnvVec.Control);
+                                           partEntry.DosEnvVec.Control);
+
                 AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.dosEnvVec.bootBlocks = {0}",
-                                          partEntry.DosEnvVec.BootBlocks);
+                                           partEntry.DosEnvVec.BootBlocks);
 
                 partitionEntries.Add(partEntry);
                 nextBlock = partEntry.NextPtr;
@@ -640,19 +559,21 @@ namespace Aaru.Partitions
             List<FileSystemHeader> fshdEntries    = new List<FileSystemHeader>();
             List<LoadSegment>      segmentEntries = new List<LoadSegment>();
             nextBlock = rdb.FsheaderPtr;
+
             while(nextBlock != 0xFFFFFFFF)
             {
                 AaruConsole.DebugWriteLine("Amiga RDB plugin",
-                                          "Going to block {0} in search of a FileSystemHeader block", nextBlock);
+                                           "Going to block {0} in search of a FileSystemHeader block", nextBlock);
 
                 sector = imagePlugin.ReadSector(nextBlock);
                 uint magic = BigEndianBitConverter.ToUInt32(sector, 0);
 
-                if(magic != FILESYSTEM_HEADER_MAGIC) break;
+                if(magic != FILESYSTEM_HEADER_MAGIC)
+                    break;
 
                 AaruConsole.DebugWriteLine("Amiga RDB plugin", "Found FileSystemHeader block");
 
-                FileSystemHeader fshd = new FileSystemHeader
+                var fshd = new FileSystemHeader
                 {
                     Magic      = BigEndianBitConverter.ToUInt32(sector, 0x00),
                     Size       = BigEndianBitConverter.ToUInt32(sector, 0x04),
@@ -664,8 +585,7 @@ namespace Aaru.Partitions
                     Reserved2  = BigEndianBitConverter.ToUInt32(sector, 0x1C),
                     DosType    = BigEndianBitConverter.ToUInt32(sector, 0x20),
                     Version    = BigEndianBitConverter.ToUInt32(sector, 0x24),
-                    PatchFlags = BigEndianBitConverter.ToUInt32(sector, 0x28),
-                    Dnode = new DeviceNode
+                    PatchFlags = BigEndianBitConverter.ToUInt32(sector, 0x28), Dnode = new DeviceNode
                     {
                         Type       = BigEndianBitConverter.ToUInt32(sector, 0x2C),
                         Task       = BigEndianBitConverter.ToUInt32(sector, 0x30),
@@ -680,48 +600,57 @@ namespace Aaru.Partitions
                 };
 
                 AaruConsole.DebugWriteLine("Amiga RDB plugin", "FSHD.magic = 0x{0:X8}", fshd.Magic);
+
                 AaruConsole.DebugWriteLine("Amiga RDB plugin", "FSHD.size = {0} longs, {1} bytes", fshd.Size,
-                                          fshd.Size * 4);
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "FSHD.checksum = 0x{0:X8}",  fshd.Checksum);
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "FSHD.targetID = {0}",       fshd.TargetId);
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "FSHD.next_ptr = {0}",       fshd.NextPtr);
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "FSHD.flags = 0x{0:X8}",     fshd.Flags);
+                                           fshd.Size * 4);
+
+                AaruConsole.DebugWriteLine("Amiga RDB plugin", "FSHD.checksum = 0x{0:X8}", fshd.Checksum);
+                AaruConsole.DebugWriteLine("Amiga RDB plugin", "FSHD.targetID = {0}", fshd.TargetId);
+                AaruConsole.DebugWriteLine("Amiga RDB plugin", "FSHD.next_ptr = {0}", fshd.NextPtr);
+                AaruConsole.DebugWriteLine("Amiga RDB plugin", "FSHD.flags = 0x{0:X8}", fshd.Flags);
                 AaruConsole.DebugWriteLine("Amiga RDB plugin", "FSHD.reserved1 = 0x{0:X8}", fshd.Reserved1);
                 AaruConsole.DebugWriteLine("Amiga RDB plugin", "FSHD.reserved2 = 0x{0:X8}", fshd.Reserved2);
+
                 AaruConsole.DebugWriteLine("Amiga RDB plugin", "FSHD.dosType = {0}",
-                                          AmigaDosTypeToString(fshd.DosType));
+                                           AmigaDosTypeToString(fshd.DosType));
+
                 AaruConsole.DebugWriteLine("Amiga RDB plugin", "FSHD.version = {0:D2}.{1:D2} (0x{2:X8})",
-                                          (fshd.Version & 0xFFFF0000) >> 16, fshd.Version & 0xFFFF, fshd.Version);
+                                           (fshd.Version & 0xFFFF0000) >> 16, fshd.Version & 0xFFFF, fshd.Version);
+
                 AaruConsole.DebugWriteLine("Amiga RDB plugin", "FSHD.patchFlags = 0x{0:X8}", fshd.PatchFlags);
 
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "FSHD.dnode.type = {0}",      fshd.Dnode.Type);
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "FSHD.dnode.task = {0}",      fshd.Dnode.Task);
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "FSHD.dnode.locked = {0}",    fshd.Dnode.Locked);
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "FSHD.dnode.handler = {0}",   fshd.Dnode.Handler);
+                AaruConsole.DebugWriteLine("Amiga RDB plugin", "FSHD.dnode.type = {0}", fshd.Dnode.Type);
+                AaruConsole.DebugWriteLine("Amiga RDB plugin", "FSHD.dnode.task = {0}", fshd.Dnode.Task);
+                AaruConsole.DebugWriteLine("Amiga RDB plugin", "FSHD.dnode.locked = {0}", fshd.Dnode.Locked);
+                AaruConsole.DebugWriteLine("Amiga RDB plugin", "FSHD.dnode.handler = {0}", fshd.Dnode.Handler);
                 AaruConsole.DebugWriteLine("Amiga RDB plugin", "FSHD.dnode.stackSize = {0}", fshd.Dnode.StackSize);
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "FSHD.dnode.priority = {0}",  fshd.Dnode.Priority);
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "FSHD.dnode.startup = {0}",   fshd.Dnode.Startup);
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "FSHD.dnode.seglist_ptr = {0}",
-                                          fshd.Dnode.SeglistPtr);
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "FSHD.dnode.global_vec = 0x{0:X8}", fshd.Dnode.GlobalVec);
+                AaruConsole.DebugWriteLine("Amiga RDB plugin", "FSHD.dnode.priority = {0}", fshd.Dnode.Priority);
+                AaruConsole.DebugWriteLine("Amiga RDB plugin", "FSHD.dnode.startup = {0}", fshd.Dnode.Startup);
+                AaruConsole.DebugWriteLine("Amiga RDB plugin", "FSHD.dnode.seglist_ptr = {0}", fshd.Dnode.SeglistPtr);
+
+                AaruConsole.DebugWriteLine("Amiga RDB plugin", "FSHD.dnode.global_vec = 0x{0:X8}",
+                                           fshd.Dnode.GlobalVec);
 
                 nextBlock = fshd.Dnode.SeglistPtr;
-                bool        thereAreLoadSegments = false;
-                Sha1Context sha1Ctx              = new Sha1Context();
+                bool thereAreLoadSegments = false;
+                var  sha1Ctx              = new Sha1Context();
+
                 while(nextBlock != 0xFFFFFFFF)
                 {
-                    AaruConsole.DebugWriteLine("Amiga RDB plugin", "Going to block {0} in search of a LoadSegment block",
-                                              nextBlock);
+                    AaruConsole.DebugWriteLine("Amiga RDB plugin",
+                                               "Going to block {0} in search of a LoadSegment block", nextBlock);
 
                     sector = imagePlugin.ReadSector(nextBlock);
                     uint magicSeg = BigEndianBitConverter.ToUInt32(sector, 0);
 
-                    if(magicSeg != LOAD_SEG_MAGIC) break;
+                    if(magicSeg != LOAD_SEG_MAGIC)
+                        break;
 
                     AaruConsole.DebugWriteLine("Amiga RDB plugin", "Found LoadSegment block");
 
                     thereAreLoadSegments = true;
-                    LoadSegment loadSeg = new LoadSegment
+
+                    var loadSeg = new LoadSegment
                     {
                         Magic    = BigEndianBitConverter.ToUInt32(sector, 0x00),
                         Size     = BigEndianBitConverter.ToUInt32(sector, 0x04),
@@ -729,15 +658,18 @@ namespace Aaru.Partitions
                         TargetId = BigEndianBitConverter.ToUInt32(sector, 0x0C),
                         NextPtr  = BigEndianBitConverter.ToUInt32(sector, 0x10)
                     };
+
                     loadSeg.LoadData = new byte[(loadSeg.Size - 5) * 4];
                     Array.Copy(sector, 0x14, loadSeg.LoadData, 0, (loadSeg.Size - 5) * 4);
 
                     AaruConsole.DebugWriteLine("Amiga RDB plugin", "loadSeg.magic = 0x{0:X8}", loadSeg.Magic);
+
                     AaruConsole.DebugWriteLine("Amiga RDB plugin", "loadSeg.size = {0} longs, {1} bytes", loadSeg.Size,
-                                              loadSeg.Size * 4);
+                                               loadSeg.Size * 4);
+
                     AaruConsole.DebugWriteLine("Amiga RDB plugin", "loadSeg.checksum = 0x{0:X8}", loadSeg.Checksum);
-                    AaruConsole.DebugWriteLine("Amiga RDB plugin", "loadSeg.targetID = {0}",      loadSeg.TargetId);
-                    AaruConsole.DebugWriteLine("Amiga RDB plugin", "loadSeg.next_ptr = {0}",      loadSeg.NextPtr);
+                    AaruConsole.DebugWriteLine("Amiga RDB plugin", "loadSeg.targetID = {0}", loadSeg.TargetId);
+                    AaruConsole.DebugWriteLine("Amiga RDB plugin", "loadSeg.next_ptr = {0}", loadSeg.NextPtr);
 
                     segmentEntries.Add(loadSeg);
                     nextBlock = loadSeg.NextPtr;
@@ -756,36 +688,22 @@ namespace Aaru.Partitions
             }
 
             ulong sequence = 0;
+
             foreach(Partition entry in partitionEntries.Select(rdbEntry => new Partition
             {
-                Description =
-                    AmigaDosTypeToDescriptionString(rdbEntry
-                                                   .DosEnvVec
-                                                   .DosType),
-                Name     = rdbEntry.DriveName,
-                Sequence = sequence,
-                Length =
-                    (rdbEntry.DosEnvVec.HighCylinder + 1 -
-                     rdbEntry.DosEnvVec.LowCylinder) *
-                    rdbEntry.DosEnvVec.Surfaces      *
-                    rdbEntry.DosEnvVec.Bpt,
-                Start =
-                    rdbEntry.DosEnvVec.LowCylinder *
-                    rdbEntry.DosEnvVec.Surfaces    *
-                    rdbEntry.DosEnvVec.Bpt + sectorOffset,
-                Type =
-                    AmigaDosTypeToString(rdbEntry.DosEnvVec
-                                                 .DosType),
-                Scheme = Name,
-                Offset =
-                    (rdbEntry.DosEnvVec.LowCylinder *
-                     rdbEntry.DosEnvVec.Surfaces    *
-                     rdbEntry.DosEnvVec.Bpt + sectorOffset) *
-                    rdb.BlockSize,
-                Size = (rdbEntry.DosEnvVec.HighCylinder + 1 -
-                        rdbEntry.DosEnvVec.LowCylinder) *
-                       rdbEntry.DosEnvVec.Surfaces      *
-                       rdbEntry.DosEnvVec.Bpt           * rdb.BlockSize
+                Description = AmigaDosTypeToDescriptionString(rdbEntry.DosEnvVec.DosType), Name = rdbEntry.DriveName,
+                Sequence    = sequence,
+                Length = ((rdbEntry.DosEnvVec.HighCylinder + 1) - rdbEntry.DosEnvVec.LowCylinder) *
+                         rdbEntry.DosEnvVec.Surfaces                                              *
+                         rdbEntry.DosEnvVec.Bpt,
+                Start = (rdbEntry.DosEnvVec.LowCylinder * rdbEntry.DosEnvVec.Surfaces * rdbEntry.DosEnvVec.Bpt) +
+                        sectorOffset,
+                Type = AmigaDosTypeToString(rdbEntry.DosEnvVec.DosType), Scheme = Name,
+                Offset = ((rdbEntry.DosEnvVec.LowCylinder * rdbEntry.DosEnvVec.Surfaces * rdbEntry.DosEnvVec.Bpt) +
+                          sectorOffset) * rdb.BlockSize,
+                Size = ((rdbEntry.DosEnvVec.HighCylinder + 1) - rdbEntry.DosEnvVec.LowCylinder) *
+                       rdbEntry.DosEnvVec.Surfaces                                              *
+                       rdbEntry.DosEnvVec.Bpt                                                   * rdb.BlockSize
             }))
             {
                 partitions.Add(entry);
@@ -855,7 +773,8 @@ namespace Aaru.Partitions
                     if((amigaDosType & TYPEID_AMIX_SYSV) == TYPEID_AMIX_SYSV)
                         return $"Unknown Amiga UNIX filesystem type {AmigaDosTypeToString(amigaDosType)}";
 
-                    if((amigaDosType & 0x50465300) == 0x50465300 || (amigaDosType & 0x41465300) == 0x41465300)
+                    if((amigaDosType & 0x50465300) == 0x50465300 ||
+                       (amigaDosType & 0x41465300) == 0x41465300)
                         return $"Unknown ProfessionalFileSystem type {AmigaDosTypeToString(amigaDosType)}";
 
                     if((amigaDosType & TYPEID_SFS) == TYPEID_SFS)
@@ -898,615 +817,320 @@ namespace Aaru.Partitions
             return quoted ? $"\"{textPartString}\\{amigaDosType & 0xFF}\"" : $"{textPartString}\\{amigaDosType & 0xFF}";
         }
 
-        /// <summary>
-        ///     Amiga Rigid Disk Block, header for partitioning scheme
-        ///     Can be in any sector from 0 to 15, inclusive
-        /// </summary>
+        /// <summary>Amiga Rigid Disk Block, header for partitioning scheme Can be in any sector from 0 to 15, inclusive</summary>
         struct RigidDiskBlock
         {
-            /// <summary>
-            ///     "RDSK"
-            /// </summary>
+            /// <summary>"RDSK"</summary>
             public uint Magic;
-            /// <summary>
-            ///     Size in longs
-            /// </summary>
+            /// <summary>Size in longs</summary>
             public uint Size;
-            /// <summary>
-            ///     Checksum
-            /// </summary>
+            /// <summary>Checksum</summary>
             public int Checksum;
-            /// <summary>
-            ///     SCSI target ID, 7 for non-SCSI
-            /// </summary>
+            /// <summary>SCSI target ID, 7 for non-SCSI</summary>
             public uint TargetId;
-            /// <summary>
-            ///     Block size in bytes
-            /// </summary>
+            /// <summary>Block size in bytes</summary>
             public uint BlockSize;
-            /// <summary>
-            ///     Flags
-            /// </summary>
+            /// <summary>Flags</summary>
             public uint Flags;
-            /// <summary>
-            ///     Pointer to first BadBlockList, 0xFFFFFFFF means last block in device
-            /// </summary>
+            /// <summary>Pointer to first BadBlockList, 0xFFFFFFFF means last block in device</summary>
             public uint BadblockPtr;
-            /// <summary>
-            ///     Pointer to first PartitionEntry, 0xFFFFFFFF means last block in device
-            /// </summary>
+            /// <summary>Pointer to first PartitionEntry, 0xFFFFFFFF means last block in device</summary>
             public uint PartitionPtr;
-            /// <summary>
-            ///     Pointer to first FileSystemHeader, 0xFFFFFFFF means last block in device
-            /// </summary>
+            /// <summary>Pointer to first FileSystemHeader, 0xFFFFFFFF means last block in device</summary>
             public uint FsheaderPtr;
-            /// <summary>
-            ///     Optional drive specific init code
-            /// </summary>
+            /// <summary>Optional drive specific init code</summary>
             public uint Driveinitcode;
-            /// <summary>
-            ///     Reserved, should be 0xFFFFFFFF
-            /// </summary>
+            /// <summary>Reserved, should be 0xFFFFFFFF</summary>
             public uint Reserved1;
-            /// <summary>
-            ///     Reserved, should be 0xFFFFFFFF
-            /// </summary>
+            /// <summary>Reserved, should be 0xFFFFFFFF</summary>
             public uint Reserved2;
-            /// <summary>
-            ///     Reserved, should be 0xFFFFFFFF
-            /// </summary>
+            /// <summary>Reserved, should be 0xFFFFFFFF</summary>
             public uint Reserved3;
-            /// <summary>
-            ///     Reserved, should be 0xFFFFFFFF
-            /// </summary>
+            /// <summary>Reserved, should be 0xFFFFFFFF</summary>
             public uint Reserved4;
-            /// <summary>
-            ///     Reserved, should be 0xFFFFFFFF
-            /// </summary>
+            /// <summary>Reserved, should be 0xFFFFFFFF</summary>
             public uint Reserved5;
-            /// <summary>
-            ///     Reserved, should be 0xFFFFFFFF
-            /// </summary>
+            /// <summary>Reserved, should be 0xFFFFFFFF</summary>
             public uint Reserved6;
-            /// <summary>
-            ///     Cylinders in drive
-            /// </summary>
+            /// <summary>Cylinders in drive</summary>
             public uint Cylinders;
-            /// <summary>
-            ///     Sectors per track
-            /// </summary>
+            /// <summary>Sectors per track</summary>
             public uint Spt;
-            /// <summary>
-            ///     Heads in drive
-            /// </summary>
+            /// <summary>Heads in drive</summary>
             public uint Heads;
-            /// <summary>
-            ///     Drive interleave
-            /// </summary>
+            /// <summary>Drive interleave</summary>
             public uint Interleave;
-            /// <summary>
-            ///     Cylinder for parking heads
-            /// </summary>
+            /// <summary>Cylinder for parking heads</summary>
             public uint Parking;
-            /// <summary>
-            ///     Reserved, should be zero
-            /// </summary>
+            /// <summary>Reserved, should be zero</summary>
             public uint Reserved7;
-            /// <summary>
-            ///     Reserved, should be zero
-            /// </summary>
+            /// <summary>Reserved, should be zero</summary>
             public uint Reserved8;
-            /// <summary>
-            ///     Reserved, should be zero
-            /// </summary>
+            /// <summary>Reserved, should be zero</summary>
             public uint Reserved9;
-            /// <summary>
-            ///     Starting cylinder for write precompensation
-            /// </summary>
+            /// <summary>Starting cylinder for write precompensation</summary>
             public uint Writeprecomp;
-            /// <summary>
-            ///     Starting cylinder for reduced write current
-            /// </summary>
+            /// <summary>Starting cylinder for reduced write current</summary>
             public uint Reducedwrite;
-            /// <summary>
-            ///     Drive step rate
-            /// </summary>
+            /// <summary>Drive step rate</summary>
             public uint Steprate;
-            /// <summary>
-            ///     Reserved, should be zero
-            /// </summary>
+            /// <summary>Reserved, should be zero</summary>
             public uint Reserved10;
-            /// <summary>
-            ///     Reserved, should be zero
-            /// </summary>
+            /// <summary>Reserved, should be zero</summary>
             public uint Reserved11;
-            /// <summary>
-            ///     Reserved, should be zero
-            /// </summary>
+            /// <summary>Reserved, should be zero</summary>
             public uint Reserved12;
-            /// <summary>
-            ///     Reserved, should be zero
-            /// </summary>
+            /// <summary>Reserved, should be zero</summary>
             public uint Reserved13;
-            /// <summary>
-            ///     Reserved, should be zero
-            /// </summary>
+            /// <summary>Reserved, should be zero</summary>
             public uint Reserved14;
-            /// <summary>
-            ///     Low block of RDB reserved blocks
-            /// </summary>
+            /// <summary>Low block of RDB reserved blocks</summary>
             public uint RdbBlockLow;
-            /// <summary>
-            ///     High block of RDB reserved blocks
-            /// </summary>
+            /// <summary>High block of RDB reserved blocks</summary>
             public uint RdbBlockHigh;
-            /// <summary>
-            ///     Low cylinder for partitionable area
-            /// </summary>
+            /// <summary>Low cylinder for partitionable area</summary>
             public uint LowCylinder;
-            /// <summary>
-            ///     High cylinder for partitionable area
-            /// </summary>
+            /// <summary>High cylinder for partitionable area</summary>
             public uint HighCylinder;
-            /// <summary>
-            ///     Blocks per cylinder
-            /// </summary>
+            /// <summary>Blocks per cylinder</summary>
             public uint CylBlocks;
-            /// <summary>
-            ///     Seconds for head autoparking
-            /// </summary>
+            /// <summary>Seconds for head autoparking</summary>
             public uint AutoParkSeconds;
-            /// <summary>
-            ///     Highest block used by RDB
-            /// </summary>
+            /// <summary>Highest block used by RDB</summary>
             public uint HighRdskBlock;
-            /// <summary>
-            ///     Reserved, should be zero
-            /// </summary>
+            /// <summary>Reserved, should be zero</summary>
             public uint Reserved15;
-            /// <summary>
-            ///     Disk vendor, 8 bytes
-            /// </summary>
+            /// <summary>Disk vendor, 8 bytes</summary>
             public string DiskVendor;
-            /// <summary>
-            ///     Disk product, 16 bytes
-            /// </summary>
+            /// <summary>Disk product, 16 bytes</summary>
             public string DiskProduct;
-            /// <summary>
-            ///     Disk revision, 4 bytes
-            /// </summary>
+            /// <summary>Disk revision, 4 bytes</summary>
             public string DiskRevision;
-            /// <summary>
-            ///     Controller vendor, 8 bytes
-            /// </summary>
+            /// <summary>Controller vendor, 8 bytes</summary>
             public string ControllerVendor;
-            /// <summary>
-            ///     Controller product, 16 bytes
-            /// </summary>
+            /// <summary>Controller product, 16 bytes</summary>
             public string ControllerProduct;
-            /// <summary>
-            ///     Controller revision, 4 bytes
-            /// </summary>
+            /// <summary>Controller revision, 4 bytes</summary>
             public string ControllerRevision;
-            /// <summary>
-            ///     Reserved, should be zero
-            /// </summary>
+            /// <summary>Reserved, should be zero</summary>
             public uint Reserved16;
-            /// <summary>
-            ///     Reserved, should be zero
-            /// </summary>
+            /// <summary>Reserved, should be zero</summary>
             public uint Reserved17;
-            /// <summary>
-            ///     Reserved, should be zero
-            /// </summary>
+            /// <summary>Reserved, should be zero</summary>
             public uint Reserved18;
-            /// <summary>
-            ///     Reserved, should be zero
-            /// </summary>
+            /// <summary>Reserved, should be zero</summary>
             public uint Reserved19;
-            /// <summary>
-            ///     Reserved, should be zero
-            /// </summary>
+            /// <summary>Reserved, should be zero</summary>
             public uint Reserved20;
-            /// <summary>
-            ///     Reserved, should be zero
-            /// </summary>
+            /// <summary>Reserved, should be zero</summary>
             public uint Reserved21;
-            /// <summary>
-            ///     Reserved, should be zero
-            /// </summary>
+            /// <summary>Reserved, should be zero</summary>
             public uint Reserved22;
-            /// <summary>
-            ///     Reserved, should be zero
-            /// </summary>
+            /// <summary>Reserved, should be zero</summary>
             public uint Reserved23;
-            /// <summary>
-            ///     Reserved, should be zero
-            /// </summary>
+            /// <summary>Reserved, should be zero</summary>
             public uint Reserved24;
-            /// <summary>
-            ///     Reserved, should be zero
-            /// </summary>
+            /// <summary>Reserved, should be zero</summary>
             public uint Reserved25;
         }
 
-        /// <summary>
-        ///     Pair for spare blocks
-        /// </summary>
+        /// <summary>Pair for spare blocks</summary>
         struct BadBlockEntry
         {
-            /// <summary>
-            ///     Bad block pointer
-            /// </summary>
+            /// <summary>Bad block pointer</summary>
             public uint BadBlock;
-            /// <summary>
-            ///     Replacement block pointer
-            /// </summary>
+            /// <summary>Replacement block pointer</summary>
             public uint GoodBlock;
         }
 
-        /// <summary>
-        ///     List of bad blocks and spares
-        /// </summary>
+        /// <summary>List of bad blocks and spares</summary>
         struct BadBlockList
         {
-            /// <summary>
-            ///     "BADB"
-            /// </summary>
+            /// <summary>"BADB"</summary>
             public uint Magic;
-            /// <summary>
-            ///     Size in longs
-            /// </summary>
+            /// <summary>Size in longs</summary>
             public uint Size;
-            /// <summary>
-            ///     Checksum
-            /// </summary>
+            /// <summary>Checksum</summary>
             public int Checksum;
-            /// <summary>
-            ///     SCSI target ID, 7 for non-SCSI
-            /// </summary>
+            /// <summary>SCSI target ID, 7 for non-SCSI</summary>
             public uint TargetId;
-            /// <summary>
-            ///     Pointer for next BadBlockList
-            /// </summary>
+            /// <summary>Pointer for next BadBlockList</summary>
             public uint NextPtr;
-            /// <summary>
-            ///     Reserved
-            /// </summary>
+            /// <summary>Reserved</summary>
             public uint Reserved;
-            /// <summary>
-            ///     Bad block entries, up to block filling, 8 bytes each
-            /// </summary>
+            /// <summary>Bad block entries, up to block filling, 8 bytes each</summary>
             public BadBlockEntry[] BlockPairs;
         }
 
-        /// <summary>
-        ///     DOSEnvVec, used by AmigaDOS
-        /// </summary>
+        /// <summary>DOSEnvVec, used by AmigaDOS</summary>
         struct DosEnvironmentVector
         {
-            /// <summary>
-            ///     Size in longs, should be 16, minimum 11
-            /// </summary>
+            /// <summary>Size in longs, should be 16, minimum 11</summary>
             public uint Size;
-            /// <summary>
-            ///     Block size in longs
-            /// </summary>
+            /// <summary>Block size in longs</summary>
             public uint BlockSize;
-            /// <summary>
-            ///     Unknown, 0
-            /// </summary>
+            /// <summary>Unknown, 0</summary>
             public uint SecOrg;
-            /// <summary>
-            ///     Heads in drive
-            /// </summary>
+            /// <summary>Heads in drive</summary>
             public uint Surfaces;
-            /// <summary>
-            ///     Sectors per block
-            /// </summary>
+            /// <summary>Sectors per block</summary>
             public uint Spb;
-            /// <summary>
-            ///     Blocks per track
-            /// </summary>
+            /// <summary>Blocks per track</summary>
             public uint Bpt;
-            /// <summary>
-            ///     DOS reserved blocks at start of partition
-            /// </summary>
+            /// <summary>DOS reserved blocks at start of partition</summary>
             public uint Reservedblocks;
-            /// <summary>
-            ///     DOS reserved blocks at end of partition
-            /// </summary>
+            /// <summary>DOS reserved blocks at end of partition</summary>
             public uint Prealloc;
-            /// <summary>
-            ///     Interleave
-            /// </summary>
+            /// <summary>Interleave</summary>
             public uint Interleave;
-            /// <summary>
-            ///     First cylinder of a partition, inclusive
-            /// </summary>
+            /// <summary>First cylinder of a partition, inclusive</summary>
             public uint LowCylinder;
-            /// <summary>
-            ///     Last cylinder of a partition, inclusive
-            /// </summary>
+            /// <summary>Last cylinder of a partition, inclusive</summary>
             public uint HighCylinder;
-            /// <summary>
-            ///     Buffers, usually 30
-            /// </summary>
+            /// <summary>Buffers, usually 30</summary>
             public uint NumBuffer;
-            /// <summary>
-            ///     Type of memory to allocate for buffers
-            /// </summary>
+            /// <summary>Type of memory to allocate for buffers</summary>
             public uint BufMemType;
-            /// <summary>
-            ///     Maximum transfer, usually 0x7FFFFFFF
-            /// </summary>
+            /// <summary>Maximum transfer, usually 0x7FFFFFFF</summary>
             public uint MaxTransfer;
-            /// <summary>
-            ///     Address mask to block out certain memory, usually 0xFFFFFFFE
-            /// </summary>
+            /// <summary>Address mask to block out certain memory, usually 0xFFFFFFFE</summary>
             public uint Mask;
-            /// <summary>
-            ///     Boot priority
-            /// </summary>
+            /// <summary>Boot priority</summary>
             public uint BootPriority;
-            /// <summary>
-            ///     Partition type, and filesystem driver identification for AmigaDOS
-            /// </summary>
+            /// <summary>Partition type, and filesystem driver identification for AmigaDOS</summary>
             public uint DosType;
-            /// <summary>
-            ///     Default baud rate for SER and AUX handlers
-            /// </summary>
+            /// <summary>Default baud rate for SER and AUX handlers</summary>
             public uint Baud;
-            /// <summary>
-            ///     Flow control values for SER and AUX handlers
-            /// </summary>
+            /// <summary>Flow control values for SER and AUX handlers</summary>
             public uint Control;
-            /// <summary>
-            ///     Since Kickstart 2, how many boot blocks are to be loaded
-            /// </summary>
+            /// <summary>Since Kickstart 2, how many boot blocks are to be loaded</summary>
             public uint BootBlocks;
         }
 
         struct PartitionEntry
         {
-            /// <summary>
-            ///     "PART"
-            /// </summary>
+            /// <summary>"PART"</summary>
             public uint Magic;
-            /// <summary>
-            ///     Size in longs
-            /// </summary>
+            /// <summary>Size in longs</summary>
             public uint Size;
-            /// <summary>
-            ///     Checksum
-            /// </summary>
+            /// <summary>Checksum</summary>
             public int Checksum;
-            /// <summary>
-            ///     SCSI target ID, 7 for non-SCSI
-            /// </summary>
+            /// <summary>SCSI target ID, 7 for non-SCSI</summary>
             public uint TargetId;
-            /// <summary>
-            ///     Pointer to next PartitionEntry
-            /// </summary>
+            /// <summary>Pointer to next PartitionEntry</summary>
             public uint NextPtr;
-            /// <summary>
-            ///     Partition flags
-            /// </summary>
+            /// <summary>Partition flags</summary>
             public uint Flags;
-            /// <summary>
-            ///     Reserved
-            /// </summary>
+            /// <summary>Reserved</summary>
             public uint Reserved1;
-            /// <summary>
-            ///     Reserved
-            /// </summary>
+            /// <summary>Reserved</summary>
             public uint Reserved2;
-            /// <summary>
-            ///     Preferred flags for OpenDevice()
-            /// </summary>
+            /// <summary>Preferred flags for OpenDevice()</summary>
             public uint DevFlags;
-            /// <summary>
-            ///     Length of drive name
-            /// </summary>
+            /// <summary>Length of drive name</summary>
             public uint DriveNameLen;
-            /// <summary>
-            ///     Drive name, 31 bytes
-            /// </summary>
+            /// <summary>Drive name, 31 bytes</summary>
             public string DriveName;
-            /// <summary>
-            ///     Reserved
-            /// </summary>
+            /// <summary>Reserved</summary>
             public uint Reserved3;
-            /// <summary>
-            ///     Reserved
-            /// </summary>
+            /// <summary>Reserved</summary>
             public uint Reserved4;
-            /// <summary>
-            ///     Reserved
-            /// </summary>
+            /// <summary>Reserved</summary>
             public uint Reserved5;
-            /// <summary>
-            ///     Reserved
-            /// </summary>
+            /// <summary>Reserved</summary>
             public uint Reserved6;
-            /// <summary>
-            ///     Reserved
-            /// </summary>
+            /// <summary>Reserved</summary>
             public uint Reserved7;
-            /// <summary>
-            ///     Reserved
-            /// </summary>
+            /// <summary>Reserved</summary>
             public uint Reserved8;
-            /// <summary>
-            ///     Reserved
-            /// </summary>
+            /// <summary>Reserved</summary>
             public uint Reserved9;
-            /// <summary>
-            ///     Reserved
-            /// </summary>
+            /// <summary>Reserved</summary>
             public uint Reserved10;
-            /// <summary>
-            ///     Reserved
-            /// </summary>
+            /// <summary>Reserved</summary>
             public uint Reserved11;
-            /// <summary>
-            ///     Reserved
-            /// </summary>
+            /// <summary>Reserved</summary>
             public uint Reserved12;
-            /// <summary>
-            ///     Reserved
-            /// </summary>
+            /// <summary>Reserved</summary>
             public uint Reserved13;
-            /// <summary>
-            ///     Reserved
-            /// </summary>
+            /// <summary>Reserved</summary>
             public uint Reserved14;
-            /// <summary>
-            ///     Reserved
-            /// </summary>
+            /// <summary>Reserved</summary>
             public uint Reserved15;
-            /// <summary>
-            ///     Reserved
-            /// </summary>
+            /// <summary>Reserved</summary>
             public uint Reserved16;
-            /// <summary>
-            ///     Reserved
-            /// </summary>
+            /// <summary>Reserved</summary>
             public uint Reserved17;
-            /// <summary>
-            ///     DOSEnvVec, more information about partition
-            /// </summary>
+            /// <summary>DOSEnvVec, more information about partition</summary>
             public DosEnvironmentVector DosEnvVec;
         }
 
-        /// <summary>
-        ///     Device node, mostly useless, except for pointer to first LoadSegment block
-        /// </summary>
+        /// <summary>Device node, mostly useless, except for pointer to first LoadSegment block</summary>
         struct DeviceNode
         {
-            /// <summary>
-            ///     Device node type, =0
-            /// </summary>
+            /// <summary>Device node type, =0</summary>
             public uint Type;
-            /// <summary>
-            ///     DOS task field, =0
-            /// </summary>
+            /// <summary>DOS task field, =0</summary>
             public uint Task;
-            /// <summary>
-            ///     Unused, =0
-            /// </summary>
+            /// <summary>Unused, =0</summary>
             public uint Locked;
-            /// <summary>
-            ///     Filename handler to LoadSegment, =0
-            /// </summary>
+            /// <summary>Filename handler to LoadSegment, =0</summary>
             public uint Handler;
-            /// <summary>
-            ///     Stack size when starting task, =0
-            /// </summary>
+            /// <summary>Stack size when starting task, =0</summary>
             public uint StackSize;
-            /// <summary>
-            ///     Task priority, =0
-            /// </summary>
+            /// <summary>Task priority, =0</summary>
             public uint Priority;
-            /// <summary>
-            ///     Startup message, =0
-            /// </summary>
+            /// <summary>Startup message, =0</summary>
             public uint Startup;
-            /// <summary>
-            ///     Pointer to first LoadSegment block
-            /// </summary>
+            /// <summary>Pointer to first LoadSegment block</summary>
             public uint SeglistPtr;
-            /// <summary>
-            ///     BCPL globabl vector when starting task, =0xFFFFFFFF
-            /// </summary>
+            /// <summary>BCPL globabl vector when starting task, =0xFFFFFFFF</summary>
             public uint GlobalVec;
         }
 
-        /// <summary>
-        ///     File system header
-        /// </summary>
+        /// <summary>File system header</summary>
         struct FileSystemHeader
         {
-            /// <summary>
-            ///     "FSHD"
-            /// </summary>
+            /// <summary>"FSHD"</summary>
             public uint Magic;
-            /// <summary>
-            ///     Size in longs, 64
-            /// </summary>
+            /// <summary>Size in longs, 64</summary>
             public uint Size;
-            /// <summary>
-            ///     Checksum
-            /// </summary>
+            /// <summary>Checksum</summary>
             public int Checksum;
-            /// <summary>
-            ///     SCSI target ID, 7 for non-SCSI
-            /// </summary>
+            /// <summary>SCSI target ID, 7 for non-SCSI</summary>
             public uint TargetId;
-            /// <summary>
-            ///     Pointer to next FileSystemHeader block
-            /// </summary>
+            /// <summary>Pointer to next FileSystemHeader block</summary>
             public uint NextPtr;
-            /// <summary>
-            ///     Flags, unknown
-            /// </summary>
+            /// <summary>Flags, unknown</summary>
             public uint Flags;
-            /// <summary>
-            ///     Reserved
-            /// </summary>
+            /// <summary>Reserved</summary>
             public uint Reserved1;
-            /// <summary>
-            ///     Reserved
-            /// </summary>
+            /// <summary>Reserved</summary>
             public uint Reserved2;
-            /// <summary>
-            ///     Partition type, and filesystem driver identification for AmigaDOS
-            /// </summary>
+            /// <summary>Partition type, and filesystem driver identification for AmigaDOS</summary>
             public uint DosType;
-            /// <summary>
-            ///     Filesystem version
-            ///     Mask 0xFFFF0000, >>16, major version
-            ///     Mask 0x0000FFFF, minor version
-            /// </summary>
+            /// <summary>Filesystem version Mask 0xFFFF0000, >>16, major version Mask 0x0000FFFF, minor version</summary>
             public uint Version;
-            /// <summary>
-            ///     Bits for DeviceNode fields that should be substituted into a standard device node
-            /// </summary>
+            /// <summary>Bits for DeviceNode fields that should be substituted into a standard device node</summary>
             public uint PatchFlags;
-            /// <summary>
-            ///     Device node
-            /// </summary>
+            /// <summary>Device node</summary>
             public DeviceNode Dnode;
         }
 
-        /// <summary>
-        ///     Filesystem code
-        /// </summary>
+        /// <summary>Filesystem code</summary>
         struct LoadSegment
         {
-            /// <summary>
-            ///     "LSEG"
-            /// </summary>
+            /// <summary>"LSEG"</summary>
             public uint Magic;
-            /// <summary>
-            ///     Size in longs
-            /// </summary>
+            /// <summary>Size in longs</summary>
             public uint Size;
-            /// <summary>
-            ///     Checksum
-            /// </summary>
+            /// <summary>Checksum</summary>
             public int Checksum;
-            /// <summary>
-            ///     SCSI target ID, 7 for non-SCSI
-            /// </summary>
+            /// <summary>SCSI target ID, 7 for non-SCSI</summary>
             public uint TargetId;
-            /// <summary>
-            ///     Pointer to next LoadSegment
-            /// </summary>
+            /// <summary>Pointer to next LoadSegment</summary>
             public uint NextPtr;
-            /// <summary>
-            ///     Executable code, with relocation hunks, til end of sector
-            /// </summary>
+            /// <summary>Executable code, with relocation hunks, til end of sector</summary>
             public byte[] LoadData;
         }
     }
diff --git a/Aaru.Partitions/Register.cs b/Aaru.Partitions/Register.cs
index a6e7d9b91..9b5d08f16 100644
--- a/Aaru.Partitions/Register.cs
+++ b/Aaru.Partitions/Register.cs
@@ -56,11 +56,10 @@ namespace Aaru.Partitions
 
         public List<Type> GetAllMediaImagePlugins() => null;
 
-        public List<Type> GetAllPartitionPlugins()
-        {
-            return Assembly.GetExecutingAssembly().GetTypes().Where(t => t.GetInterfaces().Contains(typeof(IPartition)))
-                           .Where(t => t.IsClass).ToList();
-        }
+        public List<Type> GetAllPartitionPlugins() => Assembly.
+                                                      GetExecutingAssembly().GetTypes().
+                                                      Where(t => t.GetInterfaces().Contains(typeof(IPartition))).
+                                                      Where(t => t.IsClass).ToList();
 
         public List<Type> GetAllReadOnlyFilesystemPlugins() => null;
 
diff --git a/Aaru.Partitions/RioKarma.cs b/Aaru.Partitions/RioKarma.cs
index 212f27488..b8449293f 100644
--- a/Aaru.Partitions/RioKarma.cs
+++ b/Aaru.Partitions/RioKarma.cs
@@ -53,27 +53,24 @@ namespace Aaru.Partitions
         {
             partitions = null;
             byte[] sector = imagePlugin.ReadSector(sectorOffset);
-            if(sector.Length < 512) return false;
+
+            if(sector.Length < 512)
+                return false;
 
             RioKarmaTable table = Marshal.ByteArrayToStructureLittleEndian<RioKarmaTable>(sector);
 
-            if(table.magic != KARMA_MAGIC) return false;
+            if(table.magic != KARMA_MAGIC)
+                return false;
 
             ulong counter = 0;
 
-            partitions = (from entry in table.entries
-                          let part = new Partition
-                          {
-                              Start    = entry.offset,
-                              Offset   = (ulong)(entry.offset * sector.Length),
-                              Size     = entry.size,
-                              Length   = (ulong)(entry.size * sector.Length),
-                              Type     = "Rio Karma",
-                              Sequence = counter++,
-                              Scheme   = Name
-                          }
-                          where entry.type == ENTRY_MAGIC
-                          select part).ToList();
+            partitions = (from entry in table.entries let part = new Partition
+                             {
+                                 Start    = entry.offset, Offset = (ulong)(entry.offset * sector.Length),
+                                 Size     = entry.size, Length   = (ulong)(entry.size   * sector.Length),
+                                 Type     = "Rio Karma",
+                                 Sequence = counter++, Scheme = Name
+                             } where entry.type == ENTRY_MAGIC select part).ToList();
 
             return true;
         }
@@ -82,23 +79,23 @@ namespace Aaru.Partitions
         struct RioKarmaTable
         {
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 270)]
-            public byte[] reserved;
+            public readonly byte[] reserved;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
-            public RioKarmaEntry[] entries;
+            public readonly RioKarmaEntry[] entries;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 208)]
-            public byte[] padding;
-            public ushort magic;
+            public readonly byte[] padding;
+            public readonly ushort magic;
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct RioKarmaEntry
         {
-            public uint reserved;
-            public byte type;
+            public readonly uint reserved;
+            public readonly byte type;
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
-            public byte[] reserved2;
-            public uint offset;
-            public uint size;
+            public readonly byte[] reserved2;
+            public readonly uint offset;
+            public readonly uint size;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Partitions/SGI.cs b/Aaru.Partitions/SGI.cs
index d3edf3dae..8e345f78c 100644
--- a/Aaru.Partitions/SGI.cs
+++ b/Aaru.Partitions/SGI.cs
@@ -58,9 +58,12 @@ namespace Aaru.Partitions
             partitions = new List<Partition>();
 
             byte[] sector = imagePlugin.ReadSector(sectorOffset);
-            if(sector.Length < 512) return false;
+
+            if(sector.Length < 512)
+                return false;
 
             SGILabel dvh = Marshal.ByteArrayToStructureBigEndian<SGILabel>(sector);
+
             for(int i = 0; i < dvh.volume.Length; i++)
                 dvh.volume[i] = (SGIVolume)Marshal.SwapStructureMembersEndian(dvh.volume[i]);
 
@@ -68,69 +71,91 @@ namespace Aaru.Partitions
                 dvh.partitions[i] = (SGIPartition)Marshal.SwapStructureMembersEndian(dvh.partitions[i]);
 
             AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.magic = 0x{0:X8} (should be 0x{1:X8})", dvh.magic,
-                                      SGI_MAGIC);
+                                       SGI_MAGIC);
 
-            if(dvh.magic != SGI_MAGIC) return false;
+            if(dvh.magic != SGI_MAGIC)
+                return false;
 
             AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.root_part_num = {0}", dvh.root_part_num);
             AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.swap_part_num = {0}", dvh.swap_part_num);
+
             AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.boot_file = \"{0}\"",
-                                      StringHandlers.CToString(dvh.boot_file));
+                                       StringHandlers.CToString(dvh.boot_file));
+
             AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_skew = {0}", dvh.device_params.dp_skew);
             AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_gap1 = {0}", dvh.device_params.dp_gap1);
             AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_gap2 = {0}", dvh.device_params.dp_gap2);
+
             AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_spares_cyl = {0}",
-                                      dvh.device_params.dp_spares_cyl);
-            AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_cyls = {0}",  dvh.device_params.dp_cyls);
-            AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_shd0 = {0}",  dvh.device_params.dp_shd0);
+                                       dvh.device_params.dp_spares_cyl);
+
+            AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_cyls = {0}", dvh.device_params.dp_cyls);
+            AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_shd0 = {0}", dvh.device_params.dp_shd0);
             AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_trks0 = {0}", dvh.device_params.dp_trks0);
+
             AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_ctq_depth = {0}",
-                                      dvh.device_params.dp_ctq_depth);
-            AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_cylshi = {0}", dvh.device_params.dp_cylshi);
-            AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_secs = {0}",   dvh.device_params.dp_secs);
+                                       dvh.device_params.dp_ctq_depth);
+
+            AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_cylshi = {0}",
+                                       dvh.device_params.dp_cylshi);
+
+            AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_secs = {0}", dvh.device_params.dp_secs);
+
             AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_secbytes = {0}",
-                                      dvh.device_params.dp_secbytes);
+                                       dvh.device_params.dp_secbytes);
+
             AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_interleave = {0}",
-                                      dvh.device_params.dp_interleave);
+                                       dvh.device_params.dp_interleave);
+
             AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_flags = {0}", dvh.device_params.dp_flags);
+
             AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_datarate = {0}",
-                                      dvh.device_params.dp_datarate);
+                                       dvh.device_params.dp_datarate);
+
             AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_nretries = {0}",
-                                      dvh.device_params.dp_nretries);
-            AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_mspw = {0}",   dvh.device_params.dp_mspw);
-            AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_xgap1 = {0}",  dvh.device_params.dp_xgap1);
-            AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_xsync = {0}",  dvh.device_params.dp_xsync);
-            AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_xrdly = {0}",  dvh.device_params.dp_xrdly);
-            AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_xgap2 = {0}",  dvh.device_params.dp_xgap2);
-            AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_xrgate = {0}", dvh.device_params.dp_xrgate);
-            AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_xwcont = {0}", dvh.device_params.dp_xwcont);
+                                       dvh.device_params.dp_nretries);
+
+            AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_mspw = {0}", dvh.device_params.dp_mspw);
+            AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_xgap1 = {0}", dvh.device_params.dp_xgap1);
+            AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_xsync = {0}", dvh.device_params.dp_xsync);
+            AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_xrdly = {0}", dvh.device_params.dp_xrdly);
+            AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_xgap2 = {0}", dvh.device_params.dp_xgap2);
+
+            AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_xrgate = {0}",
+                                       dvh.device_params.dp_xrgate);
+
+            AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_xwcont = {0}",
+                                       dvh.device_params.dp_xwcont);
 
             ulong counter = 0;
 
             for(int i = 0; i < dvh.partitions.Length; i++)
             {
                 AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.partitions[{0}].num_blocks = {1}", i,
-                                          dvh.partitions[i].num_blocks);
+                                           dvh.partitions[i].num_blocks);
+
                 AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.partitions[{0}].first_block = {1}", i,
-                                          dvh.partitions[i].first_block);
+                                           dvh.partitions[i].first_block);
+
                 // TODO: Solve big endian marshal with enumerations
                 dvh.partitions[i].type = (SGIType)Swapping.Swap((uint)dvh.partitions[i].type);
                 AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.partitions[{0}].type = {1}", i, dvh.partitions[i].type);
 
-                Partition part = new Partition
+                var part = new Partition
                 {
-                    Start =
-                        dvh.partitions[i].first_block * dvh.device_params.dp_secbytes / imagePlugin.Info.SectorSize,
+                    Start = (dvh.partitions[i].first_block * dvh.device_params.dp_secbytes) /
+                            imagePlugin.Info.SectorSize,
                     Offset = dvh.partitions[i].first_block * dvh.device_params.dp_secbytes,
-                    Length = dvh.partitions[i].num_blocks * dvh.device_params.dp_secbytes /
+                    Length = (dvh.partitions[i].num_blocks * dvh.device_params.dp_secbytes) /
                              imagePlugin.Info.SectorSize,
-                    Size     = dvh.partitions[i].num_blocks * dvh.device_params.dp_secbytes,
-                    Type     = TypeToString(dvh.partitions[i].type),
-                    Sequence = counter,
-                    Scheme   = Name
+                    Size = dvh.partitions[i].num_blocks * dvh.device_params.dp_secbytes,
+                    Type = TypeToString(dvh.partitions[i].type), Sequence = counter, Scheme = Name
                 };
-                if(part.Size              <= 0 || dvh.partitions[i].type == SGIType.Header ||
-                   dvh.partitions[i].type == SGIType.Volume) continue;
+
+                if(part.Size              <= 0              ||
+                   dvh.partitions[i].type == SGIType.Header ||
+                   dvh.partitions[i].type == SGIType.Volume)
+                    continue;
 
                 partitions.Add(part);
                 counter++;
@@ -168,26 +193,26 @@ namespace Aaru.Partitions
         struct SGILabel
         {
             /// <summary></summary>
-            public uint magic;
+            public readonly uint magic;
             /// <summary></summary>
-            public short root_part_num;
+            public readonly short root_part_num;
             /// <summary></summary>
-            public short swap_part_num;
+            public readonly short swap_part_num;
             /// <summary></summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public byte[] boot_file;
+            public readonly byte[] boot_file;
             /// <summary></summary>
-            public SGIDeviceParameters device_params;
+            public readonly SGIDeviceParameters device_params;
             /// <summary></summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 15)]
-            public SGIVolume[] volume;
+            public readonly SGIVolume[] volume;
             /// <summary></summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public SGIPartition[] partitions;
+            public readonly SGIPartition[] partitions;
             /// <summary></summary>
-            public uint csum;
+            public readonly uint csum;
             /// <summary></summary>
-            public uint padding;
+            public readonly uint padding;
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
@@ -195,41 +220,30 @@ namespace Aaru.Partitions
         {
             /// <summary></summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public byte[] name;
+            public readonly byte[] name;
             /// <summary></summary>
-            public uint block_num;
+            public readonly uint block_num;
             /// <summary></summary>
-            public uint num_bytes;
+            public readonly uint num_bytes;
         }
 
         enum SGIType : uint
         {
-            Header    = 0,
-            TrkRepl   = 1,
-            SecRepl   = 2,
-            Swap      = 3,
-            Bsd       = 4,
-            SystemV   = 5,
-            Volume    = 6,
-            EFS       = 7,
-            Lvol      = 8,
-            Rlvol     = 9,
-            XFS       = 0xA,
-            Xlvol     = 0xB,
-            Rxlvol    = 0xC,
-            Xvm       = 0x0D,
-            LinuxSwap = 0x82,
-            Linux     = 0x83,
-            LinuxRAID = 0xFD
+            Header = 0, TrkRepl      = 1, SecRepl      = 2,
+            Swap   = 3, Bsd          = 4, SystemV      = 5,
+            Volume = 6, EFS          = 7, Lvol         = 8,
+            Rlvol  = 9, XFS          = 0xA, Xlvol      = 0xB,
+            Rxlvol = 0xC, Xvm        = 0x0D, LinuxSwap = 0x82,
+            Linux  = 0x83, LinuxRAID = 0xFD
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct SGIPartition
         {
             /// <summary></summary>
-            public uint num_blocks;
+            public readonly uint num_blocks;
             /// <summary></summary>
-            public uint first_block;
+            public readonly uint first_block;
             /// <summary></summary>
             public SGIType type;
         }
diff --git a/Aaru.Partitions/Sun.cs b/Aaru.Partitions/Sun.cs
index 6571472ee..cfb060558 100644
--- a/Aaru.Partitions/Sun.cs
+++ b/Aaru.Partitions/Sun.cs
@@ -64,12 +64,12 @@ namespace Aaru.Partitions
         /// <summary>Length of v_volume</summary>
         const int LEN_DKL_VVOL = 8;
         /// <summary>Size of padding in SunOS disk label</summary>
-        const int LEN_DKL_PAD = DK_LABEL_SIZE - (LEN_DKL_ASCII + NDKMAP * 8 + 14 * 2);
+        const int LEN_DKL_PAD = DK_LABEL_SIZE - (LEN_DKL_ASCII + (NDKMAP * 8) + (14 * 2));
         /// <summary>Size of padding in Solaris disk label with 8 partitions</summary>
-        const int LEN_DKL_PAD8 = DK_LABEL_SIZE - (LEN_DKL_ASCII + 136    + // sizeof(dk_vtoc8)
-                                                  NDKMAP * 8    + 14 * 2 + 2 * 2);
-        const int LEN_DKL_PAD16 = DK_LABEL_SIZE - (456   + // sizeof(dk_vtoc16)
-                                                   4 * 4 + 12 * 2 + 2 * 2);
+        const int LEN_DKL_PAD8 = DK_LABEL_SIZE - (LEN_DKL_ASCII + 136      + // sizeof(dk_vtoc8)
+                                                  (NDKMAP * 8)  + (14 * 2) + (2 * 2));
+        const int LEN_DKL_PAD16 = DK_LABEL_SIZE - (456     + // sizeof(dk_vtoc16)
+                                                   (4 * 4) + (12 * 2) + (2 * 2));
 
         public string Name   => "Sun Disklabel";
         public Guid   Id     => new Guid("50F35CC4-8375-4445-8DCB-1BA550C931A3");
@@ -79,9 +79,11 @@ namespace Aaru.Partitions
         {
             partitions = new List<Partition>();
 
-            if(imagePlugin.Info.SectorSize < 512) return false;
+            if(imagePlugin.Info.SectorSize < 512)
+                return false;
 
-            if(sectorOffset + 2 >= imagePlugin.Info.Sectors) return false;
+            if(sectorOffset + 2 >= imagePlugin.Info.Sectors)
+                return false;
 
             bool useDkl = false, useDkl8 = false, useDkl16 = false;
 
@@ -91,17 +93,24 @@ namespace Aaru.Partitions
             dk_label8  dkl8  = Marshal.ByteArrayToStructureLittleEndian<dk_label8>(sunSector);
             dk_label16 dkl16 = Marshal.ByteArrayToStructureLittleEndian<dk_label16>(sunSector);
 
-            AaruConsole.DebugWriteLine("Sun plugin", "dkl.dkl_magic = 0x{0:X4}",           dkl.dkl_magic);
-            AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_vtoc.v_sanity = 0x{0:X8}",  dkl8.dkl_vtoc.v_sanity);
+            AaruConsole.DebugWriteLine("Sun plugin", "dkl.dkl_magic = 0x{0:X4}", dkl.dkl_magic);
+            AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_vtoc.v_sanity = 0x{0:X8}", dkl8.dkl_vtoc.v_sanity);
             AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_vtoc.v_sanity = 0x{0:X8}", dkl16.dkl_vtoc.v_sanity);
 
-            if(dkl.dkl_magic == DKL_MAGIC || dkl.dkl_magic == DKL_CIGAM)
-                if(dkl16.dkl_vtoc.v_sanity == VTOC_SANE || dkl16.dkl_vtoc.v_sanity == VTOC_ENAS)
-                    useDkl16                                                                                = true;
-                else if(dkl8.dkl_vtoc.v_sanity == VTOC_SANE || dkl8.dkl_vtoc.v_sanity == VTOC_ENAS) useDkl8 = true;
-                else useDkl                                                                                 = true;
+            if(dkl.dkl_magic == DKL_MAGIC ||
+               dkl.dkl_magic == DKL_CIGAM)
+                if(dkl16.dkl_vtoc.v_sanity == VTOC_SANE ||
+                   dkl16.dkl_vtoc.v_sanity == VTOC_ENAS)
+                    useDkl16 = true;
+                else if(dkl8.dkl_vtoc.v_sanity == VTOC_SANE ||
+                        dkl8.dkl_vtoc.v_sanity == VTOC_ENAS)
+                    useDkl8 = true;
+                else
+                    useDkl = true;
 
-            if(!useDkl && !useDkl8 && !useDkl16)
+            if(!useDkl  &&
+               !useDkl8 &&
+               !useDkl16)
             {
                 sunSector = imagePlugin.ReadSector(sectorOffset + 1);
 
@@ -109,43 +118,57 @@ namespace Aaru.Partitions
                 dkl8  = Marshal.ByteArrayToStructureLittleEndian<dk_label8>(sunSector);
                 dkl16 = Marshal.ByteArrayToStructureLittleEndian<dk_label16>(sunSector);
 
-                if(dkl.dkl_magic == DKL_MAGIC || dkl.dkl_magic == DKL_CIGAM)
-                    if(dkl16.dkl_vtoc.v_sanity == VTOC_SANE || dkl16.dkl_vtoc.v_sanity == VTOC_ENAS)
-                        useDkl16                                                                                = true;
-                    else if(dkl8.dkl_vtoc.v_sanity == VTOC_SANE || dkl8.dkl_vtoc.v_sanity == VTOC_ENAS) useDkl8 = true;
-                    else useDkl                                                                                 = true;
+                if(dkl.dkl_magic == DKL_MAGIC ||
+                   dkl.dkl_magic == DKL_CIGAM)
+                    if(dkl16.dkl_vtoc.v_sanity == VTOC_SANE ||
+                       dkl16.dkl_vtoc.v_sanity == VTOC_ENAS)
+                        useDkl16 = true;
+                    else if(dkl8.dkl_vtoc.v_sanity == VTOC_SANE ||
+                            dkl8.dkl_vtoc.v_sanity == VTOC_ENAS)
+                        useDkl8 = true;
+                    else
+                        useDkl = true;
             }
 
-            if(!useDkl && !useDkl8 && !useDkl16) return false;
+            if(!useDkl  &&
+               !useDkl8 &&
+               !useDkl16)
+                return false;
 
-            if(useDkl16     && dkl16.dkl_magic == DKL_CIGAM) dkl16 = SwapDiskLabel(dkl16);
-            else if(useDkl8 && dkl8.dkl_magic  == DKL_CIGAM) dkl8  = SwapDiskLabel(dkl8);
-            else if(useDkl  && dkl.dkl_magic   == DKL_CIGAM) dkl   = SwapDiskLabel(dkl);
+            if(useDkl16 && dkl16.dkl_magic == DKL_CIGAM)
+                dkl16 = SwapDiskLabel(dkl16);
+            else if(useDkl8 && dkl8.dkl_magic == DKL_CIGAM)
+                dkl8 = SwapDiskLabel(dkl8);
+            else if(useDkl && dkl.dkl_magic == DKL_CIGAM)
+                dkl = SwapDiskLabel(dkl);
 
             if(useDkl)
             {
                 ulong sectorsPerCylinder = (ulong)(dkl.dkl_nsect * dkl.dkl_nhead);
 
                 AaruConsole.DebugWriteLine("Sun plugin", "dkl.dkl_asciilabel = \"{0}\"",
-                                          StringHandlers.CToString(dkl.dkl_asciilabel));
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl.dkl_rpm = {0}",    dkl.dkl_rpm);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl.dkl_pcyl = {0}",   dkl.dkl_pcyl);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl.dkl_apc = {0}",    dkl.dkl_apc);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl.dkl_gap1 = {0}",   dkl.dkl_gap1);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl.dkl_gap2 = {0}",   dkl.dkl_gap2);
+                                           StringHandlers.CToString(dkl.dkl_asciilabel));
+
+                AaruConsole.DebugWriteLine("Sun plugin", "dkl.dkl_rpm = {0}", dkl.dkl_rpm);
+                AaruConsole.DebugWriteLine("Sun plugin", "dkl.dkl_pcyl = {0}", dkl.dkl_pcyl);
+                AaruConsole.DebugWriteLine("Sun plugin", "dkl.dkl_apc = {0}", dkl.dkl_apc);
+                AaruConsole.DebugWriteLine("Sun plugin", "dkl.dkl_gap1 = {0}", dkl.dkl_gap1);
+                AaruConsole.DebugWriteLine("Sun plugin", "dkl.dkl_gap2 = {0}", dkl.dkl_gap2);
                 AaruConsole.DebugWriteLine("Sun plugin", "dkl.dkl_intrlv = {0}", dkl.dkl_intrlv);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl.dkl_ncyl = {0}",   dkl.dkl_ncyl);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl.dkl_acyl = {0}",   dkl.dkl_acyl);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl.dkl_nhead = {0}",  dkl.dkl_nhead);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl.dkl_nsect = {0}",  dkl.dkl_nsect);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl.dkl_bhead = {0}",  dkl.dkl_bhead);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl.dkl_ppart = {0}",  dkl.dkl_ppart);
+                AaruConsole.DebugWriteLine("Sun plugin", "dkl.dkl_ncyl = {0}", dkl.dkl_ncyl);
+                AaruConsole.DebugWriteLine("Sun plugin", "dkl.dkl_acyl = {0}", dkl.dkl_acyl);
+                AaruConsole.DebugWriteLine("Sun plugin", "dkl.dkl_nhead = {0}", dkl.dkl_nhead);
+                AaruConsole.DebugWriteLine("Sun plugin", "dkl.dkl_nsect = {0}", dkl.dkl_nsect);
+                AaruConsole.DebugWriteLine("Sun plugin", "dkl.dkl_bhead = {0}", dkl.dkl_bhead);
+                AaruConsole.DebugWriteLine("Sun plugin", "dkl.dkl_ppart = {0}", dkl.dkl_ppart);
+
                 for(int i = 0; i < NDKMAP; i++)
                 {
                     AaruConsole.DebugWriteLine("Sun plugin", "dkl.dkl_map[{0}].dkl_cylno = {1}", i,
-                                              dkl.dkl_map[i].dkl_cylno);
+                                               dkl.dkl_map[i].dkl_cylno);
+
                     AaruConsole.DebugWriteLine("Sun plugin", "dkl.dkl_map[{0}].dkl_nblk = {1}", i,
-                                              dkl.dkl_map[i].dkl_nblk);
+                                               dkl.dkl_map[i].dkl_nblk);
                 }
 
                 AaruConsole.DebugWriteLine("Sun plugin", "dkl.dkl_magic = 0x{0:X4}", dkl.dkl_magic);
@@ -153,22 +176,24 @@ namespace Aaru.Partitions
                 AaruConsole.DebugWriteLine("Sun plugin", "sectorsPerCylinder = {0}", sectorsPerCylinder);
 
                 for(int i = 0; i < NDKMAP; i++)
-                    if(dkl.dkl_map[i].dkl_cylno > 0 && dkl.dkl_map[i].dkl_nblk > 0)
+                    if(dkl.dkl_map[i].dkl_cylno > 0 &&
+                       dkl.dkl_map[i].dkl_nblk  > 0)
                     {
-                        Partition part = new Partition
+                        var part = new Partition
                         {
                             Size     = (ulong)dkl.dkl_map[i].dkl_nblk * DK_LABEL_SIZE,
-                            Length   = (ulong)(dkl.dkl_map[i].dkl_nblk * DK_LABEL_SIZE / imagePlugin.Info.SectorSize),
+                            Length   = (ulong)((dkl.dkl_map[i].dkl_nblk * DK_LABEL_SIZE) / imagePlugin.Info.SectorSize),
                             Sequence = (ulong)i,
-                            Offset =
-                                ((ulong)dkl.dkl_map[i].dkl_cylno * sectorsPerCylinder + sectorOffset) *
-                                DK_LABEL_SIZE,
-                            Start = ((ulong)dkl.dkl_map[i].dkl_cylno * sectorsPerCylinder + sectorOffset) *
-                                    DK_LABEL_SIZE / imagePlugin.Info.SectorSize,
+                            Offset = (((ulong)dkl.dkl_map[i].dkl_cylno * sectorsPerCylinder) + sectorOffset) *
+                                     DK_LABEL_SIZE,
+                            Start = ((((ulong)dkl.dkl_map[i].dkl_cylno * sectorsPerCylinder) + sectorOffset) *
+                                     DK_LABEL_SIZE) / imagePlugin.Info.SectorSize,
                             Type   = "SunOS partition",
                             Scheme = Name
                         };
-                        if(part.Start < imagePlugin.Info.Sectors && part.End <= imagePlugin.Info.Sectors)
+
+                        if(part.Start < imagePlugin.Info.Sectors &&
+                           part.End   <= imagePlugin.Info.Sectors)
                             partitions.Add(part);
                     }
             }
@@ -177,138 +202,163 @@ namespace Aaru.Partitions
                 ulong sectorsPerCylinder = (ulong)(dkl8.dkl_nsect * dkl8.dkl_nhead);
 
                 AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_asciilabel = \"{0}\"",
-                                          StringHandlers.CToString(dkl8.dkl_asciilabel));
+                                           StringHandlers.CToString(dkl8.dkl_asciilabel));
+
                 AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_vtoc.v_version = {0}", dkl8.dkl_vtoc.v_version);
+
                 AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_vtoc.v_volume = \"{0}\"",
-                                          StringHandlers.CToString(dkl8.dkl_vtoc.v_volume));
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_vtoc.v_nparts = {0}",      dkl8.dkl_vtoc.v_nparts);
+                                           StringHandlers.CToString(dkl8.dkl_vtoc.v_volume));
+
+                AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_vtoc.v_nparts = {0}", dkl8.dkl_vtoc.v_nparts);
                 AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_vtoc.v_sanity = 0x{0:X8}", dkl8.dkl_vtoc.v_sanity);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_write_reinstruct = {0}",   dkl8.dkl_write_reinstruct);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_read_reinstruct = {0}",    dkl8.dkl_read_reinstruct);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_rpm = {0}",                dkl8.dkl_rpm);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_pcyl = {0}",               dkl8.dkl_pcyl);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_apc = {0}",                dkl8.dkl_apc);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_obs1 = {0}",               dkl8.dkl_obs1);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_obs2 = {0}",               dkl8.dkl_obs2);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_intrlv = {0}",             dkl8.dkl_intrlv);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_ncyl = {0}",               dkl8.dkl_ncyl);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_acyl = {0}",               dkl8.dkl_acyl);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_nhead = {0}",              dkl8.dkl_nhead);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_nsect = {0}",              dkl8.dkl_nsect);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_obs3 = {0}",               dkl8.dkl_obs3);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_obs4 = {0}",               dkl8.dkl_obs4);
+                AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_write_reinstruct = {0}", dkl8.dkl_write_reinstruct);
+                AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_read_reinstruct = {0}", dkl8.dkl_read_reinstruct);
+                AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_rpm = {0}", dkl8.dkl_rpm);
+                AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_pcyl = {0}", dkl8.dkl_pcyl);
+                AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_apc = {0}", dkl8.dkl_apc);
+                AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_obs1 = {0}", dkl8.dkl_obs1);
+                AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_obs2 = {0}", dkl8.dkl_obs2);
+                AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_intrlv = {0}", dkl8.dkl_intrlv);
+                AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_ncyl = {0}", dkl8.dkl_ncyl);
+                AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_acyl = {0}", dkl8.dkl_acyl);
+                AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_nhead = {0}", dkl8.dkl_nhead);
+                AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_nsect = {0}", dkl8.dkl_nsect);
+                AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_obs3 = {0}", dkl8.dkl_obs3);
+                AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_obs4 = {0}", dkl8.dkl_obs4);
+
                 for(int i = 0; i < NDKMAP; i++)
                 {
                     AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_map[{0}].dkl_cylno = {1}", i,
-                                              dkl8.dkl_map[i].dkl_cylno);
+                                               dkl8.dkl_map[i].dkl_cylno);
+
                     AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_map[{0}].dkl_nblk = {1}", i,
-                                              dkl8.dkl_map[i].dkl_nblk);
+                                               dkl8.dkl_map[i].dkl_nblk);
+
                     AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_vtoc.v_part[{0}].p_tag = {1} ({2})", i,
-                                              dkl8.dkl_vtoc.v_part[i].p_tag, (ushort)dkl8.dkl_vtoc.v_part[i].p_tag);
+                                               dkl8.dkl_vtoc.v_part[i].p_tag, (ushort)dkl8.dkl_vtoc.v_part[i].p_tag);
+
                     AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_vtoc.v_part[{0}].p_flag = {1} ({2})", i,
-                                              dkl8.dkl_vtoc.v_part[i].p_flag, (ushort)dkl8.dkl_vtoc.v_part[i].p_flag);
+                                               dkl8.dkl_vtoc.v_part[i].p_flag, (ushort)dkl8.dkl_vtoc.v_part[i].p_flag);
+
                     AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_vtoc.v_timestamp[{0}] = {1}", i,
-                                              DateHandlers.UnixToDateTime(dkl8.dkl_vtoc.v_timestamp[i]));
+                                               DateHandlers.UnixToDateTime(dkl8.dkl_vtoc.v_timestamp[i]));
                 }
 
                 AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_magic = 0x{0:X4}", dkl8.dkl_magic);
                 AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_cksum = 0x{0:X4}", dkl8.dkl_cksum);
-                AaruConsole.DebugWriteLine("Sun plugin", "sectorsPerCylinder = {0}",  sectorsPerCylinder);
+                AaruConsole.DebugWriteLine("Sun plugin", "sectorsPerCylinder = {0}", sectorsPerCylinder);
 
-                if(dkl8.dkl_vtoc.v_nparts > NDKMAP) return false;
+                if(dkl8.dkl_vtoc.v_nparts > NDKMAP)
+                    return false;
 
                 for(int i = 0; i < dkl8.dkl_vtoc.v_nparts; i++)
-                    if(dkl8.dkl_map[i].dkl_nblk      > 0 && dkl8.dkl_vtoc.v_part[i].p_tag != SunTag.SunEmpty &&
+                    if(dkl8.dkl_map[i].dkl_nblk      > 0                &&
+                       dkl8.dkl_vtoc.v_part[i].p_tag != SunTag.SunEmpty &&
                        dkl8.dkl_vtoc.v_part[i].p_tag != SunTag.SunWholeDisk)
                     {
-                        Partition part = new Partition
+                        var part = new Partition
                         {
                             Description = SunFlagsToString(dkl8.dkl_vtoc.v_part[i].p_flag),
                             Size        = (ulong)dkl8.dkl_map[i].dkl_nblk * DK_LABEL_SIZE,
                             Length =
-                                (ulong)(dkl8.dkl_map[i].dkl_nblk * DK_LABEL_SIZE / imagePlugin.Info.SectorSize),
+                                (ulong)((dkl8.dkl_map[i].dkl_nblk * DK_LABEL_SIZE) / imagePlugin.Info.SectorSize),
                             Sequence = (ulong)i,
-                            Offset =
-                                ((ulong)dkl8.dkl_map[i].dkl_cylno * sectorsPerCylinder + sectorOffset) *
-                                DK_LABEL_SIZE,
-                            Start = ((ulong)dkl8.dkl_map[i].dkl_cylno * sectorsPerCylinder + sectorOffset) *
-                                    DK_LABEL_SIZE / imagePlugin.Info.SectorSize,
-                            Type   = SunIdToString(dkl8.dkl_vtoc.v_part[i].p_tag),
-                            Scheme = Name
+                            Offset = (((ulong)dkl8.dkl_map[i].dkl_cylno * sectorsPerCylinder) + sectorOffset) *
+                                     DK_LABEL_SIZE,
+                            Start = ((((ulong)dkl8.dkl_map[i].dkl_cylno * sectorsPerCylinder) + sectorOffset) *
+                                     DK_LABEL_SIZE) / imagePlugin.Info.SectorSize,
+                            Type = SunIdToString(dkl8.dkl_vtoc.v_part[i].p_tag), Scheme = Name
                         };
+
                         if(dkl8.dkl_vtoc.v_timestamp[i] != 0)
                             part.Description +=
                                 $"\nPartition timestamped on {DateHandlers.UnixToDateTime(dkl8.dkl_vtoc.v_timestamp[i])}";
 
-                        if(part.Start < imagePlugin.Info.Sectors && part.End <= imagePlugin.Info.Sectors)
+                        if(part.Start < imagePlugin.Info.Sectors &&
+                           part.End   <= imagePlugin.Info.Sectors)
                             partitions.Add(part);
                     }
             }
             else
             {
                 AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_vtoc.v_sanity = 0x{0:X8}", dkl16.dkl_vtoc.v_sanity);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_vtoc.v_version = {0}",     dkl16.dkl_vtoc.v_version);
+                AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_vtoc.v_version = {0}", dkl16.dkl_vtoc.v_version);
+
                 AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_vtoc.v_volume = \"{0}\"",
-                                          StringHandlers.CToString(dkl16.dkl_vtoc.v_volume));
+                                           StringHandlers.CToString(dkl16.dkl_vtoc.v_volume));
+
                 AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_vtoc.v_sectorsz = {0}", dkl16.dkl_vtoc.v_sectorsz);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_vtoc.v_nparts = {0}",   dkl16.dkl_vtoc.v_nparts);
+                AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_vtoc.v_nparts = {0}", dkl16.dkl_vtoc.v_nparts);
+
                 AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_vtoc.v_asciilabel = \"{0}\"",
-                                          StringHandlers.CToString(dkl16.dkl_vtoc.v_asciilabel));
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_pcyl = {0}",             dkl16.dkl_pcyl);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_ncyl = {0}",             dkl16.dkl_ncyl);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_acyl = {0}",             dkl16.dkl_acyl);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_bcyl = {0}",             dkl16.dkl_bcyl);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_nhead = {0}",            dkl16.dkl_nhead);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_nsect = {0}",            dkl16.dkl_nsect);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_intrlv = {0}",           dkl16.dkl_intrlv);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_skew = {0}",             dkl16.dkl_skew);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_apc = {0}",              dkl16.dkl_apc);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_rpm = {0}",              dkl16.dkl_rpm);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_write_reinstruct = {0}", dkl16.dkl_write_reinstruct);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_read_reinstruct = {0}",  dkl16.dkl_read_reinstruct);
+                                           StringHandlers.CToString(dkl16.dkl_vtoc.v_asciilabel));
+
+                AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_pcyl = {0}", dkl16.dkl_pcyl);
+                AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_ncyl = {0}", dkl16.dkl_ncyl);
+                AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_acyl = {0}", dkl16.dkl_acyl);
+                AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_bcyl = {0}", dkl16.dkl_bcyl);
+                AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_nhead = {0}", dkl16.dkl_nhead);
+                AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_nsect = {0}", dkl16.dkl_nsect);
+                AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_intrlv = {0}", dkl16.dkl_intrlv);
+                AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_skew = {0}", dkl16.dkl_skew);
+                AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_apc = {0}", dkl16.dkl_apc);
+                AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_rpm = {0}", dkl16.dkl_rpm);
+
+                AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_write_reinstruct = {0}",
+                                           dkl16.dkl_write_reinstruct);
+
+                AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_read_reinstruct = {0}", dkl16.dkl_read_reinstruct);
+
                 for(int i = 0; i < NDKMAP16; i++)
                 {
                     AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_vtoc.v_part[{0}].p_start = {1}", i,
-                                              dkl16.dkl_vtoc.v_part[i].p_start);
+                                               dkl16.dkl_vtoc.v_part[i].p_start);
+
                     AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_vtoc.v_part[{0}].p_size = {1}", i,
-                                              dkl16.dkl_vtoc.v_part[i].p_size);
+                                               dkl16.dkl_vtoc.v_part[i].p_size);
+
                     AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_vtoc.v_part[{0}].p_tag = {1} ({2})", i,
-                                              dkl16.dkl_vtoc.v_part[i].p_tag, (ushort)dkl16.dkl_vtoc.v_part[i].p_tag);
+                                               dkl16.dkl_vtoc.v_part[i].p_tag, (ushort)dkl16.dkl_vtoc.v_part[i].p_tag);
+
                     AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_vtoc.v_part[{0}].p_flag = {1} ({2})", i,
-                                              dkl16.dkl_vtoc.v_part[i].p_flag, (ushort)dkl16.dkl_vtoc.v_part[i].p_flag);
+                                               dkl16.dkl_vtoc.v_part[i].p_flag,
+                                               (ushort)dkl16.dkl_vtoc.v_part[i].p_flag);
+
                     AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_vtoc.v_timestamp[{0}] = {1}", i,
-                                              DateHandlers.UnixToDateTime(dkl16.dkl_vtoc.v_timestamp[i]));
+                                               DateHandlers.UnixToDateTime(dkl16.dkl_vtoc.v_timestamp[i]));
                 }
 
                 AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_magic = 0x{0:X4}", dkl16.dkl_magic);
                 AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_cksum = 0x{0:X4}", dkl16.dkl_cksum);
 
-                if(dkl16.dkl_vtoc.v_nparts > NDKMAP16) return false;
+                if(dkl16.dkl_vtoc.v_nparts > NDKMAP16)
+                    return false;
 
                 for(int i = 0; i < dkl16.dkl_vtoc.v_nparts; i++)
-                    if(dkl16.dkl_vtoc.v_part[i].p_size > 0 && dkl16.dkl_vtoc.v_part[i].p_tag != SunTag.SunEmpty &&
+                    if(dkl16.dkl_vtoc.v_part[i].p_size > 0                &&
+                       dkl16.dkl_vtoc.v_part[i].p_tag  != SunTag.SunEmpty &&
                        dkl16.dkl_vtoc.v_part[i].p_tag  != SunTag.SunWholeDisk)
                     {
-                        Partition part = new Partition
+                        var part = new Partition
                         {
                             Description = SunFlagsToString(dkl16.dkl_vtoc.v_part[i].p_flag),
                             Size        = (ulong)dkl16.dkl_vtoc.v_part[i].p_size * dkl16.dkl_vtoc.v_sectorsz,
-                            Length =
-                                (ulong)(dkl16.dkl_vtoc.v_part[i].p_size * dkl16.dkl_vtoc.v_sectorsz /
-                                        imagePlugin.Info.SectorSize),
+                            Length = (ulong)((dkl16.dkl_vtoc.v_part[i].p_size * dkl16.dkl_vtoc.v_sectorsz) /
+                                             imagePlugin.Info.SectorSize),
                             Sequence = (ulong)i,
-                            Offset =
-                                ((ulong)dkl16.dkl_vtoc.v_part[i].p_start + sectorOffset) *
-                                dkl16.dkl_vtoc.v_sectorsz,
-                            Start = ((ulong)dkl16.dkl_vtoc.v_part[i].p_start + sectorOffset) *
-                                    dkl16.dkl_vtoc.v_sectorsz / imagePlugin.Info.SectorSize,
-                            Type   = SunIdToString(dkl16.dkl_vtoc.v_part[i].p_tag),
-                            Scheme = Name
+                            Offset = ((ulong)dkl16.dkl_vtoc.v_part[i].p_start + sectorOffset) *
+                                     dkl16.dkl_vtoc.v_sectorsz,
+                            Start = (((ulong)dkl16.dkl_vtoc.v_part[i].p_start + sectorOffset) *
+                                     dkl16.dkl_vtoc.v_sectorsz) / imagePlugin.Info.SectorSize,
+                            Type = SunIdToString(dkl16.dkl_vtoc.v_part[i].p_tag), Scheme = Name
                         };
+
                         if(dkl16.dkl_vtoc.v_timestamp[i] != 0)
                             part.Description +=
                                 $"\nPartition timestamped on {DateHandlers.UnixToDateTime(dkl16.dkl_vtoc.v_timestamp[i])}";
-                        if(part.Start < imagePlugin.Info.Sectors && part.End <= imagePlugin.Info.Sectors)
+
+                        if(part.Start < imagePlugin.Info.Sectors &&
+                           part.End   <= imagePlugin.Info.Sectors)
                             partitions.Add(part);
                     }
             }
@@ -320,6 +370,7 @@ namespace Aaru.Partitions
         {
             AaruConsole.DebugWriteLine("Sun plugin", "Swapping dk_label");
             label = (dk_label)Marshal.SwapStructureMembersEndian(label);
+
             for(int i = 0; i < label.dkl_map.Length; i++)
                 label.dkl_map[i] = (dk_map)Marshal.SwapStructureMembersEndian(label.dkl_map[i]);
 
@@ -330,11 +381,13 @@ namespace Aaru.Partitions
         {
             AaruConsole.DebugWriteLine("Sun plugin", "Swapping dk_label8");
             label = (dk_label8)Marshal.SwapStructureMembersEndian(label);
+
             for(int i = 0; i < label.dkl_map.Length; i++)
                 label.dkl_map[i] = (dk_map)Marshal.SwapStructureMembersEndian(label.dkl_map[i]);
 
             for(int i = 0; i < label.dkl_vtoc.v_bootinfo.Length; i++)
                 label.dkl_vtoc.v_bootinfo[i] = Swapping.Swap(label.dkl_vtoc.v_bootinfo[i]);
+
             for(int i = 0; i < label.dkl_vtoc.v_part.Length; i++)
             {
                 label.dkl_vtoc.v_part[i].p_flag = (SunFlags)Swapping.Swap((ushort)label.dkl_vtoc.v_part[i].p_flag);
@@ -343,6 +396,7 @@ namespace Aaru.Partitions
 
             for(int i = 0; i < label.dkl_vtoc.v_timestamp.Length; i++)
                 label.dkl_vtoc.v_timestamp[i] = Swapping.Swap(label.dkl_vtoc.v_timestamp[i]);
+
             for(int i = 0; i < label.dkl_vtoc.v_reserved.Length; i++)
                 label.dkl_vtoc.v_reserved[i] = Swapping.Swap(label.dkl_vtoc.v_reserved[i]);
 
@@ -353,8 +407,10 @@ namespace Aaru.Partitions
         {
             AaruConsole.DebugWriteLine("Sun plugin", "Swapping dk_label16");
             label = (dk_label16)Marshal.SwapStructureMembersEndian(label);
+
             for(int i = 0; i < label.dkl_vtoc.v_bootinfo.Length; i++)
                 label.dkl_vtoc.v_bootinfo[i] = Swapping.Swap(label.dkl_vtoc.v_bootinfo[i]);
+
             for(int i = 0; i < label.dkl_vtoc.v_part.Length; i++)
             {
                 label.dkl_vtoc.v_part[i].p_flag  = (SunFlags)Swapping.Swap((ushort)label.dkl_vtoc.v_part[i].p_flag);
@@ -365,6 +421,7 @@ namespace Aaru.Partitions
 
             for(int i = 0; i < label.dkl_vtoc.v_timestamp.Length; i++)
                 label.dkl_vtoc.v_timestamp[i] = Swapping.Swap(label.dkl_vtoc.v_timestamp[i]);
+
             for(int i = 0; i < label.dkl_vtoc.v_reserved.Length; i++)
                 label.dkl_vtoc.v_reserved[i] = Swapping.Swap(label.dkl_vtoc.v_reserved[i]);
 
@@ -373,9 +430,14 @@ namespace Aaru.Partitions
 
         static string SunFlagsToString(SunFlags flags)
         {
-            StringBuilder sb = new StringBuilder();
-            if(flags.HasFlag(SunFlags.NoMount)) sb.AppendLine("Unmountable");
-            if(flags.HasFlag(SunFlags.ReadOnly)) sb.AppendLine("Read-only");
+            var sb = new StringBuilder();
+
+            if(flags.HasFlag(SunFlags.NoMount))
+                sb.AppendLine("Unmountable");
+
+            if(flags.HasFlag(SunFlags.ReadOnly))
+                sb.AppendLine("Read-only");
+
             return sb.ToString();
         }
 
@@ -413,37 +475,20 @@ namespace Aaru.Partitions
 
         enum SunTag : ushort
         {
-            SunEmpty       = 0x0000,
-            SunBoot        = 0x0001,
-            SunRoot        = 0x0002,
-            SunSwap        = 0x0003,
-            SunUsr         = 0x0004,
-            SunWholeDisk   = 0x0005,
-            SunStand       = 0x0006,
-            SunVar         = 0x0007,
-            SunHome        = 0x0008,
-            SunAlt         = 0x0009,
-            SunCache       = 0x000A,
-            SunReserved    = 0x000B,
-            VxVmPublic     = 0x000E,
-            VxVmPrivate    = 0x000F,
-            LinuxSwap      = 0x0082,
-            Linux          = 0x0083,
-            LVM            = 0x008E,
-            LinuxRaid      = 0x00FD,
-            NetBSD         = 0x00FF,
-            FreeBSD_Swap   = 0x0901,
-            FreeBSD_UFS    = 0x0902,
-            FreeBSD_Vinum  = 0x0903,
-            FreeBSD_ZFS    = 0x0904,
-            FreeBSD_NANDFS = 0x0905
+            SunEmpty      = 0x0000, SunBoot      = 0x0001, SunRoot        = 0x0002,
+            SunSwap       = 0x0003, SunUsr       = 0x0004, SunWholeDisk   = 0x0005,
+            SunStand      = 0x0006, SunVar       = 0x0007, SunHome        = 0x0008,
+            SunAlt        = 0x0009, SunCache     = 0x000A, SunReserved    = 0x000B,
+            VxVmPublic    = 0x000E, VxVmPrivate  = 0x000F, LinuxSwap      = 0x0082,
+            Linux         = 0x0083, LVM          = 0x008E, LinuxRaid      = 0x00FD,
+            NetBSD        = 0x00FF, FreeBSD_Swap = 0x0901, FreeBSD_UFS    = 0x0902,
+            FreeBSD_Vinum = 0x0903, FreeBSD_ZFS  = 0x0904, FreeBSD_NANDFS = 0x0905
         }
 
         [Flags]
         enum SunFlags : ushort
         {
-            NoMount  = 0x0001,
-            ReadOnly = 0x0010
+            NoMount = 0x0001, ReadOnly = 0x0010
         }
 
         /// <summary>SunOS logical partitions</summary>
@@ -451,9 +496,9 @@ namespace Aaru.Partitions
         struct dk_map
         {
             /// <summary>starting cylinder</summary>
-            public int dkl_cylno;
+            public readonly int dkl_cylno;
             /// <summary>number of blocks</summary>
-            public int dkl_nblk;
+            public readonly int dkl_nblk;
         }
 
         /// <summary>SunOS disk label</summary>
@@ -462,41 +507,41 @@ namespace Aaru.Partitions
         {
             /// <summary>Informative string</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = LEN_DKL_ASCII)]
-            public byte[] dkl_asciilabel;
+            public readonly byte[] dkl_asciilabel;
             /// <summary>Padding</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = LEN_DKL_PAD)]
-            public byte[] dkl_pad;
+            public readonly byte[] dkl_pad;
             /// <summary>rotations per minute</summary>
-            public ushort dkl_rpm;
+            public readonly ushort dkl_rpm;
             /// <summary># physical cylinders</summary>
-            public ushort dkl_pcyl;
+            public readonly ushort dkl_pcyl;
             /// <summary>alternates per cylinder</summary>
-            public ushort dkl_apc;
+            public readonly ushort dkl_apc;
             /// <summary>size of gap 1</summary>
-            public ushort dkl_gap1;
+            public readonly ushort dkl_gap1;
             /// <summary>size of gap 2</summary>
-            public ushort dkl_gap2;
+            public readonly ushort dkl_gap2;
             /// <summary>interleave factor</summary>
-            public ushort dkl_intrlv;
+            public readonly ushort dkl_intrlv;
             /// <summary># of data cylinders</summary>
-            public ushort dkl_ncyl;
+            public readonly ushort dkl_ncyl;
             /// <summary># of alternate cylinders</summary>
-            public ushort dkl_acyl;
+            public readonly ushort dkl_acyl;
             /// <summary># of heads in this partition</summary>
-            public ushort dkl_nhead;
+            public readonly ushort dkl_nhead;
             /// <summary># of 512 byte sectors per track</summary>
-            public ushort dkl_nsect;
+            public readonly ushort dkl_nsect;
             /// <summary>identifies proper label location</summary>
-            public ushort dkl_bhead;
+            public readonly ushort dkl_bhead;
             /// <summary>physical partition #</summary>
-            public ushort dkl_ppart;
+            public readonly ushort dkl_ppart;
             /// <summary>Logical partitions</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = NDKMAP)]
-            public dk_map[] dkl_map;
+            public readonly dk_map[] dkl_map;
             /// <summary>identifies this label format</summary>
-            public ushort dkl_magic;
+            public readonly ushort dkl_magic;
             /// <summary>xor checksum of sector</summary>
-            public ushort dkl_cksum;
+            public readonly ushort dkl_cksum;
         }
 
         /// <summary>Solaris logical partition for small disk label</summary>
@@ -527,28 +572,28 @@ namespace Aaru.Partitions
         struct dk_vtoc8
         {
             /// <summary> layout version</summary>
-            public uint v_version;
+            public readonly uint v_version;
             /// <summary> volume name</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = LEN_DKL_VVOL)]
-            public byte[] v_volume;
+            public readonly byte[] v_volume;
             /// <summary> number of partitions </summary>
-            public ushort v_nparts;
+            public readonly ushort v_nparts;
             /// <summary> partition hdrs, sec 2</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = NDKMAP)]
-            public dk_map2[] v_part;
+            public readonly dk_map2[] v_part;
             /// <summary>Alignment</summary>
-            public ushort padding;
+            public readonly ushort padding;
             /// <summary> info needed by mboot</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
-            public uint[] v_bootinfo;
+            public readonly uint[] v_bootinfo;
             /// <summary> to verify vtoc sanity</summary>
-            public uint v_sanity;
+            public readonly uint v_sanity;
             /// <summary> free space</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 10)]
-            public uint[] v_reserved;
+            public readonly uint[] v_reserved;
             /// <summary> partition timestamp</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = NDKMAP)]
-            public int[] v_timestamp;
+            public readonly int[] v_timestamp;
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
@@ -556,30 +601,30 @@ namespace Aaru.Partitions
         {
             /// <summary>info needed by mboot</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
-            public uint[] v_bootinfo;
+            public readonly uint[] v_bootinfo;
             /// <summary>to verify vtoc sanity</summary>
-            public uint v_sanity;
+            public readonly uint v_sanity;
             /// <summary>layout version</summary>
-            public uint v_version;
+            public readonly uint v_version;
             /// <summary>volume name</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = LEN_DKL_VVOL)]
-            public byte[] v_volume;
+            public readonly byte[] v_volume;
             /// <summary>sector size in bytes</summary>
-            public ushort v_sectorsz;
+            public readonly ushort v_sectorsz;
             /// <summary>number of partitions</summary>
-            public ushort v_nparts;
+            public readonly ushort v_nparts;
             /// <summary>free space</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 10)]
-            public uint[] v_reserved;
+            public readonly uint[] v_reserved;
             /// <summary>partition headers</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = NDKMAP16)]
-            public dkl_partition[] v_part;
+            public readonly dkl_partition[] v_part;
             /// <summary>partition timestamp</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = NDKMAP16)]
-            public int[] v_timestamp;
+            public readonly int[] v_timestamp;
             /// <summary>for compatibility</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = LEN_DKL_ASCII)]
-            public byte[] v_asciilabel;
+            public readonly byte[] v_asciilabel;
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
@@ -587,88 +632,88 @@ namespace Aaru.Partitions
         {
             /// <summary>for compatibility</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = LEN_DKL_ASCII)]
-            public byte[] dkl_asciilabel;
+            public readonly byte[] dkl_asciilabel;
             /// <summary>vtoc inclusions from AT&amp;T SVr4</summary>
-            public dk_vtoc8 dkl_vtoc;
+            public readonly dk_vtoc8 dkl_vtoc;
             /// <summary># sectors to skip, writes</summary>
-            public ushort dkl_write_reinstruct;
+            public readonly ushort dkl_write_reinstruct;
             /// <summary># sectors to skip, reads</summary>
-            public ushort dkl_read_reinstruct;
+            public readonly ushort dkl_read_reinstruct;
             /// <summary>unused part of 512 bytes</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = LEN_DKL_PAD8)]
-            public byte[] dkl_pad;
+            public readonly byte[] dkl_pad;
             /// <summary>rotations per minute</summary>
-            public ushort dkl_rpm;
+            public readonly ushort dkl_rpm;
             /// <summary># physical cylinders</summary>
-            public ushort dkl_pcyl;
+            public readonly ushort dkl_pcyl;
             /// <summary>alternates per cylinder</summary>
-            public ushort dkl_apc;
+            public readonly ushort dkl_apc;
             /// <summary>obsolete</summary>
-            public ushort dkl_obs1;
+            public readonly ushort dkl_obs1;
             /// <summary>obsolete</summary>
-            public ushort dkl_obs2;
+            public readonly ushort dkl_obs2;
             /// <summary>interleave factor</summary>
-            public ushort dkl_intrlv;
+            public readonly ushort dkl_intrlv;
             /// <summary># of data cylinders</summary>
-            public ushort dkl_ncyl;
+            public readonly ushort dkl_ncyl;
             /// <summary># of alternate cylinders</summary>
-            public ushort dkl_acyl;
+            public readonly ushort dkl_acyl;
             /// <summary># of heads in this partition</summary>
-            public ushort dkl_nhead;
+            public readonly ushort dkl_nhead;
             /// <summary># of 512 byte sectors per track</summary>
-            public ushort dkl_nsect;
+            public readonly ushort dkl_nsect;
             /// <summary>obsolete</summary>
-            public ushort dkl_obs3;
+            public readonly ushort dkl_obs3;
             /// <summary>obsolete</summary>
-            public ushort dkl_obs4;
+            public readonly ushort dkl_obs4;
             /// <summary>logical partition headers</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = NDKMAP)]
-            public dk_map[] dkl_map;
+            public readonly dk_map[] dkl_map;
             /// <summary>identifies this label format</summary>
-            public ushort dkl_magic;
+            public readonly ushort dkl_magic;
             /// <summary>xor checksum of sector</summary>
-            public ushort dkl_cksum;
+            public readonly ushort dkl_cksum;
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct dk_label16
         {
             /// <summary>vtoc inclusions from AT&amp;T SVr4</summary>
-            public dk_vtoc16 dkl_vtoc;
+            public readonly dk_vtoc16 dkl_vtoc;
             /// <summary># of physical cylinders</summary>
-            public uint dkl_pcyl;
+            public readonly uint dkl_pcyl;
             /// <summary># of data cylinders</summary>
-            public uint dkl_ncyl;
+            public readonly uint dkl_ncyl;
             /// <summary># of alternate cylinders</summary>
-            public ushort dkl_acyl;
+            public readonly ushort dkl_acyl;
             /// <summary>cyl offset (for fixed head area)</summary>
-            public ushort dkl_bcyl;
+            public readonly ushort dkl_bcyl;
             /// <summary># of heads</summary>
-            public uint dkl_nhead;
+            public readonly uint dkl_nhead;
             /// <summary># of data sectors per track</summary>
-            public uint dkl_nsect;
+            public readonly uint dkl_nsect;
             /// <summary>interleave factor</summary>
-            public ushort dkl_intrlv;
+            public readonly ushort dkl_intrlv;
             /// <summary>skew factor</summary>
-            public ushort dkl_skew;
+            public readonly ushort dkl_skew;
             /// <summary>alternates per cyl (SCSI only)  </summary>
-            public ushort dkl_apc;
+            public readonly ushort dkl_apc;
             /// <summary>revolutions per minute</summary>
-            public ushort dkl_rpm;
+            public readonly ushort dkl_rpm;
             /// <summary># sectors to skip, writes</summary>
-            public ushort dkl_write_reinstruct;
+            public readonly ushort dkl_write_reinstruct;
             /// <summary># sectors to skip, reads </summary>
-            public ushort dkl_read_reinstruct;
+            public readonly ushort dkl_read_reinstruct;
             /// <summary>for compatible expansion</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
-            public ushort[] dkl_extra;
+            public readonly ushort[] dkl_extra;
             /// <summary>unused part of 512 bytes</summary>
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = LEN_DKL_PAD16)]
-            public byte[] dkl_pad;
+            public readonly byte[] dkl_pad;
             /// <summary>identifies this label format</summary>
-            public ushort dkl_magic;
+            public readonly ushort dkl_magic;
             /// <summary>xor checksum of sector</summary>
-            public ushort dkl_cksum;
+            public readonly ushort dkl_cksum;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Partitions/UNIX.cs b/Aaru.Partitions/UNIX.cs
index a72d22a7e..f27bf1739 100644
--- a/Aaru.Partitions/UNIX.cs
+++ b/Aaru.Partitions/UNIX.cs
@@ -47,91 +47,43 @@ namespace Aaru.Partitions
         {
             new Partition
             {
-                Description = null,
-                Name        = "/",
-                Type        = "data",
-                Length      = 9600,
-                Start       = 0,
-                Size        = 4915200,
-                Offset      = 0,
-                Sequence    = 0
+                Description = null, Name = "/", Type       = "data", Length = 9600,
+                Start       = 0, Size    = 4915200, Offset = 0, Sequence    = 0
             },
             new Partition
             {
-                Description = null,
-                Name        = "/usr",
-                Type        = "data",
-                Length      = 20000,
-                Start       = 9600,
-                Size        = 10240000,
-                Offset      = 4915200,
-                Sequence    = 1
+                Description = null, Name = "/usr", Type     = "data", Length    = 20000,
+                Start       = 9600, Size = 10240000, Offset = 4915200, Sequence = 1
             },
             new Partition
             {
-                Description = null,
-                Name        = "error log",
-                Type        = "errorlog",
-                Length      = 200,
-                Start       = 29600,
-                Size        = 102400,
-                Offset      = 15155200,
-                Sequence    = 2
+                Description = null, Name  = "error log", Type = "errorlog", Length = 200,
+                Start       = 29600, Size = 102400, Offset    = 15155200, Sequence = 2
             },
             new Partition
             {
-                Description = null,
-                Name        = "swap",
-                Type        = "swap",
-                Length      = 6000,
-                Start       = 29800,
-                Size        = 3072000,
-                Offset      = 15257600,
-                Sequence    = 2
+                Description = null, Name  = "swap", Type    = "swap", Length     = 6000,
+                Start       = 29800, Size = 3072000, Offset = 15257600, Sequence = 2
             },
             new Partition
             {
-                Description = null,
-                Name        = "user",
-                Type        = "data",
-                Length      = 363376,
-                Start       = 35800,
-                Size        = 186048512,
-                Offset      = 18329600,
-                Sequence    = 3
+                Description = null, Name  = "user", Type      = "data", Length     = 363376,
+                Start       = 35800, Size = 186048512, Offset = 18329600, Sequence = 3
             },
             new Partition
             {
-                Description = null,
-                Name        = "user",
-                Type        = "data",
-                Length      = 181688,
-                Start       = 35800,
-                Size        = 93024256,
-                Offset      = 18329600,
-                Sequence    = 4
+                Description = null, Name  = "user", Type     = "data", Length     = 181688,
+                Start       = 35800, Size = 93024256, Offset = 18329600, Sequence = 4
             },
             new Partition
             {
-                Description = null,
-                Name        = "user",
-                Type        = "data",
-                Length      = 181688,
-                Start       = 217488,
-                Size        = 93024256,
-                Offset      = 111353856,
-                Sequence    = 5
+                Description = null, Name   = "user", Type     = "data", Length      = 181688,
+                Start       = 217488, Size = 93024256, Offset = 111353856, Sequence = 5
             },
             new Partition
             {
-                Description = null,
-                Name        = "maintenance area",
-                Type        = "maintenance",
-                Length      = 1000,
-                Start       = 399176,
-                Size        = 512000,
-                Offset      = 204378112,
-                Sequence    = 8
+                Description = null, Name   = "maintenance area", Type = "maintenance", Length = 1000,
+                Start       = 399176, Size = 512000, Offset           = 204378112, Sequence   = 8
             }
         };
 
@@ -139,69 +91,33 @@ namespace Aaru.Partitions
         {
             new Partition
             {
-                Description = null,
-                Name        = "/",
-                Type        = "data",
-                Length      = 9600,
-                Start       = 0,
-                Size        = 4915200,
-                Offset      = 0,
-                Sequence    = 0
+                Description = null, Name = "/", Type       = "data", Length = 9600,
+                Start       = 0, Size    = 4915200, Offset = 0, Sequence    = 0
             },
             new Partition
             {
-                Description = null,
-                Name        = "/usr",
-                Type        = "data",
-                Length      = 20000,
-                Start       = 9600,
-                Size        = 10240000,
-                Offset      = 4915200,
-                Sequence    = 1
+                Description = null, Name = "/usr", Type     = "data", Length    = 20000,
+                Start       = 9600, Size = 10240000, Offset = 4915200, Sequence = 1
             },
             new Partition
             {
-                Description = null,
-                Name        = "error log",
-                Type        = "errorlog",
-                Length      = 200,
-                Start       = 29600,
-                Size        = 102400,
-                Offset      = 15155200,
-                Sequence    = 2
+                Description = null, Name  = "error log", Type = "errorlog", Length = 200,
+                Start       = 29600, Size = 102400, Offset    = 15155200, Sequence = 2
             },
             new Partition
             {
-                Description = null,
-                Name        = "swap",
-                Type        = "swap",
-                Length      = 6000,
-                Start       = 29800,
-                Size        = 3072000,
-                Offset      = 15257600,
-                Sequence    = 2
+                Description = null, Name  = "swap", Type    = "swap", Length     = 6000,
+                Start       = 29800, Size = 3072000, Offset = 15257600, Sequence = 2
             },
             new Partition
             {
-                Description = null,
-                Name        = "user",
-                Type        = "data",
-                Length      = 200412,
-                Start       = 35800,
-                Size        = 102610944,
-                Offset      = 18329600,
-                Sequence    = 3
+                Description = null, Name  = "user", Type      = "data", Length     = 200412,
+                Start       = 35800, Size = 102610944, Offset = 18329600, Sequence = 3
             },
             new Partition
             {
-                Description = null,
-                Name        = "maintenance area",
-                Type        = "maintenance",
-                Length      = 1000,
-                Start       = 236212,
-                Size        = 512000,
-                Offset      = 120940544,
-                Sequence    = 8
+                Description = null, Name   = "maintenance area", Type = "maintenance", Length = 1000,
+                Start       = 236212, Size = 512000, Offset           = 120940544, Sequence   = 8
             }
         };
 
@@ -209,102 +125,48 @@ namespace Aaru.Partitions
         {
             new Partition
             {
-                Description = null,
-                Name        = "/",
-                Type        = "data",
-                Length      = 9600,
-                Start       = 0,
-                Size        = 4915200,
-                Offset      = 0,
-                Sequence    = 0
+                Description = null, Name = "/", Type       = "data", Length = 9600,
+                Start       = 0, Size    = 4915200, Offset = 0, Sequence    = 0
             },
             new Partition
             {
-                Description = null,
-                Name        = "/usr",
-                Type        = "data",
-                Length      = 20000,
-                Start       = 9600,
-                Size        = 10240000,
-                Offset      = 4915200,
-                Sequence    = 1
+                Description = null, Name = "/usr", Type     = "data", Length    = 20000,
+                Start       = 9600, Size = 10240000, Offset = 4915200, Sequence = 1
             },
             new Partition
             {
-                Description = null,
-                Name        = "error log",
-                Type        = "errorlog",
-                Length      = 200,
-                Start       = 29600,
-                Size        = 102400,
-                Offset      = 15155200,
-                Sequence    = 2
+                Description = null, Name  = "error log", Type = "errorlog", Length = 200,
+                Start       = 29600, Size = 102400, Offset    = 15155200, Sequence = 2
             },
             new Partition
             {
-                Description = null,
-                Name        = "swap",
-                Type        = "swap",
-                Length      = 6000,
-                Start       = 29800,
-                Size        = 3072000,
-                Offset      = 15257600,
-                Sequence    = 2
+                Description = null, Name  = "swap", Type    = "swap", Length     = 6000,
+                Start       = 29800, Size = 3072000, Offset = 15257600, Sequence = 2
             },
             new Partition
             {
-                Description = null,
-                Name        = "user",
-                Type        = "data",
-                Length      = 854272,
-                Start       = 35800,
-                Size        = 437387264,
-                Offset      = 18329600,
-                Sequence    = 3
+                Description = null, Name  = "user", Type      = "data", Length     = 854272,
+                Start       = 35800, Size = 437387264, Offset = 18329600, Sequence = 3
             },
             new Partition
             {
-                Description = null,
-                Name        = "user",
-                Type        = "data",
-                Length      = 181688,
-                Start       = 35800,
-                Size        = 93024256,
-                Offset      = 18329600,
-                Sequence    = 4
+                Description = null, Name  = "user", Type     = "data", Length     = 181688,
+                Start       = 35800, Size = 93024256, Offset = 18329600, Sequence = 4
             },
             new Partition
             {
-                Description = null,
-                Name        = "user",
-                Type        = "data",
-                Length      = 181688,
-                Start       = 217488,
-                Size        = 93024256,
-                Offset      = 111353856,
-                Sequence    = 5
+                Description = null, Name   = "user", Type     = "data", Length      = 181688,
+                Start       = 217488, Size = 93024256, Offset = 111353856, Sequence = 5
             },
             new Partition
             {
-                Description = null,
-                Name        = "user",
-                Type        = "data",
-                Length      = 490896,
-                Start       = 399176,
-                Size        = 251338752,
-                Offset      = 204378112,
-                Sequence    = 6
+                Description = null, Name   = "user", Type      = "data", Length      = 490896,
+                Start       = 399176, Size = 251338752, Offset = 204378112, Sequence = 6
             },
             new Partition
             {
-                Description = null,
-                Name        = "maintenance area",
-                Type        = "maintenance",
-                Length      = 1000,
-                Start       = 890072,
-                Size        = 512000,
-                Offset      = 455716864,
-                Sequence    = 8
+                Description = null, Name   = "maintenance area", Type = "maintenance", Length = 1000,
+                Start       = 890072, Size = 512000, Offset           = 455716864, Sequence   = 8
             }
         };
 
@@ -312,80 +174,38 @@ namespace Aaru.Partitions
         {
             new Partition
             {
-                Description = null,
-                Name        = "/",
-                Type        = "data",
-                Length      = 9000,
-                Start       = 0,
-                Size        = 4608000,
-                Offset      = 0,
-                Sequence    = 0
+                Description = null, Name = "/", Type       = "data", Length = 9000,
+                Start       = 0, Size    = 4608000, Offset = 0, Sequence    = 0
             },
             new Partition
             {
-                Description = null,
-                Name        = "error log",
-                Type        = "errorlog",
-                Length      = 200,
-                Start       = 9000,
-                Size        = 102400,
-                Offset      = 4608000,
-                Sequence    = 2
+                Description = null, Name = "error log", Type = "errorlog", Length = 200,
+                Start       = 9000, Size = 102400, Offset    = 4608000, Sequence  = 2
             },
             new Partition
             {
-                Description = null,
-                Name        = "swap",
-                Type        = "swap",
-                Length      = 4000,
-                Start       = 9200,
-                Size        = 2048000,
-                Offset      = 4710400,
-                Sequence    = 2
+                Description = null, Name = "swap", Type    = "swap", Length    = 4000,
+                Start       = 9200, Size = 2048000, Offset = 4710400, Sequence = 2
             },
             new Partition
             {
-                Description = null,
-                Name        = "user",
-                Type        = "data",
-                Length      = 37600,
-                Start       = 13200,
-                Size        = 19251200,
-                Offset      = 6758400,
-                Sequence    = 3
+                Description = null, Name  = "user", Type     = "data", Length    = 37600,
+                Start       = 13200, Size = 19251200, Offset = 6758400, Sequence = 3
             },
             new Partition
             {
-                Description = null,
-                Name        = "user",
-                Type        = "data",
-                Length      = 12000,
-                Start       = 13200,
-                Size        = 6144000,
-                Offset      = 6758400,
-                Sequence    = 4
+                Description = null, Name  = "user", Type    = "data", Length    = 12000,
+                Start       = 13200, Size = 6144000, Offset = 6758400, Sequence = 4
             },
             new Partition
             {
-                Description = null,
-                Name        = "user",
-                Type        = "data",
-                Length      = 25600,
-                Start       = 25200,
-                Size        = 13107200,
-                Offset      = 6758400,
-                Sequence    = 5
+                Description = null, Name  = "user", Type     = "data", Length    = 25600,
+                Start       = 25200, Size = 13107200, Offset = 6758400, Sequence = 5
             },
             new Partition
             {
-                Description = null,
-                Name        = "maintenance area",
-                Type        = "maintenance",
-                Length      = 102,
-                Start       = 890072,
-                Size        = 50800,
-                Offset      = 26009600,
-                Sequence    = 8
+                Description = null, Name   = "maintenance area", Type = "maintenance", Length = 102,
+                Start       = 890072, Size = 50800, Offset            = 26009600, Sequence    = 8
             }
         };
 
@@ -393,58 +213,28 @@ namespace Aaru.Partitions
         {
             new Partition
             {
-                Description = null,
-                Name        = "/",
-                Type        = "data",
-                Length      = 9700,
-                Start       = 0,
-                Size        = 4966400,
-                Offset      = 0,
-                Sequence    = 0
+                Description = null, Name = "/", Type       = "data", Length = 9700,
+                Start       = 0, Size    = 4966400, Offset = 0, Sequence    = 0
             },
             new Partition
             {
-                Description = null,
-                Name        = "error log",
-                Type        = "errorlog",
-                Length      = 100,
-                Start       = 9700,
-                Size        = 51200,
-                Offset      = 4966400,
-                Sequence    = 5
+                Description = null, Name = "error log", Type = "errorlog", Length = 100,
+                Start       = 9700, Size = 51200, Offset     = 4966400, Sequence  = 5
             },
             new Partition
             {
-                Description = null,
-                Name        = "swap",
-                Type        = "swap",
-                Length      = 3000,
-                Start       = 9800,
-                Size        = 1536000,
-                Offset      = 5017600,
-                Sequence    = 5
+                Description = null, Name = "swap", Type    = "swap", Length    = 3000,
+                Start       = 9800, Size = 1536000, Offset = 5017600, Sequence = 5
             },
             new Partition
             {
-                Description = null,
-                Name        = "/usr",
-                Type        = "data",
-                Length      = 28728,
-                Start       = 12800,
-                Size        = 14708736,
-                Offset      = 6553600,
-                Sequence    = 6
+                Description = null, Name  = "/usr", Type     = "data", Length    = 28728,
+                Start       = 12800, Size = 14708736, Offset = 6553600, Sequence = 6
             },
             new Partition
             {
-                Description = null,
-                Name        = "maintenance area",
-                Type        = "maintenance",
-                Length      = 32,
-                Start       = 41528,
-                Size        = 16384,
-                Offset      = 21262336,
-                Sequence    = 8
+                Description = null, Name  = "maintenance area", Type = "maintenance", Length = 32,
+                Start       = 41528, Size = 16384, Offset            = 21262336, Sequence    = 8
             }
         };
 
@@ -452,69 +242,33 @@ namespace Aaru.Partitions
         {
             new Partition
             {
-                Description = null,
-                Name        = "/",
-                Type        = "data",
-                Length      = 9700,
-                Start       = 0,
-                Size        = 4966400,
-                Offset      = 0,
-                Sequence    = 0
+                Description = null, Name = "/", Type       = "data", Length = 9700,
+                Start       = 0, Size    = 4966400, Offset = 0, Sequence    = 0
             },
             new Partition
             {
-                Description = null,
-                Name        = "/usr",
-                Type        = "data",
-                Length      = 17300,
-                Start       = 9700,
-                Size        = 102400,
-                Offset      = 4966400,
-                Sequence    = 1
+                Description = null, Name = "/usr", Type   = "data", Length    = 17300,
+                Start       = 9700, Size = 102400, Offset = 4966400, Sequence = 1
             },
             new Partition
             {
-                Description = null,
-                Name        = "error log",
-                Type        = "errorlog",
-                Length      = 100,
-                Start       = 27000,
-                Size        = 51200,
-                Offset      = 13824000,
-                Sequence    = 2
+                Description = null, Name  = "error log", Type = "errorlog", Length = 100,
+                Start       = 27000, Size = 51200, Offset     = 13824000, Sequence = 2
             },
             new Partition
             {
-                Description = null,
-                Name        = "swap",
-                Type        = "swap",
-                Length      = 3000,
-                Start       = 27100,
-                Size        = 1536000,
-                Offset      = 13875200,
-                Sequence    = 2
+                Description = null, Name  = "swap", Type    = "swap", Length     = 3000,
+                Start       = 27100, Size = 1536000, Offset = 13875200, Sequence = 2
             },
             new Partition
             {
-                Description = null,
-                Name        = "user",
-                Type        = "data",
-                Length      = 53072,
-                Start       = 30100,
-                Size        = 27172864,
-                Offset      = 15411200,
-                Sequence    = 3
+                Description = null, Name  = "user", Type     = "data", Length     = 53072,
+                Start       = 30100, Size = 27172864, Offset = 15411200, Sequence = 3
             },
             new Partition
             {
-                Description = null,
-                Name        = "maintenance area",
-                Type        = "maintenance",
-                Length      = 32,
-                Start       = 83172,
-                Size        = 16384,
-                Offset      = 42584064,
-                Sequence    = 8
+                Description = null, Name  = "maintenance area", Type = "maintenance", Length = 32,
+                Start       = 83172, Size = 16384, Offset            = 42584064, Sequence    = 8
             }
         };
 
@@ -522,58 +276,28 @@ namespace Aaru.Partitions
         {
             new Partition
             {
-                Description = null,
-                Name        = "/",
-                Type        = "data",
-                Length      = 7460,
-                Start       = 0,
-                Size        = 4608000,
-                Offset      = 0,
-                Sequence    = 0
+                Description = null, Name = "/", Type       = "data", Length = 7460,
+                Start       = 0, Size    = 4608000, Offset = 0, Sequence    = 0
             },
             new Partition
             {
-                Description = null,
-                Name        = "error log",
-                Type        = "errorlog",
-                Length      = 40,
-                Start       = 0,
-                Size        = 20480,
-                Offset      = 0,
-                Sequence    = 0
+                Description = null, Name = "error log", Type = "errorlog", Length = 40,
+                Start       = 0, Size    = 20480, Offset     = 0, Sequence        = 0
             },
             new Partition
             {
-                Description = null,
-                Name        = "swap",
-                Type        = "swap",
-                Length      = 2200,
-                Start       = 0,
-                Size        = 1126400,
-                Offset      = 0,
-                Sequence    = 0
+                Description = null, Name = "swap", Type    = "swap", Length = 2200,
+                Start       = 0, Size    = 1126400, Offset = 0, Sequence    = 0
             },
             new Partition
             {
-                Description = null,
-                Name        = "/usr",
-                Type        = "data",
-                Length      = 11868,
-                Start       = 9700,
-                Size        = 6076416,
-                Offset      = 6758400,
-                Sequence    = 4
+                Description = null, Name = "/usr", Type    = "data", Length    = 11868,
+                Start       = 9700, Size = 6076416, Offset = 6758400, Sequence = 4
             },
             new Partition
             {
-                Description = null,
-                Name        = "maintenance area",
-                Type        = "maintenance",
-                Length      = 32,
-                Start       = 21568,
-                Size        = 16384,
-                Offset      = 11042816,
-                Sequence    = 8
+                Description = null, Name  = "maintenance area", Type = "maintenance", Length = 32,
+                Start       = 21568, Size = 16384, Offset            = 11042816, Sequence    = 8
             }
         };
 
@@ -581,69 +305,33 @@ namespace Aaru.Partitions
         {
             new Partition
             {
-                Description = null,
-                Name        = "/",
-                Type        = "data",
-                Length      = 9700,
-                Start       = 0,
-                Size        = 4966400,
-                Offset      = 0,
-                Sequence    = 0
+                Description = null, Name = "/", Type       = "data", Length = 9700,
+                Start       = 0, Size    = 4966400, Offset = 0, Sequence    = 0
             },
             new Partition
             {
-                Description = null,
-                Name        = "/usr",
-                Type        = "data",
-                Length      = 17300,
-                Start       = 9700,
-                Size        = 8857600,
-                Offset      = 4966400,
-                Sequence    = 1
+                Description = null, Name = "/usr", Type    = "data", Length    = 17300,
+                Start       = 9700, Size = 8857600, Offset = 4966400, Sequence = 1
             },
             new Partition
             {
-                Description = null,
-                Name        = "error log",
-                Type        = "errorlog",
-                Length      = 100,
-                Start       = 27000,
-                Size        = 51200,
-                Offset      = 13824000,
-                Sequence    = 2
+                Description = null, Name  = "error log", Type = "errorlog", Length = 100,
+                Start       = 27000, Size = 51200, Offset     = 13824000, Sequence = 2
             },
             new Partition
             {
-                Description = null,
-                Name        = "swap",
-                Type        = "swap",
-                Length      = 3000,
-                Start       = 27100,
-                Size        = 1536000,
-                Offset      = 13875200,
-                Sequence    = 2
+                Description = null, Name  = "swap", Type    = "swap", Length     = 3000,
+                Start       = 27100, Size = 1536000, Offset = 13875200, Sequence = 2
             },
             new Partition
             {
-                Description = null,
-                Name        = "user",
-                Type        = "data",
-                Length      = 30348,
-                Start       = 30100,
-                Size        = 15538176,
-                Offset      = 15411200,
-                Sequence    = 3
+                Description = null, Name  = "user", Type     = "data", Length     = 30348,
+                Start       = 30100, Size = 15538176, Offset = 15411200, Sequence = 3
             },
             new Partition
             {
-                Description = null,
-                Name        = "maintenance area",
-                Type        = "maintenance",
-                Length      = 32,
-                Start       = 60448,
-                Size        = 16384,
-                Offset      = 30949376,
-                Sequence    = 8
+                Description = null, Name  = "maintenance area", Type = "maintenance", Length = 32,
+                Start       = 60448, Size = 16384, Offset            = 30949376, Sequence    = 8
             }
         };
 
@@ -651,69 +339,33 @@ namespace Aaru.Partitions
         {
             new Partition
             {
-                Description = null,
-                Name        = "/",
-                Type        = "data",
-                Length      = 9700,
-                Start       = 0,
-                Size        = 4966400,
-                Offset      = 0,
-                Sequence    = 0
+                Description = null, Name = "/", Type       = "data", Length = 9700,
+                Start       = 0, Size    = 4966400, Offset = 0, Sequence    = 0
             },
             new Partition
             {
-                Description = null,
-                Name        = "/usr",
-                Type        = "data",
-                Length      = 17300,
-                Start       = 9700,
-                Size        = 8857600,
-                Offset      = 4966400,
-                Sequence    = 1
+                Description = null, Name = "/usr", Type    = "data", Length    = 17300,
+                Start       = 9700, Size = 8857600, Offset = 4966400, Sequence = 1
             },
             new Partition
             {
-                Description = null,
-                Name        = "error log",
-                Type        = "errorlog",
-                Length      = 100,
-                Start       = 27000,
-                Size        = 51200,
-                Offset      = 13824000,
-                Sequence    = 2
+                Description = null, Name  = "error log", Type = "errorlog", Length = 100,
+                Start       = 27000, Size = 51200, Offset     = 13824000, Sequence = 2
             },
             new Partition
             {
-                Description = null,
-                Name        = "swap",
-                Type        = "swap",
-                Length      = 3000,
-                Start       = 27100,
-                Size        = 1536000,
-                Offset      = 13875200,
-                Sequence    = 2
+                Description = null, Name  = "swap", Type    = "swap", Length     = 3000,
+                Start       = 27100, Size = 1536000, Offset = 13875200, Sequence = 2
             },
             new Partition
             {
-                Description = null,
-                Name        = "user",
-                Type        = "data",
-                Length      = 108540,
-                Start       = 30100,
-                Size        = 55572480,
-                Offset      = 15411200,
-                Sequence    = 3
+                Description = null, Name  = "user", Type     = "data", Length     = 108540,
+                Start       = 30100, Size = 55572480, Offset = 15411200, Sequence = 3
             },
             new Partition
             {
-                Description = null,
-                Name        = "maintenance area",
-                Type        = "maintenance",
-                Length      = 32,
-                Start       = 138640,
-                Size        = 16384,
-                Offset      = 70983680,
-                Sequence    = 8
+                Description = null, Name   = "maintenance area", Type = "maintenance", Length = 32,
+                Start       = 138640, Size = 16384, Offset            = 70983680, Sequence    = 8
             }
         };
 
@@ -721,69 +373,33 @@ namespace Aaru.Partitions
         {
             new Partition
             {
-                Description = null,
-                Name        = "/",
-                Type        = "data",
-                Length      = 9700,
-                Start       = 0,
-                Size        = 4966400,
-                Offset      = 0,
-                Sequence    = 0
+                Description = null, Name = "/", Type       = "data", Length = 9700,
+                Start       = 0, Size    = 4966400, Offset = 0, Sequence    = 0
             },
             new Partition
             {
-                Description = null,
-                Name        = "/usr",
-                Type        = "data",
-                Length      = 17300,
-                Start       = 9700,
-                Size        = 8857600,
-                Offset      = 4966400,
-                Sequence    = 1
+                Description = null, Name = "/usr", Type    = "data", Length    = 17300,
+                Start       = 9700, Size = 8857600, Offset = 4966400, Sequence = 1
             },
             new Partition
             {
-                Description = null,
-                Name        = "error log",
-                Type        = "errorlog",
-                Length      = 100,
-                Start       = 27000,
-                Size        = 51200,
-                Offset      = 13824000,
-                Sequence    = 2
+                Description = null, Name  = "error log", Type = "errorlog", Length = 100,
+                Start       = 27000, Size = 51200, Offset     = 13824000, Sequence = 2
             },
             new Partition
             {
-                Description = null,
-                Name        = "swap",
-                Type        = "swap",
-                Length      = 3000,
-                Start       = 27100,
-                Size        = 1536000,
-                Offset      = 13875200,
-                Sequence    = 2
+                Description = null, Name  = "swap", Type    = "swap", Length     = 3000,
+                Start       = 27100, Size = 1536000, Offset = 13875200, Sequence = 2
             },
             new Partition
             {
-                Description = null,
-                Name        = "user",
-                Type        = "data",
-                Length      = 281068,
-                Start       = 30100,
-                Size        = 143906816,
-                Offset      = 15411200,
-                Sequence    = 3
+                Description = null, Name  = "user", Type      = "data", Length     = 281068,
+                Start       = 30100, Size = 143906816, Offset = 15411200, Sequence = 3
             },
             new Partition
             {
-                Description = null,
-                Name        = "maintenance area",
-                Type        = "maintenance",
-                Length      = 32,
-                Start       = 311168,
-                Size        = 16384,
-                Offset      = 159318016,
-                Sequence    = 8
+                Description = null, Name   = "maintenance area", Type = "maintenance", Length = 32,
+                Start       = 311168, Size = 16384, Offset            = 159318016, Sequence   = 8
             }
         };
 
@@ -791,58 +407,28 @@ namespace Aaru.Partitions
         {
             new Partition
             {
-                Description = null,
-                Name        = "/",
-                Type        = "data",
-                Length      = 7920,
-                Start       = 0,
-                Size        = 4055040,
-                Offset      = 0,
-                Sequence    = 0
+                Description = null, Name = "/", Type       = "data", Length = 7920,
+                Start       = 0, Size    = 4055040, Offset = 0, Sequence    = 0
             },
             new Partition
             {
-                Description = null,
-                Name        = "error log",
-                Type        = "errorlog",
-                Length      = 100,
-                Start       = 7920,
-                Size        = 51200,
-                Offset      = 4055040,
-                Sequence    = 1
+                Description = null, Name = "error log", Type = "errorlog", Length = 100,
+                Start       = 7920, Size = 51200, Offset     = 4055040, Sequence  = 1
             },
             new Partition
             {
-                Description = null,
-                Name        = "swap",
-                Type        = "swap",
-                Length      = 2936,
-                Start       = 8020,
-                Size        = 1503232,
-                Offset      = 4106240,
-                Sequence    = 1
+                Description = null, Name = "swap", Type    = "swap", Length    = 2936,
+                Start       = 8020, Size = 1503232, Offset = 4106240, Sequence = 1
             },
             new Partition
             {
-                Description = null,
-                Name        = "/usr",
-                Type        = "data",
-                Length      = 16126,
-                Start       = 10956,
-                Size        = 8256512,
-                Offset      = 5609472,
-                Sequence    = 2
+                Description = null, Name  = "/usr", Type    = "data", Length    = 16126,
+                Start       = 10956, Size = 8256512, Offset = 5609472, Sequence = 2
             },
             new Partition
             {
-                Description = null,
-                Name        = "bad sector file",
-                Type        = "bad",
-                Length      = 44,
-                Start       = 27082,
-                Size        = 22528,
-                Offset      = 13865984,
-                Sequence    = 8
+                Description = null, Name  = "bad sector file", Type = "bad", Length      = 44,
+                Start       = 27082, Size = 22528, Offset           = 13865984, Sequence = 8
             }
         };
 
@@ -850,58 +436,28 @@ namespace Aaru.Partitions
         {
             new Partition
             {
-                Description = null,
-                Name        = "/",
-                Type        = "data",
-                Length      = 7920,
-                Start       = 0,
-                Size        = 4055040,
-                Offset      = 0,
-                Sequence    = 0
+                Description = null, Name = "/", Type       = "data", Length = 7920,
+                Start       = 0, Size    = 4055040, Offset = 0, Sequence    = 0
             },
             new Partition
             {
-                Description = null,
-                Name        = "error log",
-                Type        = "errorlog",
-                Length      = 100,
-                Start       = 7920,
-                Size        = 51200,
-                Offset      = 4055040,
-                Sequence    = 1
+                Description = null, Name = "error log", Type = "errorlog", Length = 100,
+                Start       = 7920, Size = 51200, Offset     = 4055040, Sequence  = 1
             },
             new Partition
             {
-                Description = null,
-                Name        = "swap",
-                Type        = "swap",
-                Length      = 2936,
-                Start       = 8020,
-                Size        = 1503232,
-                Offset      = 4106240,
-                Sequence    = 1
+                Description = null, Name = "swap", Type    = "swap", Length    = 2936,
+                Start       = 8020, Size = 1503232, Offset = 4106240, Sequence = 1
             },
             new Partition
             {
-                Description = null,
-                Name        = "/usr",
-                Type        = "data",
-                Length      = 42790,
-                Start       = 10956,
-                Size        = 21908480,
-                Offset      = 5609472,
-                Sequence    = 3
+                Description = null, Name  = "/usr", Type     = "data", Length    = 42790,
+                Start       = 10956, Size = 21908480, Offset = 5609472, Sequence = 3
             },
             new Partition
             {
-                Description = null,
-                Name        = "bad sector file",
-                Type        = "bad",
-                Length      = 44,
-                Start       = 53746,
-                Size        = 22528,
-                Offset      = 27517952,
-                Sequence    = 8
+                Description = null, Name  = "bad sector file", Type = "bad", Length      = 44,
+                Start       = 53746, Size = 22528, Offset           = 27517952, Sequence = 8
             }
         };
 
@@ -909,102 +465,48 @@ namespace Aaru.Partitions
         {
             new Partition
             {
-                Description = null,
-                Name        = "/",
-                Type        = "data",
-                Length      = 9120,
-                Start       = 0,
-                Size        = 4669440,
-                Offset      = 0,
-                Sequence    = 0
+                Description = null, Name = "/", Type       = "data", Length = 9120,
+                Start       = 0, Size    = 4669440, Offset = 0, Sequence    = 0
             },
             new Partition
             {
-                Description = null,
-                Name        = "error log",
-                Type        = "errorlog",
-                Length      = 200,
-                Start       = 9120,
-                Size        = 102400,
-                Offset      = 4669440,
-                Sequence    = 1
+                Description = null, Name = "error log", Type = "errorlog", Length = 200,
+                Start       = 9120, Size = 102400, Offset    = 4669440, Sequence  = 1
             },
             new Partition
             {
-                Description = null,
-                Name        = "swap",
-                Type        = "swap",
-                Length      = 5400,
-                Start       = 9320,
-                Size        = 2764800,
-                Offset      = 2764800,
-                Sequence    = 1
+                Description = null, Name = "swap", Type    = "swap", Length    = 5400,
+                Start       = 9320, Size = 2764800, Offset = 2764800, Sequence = 1
             },
             new Partition
             {
-                Description = null,
-                Name        = "/usr",
-                Type        = "data",
-                Length      = 5600,
-                Start       = 29120,
-                Size        = 2867200,
-                Offset      = 14909440,
-                Sequence    = 2
+                Description = null, Name  = "/usr", Type    = "data", Length     = 5600,
+                Start       = 29120, Size = 2867200, Offset = 14909440, Sequence = 2
             },
             new Partition
             {
-                Description = null,
-                Name        = "user",
-                Type        = "data",
-                Length      = 96896,
-                Start       = 34720,
-                Size        = 49610752,
-                Offset      = 17776640,
-                Sequence    = 3
+                Description = null, Name  = "user", Type     = "data", Length     = 96896,
+                Start       = 34720, Size = 49610752, Offset = 17776640, Sequence = 3
             },
             new Partition
             {
-                Description = null,
-                Name        = "user",
-                Type        = "data",
-                Length      = 32160,
-                Start       = 34720,
-                Size        = 16465920,
-                Offset      = 17776640,
-                Sequence    = 4
+                Description = null, Name  = "user", Type     = "data", Length     = 32160,
+                Start       = 34720, Size = 16465920, Offset = 17776640, Sequence = 4
             },
             new Partition
             {
-                Description = null,
-                Name        = "user",
-                Type        = "data",
-                Length      = 32160,
-                Start       = 66880,
-                Size        = 16465920,
-                Offset      = 34242560,
-                Sequence    = 5
+                Description = null, Name  = "user", Type     = "data", Length     = 32160,
+                Start       = 66880, Size = 16465920, Offset = 34242560, Sequence = 5
             },
             new Partition
             {
-                Description = null,
-                Name        = "user",
-                Type        = "data",
-                Length      = 32576,
-                Start       = 99040,
-                Size        = 16678912,
-                Offset      = 50708480,
-                Sequence    = 6
+                Description = null, Name  = "user", Type     = "data", Length     = 32576,
+                Start       = 99040, Size = 16678912, Offset = 50708480, Sequence = 6
             },
             new Partition
             {
-                Description = null,
-                Name        = "bad sector file",
-                Type        = "bad",
-                Length      = 64,
-                Start       = 131616,
-                Size        = 32768,
-                Offset      = 67387392,
-                Sequence    = 8
+                Description = null, Name   = "bad sector file", Type = "bad", Length      = 64,
+                Start       = 131616, Size = 32768, Offset           = 67387392, Sequence = 8
             }
         };
 
@@ -1012,102 +514,48 @@ namespace Aaru.Partitions
         {
             new Partition
             {
-                Description = null,
-                Name        = "/",
-                Type        = "data",
-                Length      = 10336,
-                Start       = 0,
-                Size        = 5292032,
-                Offset      = 0,
-                Sequence    = 0
+                Description = null, Name = "/", Type       = "data", Length = 10336,
+                Start       = 0, Size    = 5292032, Offset = 0, Sequence    = 0
             },
             new Partition
             {
-                Description = null,
-                Name        = "/usr",
-                Type        = "data",
-                Length      = 21280,
-                Start       = 10336,
-                Size        = 10895360,
-                Offset      = 5292032,
-                Sequence    = 1
+                Description = null, Name  = "/usr", Type     = "data", Length    = 21280,
+                Start       = 10336, Size = 10895360, Offset = 5292032, Sequence = 1
             },
             new Partition
             {
-                Description = null,
-                Name        = "error log",
-                Type        = "errorlog",
-                Length      = 200,
-                Start       = 31616,
-                Size        = 102400,
-                Offset      = 16187392,
-                Sequence    = 2
+                Description = null, Name  = "error log", Type = "errorlog", Length = 200,
+                Start       = 31616, Size = 102400, Offset    = 16187392, Sequence = 2
             },
             new Partition
             {
-                Description = null,
-                Name        = "swap",
-                Type        = "swap",
-                Length      = 6388,
-                Start       = 31816,
-                Size        = 3270656,
-                Offset      = 16289792,
-                Sequence    = 2
+                Description = null, Name  = "swap", Type    = "swap", Length     = 6388,
+                Start       = 31816, Size = 3270656, Offset = 16289792, Sequence = 2
             },
             new Partition
             {
-                Description = null,
-                Name        = "user",
-                Type        = "data",
-                Length      = 462016,
-                Start       = 38304,
-                Size        = 236552192,
-                Offset      = 19611648,
-                Sequence    = 3
+                Description = null, Name  = "user", Type      = "data", Length     = 462016,
+                Start       = 38304, Size = 236552192, Offset = 19611648, Sequence = 3
             },
             new Partition
             {
-                Description = null,
-                Name        = "user",
-                Type        = "data",
-                Length      = 153824,
-                Start       = 38304,
-                Size        = 78757888,
-                Offset      = 19611648,
-                Sequence    = 4
+                Description = null, Name  = "user", Type     = "data", Length     = 153824,
+                Start       = 38304, Size = 78757888, Offset = 19611648, Sequence = 4
             },
             new Partition
             {
-                Description = null,
-                Name        = "user",
-                Type        = "data",
-                Length      = 153824,
-                Start       = 192128,
-                Size        = 78757888,
-                Offset      = 98369536,
-                Sequence    = 5
+                Description = null, Name   = "user", Type     = "data", Length     = 153824,
+                Start       = 192128, Size = 78757888, Offset = 98369536, Sequence = 5
             },
             new Partition
             {
-                Description = null,
-                Name        = "user",
-                Type        = "data",
-                Length      = 154368,
-                Start       = 192128,
-                Size        = 79036416,
-                Offset      = 98369536,
-                Sequence    = 6
+                Description = null, Name   = "user", Type     = "data", Length     = 154368,
+                Start       = 192128, Size = 79036416, Offset = 98369536, Sequence = 6
             },
             new Partition
             {
-                Description = null,
-                Name        = "bad sector file",
-                Type        = "bad",
-                Length      = 64,
-                Start       = 421312,
-                Size        = 32768,
-                Offset      = 215711744,
-                Sequence    = 8
+                Description = null, Name   = "bad sector file", Type = "bad", Length       = 64,
+                Start       = 421312, Size = 32768, Offset           = 215711744, Sequence = 8
             }
         };
 
@@ -1115,47 +563,23 @@ namespace Aaru.Partitions
         {
             new Partition
             {
-                Description = null,
-                Name        = "/",
-                Type        = "data",
-                Length      = 8400,
-                Start       = 0,
-                Size        = 4300800,
-                Offset      = 0,
-                Sequence    = 0
+                Description = null, Name = "/", Type       = "data", Length = 8400,
+                Start       = 0, Size    = 4300800, Offset = 0, Sequence    = 0
             },
             new Partition
             {
-                Description = null,
-                Name        = "error log",
-                Type        = "errorlog",
-                Length      = 100,
-                Start       = 8400,
-                Size        = 51200,
-                Offset      = 4300800,
-                Sequence    = 1
+                Description = null, Name = "error log", Type = "errorlog", Length = 100,
+                Start       = 8400, Size = 51200, Offset     = 4300800, Sequence  = 1
             },
             new Partition
             {
-                Description = null,
-                Name        = "swap",
-                Type        = "swap",
-                Length      = 3100,
-                Start       = 8500,
-                Size        = 1587200,
-                Offset      = 4352000,
-                Sequence    = 1
+                Description = null, Name = "swap", Type    = "swap", Length    = 3100,
+                Start       = 8500, Size = 1587200, Offset = 4352000, Sequence = 1
             },
             new Partition
             {
-                Description = null,
-                Name        = "/usr",
-                Type        = "data",
-                Length      = 28400,
-                Start       = 11600,
-                Size        = 14540800,
-                Offset      = 5939200,
-                Sequence    = 2
+                Description = null, Name  = "/usr", Type     = "data", Length    = 28400,
+                Start       = 11600, Size = 14540800, Offset = 5939200, Sequence = 2
             }
         };
 
@@ -1163,47 +587,23 @@ namespace Aaru.Partitions
         {
             new Partition
             {
-                Description = null,
-                Name        = "/",
-                Type        = "data",
-                Length      = 8400,
-                Start       = 0,
-                Size        = 4300800,
-                Offset      = 0,
-                Sequence    = 0
+                Description = null, Name = "/", Type       = "data", Length = 8400,
+                Start       = 0, Size    = 4300800, Offset = 0, Sequence    = 0
             },
             new Partition
             {
-                Description = null,
-                Name        = "error log",
-                Type        = "errorlog",
-                Length      = 100,
-                Start       = 8400,
-                Size        = 51200,
-                Offset      = 4300800,
-                Sequence    = 1
+                Description = null, Name = "error log", Type = "errorlog", Length = 100,
+                Start       = 8400, Size = 51200, Offset     = 4300800, Sequence  = 1
             },
             new Partition
             {
-                Description = null,
-                Name        = "swap",
-                Type        = "swap",
-                Length      = 3100,
-                Start       = 8500,
-                Size        = 1587200,
-                Offset      = 4352000,
-                Sequence    = 1
+                Description = null, Name = "swap", Type    = "swap", Length    = 3100,
+                Start       = 8500, Size = 1587200, Offset = 4352000, Sequence = 1
             },
             new Partition
             {
-                Description = null,
-                Name        = "/usr",
-                Type        = "data",
-                Length      = 68400,
-                Start       = 11600,
-                Size        = 35020800,
-                Offset      = 5939200,
-                Sequence    = 2
+                Description = null, Name  = "/usr", Type     = "data", Length    = 68400,
+                Start       = 11600, Size = 35020800, Offset = 5939200, Sequence = 2
             }
         };
 
@@ -1211,69 +611,33 @@ namespace Aaru.Partitions
         {
             new Partition
             {
-                Description = null,
-                Name        = "/",
-                Type        = "data",
-                Length      = 9614,
-                Start       = 0,
-                Size        = 4922368,
-                Offset      = 0,
-                Sequence    = 0
+                Description = null, Name = "/", Type       = "data", Length = 9614,
+                Start       = 0, Size    = 4922368, Offset = 0, Sequence    = 0
             },
             new Partition
             {
-                Description = null,
-                Name        = "/usr",
-                Type        = "data",
-                Length      = 20064,
-                Start       = 9614,
-                Size        = 10272768,
-                Offset      = 4922368,
-                Sequence    = 1
+                Description = null, Name = "/usr", Type     = "data", Length    = 20064,
+                Start       = 9614, Size = 10272768, Offset = 4922368, Sequence = 1
             },
             new Partition
             {
-                Description = null,
-                Name        = "error log",
-                Type        = "errorlog",
-                Length      = 200,
-                Start       = 29678,
-                Size        = 102400,
-                Offset      = 15195136,
-                Sequence    = 2
+                Description = null, Name  = "error log", Type = "errorlog", Length = 200,
+                Start       = 29678, Size = 102400, Offset    = 15195136, Sequence = 2
             },
             new Partition
             {
-                Description = null,
-                Name        = "swap",
-                Type        = "swap",
-                Length      = 6070,
-                Start       = 29878,
-                Size        = 1587200,
-                Offset      = 15297536,
-                Sequence    = 2
+                Description = null, Name  = "swap", Type    = "swap", Length     = 6070,
+                Start       = 29878, Size = 1587200, Offset = 15297536, Sequence = 2
             },
             new Partition
             {
-                Description = null,
-                Name        = "user",
-                Type        = "data",
-                Length      = 135806,
-                Start       = 35948,
-                Size        = 69532672,
-                Offset      = 18405376,
-                Sequence    = 3
+                Description = null, Name  = "user", Type     = "data", Length     = 135806,
+                Start       = 35948, Size = 69532672, Offset = 18405376, Sequence = 3
             },
             new Partition
             {
-                Description = null,
-                Name        = "bad sector file",
-                Type        = "bad",
-                Length      = 44,
-                Start       = 171754,
-                Size        = 22528,
-                Offset      = 87938048,
-                Sequence    = 8
+                Description = null, Name   = "bad sector file", Type = "bad", Length      = 44,
+                Start       = 171754, Size = 22528, Offset           = 87938048, Sequence = 8
             }
         };
 
@@ -1281,91 +645,43 @@ namespace Aaru.Partitions
         {
             new Partition
             {
-                Description = null,
-                Name        = "/",
-                Type        = "data",
-                Length      = 9614,
-                Start       = 0,
-                Size        = 4922368,
-                Offset      = 0,
-                Sequence    = 0
+                Description = null, Name = "/", Type       = "data", Length = 9614,
+                Start       = 0, Size    = 4922368, Offset = 0, Sequence    = 0
             },
             new Partition
             {
-                Description = null,
-                Name        = "/usr",
-                Type        = "data",
-                Length      = 20064,
-                Start       = 9614,
-                Size        = 10272768,
-                Offset      = 4922368,
-                Sequence    = 1
+                Description = null, Name = "/usr", Type     = "data", Length    = 20064,
+                Start       = 9614, Size = 10272768, Offset = 4922368, Sequence = 1
             },
             new Partition
             {
-                Description = null,
-                Name        = "error log",
-                Type        = "errorlog",
-                Length      = 200,
-                Start       = 29678,
-                Size        = 102400,
-                Offset      = 15195136,
-                Sequence    = 2
+                Description = null, Name  = "error log", Type = "errorlog", Length = 200,
+                Start       = 29678, Size = 102400, Offset    = 15195136, Sequence = 2
             },
             new Partition
             {
-                Description = null,
-                Name        = "swap",
-                Type        = "swap",
-                Length      = 6070,
-                Start       = 29878,
-                Size        = 1587200,
-                Offset      = 15297536,
-                Sequence    = 2
+                Description = null, Name  = "swap", Type    = "swap", Length     = 6070,
+                Start       = 29878, Size = 1587200, Offset = 15297536, Sequence = 2
             },
             new Partition
             {
-                Description = null,
-                Name        = "user",
-                Type        = "data",
-                Length      = 135806,
-                Start       = 35948,
-                Size        = 69532672,
-                Offset      = 18405376,
-                Sequence    = 3
+                Description = null, Name  = "user", Type     = "data", Length     = 135806,
+                Start       = 35948, Size = 69532672, Offset = 18405376, Sequence = 3
             },
             new Partition
             {
-                Description = null,
-                Name        = "user",
-                Type        = "data",
-                Length      = 304678,
-                Start       = 35948,
-                Size        = 155995136,
-                Offset      = 18405376,
-                Sequence    = 4
+                Description = null, Name  = "user", Type      = "data", Length     = 304678,
+                Start       = 35948, Size = 155995136, Offset = 18405376, Sequence = 4
             },
             new Partition
             {
-                Description = null,
-                Name        = "user",
-                Type        = "data",
-                Length      = 166828,
-                Start       = 171798,
-                Size        = 85415936,
-                Offset      = 87960576,
-                Sequence    = 5
+                Description = null, Name   = "user", Type     = "data", Length     = 166828,
+                Start       = 171798, Size = 85415936, Offset = 87960576, Sequence = 5
             },
             new Partition
             {
-                Description = null,
-                Name        = "bad sector file",
-                Type        = "bad",
-                Length      = 44,
-                Start       = 340626,
-                Size        = 22528,
-                Offset      = 174400512,
-                Sequence    = 8
+                Description = null, Name   = "bad sector file", Type = "bad", Length       = 44,
+                Start       = 340626, Size = 22528, Offset           = 174400512, Sequence = 8
             }
         };
 
@@ -1378,70 +694,90 @@ namespace Aaru.Partitions
             partitions = new List<Partition>();
             Partition[] parts;
 
-            if(sectorOffset != 0) return false;
+            if(sectorOffset != 0)
+                return false;
 
             switch(imagePlugin.Info.MediaType)
             {
                 case MediaType.RA60:
                     parts = RA60;
+
                     break;
                 case MediaType.RA80:
                     parts = RA80;
+
                     break;
                 case MediaType.RA81:
                     parts = RA81;
+
                     break;
                 case MediaType.RC25:
                     parts = RC25;
+
                     break;
                 case MediaType.RD31:
                     parts = RD31;
+
                     break;
                 case MediaType.RD32:
                     parts = RD32;
+
                     break;
                 case MediaType.RD51:
                     parts = RD51;
+
                     break;
                 case MediaType.RD52:
                     parts = RD52;
+
                     break;
                 case MediaType.RD53:
                     parts = RD53;
+
                     break;
                 case MediaType.RD54:
                     parts = RD54;
+
                     break;
                 case MediaType.RK06:
                     parts = RK06;
+
                     break;
                 case MediaType.RK07:
                     parts = RK07;
+
                     break;
                 case MediaType.RM02:
                 case MediaType.RM03:
                     parts = RM02;
+
                     break;
                 case MediaType.RM05:
                     parts = RM05;
+
                     break;
                 case MediaType.RP02:
                     parts = RP02;
+
                     break;
                 case MediaType.RP03:
                     parts = RP03;
+
                     break;
                 case MediaType.RP04:
                 case MediaType.RP05:
                     parts = RP04;
+
                     break;
                 case MediaType.RP06:
                     parts = RP06;
+
                     break;
                 default: return false;
             }
 
-            for(int i = 0; i < parts.Length; i++) parts[i].Scheme = "";
+            for(int i = 0; i < parts.Length; i++)
+                parts[i].Scheme = "";
 
             partitions = parts.ToList();
 
diff --git a/Aaru.Partitions/VTOC.cs b/Aaru.Partitions/VTOC.cs
index 13b6bbdea..0d5580c6b 100644
--- a/Aaru.Partitions/VTOC.cs
+++ b/Aaru.Partitions/VTOC.cs
@@ -64,20 +64,29 @@ namespace Aaru.Partitions
             bool   magicFound = false;
             bool   absolute   = false;
 
-            foreach(ulong i in new ulong[] {0, 1, 8, 29}.TakeWhile(i => i + sectorOffset < imagePlugin.Info.Sectors))
+            foreach(ulong i in new ulong[]
+            {
+                0, 1, 8, 29
+            }.TakeWhile(i => i + sectorOffset < imagePlugin.Info.Sectors))
             {
                 pdsector = imagePlugin.ReadSector(i + sectorOffset);
                 magic    = BitConverter.ToUInt32(pdsector, 4);
+
                 AaruConsole.DebugWriteLine("VTOC plugin", "sanity at {0} is 0x{1:X8} (should be 0x{2:X8} or 0x{3:X8})",
-                                          i + sectorOffset, magic, PD_MAGIC, PD_CIGAM);
-                if(magic != PD_MAGIC && magic != PD_CIGAM) continue;
+                                           i + sectorOffset, magic, PD_MAGIC, PD_CIGAM);
+
+                if(magic != PD_MAGIC &&
+                   magic != PD_CIGAM)
+                    continue;
 
                 magicFound = true;
                 pdloc      = i;
+
                 break;
             }
 
-            if(!magicFound) return false;
+            if(!magicFound)
+                return false;
 
             PDInfo    pd;
             PDInfoOld pdold;
@@ -94,63 +103,69 @@ namespace Aaru.Partitions
             }
 
             AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.driveid = {0}", pd.driveid);
+
             AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.sanity = 0x{0:X8} (should be 0x{1:X8})", pd.sanity,
-                                      PD_MAGIC);
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.version = {0}",    pd.version);
+                                       PD_MAGIC);
+
+            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.version = {0}", pd.version);
             AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.serial = \"{0}\"", StringHandlers.CToString(pd.serial));
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.cyls = {0}",       pd.cyls);
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.tracks = {0}",     pd.tracks);
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.sectors = {0}",    pd.sectors);
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.bytes = {0}",      pd.bytes);
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.logicalst = {0}",  pd.logicalst);
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.errlogst = {0}",   pd.errlogst);
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.errlogsz = {0}",   pd.errlogsz);
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.mfgst = {0}",      pd.mfgst);
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.mfgsz = {0}",      pd.mfgsz);
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.defectst = {0}",   pd.defectst);
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.defectsz = {0}",   pd.defectsz);
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.relno = {0}",      pd.relno);
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.relst = {0}",      pd.relst);
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.relsz = {0}",      pd.relsz);
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.relnext = {0}",    pd.relnext);
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.allcstrt = {0}",   pdold.allcstrt);
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.allcend = {0}",    pdold.allcend);
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.vtoc_ptr = {0}",   pd.vtoc_ptr);
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.vtoc_len = {0}",   pd.vtoc_len);
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.vtoc_pad = {0}",   pd.vtoc_pad);
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.alt_ptr = {0}",    pd.alt_ptr);
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.alt_len = {0}",    pd.alt_len);
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.pcyls = {0}",      pd.pcyls);
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.ptracks = {0}",    pd.ptracks);
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.psectors = {0}",   pd.psectors);
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.pbytes = {0}",     pd.pbytes);
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.secovhd = {0}",    pd.secovhd);
+            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.cyls = {0}", pd.cyls);
+            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.tracks = {0}", pd.tracks);
+            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.sectors = {0}", pd.sectors);
+            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.bytes = {0}", pd.bytes);
+            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.logicalst = {0}", pd.logicalst);
+            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.errlogst = {0}", pd.errlogst);
+            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.errlogsz = {0}", pd.errlogsz);
+            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.mfgst = {0}", pd.mfgst);
+            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.mfgsz = {0}", pd.mfgsz);
+            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.defectst = {0}", pd.defectst);
+            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.defectsz = {0}", pd.defectsz);
+            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.relno = {0}", pd.relno);
+            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.relst = {0}", pd.relst);
+            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.relsz = {0}", pd.relsz);
+            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.relnext = {0}", pd.relnext);
+            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.allcstrt = {0}", pdold.allcstrt);
+            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.allcend = {0}", pdold.allcend);
+            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.vtoc_ptr = {0}", pd.vtoc_ptr);
+            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.vtoc_len = {0}", pd.vtoc_len);
+            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.vtoc_pad = {0}", pd.vtoc_pad);
+            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.alt_ptr = {0}", pd.alt_ptr);
+            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.alt_len = {0}", pd.alt_len);
+            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.pcyls = {0}", pd.pcyls);
+            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.ptracks = {0}", pd.ptracks);
+            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.psectors = {0}", pd.psectors);
+            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.pbytes = {0}", pd.pbytes);
+            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.secovhd = {0}", pd.secovhd);
             AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.interleave = {0}", pd.interleave);
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.skew = {0}",       pd.skew);
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.pad[0] = {0}",     pd.pad[0]);
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.pad[1] = {0}",     pd.pad[1]);
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.pad[2] = {0}",     pd.pad[2]);
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.pad[3] = {0}",     pd.pad[3]);
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.pad[4] = {0}",     pd.pad[4]);
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.pad[5] = {0}",     pd.pad[5]);
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.pad[6] = {0}",     pd.pad[6]);
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.pad[7] = {0}",     pd.pad[7]);
+            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.skew = {0}", pd.skew);
+            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.pad[0] = {0}", pd.pad[0]);
+            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.pad[1] = {0}", pd.pad[1]);
+            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.pad[2] = {0}", pd.pad[2]);
+            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.pad[3] = {0}", pd.pad[3]);
+            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.pad[4] = {0}", pd.pad[4]);
+            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.pad[5] = {0}", pd.pad[5]);
+            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.pad[6] = {0}", pd.pad[6]);
+            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.pad[7] = {0}", pd.pad[7]);
 
             magicFound = false;
-            bool    useOld     = false;
-            byte[]  vtocsector = imagePlugin.ReadSector(pdloc + sectorOffset + 1);
-            vtoc    vtoc       = new vtoc();
-            vtocold vtocOld    = new vtocold();
+            bool   useOld     = false;
+            byte[] vtocsector = imagePlugin.ReadSector(pdloc + sectorOffset + 1);
+            var    vtoc       = new vtoc();
+            var    vtocOld    = new vtocold();
             magic = BitConverter.ToUInt32(vtocsector, 0);
 
-            if(magic == VTOC_SANE || magic == VTOC_ENAS)
+            if(magic == VTOC_SANE ||
+               magic == VTOC_ENAS)
             {
                 magicFound = true;
                 AaruConsole.DebugWriteLine("VTOC plugin", "New VTOC found at {0}", pdloc + sectorOffset + 1);
-                if(magic == VTOC_SANE) vtoc = Marshal.ByteArrayToStructureLittleEndian<vtoc>(vtocsector);
+
+                if(magic == VTOC_SANE)
+                    vtoc = Marshal.ByteArrayToStructureLittleEndian<vtoc>(vtocsector);
                 else
                 {
                     vtoc = Marshal.ByteArrayToStructureBigEndian<vtoc>(vtocsector);
+
                     for(int i = 0; i < vtoc.v_part.Length; i++)
                     {
                         vtoc.v_part[i].p_tag   = (pTag)Swapping.Swap((ushort)vtoc.v_part[i].p_tag);
@@ -162,19 +177,24 @@ namespace Aaru.Partitions
                 }
             }
 
-            if(!magicFound && pd.version < XPDVERS)
+            if(!magicFound &&
+               pd.version < XPDVERS)
             {
                 magic = BitConverter.ToUInt32(vtocsector, 12);
 
-                if(magic == VTOC_SANE || magic == VTOC_ENAS)
+                if(magic == VTOC_SANE ||
+                   magic == VTOC_ENAS)
                 {
                     magicFound = true;
                     useOld     = true;
                     AaruConsole.DebugWriteLine("VTOC plugin", "Old VTOC found at {0}", pdloc + sectorOffset + 1);
-                    if(magic == VTOC_SANE) vtocOld = Marshal.ByteArrayToStructureLittleEndian<vtocold>(vtocsector);
+
+                    if(magic == VTOC_SANE)
+                        vtocOld = Marshal.ByteArrayToStructureLittleEndian<vtocold>(vtocsector);
                     else
                     {
                         vtocOld = Marshal.ByteArrayToStructureBigEndian<vtocold>(vtocsector);
+
                         for(int i = 0; i < vtocOld.v_part.Length; i++)
                         {
                             vtocOld.v_part[i].p_tag   = (pTag)Swapping.Swap((ushort)vtocOld.v_part[i].p_tag);
@@ -193,13 +213,18 @@ namespace Aaru.Partitions
                 ulong relSecPtr = pd.vtoc_ptr               / imagePlugin.Info.SectorSize;
                 uint  relSecOff = pd.vtoc_ptr               % imagePlugin.Info.SectorSize;
                 uint  secCount  = (relSecOff + pd.vtoc_len) / imagePlugin.Info.SectorSize;
-                if((relSecOff + pd.vtoc_len) % imagePlugin.Info.SectorSize > 0) secCount++;
+
+                if((relSecOff + pd.vtoc_len) % imagePlugin.Info.SectorSize > 0)
+                    secCount++;
+
                 AaruConsole.DebugWriteLine("VTOC plugin",
-                                          "Going to read {0} sectors from sector {1}, getting VTOC from byte {2}",
-                                          secCount, relSecPtr + sectorOffset, relSecOff);
+                                           "Going to read {0} sectors from sector {1}, getting VTOC from byte {2}",
+                                           secCount, relSecPtr + sectorOffset, relSecOff);
+
                 if(relSecPtr + sectorOffset + secCount >= imagePlugin.Info.Sectors)
                 {
                     AaruConsole.DebugWriteLine("VTOC plugin", "Going to read past device size, aborting...");
+
                     return false;
                 }
 
@@ -208,14 +233,18 @@ namespace Aaru.Partitions
                 Array.Copy(tmp, relSecOff, vtocsector, 0, pd.vtoc_len);
                 magic = BitConverter.ToUInt32(vtocsector, 0);
 
-                if(magic == VTOC_SANE || magic == VTOC_ENAS)
+                if(magic == VTOC_SANE ||
+                   magic == VTOC_ENAS)
                 {
                     magicFound = true;
                     AaruConsole.DebugWriteLine("VTOC plugin", "New VTOC found.");
-                    if(magic == VTOC_SANE) vtoc = Marshal.ByteArrayToStructureLittleEndian<vtoc>(vtocsector);
+
+                    if(magic == VTOC_SANE)
+                        vtoc = Marshal.ByteArrayToStructureLittleEndian<vtoc>(vtocsector);
                     else
                     {
                         vtoc = Marshal.ByteArrayToStructureBigEndian<vtoc>(vtocsector);
+
                         for(int i = 0; i < vtoc.v_part.Length; i++)
                         {
                             vtoc.v_part[i].p_tag   = (pTag)Swapping.Swap((ushort)vtoc.v_part[i].p_tag);
@@ -231,52 +260,70 @@ namespace Aaru.Partitions
             if(!magicFound)
             {
                 AaruConsole.DebugWriteLine("VTOC plugin", "Cannot find VTOC.");
+
                 return false;
             }
 
             if(useOld)
             {
                 AaruConsole.DebugWriteLine("VTOC plugin", "vtocOld.v_sanity = 0x{0:X8} (should be 0x{1:X8})",
-                                          vtocOld.v_sanity, VTOC_SANE);
+                                           vtocOld.v_sanity, VTOC_SANE);
+
                 AaruConsole.DebugWriteLine("VTOC plugin", "vtocOld.v_version = {0}", vtocOld.v_version);
+
                 AaruConsole.DebugWriteLine("VTOC plugin", "vtocOld.v_volume = \"{0}\"",
-                                          StringHandlers.CToString(vtocOld.v_volume));
+                                           StringHandlers.CToString(vtocOld.v_volume));
+
                 AaruConsole.DebugWriteLine("VTOC plugin", "vtocOld.v_sectorsz = {0}", vtocOld.v_sectorsz);
-                AaruConsole.DebugWriteLine("VTOC plugin", "vtocOld.v_nparts = {0}",   vtocOld.v_nparts);
+                AaruConsole.DebugWriteLine("VTOC plugin", "vtocOld.v_nparts = {0}", vtocOld.v_nparts);
+
                 for(int i = 0; i < V_NUMPAR; i++)
                 {
                     AaruConsole.DebugWriteLine("VTOC plugin", "vtocOld.v_part[{0}].p_tag = {1} ({2})", i,
-                                              vtocOld.v_part[i].p_tag, (ushort)vtocOld.v_part[i].p_tag);
+                                               vtocOld.v_part[i].p_tag, (ushort)vtocOld.v_part[i].p_tag);
+
                     AaruConsole.DebugWriteLine("VTOC plugin", "vtocOld.v_part[{0}].p_flag = {1} ({2})", i,
-                                              vtocOld.v_part[i].p_flag, (ushort)vtocOld.v_part[i].p_flag);
+                                               vtocOld.v_part[i].p_flag, (ushort)vtocOld.v_part[i].p_flag);
+
                     AaruConsole.DebugWriteLine("VTOC plugin", "vtocOld.v_part[{0}].p_start = {1}", i,
-                                              vtocOld.v_part[i].p_start);
+                                               vtocOld.v_part[i].p_start);
+
                     AaruConsole.DebugWriteLine("VTOC plugin", "vtocOld.v_part[{0}].p_size = {1}", i,
-                                              vtocOld.v_part[i].p_size);
+                                               vtocOld.v_part[i].p_size);
+
                     AaruConsole.DebugWriteLine("VTOC plugin", "vtocOld.timestamp[{0}] = {1}", i,
-                                              DateHandlers.UnixToDateTime(vtocOld.timestamp[i]));
+                                               DateHandlers.UnixToDateTime(vtocOld.timestamp[i]));
                 }
             }
             else
             {
-                AaruConsole.DebugWriteLine("VTOC plugin", "vtoc.v_sanity = 0x{0:X8} (should be 0x{1:X8})", vtoc.v_sanity,
-                                          VTOC_SANE);
+                AaruConsole.DebugWriteLine("VTOC plugin", "vtoc.v_sanity = 0x{0:X8} (should be 0x{1:X8})",
+                                           vtoc.v_sanity, VTOC_SANE);
+
                 AaruConsole.DebugWriteLine("VTOC plugin", "vtoc.v_version = {0}", vtoc.v_version);
+
                 AaruConsole.DebugWriteLine("VTOC plugin", "vtoc.v_volume = \"{0}\"",
-                                          StringHandlers.CToString(vtoc.v_volume));
-                AaruConsole.DebugWriteLine("VTOC plugin", "vtoc.v_pad = {0}",    vtoc.v_pad);
+                                           StringHandlers.CToString(vtoc.v_volume));
+
+                AaruConsole.DebugWriteLine("VTOC plugin", "vtoc.v_pad = {0}", vtoc.v_pad);
                 AaruConsole.DebugWriteLine("VTOC plugin", "vtoc.v_nparts = {0}", vtoc.v_nparts);
+
                 for(int i = 0; i < V_NUMPAR; i++)
                 {
                     AaruConsole.DebugWriteLine("VTOC plugin", "vtoc.v_part[{0}].p_tag = {1} ({2})", i,
-                                              vtoc.v_part[i].p_tag, (ushort)vtoc.v_part[i].p_tag);
+                                               vtoc.v_part[i].p_tag, (ushort)vtoc.v_part[i].p_tag);
+
                     AaruConsole.DebugWriteLine("VTOC plugin", "vtoc.v_part[{0}].p_flag = {1} ({2})", i,
-                                              vtoc.v_part[i].p_flag, (ushort)vtoc.v_part[i].p_flag);
+                                               vtoc.v_part[i].p_flag, (ushort)vtoc.v_part[i].p_flag);
+
                     AaruConsole.DebugWriteLine("VTOC plugin", "vtoc.v_part[{0}].p_start = {1}", i,
-                                              vtoc.v_part[i].p_start);
-                    AaruConsole.DebugWriteLine("VTOC plugin", "vtoc.v_part[{0}].p_size = {1}", i, vtoc.v_part[i].p_size);
+                                               vtoc.v_part[i].p_start);
+
+                    AaruConsole.DebugWriteLine("VTOC plugin", "vtoc.v_part[{0}].p_size = {1}", i,
+                                               vtoc.v_part[i].p_size);
+
                     AaruConsole.DebugWriteLine("VTOC plugin", "vtoc.timestamp[{0}] = {1}", i,
-                                              DateHandlers.UnixToDateTime(vtoc.timestamp[i]));
+                                               DateHandlers.UnixToDateTime(vtoc.timestamp[i]));
                 }
             }
 
@@ -300,45 +347,58 @@ namespace Aaru.Partitions
             // Check for a partition describing the VTOC whose start is the same as the start we know.
             // This means partition starts are absolute, not relative, to the VTOC position
             for(int i = 0; i < V_NUMPAR; i++)
-                if(parts[i].p_tag == pTag.V_BACKUP && (ulong)parts[i].p_start == sectorOffset)
+                if(parts[i].p_tag          == pTag.V_BACKUP &&
+                   (ulong)parts[i].p_start == sectorOffset)
                 {
                     absolute = true;
+
                     break;
                 }
 
             for(int i = 0; i < V_NUMPAR; i++)
                 if(parts[i].p_tag != pTag.V_UNUSED)
                 {
-                    Partition part = new Partition
+                    var part = new Partition
                     {
                         Start    = (ulong)(parts[i].p_start * bps) / imagePlugin.Info.SectorSize,
                         Length   = (ulong)(parts[i].p_size  * bps) / imagePlugin.Info.SectorSize,
-                        Offset   = (ulong)(parts[i].p_start * bps),
-                        Size     = (ulong)(parts[i].p_size  * bps),
+                        Offset   = (ulong)(parts[i].p_start * bps), Size = (ulong)(parts[i].p_size * bps),
                         Sequence = (ulong)i,
-                        Type     = $"UNIX: {decodeUNIXTAG(parts[i].p_tag, !useOld)}",
-                        Scheme   = Name
+                        Type     = $"UNIX: {decodeUNIXTAG(parts[i].p_tag, !useOld)}", Scheme = Name
                     };
+
                     string info = "";
 
                     // Apparently old ones are absolute :?
-                    if(!useOld && !absolute)
+                    if(!useOld &&
+                       !absolute)
                     {
                         part.Start  += sectorOffset;
                         part.Offset += sectorOffset * imagePlugin.Info.SectorSize;
                     }
 
-                    if(parts[i].p_flag.HasFlag(pFlag.V_VALID)) info += " (valid)";
-                    if(parts[i].p_flag.HasFlag(pFlag.V_UNMNT)) info += " (unmountable)";
-                    if(parts[i].p_flag.HasFlag(pFlag.V_OPEN)) info  += " (open)";
-                    if(parts[i].p_flag.HasFlag(pFlag.V_REMAP)) info += " (alternate sector mapping)";
-                    if(parts[i].p_flag.HasFlag(pFlag.V_RONLY)) info += " (read-only)";
+                    if(parts[i].p_flag.HasFlag(pFlag.V_VALID))
+                        info += " (valid)";
+
+                    if(parts[i].p_flag.HasFlag(pFlag.V_UNMNT))
+                        info += " (unmountable)";
+
+                    if(parts[i].p_flag.HasFlag(pFlag.V_OPEN))
+                        info += " (open)";
+
+                    if(parts[i].p_flag.HasFlag(pFlag.V_REMAP))
+                        info += " (alternate sector mapping)";
+
+                    if(parts[i].p_flag.HasFlag(pFlag.V_RONLY))
+                        info += " (read-only)";
+
                     if(timestamps[i] != 0)
                         info += $" created on {DateHandlers.UnixToDateTime(timestamps[i])}";
 
                     part.Description = "UNIX slice" + info + ".";
 
-                    if(part.End < imagePlugin.Info.Sectors) partitions.Add(part);
+                    if(part.End < imagePlugin.Info.Sectors)
+                        partitions.Add(part);
                 }
 
             return partitions.Count > 0;
@@ -371,106 +431,106 @@ namespace Aaru.Partitions
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct PDInfo
         {
-            public uint driveid; /*identifies the device type*/
-            public uint sanity;  /*verifies device sanity*/
-            public uint version; /*version number*/
+            public readonly uint driveid; /*identifies the device type*/
+            public readonly uint sanity;  /*verifies device sanity*/
+            public readonly uint version; /*version number*/
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 12)]
-            public byte[] serial;  /*serial number of the device*/
-            public uint cyls;      /*number of cylinders per drive*/
-            public uint tracks;    /*number tracks per cylinder*/
-            public uint sectors;   /*number sectors per track*/
-            public uint bytes;     /*number of bytes per sector*/
-            public uint logicalst; /*sector address of logical sector 0*/
-            public uint errlogst;  /*sector address of error log area*/
-            public uint errlogsz;  /*size in bytes of error log area*/
-            public uint mfgst;     /*sector address of mfg. defect info*/
-            public uint mfgsz;     /*size in bytes of mfg. defect info*/
-            public uint defectst;  /*sector address of the defect map*/
-            public uint defectsz;  /*size in bytes of defect map*/
-            public uint relno;     /*number of relocation areas*/
-            public uint relst;     /*sector address of relocation area*/
-            public uint relsz;     /*size in sectors of relocation area*/
-            public uint relnext;   /*address of next avail reloc sector*/
+            public readonly byte[] serial;  /*serial number of the device*/
+            public readonly uint cyls;      /*number of cylinders per drive*/
+            public readonly uint tracks;    /*number tracks per cylinder*/
+            public readonly uint sectors;   /*number sectors per track*/
+            public readonly uint bytes;     /*number of bytes per sector*/
+            public readonly uint logicalst; /*sector address of logical sector 0*/
+            public readonly uint errlogst;  /*sector address of error log area*/
+            public readonly uint errlogsz;  /*size in bytes of error log area*/
+            public readonly uint mfgst;     /*sector address of mfg. defect info*/
+            public readonly uint mfgsz;     /*size in bytes of mfg. defect info*/
+            public readonly uint defectst;  /*sector address of the defect map*/
+            public readonly uint defectsz;  /*size in bytes of defect map*/
+            public readonly uint relno;     /*number of relocation areas*/
+            public readonly uint relst;     /*sector address of relocation area*/
+            public readonly uint relsz;     /*size in sectors of relocation area*/
+            public readonly uint relnext;   /*address of next avail reloc sector*/
             /* the previous items are left intact from AT&T's 3b2 pdinfo.  Following
                are added for the 80386 port */
-            public uint   vtoc_ptr; /*byte offset of vtoc block*/
-            public ushort vtoc_len; /*byte length of vtoc block*/
-            public ushort vtoc_pad; /* pad for 16-bit machine alignment */
-            public uint   alt_ptr;  /*byte offset of alternates table*/
-            public ushort alt_len;  /*byte length of alternates table*/
+            public readonly uint   vtoc_ptr; /*byte offset of vtoc block*/
+            public readonly ushort vtoc_len; /*byte length of vtoc block*/
+            public readonly ushort vtoc_pad; /* pad for 16-bit machine alignment */
+            public readonly uint   alt_ptr;  /*byte offset of alternates table*/
+            public readonly ushort alt_len;  /*byte length of alternates table*/
             /* new in version 3 */
-            public uint   pcyls;      /*physical cylinders per drive*/
-            public uint   ptracks;    /*physical tracks per cylinder*/
-            public uint   psectors;   /*physical sectors per track*/
-            public uint   pbytes;     /*physical bytes per sector*/
-            public uint   secovhd;    /*sector overhead bytes per sector*/
-            public ushort interleave; /*interleave factor*/
-            public ushort skew;       /*skew factor*/
+            public readonly uint   pcyls;      /*physical cylinders per drive*/
+            public readonly uint   ptracks;    /*physical tracks per cylinder*/
+            public readonly uint   psectors;   /*physical sectors per track*/
+            public readonly uint   pbytes;     /*physical bytes per sector*/
+            public readonly uint   secovhd;    /*sector overhead bytes per sector*/
+            public readonly ushort interleave; /*interleave factor*/
+            public readonly ushort skew;       /*skew factor*/
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public uint[] pad; /*space for more stuff*/
+            public readonly uint[] pad; /*space for more stuff*/
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct PDInfoOld
         {
-            public uint driveid; /*identifies the device type*/
-            public uint sanity;  /*verifies device sanity*/
-            public uint version; /*version number*/
+            public readonly uint driveid; /*identifies the device type*/
+            public readonly uint sanity;  /*verifies device sanity*/
+            public readonly uint version; /*version number*/
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 12)]
-            public byte[] serial;  /*serial number of the device*/
-            public uint cyls;      /*number of cylinders per drive*/
-            public uint tracks;    /*number tracks per cylinder*/
-            public uint sectors;   /*number sectors per track*/
-            public uint bytes;     /*number of bytes per sector*/
-            public uint logicalst; /*sector address of logical sector 0*/
-            public uint errlogst;  /*sector address of error log area*/
-            public uint errlogsz;  /*size in bytes of error log area*/
-            public uint mfgst;     /*sector address of mfg. defect info*/
-            public uint mfgsz;     /*size in bytes of mfg. defect info*/
-            public uint defectst;  /*sector address of the defect map*/
-            public uint defectsz;  /*size in bytes of defect map*/
-            public uint relno;     /*number of relocation areas*/
-            public uint relst;     /*sector address of relocation area*/
-            public uint relsz;     /*size in sectors of relocation area*/
-            public uint relnext;   /*address of next avail reloc sector*/
-            public uint allcstrt;  /*start of the allocatable disk*/
-            public uint allcend;   /*end of allocatable disk*/
+            public readonly byte[] serial;  /*serial number of the device*/
+            public readonly uint cyls;      /*number of cylinders per drive*/
+            public readonly uint tracks;    /*number tracks per cylinder*/
+            public readonly uint sectors;   /*number sectors per track*/
+            public readonly uint bytes;     /*number of bytes per sector*/
+            public readonly uint logicalst; /*sector address of logical sector 0*/
+            public readonly uint errlogst;  /*sector address of error log area*/
+            public readonly uint errlogsz;  /*size in bytes of error log area*/
+            public readonly uint mfgst;     /*sector address of mfg. defect info*/
+            public readonly uint mfgsz;     /*size in bytes of mfg. defect info*/
+            public readonly uint defectst;  /*sector address of the defect map*/
+            public readonly uint defectsz;  /*size in bytes of defect map*/
+            public readonly uint relno;     /*number of relocation areas*/
+            public readonly uint relst;     /*sector address of relocation area*/
+            public readonly uint relsz;     /*size in sectors of relocation area*/
+            public readonly uint relnext;   /*address of next avail reloc sector*/
+            public readonly uint allcstrt;  /*start of the allocatable disk*/
+            public readonly uint allcend;   /*end of allocatable disk*/
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct vtocold
         {
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
-            public uint[] v_bootinfo; /*info needed by mboot*/
-            public uint v_sanity;     /*to verify vtoc sanity*/
-            public uint v_version;    /*layout version*/
+            public readonly uint[] v_bootinfo; /*info needed by mboot*/
+            public readonly uint v_sanity;     /*to verify vtoc sanity*/
+            public readonly uint v_version;    /*layout version*/
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public byte[] v_volume;   /*volume name*/
-            public ushort v_sectorsz; /*sector size in bytes*/
-            public ushort v_nparts;   /*number of partitions*/
+            public readonly byte[] v_volume;   /*volume name*/
+            public readonly ushort v_sectorsz; /*sector size in bytes*/
+            public readonly ushort v_nparts;   /*number of partitions*/
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 10)]
-            public uint[] v_reserved; /*free space*/
+            public readonly uint[] v_reserved; /*free space*/
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = V_NUMPAR)]
-            public partition[] v_part; /*partition headers*/
+            public readonly partition[] v_part; /*partition headers*/
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = V_NUMPAR)]
-            public int[] timestamp; /* SCSI time stamp */
+            public readonly int[] timestamp; /* SCSI time stamp */
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct vtoc
         {
-            public uint v_sanity;  /*to verify vtoc sanity*/
-            public uint v_version; /*layout version*/
+            public readonly uint v_sanity;  /*to verify vtoc sanity*/
+            public readonly uint v_version; /*layout version*/
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public byte[] v_volume; /*volume name*/
-            public ushort v_nparts; /*number of partitions*/
-            public ushort v_pad;    /*pad for 286 compiler*/
+            public readonly byte[] v_volume; /*volume name*/
+            public readonly ushort v_nparts; /*number of partitions*/
+            public readonly ushort v_pad;    /*pad for 286 compiler*/
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = 10)]
-            public uint[] v_reserved; /*free space*/
+            public readonly uint[] v_reserved; /*free space*/
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = V_NUMPAR)]
-            public partition[] v_part; /*partition headers*/
+            public readonly partition[] v_part; /*partition headers*/
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = V_NUMPAR)]
-            public int[] timestamp; /* SCSI time stamp */
+            public readonly int[] timestamp; /* SCSI time stamp */
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
@@ -533,13 +593,12 @@ namespace Aaru.Partitions
         [Flags]
         enum pFlag : ushort
         {
-            /* Partition permission flags */
-            V_UNMNT  = 0x01,  /* Unmountable partition */
-            V_RONLY  = 0x10,  /* Read only */
-            V_REMAP  = 0x20,  /* do alternate sector mapping */
-            V_OPEN   = 0x100, /* Partition open (for driver use) */
-            V_VALID  = 0x200, /* Partition is valid to use */
-            V_VOMASK = 0x300  /* mask for open and valid */
+            /* Partition permission flags */ V_UNMNT = 0x01,  /* Unmountable partition */
+            V_RONLY                                  = 0x10,  /* Read only */
+            V_REMAP                                  = 0x20,  /* do alternate sector mapping */
+            V_OPEN                                   = 0x100, /* Partition open (for driver use) */
+            V_VALID                                  = 0x200, /* Partition is valid to use */
+            V_VOMASK                                 = 0x300  /* mask for open and valid */
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Partitions/XENIX.cs b/Aaru.Partitions/XENIX.cs
index 39d5c38b8..8d54dd781 100644
--- a/Aaru.Partitions/XENIX.cs
+++ b/Aaru.Partitions/XENIX.cs
@@ -45,6 +45,7 @@ namespace Aaru.Partitions
         const ushort PAMAGIC     = 0x1234;
         const int    MAXPARTS    = 16;
         const uint   XENIX_BSIZE = 1024;
+
         // Can't find this in any documentation but everything is aligned to this offset (in sectors)
         const uint XENIX_OFFSET = 977;
 
@@ -53,43 +54,43 @@ namespace Aaru.Partitions
         public string Author => "Natalia Portillo";
 
         public bool GetInformation(IMediaImage imagePlugin, out List<CommonTypes.Partition> partitions,
-                                   ulong       sectorOffset)
+                                   ulong sectorOffset)
         {
             partitions = new List<CommonTypes.Partition>();
 
-            if(42 + sectorOffset >= imagePlugin.Info.Sectors) return false;
+            if(42 + sectorOffset >= imagePlugin.Info.Sectors)
+                return false;
 
             byte[] tblsector = imagePlugin.ReadSector(42 + sectorOffset);
 
             Partable xnxtbl = Marshal.ByteArrayToStructureLittleEndian<Partable>(tblsector);
 
             AaruConsole.DebugWriteLine("XENIX plugin", "xnxtbl.p_magic = 0x{0:X4} (should be 0x{1:X4})", xnxtbl.p_magic,
-                                      PAMAGIC);
+                                       PAMAGIC);
 
-            if(xnxtbl.p_magic != PAMAGIC) return false;
+            if(xnxtbl.p_magic != PAMAGIC)
+                return false;
 
             for(int i = 0; i < MAXPARTS; i++)
             {
-                AaruConsole.DebugWriteLine("XENIX plugin", "xnxtbl.p[{0}].p_off = {1}",  i, xnxtbl.p[i].p_off);
+                AaruConsole.DebugWriteLine("XENIX plugin", "xnxtbl.p[{0}].p_off = {1}", i, xnxtbl.p[i].p_off);
                 AaruConsole.DebugWriteLine("XENIX plugin", "xnxtbl.p[{0}].p_size = {1}", i, xnxtbl.p[i].p_size);
-                if(xnxtbl.p[i].p_size <= 0) continue;
 
-                CommonTypes.Partition part = new CommonTypes.Partition
+                if(xnxtbl.p[i].p_size <= 0)
+                    continue;
+
+                var part = new CommonTypes.Partition
                 {
-                    Start =
-                        (ulong)((xnxtbl.p[i].p_off + XENIX_OFFSET) * XENIX_BSIZE) / imagePlugin.Info.SectorSize +
-                        sectorOffset,
+                    Start = ((ulong)((xnxtbl.p[i].p_off + XENIX_OFFSET) * XENIX_BSIZE) / imagePlugin.Info.SectorSize) +
+                            sectorOffset,
                     Length = (ulong)(xnxtbl.p[i].p_size * XENIX_BSIZE) / imagePlugin.Info.SectorSize,
-                    Offset =
-                        (ulong)((xnxtbl.p[i].p_off + XENIX_OFFSET) * XENIX_BSIZE) +
-                        imagePlugin.Info.SectorSize * sectorOffset,
-                    Size     = (ulong)(xnxtbl.p[i].p_size * XENIX_BSIZE),
-                    Sequence = (ulong)i,
-                    Type     = "XENIX",
-                    Scheme   = Name
+                    Offset = (ulong)((xnxtbl.p[i].p_off + XENIX_OFFSET) * XENIX_BSIZE) +
+                             (imagePlugin.Info.SectorSize * sectorOffset),
+                    Size = (ulong)(xnxtbl.p[i].p_size * XENIX_BSIZE), Sequence = (ulong)i, Type = "XENIX", Scheme = Name
                 };
 
-                if(part.End < imagePlugin.Info.Sectors) partitions.Add(part);
+                if(part.End < imagePlugin.Info.Sectors)
+                    partitions.Add(part);
             }
 
             return partitions.Count > 0;
@@ -98,16 +99,16 @@ namespace Aaru.Partitions
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct Partable
         {
-            public ushort p_magic; /* magic number validity indicator */
+            public readonly ushort p_magic; /* magic number validity indicator */
             [MarshalAs(UnmanagedType.ByValArray, SizeConst = MAXPARTS)]
-            public Partition[] p; /*partition headers*/
+            public readonly Partition[] p; /*partition headers*/
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct Partition
         {
-            public int p_off;  /*start 1K block no of partition*/
-            public int p_size; /*# of 1K blocks in partition*/
+            public readonly int p_off;  /*start 1K block no of partition*/
+            public readonly int p_size; /*# of 1K blocks in partition*/
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Partitions/Xbox.cs b/Aaru.Partitions/Xbox.cs
index 3a80f79ad..41dffce96 100644
--- a/Aaru.Partitions/Xbox.cs
+++ b/Aaru.Partitions/Xbox.cs
@@ -70,10 +70,13 @@ namespace Aaru.Partitions
             partitions = new List<Partition>();
 
             // Xbox partitions always start on 0
-            if(sectorOffset != 0) return false;
+            if(sectorOffset != 0)
+                return false;
 
             byte[] sector = imagePlugin.ReadSector(0);
-            if(sector.Length < 512) return false;
+
+            if(sector.Length < 512)
+                return false;
 
             Xbox360DevKitPartitionTable table =
                 Marshal.ByteArrayToStructureBigEndian<Xbox360DevKitPartitionTable>(sector);
@@ -82,26 +85,23 @@ namespace Aaru.Partitions
                table.contentOff   + table.contentLen   <= imagePlugin.Info.Sectors &&
                table.dashboardOff + table.dashboardLen <= imagePlugin.Info.Sectors)
             {
-                Partition contentPart = new Partition
+                var contentPart = new Partition
                 {
                     Description = "Content volume",
                     Size        = (ulong)table.contentLen * imagePlugin.Info.SectorSize,
-                    Length      = table.contentLen,
-                    Sequence    = 1,
-                    Offset      = (ulong)table.contentOff * imagePlugin.Info.SectorSize,
-                    Start       = table.contentOff,
+                    Length      = table.contentLen, Sequence                                   = 1,
+                    Offset      = (ulong)table.contentOff * imagePlugin.Info.SectorSize, Start = table.contentOff,
                     Scheme      = Name
                 };
 
-                Partition dashboardPart = new Partition
+                var dashboardPart = new Partition
                 {
                     Description = "Dashboard volume",
-                    Size        = (ulong)table.dashboardLen * imagePlugin.Info.SectorSize,
-                    Length      = table.dashboardLen,
-                    Sequence    = 2,
-                    Offset      = (ulong)table.dashboardOff * imagePlugin.Info.SectorSize,
-                    Start       = table.dashboardOff,
-                    Scheme      = Name
+                    Size =
+                        (ulong)table.dashboardLen * imagePlugin.Info.SectorSize,
+                    Length = table.dashboardLen, Sequence                                   = 2,
+                    Offset = (ulong)table.dashboardOff * imagePlugin.Info.SectorSize, Start = table.dashboardOff,
+                    Scheme = Name
                 };
 
                 partitions.Add(contentPart);
@@ -119,22 +119,20 @@ namespace Aaru.Partitions
 
                 if(temp == XboxCigam)
                 {
-                    Partition sysCachePart = new Partition
+                    var sysCachePart = new Partition
                     {
                         Description = "System cache",
                         Size        = MemoryUnitDataOff,
-                        Length      = (ulong)(MemoryUnitDataOff / imagePlugin.Info.SectorSize),
-                        Sequence    = 1,
+                        Length      = (ulong)(MemoryUnitDataOff / imagePlugin.Info.SectorSize), Sequence = 1,
                         Offset      = 0,
-                        Start       = 0,
-                        Scheme      = Name
+                        Start       = 0, Scheme = Name
                     };
 
-                    Partition dataPart = new Partition
+                    var dataPart = new Partition
                     {
                         Description = "Data volume",
-                        Size        = imagePlugin.Info.Sectors * imagePlugin.Info.SectorSize - MemoryUnitDataOff,
-                        Length      = imagePlugin.Info.Sectors                               - sysCachePart.Length,
+                        Size        = (imagePlugin.Info.Sectors * imagePlugin.Info.SectorSize) - MemoryUnitDataOff,
+                        Length      = imagePlugin.Info.Sectors                                 - sysCachePart.Length,
                         Sequence    = 2,
                         Offset      = MemoryUnitDataOff,
                         Start       = sysCachePart.Length,
@@ -148,88 +146,83 @@ namespace Aaru.Partitions
                 }
             }
 
-            if(imagePlugin.Info.Sectors <= (ulong)(Xbox360DataOff / imagePlugin.Info.SectorSize)) return false;
+            if(imagePlugin.Info.Sectors <= (ulong)(Xbox360DataOff / imagePlugin.Info.SectorSize))
+                return false;
 
             {
                 sector = imagePlugin.ReadSector((ulong)(Xbox360DataOff / imagePlugin.Info.SectorSize));
                 temp   = BitConverter.ToUInt32(sector, 0);
 
-                if(temp != XboxCigam) return false;
+                if(temp != XboxCigam)
+                    return false;
 
-                Partition securityPart = new Partition
+                var securityPart = new Partition
                 {
                     Description = "Security sectors",
                     Size        = Xbox360SecuritySectorLen,
-                    Length      = (ulong)(Xbox360SecuritySectorLen / imagePlugin.Info.SectorSize),
-                    Sequence    = 1,
+                    Length      = (ulong)(Xbox360SecuritySectorLen / imagePlugin.Info.SectorSize), Sequence = 1,
                     Offset      = Xbox360SecuritySectorOff,
-                    Start       = (ulong)(Xbox360SecuritySectorOff / imagePlugin.Info.SectorSize),
-                    Scheme      = Name
+                    Start       = (ulong)(Xbox360SecuritySectorOff / imagePlugin.Info.SectorSize), Scheme = Name
                 };
 
-                Partition sysCachePart = new Partition
+                var sysCachePart = new Partition
                 {
                     Description = "System cache",
                     Size        = Xbox360SystemCacheLen,
-                    Length      = (ulong)(Xbox360SystemCacheLen / imagePlugin.Info.SectorSize),
-                    Sequence    = 2,
+                    Length      = (ulong)(Xbox360SystemCacheLen / imagePlugin.Info.SectorSize), Sequence = 2,
                     Offset      = Xbox360SystemCacheOff,
-                    Start       = (ulong)(Xbox360SystemCacheOff / imagePlugin.Info.SectorSize),
-                    Scheme      = Name
+                    Start       = (ulong)(Xbox360SystemCacheOff / imagePlugin.Info.SectorSize), Scheme = Name
                 };
 
-                Partition gameCachePart = new Partition
+                var gameCachePart = new Partition
                 {
                     Description = "Game cache",
                     Size        = Xbox360GameCacheLen,
-                    Length      = (ulong)(Xbox360GameCacheLen / imagePlugin.Info.SectorSize),
-                    Sequence    = 3,
+                    Length      = (ulong)(Xbox360GameCacheLen / imagePlugin.Info.SectorSize), Sequence = 3,
                     Offset      = Xbox360GameCacheOff,
-                    Start       = (ulong)(Xbox360GameCacheOff / imagePlugin.Info.SectorSize),
-                    Scheme      = Name
+                    Start =
+                        (ulong)(Xbox360GameCacheOff / imagePlugin.Info.SectorSize),
+                    Scheme = Name
                 };
 
-                Partition sysExtPart = new Partition
+                var sysExtPart = new Partition
                 {
-                    Description = "System volume",
-                    Size        = Xbox368SysExtLen,
-                    Length      = (ulong)(Xbox368SysExtLen / imagePlugin.Info.SectorSize),
-                    Sequence    = 4,
+                    Description = "System volume", Size                                             = Xbox368SysExtLen,
+                    Length      = (ulong)(Xbox368SysExtLen / imagePlugin.Info.SectorSize), Sequence = 4,
                     Offset      = Xbox368SysExtOff,
-                    Start       = (ulong)(Xbox368SysExtOff / imagePlugin.Info.SectorSize),
-                    Scheme      = Name
+                    Start =
+                        (ulong)(Xbox368SysExtOff / imagePlugin.Info.SectorSize),
+                    Scheme = Name
                 };
 
-                Partition sysExt2Part = new Partition
+                var sysExt2Part = new Partition
                 {
                     Description = "System volume 2",
                     Size        = Xbox360SysExt2Len,
-                    Length      = (ulong)(Xbox360SysExt2Len / imagePlugin.Info.SectorSize),
-                    Sequence    = 5,
+                    Length      = (ulong)(Xbox360SysExt2Len / imagePlugin.Info.SectorSize), Sequence = 5,
                     Offset      = Xbox360SysExt2Off,
-                    Start       = (ulong)(Xbox360SysExt2Off / imagePlugin.Info.SectorSize),
-                    Scheme      = Name
+                    Start =
+                        (ulong)(Xbox360SysExt2Off / imagePlugin.Info.SectorSize),
+                    Scheme = Name
                 };
 
-                Partition xbox1Part = new Partition
+                var xbox1Part = new Partition
                 {
-                    Description = "Xbox backwards compatibility",
-                    Size        = Xbox360CompatLen,
-                    Length      = (ulong)(Xbox360CompatLen / imagePlugin.Info.SectorSize),
-                    Sequence    = 6,
+                    Description = "Xbox backwards compatibility", Size                              = Xbox360CompatLen,
+                    Length      = (ulong)(Xbox360CompatLen / imagePlugin.Info.SectorSize), Sequence = 6,
                     Offset      = Xbox360CompatOff,
-                    Start       = (ulong)(Xbox360CompatOff / imagePlugin.Info.SectorSize),
-                    Scheme      = Name
+                    Start =
+                        (ulong)(Xbox360CompatOff / imagePlugin.Info.SectorSize),
+                    Scheme = Name
                 };
 
-                Partition dataPart = new Partition
+                var dataPart = new Partition
                 {
-                    Description = "Data volume",
-                    Sequence    = 7,
+                    Description = "Data volume", Sequence = 7,
                     Offset      = Xbox360DataOff,
-                    Start       = (ulong)(Xbox360DataOff / imagePlugin.Info.SectorSize),
-                    Scheme      = Name
+                    Start       = (ulong)(Xbox360DataOff / imagePlugin.Info.SectorSize), Scheme = Name
                 };
+
                 dataPart.Length = imagePlugin.Info.Sectors - dataPart.Start;
                 dataPart.Size   = dataPart.Length * imagePlugin.Info.SectorSize;
 
@@ -248,12 +241,12 @@ namespace Aaru.Partitions
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         struct Xbox360DevKitPartitionTable
         {
-            public uint magic;
-            public uint unknown;
-            public uint contentOff;
-            public uint contentLen;
-            public uint dashboardOff;
-            public uint dashboardLen;
+            public readonly uint magic;
+            public readonly uint unknown;
+            public readonly uint contentOff;
+            public readonly uint contentLen;
+            public readonly uint dashboardOff;
+            public readonly uint dashboardLen;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Settings/Settings.cs b/Aaru.Settings/Settings.cs
index 9420efc02..fc7cc6a8a 100644
--- a/Aaru.Settings/Settings.cs
+++ b/Aaru.Settings/Settings.cs
@@ -33,8 +33,8 @@
 using System;
 using System.IO;
 using System.Xml.Serialization;
-using Claunia.PropertyList;
 using Aaru.CommonTypes.Interop;
+using Claunia.PropertyList;
 using Microsoft.Win32;
 using PlatformID = Aaru.CommonTypes.Interop.PlatformID;
 
@@ -138,10 +138,11 @@ namespace Aaru.Settings
                         if(!Directory.Exists(appSupportPath))
                             Directory.CreateDirectory(appSupportPath);
 
-                        string dicPath = Path.Combine(appSupportPath, "DiscImageChef");
+                        string dicPath  = Path.Combine(appSupportPath, "DiscImageChef");
                         string aaruPath = Path.Combine(appSupportPath, "Aaru");
 
-                        if(Directory.Exists(dicPath) && !Directory.Exists(aaruPath))
+                        if(Directory.Exists(dicPath) &&
+                           !Directory.Exists(aaruPath))
                             Directory.Move(dicPath, aaruPath);
 
                         if(!Directory.Exists(aaruPath))
@@ -177,7 +178,7 @@ namespace Aaru.Settings
                         if(!Directory.Exists(appSupportPath))
                             Directory.CreateDirectory(appSupportPath);
 
-                        string dicPath = Path.Combine(appSupportPath, "DiscImageChef");
+                        string dicPath  = Path.Combine(appSupportPath, "DiscImageChef");
                         string aaruPath = Path.Combine(appSupportPath, "Aaru");
 
                         if(Directory.Exists(dicPath) &&
@@ -212,7 +213,7 @@ namespace Aaru.Settings
 
                         string oldDicPath = Path.Combine(homePath, ".claunia.com", "DiscImageChef");
                         string dicPath    = Path.Combine(xdgDataPath, "DiscImageChef");
-                        string aaruPath = Path.Combine(xdgDataPath, "Aaru");
+                        string aaruPath   = Path.Combine(xdgDataPath, "Aaru");
 
                         if(Directory.Exists(oldDicPath) &&
                            !Directory.Exists(aaruPath))
@@ -265,7 +266,9 @@ namespace Aaru.Settings
                             Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), "Library",
                                          "Preferences");
 
-                        string dicPreferencesFilePath = Path.Combine(preferencesPath, "com.claunia.discimagechef.plist");
+                        string dicPreferencesFilePath =
+                            Path.Combine(preferencesPath, "com.claunia.discimagechef.plist");
+
                         string preferencesFilePath = Path.Combine(preferencesPath, "com.claunia.aaru.plist");
 
                         if(File.Exists(dicPreferencesFilePath))
@@ -357,8 +360,8 @@ namespace Aaru.Settings
                         }
 
                         RegistryKey dicKey = parentKey.OpenSubKey("DiscImageChef");
-                        RegistryKey key = parentKey.OpenSubKey("Aaru");
-                        bool stats;
+                        RegistryKey key    = parentKey.OpenSubKey("Aaru");
+                        bool        stats;
 
                         if(dicKey != null &&
                            key    == null)
@@ -438,7 +441,7 @@ namespace Aaru.Settings
                                          XDG_CONFIG_HOME_RESOLVED);
 
                         string dicSettingsPath = Path.Combine(xdgConfigPath, "DiscImageChef.xml");
-                        string settingsPath = Path.Combine(xdgConfigPath, "Aaru.xml");
+                        string settingsPath    = Path.Combine(xdgConfigPath, "Aaru.xml");
 
                         if(File.Exists(oldSettingsPath) &&
                            !File.Exists(settingsPath))
diff --git a/Aaru.Tests.Devices/ATA.cs b/Aaru.Tests.Devices/ATA.cs
index 114e707e3..8f8e44840 100644
--- a/Aaru.Tests.Devices/ATA.cs
+++ b/Aaru.Tests.Devices/ATA.cs
@@ -26,68 +26,79 @@
 // Copyright © 2011-2019 Natalia Portillo
 // ****************************************************************************/
 
-using Aaru.Tests.Devices.ATA;
 using Aaru.Console;
 using Aaru.Devices;
+using Aaru.Tests.Devices.ATA;
 
 namespace Aaru.Tests.Devices
 {
-    static partial class MainClass
+    internal static partial class MainClass
     {
         public static void Ata(string devPath, Device dev)
         {
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Send an ATA command to the device:");
-                DicConsole.WriteLine("1.- Send a CHS ATA command to the device.");
-                DicConsole.WriteLine("2.- Send a 28-bit ATA command to the device.");
-                DicConsole.WriteLine("3.- Send a 48-bit ATA command to the device.");
-                DicConsole.WriteLine("4.- Send an ATAPI command to the device.");
-                DicConsole.WriteLine("5.- Send a CompactFlash command to the device.");
-                DicConsole.WriteLine("6.- Send a Media Card Pass Through command to the device.");
-                DicConsole.WriteLine("7.- Send a S.M.A.R.T. command to the device.");
-                DicConsole.WriteLine("0.- Return to command class menu.");
-                DicConsole.Write("Choose: ");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Send an ATA command to the device:");
+                AaruConsole.WriteLine("1.- Send a CHS ATA command to the device.");
+                AaruConsole.WriteLine("2.- Send a 28-bit ATA command to the device.");
+                AaruConsole.WriteLine("3.- Send a 48-bit ATA command to the device.");
+                AaruConsole.WriteLine("4.- Send an ATAPI command to the device.");
+                AaruConsole.WriteLine("5.- Send a CompactFlash command to the device.");
+                AaruConsole.WriteLine("6.- Send a Media Card Pass Through command to the device.");
+                AaruConsole.WriteLine("7.- Send a S.M.A.R.T. command to the device.");
+                AaruConsole.WriteLine("0.- Return to command class menu.");
+                AaruConsole.Write("Choose: ");
 
                 string strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out int item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to command class menu...");
+                        AaruConsole.WriteLine("Returning to command class menu...");
+
                         return;
                     case 1:
                         AtaChs.Menu(devPath, dev);
+
                         continue;
                     case 2:
                         Ata28.Menu(devPath, dev);
+
                         continue;
                     case 3:
                         Ata48.Menu(devPath, dev);
+
                         continue;
                     case 4:
                         Atapi.Menu(devPath, dev);
+
                         continue;
                     case 5:
                         Cfa.Menu(devPath, dev);
+
                         continue;
                     case 6:
                         Mcpt.Menu(devPath, dev);
+
                         continue;
                     case 7:
                         Smart.Menu(devPath, dev);
+
                         continue;
                     default:
-                        DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                        AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                         System.Console.ReadKey();
+
                         continue;
                 }
             }
diff --git a/Aaru.Tests.Devices/ATA/Ata28.cs b/Aaru.Tests.Devices/ATA/Ata28.cs
index 9ef43ffda..fae335871 100644
--- a/Aaru.Tests.Devices/ATA/Ata28.cs
+++ b/Aaru.Tests.Devices/ATA/Ata28.cs
@@ -32,78 +32,93 @@ using Aaru.Devices;
 
 namespace Aaru.Tests.Devices.ATA
 {
-    static class Ata28
+    internal static class Ata28
     {
         internal static void Menu(string devPath, Device dev)
         {
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Send a 28-bit ATA command to the device:");
-                DicConsole.WriteLine("1.- Send READ BUFFER command.");
-                DicConsole.WriteLine("2.- Send READ BUFFER DMA command.");
-                DicConsole.WriteLine("3.- Send READ DMA command.");
-                DicConsole.WriteLine("4.- Send READ DMA WITH RETRIES command.");
-                DicConsole.WriteLine("5.- Send READ LONG command.");
-                DicConsole.WriteLine("6.- Send READ LONG WITH RETRIES command.");
-                DicConsole.WriteLine("7.- Send READ MULTIPLE command.");
-                DicConsole.WriteLine("8.- Send READ NATIVE MAX ADDRESS command.");
-                DicConsole.WriteLine("9.- Send READ SECTORS command.");
-                DicConsole.WriteLine("10.- Send READ SECTORS WITH RETRIES command.");
-                DicConsole.WriteLine("11.- Send SEEK command.");
-                DicConsole.WriteLine("0.- Return to ATA commands menu.");
-                DicConsole.Write("Choose: ");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Send a 28-bit ATA command to the device:");
+                AaruConsole.WriteLine("1.- Send READ BUFFER command.");
+                AaruConsole.WriteLine("2.- Send READ BUFFER DMA command.");
+                AaruConsole.WriteLine("3.- Send READ DMA command.");
+                AaruConsole.WriteLine("4.- Send READ DMA WITH RETRIES command.");
+                AaruConsole.WriteLine("5.- Send READ LONG command.");
+                AaruConsole.WriteLine("6.- Send READ LONG WITH RETRIES command.");
+                AaruConsole.WriteLine("7.- Send READ MULTIPLE command.");
+                AaruConsole.WriteLine("8.- Send READ NATIVE MAX ADDRESS command.");
+                AaruConsole.WriteLine("9.- Send READ SECTORS command.");
+                AaruConsole.WriteLine("10.- Send READ SECTORS WITH RETRIES command.");
+                AaruConsole.WriteLine("11.- Send SEEK command.");
+                AaruConsole.WriteLine("0.- Return to ATA commands menu.");
+                AaruConsole.Write("Choose: ");
 
                 string strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out int item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to ATA commands menu...");
+                        AaruConsole.WriteLine("Returning to ATA commands menu...");
+
                         return;
                     case 1:
                         ReadBuffer(devPath, dev);
+
                         continue;
                     case 2:
                         ReadBufferDma(devPath, dev);
+
                         continue;
                     case 3:
                         ReadDma(devPath, dev, false);
+
                         continue;
                     case 4:
                         ReadDma(devPath, dev, true);
+
                         continue;
                     case 5:
                         ReadLong(devPath, dev, false);
+
                         continue;
                     case 6:
                         ReadLong(devPath, dev, true);
+
                         continue;
                     case 7:
                         ReadMultiple(devPath, dev);
+
                         continue;
                     case 8:
                         ReadNativeMaxAddress(devPath, dev);
+
                         continue;
                     case 9:
                         ReadSectors(devPath, dev, false);
+
                         continue;
                     case 10:
                         ReadSectors(devPath, dev, true);
+
                         continue;
                     case 11:
                         Seek(devPath, dev);
+
                         continue;
                     default:
-                        DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                        AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                         System.Console.ReadKey();
+
                         continue;
                 }
             }
@@ -113,63 +128,73 @@ namespace Aaru.Tests.Devices.ATA
         {
             start:
             System.Console.Clear();
+
             bool sense = dev.ReadBuffer(out byte[] buffer, out AtaErrorRegistersLba28 errorRegisters, dev.Timeout,
                                         out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Decode error registers.");
-            DicConsole.WriteLine("3.- Send command again.");
-            DicConsole.WriteLine("0.- Return to 28-bit ATA commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending READ BUFFER to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Decode error registers.");
+            AaruConsole.WriteLine("3.- Send command again.");
+            AaruConsole.WriteLine("0.- Return to 28-bit ATA commands menu.");
+            AaruConsole.Write("Choose: ");
 
             string strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out int item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to 28-bit ATA commands menu...");
+                    AaruConsole.WriteLine("Returning to 28-bit ATA commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ BUFFER response:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ BUFFER response:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ BUFFER status registers:");
-                    DicConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ BUFFER status registers:");
+                    AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3: goto start;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -178,63 +203,73 @@ namespace Aaru.Tests.Devices.ATA
         {
             start:
             System.Console.Clear();
+
             bool sense = dev.ReadBufferDma(out byte[] buffer, out AtaErrorRegistersLba28 errorRegisters, dev.Timeout,
                                            out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Decode error registers.");
-            DicConsole.WriteLine("3.- Send command again.");
-            DicConsole.WriteLine("0.- Return to 28-bit ATA commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending READ BUFFER DMA to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Decode error registers.");
+            AaruConsole.WriteLine("3.- Send command again.");
+            AaruConsole.WriteLine("0.- Return to 28-bit ATA commands menu.");
+            AaruConsole.Write("Choose: ");
 
             string strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out int item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to 28-bit ATA commands menu...");
+                    AaruConsole.WriteLine("Returning to 28-bit ATA commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ BUFFER DMA response:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ BUFFER DMA response:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ BUFFER DMA status registers:");
-                    DicConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ BUFFER DMA status registers:");
+                    AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3: goto start;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -247,56 +282,64 @@ namespace Aaru.Tests.Devices.ATA
             int    item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}",                         devPath);
-                DicConsole.WriteLine("Parameters for READ DMA {0}command:", retries ? "WITH RETRIES " : "");
-                DicConsole.WriteLine("LBA: {0}",                            lba);
-                DicConsole.WriteLine("Count: {0}",                          count);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to 28-bit ATA commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for READ DMA {0}command:", retries ? "WITH RETRIES " : "");
+                AaruConsole.WriteLine("LBA: {0}", lba);
+                AaruConsole.WriteLine("Count: {0}", count);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to 28-bit ATA commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to 28-bit ATA commands menu...");
+                        AaruConsole.WriteLine("Returning to 28-bit ATA commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.Write("What logical block address?: ");
+                        AaruConsole.Write("What logical block address?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!uint.TryParse(strDev, out lba))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             lba = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
                         if(lba > 0xFFFFFFF)
                         {
-                            DicConsole
-                               .WriteLine("Logical block address cannot be bigger than {0}. Setting it to {0}...",
+                            AaruConsole.
+                                WriteLine("Logical block address cannot be bigger than {0}. Setting it to {0}...",
                                           0xFFFFFFF);
+
                             lba = 0xFFFFFFF;
                         }
 
-                        DicConsole.Write("How many sectors?: ");
+                        AaruConsole.Write("How many sectors?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!byte.TryParse(strDev, out count))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             count = 0;
                             System.Console.ReadKey();
                         }
@@ -308,65 +351,75 @@ namespace Aaru.Tests.Devices.ATA
 
             start:
             System.Console.Clear();
+
             bool sense = dev.ReadDma(out byte[] buffer, out AtaErrorRegistersLba28 errorRegisters, retries, lba, count,
                                      dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}",                        devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}",       ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Decode error registers.");
-            DicConsole.WriteLine("3.- Send command again.");
-            DicConsole.WriteLine("4.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to 28-bit ATA commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending READ DMA {0}to the device:", retries ? "WITH RETRIES " : "");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Decode error registers.");
+            AaruConsole.WriteLine("3.- Send command again.");
+            AaruConsole.WriteLine("4.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to 28-bit ATA commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to 28-bit ATA commands menu...");
+                    AaruConsole.WriteLine("Returning to 28-bit ATA commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}",           devPath);
-                    DicConsole.WriteLine("READ DMA {0}response:", retries ? "WITH RETRIES " : "");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ DMA {0}response:", retries ? "WITH RETRIES " : "");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     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.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ DMA {0}status registers:", retries ? "WITH RETRIES " : "");
+                    AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3: goto start;
                 case 4: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -379,56 +432,64 @@ namespace Aaru.Tests.Devices.ATA
             int    item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}",                          devPath);
-                DicConsole.WriteLine("Parameters for READ LONG {0}command:", retries ? "WITH RETRIES " : "");
-                DicConsole.WriteLine("LBA: {0}",                             lba);
-                DicConsole.WriteLine("Block size: {0}",                      blockSize);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to 28-bit ATA commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for READ LONG {0}command:", retries ? "WITH RETRIES " : "");
+                AaruConsole.WriteLine("LBA: {0}", lba);
+                AaruConsole.WriteLine("Block size: {0}", blockSize);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to 28-bit ATA commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to 28-bit ATA commands menu...");
+                        AaruConsole.WriteLine("Returning to 28-bit ATA commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.Write("What logical block address?: ");
+                        AaruConsole.Write("What logical block address?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!uint.TryParse(strDev, out lba))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             lba = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
                         if(lba > 0xFFFFFFF)
                         {
-                            DicConsole
-                               .WriteLine("Logical block address cannot be bigger than {0}. Setting it to {0}...",
+                            AaruConsole.
+                                WriteLine("Logical block address cannot be bigger than {0}. Setting it to {0}...",
                                           0xFFFFFFF);
+
                             lba = 0xFFFFFFF;
                         }
 
-                        DicConsole.Write("How many bytes to expect?: ");
+                        AaruConsole.Write("How many bytes to expect?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!uint.TryParse(strDev, out blockSize))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             blockSize = 0;
                             System.Console.ReadKey();
                         }
@@ -440,65 +501,75 @@ namespace Aaru.Tests.Devices.ATA
 
             start:
             System.Console.Clear();
+
             bool sense = dev.ReadLong(out byte[] buffer, out AtaErrorRegistersLba28 errorRegisters, retries, lba,
                                       blockSize, dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}",                         devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}",        ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Decode error registers.");
-            DicConsole.WriteLine("3.- Send command again.");
-            DicConsole.WriteLine("4.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to 28-bit ATA commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending READ LONG {0}to the device:", retries ? "WITH RETRIES " : "");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Decode error registers.");
+            AaruConsole.WriteLine("3.- Send command again.");
+            AaruConsole.WriteLine("4.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to 28-bit ATA commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to 28-bit ATA commands menu...");
+                    AaruConsole.WriteLine("Returning to 28-bit ATA commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}",            devPath);
-                    DicConsole.WriteLine("READ LONG {0}response:", retries ? "WITH RETRIES " : "");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ LONG {0}response:", retries ? "WITH RETRIES " : "");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     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.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ LONG {0}status registers:", retries ? "WITH RETRIES " : "");
+                    AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3: goto start;
                 case 4: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -511,56 +582,64 @@ namespace Aaru.Tests.Devices.ATA
             int    item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Parameters for READ MULTIPLE command:");
-                DicConsole.WriteLine("LBA: {0}",   lba);
-                DicConsole.WriteLine("Count: {0}", count);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to 28-bit ATA commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for READ MULTIPLE command:");
+                AaruConsole.WriteLine("LBA: {0}", lba);
+                AaruConsole.WriteLine("Count: {0}", count);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to 28-bit ATA commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to 28-bit ATA commands menu...");
+                        AaruConsole.WriteLine("Returning to 28-bit ATA commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.Write("What logical block address?: ");
+                        AaruConsole.Write("What logical block address?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!uint.TryParse(strDev, out lba))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             lba = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
                         if(lba > 0xFFFFFFF)
                         {
-                            DicConsole
-                               .WriteLine("Logical block address cannot be bigger than {0}. Setting it to {0}...",
+                            AaruConsole.
+                                WriteLine("Logical block address cannot be bigger than {0}. Setting it to {0}...",
                                           0xFFFFFFF);
+
                             lba = 0xFFFFFFF;
                         }
 
-                        DicConsole.Write("How many sectors?: ");
+                        AaruConsole.Write("How many sectors?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!byte.TryParse(strDev, out count))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             count = 0;
                             System.Console.ReadKey();
                         }
@@ -572,65 +651,75 @@ namespace Aaru.Tests.Devices.ATA
 
             start:
             System.Console.Clear();
+
             bool sense = dev.ReadMultiple(out byte[] buffer, out AtaErrorRegistersLba28 errorRegisters, lba, count,
                                           dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Decode error registers.");
-            DicConsole.WriteLine("3.- Send command again.");
-            DicConsole.WriteLine("4.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to 28-bit ATA commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending READ MULTIPLE to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Decode error registers.");
+            AaruConsole.WriteLine("3.- Send command again.");
+            AaruConsole.WriteLine("4.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to 28-bit ATA commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to 28-bit ATA commands menu...");
+                    AaruConsole.WriteLine("Returning to 28-bit ATA commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ MULTIPLE response:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ MULTIPLE response:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ MULTIPLE status registers:");
-                    DicConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ MULTIPLE status registers:");
+                    AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3: goto start;
                 case 4: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -639,51 +728,57 @@ namespace Aaru.Tests.Devices.ATA
         {
             start:
             System.Console.Clear();
+
             bool sense = dev.ReadNativeMaxAddress(out uint lba, out AtaErrorRegistersLba28 errorRegisters, dev.Timeout,
                                                   out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            DicConsole.WriteLine("Sending READ NATIVE MAX ADDRESS to the device:");
-            DicConsole.WriteLine("Command took {0} ms.", duration);
-            DicConsole.WriteLine("Sense is {0}.",        sense);
-            DicConsole.WriteLine("Max LBA is {0}.",      lba);
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Decode error registers.");
-            DicConsole.WriteLine("2.- Send command again.");
-            DicConsole.WriteLine("0.- Return to 28-bit ATA commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending READ NATIVE MAX ADDRESS to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Max LBA is {0}.", lba);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Decode error registers.");
+            AaruConsole.WriteLine("2.- Send command again.");
+            AaruConsole.WriteLine("0.- Return to 28-bit ATA commands menu.");
+            AaruConsole.Write("Choose: ");
 
             string strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out int item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to 28-bit ATA commands menu...");
+                    AaruConsole.WriteLine("Returning to 28-bit ATA commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ NATIVE MAX ADDRESS status registers:");
-                    DicConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ NATIVE MAX ADDRESS status registers:");
+                    AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2: goto start;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -696,56 +791,64 @@ namespace Aaru.Tests.Devices.ATA
             int    item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}",                             devPath);
-                DicConsole.WriteLine("Parameters for READ SECTORS {0}command:", retries ? "WITH RETRIES " : "");
-                DicConsole.WriteLine("LBA: {0}",                                lba);
-                DicConsole.WriteLine("Count: {0}",                              count);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to 28-bit ATA commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for READ SECTORS {0}command:", retries ? "WITH RETRIES " : "");
+                AaruConsole.WriteLine("LBA: {0}", lba);
+                AaruConsole.WriteLine("Count: {0}", count);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to 28-bit ATA commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to 28-bit ATA commands menu...");
+                        AaruConsole.WriteLine("Returning to 28-bit ATA commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.Write("What logical block address?: ");
+                        AaruConsole.Write("What logical block address?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!uint.TryParse(strDev, out lba))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             lba = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
                         if(lba > 0xFFFFFFF)
                         {
-                            DicConsole
-                               .WriteLine("Logical block address cannot be bigger than {0}. Setting it to {0}...",
+                            AaruConsole.
+                                WriteLine("Logical block address cannot be bigger than {0}. Setting it to {0}...",
                                           0xFFFFFFF);
+
                             lba = 0xFFFFFFF;
                         }
 
-                        DicConsole.Write("How many sectors?: ");
+                        AaruConsole.Write("How many sectors?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!byte.TryParse(strDev, out count))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             count = 0;
                             System.Console.ReadKey();
                         }
@@ -757,65 +860,75 @@ namespace Aaru.Tests.Devices.ATA
 
             start:
             System.Console.Clear();
+
             bool sense = dev.Read(out byte[] buffer, out AtaErrorRegistersLba28 errorRegisters, retries, lba, count,
                                   dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}",                            devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}",           ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Decode error registers.");
-            DicConsole.WriteLine("3.- Send command again.");
-            DicConsole.WriteLine("4.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to 28-bit ATA commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending READ SECTORS {0}to the device:", retries ? "WITH RETRIES " : "");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Decode error registers.");
+            AaruConsole.WriteLine("3.- Send command again.");
+            AaruConsole.WriteLine("4.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to 28-bit ATA commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to 28-bit ATA commands menu...");
+                    AaruConsole.WriteLine("Returning to 28-bit ATA commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}",               devPath);
-                    DicConsole.WriteLine("READ SECTORS {0}response:", retries ? "WITH RETRIES " : "");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ SECTORS {0}response:", retries ? "WITH RETRIES " : "");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     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.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ SECTORS {0}status registers:", retries ? "WITH RETRIES " : "");
+                    AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3: goto start;
                 case 4: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -827,47 +940,54 @@ namespace Aaru.Tests.Devices.ATA
             int    item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Parameters for SEEK command:");
-                DicConsole.WriteLine("LBA: {0}", lba);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to 28-bit ATA commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for SEEK command:");
+                AaruConsole.WriteLine("LBA: {0}", lba);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to 28-bit ATA commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to 28-bit ATA commands menu...");
+                        AaruConsole.WriteLine("Returning to 28-bit ATA commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.Write("What logical block address?: ");
+                        AaruConsole.Write("What logical block address?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!uint.TryParse(strDev, out lba))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             lba = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
                         if(lba > 0xFFFFFFF)
                         {
-                            DicConsole
-                               .WriteLine("Logical block address cannot be bigger than {0}. Setting it to {0}...",
+                            AaruConsole.
+                                WriteLine("Logical block address cannot be bigger than {0}. Setting it to {0}...",
                                           0xFFFFFFF);
+
                             lba = 0xFFFFFFF;
                         }
 
@@ -881,48 +1001,53 @@ namespace Aaru.Tests.Devices.ATA
             bool sense = dev.Seek(out AtaErrorRegistersLba28 errorRegisters, lba, dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            DicConsole.WriteLine("Sending SEEK to the device:");
-            DicConsole.WriteLine("Command took {0} ms.", duration);
-            DicConsole.WriteLine("Sense is {0}.",        sense);
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Decode error registers.");
-            DicConsole.WriteLine("2.- Send command again.");
-            DicConsole.WriteLine("3.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to 28-bit ATA commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending SEEK to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Decode error registers.");
+            AaruConsole.WriteLine("2.- Send command again.");
+            AaruConsole.WriteLine("3.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to 28-bit ATA commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to 28-bit ATA commands menu...");
+                    AaruConsole.WriteLine("Returning to 28-bit ATA commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("SEEK status registers:");
-                    DicConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("SEEK status registers:");
+                    AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2: goto start;
                 case 3: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
diff --git a/Aaru.Tests.Devices/ATA/Ata48.cs b/Aaru.Tests.Devices/ATA/Ata48.cs
index 56960b0ae..2ed9a6503 100644
--- a/Aaru.Tests.Devices/ATA/Ata48.cs
+++ b/Aaru.Tests.Devices/ATA/Ata48.cs
@@ -32,62 +32,73 @@ using Aaru.Devices;
 
 namespace Aaru.Tests.Devices.ATA
 {
-    static class Ata48
+    internal static class Ata48
     {
         internal static void Menu(string devPath, Device dev)
         {
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Send a 48-bit ATA command to the device:");
-                DicConsole.WriteLine("1.- Send GET NATIVE MAX ADDRESS EXT command.");
-                DicConsole.WriteLine("2.- Send READ DMA EXT command.");
-                DicConsole.WriteLine("3.- Send READ LOG DMA EXT command.");
-                DicConsole.WriteLine("4.- Send READ LOG EXT command.");
-                DicConsole.WriteLine("5.- Send READ MATIVE MAX ADDRESS EXT command.");
-                DicConsole.WriteLine("6.- Send READ MULTIPLE EXT command.");
-                DicConsole.WriteLine("7.- Send READ SECTORS EXT command.");
-                DicConsole.WriteLine("0.- Return to ATA commands menu.");
-                DicConsole.Write("Choose: ");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Send a 48-bit ATA command to the device:");
+                AaruConsole.WriteLine("1.- Send GET NATIVE MAX ADDRESS EXT command.");
+                AaruConsole.WriteLine("2.- Send READ DMA EXT command.");
+                AaruConsole.WriteLine("3.- Send READ LOG DMA EXT command.");
+                AaruConsole.WriteLine("4.- Send READ LOG EXT command.");
+                AaruConsole.WriteLine("5.- Send READ MATIVE MAX ADDRESS EXT command.");
+                AaruConsole.WriteLine("6.- Send READ MULTIPLE EXT command.");
+                AaruConsole.WriteLine("7.- Send READ SECTORS EXT command.");
+                AaruConsole.WriteLine("0.- Return to ATA commands menu.");
+                AaruConsole.Write("Choose: ");
 
                 string strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out int item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to ATA commands menu...");
+                        AaruConsole.WriteLine("Returning to ATA commands menu...");
+
                         return;
                     case 1:
                         GetNativeMaxAddressExt(devPath, dev);
+
                         continue;
                     case 2:
                         ReadDmaExt(devPath, dev);
+
                         continue;
                     case 3:
                         ReadLogDmaExt(devPath, dev);
+
                         continue;
                     case 4:
                         ReadLogExt(devPath, dev);
+
                         continue;
                     case 5:
                         ReadNativeMaxAddressExt(devPath, dev);
+
                         continue;
                     case 6:
                         ReadMultipleExt(devPath, dev);
+
                         continue;
                     case 7:
                         ReadSectorsExt(devPath, dev);
+
                         continue;
                     default:
-                        DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                        AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                         System.Console.ReadKey();
+
                         continue;
                 }
             }
@@ -97,51 +108,57 @@ namespace Aaru.Tests.Devices.ATA
         {
             start:
             System.Console.Clear();
+
             bool sense = dev.GetNativeMaxAddressExt(out ulong lba, out AtaErrorRegistersLba48 errorRegisters,
                                                     dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            DicConsole.WriteLine("Sending GET NATIVE MAX ADDRESS EXT to the device:");
-            DicConsole.WriteLine("Command took {0} ms.", duration);
-            DicConsole.WriteLine("Sense is {0}.",        sense);
-            DicConsole.WriteLine("Max LBA is {0}.",      lba);
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Decode error registers.");
-            DicConsole.WriteLine("2.- Send command again.");
-            DicConsole.WriteLine("0.- Return to 48-bit ATA commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending GET NATIVE MAX ADDRESS EXT to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Max LBA is {0}.", lba);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Decode error registers.");
+            AaruConsole.WriteLine("2.- Send command again.");
+            AaruConsole.WriteLine("0.- Return to 48-bit ATA commands menu.");
+            AaruConsole.Write("Choose: ");
 
             string strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out int item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to 48-bit ATA commands menu...");
+                    AaruConsole.WriteLine("Returning to 48-bit ATA commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("GET NATIVE MAX ADDRESS EXT status registers:");
-                    DicConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("GET NATIVE MAX ADDRESS EXT status registers:");
+                    AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2: goto start;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -154,56 +171,64 @@ namespace Aaru.Tests.Devices.ATA
             int    item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Parameters for READ DMA EXT command:");
-                DicConsole.WriteLine("LBA: {0}",   lba);
-                DicConsole.WriteLine("Count: {0}", count);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to 48-bit ATA commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for READ DMA EXT command:");
+                AaruConsole.WriteLine("LBA: {0}", lba);
+                AaruConsole.WriteLine("Count: {0}", count);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to 48-bit ATA commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to 48-bit ATA commands menu...");
+                        AaruConsole.WriteLine("Returning to 48-bit ATA commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.Write("What logical block address?: ");
+                        AaruConsole.Write("What logical block address?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!ulong.TryParse(strDev, out lba))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             lba = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
                         if(lba > 0xFFFFFFFFFFFF)
                         {
-                            DicConsole
-                               .WriteLine("Logical block address cannot be bigger than {0}. Setting it to {0}...",
+                            AaruConsole.
+                                WriteLine("Logical block address cannot be bigger than {0}. Setting it to {0}...",
                                           0xFFFFFFFFFFFF);
+
                             lba = 0xFFFFFFFFFFFF;
                         }
 
-                        DicConsole.Write("How many sectors?: ");
+                        AaruConsole.Write("How many sectors?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!ushort.TryParse(strDev, out count))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             count = 0;
                             System.Console.ReadKey();
                         }
@@ -215,65 +240,75 @@ namespace Aaru.Tests.Devices.ATA
 
             start:
             System.Console.Clear();
+
             bool sense = dev.ReadDma(out byte[] buffer, out AtaErrorRegistersLba48 errorRegisters, lba, count,
                                      dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Decode error registers.");
-            DicConsole.WriteLine("3.- Send command again.");
-            DicConsole.WriteLine("4.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to 48-bit ATA commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending READ DMA EXT to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Decode error registers.");
+            AaruConsole.WriteLine("3.- Send command again.");
+            AaruConsole.WriteLine("4.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to 48-bit ATA commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to 48-bit ATA commands menu...");
+                    AaruConsole.WriteLine("Returning to 48-bit ATA commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ DMA EXT response:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ DMA EXT response:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ DMA EXT status registers:");
-                    DicConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ DMA EXT status registers:");
+                    AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3: goto start;
                 case 4: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -287,59 +322,68 @@ namespace Aaru.Tests.Devices.ATA
             int    item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Parameters for READ LOG EXT command:");
-                DicConsole.WriteLine("Log address: {0}", address);
-                DicConsole.WriteLine("Page number: {0}", page);
-                DicConsole.WriteLine("Count: {0}",       count);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to 48-bit ATA commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for READ LOG EXT command:");
+                AaruConsole.WriteLine("Log address: {0}", address);
+                AaruConsole.WriteLine("Page number: {0}", page);
+                AaruConsole.WriteLine("Count: {0}", count);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to 48-bit ATA commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to 48-bit ATA commands menu...");
+                        AaruConsole.WriteLine("Returning to 48-bit ATA commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.Write("What log address?: ");
+                        AaruConsole.Write("What log address?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!byte.TryParse(strDev, out address))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             address = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("What page number?: ");
+                        AaruConsole.Write("What page number?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!ushort.TryParse(strDev, out page))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             page = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("How many sectors?: ");
+                        AaruConsole.Write("How many sectors?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!ushort.TryParse(strDev, out count))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             count = 0;
                             System.Console.ReadKey();
                         }
@@ -351,65 +395,75 @@ namespace Aaru.Tests.Devices.ATA
 
             start:
             System.Console.Clear();
+
             bool sense = dev.ReadLog(out byte[] buffer, out AtaErrorRegistersLba48 errorRegisters, address, page, count,
                                      dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Decode error registers.");
-            DicConsole.WriteLine("3.- Send command again.");
-            DicConsole.WriteLine("4.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to 48-bit ATA commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending READ LOG EXT to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Decode error registers.");
+            AaruConsole.WriteLine("3.- Send command again.");
+            AaruConsole.WriteLine("4.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to 48-bit ATA commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to 48-bit ATA commands menu...");
+                    AaruConsole.WriteLine("Returning to 48-bit ATA commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ LOG EXT response:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ LOG EXT response:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ LOG EXT status registers:");
-                    DicConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ LOG EXT status registers:");
+                    AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3: goto start;
                 case 4: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -423,59 +477,68 @@ namespace Aaru.Tests.Devices.ATA
             int    item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Parameters for READ LOG DMA EXT command:");
-                DicConsole.WriteLine("Log address: {0}", address);
-                DicConsole.WriteLine("Page number: {0}", page);
-                DicConsole.WriteLine("Count: {0}",       count);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to 48-bit ATA commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for READ LOG DMA EXT command:");
+                AaruConsole.WriteLine("Log address: {0}", address);
+                AaruConsole.WriteLine("Page number: {0}", page);
+                AaruConsole.WriteLine("Count: {0}", count);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to 48-bit ATA commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to 48-bit ATA commands menu...");
+                        AaruConsole.WriteLine("Returning to 48-bit ATA commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.Write("What log address?: ");
+                        AaruConsole.Write("What log address?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!byte.TryParse(strDev, out address))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             address = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("What page number?: ");
+                        AaruConsole.Write("What page number?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!ushort.TryParse(strDev, out page))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             page = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("How many sectors?: ");
+                        AaruConsole.Write("How many sectors?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!ushort.TryParse(strDev, out count))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             count = 0;
                             System.Console.ReadKey();
                         }
@@ -487,65 +550,75 @@ namespace Aaru.Tests.Devices.ATA
 
             start:
             System.Console.Clear();
+
             bool sense = dev.ReadLogDma(out byte[] buffer, out AtaErrorRegistersLba48 errorRegisters, address, page,
                                         count, dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Decode error registers.");
-            DicConsole.WriteLine("3.- Send command again.");
-            DicConsole.WriteLine("4.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to 48-bit ATA commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending READ LOG DMA EXT to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Decode error registers.");
+            AaruConsole.WriteLine("3.- Send command again.");
+            AaruConsole.WriteLine("4.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to 48-bit ATA commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to 48-bit ATA commands menu...");
+                    AaruConsole.WriteLine("Returning to 48-bit ATA commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ LOG DMA EXT response:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ LOG DMA EXT response:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ LOG DMA EXT status registers:");
-                    DicConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ LOG DMA EXT status registers:");
+                    AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3: goto start;
                 case 4: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -558,56 +631,64 @@ namespace Aaru.Tests.Devices.ATA
             int    item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Parameters for READ MULTIPLE EXT command:");
-                DicConsole.WriteLine("LBA: {0}",   lba);
-                DicConsole.WriteLine("Count: {0}", count);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to 48-bit ATA commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for READ MULTIPLE EXT command:");
+                AaruConsole.WriteLine("LBA: {0}", lba);
+                AaruConsole.WriteLine("Count: {0}", count);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to 48-bit ATA commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to 48-bit ATA commands menu...");
+                        AaruConsole.WriteLine("Returning to 48-bit ATA commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.Write("What logical block address?: ");
+                        AaruConsole.Write("What logical block address?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!ulong.TryParse(strDev, out lba))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             lba = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
                         if(lba > 0xFFFFFFFFFFFF)
                         {
-                            DicConsole
-                               .WriteLine("Logical block address cannot be bigger than {0}. Setting it to {0}...",
+                            AaruConsole.
+                                WriteLine("Logical block address cannot be bigger than {0}. Setting it to {0}...",
                                           0xFFFFFFFFFFFF);
+
                             lba = 0xFFFFFFFFFFFF;
                         }
 
-                        DicConsole.Write("How many sectors?: ");
+                        AaruConsole.Write("How many sectors?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!ushort.TryParse(strDev, out count))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             count = 0;
                             System.Console.ReadKey();
                         }
@@ -619,65 +700,75 @@ namespace Aaru.Tests.Devices.ATA
 
             start:
             System.Console.Clear();
+
             bool sense = dev.ReadMultiple(out byte[] buffer, out AtaErrorRegistersLba48 errorRegisters, lba, count,
                                           dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Decode error registers.");
-            DicConsole.WriteLine("3.- Send command again.");
-            DicConsole.WriteLine("4.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to 48-bit ATA commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending READ MULTIPLE EXT to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Decode error registers.");
+            AaruConsole.WriteLine("3.- Send command again.");
+            AaruConsole.WriteLine("4.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to 48-bit ATA commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to 48-bit ATA commands menu...");
+                    AaruConsole.WriteLine("Returning to 48-bit ATA commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ MULTIPLE EXT response:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ MULTIPLE EXT response:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ MULTIPLE EXT status registers:");
-                    DicConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ MULTIPLE EXT status registers:");
+                    AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3: goto start;
                 case 4: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -686,51 +777,57 @@ namespace Aaru.Tests.Devices.ATA
         {
             start:
             System.Console.Clear();
+
             bool sense = dev.ReadNativeMaxAddress(out ulong lba, out AtaErrorRegistersLba48 errorRegisters, dev.Timeout,
                                                   out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            DicConsole.WriteLine("Sending READ NATIVE MAX ADDRESS EXT to the device:");
-            DicConsole.WriteLine("Command took {0} ms.", duration);
-            DicConsole.WriteLine("Sense is {0}.",        sense);
-            DicConsole.WriteLine("Max LBA is {0}.",      lba);
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Decode error registers.");
-            DicConsole.WriteLine("2.- Send command again.");
-            DicConsole.WriteLine("0.- Return to 48-bit ATA commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending READ NATIVE MAX ADDRESS EXT to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Max LBA is {0}.", lba);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Decode error registers.");
+            AaruConsole.WriteLine("2.- Send command again.");
+            AaruConsole.WriteLine("0.- Return to 48-bit ATA commands menu.");
+            AaruConsole.Write("Choose: ");
 
             string strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out int item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to 48-bit ATA commands menu...");
+                    AaruConsole.WriteLine("Returning to 48-bit ATA commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ NATIVE MAX ADDRESS status registers:");
-                    DicConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ NATIVE MAX ADDRESS status registers:");
+                    AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2: goto start;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -743,56 +840,64 @@ namespace Aaru.Tests.Devices.ATA
             int    item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Parameters for READ SECTORS EXT command:");
-                DicConsole.WriteLine("LBA: {0}",   lba);
-                DicConsole.WriteLine("Count: {0}", count);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to 48-bit ATA commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for READ SECTORS EXT command:");
+                AaruConsole.WriteLine("LBA: {0}", lba);
+                AaruConsole.WriteLine("Count: {0}", count);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to 48-bit ATA commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to 48-bit ATA commands menu...");
+                        AaruConsole.WriteLine("Returning to 48-bit ATA commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.Write("What logical block address?: ");
+                        AaruConsole.Write("What logical block address?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!ulong.TryParse(strDev, out lba))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             lba = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
                         if(lba > 0xFFFFFFFFFFFF)
                         {
-                            DicConsole
-                               .WriteLine("Logical block address cannot be bigger than {0}. Setting it to {0}...",
+                            AaruConsole.
+                                WriteLine("Logical block address cannot be bigger than {0}. Setting it to {0}...",
                                           0xFFFFFFFFFFFF);
+
                             lba = 0xFFFFFFFFFFFF;
                         }
 
-                        DicConsole.Write("How many sectors?: ");
+                        AaruConsole.Write("How many sectors?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!ushort.TryParse(strDev, out count))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             count = 0;
                             System.Console.ReadKey();
                         }
@@ -804,65 +909,75 @@ namespace Aaru.Tests.Devices.ATA
 
             start:
             System.Console.Clear();
+
             bool sense = dev.Read(out byte[] buffer, out AtaErrorRegistersLba48 errorRegisters, lba, count, dev.Timeout,
                                   out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Decode error registers.");
-            DicConsole.WriteLine("3.- Send command again.");
-            DicConsole.WriteLine("4.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to 48-bit ATA commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending READ SECTORS EXT to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Decode error registers.");
+            AaruConsole.WriteLine("3.- Send command again.");
+            AaruConsole.WriteLine("4.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to 48-bit ATA commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to 48-bit ATA commands menu...");
+                    AaruConsole.WriteLine("Returning to 48-bit ATA commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ SECTORS EXT response:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ SECTORS EXT response:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ SECTORS EXT status registers:");
-                    DicConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ SECTORS EXT status registers:");
+                    AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3: goto start;
                 case 4: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
diff --git a/Aaru.Tests.Devices/ATA/AtaCHS.cs b/Aaru.Tests.Devices/ATA/AtaCHS.cs
index a4affc01b..f59759efe 100644
--- a/Aaru.Tests.Devices/ATA/AtaCHS.cs
+++ b/Aaru.Tests.Devices/ATA/AtaCHS.cs
@@ -32,74 +32,88 @@ using Aaru.Devices;
 
 namespace Aaru.Tests.Devices.ATA
 {
-    static class AtaChs
+    internal static class AtaChs
     {
         internal static void Menu(string devPath, Device dev)
         {
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Send a CHS ATA command to the device:");
-                DicConsole.WriteLine("1.- Send IDENTIFY DEVICE command.");
-                DicConsole.WriteLine("2.- Send READ DMA command.");
-                DicConsole.WriteLine("3.- Send READ DMA WITH RETRIES command.");
-                DicConsole.WriteLine("4.- Send READ LONG command.");
-                DicConsole.WriteLine("5.- Send READ LONG WITH RETRIES command.");
-                DicConsole.WriteLine("6.- Send READ MULTIPLE command.");
-                DicConsole.WriteLine("7.- Send READ SECTORS command.");
-                DicConsole.WriteLine("8.- Send READ SECTORS WITH RETRIES command.");
-                DicConsole.WriteLine("9.- Send SEEK command.");
-                DicConsole.WriteLine("10.- Send SET FEATURES command.");
-                DicConsole.WriteLine("0.- Return to ATA commands menu.");
-                DicConsole.Write("Choose: ");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Send a CHS ATA command to the device:");
+                AaruConsole.WriteLine("1.- Send IDENTIFY DEVICE command.");
+                AaruConsole.WriteLine("2.- Send READ DMA command.");
+                AaruConsole.WriteLine("3.- Send READ DMA WITH RETRIES command.");
+                AaruConsole.WriteLine("4.- Send READ LONG command.");
+                AaruConsole.WriteLine("5.- Send READ LONG WITH RETRIES command.");
+                AaruConsole.WriteLine("6.- Send READ MULTIPLE command.");
+                AaruConsole.WriteLine("7.- Send READ SECTORS command.");
+                AaruConsole.WriteLine("8.- Send READ SECTORS WITH RETRIES command.");
+                AaruConsole.WriteLine("9.- Send SEEK command.");
+                AaruConsole.WriteLine("10.- Send SET FEATURES command.");
+                AaruConsole.WriteLine("0.- Return to ATA commands menu.");
+                AaruConsole.Write("Choose: ");
 
                 string strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out int item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to ATA commands menu...");
+                        AaruConsole.WriteLine("Returning to ATA commands menu...");
+
                         return;
                     case 1:
                         Identify(devPath, dev);
+
                         continue;
                     case 2:
                         ReadDma(devPath, dev, false);
+
                         continue;
                     case 3:
                         ReadDma(devPath, dev, true);
+
                         continue;
                     case 4:
                         ReadLong(devPath, dev, false);
+
                         continue;
                     case 5:
                         ReadLong(devPath, dev, true);
+
                         continue;
                     case 6:
                         ReadMultiple(devPath, dev);
+
                         continue;
                     case 7:
                         ReadSectors(devPath, dev, false);
+
                         continue;
                     case 8:
                         ReadSectors(devPath, dev, true);
+
                         continue;
                     case 9:
                         Seek(devPath, dev);
+
                         continue;
                     case 10:
                         SetFeatures(devPath, dev);
+
                         continue;
                     default:
-                        DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                        AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                         System.Console.ReadKey();
+
                         continue;
                 }
             }
@@ -109,74 +123,88 @@ namespace Aaru.Tests.Devices.ATA
         {
             start:
             System.Console.Clear();
+
             bool sense = dev.AtaIdentify(out byte[] buffer, out AtaErrorRegistersChs errorRegisters,
                                          out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Decode buffer.");
-            DicConsole.WriteLine("3.- Decode error registers.");
-            DicConsole.WriteLine("4.- Send command again.");
-            DicConsole.WriteLine("0.- Return to CHS ATA commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending IDENTIFY DEVICE to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Decode buffer.");
+            AaruConsole.WriteLine("3.- Decode error registers.");
+            AaruConsole.WriteLine("4.- Send command again.");
+            AaruConsole.WriteLine("0.- Return to CHS ATA commands menu.");
+            AaruConsole.Write("Choose: ");
 
             string strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out int item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to CHS ATA commands menu...");
+                    AaruConsole.WriteLine("Returning to CHS ATA commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("IDENTIFY DEVICE response:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("IDENTIFY DEVICE response:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("IDENTIFY DEVICE decoded response:");
-                    if(buffer != null) DicConsole.WriteLine("{0}", Decoders.ATA.Identify.Prettify(buffer));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("IDENTIFY DEVICE decoded response:");
+
+                    if(buffer != null)
+                        AaruConsole.WriteLine("{0}", Decoders.ATA.Identify.Prettify(buffer));
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("IDENTIFY DEVICE status registers:");
-                    DicConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("IDENTIFY DEVICE status registers:");
+                    AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 4: goto start;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -191,76 +219,87 @@ namespace Aaru.Tests.Devices.ATA
             int    item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}",                         devPath);
-                DicConsole.WriteLine("Parameters for READ DMA {0}command:", retries ? "WITH RETRIES " : "");
-                DicConsole.WriteLine("Cylinder: {0}",                       cylinder);
-                DicConsole.WriteLine("Head: {0}",                           head);
-                DicConsole.WriteLine("Sector: {0}",                         sector);
-                DicConsole.WriteLine("Count: {0}",                          count);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to CHS ATA commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for READ DMA {0}command:", retries ? "WITH RETRIES " : "");
+                AaruConsole.WriteLine("Cylinder: {0}", cylinder);
+                AaruConsole.WriteLine("Head: {0}", head);
+                AaruConsole.WriteLine("Sector: {0}", sector);
+                AaruConsole.WriteLine("Count: {0}", count);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to CHS ATA commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to CHS ATA commands menu...");
+                        AaruConsole.WriteLine("Returning to CHS ATA commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.Write("What cylinder?: ");
+                        AaruConsole.Write("What cylinder?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!ushort.TryParse(strDev, out cylinder))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             cylinder = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("What head?: ");
+                        AaruConsole.Write("What head?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!byte.TryParse(strDev, out head))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             head = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
                         if(head > 15)
                         {
-                            DicConsole.WriteLine("Head cannot be bigger than 15. Setting it to 15...");
+                            AaruConsole.WriteLine("Head cannot be bigger than 15. Setting it to 15...");
                             head = 15;
                         }
 
-                        DicConsole.Write("What sector?: ");
+                        AaruConsole.Write("What sector?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!byte.TryParse(strDev, out sector))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             sector = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("How many sectors?: ");
+                        AaruConsole.Write("How many sectors?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!byte.TryParse(strDev, out count))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             count = 0;
                             System.Console.ReadKey();
                         }
@@ -272,65 +311,75 @@ namespace Aaru.Tests.Devices.ATA
 
             start:
             System.Console.Clear();
+
             bool sense = dev.ReadDma(out byte[] buffer, out AtaErrorRegistersChs errorRegisters, retries, cylinder,
                                      head, sector, count, dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}",                        devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}",       ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Decode error registers.");
-            DicConsole.WriteLine("3.- Send command again.");
-            DicConsole.WriteLine("4.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to CHS ATA commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending READ DMA {0}to the device:", retries ? "WITH RETRIES " : "");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Decode error registers.");
+            AaruConsole.WriteLine("3.- Send command again.");
+            AaruConsole.WriteLine("4.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to CHS ATA commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to CHS ATA commands menu...");
+                    AaruConsole.WriteLine("Returning to CHS ATA commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}",           devPath);
-                    DicConsole.WriteLine("READ DMA {0}response:", retries ? "WITH RETRIES " : "");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ DMA {0}response:", retries ? "WITH RETRIES " : "");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     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.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ DMA {0}status registers:", retries ? "WITH RETRIES " : "");
+                    AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3: goto start;
                 case 4: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -345,76 +394,87 @@ namespace Aaru.Tests.Devices.ATA
             int    item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}",                          devPath);
-                DicConsole.WriteLine("Parameters for READ LONG {0}command:", retries ? "WITH RETRIES " : "");
-                DicConsole.WriteLine("Cylinder: {0}",                        cylinder);
-                DicConsole.WriteLine("Head: {0}",                            head);
-                DicConsole.WriteLine("Sector: {0}",                          sector);
-                DicConsole.WriteLine("Block size: {0}",                      blockSize);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to CHS ATA commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for READ LONG {0}command:", retries ? "WITH RETRIES " : "");
+                AaruConsole.WriteLine("Cylinder: {0}", cylinder);
+                AaruConsole.WriteLine("Head: {0}", head);
+                AaruConsole.WriteLine("Sector: {0}", sector);
+                AaruConsole.WriteLine("Block size: {0}", blockSize);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to CHS ATA commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to CHS ATA commands menu...");
+                        AaruConsole.WriteLine("Returning to CHS ATA commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.Write("What cylinder?: ");
+                        AaruConsole.Write("What cylinder?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!ushort.TryParse(strDev, out cylinder))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             cylinder = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("What head?: ");
+                        AaruConsole.Write("What head?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!byte.TryParse(strDev, out head))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             head = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
                         if(head > 15)
                         {
-                            DicConsole.WriteLine("Head cannot be bigger than 15. Setting it to 15...");
+                            AaruConsole.WriteLine("Head cannot be bigger than 15. Setting it to 15...");
                             head = 15;
                         }
 
-                        DicConsole.Write("What sector?: ");
+                        AaruConsole.Write("What sector?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!byte.TryParse(strDev, out sector))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             sector = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("How many bytes to expect?: ");
+                        AaruConsole.Write("How many bytes to expect?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!uint.TryParse(strDev, out blockSize))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             blockSize = 0;
                             System.Console.ReadKey();
                         }
@@ -426,65 +486,75 @@ namespace Aaru.Tests.Devices.ATA
 
             start:
             System.Console.Clear();
+
             bool sense = dev.ReadLong(out byte[] buffer, out AtaErrorRegistersChs errorRegisters, retries, cylinder,
                                       head, sector, blockSize, dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}",                         devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}",        ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Decode error registers.");
-            DicConsole.WriteLine("3.- Send command again.");
-            DicConsole.WriteLine("4.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to CHS ATA commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending READ LONG {0}to the device:", retries ? "WITH RETRIES " : "");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Decode error registers.");
+            AaruConsole.WriteLine("3.- Send command again.");
+            AaruConsole.WriteLine("4.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to CHS ATA commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to CHS ATA commands menu...");
+                    AaruConsole.WriteLine("Returning to CHS ATA commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}",            devPath);
-                    DicConsole.WriteLine("READ LONG {0}response:", retries ? "WITH RETRIES " : "");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ LONG {0}response:", retries ? "WITH RETRIES " : "");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     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.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ LONG {0}status registers:", retries ? "WITH RETRIES " : "");
+                    AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3: goto start;
                 case 4: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -499,76 +569,87 @@ namespace Aaru.Tests.Devices.ATA
             int    item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Parameters for READ MULTIPLE command:");
-                DicConsole.WriteLine("Cylinder: {0}", cylinder);
-                DicConsole.WriteLine("Head: {0}",     head);
-                DicConsole.WriteLine("Sector: {0}",   sector);
-                DicConsole.WriteLine("Count: {0}",    count);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to CHS ATA commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for READ MULTIPLE command:");
+                AaruConsole.WriteLine("Cylinder: {0}", cylinder);
+                AaruConsole.WriteLine("Head: {0}", head);
+                AaruConsole.WriteLine("Sector: {0}", sector);
+                AaruConsole.WriteLine("Count: {0}", count);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to CHS ATA commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to CHS ATA commands menu...");
+                        AaruConsole.WriteLine("Returning to CHS ATA commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.Write("What cylinder?: ");
+                        AaruConsole.Write("What cylinder?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!ushort.TryParse(strDev, out cylinder))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             cylinder = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("What head?: ");
+                        AaruConsole.Write("What head?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!byte.TryParse(strDev, out head))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             head = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
                         if(head > 15)
                         {
-                            DicConsole.WriteLine("Head cannot be bigger than 15. Setting it to 15...");
+                            AaruConsole.WriteLine("Head cannot be bigger than 15. Setting it to 15...");
                             head = 15;
                         }
 
-                        DicConsole.Write("What sector?: ");
+                        AaruConsole.Write("What sector?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!byte.TryParse(strDev, out sector))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             sector = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("How many sectors?: ");
+                        AaruConsole.Write("How many sectors?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!byte.TryParse(strDev, out count))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             count = 0;
                             System.Console.ReadKey();
                         }
@@ -580,65 +661,75 @@ namespace Aaru.Tests.Devices.ATA
 
             start:
             System.Console.Clear();
+
             bool sense = dev.ReadMultiple(out byte[] buffer, out AtaErrorRegistersChs errorRegisters, cylinder, head,
                                           sector, count, dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Decode error registers.");
-            DicConsole.WriteLine("3.- Send command again.");
-            DicConsole.WriteLine("4.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to CHS ATA commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending READ MULTIPLE to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Decode error registers.");
+            AaruConsole.WriteLine("3.- Send command again.");
+            AaruConsole.WriteLine("4.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to CHS ATA commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to CHS ATA commands menu...");
+                    AaruConsole.WriteLine("Returning to CHS ATA commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ MULTIPLE response:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ MULTIPLE response:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ MULTIPLE status registers:");
-                    DicConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ MULTIPLE status registers:");
+                    AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3: goto start;
                 case 4: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -653,76 +744,87 @@ namespace Aaru.Tests.Devices.ATA
             int    item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}",                             devPath);
-                DicConsole.WriteLine("Parameters for READ SECTORS {0}command:", retries ? "WITH RETRIES " : "");
-                DicConsole.WriteLine("Cylinder: {0}",                           cylinder);
-                DicConsole.WriteLine("Head: {0}",                               head);
-                DicConsole.WriteLine("Sector: {0}",                             sector);
-                DicConsole.WriteLine("Count: {0}",                              count);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to CHS ATA commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for READ SECTORS {0}command:", retries ? "WITH RETRIES " : "");
+                AaruConsole.WriteLine("Cylinder: {0}", cylinder);
+                AaruConsole.WriteLine("Head: {0}", head);
+                AaruConsole.WriteLine("Sector: {0}", sector);
+                AaruConsole.WriteLine("Count: {0}", count);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to CHS ATA commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to CHS ATA commands menu...");
+                        AaruConsole.WriteLine("Returning to CHS ATA commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.Write("What cylinder?: ");
+                        AaruConsole.Write("What cylinder?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!ushort.TryParse(strDev, out cylinder))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             cylinder = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("What head?: ");
+                        AaruConsole.Write("What head?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!byte.TryParse(strDev, out head))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             head = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
                         if(head > 15)
                         {
-                            DicConsole.WriteLine("Head cannot be bigger than 15. Setting it to 15...");
+                            AaruConsole.WriteLine("Head cannot be bigger than 15. Setting it to 15...");
                             head = 15;
                         }
 
-                        DicConsole.Write("What sector?: ");
+                        AaruConsole.Write("What sector?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!byte.TryParse(strDev, out sector))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             sector = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("How many sectors?: ");
+                        AaruConsole.Write("How many sectors?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!byte.TryParse(strDev, out count))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             count = 0;
                             System.Console.ReadKey();
                         }
@@ -734,65 +836,75 @@ namespace Aaru.Tests.Devices.ATA
 
             start:
             System.Console.Clear();
+
             bool sense = dev.Read(out byte[] buffer, out AtaErrorRegistersChs errorRegisters, retries, cylinder, head,
                                   sector, count, dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}",                            devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}",           ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Decode error registers.");
-            DicConsole.WriteLine("3.- Send command again.");
-            DicConsole.WriteLine("4.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to CHS ATA commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending READ SECTORS {0}to the device:", retries ? "WITH RETRIES " : "");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Decode error registers.");
+            AaruConsole.WriteLine("3.- Send command again.");
+            AaruConsole.WriteLine("4.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to CHS ATA commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to CHS ATA commands menu...");
+                    AaruConsole.WriteLine("Returning to CHS ATA commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}",               devPath);
-                    DicConsole.WriteLine("READ SECTORS {0}response:", retries ? "WITH RETRIES " : "");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ SECTORS {0}response:", retries ? "WITH RETRIES " : "");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     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.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ SECTORS {0}status registers:", retries ? "WITH RETRIES " : "");
+                    AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3: goto start;
                 case 4: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -806,65 +918,74 @@ namespace Aaru.Tests.Devices.ATA
             int    item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Parameters for SEEK command:");
-                DicConsole.WriteLine("Cylinder: {0}", cylinder);
-                DicConsole.WriteLine("Head: {0}",     head);
-                DicConsole.WriteLine("Sector: {0}",   sector);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to CHS ATA commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for SEEK command:");
+                AaruConsole.WriteLine("Cylinder: {0}", cylinder);
+                AaruConsole.WriteLine("Head: {0}", head);
+                AaruConsole.WriteLine("Sector: {0}", sector);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to CHS ATA commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to CHS ATA commands menu...");
+                        AaruConsole.WriteLine("Returning to CHS ATA commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.Write("What cylinder?: ");
+                        AaruConsole.Write("What cylinder?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!ushort.TryParse(strDev, out cylinder))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             cylinder = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("What head?: ");
+                        AaruConsole.Write("What head?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!byte.TryParse(strDev, out head))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             head = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
                         if(head > 15)
                         {
-                            DicConsole.WriteLine("Head cannot be bigger than 15. Setting it to 15...");
+                            AaruConsole.WriteLine("Head cannot be bigger than 15. Setting it to 15...");
                             head = 15;
                         }
 
-                        DicConsole.Write("What sector?: ");
+                        AaruConsole.Write("What sector?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!byte.TryParse(strDev, out sector))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             sector = 0;
                             System.Console.ReadKey();
                         }
@@ -876,52 +997,58 @@ namespace Aaru.Tests.Devices.ATA
 
             start:
             System.Console.Clear();
+
             bool sense = dev.Seek(out AtaErrorRegistersChs errorRegisters, cylinder, head, sector, dev.Timeout,
                                   out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            DicConsole.WriteLine("Sending SEEK to the device:");
-            DicConsole.WriteLine("Command took {0} ms.", duration);
-            DicConsole.WriteLine("Sense is {0}.",        sense);
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Decode error registers.");
-            DicConsole.WriteLine("2.- Send command again.");
-            DicConsole.WriteLine("3.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to CHS ATA commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending SEEK to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Decode error registers.");
+            AaruConsole.WriteLine("2.- Send command again.");
+            AaruConsole.WriteLine("3.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to CHS ATA commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to CHS ATA commands menu...");
+                    AaruConsole.WriteLine("Returning to CHS ATA commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("SEEK status registers:");
-                    DicConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("SEEK status registers:");
+                    AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2: goto start;
                 case 3: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -937,85 +1064,96 @@ namespace Aaru.Tests.Devices.ATA
             int    item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Parameters for SET FEATURES command:");
-                DicConsole.WriteLine("Cylinder: {0}",     cylinder);
-                DicConsole.WriteLine("Head: {0}",         head);
-                DicConsole.WriteLine("Sector: {0}",       sector);
-                DicConsole.WriteLine("Sector count: {0}", sectorCount);
-                DicConsole.WriteLine("Feature: 0x{0:X2}", feature);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to CHS ATA commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for SET FEATURES command:");
+                AaruConsole.WriteLine("Cylinder: {0}", cylinder);
+                AaruConsole.WriteLine("Head: {0}", head);
+                AaruConsole.WriteLine("Sector: {0}", sector);
+                AaruConsole.WriteLine("Sector count: {0}", sectorCount);
+                AaruConsole.WriteLine("Feature: 0x{0:X2}", feature);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to CHS ATA commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to CHS ATA commands menu...");
+                        AaruConsole.WriteLine("Returning to CHS ATA commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.Write("What cylinder?: ");
+                        AaruConsole.Write("What cylinder?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!ushort.TryParse(strDev, out cylinder))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             cylinder = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("What head?: ");
+                        AaruConsole.Write("What head?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!byte.TryParse(strDev, out head))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             head = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
                         if(head > 15)
                         {
-                            DicConsole.WriteLine("Head cannot be bigger than 15. Setting it to 15...");
+                            AaruConsole.WriteLine("Head cannot be bigger than 15. Setting it to 15...");
                             head = 15;
                         }
 
-                        DicConsole.Write("What sector?: ");
+                        AaruConsole.Write("What sector?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!byte.TryParse(strDev, out sector))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             sector = 0;
                             System.Console.ReadKey();
                         }
 
-                        DicConsole.Write("What sector count?: ");
+                        AaruConsole.Write("What sector count?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!byte.TryParse(strDev, out sectorCount))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             sectorCount = 0;
                             System.Console.ReadKey();
                         }
 
-                        DicConsole.Write("What feature?: ");
+                        AaruConsole.Write("What feature?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!byte.TryParse(strDev, out feature))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             feature = 0;
                             System.Console.ReadKey();
                         }
@@ -1027,52 +1165,58 @@ namespace Aaru.Tests.Devices.ATA
 
             start:
             System.Console.Clear();
+
             bool sense = dev.Seek(out AtaErrorRegistersChs errorRegisters, cylinder, head, sector, dev.Timeout,
                                   out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            DicConsole.WriteLine("Sending SET FEATURES to the device:");
-            DicConsole.WriteLine("Command took {0} ms.", duration);
-            DicConsole.WriteLine("Sense is {0}.",        sense);
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Decode error registers.");
-            DicConsole.WriteLine("2.- Send command again.");
-            DicConsole.WriteLine("3.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to CHS ATA commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending SET FEATURES to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Decode error registers.");
+            AaruConsole.WriteLine("2.- Send command again.");
+            AaruConsole.WriteLine("3.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to CHS ATA commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to CHS ATA commands menu...");
+                    AaruConsole.WriteLine("Returning to CHS ATA commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("SET FEATURES status registers:");
-                    DicConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("SET FEATURES status registers:");
+                    AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2: goto start;
                 case 3: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
diff --git a/Aaru.Tests.Devices/ATA/Atapi.cs b/Aaru.Tests.Devices/ATA/Atapi.cs
index 41da95859..bd1dcc856 100644
--- a/Aaru.Tests.Devices/ATA/Atapi.cs
+++ b/Aaru.Tests.Devices/ATA/Atapi.cs
@@ -32,38 +32,43 @@ using Aaru.Devices;
 
 namespace Aaru.Tests.Devices.ATA
 {
-    static class Atapi
+    internal static class Atapi
     {
         internal static void Menu(string devPath, Device dev)
         {
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Send an ATAPI command to the device:");
-                DicConsole.WriteLine("1.- Send IDENTIFY PACKET DEVICE command.");
-                DicConsole.WriteLine("0.- Return to ATA commands menu.");
-                DicConsole.Write("Choose: ");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Send an ATAPI command to the device:");
+                AaruConsole.WriteLine("1.- Send IDENTIFY PACKET DEVICE command.");
+                AaruConsole.WriteLine("0.- Return to ATA commands menu.");
+                AaruConsole.Write("Choose: ");
 
                 string strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out int item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to ATA commands menu...");
+                        AaruConsole.WriteLine("Returning to ATA commands menu...");
+
                         return;
                     case 1:
                         Identify(devPath, dev);
+
                         continue;
                     default:
-                        DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                        AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                         System.Console.ReadKey();
+
                         continue;
                 }
             }
@@ -73,74 +78,88 @@ namespace Aaru.Tests.Devices.ATA
         {
             start:
             System.Console.Clear();
+
             bool sense = dev.AtapiIdentify(out byte[] buffer, out AtaErrorRegistersChs errorRegisters,
                                            out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Decode buffer.");
-            DicConsole.WriteLine("3.- Decode error registers.");
-            DicConsole.WriteLine("4.- Send command again.");
-            DicConsole.WriteLine("0.- Return to ATAPI commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending IDENTIFY PACKET DEVICE to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Decode buffer.");
+            AaruConsole.WriteLine("3.- Decode error registers.");
+            AaruConsole.WriteLine("4.- Send command again.");
+            AaruConsole.WriteLine("0.- Return to ATAPI commands menu.");
+            AaruConsole.Write("Choose: ");
 
             string strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out int item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to ATAPI commands menu...");
+                    AaruConsole.WriteLine("Returning to ATAPI commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("IDENTIFY PACKET DEVICE response:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("IDENTIFY PACKET DEVICE response:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("IDENTIFY PACKET DEVICE decoded response:");
-                    if(buffer != null) DicConsole.WriteLine("{0}", Decoders.ATA.Identify.Prettify(buffer));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("IDENTIFY PACKET DEVICE decoded response:");
+
+                    if(buffer != null)
+                        AaruConsole.WriteLine("{0}", Decoders.ATA.Identify.Prettify(buffer));
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("IDENTIFY PACKET DEVICE status registers:");
-                    DicConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("IDENTIFY PACKET DEVICE status registers:");
+                    AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 4: goto start;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
diff --git a/Aaru.Tests.Devices/ATA/Cfa.cs b/Aaru.Tests.Devices/ATA/Cfa.cs
index 2d2db950c..9adcb6932 100644
--- a/Aaru.Tests.Devices/ATA/Cfa.cs
+++ b/Aaru.Tests.Devices/ATA/Cfa.cs
@@ -32,46 +32,53 @@ using Aaru.Devices;
 
 namespace Aaru.Tests.Devices.ATA
 {
-    static class Cfa
+    internal static class Cfa
     {
         internal static void Menu(string devPath, Device dev)
         {
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Send a CompactFlash command to the device:");
-                DicConsole.WriteLine("1.- Send REQUEST EXTENDED ERROR CODE command.");
-                DicConsole.WriteLine("2.- Send CHS TRANSLATE SECTOR command.");
-                DicConsole.WriteLine("3.- Send LBA TRANSLATE SECTOR command.");
-                DicConsole.WriteLine("0.- Return to ATA commands menu.");
-                DicConsole.Write("Choose: ");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Send a CompactFlash command to the device:");
+                AaruConsole.WriteLine("1.- Send REQUEST EXTENDED ERROR CODE command.");
+                AaruConsole.WriteLine("2.- Send CHS TRANSLATE SECTOR command.");
+                AaruConsole.WriteLine("3.- Send LBA TRANSLATE SECTOR command.");
+                AaruConsole.WriteLine("0.- Return to ATA commands menu.");
+                AaruConsole.Write("Choose: ");
 
                 string strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out int item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to ATA commands menu...");
+                        AaruConsole.WriteLine("Returning to ATA commands menu...");
+
                         return;
                     case 1:
                         RequestExtendedErrorCode(devPath, dev);
+
                         continue;
                     case 2:
                         TranslateSectorChs(devPath, dev);
+
                         continue;
                     case 3:
                         TranslateSectorLba(devPath, dev);
+
                         continue;
                     default:
-                        DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                        AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                         System.Console.ReadKey();
+
                         continue;
                 }
             }
@@ -81,51 +88,57 @@ namespace Aaru.Tests.Devices.ATA
         {
             start:
             System.Console.Clear();
+
             bool sense = dev.RequestExtendedErrorCode(out byte errorCode, out AtaErrorRegistersLba28 errorRegisters,
                                                       dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            DicConsole.WriteLine("Sending REQUEST EXTENDED ERROR CODE to the device:");
-            DicConsole.WriteLine("Command took {0} ms.", duration);
-            DicConsole.WriteLine("Sense is {0}.",        sense);
-            DicConsole.WriteLine("Error code is {0}.",   errorCode);
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Decode error registers.");
-            DicConsole.WriteLine("2.- Send command again.");
-            DicConsole.WriteLine("0.- Return to CompactFlash commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending REQUEST EXTENDED ERROR CODE to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Error code is {0}.", errorCode);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Decode error registers.");
+            AaruConsole.WriteLine("2.- Send command again.");
+            AaruConsole.WriteLine("0.- Return to CompactFlash commands menu.");
+            AaruConsole.Write("Choose: ");
 
             string strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out int item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to CompactFlash commands menu...");
+                    AaruConsole.WriteLine("Returning to CompactFlash commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("REQUEST EXTENDED ERROR CODE status registers:");
-                    DicConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("REQUEST EXTENDED ERROR CODE status registers:");
+                    AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2: goto start;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -139,65 +152,74 @@ namespace Aaru.Tests.Devices.ATA
             int    item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Parameters for TRANSLATE SECTOR command:");
-                DicConsole.WriteLine("Cylinder: {0}", cylinder);
-                DicConsole.WriteLine("Head: {0}",     head);
-                DicConsole.WriteLine("Sector: {0}",   sector);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to CompactFlash commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for TRANSLATE SECTOR command:");
+                AaruConsole.WriteLine("Cylinder: {0}", cylinder);
+                AaruConsole.WriteLine("Head: {0}", head);
+                AaruConsole.WriteLine("Sector: {0}", sector);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to CompactFlash commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to CompactFlash commands menu...");
+                        AaruConsole.WriteLine("Returning to CompactFlash commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.Write("What cylinder?: ");
+                        AaruConsole.Write("What cylinder?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!ushort.TryParse(strDev, out cylinder))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             cylinder = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("What head?: ");
+                        AaruConsole.Write("What head?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!byte.TryParse(strDev, out head))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             head = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
                         if(head > 15)
                         {
-                            DicConsole.WriteLine("Head cannot be bigger than 15. Setting it to 15...");
+                            AaruConsole.WriteLine("Head cannot be bigger than 15. Setting it to 15...");
                             head = 15;
                         }
 
-                        DicConsole.Write("What sector?: ");
+                        AaruConsole.Write("What sector?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!byte.TryParse(strDev, out sector))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             sector = 0;
                             System.Console.ReadKey();
                         }
@@ -209,65 +231,75 @@ namespace Aaru.Tests.Devices.ATA
 
             start:
             System.Console.Clear();
+
             bool sense = dev.TranslateSector(out byte[] buffer, out AtaErrorRegistersChs errorRegisters, cylinder, head,
                                              sector, dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Decode error registers.");
-            DicConsole.WriteLine("3.- Send command again.");
-            DicConsole.WriteLine("4.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to CompactFlash commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending TRANSLATE SECTOR to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Decode error registers.");
+            AaruConsole.WriteLine("3.- Send command again.");
+            AaruConsole.WriteLine("4.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to CompactFlash commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to CompactFlash commands menu...");
+                    AaruConsole.WriteLine("Returning to CompactFlash commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("TRANSLATE SECTOR response:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("TRANSLATE SECTOR response:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("TRANSLATE SECTOR status registers:");
-                    DicConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("TRANSLATE SECTOR status registers:");
+                    AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3: goto start;
                 case 4: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -279,47 +311,54 @@ namespace Aaru.Tests.Devices.ATA
             int    item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Parameters for TRANSLATE SECTOR command:");
-                DicConsole.WriteLine("LBA: {0}", lba);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to CompactFlash commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for TRANSLATE SECTOR command:");
+                AaruConsole.WriteLine("LBA: {0}", lba);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to CompactFlash commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to CompactFlash commands menu...");
+                        AaruConsole.WriteLine("Returning to CompactFlash commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.Write("What logical block address?: ");
+                        AaruConsole.Write("What logical block address?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!uint.TryParse(strDev, out lba))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             lba = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
                         if(lba > 0xFFFFFFF)
                         {
-                            DicConsole
-                               .WriteLine("Logical block address cannot be bigger than {0}. Setting it to {0}...",
+                            AaruConsole.
+                                WriteLine("Logical block address cannot be bigger than {0}. Setting it to {0}...",
                                           0xFFFFFFF);
+
                             lba = 0xFFFFFFF;
                         }
 
@@ -330,65 +369,75 @@ namespace Aaru.Tests.Devices.ATA
 
             start:
             System.Console.Clear();
+
             bool sense = dev.TranslateSector(out byte[] buffer, out AtaErrorRegistersLba28 errorRegisters, lba,
                                              dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Decode error registers.");
-            DicConsole.WriteLine("3.- Send command again.");
-            DicConsole.WriteLine("4.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to CompactFlash commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending TRANSLATE SECTOR to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Decode error registers.");
+            AaruConsole.WriteLine("3.- Send command again.");
+            AaruConsole.WriteLine("4.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to CompactFlash commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to CompactFlash commands menu...");
+                    AaruConsole.WriteLine("Returning to CompactFlash commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("TRANSLATE SECTOR response:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("TRANSLATE SECTOR response:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("TRANSLATE SECTOR status registers:");
-                    DicConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("TRANSLATE SECTOR status registers:");
+                    AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3: goto start;
                 case 4: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
diff --git a/Aaru.Tests.Devices/ATA/MCPT.cs b/Aaru.Tests.Devices/ATA/MCPT.cs
index 0408bd638..0b7068bbe 100644
--- a/Aaru.Tests.Devices/ATA/MCPT.cs
+++ b/Aaru.Tests.Devices/ATA/MCPT.cs
@@ -32,38 +32,43 @@ using Aaru.Devices;
 
 namespace Aaru.Tests.Devices.ATA
 {
-    static class Mcpt
+    internal static class Mcpt
     {
         internal static void Menu(string devPath, Device dev)
         {
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Send a Media Card Pass Through command to the device:");
-                DicConsole.WriteLine("1.- Send CHECK MEDIA CARD TYPE command.");
-                DicConsole.WriteLine("0.- Return to ATA commands menu.");
-                DicConsole.Write("Choose: ");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Send a Media Card Pass Through command to the device:");
+                AaruConsole.WriteLine("1.- Send CHECK MEDIA CARD TYPE command.");
+                AaruConsole.WriteLine("0.- Return to ATA commands menu.");
+                AaruConsole.Write("Choose: ");
 
                 string strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out int item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to ATA commands menu...");
+                        AaruConsole.WriteLine("Returning to ATA commands menu...");
+
                         return;
                     case 1:
                         CheckMediaCardType(devPath, dev);
+
                         continue;
                     default:
-                        DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                        AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                         System.Console.ReadKey();
+
                         continue;
                 }
             }
@@ -76,37 +81,42 @@ namespace Aaru.Tests.Devices.ATA
             int    item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Parameters for CHECK MEDIA CARD TYPE command:");
-                DicConsole.WriteLine("Feature: {0}", feature);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to Media Card Pass Through commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for CHECK MEDIA CARD TYPE command:");
+                AaruConsole.WriteLine("Feature: {0}", feature);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to Media Card Pass Through commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to Media Card Pass Through commands menu...");
+                        AaruConsole.WriteLine("Returning to Media Card Pass Through commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.Write("Feature?: ");
+                        AaruConsole.Write("Feature?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!byte.TryParse(strDev, out feature))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             feature = 0;
                             System.Console.ReadKey();
                         }
@@ -118,43 +128,48 @@ namespace Aaru.Tests.Devices.ATA
 
             start:
             System.Console.Clear();
+
             bool sense = dev.CheckMediaCardType(feature, out AtaErrorRegistersChs errorRegisters, dev.Timeout,
                                                 out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            DicConsole.WriteLine("Sending CHECK MEDIA CARD TYPE to the device:");
-            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.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Send command again.");
-            DicConsole.WriteLine("2.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to Media Card Pass Through commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending CHECK MEDIA CARD TYPE to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("CHECK MEDIA CARD TYPE status registers:");
+            AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Send command again.");
+            AaruConsole.WriteLine("2.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to Media Card Pass Through commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to Media Card Pass Through commands menu...");
+                    AaruConsole.WriteLine("Returning to Media Card Pass Through commands menu...");
+
                     return;
                 case 1: goto start;
                 case 2: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
diff --git a/Aaru.Tests.Devices/ATA/Smart.cs b/Aaru.Tests.Devices/ATA/Smart.cs
index a89a28d0c..82aa5abcb 100644
--- a/Aaru.Tests.Devices/ATA/Smart.cs
+++ b/Aaru.Tests.Devices/ATA/Smart.cs
@@ -32,66 +32,78 @@ using Aaru.Devices;
 
 namespace Aaru.Tests.Devices.ATA
 {
-    static class Smart
+    internal static class Smart
     {
         internal static void Menu(string devPath, Device dev)
         {
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Send a S.M.A.R.T. command to the device:");
-                DicConsole.WriteLine("1.- Send DISABLE ATTRIBUTE AUTOSAVE command.");
-                DicConsole.WriteLine("2.- Send DISABLE OPERATIONS command.");
-                DicConsole.WriteLine("3.- Send ENABLE ATTRIBUTE AUTOSAVE command.");
-                DicConsole.WriteLine("4.- Send ENABLE OPERATIONS command.");
-                DicConsole.WriteLine("5.- Send EXECUTE OFF-LINE IMMEDIATE command.");
-                DicConsole.WriteLine("6.- Send READ DATA command.");
-                DicConsole.WriteLine("7.- Send READ LOG command.");
-                DicConsole.WriteLine("8.- Send RETURN STATUS command.");
-                DicConsole.WriteLine("0.- Return to ATA commands menu.");
-                DicConsole.Write("Choose: ");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Send a S.M.A.R.T. command to the device:");
+                AaruConsole.WriteLine("1.- Send DISABLE ATTRIBUTE AUTOSAVE command.");
+                AaruConsole.WriteLine("2.- Send DISABLE OPERATIONS command.");
+                AaruConsole.WriteLine("3.- Send ENABLE ATTRIBUTE AUTOSAVE command.");
+                AaruConsole.WriteLine("4.- Send ENABLE OPERATIONS command.");
+                AaruConsole.WriteLine("5.- Send EXECUTE OFF-LINE IMMEDIATE command.");
+                AaruConsole.WriteLine("6.- Send READ DATA command.");
+                AaruConsole.WriteLine("7.- Send READ LOG command.");
+                AaruConsole.WriteLine("8.- Send RETURN STATUS command.");
+                AaruConsole.WriteLine("0.- Return to ATA commands menu.");
+                AaruConsole.Write("Choose: ");
 
                 string strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out int item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to ATA commands menu...");
+                        AaruConsole.WriteLine("Returning to ATA commands menu...");
+
                         return;
                     case 1:
                         DisableAttributeAutosave(devPath, dev);
+
                         continue;
                     case 2:
                         DisableOperations(devPath, dev);
+
                         continue;
                     case 3:
                         EnableAttributeAutosave(devPath, dev);
+
                         continue;
                     case 4:
                         EnableOperations(devPath, dev);
+
                         continue;
                     case 5:
                         ExecuteOfflineImmediate(devPath, dev);
+
                         continue;
                     case 6:
                         ReadData(devPath, dev);
+
                         continue;
                     case 7:
                         ReadLog(devPath, dev);
+
                         continue;
                     case 8:
                         ReturnStatus(devPath, dev);
+
                         continue;
                     default:
-                        DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                        AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                         System.Console.ReadKey();
+
                         continue;
                 }
             }
@@ -101,42 +113,47 @@ namespace Aaru.Tests.Devices.ATA
         {
             start:
             System.Console.Clear();
+
             bool sense =
                 dev.SmartDisableAttributeAutosave(out AtaErrorRegistersLba28 errorRegisters, dev.Timeout,
                                                   out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            DicConsole.WriteLine("Sending DISABLE ATTRIBUTE AUTOSAVE to the device:");
-            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.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Send command again.");
-            DicConsole.WriteLine("0.- Return to S.M.A.R.T. commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending DISABLE ATTRIBUTE AUTOSAVE to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("DISABLE ATTRIBUTE AUTOSAVE status registers:");
+            AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Send command again.");
+            AaruConsole.WriteLine("0.- Return to S.M.A.R.T. commands menu.");
+            AaruConsole.Write("Choose: ");
 
             string strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out int item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to S.M.A.R.T. commands menu...");
+                    AaruConsole.WriteLine("Returning to S.M.A.R.T. commands menu...");
+
                     return;
                 case 1: goto start;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -148,37 +165,41 @@ namespace Aaru.Tests.Devices.ATA
             bool sense = dev.SmartDisable(out AtaErrorRegistersLba28 errorRegisters, dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            DicConsole.WriteLine("Sending DISABLE OPERATIONS to the device:");
-            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.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Send command again.");
-            DicConsole.WriteLine("0.- Return to S.M.A.R.T. commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending DISABLE OPERATIONS to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("DISABLE OPERATIONS status registers:");
+            AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Send command again.");
+            AaruConsole.WriteLine("0.- Return to S.M.A.R.T. commands menu.");
+            AaruConsole.Write("Choose: ");
 
             string strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out int item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to S.M.A.R.T. commands menu...");
+                    AaruConsole.WriteLine("Returning to S.M.A.R.T. commands menu...");
+
                     return;
                 case 1: goto start;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -187,42 +208,47 @@ namespace Aaru.Tests.Devices.ATA
         {
             start:
             System.Console.Clear();
+
             bool sense =
                 dev.SmartEnableAttributeAutosave(out AtaErrorRegistersLba28 errorRegisters, dev.Timeout,
                                                  out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            DicConsole.WriteLine("Sending ENABLE ATTRIBUTE AUTOSAVE to the device:");
-            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.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Send command again.");
-            DicConsole.WriteLine("0.- Return to S.M.A.R.T. commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending ENABLE ATTRIBUTE AUTOSAVE to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("ENABLE ATTRIBUTE AUTOSAVE status registers:");
+            AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Send command again.");
+            AaruConsole.WriteLine("0.- Return to S.M.A.R.T. commands menu.");
+            AaruConsole.Write("Choose: ");
 
             string strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out int item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to S.M.A.R.T. commands menu...");
+                    AaruConsole.WriteLine("Returning to S.M.A.R.T. commands menu...");
+
                     return;
                 case 1: goto start;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -234,37 +260,41 @@ namespace Aaru.Tests.Devices.ATA
             bool sense = dev.SmartEnable(out AtaErrorRegistersLba28 errorRegisters, dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            DicConsole.WriteLine("Sending ENABLE OPERATIONS to the device:");
-            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.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Send command again.");
-            DicConsole.WriteLine("0.- Return to S.M.A.R.T. commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending ENABLE OPERATIONS to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("ENABLE OPERATIONS status registers:");
+            AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Send command again.");
+            AaruConsole.WriteLine("0.- Return to S.M.A.R.T. commands menu.");
+            AaruConsole.Write("Choose: ");
 
             string strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out int item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to S.M.A.R.T. commands menu...");
+                    AaruConsole.WriteLine("Returning to S.M.A.R.T. commands menu...");
+
                     return;
                 case 1: goto start;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -276,37 +306,42 @@ namespace Aaru.Tests.Devices.ATA
             int    item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Parameters for EXECUTE OFF-LINE IMMEDIATE command:");
-                DicConsole.WriteLine("Subcommand: {0}", subcommand);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to S.M.A.R.T. commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for EXECUTE OFF-LINE IMMEDIATE command:");
+                AaruConsole.WriteLine("Subcommand: {0}", subcommand);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to S.M.A.R.T. commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to S.M.A.R.T. commands menu...");
+                        AaruConsole.WriteLine("Returning to S.M.A.R.T. commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.Write("Subcommand?: ");
+                        AaruConsole.Write("Subcommand?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!byte.TryParse(strDev, out subcommand))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             subcommand = 0;
                             System.Console.ReadKey();
                         }
@@ -318,43 +353,48 @@ namespace Aaru.Tests.Devices.ATA
 
             start:
             System.Console.Clear();
+
             bool sense = dev.SmartExecuteOffLineImmediate(out AtaErrorRegistersLba28 errorRegisters, subcommand,
                                                           dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            DicConsole.WriteLine("Sending EXECUTE OFF-LINE IMMEDIATE to the device:");
-            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.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Send command again.");
-            DicConsole.WriteLine("2.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to Media Card Pass Through commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending EXECUTE OFF-LINE IMMEDIATE to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("EXECUTE OFF-LINE IMMEDIATE status registers:");
+            AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Send command again.");
+            AaruConsole.WriteLine("2.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to Media Card Pass Through commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to S.M.A.R.T. commands menu...");
+                    AaruConsole.WriteLine("Returning to S.M.A.R.T. commands menu...");
+
                     return;
                 case 1: goto start;
                 case 2: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -363,63 +403,73 @@ namespace Aaru.Tests.Devices.ATA
         {
             start:
             System.Console.Clear();
+
             bool sense = dev.SmartReadData(out byte[] buffer, out AtaErrorRegistersLba28 errorRegisters, dev.Timeout,
                                            out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Decode error registers.");
-            DicConsole.WriteLine("3.- Send command again.");
-            DicConsole.WriteLine("0.- Return to S.M.A.R.T. commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending READ DATA to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Decode error registers.");
+            AaruConsole.WriteLine("3.- Send command again.");
+            AaruConsole.WriteLine("0.- Return to S.M.A.R.T. commands menu.");
+            AaruConsole.Write("Choose: ");
 
             string strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out int item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to S.M.A.R.T. commands menu...");
+                    AaruConsole.WriteLine("Returning to S.M.A.R.T. commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ DATA response:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ DATA response:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ DATA status registers:");
-                    DicConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ DATA status registers:");
+                    AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 4: goto start;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -431,37 +481,42 @@ namespace Aaru.Tests.Devices.ATA
             int    item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Parameters for READ LOG command:");
-                DicConsole.WriteLine("Log address: {0}", address);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to S.M.A.R.T. commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for READ LOG command:");
+                AaruConsole.WriteLine("Log address: {0}", address);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to S.M.A.R.T. commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to S.M.A.R.T. commands menu...");
+                        AaruConsole.WriteLine("Returning to S.M.A.R.T. commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.Write("Log address?: ");
+                        AaruConsole.Write("Log address?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!byte.TryParse(strDev, out address))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             address = 0;
                             System.Console.ReadKey();
                         }
@@ -473,65 +528,75 @@ namespace Aaru.Tests.Devices.ATA
 
             start:
             System.Console.Clear();
+
             bool sense = dev.SmartReadLog(out byte[] buffer, out AtaErrorRegistersLba28 errorRegisters, address,
                                           dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Decode error registers.");
-            DicConsole.WriteLine("3.- Send command again.");
-            DicConsole.WriteLine("4.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to S.M.A.R.T. commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending READ LOG to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Decode error registers.");
+            AaruConsole.WriteLine("3.- Send command again.");
+            AaruConsole.WriteLine("4.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to S.M.A.R.T. commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to S.M.A.R.T. commands menu...");
+                    AaruConsole.WriteLine("Returning to S.M.A.R.T. commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ LOG response:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ LOG response:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ LOG status registers:");
-                    DicConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ LOG status registers:");
+                    AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3: goto start;
                 case 4: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -540,41 +605,46 @@ namespace Aaru.Tests.Devices.ATA
         {
             start:
             System.Console.Clear();
+
             bool sense = dev.SmartReturnStatus(out AtaErrorRegistersLba28 errorRegisters, dev.Timeout,
                                                out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            DicConsole.WriteLine("Sending RETURN STATUS to the device:");
-            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.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Send command again.");
-            DicConsole.WriteLine("0.- Return to S.M.A.R.T. commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending RETURN STATUS to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("RETURN STATUS status registers:");
+            AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Send command again.");
+            AaruConsole.WriteLine("0.- Return to S.M.A.R.T. commands menu.");
+            AaruConsole.Write("Choose: ");
 
             string strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out int item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to S.M.A.R.T. commands menu...");
+                    AaruConsole.WriteLine("Returning to S.M.A.R.T. commands menu...");
+
                     return;
                 case 1: goto start;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
diff --git a/Aaru.Tests.Devices/Command.cs b/Aaru.Tests.Devices/Command.cs
index aee3cfe50..29c4b66b7 100644
--- a/Aaru.Tests.Devices/Command.cs
+++ b/Aaru.Tests.Devices/Command.cs
@@ -31,50 +31,58 @@ using Aaru.Devices;
 
 namespace Aaru.Tests.Devices
 {
-    static partial class MainClass
+    internal static partial class MainClass
     {
         public static void Command(string devPath, Device dev)
         {
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Send a command to the device:");
-                DicConsole.WriteLine("1.- Send a SCSI command.");
-                DicConsole.WriteLine("2.- Send an ATA command.");
-                DicConsole.WriteLine("3.- Send a SecureDigital/MultiMediaCard command.");
-                DicConsole.WriteLine("4.- Send a NVMe command.");
-                DicConsole.WriteLine("0.- Return to device menu.");
-                DicConsole.Write("Choose: ");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Send a command to the device:");
+                AaruConsole.WriteLine("1.- Send a SCSI command.");
+                AaruConsole.WriteLine("2.- Send an ATA command.");
+                AaruConsole.WriteLine("3.- Send a SecureDigital/MultiMediaCard command.");
+                AaruConsole.WriteLine("4.- Send a NVMe command.");
+                AaruConsole.WriteLine("0.- Return to device menu.");
+                AaruConsole.Write("Choose: ");
 
                 string strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out int item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to device menu...");
+                        AaruConsole.WriteLine("Returning to device menu...");
+
                         return;
                     case 1:
                         Scsi(devPath, dev);
+
                         continue;
                     case 2:
                         Ata(devPath, dev);
+
                         continue;
                     case 3:
                         SecureDigital(devPath, dev);
+
                         continue;
                     case 4:
                         NVMe(devPath, dev);
+
                         continue;
                     default:
-                        DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                        AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                         System.Console.ReadKey();
+
                         continue;
                 }
             }
diff --git a/Aaru.Tests.Devices/DecodeATARegisters.cs b/Aaru.Tests.Devices/DecodeATARegisters.cs
index c7cc49085..ae0443006 100644
--- a/Aaru.Tests.Devices/DecodeATARegisters.cs
+++ b/Aaru.Tests.Devices/DecodeATARegisters.cs
@@ -32,20 +32,35 @@ using Aaru.Decoders.ATA;
 
 namespace Aaru.Tests.Devices
 {
-    static partial class MainClass
+    internal static partial class MainClass
     {
         static string DecodeAtaStatus(byte status)
         {
             string ret = "";
 
-            if((status & 0x80) == 0x80) ret += "BSY ";
-            if((status & 0x40) == 0x40) ret += "DRDY ";
-            if((status & 0x20) == 0x20) ret += "DWF ";
-            if((status & 0x10) == 0x10) ret += "DSC ";
-            if((status & 0x8)  == 0x8) ret  += "DRQ ";
-            if((status & 0x4)  == 0x4) ret  += "CORR ";
-            if((status & 0x2)  == 0x2) ret  += "IDX ";
-            if((status & 0x1)  == 0x1) ret  += "ERR ";
+            if((status & 0x80) == 0x80)
+                ret += "BSY ";
+
+            if((status & 0x40) == 0x40)
+                ret += "DRDY ";
+
+            if((status & 0x20) == 0x20)
+                ret += "DWF ";
+
+            if((status & 0x10) == 0x10)
+                ret += "DSC ";
+
+            if((status & 0x8) == 0x8)
+                ret += "DRQ ";
+
+            if((status & 0x4) == 0x4)
+                ret += "CORR ";
+
+            if((status & 0x2) == 0x2)
+                ret += "IDX ";
+
+            if((status & 0x1) == 0x1)
+                ret += "ERR ";
 
             return ret;
         }
@@ -54,21 +69,36 @@ namespace Aaru.Tests.Devices
         {
             string ret = "";
 
-            if((status & 0x80) == 0x80) ret += "BBK ";
-            if((status & 0x40) == 0x40) ret += "UNC ";
-            if((status & 0x20) == 0x20) ret += "MC ";
-            if((status & 0x10) == 0x10) ret += "IDNF ";
-            if((status & 0x8)  == 0x8) ret  += "MCR ";
-            if((status & 0x4)  == 0x4) ret  += "ABRT ";
-            if((status & 0x2)  == 0x2) ret  += "TK0NF ";
-            if((status & 0x1)  == 0x1) ret  += "AMNF ";
+            if((status & 0x80) == 0x80)
+                ret += "BBK ";
+
+            if((status & 0x40) == 0x40)
+                ret += "UNC ";
+
+            if((status & 0x20) == 0x20)
+                ret += "MC ";
+
+            if((status & 0x10) == 0x10)
+                ret += "IDNF ";
+
+            if((status & 0x8) == 0x8)
+                ret += "MCR ";
+
+            if((status & 0x4) == 0x4)
+                ret += "ABRT ";
+
+            if((status & 0x2) == 0x2)
+                ret += "TK0NF ";
+
+            if((status & 0x1) == 0x1)
+                ret += "AMNF ";
 
             return ret;
         }
 
         public static string DecodeAtaRegisters(AtaErrorRegistersChs registers)
         {
-            StringBuilder sb = new StringBuilder();
+            var sb = new StringBuilder();
             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();
@@ -79,40 +109,47 @@ namespace Aaru.Tests.Devices
             sb.AppendFormat("LBA?: {0}", Convert.ToBoolean(registers.DeviceHead & 0x40)).AppendLine();
             sb.AppendFormat("Bit 7 set?: {0}", Convert.ToBoolean(registers.DeviceHead & 0x80)).AppendLine();
             sb.AppendFormat("Bit 5 set?: {0}", Convert.ToBoolean(registers.DeviceHead & 0x20)).AppendLine();
+
             return sb.ToString();
         }
 
         public static string DecodeAtaRegisters(AtaErrorRegistersLba28 registers)
         {
-            StringBuilder sb = new StringBuilder();
+            var sb = new StringBuilder();
             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) +
                             registers.LbaLow);
+
             sb.AppendFormat("Count: {0}", registers.SectorCount).AppendLine();
             sb.AppendFormat("LBA?: {0}", Convert.ToBoolean(registers.DeviceHead & 0x40)).AppendLine();
             sb.AppendFormat("Bit 7 set?: {0}", Convert.ToBoolean(registers.DeviceHead & 0x80)).AppendLine();
             sb.AppendFormat("Bit 5 set?: {0}", Convert.ToBoolean(registers.DeviceHead & 0x20)).AppendLine();
+
             return sb.ToString();
         }
 
         public static string DecodeAtaRegisters(AtaErrorRegistersLba48 registers)
         {
-            StringBuilder sb = new StringBuilder();
+            var sb = new StringBuilder();
             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      +
-                            registers.LbaHigh                   * (ulong)0x100000000L +
-                            (ulong)(registers.LbaMid << 16)                           +
+                            ((ulong)(registers.DeviceHead & 0xF) * 0x100000000000)      +
+                            (registers.LbaHigh                   * (ulong)0x100000000L) +
+                            (ulong)(registers.LbaMid << 16)                             +
                             registers.LbaLow);
+
             sb.AppendFormat("Count: {0}", registers.SectorCount).AppendLine();
             sb.AppendFormat("LBA?: {0}", Convert.ToBoolean(registers.DeviceHead & 0x40)).AppendLine();
             sb.AppendFormat("Bit 7 set?: {0}", Convert.ToBoolean(registers.DeviceHead & 0x80)).AppendLine();
             sb.AppendFormat("Bit 5 set?: {0}", Convert.ToBoolean(registers.DeviceHead & 0x20)).AppendLine();
+
             return sb.ToString();
         }
     }
diff --git a/Aaru.Tests.Devices/Device.cs b/Aaru.Tests.Devices/Device.cs
index 562258407..b272fe113 100644
--- a/Aaru.Tests.Devices/Device.cs
+++ b/Aaru.Tests.Devices/Device.cs
@@ -31,95 +31,110 @@ using Aaru.Devices;
 
 namespace Aaru.Tests.Devices
 {
-    static partial class MainClass
+    internal static partial class MainClass
     {
         public static void Device(string devPath)
         {
-            DicConsole.WriteLine("Going to open {0}. Press any key to continue...", devPath);
+            AaruConsole.WriteLine("Going to open {0}. Press any key to continue...", devPath);
             System.Console.ReadKey();
 
-            Device dev = new Device(devPath);
+            var dev = new Device(devPath);
 
             while(true)
             {
-                DicConsole.WriteLine("dev.PlatformID = {0}",        dev.PlatformId);
-                DicConsole.WriteLine("dev.FileHandle = {0}",        dev.FileHandle);
-                DicConsole.WriteLine("dev.Timeout = {0}",           dev.Timeout);
-                DicConsole.WriteLine("dev.Error = {0}",             dev.Error);
-                DicConsole.WriteLine("dev.LastError = {0}",         dev.LastError);
-                DicConsole.WriteLine("dev.Type = {0}",              dev.Type);
-                DicConsole.WriteLine("dev.Manufacturer = \"{0}\"",  dev.Manufacturer);
-                DicConsole.WriteLine("dev.Model = \"{0}\"",         dev.Model);
-                DicConsole.WriteLine("dev.Revision = \"{0}\"",      dev.FirmwareRevision);
-                DicConsole.WriteLine("dev.Serial = \"{0}\"",        dev.Serial);
-                DicConsole.WriteLine("dev.SCSIType = {0}",          dev.ScsiType);
-                DicConsole.WriteLine("dev.IsRemovable = {0}",       dev.IsRemovable);
-                DicConsole.WriteLine("dev.IsUSB = {0}",             dev.IsUsb);
-                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?.Length.ToString() ?? "null");
-                DicConsole.WriteLine("dev.USBManufacturerString = \"{0}\"", dev.UsbManufacturerString);
-                DicConsole.WriteLine("dev.USBProductString = \"{0}\"",      dev.UsbProductString);
-                DicConsole.WriteLine("dev.USBSerialString = \"{0}\"",       dev.UsbSerialString);
-                DicConsole.WriteLine("dev.IsFireWire = {0}",                dev.IsFireWire);
-                DicConsole.WriteLine("dev.FireWireGUID = {0:X16}",          dev.FireWireGuid);
-                DicConsole.WriteLine("dev.FireWireModel = 0x{0:X8}",        dev.FireWireModel);
-                DicConsole.WriteLine("dev.FireWireModelName = \"{0}\"",     dev.FireWireModelName);
-                DicConsole.WriteLine("dev.FireWireVendor = 0x{0:X8}",       dev.FireWireVendor);
-                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?.Length.ToString() ?? "null");
+                AaruConsole.WriteLine("dev.PlatformID = {0}", dev.PlatformId);
+                AaruConsole.WriteLine("dev.FileHandle = {0}", dev.FileHandle);
+                AaruConsole.WriteLine("dev.Timeout = {0}", dev.Timeout);
+                AaruConsole.WriteLine("dev.Error = {0}", dev.Error);
+                AaruConsole.WriteLine("dev.LastError = {0}", dev.LastError);
+                AaruConsole.WriteLine("dev.Type = {0}", dev.Type);
+                AaruConsole.WriteLine("dev.Manufacturer = \"{0}\"", dev.Manufacturer);
+                AaruConsole.WriteLine("dev.Model = \"{0}\"", dev.Model);
+                AaruConsole.WriteLine("dev.Revision = \"{0}\"", dev.FirmwareRevision);
+                AaruConsole.WriteLine("dev.Serial = \"{0}\"", dev.Serial);
+                AaruConsole.WriteLine("dev.SCSIType = {0}", dev.ScsiType);
+                AaruConsole.WriteLine("dev.IsRemovable = {0}", dev.IsRemovable);
+                AaruConsole.WriteLine("dev.IsUSB = {0}", dev.IsUsb);
+                AaruConsole.WriteLine("dev.USBVendorID = 0x{0:X4}", dev.UsbVendorId);
+                AaruConsole.WriteLine("dev.USBProductID = 0x{0:X4}", dev.UsbProductId);
 
-                DicConsole.WriteLine("Press any key to continue...", devPath);
+                AaruConsole.WriteLine("dev.USBDescriptors.Length = {0}",
+                                      dev.UsbDescriptors?.Length.ToString() ?? "null");
+
+                AaruConsole.WriteLine("dev.USBManufacturerString = \"{0}\"", dev.UsbManufacturerString);
+                AaruConsole.WriteLine("dev.USBProductString = \"{0}\"", dev.UsbProductString);
+                AaruConsole.WriteLine("dev.USBSerialString = \"{0}\"", dev.UsbSerialString);
+                AaruConsole.WriteLine("dev.IsFireWire = {0}", dev.IsFireWire);
+                AaruConsole.WriteLine("dev.FireWireGUID = {0:X16}", dev.FireWireGuid);
+                AaruConsole.WriteLine("dev.FireWireModel = 0x{0:X8}", dev.FireWireModel);
+                AaruConsole.WriteLine("dev.FireWireModelName = \"{0}\"", dev.FireWireModelName);
+                AaruConsole.WriteLine("dev.FireWireVendor = 0x{0:X8}", dev.FireWireVendor);
+                AaruConsole.WriteLine("dev.FireWireVendorName = \"{0}\"", dev.FireWireVendorName);
+                AaruConsole.WriteLine("dev.IsCompactFlash = {0}", dev.IsCompactFlash);
+                AaruConsole.WriteLine("dev.IsPCMCIA = {0}", dev.IsPcmcia);
+                AaruConsole.WriteLine("dev.CIS.Length = {0}", dev.Cis?.Length.ToString() ?? "null");
+
+                AaruConsole.WriteLine("Press any key to continue...", devPath);
                 System.Console.ReadKey();
 
                 menu:
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Options:");
-                DicConsole.WriteLine("1.- Print USB descriptors.");
-                DicConsole.WriteLine("2.- Print PCMCIA CIS.");
-                DicConsole.WriteLine("3.- Send a command to the device.");
-                DicConsole.WriteLine("0.- Return to device selection.");
-                DicConsole.Write("Choose: ");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Options:");
+                AaruConsole.WriteLine("1.- Print USB descriptors.");
+                AaruConsole.WriteLine("2.- Print PCMCIA CIS.");
+                AaruConsole.WriteLine("3.- Send a command to the device.");
+                AaruConsole.WriteLine("0.- Return to device selection.");
+                AaruConsole.Write("Choose: ");
 
                 string strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out int item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     goto menu;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to device selection...");
+                        AaruConsole.WriteLine("Returning to device selection...");
+
                         return;
                     case 1:
                         System.Console.Clear();
-                        DicConsole.WriteLine("Device: {0}", devPath);
-                        DicConsole.WriteLine("USB descriptors:");
-                        if(dev.UsbDescriptors != null) PrintHex.PrintHexArray(dev.UsbDescriptors, 64);
-                        DicConsole.WriteLine("Press any key to continue...");
+                        AaruConsole.WriteLine("Device: {0}", devPath);
+                        AaruConsole.WriteLine("USB descriptors:");
+
+                        if(dev.UsbDescriptors != null)
+                            PrintHex.PrintHexArray(dev.UsbDescriptors, 64);
+
+                        AaruConsole.WriteLine("Press any key to continue...");
                         System.Console.ReadKey();
+
                         goto menu;
                     case 2:
                         System.Console.Clear();
-                        DicConsole.WriteLine("Device: {0}", devPath);
-                        DicConsole.WriteLine("PCMCIA CIS:");
-                        if(dev.Cis != null) PrintHex.PrintHexArray(dev.Cis, 64);
-                        DicConsole.WriteLine("Press any key to continue...");
+                        AaruConsole.WriteLine("Device: {0}", devPath);
+                        AaruConsole.WriteLine("PCMCIA CIS:");
+
+                        if(dev.Cis != null)
+                            PrintHex.PrintHexArray(dev.Cis, 64);
+
+                        AaruConsole.WriteLine("Press any key to continue...");
                         System.Console.ReadKey();
+
                         goto menu;
                     case 3:
                         Command(devPath, dev);
+
                         goto menu;
                     default:
-                        DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                        AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                         System.Console.ReadKey();
+
                         goto menu;
                 }
             }
diff --git a/Aaru.Tests.Devices/Main.cs b/Aaru.Tests.Devices/Main.cs
index 6e165c401..12ce993ba 100644
--- a/Aaru.Tests.Devices/Main.cs
+++ b/Aaru.Tests.Devices/Main.cs
@@ -32,21 +32,23 @@ using Aaru.Devices;
 
 namespace Aaru.Tests.Devices
 {
-    static partial class MainClass
+    internal static partial class MainClass
     {
         public static void Main()
         {
-            DicConsole.WriteLineEvent        += System.Console.WriteLine;
-            DicConsole.WriteEvent            += System.Console.Write;
-            DicConsole.ErrorWriteLineEvent   += System.Console.Error.WriteLine;
-            DicConsole.DebugWriteLineEvent   += System.Console.Error.WriteLine;
-            DicConsole.VerboseWriteLineEvent += System.Console.WriteLine;
+            AaruConsole.WriteLineEvent        += System.Console.WriteLine;
+            AaruConsole.WriteEvent            += System.Console.Write;
+            AaruConsole.ErrorWriteLineEvent   += System.Console.Error.WriteLine;
+            AaruConsole.DebugWriteLineEvent   += System.Console.Error.WriteLine;
+            AaruConsole.VerboseWriteLineEvent += System.Console.WriteLine;
 
             DeviceInfo[] devices = Aaru.Devices.Device.ListDevices();
 
-            if(devices == null || devices.Length == 0)
+            if(devices        == null ||
+               devices.Length == 0)
             {
-                DicConsole.WriteLine("No known devices attached.");
+                AaruConsole.WriteLine("No known devices attached.");
+
                 return;
             }
 
@@ -56,37 +58,43 @@ namespace Aaru.Tests.Devices
             {
                 System.Console.Clear();
 
-                DicConsole.WriteLine("DiscImageChef device handling tests");
+                AaruConsole.WriteLine("DiscImageChef device handling tests");
+
+                AaruConsole.WriteLine("{6,-8}|{0,-22}|{1,-16}|{2,-24}|{3,-24}|{4,-10}|{5,-10}", "Path", "Vendor",
+                                      "Model", "Serial", "Bus", "Supported?", "Number");
+
+                AaruConsole.WriteLine("{6,-8}|{0,-22}+{1,-16}+{2,-24}+{3,-24}+{4,-10}+{5,-10}",
+                                      "----------------------", "----------------", "------------------------",
+                                      "------------------------", "----------", "----------", "--------");
 
-                DicConsole.WriteLine("{6,-8}|{0,-22}|{1,-16}|{2,-24}|{3,-24}|{4,-10}|{5,-10}", "Path", "Vendor",
-                                     "Model", "Serial", "Bus", "Supported?", "Number");
-                DicConsole.WriteLine("{6,-8}|{0,-22}+{1,-16}+{2,-24}+{3,-24}+{4,-10}+{5,-10}", "----------------------",
-                                     "----------------", "------------------------", "------------------------",
-                                     "----------", "----------", "--------");
                 for(int i = 0; i < devices.Length; i++)
-                    DicConsole.WriteLine("{6,-8}|{0,-22}|{1,-16}|{2,-24}|{3,-24}|{4,-10}|{5,-10}", devices[i].Path,
-                                         devices[i].Vendor, devices[i].Model, devices[i].Serial, devices[i].Bus,
-                                         devices[i].Supported, i + 1);
+                    AaruConsole.WriteLine("{6,-8}|{0,-22}|{1,-16}|{2,-24}|{3,-24}|{4,-10}|{5,-10}", devices[i].Path,
+                                          devices[i].Vendor, devices[i].Model, devices[i].Serial, devices[i].Bus,
+                                          devices[i].Supported, i + 1);
 
-                DicConsole.Write("Please choose which drive to test (0 to exit): ");
+                AaruConsole.Write("Please choose which drive to test (0 to exit): ");
                 string strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out int item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 if(item == 0)
                 {
-                    DicConsole.WriteLine("Exiting...");
+                    AaruConsole.WriteLine("Exiting...");
+
                     return;
                 }
 
                 if(item > devices.Length)
                 {
-                    DicConsole.WriteLine("No such device. Press any key to continue...");
+                    AaruConsole.WriteLine("No such device. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
diff --git a/Aaru.Tests.Devices/NVMe.cs b/Aaru.Tests.Devices/NVMe.cs
index a90076f83..671f1ad9c 100644
--- a/Aaru.Tests.Devices/NVMe.cs
+++ b/Aaru.Tests.Devices/NVMe.cs
@@ -31,11 +31,11 @@ using Aaru.Devices;
 
 namespace Aaru.Tests.Devices
 {
-    static partial class MainClass
+    internal static partial class MainClass
     {
         public static void NVMe(string devPath, Device dev)
         {
-            DicConsole.WriteLine("NVMe commands not yet implemented. Press any key to continue...");
+            AaruConsole.WriteLine("NVMe commands not yet implemented. Press any key to continue...");
             System.Console.ReadKey();
         }
     }
diff --git a/Aaru.Tests.Devices/SCSI.cs b/Aaru.Tests.Devices/SCSI.cs
index 563a0985f..49a096448 100644
--- a/Aaru.Tests.Devices/SCSI.cs
+++ b/Aaru.Tests.Devices/SCSI.cs
@@ -26,108 +26,129 @@
 // Copyright © 2011-2019 Natalia Portillo
 // ****************************************************************************/
 
-using Aaru.Tests.Devices.SCSI;
 using Aaru.Console;
 using Aaru.Devices;
+using Aaru.Tests.Devices.SCSI;
 
 namespace Aaru.Tests.Devices
 {
-    static partial class MainClass
+    internal static partial class MainClass
     {
         public static void Scsi(string devPath, Device dev)
         {
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Send a SCSI command to the device:");
-                DicConsole.WriteLine("1.- Send an Adaptec vendor command to the device.");
-                DicConsole.WriteLine("2.- Send an Archive vendor command to the device.");
-                DicConsole.WriteLine("3.- Send a Certance vendor command to the device.");
-                DicConsole.WriteLine("4.- Send a Fujitsu vendor command to the device.");
-                DicConsole.WriteLine("5.- Send an HL-DT-ST vendor command to the device.");
-                DicConsole.WriteLine("6.- Send a Hewlett-Packard vendor command to the device.");
-                DicConsole.WriteLine("7.- Send a Kreon vendor command to the device.");
-                DicConsole.WriteLine("8.- Send a SCSI MultiMedia Command to the device.");
-                DicConsole.WriteLine("9.- Send a NEC vendor command to the device.");
-                DicConsole.WriteLine("10.- Send a Pioneer vendor command to the device.");
-                DicConsole.WriteLine("11.- Send a Plasmon vendor command to the device.");
-                DicConsole.WriteLine("12.- Send a Plextor vendor command to the device.");
-                DicConsole.WriteLine("13.- Send a SCSI Block Command to the device.");
-                DicConsole.WriteLine("14.- Send a SCSI Media Changer command to the device.");
-                DicConsole.WriteLine("15.- Send a SCSI Primary Command to the device.");
-                DicConsole.WriteLine("16.- Send a SCSI Streaming Command to the device.");
-                DicConsole.WriteLine("17.- Send a SyQuest vendor command to the device.");
-                DicConsole.WriteLine("0.- Return to command class menu.");
-                DicConsole.Write("Choose: ");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Send a SCSI command to the device:");
+                AaruConsole.WriteLine("1.- Send an Adaptec vendor command to the device.");
+                AaruConsole.WriteLine("2.- Send an Archive vendor command to the device.");
+                AaruConsole.WriteLine("3.- Send a Certance vendor command to the device.");
+                AaruConsole.WriteLine("4.- Send a Fujitsu vendor command to the device.");
+                AaruConsole.WriteLine("5.- Send an HL-DT-ST vendor command to the device.");
+                AaruConsole.WriteLine("6.- Send a Hewlett-Packard vendor command to the device.");
+                AaruConsole.WriteLine("7.- Send a Kreon vendor command to the device.");
+                AaruConsole.WriteLine("8.- Send a SCSI MultiMedia Command to the device.");
+                AaruConsole.WriteLine("9.- Send a NEC vendor command to the device.");
+                AaruConsole.WriteLine("10.- Send a Pioneer vendor command to the device.");
+                AaruConsole.WriteLine("11.- Send a Plasmon vendor command to the device.");
+                AaruConsole.WriteLine("12.- Send a Plextor vendor command to the device.");
+                AaruConsole.WriteLine("13.- Send a SCSI Block Command to the device.");
+                AaruConsole.WriteLine("14.- Send a SCSI Media Changer command to the device.");
+                AaruConsole.WriteLine("15.- Send a SCSI Primary Command to the device.");
+                AaruConsole.WriteLine("16.- Send a SCSI Streaming Command to the device.");
+                AaruConsole.WriteLine("17.- Send a SyQuest vendor command to the device.");
+                AaruConsole.WriteLine("0.- Return to command class menu.");
+                AaruConsole.Write("Choose: ");
 
                 string strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out int item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to command class menu...");
+                        AaruConsole.WriteLine("Returning to command class menu...");
+
                         return;
                     case 1:
                         Adaptec.Menu(devPath, dev);
+
                         continue;
                     case 2:
                         ArchiveCorp.Menu(devPath, dev);
+
                         continue;
                     case 3:
                         Certance.Menu(devPath, dev);
+
                         continue;
                     case 4:
                         Fujitsu.Menu(devPath, dev);
+
                         continue;
                     case 5:
                         HlDtSt.Menu(devPath, dev);
+
                         continue;
                     case 6:
                         Hp.Menu(devPath, dev);
+
                         continue;
                     case 7:
                         Kreon.Menu(devPath, dev);
+
                         continue;
                     case 8:
                         Mmc.Menu(devPath, dev);
+
                         continue;
                     case 9:
                         Nec.Menu(devPath, dev);
+
                         continue;
                     case 10:
                         Pioneer.Menu(devPath, dev);
+
                         continue;
                     case 11:
                         Plasmon.Menu(devPath, dev);
+
                         continue;
                     case 12:
                         Plextor.Menu(devPath, dev);
+
                         continue;
                     case 13:
                         Sbc.Menu(devPath, dev);
+
                         continue;
                     case 14:
                         Smc.Menu(devPath, dev);
+
                         continue;
                     case 15:
                         Spc.Menu(devPath, dev);
+
                         continue;
                     case 16:
                         Ssc.Menu(devPath, dev);
+
                         continue;
                     case 17:
                         SyQuest.Menu(devPath, dev);
+
                         continue;
                     default:
-                        DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                        AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                         System.Console.ReadKey();
+
                         continue;
                 }
             }
diff --git a/Aaru.Tests.Devices/SCSI/Adaptec.cs b/Aaru.Tests.Devices/SCSI/Adaptec.cs
index 3a12bd11e..4a0622d14 100644
--- a/Aaru.Tests.Devices/SCSI/Adaptec.cs
+++ b/Aaru.Tests.Devices/SCSI/Adaptec.cs
@@ -32,50 +32,58 @@ using Aaru.Devices;
 
 namespace Aaru.Tests.Devices.SCSI
 {
-    static class Adaptec
+    internal static class Adaptec
     {
         internal static void Menu(string devPath, Device dev)
         {
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Send an Adaptec vendor command to the device:");
-                DicConsole.WriteLine("1.- Send READ/RESET USAGE COUNTER command.");
-                DicConsole.WriteLine("2.- Send READ DATA BUFFER command.");
-                DicConsole.WriteLine("3.- Send SET ERROR THRESHOLD command.");
-                DicConsole.WriteLine("4.- Send TRANSLATE command.");
-                DicConsole.WriteLine("0.- Return to SCSI commands menu.");
-                DicConsole.Write("Choose: ");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Send an Adaptec vendor command to the device:");
+                AaruConsole.WriteLine("1.- Send READ/RESET USAGE COUNTER command.");
+                AaruConsole.WriteLine("2.- Send READ DATA BUFFER command.");
+                AaruConsole.WriteLine("3.- Send SET ERROR THRESHOLD command.");
+                AaruConsole.WriteLine("4.- Send TRANSLATE command.");
+                AaruConsole.WriteLine("0.- Return to SCSI commands menu.");
+                AaruConsole.Write("Choose: ");
 
                 string strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out int item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to SCSI commands menu...");
+                        AaruConsole.WriteLine("Returning to SCSI commands menu...");
+
                         return;
                     case 1:
                         ReadResetUsageCounter(devPath, dev);
+
                         continue;
                     case 2:
                         ReadDataBuffer(devPath, dev);
+
                         continue;
                     case 3:
                         SetErrorThreshold(devPath, dev);
+
                         continue;
                     case 4:
                         Translate(devPath, dev);
+
                         continue;
                     default:
-                        DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                        AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                         System.Console.ReadKey();
+
                         continue;
                 }
             }
@@ -88,37 +96,42 @@ namespace Aaru.Tests.Devices.SCSI
             int    item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Parameters for READ/RESET USAGE COUNTER command:");
-                DicConsole.WriteLine("Drive 1?: {0}", drive1);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to Adaptec vendor commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for READ/RESET USAGE COUNTER command:");
+                AaruConsole.WriteLine("Drive 1?: {0}", drive1);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to Adaptec vendor commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to Adaptec vendor commands menu...");
+                        AaruConsole.WriteLine("Returning to Adaptec vendor commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.Write("Drive 1?: ");
+                        AaruConsole.Write("Drive 1?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out drive1))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             drive1 = false;
                             System.Console.ReadKey();
                         }
@@ -130,78 +143,92 @@ namespace Aaru.Tests.Devices.SCSI
 
             start:
             System.Console.Clear();
+
             bool sense = dev.AdaptecReadUsageCounter(out byte[] buffer, out byte[] senseBuffer, drive1, dev.Timeout,
                                                      out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}",       ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",         senseBuffer?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Print sense buffer.");
-            DicConsole.WriteLine("3.- Decode sense buffer.");
-            DicConsole.WriteLine("4.- Send command again.");
-            DicConsole.WriteLine("5.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to Adaptec vendor commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending READ/RESET USAGE COUNTER to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Print sense buffer.");
+            AaruConsole.WriteLine("3.- Decode sense buffer.");
+            AaruConsole.WriteLine("4.- Send command again.");
+            AaruConsole.WriteLine("5.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to Adaptec vendor commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to Adaptec vendor commands menu...");
+                    AaruConsole.WriteLine("Returning to Adaptec vendor commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ/RESET USAGE COUNTER response:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ/RESET USAGE COUNTER response:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ/RESET USAGE COUNTER sense:");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ/RESET USAGE COUNTER sense:");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ/RESET USAGE COUNTER decoded sense:");
-                    DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ/RESET USAGE COUNTER decoded sense:");
+                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 4: goto start;
                 case 5: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -210,76 +237,90 @@ namespace Aaru.Tests.Devices.SCSI
         {
             start:
             System.Console.Clear();
+
             bool sense = dev.AdaptecReadBuffer(out byte[] buffer, out byte[] senseBuffer, dev.Timeout,
                                                out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}",       ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",         senseBuffer?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Print sense buffer.");
-            DicConsole.WriteLine("3.- Decode sense buffer.");
-            DicConsole.WriteLine("4.- Send command again.");
-            DicConsole.WriteLine("0.- Return to Adaptec vendor commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending READ DATA BUFFER to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Print sense buffer.");
+            AaruConsole.WriteLine("3.- Decode sense buffer.");
+            AaruConsole.WriteLine("4.- Send command again.");
+            AaruConsole.WriteLine("0.- Return to Adaptec vendor commands menu.");
+            AaruConsole.Write("Choose: ");
 
             string strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out int item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to Adaptec vendor commands menu...");
+                    AaruConsole.WriteLine("Returning to Adaptec vendor commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ DATA BUFFER response:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ DATA BUFFER response:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ DATA BUFFER sense:");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ DATA BUFFER sense:");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ DATA BUFFER decoded sense:");
-                    DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ DATA BUFFER decoded sense:");
+                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 4: goto start;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -292,48 +333,55 @@ namespace Aaru.Tests.Devices.SCSI
             int    item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Parameters for SET ERROR THRESHOLD command:");
-                DicConsole.WriteLine("Drive 1?: {0}",        drive1);
-                DicConsole.WriteLine("Error threshold: {0}", threshold);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to Adaptec vendor commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for SET ERROR THRESHOLD command:");
+                AaruConsole.WriteLine("Drive 1?: {0}", drive1);
+                AaruConsole.WriteLine("Error threshold: {0}", threshold);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to Adaptec vendor commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to Adaptec vendor commands menu...");
+                        AaruConsole.WriteLine("Returning to Adaptec vendor commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.Write("Drive 1?: ");
+                        AaruConsole.Write("Drive 1?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out drive1))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             drive1 = false;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Error threshold?: ");
+                        AaruConsole.Write("Error threshold?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!byte.TryParse(strDev, out threshold))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             threshold = 0;
                             System.Console.ReadKey();
                         }
@@ -345,57 +393,66 @@ namespace Aaru.Tests.Devices.SCSI
 
             start:
             System.Console.Clear();
+
             bool sense =
                 dev.AdaptecSetErrorThreshold(threshold, out byte[] senseBuffer, drive1, dev.Timeout,
                                              out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            DicConsole.WriteLine("Sending SET ERROR THRESHOLD to the device:");
-            DicConsole.WriteLine("Command took {0} ms.",               duration);
-            DicConsole.WriteLine("Sense is {0}.",                      sense);
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",         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));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print sense buffer.");
-            DicConsole.WriteLine("2.- Send command again.");
-            DicConsole.WriteLine("3.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to Adaptec vendor commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending SET ERROR THRESHOLD to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine("SET ERROR THRESHOLD decoded sense:");
+            AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print sense buffer.");
+            AaruConsole.WriteLine("2.- Send command again.");
+            AaruConsole.WriteLine("3.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to Adaptec vendor commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to Adaptec vendor commands menu...");
+                    AaruConsole.WriteLine("Returning to Adaptec vendor commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("SET ERROR THRESHOLD sense:");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("SET ERROR THRESHOLD sense:");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2: goto start;
                 case 3: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -408,48 +465,55 @@ namespace Aaru.Tests.Devices.SCSI
             int    item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Parameters for TRANSLATE command:");
-                DicConsole.WriteLine("Drive 1?: {0}", drive1);
-                DicConsole.WriteLine("LBA: {0}",      lba);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to Adaptec vendor commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for TRANSLATE command:");
+                AaruConsole.WriteLine("Drive 1?: {0}", drive1);
+                AaruConsole.WriteLine("LBA: {0}", lba);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to Adaptec vendor commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to Adaptec vendor commands menu...");
+                        AaruConsole.WriteLine("Returning to Adaptec vendor commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.Write("Drive 1?: ");
+                        AaruConsole.Write("Drive 1?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out drive1))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             drive1 = false;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("LBA?: ");
+                        AaruConsole.Write("LBA?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!uint.TryParse(strDev, out lba))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             lba = 0;
                             System.Console.ReadKey();
                         }
@@ -461,78 +525,92 @@ namespace Aaru.Tests.Devices.SCSI
 
             start:
             System.Console.Clear();
+
             bool sense = dev.AdaptecTranslate(out byte[] buffer, out byte[] senseBuffer, drive1, lba, dev.Timeout,
                                               out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}",       ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",         senseBuffer?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Print sense buffer.");
-            DicConsole.WriteLine("3.- Decode sense buffer.");
-            DicConsole.WriteLine("4.- Send command again.");
-            DicConsole.WriteLine("5.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to Adaptec vendor commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending TRANSLATE to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Print sense buffer.");
+            AaruConsole.WriteLine("3.- Decode sense buffer.");
+            AaruConsole.WriteLine("4.- Send command again.");
+            AaruConsole.WriteLine("5.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to Adaptec vendor commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to Adaptec vendor commands menu...");
+                    AaruConsole.WriteLine("Returning to Adaptec vendor commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("TRANSLATE response:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("TRANSLATE response:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("TRANSLATE sense:");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("TRANSLATE sense:");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("TRANSLATE decoded sense:");
-                    DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("TRANSLATE decoded sense:");
+                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 4: goto start;
                 case 5: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
diff --git a/Aaru.Tests.Devices/SCSI/ArchiveCorp.cs b/Aaru.Tests.Devices/SCSI/ArchiveCorp.cs
index 24cbdcd7b..0b75f240f 100644
--- a/Aaru.Tests.Devices/SCSI/ArchiveCorp.cs
+++ b/Aaru.Tests.Devices/SCSI/ArchiveCorp.cs
@@ -32,42 +32,48 @@ using Aaru.Devices;
 
 namespace Aaru.Tests.Devices.SCSI
 {
-    static class ArchiveCorp
+    internal static class ArchiveCorp
     {
         internal static void Menu(string devPath, Device dev)
         {
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Send an Archive vendor command to the device:");
-                DicConsole.WriteLine("1.- Send REQUEST BLOCK ADDRESS command.");
-                DicConsole.WriteLine("2.- Send SEEK BLOCK command.");
-                DicConsole.WriteLine("0.- Return to SCSI commands menu.");
-                DicConsole.Write("Choose: ");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Send an Archive vendor command to the device:");
+                AaruConsole.WriteLine("1.- Send REQUEST BLOCK ADDRESS command.");
+                AaruConsole.WriteLine("2.- Send SEEK BLOCK command.");
+                AaruConsole.WriteLine("0.- Return to SCSI commands menu.");
+                AaruConsole.Write("Choose: ");
 
                 string strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out int item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to SCSI commands menu...");
+                        AaruConsole.WriteLine("Returning to SCSI commands menu...");
+
                         return;
                     case 1:
                         RequestBlockAddress(devPath, dev);
+
                         continue;
                     case 2:
                         SeekBlock(devPath, dev);
+
                         continue;
                     default:
-                        DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                        AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                         System.Console.ReadKey();
+
                         continue;
                 }
             }
@@ -80,37 +86,42 @@ namespace Aaru.Tests.Devices.SCSI
             int    item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Parameters for REQUEST BLOCK ADDRESS command:");
-                DicConsole.WriteLine("LBA: {0}", lba);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to Archive vendor commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for REQUEST BLOCK ADDRESS command:");
+                AaruConsole.WriteLine("LBA: {0}", lba);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to Archive vendor commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to Archive vendor commands menu...");
+                        AaruConsole.WriteLine("Returning to Archive vendor commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.Write("LBA?: ");
+                        AaruConsole.Write("LBA?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!uint.TryParse(strDev, out lba))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             lba = 0;
                             System.Console.ReadKey();
                         }
@@ -122,78 +133,92 @@ namespace Aaru.Tests.Devices.SCSI
 
             start:
             System.Console.Clear();
+
             bool sense = dev.ArchiveCorpRequestBlockAddress(out byte[] buffer, out byte[] senseBuffer, lba, dev.Timeout,
                                                             out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}",       ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",         senseBuffer?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Print sense buffer.");
-            DicConsole.WriteLine("3.- Decode sense buffer.");
-            DicConsole.WriteLine("4.- Send command again.");
-            DicConsole.WriteLine("5.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to Archive vendor commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending REQUEST BLOCK ADDRESS to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Print sense buffer.");
+            AaruConsole.WriteLine("3.- Decode sense buffer.");
+            AaruConsole.WriteLine("4.- Send command again.");
+            AaruConsole.WriteLine("5.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to Archive vendor commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to Archive vendor commands menu...");
+                    AaruConsole.WriteLine("Returning to Archive vendor commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("REQUEST BLOCK ADDRESS response:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("REQUEST BLOCK ADDRESS response:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("REQUEST BLOCK ADDRESS sense:");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("REQUEST BLOCK ADDRESS sense:");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("REQUEST BLOCK ADDRESS decoded sense:");
-                    DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("REQUEST BLOCK ADDRESS decoded sense:");
+                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 4: goto start;
                 case 5: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -206,48 +231,55 @@ namespace Aaru.Tests.Devices.SCSI
             int    item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Parameters for SEEK BLOCK command:");
-                DicConsole.WriteLine("Immediate?: {0}", immediate);
-                DicConsole.WriteLine("LBA: {0}",        lba);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to Archive vendor commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for SEEK BLOCK command:");
+                AaruConsole.WriteLine("Immediate?: {0}", immediate);
+                AaruConsole.WriteLine("LBA: {0}", lba);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to Archive vendor commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to Archive vendor commands menu...");
+                        AaruConsole.WriteLine("Returning to Archive vendor commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.Write("Immediate?: ");
+                        AaruConsole.Write("Immediate?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out immediate))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             immediate = false;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("LBA?: ");
+                        AaruConsole.Write("LBA?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!uint.TryParse(strDev, out lba))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             lba = 0;
                             System.Console.ReadKey();
                         }
@@ -259,56 +291,65 @@ namespace Aaru.Tests.Devices.SCSI
 
             start:
             System.Console.Clear();
+
             bool sense =
                 dev.ArchiveCorpSeekBlock(out byte[] senseBuffer, immediate, lba, dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            DicConsole.WriteLine("Sending SEEK BLOCK to the device:");
-            DicConsole.WriteLine("Command took {0} ms.",               duration);
-            DicConsole.WriteLine("Sense is {0}.",                      sense);
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",         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));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print sense buffer.");
-            DicConsole.WriteLine("2.- Send command again.");
-            DicConsole.WriteLine("3.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to Archive vendor commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending SEEK BLOCK to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine("SEEK BLOCK decoded sense:");
+            AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print sense buffer.");
+            AaruConsole.WriteLine("2.- Send command again.");
+            AaruConsole.WriteLine("3.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to Archive vendor commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to Archive vendor commands menu...");
+                    AaruConsole.WriteLine("Returning to Archive vendor commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("SEEK BLOCK sense:");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("SEEK BLOCK sense:");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2: goto start;
                 case 3: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
diff --git a/Aaru.Tests.Devices/SCSI/Certance.cs b/Aaru.Tests.Devices/SCSI/Certance.cs
index 5df4e6d72..486f554ac 100644
--- a/Aaru.Tests.Devices/SCSI/Certance.cs
+++ b/Aaru.Tests.Devices/SCSI/Certance.cs
@@ -32,42 +32,48 @@ using Aaru.Devices;
 
 namespace Aaru.Tests.Devices.SCSI
 {
-    static class Certance
+    internal static class Certance
     {
         internal static void Menu(string devPath, Device dev)
         {
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Send a Certance vendor command to the device:");
-                DicConsole.WriteLine("1.- Send PARK command.");
-                DicConsole.WriteLine("2.- Send UNPARK command.");
-                DicConsole.WriteLine("0.- Return to SCSI commands menu.");
-                DicConsole.Write("Choose: ");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Send a Certance vendor command to the device:");
+                AaruConsole.WriteLine("1.- Send PARK command.");
+                AaruConsole.WriteLine("2.- Send UNPARK command.");
+                AaruConsole.WriteLine("0.- Return to SCSI commands menu.");
+                AaruConsole.Write("Choose: ");
 
                 string strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out int item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to SCSI commands menu...");
+                        AaruConsole.WriteLine("Returning to SCSI commands menu...");
+
                         return;
                     case 1:
                         Park(devPath, dev);
+
                         continue;
                     case 2:
                         Unpark(devPath, dev);
+
                         continue;
                     default:
-                        DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                        AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                         System.Console.ReadKey();
+
                         continue;
                 }
             }
@@ -80,50 +86,58 @@ namespace Aaru.Tests.Devices.SCSI
             bool sense = dev.CertancePark(out byte[] senseBuffer, dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            DicConsole.WriteLine("Sending PARK to the device:");
-            DicConsole.WriteLine("Command took {0} ms.",               duration);
-            DicConsole.WriteLine("Sense is {0}.",                      sense);
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",         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));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print sense buffer.");
-            DicConsole.WriteLine("2.- Send command again.");
-            DicConsole.WriteLine("0.- Return to Certance vendor commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending PARK to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine("PARK decoded sense:");
+            AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print sense buffer.");
+            AaruConsole.WriteLine("2.- Send command again.");
+            AaruConsole.WriteLine("0.- Return to Certance vendor commands menu.");
+            AaruConsole.Write("Choose: ");
 
             string strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out int item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to Certance vendor commands menu...");
+                    AaruConsole.WriteLine("Returning to Certance vendor commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("PARK sense:");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("PARK sense:");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2: goto start;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -135,50 +149,58 @@ namespace Aaru.Tests.Devices.SCSI
             bool sense = dev.CertanceUnpark(out byte[] senseBuffer, dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            DicConsole.WriteLine("Sending UNPARK to the device:");
-            DicConsole.WriteLine("Command took {0} ms.",               duration);
-            DicConsole.WriteLine("Sense is {0}.",                      sense);
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",         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));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print sense buffer.");
-            DicConsole.WriteLine("2.- Send command again.");
-            DicConsole.WriteLine("0.- Return to Certance vendor commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending UNPARK to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine("UNPARK decoded sense:");
+            AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print sense buffer.");
+            AaruConsole.WriteLine("2.- Send command again.");
+            AaruConsole.WriteLine("0.- Return to Certance vendor commands menu.");
+            AaruConsole.Write("Choose: ");
 
             string strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out int item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to Certance vendor commands menu...");
+                    AaruConsole.WriteLine("Returning to Certance vendor commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("UNPARK sense:");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("UNPARK sense:");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2: goto start;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
diff --git a/Aaru.Tests.Devices/SCSI/Fujitsu.cs b/Aaru.Tests.Devices/SCSI/Fujitsu.cs
index db300a545..a7f393dd5 100644
--- a/Aaru.Tests.Devices/SCSI/Fujitsu.cs
+++ b/Aaru.Tests.Devices/SCSI/Fujitsu.cs
@@ -33,38 +33,43 @@ using Aaru.Devices;
 
 namespace Aaru.Tests.Devices.SCSI
 {
-    static class Fujitsu
+    internal static class Fujitsu
     {
         internal static void Menu(string devPath, Device dev)
         {
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Send a Fujitsu vendor command to the device:");
-                DicConsole.WriteLine("1.- Send DISPLAY command.");
-                DicConsole.WriteLine("0.- Return to SCSI commands menu.");
-                DicConsole.Write("Choose: ");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Send a Fujitsu vendor command to the device:");
+                AaruConsole.WriteLine("1.- Send DISPLAY command.");
+                AaruConsole.WriteLine("0.- Return to SCSI commands menu.");
+                AaruConsole.Write("Choose: ");
 
                 string strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out int item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to SCSI commands menu...");
+                        AaruConsole.WriteLine("Returning to SCSI commands menu...");
+
                         return;
                     case 1:
                         Display(devPath, dev);
+
                         continue;
                     default:
-                        DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                        AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                         System.Console.ReadKey();
+
                         continue;
                 }
             }
@@ -80,60 +85,71 @@ namespace Aaru.Tests.Devices.SCSI
             int                 item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Parameters for DISPLAY command:");
-                DicConsole.WriteLine("Descriptor: {0}", flash);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to Fujitsu vendor commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for DISPLAY command:");
+                AaruConsole.WriteLine("Descriptor: {0}", flash);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to Fujitsu vendor commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to Fujitsu vendor commands menu...");
+                        AaruConsole.WriteLine("Returning to Fujitsu vendor commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.Write("Flash?: ");
+                        AaruConsole.Write("Flash?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out flash))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             flash = false;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.WriteLine("Display mode");
-                        DicConsole.WriteLine("Available values: {0} {1} {2} {3} {4}", FujitsuDisplayModes.Cancel,
-                                             FujitsuDisplayModes.Cart, FujitsuDisplayModes.Half,
-                                             FujitsuDisplayModes.Idle, FujitsuDisplayModes.Ready);
-                        DicConsole.Write("Choose?: ");
+                        AaruConsole.WriteLine("Display mode");
+
+                        AaruConsole.WriteLine("Available values: {0} {1} {2} {3} {4}", FujitsuDisplayModes.Cancel,
+                                              FujitsuDisplayModes.Cart, FujitsuDisplayModes.Half,
+                                              FujitsuDisplayModes.Idle, FujitsuDisplayModes.Ready);
+
+                        AaruConsole.Write("Choose?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!Enum.TryParse(strDev, true, out mode))
                         {
-                            DicConsole.WriteLine("Not a correct display mode. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a correct display mode. Press any key to continue...");
                             mode = FujitsuDisplayModes.Ready;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("First display half (will be cut to 7-bit ASCII, 8 chars?: ");
+                        AaruConsole.Write("First display half (will be cut to 7-bit ASCII, 8 chars?: ");
                         firstHalf = System.Console.ReadLine();
-                        DicConsole.Write("Second display half (will be cut to 7-bit ASCII, 8 chars?: ");
+                        AaruConsole.Write("Second display half (will be cut to 7-bit ASCII, 8 chars?: ");
                         secondHalf = System.Console.ReadLine();
+
                         break;
                     case 2: goto start;
                 }
@@ -141,56 +157,65 @@ namespace Aaru.Tests.Devices.SCSI
 
             start:
             System.Console.Clear();
+
             bool sense = dev.FujitsuDisplay(out byte[] senseBuffer, flash, mode, firstHalf, secondHalf, dev.Timeout,
                                             out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            DicConsole.WriteLine("Sending DISPLAY to the device:");
-            DicConsole.WriteLine("Command took {0} ms.",               duration);
-            DicConsole.WriteLine("Sense is {0}.",                      sense);
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",         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));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print sense buffer.");
-            DicConsole.WriteLine("2.- Send command again.");
-            DicConsole.WriteLine("3.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to Fujitsu vendor commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending DISPLAY to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine("DISPLAY decoded sense:");
+            AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print sense buffer.");
+            AaruConsole.WriteLine("2.- Send command again.");
+            AaruConsole.WriteLine("3.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to Fujitsu vendor commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to Fujitsu vendor commands menu...");
+                    AaruConsole.WriteLine("Returning to Fujitsu vendor commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("DISPLAY sense:");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("DISPLAY sense:");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2: goto start;
                 case 3: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
diff --git a/Aaru.Tests.Devices/SCSI/HL-DT-ST.cs b/Aaru.Tests.Devices/SCSI/HL-DT-ST.cs
index d7133f7c9..0b1ec4267 100644
--- a/Aaru.Tests.Devices/SCSI/HL-DT-ST.cs
+++ b/Aaru.Tests.Devices/SCSI/HL-DT-ST.cs
@@ -32,38 +32,43 @@ using Aaru.Devices;
 
 namespace Aaru.Tests.Devices.SCSI
 {
-    static class HlDtSt
+    internal static class HlDtSt
     {
         internal static void Menu(string devPath, Device dev)
         {
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Send an HL-DT-ST vendor command to the device:");
-                DicConsole.WriteLine("1.- Send READ DVD (RAW) command.");
-                DicConsole.WriteLine("0.- Return to SCSI commands menu.");
-                DicConsole.Write("Choose: ");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Send an HL-DT-ST vendor command to the device:");
+                AaruConsole.WriteLine("1.- Send READ DVD (RAW) command.");
+                AaruConsole.WriteLine("0.- Return to SCSI commands menu.");
+                AaruConsole.Write("Choose: ");
 
                 string strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out int item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to SCSI commands menu...");
+                        AaruConsole.WriteLine("Returning to SCSI commands menu...");
+
                         return;
                     case 1:
                         ReadDvdRaw(devPath, dev);
+
                         continue;
                     default:
-                        DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                        AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                         System.Console.ReadKey();
+
                         continue;
                 }
             }
@@ -77,48 +82,55 @@ namespace Aaru.Tests.Devices.SCSI
             int    item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Parameters for READ DVD (RAW) command:");
-                DicConsole.WriteLine("LBA: {0}",   lba);
-                DicConsole.WriteLine("Count: {0}", count);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to HL-DT-ST vendor commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for READ DVD (RAW) command:");
+                AaruConsole.WriteLine("LBA: {0}", lba);
+                AaruConsole.WriteLine("Count: {0}", count);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to HL-DT-ST vendor commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to HL-DT-ST vendor commands menu...");
+                        AaruConsole.WriteLine("Returning to HL-DT-ST vendor commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.Write("How many sectors?: ");
+                        AaruConsole.Write("How many sectors?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!uint.TryParse(strDev, out count))
                         {
-                            DicConsole.WriteLine("Not a numbr. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a numbr. Press any key to continue...");
                             count = 1;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("LBA?: ");
+                        AaruConsole.Write("LBA?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!uint.TryParse(strDev, out lba))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             lba = 0;
                             System.Console.ReadKey();
                         }
@@ -130,78 +142,92 @@ namespace Aaru.Tests.Devices.SCSI
 
             start:
             System.Console.Clear();
+
             bool sense = dev.HlDtStReadRawDvd(out byte[] buffer, out byte[] senseBuffer, lba, count, dev.Timeout,
                                               out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}",       ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",         senseBuffer?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Print sense buffer.");
-            DicConsole.WriteLine("3.- Decode sense buffer.");
-            DicConsole.WriteLine("4.- Send command again.");
-            DicConsole.WriteLine("5.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to HL-DT-ST vendor commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending READ DVD (RAW) to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Print sense buffer.");
+            AaruConsole.WriteLine("3.- Decode sense buffer.");
+            AaruConsole.WriteLine("4.- Send command again.");
+            AaruConsole.WriteLine("5.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to HL-DT-ST vendor commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to HL-DT-ST vendor commands menu...");
+                    AaruConsole.WriteLine("Returning to HL-DT-ST vendor commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ DVD (RAW) response:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ DVD (RAW) response:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ DVD (RAW) sense:");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ DVD (RAW) sense:");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ DVD (RAW) decoded sense:");
-                    DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ DVD (RAW) decoded sense:");
+                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 4: goto start;
                 case 5: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
diff --git a/Aaru.Tests.Devices/SCSI/HP.cs b/Aaru.Tests.Devices/SCSI/HP.cs
index 7278cba50..bfaefe4df 100644
--- a/Aaru.Tests.Devices/SCSI/HP.cs
+++ b/Aaru.Tests.Devices/SCSI/HP.cs
@@ -32,38 +32,43 @@ using Aaru.Devices;
 
 namespace Aaru.Tests.Devices.SCSI
 {
-    static class Hp
+    internal static class Hp
     {
         internal static void Menu(string devPath, Device dev)
         {
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Send a Hewlett-Packard vendor command to the device:");
-                DicConsole.WriteLine("1.- Send READ LONG command.");
-                DicConsole.WriteLine("0.- Return to SCSI commands menu.");
-                DicConsole.Write("Choose: ");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Send a Hewlett-Packard vendor command to the device:");
+                AaruConsole.WriteLine("1.- Send READ LONG command.");
+                AaruConsole.WriteLine("0.- Return to SCSI commands menu.");
+                AaruConsole.Write("Choose: ");
 
                 string strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out int item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to SCSI commands menu...");
+                        AaruConsole.WriteLine("Returning to SCSI commands menu...");
+
                         return;
                     case 1:
                         ReadLong(devPath, dev);
+
                         continue;
                     default:
-                        DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                        AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                         System.Console.ReadKey();
+
                         continue;
                 }
             }
@@ -81,92 +86,110 @@ namespace Aaru.Tests.Devices.SCSI
             int    item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Parameters for READ LONG command:");
-                DicConsole.WriteLine("{0} Block Address: {1}", physical ? "Physical" : "Logical", address);
-                DicConsole.WriteLine("Relative?: {0}",         relative);
-                DicConsole.WriteLine("Will transfer {0} {1}",  length, sectorCount ? "sectors" : "bytes");
-                if(sectorCount) DicConsole.WriteLine("Expected sector size: {0} bytes", bps);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to Hewlett-Packard vendor commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for READ LONG command:");
+                AaruConsole.WriteLine("{0} Block Address: {1}", physical ? "Physical" : "Logical", address);
+                AaruConsole.WriteLine("Relative?: {0}", relative);
+                AaruConsole.WriteLine("Will transfer {0} {1}", length, sectorCount ? "sectors" : "bytes");
+
+                if(sectorCount)
+                    AaruConsole.WriteLine("Expected sector size: {0} bytes", bps);
+
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to Hewlett-Packard vendor commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to Hewlett-Packard vendor commands menu...");
+                        AaruConsole.WriteLine("Returning to Hewlett-Packard vendor commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.Write("Physical address?: ");
+                        AaruConsole.Write("Physical address?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out physical))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             physical = false;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Relative address?: ");
+                        AaruConsole.Write("Relative address?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out relative))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             relative = false;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("{0} Block Address?: ", physical ? "Physical" : "Logical");
+                        AaruConsole.Write("{0} Block Address?: ", physical ? "Physical" : "Logical");
                         strDev = System.Console.ReadLine();
+
                         if(!uint.TryParse(strDev, out address))
                         {
-                            DicConsole.WriteLine("Not a numbr. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a numbr. Press any key to continue...");
                             address = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Transfer sectors?: ");
+                        AaruConsole.Write("Transfer sectors?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out sectorCount))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             sectorCount = true;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("How many {0} to transfer?: ", sectorCount ? "sectors" : "bytes");
+                        AaruConsole.Write("How many {0} to transfer?: ", sectorCount ? "sectors" : "bytes");
                         strDev = System.Console.ReadLine();
+
                         if(!ushort.TryParse(strDev, out length))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             length = (ushort)(sectorCount ? 1 : 512);
                             System.Console.ReadKey();
+
                             continue;
                         }
 
                         if(sectorCount)
                         {
-                            DicConsole.Write("How many bytes to expect per sector?");
+                            AaruConsole.Write("How many bytes to expect per sector?");
                             strDev = System.Console.ReadLine();
+
                             if(!ushort.TryParse(strDev, out bps))
                             {
-                                DicConsole.WriteLine("Not a numbr. Press any key to continue...");
+                                AaruConsole.WriteLine("Not a numbr. Press any key to continue...");
                                 bps = 512;
                                 System.Console.ReadKey();
                             }
@@ -179,78 +202,92 @@ namespace Aaru.Tests.Devices.SCSI
 
             start:
             System.Console.Clear();
+
             bool sense = dev.HpReadLong(out byte[] buffer, out byte[] senseBuffer, relative, address, length, bps,
                                         physical, sectorCount, dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}",       ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",         senseBuffer?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Print sense buffer.");
-            DicConsole.WriteLine("3.- Decode sense buffer.");
-            DicConsole.WriteLine("4.- Send command again.");
-            DicConsole.WriteLine("5.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to Hewlett-Packard vendor commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending READ LONG to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Print sense buffer.");
+            AaruConsole.WriteLine("3.- Decode sense buffer.");
+            AaruConsole.WriteLine("4.- Send command again.");
+            AaruConsole.WriteLine("5.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to Hewlett-Packard vendor commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to Hewlett-Packard vendor commands menu...");
+                    AaruConsole.WriteLine("Returning to Hewlett-Packard vendor commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ LONG response:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ LONG response:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ LONG sense:");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ LONG sense:");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ LONG decoded sense:");
-                    DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ LONG decoded sense:");
+                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 4: goto start;
                 case 5: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
diff --git a/Aaru.Tests.Devices/SCSI/Kreon.cs b/Aaru.Tests.Devices/SCSI/Kreon.cs
index 81e3e2d86..bc643f047 100644
--- a/Aaru.Tests.Devices/SCSI/Kreon.cs
+++ b/Aaru.Tests.Devices/SCSI/Kreon.cs
@@ -33,50 +33,58 @@ using Aaru.Devices;
 
 namespace Aaru.Tests.Devices.SCSI
 {
-    static class Kreon
+    internal static class Kreon
     {
         internal static void Menu(string devPath, Device dev)
         {
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Send a Kreon vendor command to the device:");
-                DicConsole.WriteLine("1.- Send EXTRACT SS command.");
-                DicConsole.WriteLine("2.- Send GET FEATURE LIST command.");
-                DicConsole.WriteLine("3.- Send SET LOCK STATE command.");
-                DicConsole.WriteLine("4.- Send UNLOCK command.");
-                DicConsole.WriteLine("0.- Return to SCSI commands menu.");
-                DicConsole.Write("Choose: ");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Send a Kreon vendor command to the device:");
+                AaruConsole.WriteLine("1.- Send EXTRACT SS command.");
+                AaruConsole.WriteLine("2.- Send GET FEATURE LIST command.");
+                AaruConsole.WriteLine("3.- Send SET LOCK STATE command.");
+                AaruConsole.WriteLine("4.- Send UNLOCK command.");
+                AaruConsole.WriteLine("0.- Return to SCSI commands menu.");
+                AaruConsole.Write("Choose: ");
 
                 string strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out int item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to SCSI commands menu...");
+                        AaruConsole.WriteLine("Returning to SCSI commands menu...");
+
                         return;
                     case 1:
                         ExtractSecuritySectors(devPath, dev);
+
                         continue;
                     case 2:
                         GetFeatureList(devPath, dev);
+
                         continue;
                     case 3:
                         SetLockState(devPath, dev);
+
                         continue;
                     case 4:
                         Unlock(devPath, dev);
+
                         continue;
                     default:
-                        DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                        AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                         System.Console.ReadKey();
+
                         continue;
                 }
             }
@@ -89,37 +97,42 @@ namespace Aaru.Tests.Devices.SCSI
             int    item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Parameters for EXTRACT SS command:");
-                DicConsole.WriteLine("Request number: {0}", requestNumber);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to Kreon vendor commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for EXTRACT SS command:");
+                AaruConsole.WriteLine("Request number: {0}", requestNumber);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to Kreon vendor commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to Kreon vendor commands menu...");
+                        AaruConsole.WriteLine("Returning to Kreon vendor commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.Write("Request number?: ");
+                        AaruConsole.Write("Request number?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!byte.TryParse(strDev, out requestNumber))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             requestNumber = 0;
                             System.Console.ReadKey();
                         }
@@ -131,78 +144,92 @@ namespace Aaru.Tests.Devices.SCSI
 
             start:
             System.Console.Clear();
+
             bool sense = dev.KreonExtractSs(out byte[] buffer, out byte[] senseBuffer, dev.Timeout, out double duration,
                                             requestNumber);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}",       ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",         senseBuffer?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Print sense buffer.");
-            DicConsole.WriteLine("3.- Decode sense buffer.");
-            DicConsole.WriteLine("4.- Send command again.");
-            DicConsole.WriteLine("5.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to Kreon vendor commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending EXTRACT SS to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Print sense buffer.");
+            AaruConsole.WriteLine("3.- Decode sense buffer.");
+            AaruConsole.WriteLine("4.- Send command again.");
+            AaruConsole.WriteLine("5.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to Kreon vendor commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to Kreon vendor commands menu...");
+                    AaruConsole.WriteLine("Returning to Kreon vendor commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("EXTRACT SS response:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("EXTRACT SS response:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("EXTRACT SS sense:");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("EXTRACT SS sense:");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("EXTRACT SS decoded sense:");
-                    DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("EXTRACT SS decoded sense:");
+                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 4: goto start;
                 case 5: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -211,55 +238,64 @@ namespace Aaru.Tests.Devices.SCSI
         {
             start:
             System.Console.Clear();
+
             bool sense = dev.KreonGetFeatureList(out byte[] senseBuffer, out KreonFeatures features, dev.Timeout,
                                                  out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            DicConsole.WriteLine("Sending GET FEATURE LIST to the device:");
-            DicConsole.WriteLine("Command took {0} ms.",               duration);
-            DicConsole.WriteLine("Sense is {0}.",                      sense);
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",         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:");
-            DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print sense buffer.");
-            DicConsole.WriteLine("2.- Send command again.");
-            DicConsole.WriteLine("0.- Return to Kreon vendor commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending GET FEATURE LIST to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine("Features: {0}.", features);
+            AaruConsole.WriteLine("GET FEATURE LIST decoded sense:");
+            AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print sense buffer.");
+            AaruConsole.WriteLine("2.- Send command again.");
+            AaruConsole.WriteLine("0.- Return to Kreon vendor commands menu.");
+            AaruConsole.Write("Choose: ");
 
             string strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out int item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to Kreon vendor commands menu...");
+                    AaruConsole.WriteLine("Returning to Kreon vendor commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("GET FEATURE LIST sense:");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("GET FEATURE LIST sense:");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2: goto start;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -271,40 +307,47 @@ namespace Aaru.Tests.Devices.SCSI
             int             item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Parameters for SET LOCK STATE command:");
-                DicConsole.WriteLine("Lock state: {0}", state);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to Kreon vendor commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for SET LOCK STATE command:");
+                AaruConsole.WriteLine("Lock state: {0}", state);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to Kreon vendor commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to Kreon vendor commands menu...");
+                        AaruConsole.WriteLine("Returning to Kreon vendor commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.WriteLine("Lock state");
-                        DicConsole.WriteLine("Available values: {0} {1} {2}", KreonLockStates.Locked,
-                                             KreonLockStates.Wxripper, KreonLockStates.Xtreme);
-                        DicConsole.Write("Choose?: ");
+                        AaruConsole.WriteLine("Lock state");
+
+                        AaruConsole.WriteLine("Available values: {0} {1} {2}", KreonLockStates.Locked,
+                                              KreonLockStates.Wxripper, KreonLockStates.Xtreme);
+
+                        AaruConsole.Write("Choose?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!Enum.TryParse(strDev, true, out state))
                         {
-                            DicConsole.WriteLine("Not a correct page control. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a correct page control. Press any key to continue...");
                             state = KreonLockStates.Locked;
                             System.Console.ReadKey();
                         }
@@ -319,39 +362,43 @@ namespace Aaru.Tests.Devices.SCSI
             bool sense = dev.KreonSetLockState(out byte[] senseBuffer, state, dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            DicConsole.WriteLine("Sending SET LOCK STATE to the device:");
-            DicConsole.WriteLine("Command took {0} ms.", duration);
-            DicConsole.WriteLine("Sense is {0}.",        sense);
-            DicConsole.WriteLine("SET LOCK STATE decoded sense:");
-            DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Send command again.");
-            DicConsole.WriteLine("2.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to Kreon vendor commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending SET LOCK STATE to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("SET LOCK STATE decoded sense:");
+            AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Send command again.");
+            AaruConsole.WriteLine("2.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to Kreon vendor commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to Kreon vendor commands menu...");
+                    AaruConsole.WriteLine("Returning to Kreon vendor commands menu...");
+
                     return;
                 case 1: goto start;
                 case 2: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -363,50 +410,58 @@ namespace Aaru.Tests.Devices.SCSI
             bool sense = dev.KreonDeprecatedUnlock(out byte[] senseBuffer, dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            DicConsole.WriteLine("Sending UNLOCK to the device:");
-            DicConsole.WriteLine("Command took {0} ms.",               duration);
-            DicConsole.WriteLine("Sense is {0}.",                      sense);
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",         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));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print sense buffer.");
-            DicConsole.WriteLine("2.- Send command again.");
-            DicConsole.WriteLine("0.- Return to Kreon vendor commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending UNLOCK to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine("UNLOCK decoded sense:");
+            AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print sense buffer.");
+            AaruConsole.WriteLine("2.- Send command again.");
+            AaruConsole.WriteLine("0.- Return to Kreon vendor commands menu.");
+            AaruConsole.Write("Choose: ");
 
             string strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out int item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to Kreon vendor commands menu...");
+                    AaruConsole.WriteLine("Returning to Kreon vendor commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("UNLOCK sense:");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("UNLOCK sense:");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2: goto start;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
diff --git a/Aaru.Tests.Devices/SCSI/MMC.cs b/Aaru.Tests.Devices/SCSI/MMC.cs
index 7a7ee25e6..808611efd 100644
--- a/Aaru.Tests.Devices/SCSI/MMC.cs
+++ b/Aaru.Tests.Devices/SCSI/MMC.cs
@@ -35,66 +35,78 @@ using Aaru.Devices;
 
 namespace Aaru.Tests.Devices.SCSI
 {
-    static class Mmc
+    internal static class Mmc
     {
         internal static void Menu(string devPath, Device dev)
         {
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Send a MultiMedia Command to the device:");
-                DicConsole.WriteLine("1.- Send GET CONFIGURATION command.");
-                DicConsole.WriteLine("2.- Send PREVENT ALLOW MEDIUM REMOVAL command.");
-                DicConsole.WriteLine("3.- Send READ CD command.");
-                DicConsole.WriteLine("4.- Send READ CD MSF command.");
-                DicConsole.WriteLine("5.- Send READ DISC INFORMATION command.");
-                DicConsole.WriteLine("6.- Send READ DISC STRUCTURE command.");
-                DicConsole.WriteLine("7.- Send READ TOC/PMA/ATIP command.");
-                DicConsole.WriteLine("8.- Send START STOP UNIT command.");
-                DicConsole.WriteLine("0.- Return to SCSI commands menu.");
-                DicConsole.Write("Choose: ");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Send a MultiMedia Command to the device:");
+                AaruConsole.WriteLine("1.- Send GET CONFIGURATION command.");
+                AaruConsole.WriteLine("2.- Send PREVENT ALLOW MEDIUM REMOVAL command.");
+                AaruConsole.WriteLine("3.- Send READ CD command.");
+                AaruConsole.WriteLine("4.- Send READ CD MSF command.");
+                AaruConsole.WriteLine("5.- Send READ DISC INFORMATION command.");
+                AaruConsole.WriteLine("6.- Send READ DISC STRUCTURE command.");
+                AaruConsole.WriteLine("7.- Send READ TOC/PMA/ATIP command.");
+                AaruConsole.WriteLine("8.- Send START STOP UNIT command.");
+                AaruConsole.WriteLine("0.- Return to SCSI commands menu.");
+                AaruConsole.Write("Choose: ");
 
                 string strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out int item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to SCSI commands menu...");
+                        AaruConsole.WriteLine("Returning to SCSI commands menu...");
+
                         return;
                     case 1:
                         GetConfiguration(devPath, dev);
+
                         continue;
                     case 2:
                         PreventAllowMediumRemoval(devPath, dev);
+
                         continue;
                     case 3:
                         ReadCd(devPath, dev);
+
                         continue;
                     case 4:
                         ReadCdMsf(devPath, dev);
+
                         continue;
                     case 5:
                         ReadDiscInformation(devPath, dev);
+
                         continue;
                     case 6:
                         ReadDiscStructure(devPath, dev);
+
                         continue;
                     case 7:
                         ReadTocPmaAtip(devPath, dev);
+
                         continue;
                     case 8:
                         StartStopUnit(devPath, dev);
+
                         continue;
                     default:
-                        DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                        AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                         System.Console.ReadKey();
+
                         continue;
                 }
             }
@@ -108,52 +120,61 @@ namespace Aaru.Tests.Devices.SCSI
             int                   item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Parameters for GET CONFIGURATION command:");
-                DicConsole.WriteLine("RT: {0}",             rt);
-                DicConsole.WriteLine("Feature number: {0}", startingFeatureNumber);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to SCSI MultiMedia Commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for GET CONFIGURATION command:");
+                AaruConsole.WriteLine("RT: {0}", rt);
+                AaruConsole.WriteLine("Feature number: {0}", startingFeatureNumber);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to SCSI MultiMedia Commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to SCSI MultiMedia Commands menu...");
+                        AaruConsole.WriteLine("Returning to SCSI MultiMedia Commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.WriteLine("RT");
-                        DicConsole.WriteLine("Available values: {0} {1} {2} {3}", MmcGetConfigurationRt.All,
-                                             MmcGetConfigurationRt.Current, MmcGetConfigurationRt.Reserved,
-                                             MmcGetConfigurationRt.Single);
-                        DicConsole.Write("Choose?: ");
+                        AaruConsole.WriteLine("RT");
+
+                        AaruConsole.WriteLine("Available values: {0} {1} {2} {3}", MmcGetConfigurationRt.All,
+                                              MmcGetConfigurationRt.Current, MmcGetConfigurationRt.Reserved,
+                                              MmcGetConfigurationRt.Single);
+
+                        AaruConsole.Write("Choose?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!Enum.TryParse(strDev, true, out rt))
                         {
-                            DicConsole.WriteLine("Not a correct object type. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a correct object type. Press any key to continue...");
                             rt = MmcGetConfigurationRt.All;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Feature number");
+                        AaruConsole.Write("Feature number");
                         strDev = System.Console.ReadLine();
+
                         if(!ushort.TryParse(strDev, out startingFeatureNumber))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             startingFeatureNumber = 1;
                             System.Console.ReadKey();
                         }
@@ -165,340 +186,419 @@ namespace Aaru.Tests.Devices.SCSI
 
             start:
             System.Console.Clear();
+
             bool sense = dev.GetConfiguration(out byte[] buffer, out byte[] senseBuffer, startingFeatureNumber, rt,
                                               dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}",       ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",         senseBuffer?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Decode buffer.");
-            DicConsole.WriteLine("3.- Print sense buffer.");
-            DicConsole.WriteLine("4.- Decode sense buffer.");
-            DicConsole.WriteLine("5.- Send command again.");
-            DicConsole.WriteLine("6.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to SCSI MultiMedia Commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending GET CONFIGURATION to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Decode buffer.");
+            AaruConsole.WriteLine("3.- Print sense buffer.");
+            AaruConsole.WriteLine("4.- Decode sense buffer.");
+            AaruConsole.WriteLine("5.- Send command again.");
+            AaruConsole.WriteLine("6.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to SCSI MultiMedia Commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to SCSI MultiMedia Commands menu...");
+                    AaruConsole.WriteLine("Returning to SCSI MultiMedia Commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("GET CONFIGURATION buffer:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("GET CONFIGURATION buffer:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("GET CONFIGURATION decoded buffer:");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("GET CONFIGURATION decoded buffer:");
+
                     if(buffer != null)
                     {
                         Features.SeparatedFeatures ftr = Features.Separate(buffer);
-                        DicConsole.WriteLine("GET CONFIGURATION length is {0} bytes",        ftr.DataLength);
-                        DicConsole.WriteLine("GET CONFIGURATION current profile is {0:X4}h", ftr.CurrentProfile);
+                        AaruConsole.WriteLine("GET CONFIGURATION length is {0} bytes", ftr.DataLength);
+                        AaruConsole.WriteLine("GET CONFIGURATION current profile is {0:X4}h", ftr.CurrentProfile);
+
                         if(ftr.Descriptors != null)
                             foreach(Features.FeatureDescriptor desc in ftr.Descriptors)
                             {
-                                DicConsole.WriteLine("Feature {0:X4}h", desc.Code);
+                                AaruConsole.WriteLine("Feature {0:X4}h", desc.Code);
 
                                 switch(desc.Code)
                                 {
                                     case 0x0000:
-                                        DicConsole.Write("{0}", Features.Prettify_0000(desc.Data));
+                                        AaruConsole.Write("{0}", Features.Prettify_0000(desc.Data));
                                         PrintHex.PrintHexArray(desc.Data, 64);
+
                                         break;
                                     case 0x0001:
-                                        DicConsole.Write("{0}", Features.Prettify_0001(desc.Data));
+                                        AaruConsole.Write("{0}", Features.Prettify_0001(desc.Data));
                                         PrintHex.PrintHexArray(desc.Data, 64);
+
                                         break;
                                     case 0x0002:
-                                        DicConsole.Write("{0}", Features.Prettify_0002(desc.Data));
+                                        AaruConsole.Write("{0}", Features.Prettify_0002(desc.Data));
                                         PrintHex.PrintHexArray(desc.Data, 64);
+
                                         break;
                                     case 0x0003:
-                                        DicConsole.Write("{0}", Features.Prettify_0003(desc.Data));
+                                        AaruConsole.Write("{0}", Features.Prettify_0003(desc.Data));
                                         PrintHex.PrintHexArray(desc.Data, 64);
+
                                         break;
                                     case 0x0004:
-                                        DicConsole.Write("{0}", Features.Prettify_0004(desc.Data));
+                                        AaruConsole.Write("{0}", Features.Prettify_0004(desc.Data));
                                         PrintHex.PrintHexArray(desc.Data, 64);
+
                                         break;
                                     case 0x0010:
-                                        DicConsole.Write("{0}", Features.Prettify_0010(desc.Data));
+                                        AaruConsole.Write("{0}", Features.Prettify_0010(desc.Data));
                                         PrintHex.PrintHexArray(desc.Data, 64);
+
                                         break;
                                     case 0x001D:
-                                        DicConsole.Write("{0}", Features.Prettify_001D(desc.Data));
+                                        AaruConsole.Write("{0}", Features.Prettify_001D(desc.Data));
                                         PrintHex.PrintHexArray(desc.Data, 64);
+
                                         break;
                                     case 0x001E:
-                                        DicConsole.Write("{0}", Features.Prettify_001E(desc.Data));
+                                        AaruConsole.Write("{0}", Features.Prettify_001E(desc.Data));
                                         PrintHex.PrintHexArray(desc.Data, 64);
+
                                         break;
                                     case 0x001F:
-                                        DicConsole.Write("{0}", Features.Prettify_001F(desc.Data));
+                                        AaruConsole.Write("{0}", Features.Prettify_001F(desc.Data));
                                         PrintHex.PrintHexArray(desc.Data, 64);
+
                                         break;
                                     case 0x0020:
-                                        DicConsole.Write("{0}", Features.Prettify_0020(desc.Data));
+                                        AaruConsole.Write("{0}", Features.Prettify_0020(desc.Data));
                                         PrintHex.PrintHexArray(desc.Data, 64);
+
                                         break;
                                     case 0x0021:
-                                        DicConsole.Write("{0}", Features.Prettify_0021(desc.Data));
+                                        AaruConsole.Write("{0}", Features.Prettify_0021(desc.Data));
                                         PrintHex.PrintHexArray(desc.Data, 64);
+
                                         break;
                                     case 0x0022:
-                                        DicConsole.Write("{0}", Features.Prettify_0022(desc.Data));
+                                        AaruConsole.Write("{0}", Features.Prettify_0022(desc.Data));
                                         PrintHex.PrintHexArray(desc.Data, 64);
+
                                         break;
                                     case 0x0023:
-                                        DicConsole.Write("{0}", Features.Prettify_0023(desc.Data));
+                                        AaruConsole.Write("{0}", Features.Prettify_0023(desc.Data));
                                         PrintHex.PrintHexArray(desc.Data, 64);
+
                                         break;
                                     case 0x0024:
-                                        DicConsole.Write("{0}", Features.Prettify_0024(desc.Data));
+                                        AaruConsole.Write("{0}", Features.Prettify_0024(desc.Data));
                                         PrintHex.PrintHexArray(desc.Data, 64);
+
                                         break;
                                     case 0x0025:
-                                        DicConsole.Write("{0}", Features.Prettify_0025(desc.Data));
+                                        AaruConsole.Write("{0}", Features.Prettify_0025(desc.Data));
                                         PrintHex.PrintHexArray(desc.Data, 64);
+
                                         break;
                                     case 0x0026:
-                                        DicConsole.Write("{0}", Features.Prettify_0026(desc.Data));
+                                        AaruConsole.Write("{0}", Features.Prettify_0026(desc.Data));
                                         PrintHex.PrintHexArray(desc.Data, 64);
+
                                         break;
                                     case 0x0027:
-                                        DicConsole.Write("{0}", Features.Prettify_0027(desc.Data));
+                                        AaruConsole.Write("{0}", Features.Prettify_0027(desc.Data));
                                         PrintHex.PrintHexArray(desc.Data, 64);
+
                                         break;
                                     case 0x0028:
-                                        DicConsole.Write("{0}", Features.Prettify_0028(desc.Data));
+                                        AaruConsole.Write("{0}", Features.Prettify_0028(desc.Data));
                                         PrintHex.PrintHexArray(desc.Data, 64);
+
                                         break;
                                     case 0x0029:
-                                        DicConsole.Write("{0}", Features.Prettify_0029(desc.Data));
+                                        AaruConsole.Write("{0}", Features.Prettify_0029(desc.Data));
                                         PrintHex.PrintHexArray(desc.Data, 64);
+
                                         break;
                                     case 0x002A:
-                                        DicConsole.Write("{0}", Features.Prettify_002A(desc.Data));
+                                        AaruConsole.Write("{0}", Features.Prettify_002A(desc.Data));
                                         PrintHex.PrintHexArray(desc.Data, 64);
+
                                         break;
                                     case 0x002B:
-                                        DicConsole.Write("{0}", Features.Prettify_002B(desc.Data));
+                                        AaruConsole.Write("{0}", Features.Prettify_002B(desc.Data));
                                         PrintHex.PrintHexArray(desc.Data, 64);
+
                                         break;
                                     case 0x002C:
-                                        DicConsole.Write("{0}", Features.Prettify_002C(desc.Data));
+                                        AaruConsole.Write("{0}", Features.Prettify_002C(desc.Data));
                                         PrintHex.PrintHexArray(desc.Data, 64);
+
                                         break;
                                     case 0x002D:
-                                        DicConsole.Write("{0}", Features.Prettify_002D(desc.Data));
+                                        AaruConsole.Write("{0}", Features.Prettify_002D(desc.Data));
                                         PrintHex.PrintHexArray(desc.Data, 64);
+
                                         break;
                                     case 0x002E:
-                                        DicConsole.Write("{0}", Features.Prettify_002E(desc.Data));
+                                        AaruConsole.Write("{0}", Features.Prettify_002E(desc.Data));
                                         PrintHex.PrintHexArray(desc.Data, 64);
+
                                         break;
                                     case 0x002F:
-                                        DicConsole.Write("{0}", Features.Prettify_002F(desc.Data));
+                                        AaruConsole.Write("{0}", Features.Prettify_002F(desc.Data));
                                         PrintHex.PrintHexArray(desc.Data, 64);
+
                                         break;
                                     case 0x0030:
-                                        DicConsole.Write("{0}", Features.Prettify_0030(desc.Data));
+                                        AaruConsole.Write("{0}", Features.Prettify_0030(desc.Data));
                                         PrintHex.PrintHexArray(desc.Data, 64);
+
                                         break;
                                     case 0x0031:
-                                        DicConsole.Write("{0}", Features.Prettify_0031(desc.Data));
+                                        AaruConsole.Write("{0}", Features.Prettify_0031(desc.Data));
                                         PrintHex.PrintHexArray(desc.Data, 64);
+
                                         break;
                                     case 0x0032:
-                                        DicConsole.Write("{0}", Features.Prettify_0032(desc.Data));
+                                        AaruConsole.Write("{0}", Features.Prettify_0032(desc.Data));
                                         PrintHex.PrintHexArray(desc.Data, 64);
+
                                         break;
                                     case 0x0033:
-                                        DicConsole.Write("{0}", Features.Prettify_0033(desc.Data));
+                                        AaruConsole.Write("{0}", Features.Prettify_0033(desc.Data));
                                         PrintHex.PrintHexArray(desc.Data, 64);
+
                                         break;
                                     case 0x0035:
-                                        DicConsole.Write("{0}", Features.Prettify_0035(desc.Data));
+                                        AaruConsole.Write("{0}", Features.Prettify_0035(desc.Data));
                                         PrintHex.PrintHexArray(desc.Data, 64);
+
                                         break;
                                     case 0x0037:
-                                        DicConsole.Write("{0}", Features.Prettify_0037(desc.Data));
+                                        AaruConsole.Write("{0}", Features.Prettify_0037(desc.Data));
                                         PrintHex.PrintHexArray(desc.Data, 64);
+
                                         break;
                                     case 0x0038:
-                                        DicConsole.Write("{0}", Features.Prettify_0038(desc.Data));
+                                        AaruConsole.Write("{0}", Features.Prettify_0038(desc.Data));
                                         PrintHex.PrintHexArray(desc.Data, 64);
+
                                         break;
                                     case 0x003A:
-                                        DicConsole.Write("{0}", Features.Prettify_003A(desc.Data));
+                                        AaruConsole.Write("{0}", Features.Prettify_003A(desc.Data));
                                         PrintHex.PrintHexArray(desc.Data, 64);
+
                                         break;
                                     case 0x003B:
-                                        DicConsole.Write("{0}", Features.Prettify_003B(desc.Data));
+                                        AaruConsole.Write("{0}", Features.Prettify_003B(desc.Data));
                                         PrintHex.PrintHexArray(desc.Data, 64);
+
                                         break;
                                     case 0x0040:
-                                        DicConsole.Write("{0}", Features.Prettify_0040(desc.Data));
+                                        AaruConsole.Write("{0}", Features.Prettify_0040(desc.Data));
                                         PrintHex.PrintHexArray(desc.Data, 64);
+
                                         break;
                                     case 0x0041:
-                                        DicConsole.Write("{0}", Features.Prettify_0041(desc.Data));
+                                        AaruConsole.Write("{0}", Features.Prettify_0041(desc.Data));
                                         PrintHex.PrintHexArray(desc.Data, 64);
+
                                         break;
                                     case 0x0042:
-                                        DicConsole.Write("{0}", Features.Prettify_0042(desc.Data));
+                                        AaruConsole.Write("{0}", Features.Prettify_0042(desc.Data));
                                         PrintHex.PrintHexArray(desc.Data, 64);
+
                                         break;
                                     case 0x0050:
-                                        DicConsole.Write("{0}", Features.Prettify_0050(desc.Data));
+                                        AaruConsole.Write("{0}", Features.Prettify_0050(desc.Data));
                                         PrintHex.PrintHexArray(desc.Data, 64);
+
                                         break;
                                     case 0x0051:
-                                        DicConsole.Write("{0}", Features.Prettify_0051(desc.Data));
+                                        AaruConsole.Write("{0}", Features.Prettify_0051(desc.Data));
                                         PrintHex.PrintHexArray(desc.Data, 64);
+
                                         break;
                                     case 0x0080:
-                                        DicConsole.Write("{0}", Features.Prettify_0080(desc.Data));
+                                        AaruConsole.Write("{0}", Features.Prettify_0080(desc.Data));
                                         PrintHex.PrintHexArray(desc.Data, 64);
+
                                         break;
                                     case 0x0100:
-                                        DicConsole.Write("{0}", Features.Prettify_0100(desc.Data));
+                                        AaruConsole.Write("{0}", Features.Prettify_0100(desc.Data));
                                         PrintHex.PrintHexArray(desc.Data, 64);
+
                                         break;
                                     case 0x0101:
-                                        DicConsole.Write("{0}", Features.Prettify_0101(desc.Data));
+                                        AaruConsole.Write("{0}", Features.Prettify_0101(desc.Data));
                                         PrintHex.PrintHexArray(desc.Data, 64);
+
                                         break;
                                     case 0x0102:
-                                        DicConsole.Write("{0}", Features.Prettify_0102(desc.Data));
+                                        AaruConsole.Write("{0}", Features.Prettify_0102(desc.Data));
                                         PrintHex.PrintHexArray(desc.Data, 64);
+
                                         break;
                                     case 0x0103:
-                                        DicConsole.Write("{0}", Features.Prettify_0103(desc.Data));
+                                        AaruConsole.Write("{0}", Features.Prettify_0103(desc.Data));
                                         PrintHex.PrintHexArray(desc.Data, 64);
+
                                         break;
                                     case 0x0104:
-                                        DicConsole.Write("{0}", Features.Prettify_0104(desc.Data));
+                                        AaruConsole.Write("{0}", Features.Prettify_0104(desc.Data));
                                         PrintHex.PrintHexArray(desc.Data, 64);
+
                                         break;
                                     case 0x0105:
-                                        DicConsole.Write("{0}", Features.Prettify_0105(desc.Data));
+                                        AaruConsole.Write("{0}", Features.Prettify_0105(desc.Data));
                                         PrintHex.PrintHexArray(desc.Data, 64);
+
                                         break;
                                     case 0x0106:
-                                        DicConsole.Write("{0}", Features.Prettify_0106(desc.Data));
+                                        AaruConsole.Write("{0}", Features.Prettify_0106(desc.Data));
                                         PrintHex.PrintHexArray(desc.Data, 64);
+
                                         break;
                                     case 0x0107:
-                                        DicConsole.Write("{0}", Features.Prettify_0107(desc.Data));
+                                        AaruConsole.Write("{0}", Features.Prettify_0107(desc.Data));
                                         PrintHex.PrintHexArray(desc.Data, 64);
+
                                         break;
                                     case 0x0108:
-                                        DicConsole.Write("{0}", Features.Prettify_0108(desc.Data));
+                                        AaruConsole.Write("{0}", Features.Prettify_0108(desc.Data));
                                         PrintHex.PrintHexArray(desc.Data, 64);
+
                                         break;
                                     case 0x0109:
-                                        DicConsole.Write("{0}", Features.Prettify_0109(desc.Data));
+                                        AaruConsole.Write("{0}", Features.Prettify_0109(desc.Data));
                                         PrintHex.PrintHexArray(desc.Data, 64);
+
                                         break;
                                     case 0x010A:
-                                        DicConsole.Write("{0}", Features.Prettify_010A(desc.Data));
+                                        AaruConsole.Write("{0}", Features.Prettify_010A(desc.Data));
                                         PrintHex.PrintHexArray(desc.Data, 64);
+
                                         break;
                                     case 0x010B:
-                                        DicConsole.Write("{0}", Features.Prettify_010B(desc.Data));
+                                        AaruConsole.Write("{0}", Features.Prettify_010B(desc.Data));
                                         PrintHex.PrintHexArray(desc.Data, 64);
+
                                         break;
                                     case 0x010C:
-                                        DicConsole.Write("{0}", Features.Prettify_010C(desc.Data));
+                                        AaruConsole.Write("{0}", Features.Prettify_010C(desc.Data));
                                         PrintHex.PrintHexArray(desc.Data, 64);
+
                                         break;
                                     case 0x010D:
-                                        DicConsole.Write("{0}", Features.Prettify_010D(desc.Data));
+                                        AaruConsole.Write("{0}", Features.Prettify_010D(desc.Data));
                                         PrintHex.PrintHexArray(desc.Data, 64);
+
                                         break;
                                     case 0x010E:
-                                        DicConsole.Write("{0}", Features.Prettify_010E(desc.Data));
+                                        AaruConsole.Write("{0}", Features.Prettify_010E(desc.Data));
                                         PrintHex.PrintHexArray(desc.Data, 64);
+
                                         break;
                                     case 0x0110:
-                                        DicConsole.Write("{0}", Features.Prettify_0110(desc.Data));
+                                        AaruConsole.Write("{0}", Features.Prettify_0110(desc.Data));
                                         PrintHex.PrintHexArray(desc.Data, 64);
+
                                         break;
                                     case 0x0113:
-                                        DicConsole.Write("{0}", Features.Prettify_0113(desc.Data));
+                                        AaruConsole.Write("{0}", Features.Prettify_0113(desc.Data));
                                         PrintHex.PrintHexArray(desc.Data, 64);
+
                                         break;
                                     case 0x0142:
-                                        DicConsole.Write("{0}", Features.Prettify_0142(desc.Data));
+                                        AaruConsole.Write("{0}", Features.Prettify_0142(desc.Data));
                                         PrintHex.PrintHexArray(desc.Data, 64);
+
                                         break;
                                     default:
-                                        DicConsole.WriteLine("Don't know how to decode feature 0x{0:X4}", desc.Code);
+                                        AaruConsole.WriteLine("Don't know how to decode feature 0x{0:X4}", desc.Code);
                                         PrintHex.PrintHexArray(desc.Data, 64);
+
                                         break;
                                 }
                             }
                     }
 
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("GET CONFIGURATION sense:");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("GET CONFIGURATION sense:");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 4:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("GET CONFIGURATION decoded sense:");
-                    if(senseBuffer != null) DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("GET CONFIGURATION decoded sense:");
+
+                    if(senseBuffer != null)
+                        AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 5: goto start;
                 case 6: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -511,48 +611,55 @@ namespace Aaru.Tests.Devices.SCSI
             int    item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Parameters for PREVENT ALLOW MEDIUM REMOVAL command:");
-                DicConsole.WriteLine("Prevent removal?: {0}",  prevent);
-                DicConsole.WriteLine("Persistent value?: {0}", persistent);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to SCSI MultiMedia Commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for PREVENT ALLOW MEDIUM REMOVAL command:");
+                AaruConsole.WriteLine("Prevent removal?: {0}", prevent);
+                AaruConsole.WriteLine("Persistent value?: {0}", persistent);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to SCSI MultiMedia Commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to SCSI MultiMedia Commands menu...");
+                        AaruConsole.WriteLine("Returning to SCSI MultiMedia Commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.Write("Prevent removal?: ");
+                        AaruConsole.Write("Prevent removal?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out prevent))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             prevent = false;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Persistent value?: ");
+                        AaruConsole.Write("Persistent value?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out persistent))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             persistent = false;
                             System.Console.ReadKey();
                         }
@@ -564,56 +671,65 @@ namespace Aaru.Tests.Devices.SCSI
 
             start:
             System.Console.Clear();
+
             bool sense = dev.PreventAllowMediumRemoval(out byte[] senseBuffer, persistent, prevent, dev.Timeout,
                                                        out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            DicConsole.WriteLine("Sending PREVENT ALLOW MEDIUM REMOVAL to the device:");
-            DicConsole.WriteLine("Command took {0} ms.",               duration);
-            DicConsole.WriteLine("Sense is {0}.",                      sense);
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",         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));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print sense buffer.");
-            DicConsole.WriteLine("2.- Send command again.");
-            DicConsole.WriteLine("3.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to SCSI MultiMedia Commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending PREVENT ALLOW MEDIUM REMOVAL to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine("PREVENT ALLOW MEDIUM REMOVAL decoded sense:");
+            AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print sense buffer.");
+            AaruConsole.WriteLine("2.- Send command again.");
+            AaruConsole.WriteLine("3.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to SCSI MultiMedia Commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to SCSI MultiMedia Commands menu...");
+                    AaruConsole.WriteLine("Returning to SCSI MultiMedia Commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("PREVENT ALLOW MEDIUM REMOVAL sense:");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("PREVENT ALLOW MEDIUM REMOVAL sense:");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2: goto start;
                 case 3: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -636,173 +752,207 @@ namespace Aaru.Tests.Devices.SCSI
             int            item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Parameters for READ CD command:");
-                DicConsole.WriteLine("Address relative to current position?: {0}", relative);
-                DicConsole.WriteLine("{1}: {0}", address,
-                                     relative ? "Address" : "LBA");
-                DicConsole.WriteLine("Will transfer {0} sectors",   length);
-                DicConsole.WriteLine("Sector type: {0}",            sectorType);
-                DicConsole.WriteLine("Process audio?: {0}",         dap);
-                DicConsole.WriteLine("Retrieve sync bytes?: {0}",   sync);
-                DicConsole.WriteLine("Header mode: {0}",            header);
-                DicConsole.WriteLine("Retrieve user data?: {0}",    user);
-                DicConsole.WriteLine("Retrieve EDC/ECC data?: {0}", edc);
-                DicConsole.WriteLine("C2 mode: {0}",                c2);
-                DicConsole.WriteLine("Subchannel mode: {0}",        subchan);
-                DicConsole.WriteLine("{0} bytes per sector",        blockSize);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to SCSI MultiMedia Commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for READ CD command:");
+                AaruConsole.WriteLine("Address relative to current position?: {0}", relative);
+                AaruConsole.WriteLine("{1}: {0}", address, relative ? "Address" : "LBA");
+                AaruConsole.WriteLine("Will transfer {0} sectors", length);
+                AaruConsole.WriteLine("Sector type: {0}", sectorType);
+                AaruConsole.WriteLine("Process audio?: {0}", dap);
+                AaruConsole.WriteLine("Retrieve sync bytes?: {0}", sync);
+                AaruConsole.WriteLine("Header mode: {0}", header);
+                AaruConsole.WriteLine("Retrieve user data?: {0}", user);
+                AaruConsole.WriteLine("Retrieve EDC/ECC data?: {0}", edc);
+                AaruConsole.WriteLine("C2 mode: {0}", c2);
+                AaruConsole.WriteLine("Subchannel mode: {0}", subchan);
+                AaruConsole.WriteLine("{0} bytes per sector", blockSize);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to SCSI MultiMedia Commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to SCSI MultiMedia Commands menu...");
+                        AaruConsole.WriteLine("Returning to SCSI MultiMedia Commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.Write("Address is relative to current position?: ");
+                        AaruConsole.Write("Address is relative to current position?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out relative))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             relative = false;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("{0}?: ", relative ? "Address" : "LBA");
+                        AaruConsole.Write("{0}?: ", relative ? "Address" : "LBA");
                         strDev = System.Console.ReadLine();
+
                         if(!uint.TryParse(strDev, out address))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             address = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("How many sectors to transfer?: ");
+                        AaruConsole.Write("How many sectors to transfer?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!uint.TryParse(strDev, out length))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             length = 1;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.WriteLine("Sector type");
-                        DicConsole.WriteLine("Available values: {0} {1} {2} {3} {4} {5}", MmcSectorTypes.AllTypes,
-                                             MmcSectorTypes.Cdda, MmcSectorTypes.Mode1, MmcSectorTypes.Mode2,
-                                             MmcSectorTypes.Mode2Form1, MmcSectorTypes.Mode2Form2);
-                        DicConsole.Write("Choose?: ");
+                        AaruConsole.WriteLine("Sector type");
+
+                        AaruConsole.WriteLine("Available values: {0} {1} {2} {3} {4} {5}", MmcSectorTypes.AllTypes,
+                                              MmcSectorTypes.Cdda, MmcSectorTypes.Mode1, MmcSectorTypes.Mode2,
+                                              MmcSectorTypes.Mode2Form1, MmcSectorTypes.Mode2Form2);
+
+                        AaruConsole.Write("Choose?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!Enum.TryParse(strDev, true, out sectorType))
                         {
-                            DicConsole.WriteLine("Not a correct page control. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a correct page control. Press any key to continue...");
                             sectorType = MmcSectorTypes.AllTypes;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Process audio?: ");
+                        AaruConsole.Write("Process audio?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out dap))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             dap = false;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Retrieve sync bytes?: ");
+                        AaruConsole.Write("Retrieve sync bytes?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out sync))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             sync = false;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.WriteLine("Header mode");
-                        DicConsole.WriteLine("Available values: {0} {1} {2} {3}", MmcHeaderCodes.None,
-                                             MmcHeaderCodes.HeaderOnly, MmcHeaderCodes.SubHeaderOnly,
-                                             MmcHeaderCodes.AllHeaders);
-                        DicConsole.Write("Choose?: ");
+                        AaruConsole.WriteLine("Header mode");
+
+                        AaruConsole.WriteLine("Available values: {0} {1} {2} {3}", MmcHeaderCodes.None,
+                                              MmcHeaderCodes.HeaderOnly, MmcHeaderCodes.SubHeaderOnly,
+                                              MmcHeaderCodes.AllHeaders);
+
+                        AaruConsole.Write("Choose?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!Enum.TryParse(strDev, true, out header))
                         {
-                            DicConsole.WriteLine("Not a correct page control. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a correct page control. Press any key to continue...");
                             header = MmcHeaderCodes.None;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Retrieve user data?: ");
+                        AaruConsole.Write("Retrieve user data?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out user))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             user = false;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Retrieve EDC/ECC?: ");
+                        AaruConsole.Write("Retrieve EDC/ECC?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out edc))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             edc = false;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.WriteLine("C2 mode");
-                        DicConsole.WriteLine("Available values: {0} {1} {2}", MmcErrorField.None,
-                                             MmcErrorField.C2Pointers, MmcErrorField.C2PointersAndBlock);
-                        DicConsole.Write("Choose?: ");
+                        AaruConsole.WriteLine("C2 mode");
+
+                        AaruConsole.WriteLine("Available values: {0} {1} {2}", MmcErrorField.None,
+                                              MmcErrorField.C2Pointers, MmcErrorField.C2PointersAndBlock);
+
+                        AaruConsole.Write("Choose?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!Enum.TryParse(strDev, true, out c2))
                         {
-                            DicConsole.WriteLine("Not a correct page control. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a correct page control. Press any key to continue...");
                             c2 = MmcErrorField.None;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.WriteLine("Subchannel mode");
-                        DicConsole.WriteLine("Available values: {0} {1} {2} {3}", MmcSubchannel.None, MmcSubchannel.Raw,
-                                             MmcSubchannel.Q16, MmcSubchannel.Rw);
-                        DicConsole.Write("Choose?: ");
+                        AaruConsole.WriteLine("Subchannel mode");
+
+                        AaruConsole.WriteLine("Available values: {0} {1} {2} {3}", MmcSubchannel.None,
+                                              MmcSubchannel.Raw, MmcSubchannel.Q16, MmcSubchannel.Rw);
+
+                        AaruConsole.Write("Choose?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!Enum.TryParse(strDev, true, out subchan))
                         {
-                            DicConsole.WriteLine("Not a correct page control. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a correct page control. Press any key to continue...");
                             subchan = MmcSubchannel.None;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Expected block size?: ");
+                        AaruConsole.Write("Expected block size?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!uint.TryParse(strDev, out blockSize))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             blockSize = 2352;
                             System.Console.ReadKey();
                         }
@@ -814,79 +964,93 @@ namespace Aaru.Tests.Devices.SCSI
 
             start:
             System.Console.Clear();
+
             bool sense = dev.ReadCd(out byte[] buffer, out byte[] senseBuffer, address, blockSize, length, sectorType,
                                     dap, relative, sync, header, user, edc, c2, subchan, dev.Timeout,
                                     out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}",       ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",         senseBuffer?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Print sense buffer.");
-            DicConsole.WriteLine("3.- Decode sense buffer.");
-            DicConsole.WriteLine("4.- Send command again.");
-            DicConsole.WriteLine("5.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to SCSI MultiMedia Commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending READ CD to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Print sense buffer.");
+            AaruConsole.WriteLine("3.- Decode sense buffer.");
+            AaruConsole.WriteLine("4.- Send command again.");
+            AaruConsole.WriteLine("5.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to SCSI MultiMedia Commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to SCSI MultiMedia Commands menu...");
+                    AaruConsole.WriteLine("Returning to SCSI MultiMedia Commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ CD response:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ CD response:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ CD sense:");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ CD sense:");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ CD decoded sense:");
-                    DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ CD decoded sense:");
+                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 4: goto start;
                 case 5: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -912,201 +1076,242 @@ namespace Aaru.Tests.Devices.SCSI
             int            item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Parameters for READ CD MSF command:");
-                DicConsole.WriteLine("Start: {0:D2}:{1:D2}:{2:D2}", startMinute, startSecond, startFrame);
-                DicConsole.WriteLine("End: {0:D2}:{1:D2}:{2:D2}",   endMinute,   endSecond,   endFrame);
-                DicConsole.WriteLine("Sector type: {0}",            sectorType);
-                DicConsole.WriteLine("Process audio?: {0}",         dap);
-                DicConsole.WriteLine("Retrieve sync bytes?: {0}",   sync);
-                DicConsole.WriteLine("Header mode: {0}",            header);
-                DicConsole.WriteLine("Retrieve user data?: {0}",    user);
-                DicConsole.WriteLine("Retrieve EDC/ECC data?: {0}", edc);
-                DicConsole.WriteLine("C2 mode: {0}",                c2);
-                DicConsole.WriteLine("Subchannel mode: {0}",        subchan);
-                DicConsole.WriteLine("{0} bytes per sector",        blockSize);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to SCSI MultiMedia Commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for READ CD MSF command:");
+                AaruConsole.WriteLine("Start: {0:D2}:{1:D2}:{2:D2}", startMinute, startSecond, startFrame);
+                AaruConsole.WriteLine("End: {0:D2}:{1:D2}:{2:D2}", endMinute, endSecond, endFrame);
+                AaruConsole.WriteLine("Sector type: {0}", sectorType);
+                AaruConsole.WriteLine("Process audio?: {0}", dap);
+                AaruConsole.WriteLine("Retrieve sync bytes?: {0}", sync);
+                AaruConsole.WriteLine("Header mode: {0}", header);
+                AaruConsole.WriteLine("Retrieve user data?: {0}", user);
+                AaruConsole.WriteLine("Retrieve EDC/ECC data?: {0}", edc);
+                AaruConsole.WriteLine("C2 mode: {0}", c2);
+                AaruConsole.WriteLine("Subchannel mode: {0}", subchan);
+                AaruConsole.WriteLine("{0} bytes per sector", blockSize);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to SCSI MultiMedia Commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to SCSI MultiMedia Commands menu...");
+                        AaruConsole.WriteLine("Returning to SCSI MultiMedia Commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.Write("Start minute?: ");
+                        AaruConsole.Write("Start minute?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!byte.TryParse(strDev, out startMinute))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             startMinute = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Start second?: ");
+                        AaruConsole.Write("Start second?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!byte.TryParse(strDev, out startSecond))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             startSecond = 2;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Start frame?: ");
+                        AaruConsole.Write("Start frame?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!byte.TryParse(strDev, out startFrame))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             startFrame = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("End minute?: ");
+                        AaruConsole.Write("End minute?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!byte.TryParse(strDev, out endMinute))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             endMinute = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("End second?: ");
+                        AaruConsole.Write("End second?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!byte.TryParse(strDev, out endMinute))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             endMinute = 2;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("End frame?: ");
+                        AaruConsole.Write("End frame?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!byte.TryParse(strDev, out endFrame))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             endFrame = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.WriteLine("Sector type");
-                        DicConsole.WriteLine("Available values: {0} {1} {2} {3} {4} {5}", MmcSectorTypes.AllTypes,
-                                             MmcSectorTypes.Cdda, MmcSectorTypes.Mode1, MmcSectorTypes.Mode2,
-                                             MmcSectorTypes.Mode2Form1, MmcSectorTypes.Mode2Form2);
-                        DicConsole.Write("Choose?: ");
+                        AaruConsole.WriteLine("Sector type");
+
+                        AaruConsole.WriteLine("Available values: {0} {1} {2} {3} {4} {5}", MmcSectorTypes.AllTypes,
+                                              MmcSectorTypes.Cdda, MmcSectorTypes.Mode1, MmcSectorTypes.Mode2,
+                                              MmcSectorTypes.Mode2Form1, MmcSectorTypes.Mode2Form2);
+
+                        AaruConsole.Write("Choose?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!Enum.TryParse(strDev, true, out sectorType))
                         {
-                            DicConsole.WriteLine("Not a correct page control. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a correct page control. Press any key to continue...");
                             sectorType = MmcSectorTypes.AllTypes;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Process audio?: ");
+                        AaruConsole.Write("Process audio?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out dap))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             dap = false;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Retrieve sync bytes?: ");
+                        AaruConsole.Write("Retrieve sync bytes?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out sync))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             sync = false;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.WriteLine("Header mode");
-                        DicConsole.WriteLine("Available values: {0} {1} {2} {3}", MmcHeaderCodes.None,
-                                             MmcHeaderCodes.HeaderOnly, MmcHeaderCodes.SubHeaderOnly,
-                                             MmcHeaderCodes.AllHeaders);
-                        DicConsole.Write("Choose?: ");
+                        AaruConsole.WriteLine("Header mode");
+
+                        AaruConsole.WriteLine("Available values: {0} {1} {2} {3}", MmcHeaderCodes.None,
+                                              MmcHeaderCodes.HeaderOnly, MmcHeaderCodes.SubHeaderOnly,
+                                              MmcHeaderCodes.AllHeaders);
+
+                        AaruConsole.Write("Choose?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!Enum.TryParse(strDev, true, out header))
                         {
-                            DicConsole.WriteLine("Not a correct page control. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a correct page control. Press any key to continue...");
                             header = MmcHeaderCodes.None;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Retrieve user data?: ");
+                        AaruConsole.Write("Retrieve user data?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out user))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             user = false;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Retrieve EDC/ECC?: ");
+                        AaruConsole.Write("Retrieve EDC/ECC?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out edc))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             edc = false;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.WriteLine("C2 mode");
-                        DicConsole.WriteLine("Available values: {0} {1} {2}", MmcErrorField.None,
-                                             MmcErrorField.C2Pointers, MmcErrorField.C2PointersAndBlock);
-                        DicConsole.Write("Choose?: ");
+                        AaruConsole.WriteLine("C2 mode");
+
+                        AaruConsole.WriteLine("Available values: {0} {1} {2}", MmcErrorField.None,
+                                              MmcErrorField.C2Pointers, MmcErrorField.C2PointersAndBlock);
+
+                        AaruConsole.Write("Choose?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!Enum.TryParse(strDev, true, out c2))
                         {
-                            DicConsole.WriteLine("Not a correct page control. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a correct page control. Press any key to continue...");
                             c2 = MmcErrorField.None;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.WriteLine("Subchannel mode");
-                        DicConsole.WriteLine("Available values: {0} {1} {2} {3}", MmcSubchannel.None, MmcSubchannel.Raw,
-                                             MmcSubchannel.Q16, MmcSubchannel.Rw);
-                        DicConsole.Write("Choose?: ");
+                        AaruConsole.WriteLine("Subchannel mode");
+
+                        AaruConsole.WriteLine("Available values: {0} {1} {2} {3}", MmcSubchannel.None,
+                                              MmcSubchannel.Raw, MmcSubchannel.Q16, MmcSubchannel.Rw);
+
+                        AaruConsole.Write("Choose?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!Enum.TryParse(strDev, true, out subchan))
                         {
-                            DicConsole.WriteLine("Not a correct page control. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a correct page control. Press any key to continue...");
                             subchan = MmcSubchannel.None;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Expected block size?: ");
+                        AaruConsole.Write("Expected block size?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!uint.TryParse(strDev, out blockSize))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             blockSize = 2352;
                             System.Console.ReadKey();
                         }
@@ -1120,79 +1325,93 @@ namespace Aaru.Tests.Devices.SCSI
             uint startMsf = (uint)((startMinute << 16) + (startSecond << 8) + startFrame);
             uint endMsf   = (uint)((startMinute << 16) + (startSecond << 8) + startFrame);
             System.Console.Clear();
+
             bool sense = dev.ReadCdMsf(out byte[] buffer, out byte[] senseBuffer, startMsf, endMsf, blockSize,
                                        sectorType, dap, sync, header, user, edc, c2, subchan, dev.Timeout,
                                        out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}",       ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",         senseBuffer?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Print sense buffer.");
-            DicConsole.WriteLine("3.- Decode sense buffer.");
-            DicConsole.WriteLine("4.- Send command again.");
-            DicConsole.WriteLine("5.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to SCSI MultiMedia Commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending READ CD MSF to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Print sense buffer.");
+            AaruConsole.WriteLine("3.- Decode sense buffer.");
+            AaruConsole.WriteLine("4.- Send command again.");
+            AaruConsole.WriteLine("5.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to SCSI MultiMedia Commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to SCSI MultiMedia Commands menu...");
+                    AaruConsole.WriteLine("Returning to SCSI MultiMedia Commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ CD MSF response:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ CD MSF response:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ CD MSF sense:");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ CD MSF sense:");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ CD MSF decoded sense:");
-                    DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ CD MSF decoded sense:");
+                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 4: goto start;
                 case 5: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -1204,42 +1423,49 @@ namespace Aaru.Tests.Devices.SCSI
             int                         item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Parameters for READ DISC INFORMATION command:");
-                DicConsole.WriteLine("Information type: {0}", info);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to SCSI MultiMedia Commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for READ DISC INFORMATION command:");
+                AaruConsole.WriteLine("Information type: {0}", info);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to SCSI MultiMedia Commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to SCSI MultiMedia Commands menu...");
+                        AaruConsole.WriteLine("Returning to SCSI MultiMedia Commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.WriteLine("Information type");
-                        DicConsole.WriteLine("Available values: {0} {1} {2}",
-                                             MmcDiscInformationDataTypes.DiscInformation,
-                                             MmcDiscInformationDataTypes.TrackResources,
-                                             MmcDiscInformationDataTypes.PowResources);
-                        DicConsole.Write("Choose?: ");
+                        AaruConsole.WriteLine("Information type");
+
+                        AaruConsole.WriteLine("Available values: {0} {1} {2}",
+                                              MmcDiscInformationDataTypes.DiscInformation,
+                                              MmcDiscInformationDataTypes.TrackResources,
+                                              MmcDiscInformationDataTypes.PowResources);
+
+                        AaruConsole.Write("Choose?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!Enum.TryParse(strDev, true, out info))
                         {
-                            DicConsole.WriteLine("Not a correct page control. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a correct page control. Press any key to continue...");
                             info = MmcDiscInformationDataTypes.DiscInformation;
                             System.Console.ReadKey();
                         }
@@ -1251,89 +1477,104 @@ namespace Aaru.Tests.Devices.SCSI
 
             start:
             System.Console.Clear();
+
             bool sense = dev.ReadDiscInformation(out byte[] buffer, out byte[] senseBuffer, info, dev.Timeout,
                                                  out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}",       ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",         senseBuffer?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Decode buffer.");
-            DicConsole.WriteLine("3.- Print sense buffer.");
-            DicConsole.WriteLine("4.- Decode sense buffer.");
-            DicConsole.WriteLine("5.- Send command again.");
-            DicConsole.WriteLine("6.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to SCSI MultiMedia Commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending READ DISC INFORMATION to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Decode buffer.");
+            AaruConsole.WriteLine("3.- Print sense buffer.");
+            AaruConsole.WriteLine("4.- Decode sense buffer.");
+            AaruConsole.WriteLine("5.- Send command again.");
+            AaruConsole.WriteLine("6.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to SCSI MultiMedia Commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to SCSI MultiMedia Commands menu...");
+                    AaruConsole.WriteLine("Returning to SCSI MultiMedia Commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ DISC INFORMATION response:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ DISC INFORMATION response:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ DISC INFORMATION decoded response:");
-                    DicConsole.Write("{0}", DiscInformation.Prettify(buffer));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ DISC INFORMATION decoded response:");
+                    AaruConsole.Write("{0}", DiscInformation.Prettify(buffer));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ DISC INFORMATION sense:");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ DISC INFORMATION sense:");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 4:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ DISC INFORMATION decoded sense:");
-                    DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ DISC INFORMATION decoded sense:");
+                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 5: goto start;
                 case 6: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -1349,138 +1590,166 @@ namespace Aaru.Tests.Devices.SCSI
             int                       item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Parameters for READ DISC STRUCTURE command:");
-                DicConsole.WriteLine("Media type: {0}", mediaType);
-                DicConsole.WriteLine("Format: {0}",     format);
-                DicConsole.WriteLine("Address: {0}",    address);
-                DicConsole.WriteLine("Layer: {0}",      layer);
-                DicConsole.WriteLine("AGID: {0}",       agid);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to SCSI MultiMedia Commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for READ DISC STRUCTURE command:");
+                AaruConsole.WriteLine("Media type: {0}", mediaType);
+                AaruConsole.WriteLine("Format: {0}", format);
+                AaruConsole.WriteLine("Address: {0}", address);
+                AaruConsole.WriteLine("Layer: {0}", layer);
+                AaruConsole.WriteLine("AGID: {0}", agid);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to SCSI MultiMedia Commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to SCSI MultiMedia Commands menu...");
+                        AaruConsole.WriteLine("Returning to SCSI MultiMedia Commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.WriteLine("Media type");
-                        DicConsole.WriteLine("Available values: {0} {1}", MmcDiscStructureMediaType.Dvd,
-                                             MmcDiscStructureMediaType.Bd);
-                        DicConsole.Write("Choose?: ");
+                        AaruConsole.WriteLine("Media type");
+
+                        AaruConsole.WriteLine("Available values: {0} {1}", MmcDiscStructureMediaType.Dvd,
+                                              MmcDiscStructureMediaType.Bd);
+
+                        AaruConsole.Write("Choose?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!Enum.TryParse(strDev, true, out mediaType))
                         {
-                            DicConsole.WriteLine("Not a correct media type. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a correct media type. Press any key to continue...");
                             mediaType = MmcDiscStructureMediaType.Dvd;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.WriteLine("Format");
-                        DicConsole.WriteLine("Available values:");
+                        AaruConsole.WriteLine("Format");
+                        AaruConsole.WriteLine("Available values:");
+
                         switch(mediaType)
                         {
                             case MmcDiscStructureMediaType.Dvd:
-                                DicConsole.WriteLine("\t{0} {1} {2} {3}", MmcDiscStructureFormat.PhysicalInformation,
-                                                     MmcDiscStructureFormat.CopyrightInformation,
-                                                     MmcDiscStructureFormat.DiscKey,
-                                                     MmcDiscStructureFormat.BurstCuttingArea);
-                                DicConsole.WriteLine("\t{0} {1} {2} {3}",
-                                                     MmcDiscStructureFormat.DiscManufacturingInformation,
-                                                     MmcDiscStructureFormat.SectorCopyrightInformation,
-                                                     MmcDiscStructureFormat.MediaIdentifier,
-                                                     MmcDiscStructureFormat.MediaKeyBlock);
-                                DicConsole.WriteLine("\t{0} {1} {2} {3}", MmcDiscStructureFormat.DvdramDds,
-                                                     MmcDiscStructureFormat.DvdramMediumStatus,
-                                                     MmcDiscStructureFormat.DvdramSpareAreaInformation,
-                                                     MmcDiscStructureFormat.DvdramRecordingType);
-                                DicConsole.WriteLine("\t{0} {1} {2} {3}", MmcDiscStructureFormat.LastBorderOutRmd,
-                                                     MmcDiscStructureFormat.SpecifiedRmd,
-                                                     MmcDiscStructureFormat.PreRecordedInfo,
-                                                     MmcDiscStructureFormat.DvdrMediaIdentifier);
-                                DicConsole.WriteLine("\t{0} {1} {2} {3}",
-                                                     MmcDiscStructureFormat.DvdrPhysicalInformation,
-                                                     MmcDiscStructureFormat.Adip,
-                                                     MmcDiscStructureFormat.HddvdCopyrightInformation,
-                                                     MmcDiscStructureFormat.DvdAacs);
-                                DicConsole.WriteLine("\t{0} {1} {2} {3}", MmcDiscStructureFormat.HddvdrMediumStatus,
-                                                     MmcDiscStructureFormat.HddvdrLastRmd,
-                                                     MmcDiscStructureFormat.DvdrLayerCapacity,
-                                                     MmcDiscStructureFormat.MiddleZoneStart);
-                                DicConsole.WriteLine("\t{0} {1} {2} {3}", MmcDiscStructureFormat.JumpIntervalSize,
-                                                     MmcDiscStructureFormat.ManualLayerJumpStartLba,
-                                                     MmcDiscStructureFormat.RemapAnchorPoint,
-                                                     MmcDiscStructureFormat.Dcb);
+                                AaruConsole.WriteLine("\t{0} {1} {2} {3}", MmcDiscStructureFormat.PhysicalInformation,
+                                                      MmcDiscStructureFormat.CopyrightInformation,
+                                                      MmcDiscStructureFormat.DiscKey,
+                                                      MmcDiscStructureFormat.BurstCuttingArea);
+
+                                AaruConsole.WriteLine("\t{0} {1} {2} {3}",
+                                                      MmcDiscStructureFormat.DiscManufacturingInformation,
+                                                      MmcDiscStructureFormat.SectorCopyrightInformation,
+                                                      MmcDiscStructureFormat.MediaIdentifier,
+                                                      MmcDiscStructureFormat.MediaKeyBlock);
+
+                                AaruConsole.WriteLine("\t{0} {1} {2} {3}", MmcDiscStructureFormat.DvdramDds,
+                                                      MmcDiscStructureFormat.DvdramMediumStatus,
+                                                      MmcDiscStructureFormat.DvdramSpareAreaInformation,
+                                                      MmcDiscStructureFormat.DvdramRecordingType);
+
+                                AaruConsole.WriteLine("\t{0} {1} {2} {3}", MmcDiscStructureFormat.LastBorderOutRmd,
+                                                      MmcDiscStructureFormat.SpecifiedRmd,
+                                                      MmcDiscStructureFormat.PreRecordedInfo,
+                                                      MmcDiscStructureFormat.DvdrMediaIdentifier);
+
+                                AaruConsole.WriteLine("\t{0} {1} {2} {3}",
+                                                      MmcDiscStructureFormat.DvdrPhysicalInformation,
+                                                      MmcDiscStructureFormat.Adip,
+                                                      MmcDiscStructureFormat.HddvdCopyrightInformation,
+                                                      MmcDiscStructureFormat.DvdAacs);
+
+                                AaruConsole.WriteLine("\t{0} {1} {2} {3}", MmcDiscStructureFormat.HddvdrMediumStatus,
+                                                      MmcDiscStructureFormat.HddvdrLastRmd,
+                                                      MmcDiscStructureFormat.DvdrLayerCapacity,
+                                                      MmcDiscStructureFormat.MiddleZoneStart);
+
+                                AaruConsole.WriteLine("\t{0} {1} {2} {3}", MmcDiscStructureFormat.JumpIntervalSize,
+                                                      MmcDiscStructureFormat.ManualLayerJumpStartLba,
+                                                      MmcDiscStructureFormat.RemapAnchorPoint,
+                                                      MmcDiscStructureFormat.Dcb);
+
                                 break;
                             case MmcDiscStructureMediaType.Bd:
-                                DicConsole.WriteLine("\t{0} {1} {2} {3}", MmcDiscStructureFormat.DiscInformation,
-                                                     MmcDiscStructureFormat.BdBurstCuttingArea,
-                                                     MmcDiscStructureFormat.BdDds,
-                                                     MmcDiscStructureFormat.CartridgeStatus);
-                                DicConsole.WriteLine("\t{0} {1} {2}", MmcDiscStructureFormat.BdSpareAreaInformation,
-                                                     MmcDiscStructureFormat.RawDfl, MmcDiscStructureFormat.Pac);
+                                AaruConsole.WriteLine("\t{0} {1} {2} {3}", MmcDiscStructureFormat.DiscInformation,
+                                                      MmcDiscStructureFormat.BdBurstCuttingArea,
+                                                      MmcDiscStructureFormat.BdDds,
+                                                      MmcDiscStructureFormat.CartridgeStatus);
+
+                                AaruConsole.WriteLine("\t{0} {1} {2}", MmcDiscStructureFormat.BdSpareAreaInformation,
+                                                      MmcDiscStructureFormat.RawDfl, MmcDiscStructureFormat.Pac);
+
                                 break;
                         }
 
-                        DicConsole.WriteLine("\t{0} {1} {2} {3}", MmcDiscStructureFormat.AacsVolId,
-                                             MmcDiscStructureFormat.AacsMediaSerial, MmcDiscStructureFormat.AacsMediaId,
-                                             MmcDiscStructureFormat.Aacsmkb);
-                        DicConsole.WriteLine("\t{0} {1} {2} {3}", MmcDiscStructureFormat.AacsDataKeys,
-                                             MmcDiscStructureFormat.AacslbaExtents, MmcDiscStructureFormat.Aacsmkbcprm,
-                                             MmcDiscStructureFormat.RecognizedFormatLayers);
-                        DicConsole.WriteLine("\t{0} {1}", MmcDiscStructureFormat.WriteProtectionStatus,
-                                             MmcDiscStructureFormat.CapabilityList);
-                        DicConsole.Write("Choose?: ");
+                        AaruConsole.WriteLine("\t{0} {1} {2} {3}", MmcDiscStructureFormat.AacsVolId,
+                                              MmcDiscStructureFormat.AacsMediaSerial,
+                                              MmcDiscStructureFormat.AacsMediaId, MmcDiscStructureFormat.Aacsmkb);
+
+                        AaruConsole.WriteLine("\t{0} {1} {2} {3}", MmcDiscStructureFormat.AacsDataKeys,
+                                              MmcDiscStructureFormat.AacslbaExtents, MmcDiscStructureFormat.Aacsmkbcprm,
+                                              MmcDiscStructureFormat.RecognizedFormatLayers);
+
+                        AaruConsole.WriteLine("\t{0} {1}", MmcDiscStructureFormat.WriteProtectionStatus,
+                                              MmcDiscStructureFormat.CapabilityList);
+
+                        AaruConsole.Write("Choose?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!Enum.TryParse(strDev, true, out format))
                         {
-                            DicConsole.WriteLine("Not a correct media type. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a correct media type. Press any key to continue...");
                             format = MmcDiscStructureFormat.CapabilityList;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Address?: ");
+                        AaruConsole.Write("Address?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!uint.TryParse(strDev, out address))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             address = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Layer?: ");
+                        AaruConsole.Write("Layer?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!byte.TryParse(strDev, out layer))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             layer = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("AGID?: ");
+                        AaruConsole.Write("AGID?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!byte.TryParse(strDev, out agid))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             agid = 0;
                             System.Console.ReadKey();
                         }
@@ -1492,89 +1761,105 @@ namespace Aaru.Tests.Devices.SCSI
 
             start:
             System.Console.Clear();
+
             bool sense = dev.ReadDiscStructure(out byte[] buffer, out byte[] senseBuffer, mediaType, address, layer,
                                                format, agid, dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}",       ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",         senseBuffer?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Decode buffer.");
-            DicConsole.WriteLine("3.- Print sense buffer.");
-            DicConsole.WriteLine("4.- Decode sense buffer.");
-            DicConsole.WriteLine("5.- Send command again.");
-            DicConsole.WriteLine("6.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to SCSI MultiMedia Commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending READ DISC STRUCTURE to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Decode buffer.");
+            AaruConsole.WriteLine("3.- Print sense buffer.");
+            AaruConsole.WriteLine("4.- Decode sense buffer.");
+            AaruConsole.WriteLine("5.- Send command again.");
+            AaruConsole.WriteLine("6.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to SCSI MultiMedia Commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to SCSI MultiMedia Commands menu...");
+                    AaruConsole.WriteLine("Returning to SCSI MultiMedia Commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ DISC STRUCTURE response:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ DISC STRUCTURE response:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     // TODO: Implement
-                    DicConsole.WriteLine("READ DISC STRUCTURE decoding not yet implemented:");
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("READ DISC STRUCTURE decoding not yet implemented:");
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ DISC STRUCTURE sense:");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ DISC STRUCTURE sense:");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 4:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ DISC STRUCTURE decoded sense:");
-                    DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ DISC STRUCTURE decoded sense:");
+                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 5: goto start;
                 case 6: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -1588,59 +1873,68 @@ namespace Aaru.Tests.Devices.SCSI
             int    item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Parameters for READ TOC/PMA/ATIP command:");
-                DicConsole.WriteLine("Return MSF values?: {0}", msf);
-                DicConsole.WriteLine("Format byte: {0}",        format);
-                DicConsole.WriteLine("Session: {0}",            session);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to SCSI MultiMedia Commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for READ TOC/PMA/ATIP command:");
+                AaruConsole.WriteLine("Return MSF values?: {0}", msf);
+                AaruConsole.WriteLine("Format byte: {0}", format);
+                AaruConsole.WriteLine("Session: {0}", session);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to SCSI MultiMedia Commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to SCSI MultiMedia Commands menu...");
+                        AaruConsole.WriteLine("Returning to SCSI MultiMedia Commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.Write("Return MSF values?: ");
+                        AaruConsole.Write("Return MSF values?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out msf))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             msf = false;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Format?: ");
+                        AaruConsole.Write("Format?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!byte.TryParse(strDev, out format))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             format = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Session?: ");
+                        AaruConsole.Write("Session?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!byte.TryParse(strDev, out session))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             session = 0;
                             System.Console.ReadKey();
                         }
@@ -1652,117 +1946,142 @@ namespace Aaru.Tests.Devices.SCSI
 
             start:
             System.Console.Clear();
+
             bool sense = dev.ReadTocPmaAtip(out byte[] buffer, out byte[] senseBuffer, msf, format, session,
                                             dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}",       ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",         senseBuffer?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Decode buffer.");
-            DicConsole.WriteLine("3.- Print sense buffer.");
-            DicConsole.WriteLine("4.- Decode sense buffer.");
-            DicConsole.WriteLine("5.- Send command again.");
-            DicConsole.WriteLine("6.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to SCSI MultiMedia Commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending READ TOC/PMA/ATIP to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Decode buffer.");
+            AaruConsole.WriteLine("3.- Print sense buffer.");
+            AaruConsole.WriteLine("4.- Decode sense buffer.");
+            AaruConsole.WriteLine("5.- Send command again.");
+            AaruConsole.WriteLine("6.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to SCSI MultiMedia Commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to SCSI MultiMedia Commands menu...");
+                    AaruConsole.WriteLine("Returning to SCSI MultiMedia Commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ TOC/PMA/ATIP buffer:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ TOC/PMA/ATIP buffer:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ TOC/PMA/ATIP decoded buffer:");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ TOC/PMA/ATIP decoded buffer:");
+
                     if(buffer != null)
                         switch(format)
                         {
                             case 0:
-                                DicConsole.Write("{0}", TOC.Prettify(buffer));
+                                AaruConsole.Write("{0}", TOC.Prettify(buffer));
                                 PrintHex.PrintHexArray(buffer, 64);
+
                                 break;
                             case 1:
-                                DicConsole.Write("{0}", Session.Prettify(buffer));
+                                AaruConsole.Write("{0}", Session.Prettify(buffer));
                                 PrintHex.PrintHexArray(buffer, 64);
+
                                 break;
                             case 2:
-                                DicConsole.Write("{0}", FullTOC.Prettify(buffer));
+                                AaruConsole.Write("{0}", FullTOC.Prettify(buffer));
                                 PrintHex.PrintHexArray(buffer, 64);
+
                                 break;
                             case 3:
-                                DicConsole.Write("{0}", PMA.Prettify(buffer));
+                                AaruConsole.Write("{0}", PMA.Prettify(buffer));
                                 PrintHex.PrintHexArray(buffer, 64);
+
                                 break;
                             case 4:
-                                DicConsole.Write("{0}", ATIP.Prettify(buffer));
+                                AaruConsole.Write("{0}", ATIP.Prettify(buffer));
                                 PrintHex.PrintHexArray(buffer, 64);
+
                                 break;
                             case 5:
-                                DicConsole.Write("{0}", CDTextOnLeadIn.Prettify(buffer));
+                                AaruConsole.Write("{0}", CDTextOnLeadIn.Prettify(buffer));
                                 PrintHex.PrintHexArray(buffer, 64);
+
                                 break;
                         }
 
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ TOC/PMA/ATIP sense:");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ TOC/PMA/ATIP sense:");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 4:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ TOC/PMA/ATIP decoded sense:");
-                    if(senseBuffer != null) DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ TOC/PMA/ATIP decoded sense:");
+
+                    if(senseBuffer != null)
+                        AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 5: goto start;
                 case 6: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -1779,92 +2098,107 @@ namespace Aaru.Tests.Devices.SCSI
             int    item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Parameters for START STOP UNIT command:");
-                DicConsole.WriteLine("Immediate?: {0}",           immediate);
-                DicConsole.WriteLine("Change format layer?: {0}", changeFormatLayer);
-                DicConsole.WriteLine("Eject?: {0}",               loadEject);
-                DicConsole.WriteLine("Start?: {0}",               start);
-                DicConsole.WriteLine("Format layer: {0}",         formatLayer);
-                DicConsole.WriteLine("Power conditions: {0}",     powerConditions);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to SCSI MultiMedia Commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for START STOP UNIT command:");
+                AaruConsole.WriteLine("Immediate?: {0}", immediate);
+                AaruConsole.WriteLine("Change format layer?: {0}", changeFormatLayer);
+                AaruConsole.WriteLine("Eject?: {0}", loadEject);
+                AaruConsole.WriteLine("Start?: {0}", start);
+                AaruConsole.WriteLine("Format layer: {0}", formatLayer);
+                AaruConsole.WriteLine("Power conditions: {0}", powerConditions);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to SCSI MultiMedia Commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to SCSI MultiMedia Commands menu...");
+                        AaruConsole.WriteLine("Returning to SCSI MultiMedia Commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.Write("Immediate?: ");
+                        AaruConsole.Write("Immediate?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out immediate))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             immediate = false;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Change format layer?: ");
+                        AaruConsole.Write("Change format layer?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out changeFormatLayer))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             changeFormatLayer = false;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Eject?: ");
+                        AaruConsole.Write("Eject?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out loadEject))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             loadEject = false;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Start?: ");
+                        AaruConsole.Write("Start?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out start))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             start = false;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Format layer?: ");
+                        AaruConsole.Write("Format layer?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!byte.TryParse(strDev, out formatLayer))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             formatLayer = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Power conditions?: ");
+                        AaruConsole.Write("Power conditions?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!byte.TryParse(strDev, out powerConditions))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             powerConditions = 0;
                             System.Console.ReadKey();
                         }
@@ -1876,56 +2210,65 @@ namespace Aaru.Tests.Devices.SCSI
 
             start:
             System.Console.Clear();
+
             bool sense = dev.StartStopUnit(out byte[] senseBuffer, immediate, formatLayer, powerConditions,
                                            changeFormatLayer, loadEject, start, dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            DicConsole.WriteLine("Sending START STOP UNIT to the device:");
-            DicConsole.WriteLine("Command took {0} ms.",               duration);
-            DicConsole.WriteLine("Sense is {0}.",                      sense);
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",         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));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print sense buffer.");
-            DicConsole.WriteLine("2.- Send command again.");
-            DicConsole.WriteLine("3.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to SCSI MultiMedia Commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending START STOP UNIT to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine("START STOP UNIT decoded sense:");
+            AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print sense buffer.");
+            AaruConsole.WriteLine("2.- Send command again.");
+            AaruConsole.WriteLine("3.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to SCSI MultiMedia Commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to SCSI MultiMedia Commands menu...");
+                    AaruConsole.WriteLine("Returning to SCSI MultiMedia Commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("START STOP UNIT sense:");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("START STOP UNIT sense:");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2: goto start;
                 case 3: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
diff --git a/Aaru.Tests.Devices/SCSI/NEC.cs b/Aaru.Tests.Devices/SCSI/NEC.cs
index e692663c9..ad185e8f1 100644
--- a/Aaru.Tests.Devices/SCSI/NEC.cs
+++ b/Aaru.Tests.Devices/SCSI/NEC.cs
@@ -32,38 +32,43 @@ using Aaru.Devices;
 
 namespace Aaru.Tests.Devices.SCSI
 {
-    static class Nec
+    internal static class Nec
     {
         internal static void Menu(string devPath, Device dev)
         {
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Send a NEC vendor command to the device:");
-                DicConsole.WriteLine("1.- Send READ CD-DA command.");
-                DicConsole.WriteLine("0.- Return to SCSI commands menu.");
-                DicConsole.Write("Choose: ");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Send a NEC vendor command to the device:");
+                AaruConsole.WriteLine("1.- Send READ CD-DA command.");
+                AaruConsole.WriteLine("0.- Return to SCSI commands menu.");
+                AaruConsole.Write("Choose: ");
 
                 string strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out int item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to SCSI commands menu...");
+                        AaruConsole.WriteLine("Returning to SCSI commands menu...");
+
                         return;
                     case 1:
                         ReadCdDa(devPath, dev);
+
                         continue;
                     default:
-                        DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                        AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                         System.Console.ReadKey();
+
                         continue;
                 }
             }
@@ -77,48 +82,55 @@ namespace Aaru.Tests.Devices.SCSI
             int    item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Parameters for READ CD-DA command:");
-                DicConsole.WriteLine("LBA: {0}",                  address);
-                DicConsole.WriteLine("Will transfer {0} sectors", length);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to NEC vendor commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for READ CD-DA command:");
+                AaruConsole.WriteLine("LBA: {0}", address);
+                AaruConsole.WriteLine("Will transfer {0} sectors", length);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to NEC vendor commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to NEC vendor commands menu...");
+                        AaruConsole.WriteLine("Returning to NEC vendor commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.Write("Logical Block Address?: ");
+                        AaruConsole.Write("Logical Block Address?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!uint.TryParse(strDev, out address))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             address = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("How many sectors to transfer?: ");
+                        AaruConsole.Write("How many sectors to transfer?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!uint.TryParse(strDev, out length))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             length = 1;
                             System.Console.ReadKey();
                         }
@@ -130,78 +142,92 @@ namespace Aaru.Tests.Devices.SCSI
 
             start:
             System.Console.Clear();
+
             bool sense = dev.NecReadCdDa(out byte[] buffer, out byte[] senseBuffer, address, length, dev.Timeout,
                                          out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}",       ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",         senseBuffer?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Print sense buffer.");
-            DicConsole.WriteLine("3.- Decode sense buffer.");
-            DicConsole.WriteLine("4.- Send command again.");
-            DicConsole.WriteLine("5.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to NEC vendor commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending READ CD-DA to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Print sense buffer.");
+            AaruConsole.WriteLine("3.- Decode sense buffer.");
+            AaruConsole.WriteLine("4.- Send command again.");
+            AaruConsole.WriteLine("5.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to NEC vendor commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to NEC vendor commands menu...");
+                    AaruConsole.WriteLine("Returning to NEC vendor commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ CD-DA response:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ CD-DA response:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ CD-DA sense:");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ CD-DA sense:");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ CD-DA decoded sense:");
-                    DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ CD-DA decoded sense:");
+                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 4: goto start;
                 case 5: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
diff --git a/Aaru.Tests.Devices/SCSI/Pioneer.cs b/Aaru.Tests.Devices/SCSI/Pioneer.cs
index 82be65112..db4ac3b5b 100644
--- a/Aaru.Tests.Devices/SCSI/Pioneer.cs
+++ b/Aaru.Tests.Devices/SCSI/Pioneer.cs
@@ -33,46 +33,53 @@ using Aaru.Devices;
 
 namespace Aaru.Tests.Devices.SCSI
 {
-    static class Pioneer
+    internal static class Pioneer
     {
         internal static void Menu(string devPath, Device dev)
         {
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Send a Pioneer vendor command to the device:");
-                DicConsole.WriteLine("1.- Send READ CD-DA command.");
-                DicConsole.WriteLine("2.- Send READ CD-DA MSF command.");
-                DicConsole.WriteLine("3.- Send READ CD-XA command.");
-                DicConsole.WriteLine("0.- Return to SCSI commands menu.");
-                DicConsole.Write("Choose: ");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Send a Pioneer vendor command to the device:");
+                AaruConsole.WriteLine("1.- Send READ CD-DA command.");
+                AaruConsole.WriteLine("2.- Send READ CD-DA MSF command.");
+                AaruConsole.WriteLine("3.- Send READ CD-XA command.");
+                AaruConsole.WriteLine("0.- Return to SCSI commands menu.");
+                AaruConsole.Write("Choose: ");
 
                 string strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out int item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to SCSI commands menu...");
+                        AaruConsole.WriteLine("Returning to SCSI commands menu...");
+
                         return;
                     case 1:
                         ReadCdDa(devPath, dev);
+
                         continue;
                     case 2:
                         ReadCdDaMsf(devPath, dev);
+
                         continue;
                     case 3:
                         ReadCdXa(devPath, dev);
+
                         continue;
                     default:
-                        DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                        AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                         System.Console.ReadKey();
+
                         continue;
                 }
             }
@@ -88,65 +95,77 @@ namespace Aaru.Tests.Devices.SCSI
             int               item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Parameters for READ CD-DA command:");
-                DicConsole.WriteLine("LBA: {0}",                  address);
-                DicConsole.WriteLine("Will transfer {0} sectors", length);
-                DicConsole.WriteLine("Subchannel mode: {0}",      subchan);
-                DicConsole.WriteLine("{0} bytes per sectors",     blockSize);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to Pioneer vendor commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for READ CD-DA command:");
+                AaruConsole.WriteLine("LBA: {0}", address);
+                AaruConsole.WriteLine("Will transfer {0} sectors", length);
+                AaruConsole.WriteLine("Subchannel mode: {0}", subchan);
+                AaruConsole.WriteLine("{0} bytes per sectors", blockSize);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to Pioneer vendor commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to Pioneer vendor commands menu...");
+                        AaruConsole.WriteLine("Returning to Pioneer vendor commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.Write("Logical Block Address?: ");
+                        AaruConsole.Write("Logical Block Address?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!uint.TryParse(strDev, out address))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             address = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("How many sectors to transfer?: ");
+                        AaruConsole.Write("How many sectors to transfer?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!uint.TryParse(strDev, out length))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             length = 1;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.WriteLine("Subchannel mode");
-                        DicConsole.WriteLine("Available values: {0} {1} {2} {3}", PioneerSubchannel.None,
-                                             PioneerSubchannel.Q16, PioneerSubchannel.All, PioneerSubchannel.Only);
-                        DicConsole.Write("Choose?: ");
+                        AaruConsole.WriteLine("Subchannel mode");
+
+                        AaruConsole.WriteLine("Available values: {0} {1} {2} {3}", PioneerSubchannel.None,
+                                              PioneerSubchannel.Q16, PioneerSubchannel.All, PioneerSubchannel.Only);
+
+                        AaruConsole.Write("Choose?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!Enum.TryParse(strDev, true, out subchan))
                         {
-                            DicConsole.WriteLine("Not a correct page control. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a correct page control. Press any key to continue...");
                             subchan = PioneerSubchannel.None;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
@@ -154,15 +173,19 @@ namespace Aaru.Tests.Devices.SCSI
                         {
                             case PioneerSubchannel.Q16:
                                 blockSize = 2368;
+
                                 break;
                             case PioneerSubchannel.All:
                                 blockSize = 2448;
+
                                 break;
                             case PioneerSubchannel.Only:
                                 blockSize = 96;
+
                                 break;
                             default:
                                 blockSize = 2352;
+
                                 break;
                         }
 
@@ -173,78 +196,92 @@ namespace Aaru.Tests.Devices.SCSI
 
             start:
             System.Console.Clear();
+
             bool sense = dev.PioneerReadCdDa(out byte[] buffer, out byte[] senseBuffer, address, blockSize, length,
                                              subchan, dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}",       ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",         senseBuffer?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Print sense buffer.");
-            DicConsole.WriteLine("3.- Decode sense buffer.");
-            DicConsole.WriteLine("4.- Send command again.");
-            DicConsole.WriteLine("5.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to Pioneer vendor commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending READ CD-DA to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Print sense buffer.");
+            AaruConsole.WriteLine("3.- Decode sense buffer.");
+            AaruConsole.WriteLine("4.- Send command again.");
+            AaruConsole.WriteLine("5.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to Pioneer vendor commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to Pioneer vendor commands menu...");
+                    AaruConsole.WriteLine("Returning to Pioneer vendor commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ CD-DA response:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ CD-DA response:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ CD-DA sense:");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ CD-DA sense:");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ CD-DA decoded sense:");
-                    DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ CD-DA decoded sense:");
+                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 4: goto start;
                 case 5: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -263,105 +300,125 @@ namespace Aaru.Tests.Devices.SCSI
             int               item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Parameters for READ CD-DA MSF command:");
-                DicConsole.WriteLine("Start: {0:D2}:{1:D2}:{2:D2}", startMinute, startSecond, startFrame);
-                DicConsole.WriteLine("End: {0:D2}:{1:D2}:{2:D2}",   endMinute,   endSecond,   endFrame);
-                DicConsole.WriteLine("Subchannel mode: {0}",        subchan);
-                DicConsole.WriteLine("{0} bytes per sectors",       blockSize);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to Pioneer vendor commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for READ CD-DA MSF command:");
+                AaruConsole.WriteLine("Start: {0:D2}:{1:D2}:{2:D2}", startMinute, startSecond, startFrame);
+                AaruConsole.WriteLine("End: {0:D2}:{1:D2}:{2:D2}", endMinute, endSecond, endFrame);
+                AaruConsole.WriteLine("Subchannel mode: {0}", subchan);
+                AaruConsole.WriteLine("{0} bytes per sectors", blockSize);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to Pioneer vendor commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to Pioneer vendor commands menu...");
+                        AaruConsole.WriteLine("Returning to Pioneer vendor commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.Write("Start minute?: ");
+                        AaruConsole.Write("Start minute?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!byte.TryParse(strDev, out startMinute))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             startMinute = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Start second?: ");
+                        AaruConsole.Write("Start second?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!byte.TryParse(strDev, out startSecond))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             startSecond = 2;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Start frame?: ");
+                        AaruConsole.Write("Start frame?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!byte.TryParse(strDev, out startFrame))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             startFrame = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("End minute?: ");
+                        AaruConsole.Write("End minute?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!byte.TryParse(strDev, out endMinute))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             endMinute = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("End second?: ");
+                        AaruConsole.Write("End second?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!byte.TryParse(strDev, out endMinute))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             endMinute = 2;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("End frame?: ");
+                        AaruConsole.Write("End frame?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!byte.TryParse(strDev, out endFrame))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             endFrame = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.WriteLine("Subchannel mode");
-                        DicConsole.WriteLine("Available values: {0} {1} {2} {3}", PioneerSubchannel.None,
-                                             PioneerSubchannel.Q16, PioneerSubchannel.All, PioneerSubchannel.Only);
-                        DicConsole.Write("Choose?: ");
+                        AaruConsole.WriteLine("Subchannel mode");
+
+                        AaruConsole.WriteLine("Available values: {0} {1} {2} {3}", PioneerSubchannel.None,
+                                              PioneerSubchannel.Q16, PioneerSubchannel.All, PioneerSubchannel.Only);
+
+                        AaruConsole.Write("Choose?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!Enum.TryParse(strDev, true, out subchan))
                         {
-                            DicConsole.WriteLine("Not a correct page control. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a correct page control. Press any key to continue...");
                             subchan = PioneerSubchannel.None;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
@@ -369,15 +426,19 @@ namespace Aaru.Tests.Devices.SCSI
                         {
                             case PioneerSubchannel.Q16:
                                 blockSize = 2368;
+
                                 break;
                             case PioneerSubchannel.All:
                                 blockSize = 2448;
+
                                 break;
                             case PioneerSubchannel.Only:
                                 blockSize = 96;
+
                                 break;
                             default:
                                 blockSize = 2352;
+
                                 break;
                         }
 
@@ -390,78 +451,92 @@ namespace Aaru.Tests.Devices.SCSI
             uint startMsf = (uint)((startMinute << 16) + (startSecond << 8) + startFrame);
             uint endMsf   = (uint)((startMinute << 16) + (startSecond << 8) + startFrame);
             System.Console.Clear();
+
             bool sense = dev.PioneerReadCdDaMsf(out byte[] buffer, out byte[] senseBuffer, startMsf, endMsf, blockSize,
                                                 subchan, dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}",       ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",         senseBuffer?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Print sense buffer.");
-            DicConsole.WriteLine("3.- Decode sense buffer.");
-            DicConsole.WriteLine("4.- Send command again.");
-            DicConsole.WriteLine("5.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to Pioneer vendor commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending READ CD-DA MSF to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Print sense buffer.");
+            AaruConsole.WriteLine("3.- Decode sense buffer.");
+            AaruConsole.WriteLine("4.- Send command again.");
+            AaruConsole.WriteLine("5.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to Pioneer vendor commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to Pioneer vendor commands menu...");
+                    AaruConsole.WriteLine("Returning to Pioneer vendor commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ CD-DA MSF response:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ CD-DA MSF response:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ CD-DA MSF sense:");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ CD-DA MSF sense:");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ CD-DA MSF decoded sense:");
-                    DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ CD-DA MSF decoded sense:");
+                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 4: goto start;
                 case 5: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -476,70 +551,81 @@ namespace Aaru.Tests.Devices.SCSI
             int    item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Parameters for READ CD-XA command:");
-                DicConsole.WriteLine("LBA: {0}",                  address);
-                DicConsole.WriteLine("Will transfer {0} sectors", length);
-                DicConsole.WriteLine("Include error flags?: {0}", errorFlags);
-                DicConsole.WriteLine("Whole sector?: {0}",        wholeSector);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to Pioneer vendor commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for READ CD-XA command:");
+                AaruConsole.WriteLine("LBA: {0}", address);
+                AaruConsole.WriteLine("Will transfer {0} sectors", length);
+                AaruConsole.WriteLine("Include error flags?: {0}", errorFlags);
+                AaruConsole.WriteLine("Whole sector?: {0}", wholeSector);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to Pioneer vendor commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to Pioneer vendor commands menu...");
+                        AaruConsole.WriteLine("Returning to Pioneer vendor commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.Write("Logical Block Address?: ");
+                        AaruConsole.Write("Logical Block Address?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!uint.TryParse(strDev, out address))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             address = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("How many sectors to transfer?: ");
+                        AaruConsole.Write("How many sectors to transfer?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!uint.TryParse(strDev, out length))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             length = 1;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Include error flags?: ");
+                        AaruConsole.Write("Include error flags?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out errorFlags))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             errorFlags = false;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Read whole sector?: ");
+                        AaruConsole.Write("Read whole sector?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out wholeSector))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             wholeSector = false;
                             System.Console.ReadKey();
                         }
@@ -551,78 +637,92 @@ namespace Aaru.Tests.Devices.SCSI
 
             start:
             System.Console.Clear();
+
             bool sense = dev.PioneerReadCdXa(out byte[] buffer, out byte[] senseBuffer, address, length, errorFlags,
                                              wholeSector, dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}",       ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",         senseBuffer?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Print sense buffer.");
-            DicConsole.WriteLine("3.- Decode sense buffer.");
-            DicConsole.WriteLine("4.- Send command again.");
-            DicConsole.WriteLine("5.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to Pioneer vendor commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending READ CD-XA to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Print sense buffer.");
+            AaruConsole.WriteLine("3.- Decode sense buffer.");
+            AaruConsole.WriteLine("4.- Send command again.");
+            AaruConsole.WriteLine("5.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to Pioneer vendor commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to Pioneer vendor commands menu...");
+                    AaruConsole.WriteLine("Returning to Pioneer vendor commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ CD-XA response:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ CD-XA response:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ CD-XA sense:");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ CD-XA sense:");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ CD-XA decoded sense:");
-                    DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ CD-XA decoded sense:");
+                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 4: goto start;
                 case 5: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
diff --git a/Aaru.Tests.Devices/SCSI/Plasmon.cs b/Aaru.Tests.Devices/SCSI/Plasmon.cs
index ff100a6db..3306a704f 100644
--- a/Aaru.Tests.Devices/SCSI/Plasmon.cs
+++ b/Aaru.Tests.Devices/SCSI/Plasmon.cs
@@ -32,42 +32,48 @@ using Aaru.Devices;
 
 namespace Aaru.Tests.Devices.SCSI
 {
-    static class Plasmon
+    internal static class Plasmon
     {
         internal static void Menu(string devPath, Device dev)
         {
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Send a Plasmon vendor command to the device:");
-                DicConsole.WriteLine("1.- Send READ LONG command.");
-                DicConsole.WriteLine("2.- Send READ SECTOR LOCATION command.");
-                DicConsole.WriteLine("0.- Return to SCSI commands menu.");
-                DicConsole.Write("Choose: ");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Send a Plasmon vendor command to the device:");
+                AaruConsole.WriteLine("1.- Send READ LONG command.");
+                AaruConsole.WriteLine("2.- Send READ SECTOR LOCATION command.");
+                AaruConsole.WriteLine("0.- Return to SCSI commands menu.");
+                AaruConsole.Write("Choose: ");
 
                 string strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out int item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to SCSI commands menu...");
+                        AaruConsole.WriteLine("Returning to SCSI commands menu...");
+
                         return;
                     case 1:
                         ReadLong(devPath, dev);
+
                         continue;
                     case 2:
                         ReadSectorLocation(devPath, dev);
+
                         continue;
                     default:
-                        DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                        AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                         System.Console.ReadKey();
+
                         continue;
                 }
             }
@@ -85,92 +91,110 @@ namespace Aaru.Tests.Devices.SCSI
             int    item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Parameters for READ LONG command:");
-                DicConsole.WriteLine("{0} Block Address: {1}", physical ? "Physical" : "Logical", address);
-                DicConsole.WriteLine("Relative?: {0}",         relative);
-                DicConsole.WriteLine("Will transfer {0} {1}",  length, sectorCount ? "sectors" : "bytes");
-                if(sectorCount) DicConsole.WriteLine("Expected sector size: {0} bytes", bps);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to Plasmon vendor commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for READ LONG command:");
+                AaruConsole.WriteLine("{0} Block Address: {1}", physical ? "Physical" : "Logical", address);
+                AaruConsole.WriteLine("Relative?: {0}", relative);
+                AaruConsole.WriteLine("Will transfer {0} {1}", length, sectorCount ? "sectors" : "bytes");
+
+                if(sectorCount)
+                    AaruConsole.WriteLine("Expected sector size: {0} bytes", bps);
+
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to Plasmon vendor commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to Plasmon vendor commands menu...");
+                        AaruConsole.WriteLine("Returning to Plasmon vendor commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.Write("Physical address?: ");
+                        AaruConsole.Write("Physical address?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out physical))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             physical = false;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Relative address?: ");
+                        AaruConsole.Write("Relative address?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out relative))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             relative = false;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("{0} Block Address?: ", physical ? "Physical" : "Logical");
+                        AaruConsole.Write("{0} Block Address?: ", physical ? "Physical" : "Logical");
                         strDev = System.Console.ReadLine();
+
                         if(!uint.TryParse(strDev, out address))
                         {
-                            DicConsole.WriteLine("Not a numbr. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a numbr. Press any key to continue...");
                             address = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Transfer sectors?: ");
+                        AaruConsole.Write("Transfer sectors?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out sectorCount))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             sectorCount = true;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("How many {0} to transfer?: ", sectorCount ? "sectors" : "bytes");
+                        AaruConsole.Write("How many {0} to transfer?: ", sectorCount ? "sectors" : "bytes");
                         strDev = System.Console.ReadLine();
+
                         if(!ushort.TryParse(strDev, out length))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             length = (ushort)(sectorCount ? 1 : 512);
                             System.Console.ReadKey();
+
                             continue;
                         }
 
                         if(sectorCount)
                         {
-                            DicConsole.Write("How many bytes to expect per sector?");
+                            AaruConsole.Write("How many bytes to expect per sector?");
                             strDev = System.Console.ReadLine();
+
                             if(!ushort.TryParse(strDev, out bps))
                             {
-                                DicConsole.WriteLine("Not a numbr. Press any key to continue...");
+                                AaruConsole.WriteLine("Not a numbr. Press any key to continue...");
                                 bps = 512;
                                 System.Console.ReadKey();
                             }
@@ -183,78 +207,92 @@ namespace Aaru.Tests.Devices.SCSI
 
             start:
             System.Console.Clear();
+
             bool sense = dev.PlasmonReadLong(out byte[] buffer, out byte[] senseBuffer, relative, address, length, bps,
                                              physical, sectorCount, dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}",       ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",         senseBuffer?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Print sense buffer.");
-            DicConsole.WriteLine("3.- Decode sense buffer.");
-            DicConsole.WriteLine("4.- Send command again.");
-            DicConsole.WriteLine("5.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to Plasmon vendor commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending READ LONG to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Print sense buffer.");
+            AaruConsole.WriteLine("3.- Decode sense buffer.");
+            AaruConsole.WriteLine("4.- Send command again.");
+            AaruConsole.WriteLine("5.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to Plasmon vendor commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to Plasmon vendor commands menu...");
+                    AaruConsole.WriteLine("Returning to Plasmon vendor commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ LONG response:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ LONG response:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ LONG sense:");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ LONG sense:");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ LONG decoded sense:");
-                    DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ LONG decoded sense:");
+                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 4: goto start;
                 case 5: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -267,47 +305,54 @@ namespace Aaru.Tests.Devices.SCSI
             int    item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Parameters for READ SECTOR LOCATION command:");
-                DicConsole.WriteLine("{0} Block Address: {1}", physical ? "Physical" : "Logical", address);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to Plasmon vendor commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for READ SECTOR LOCATION command:");
+                AaruConsole.WriteLine("{0} Block Address: {1}", physical ? "Physical" : "Logical", address);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to Plasmon vendor commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to Plasmon vendor commands menu...");
+                        AaruConsole.WriteLine("Returning to Plasmon vendor commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.Write("Physical address?: ");
+                        AaruConsole.Write("Physical address?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out physical))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             physical = false;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("{0} Block Address?: ", physical ? "Physical" : "Logical");
+                        AaruConsole.Write("{0} Block Address?: ", physical ? "Physical" : "Logical");
                         strDev = System.Console.ReadLine();
+
                         if(!uint.TryParse(strDev, out address))
                         {
-                            DicConsole.WriteLine("Not a numbr. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a numbr. Press any key to continue...");
                             address = 0;
                             System.Console.ReadKey();
                         }
@@ -319,78 +364,92 @@ namespace Aaru.Tests.Devices.SCSI
 
             start:
             System.Console.Clear();
+
             bool sense = dev.PlasmonReadSectorLocation(out byte[] buffer, out byte[] senseBuffer, address, physical,
                                                        dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}",       ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",         senseBuffer?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Print sense buffer.");
-            DicConsole.WriteLine("3.- Decode sense buffer.");
-            DicConsole.WriteLine("4.- Send command again.");
-            DicConsole.WriteLine("5.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to Plasmon vendor commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending READ SECTOR LOCATION to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Print sense buffer.");
+            AaruConsole.WriteLine("3.- Decode sense buffer.");
+            AaruConsole.WriteLine("4.- Send command again.");
+            AaruConsole.WriteLine("5.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to Plasmon vendor commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to Plasmon vendor commands menu...");
+                    AaruConsole.WriteLine("Returning to Plasmon vendor commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ SECTOR LOCATION response:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ SECTOR LOCATION response:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ SECTOR LOCATION sense:");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ SECTOR LOCATION sense:");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ SECTOR LOCATION decoded sense:");
-                    DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ SECTOR LOCATION decoded sense:");
+                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 4: goto start;
                 case 5: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
diff --git a/Aaru.Tests.Devices/SCSI/Plextor.cs b/Aaru.Tests.Devices/SCSI/Plextor.cs
index 458674780..5b319a75a 100644
--- a/Aaru.Tests.Devices/SCSI/Plextor.cs
+++ b/Aaru.Tests.Devices/SCSI/Plextor.cs
@@ -33,90 +33,108 @@ using Aaru.Devices;
 
 namespace Aaru.Tests.Devices.SCSI
 {
-    static class Plextor
+    internal static class Plextor
     {
         internal static void Menu(string devPath, Device dev)
         {
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Send a Plextor vendor command to the device:");
-                DicConsole.WriteLine("1.- Send GET BOOK BITSETTING command.");
-                DicConsole.WriteLine("2.- Send GET GIGAREC command.");
-                DicConsole.WriteLine("3.- Send GET SECUREC command.");
-                DicConsole.WriteLine("4.- Send GET SILENT MODE command.");
-                DicConsole.WriteLine("5.- Send GET SINGLE-SESSION / HIDE CD-R command.");
-                DicConsole.WriteLine("6.- Send GET SPEEDREAD command.");
-                DicConsole.WriteLine("7.- Send GET TEST WRITE DVD+ command.");
-                DicConsole.WriteLine("8.- Send GET VARIREC command.");
-                DicConsole.WriteLine("9.- Send POWEREC GET SPEEDS command.");
-                DicConsole.WriteLine("10.- Send READ CD-DA command.");
-                DicConsole.WriteLine("11.- Send READ DVD (RAW) command.");
-                DicConsole.WriteLine("12.- Send READ EEPROM (CD recorders) command.");
-                DicConsole.WriteLine("13.- Send READ EEPROM (DVD recorders) command.");
-                DicConsole.WriteLine("14.- Send READ EEPROM (PX-708 and PX-712) command.");
-                DicConsole.WriteLine("0.- Return to SCSI commands menu.");
-                DicConsole.Write("Choose: ");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Send a Plextor vendor command to the device:");
+                AaruConsole.WriteLine("1.- Send GET BOOK BITSETTING command.");
+                AaruConsole.WriteLine("2.- Send GET GIGAREC command.");
+                AaruConsole.WriteLine("3.- Send GET SECUREC command.");
+                AaruConsole.WriteLine("4.- Send GET SILENT MODE command.");
+                AaruConsole.WriteLine("5.- Send GET SINGLE-SESSION / HIDE CD-R command.");
+                AaruConsole.WriteLine("6.- Send GET SPEEDREAD command.");
+                AaruConsole.WriteLine("7.- Send GET TEST WRITE DVD+ command.");
+                AaruConsole.WriteLine("8.- Send GET VARIREC command.");
+                AaruConsole.WriteLine("9.- Send POWEREC GET SPEEDS command.");
+                AaruConsole.WriteLine("10.- Send READ CD-DA command.");
+                AaruConsole.WriteLine("11.- Send READ DVD (RAW) command.");
+                AaruConsole.WriteLine("12.- Send READ EEPROM (CD recorders) command.");
+                AaruConsole.WriteLine("13.- Send READ EEPROM (DVD recorders) command.");
+                AaruConsole.WriteLine("14.- Send READ EEPROM (PX-708 and PX-712) command.");
+                AaruConsole.WriteLine("0.- Return to SCSI commands menu.");
+                AaruConsole.Write("Choose: ");
 
                 string strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out int item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to SCSI commands menu...");
+                        AaruConsole.WriteLine("Returning to SCSI commands menu...");
+
                         return;
                     case 1:
                         GetBookBitsetting(devPath, dev);
+
                         continue;
                     case 2:
                         GetGigaRec(devPath, dev);
+
                         continue;
                     case 3:
                         GetSecuRec(devPath, dev);
+
                         continue;
                     case 4:
                         GetSilentMode(devPath, dev);
+
                         continue;
                     case 5:
                         GetSingleSessionHideCdR(devPath, dev);
+
                         continue;
                     case 6:
                         GetSpeedRead(devPath, dev);
+
                         continue;
                     case 7:
                         GetTestWriteDvdPlus(devPath, dev);
+
                         continue;
                     case 8:
                         GetVariRec(devPath, dev);
+
                         continue;
                     case 9:
                         PoweRecGetSpeeds(devPath, dev);
+
                         continue;
                     case 10:
                         ReadCdDa(devPath, dev);
+
                         continue;
                     case 11:
                         ReadDvdRaw(devPath, dev);
+
                         continue;
                     case 12:
                         ReadEepromCdR(devPath, dev);
+
                         continue;
                     case 13:
                         ReadEeprom(devPath, dev);
+
                         continue;
                     case 14:
                         ReadEepromBlock(devPath, dev);
+
                         continue;
                     default:
-                        DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                        AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                         System.Console.ReadKey();
+
                         continue;
                 }
             }
@@ -129,37 +147,42 @@ namespace Aaru.Tests.Devices.SCSI
             int    item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Parameters for GET BOOK BITSETTING command:");
-                DicConsole.WriteLine("Dual layer?: {0}", dl);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to Plextor vendor commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for GET BOOK BITSETTING command:");
+                AaruConsole.WriteLine("Dual layer?: {0}", dl);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to Plextor vendor commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to Plextor vendor commands menu...");
+                        AaruConsole.WriteLine("Returning to Plextor vendor commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.Write("Dual layer?: ");
+                        AaruConsole.Write("Dual layer?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out dl))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             dl = false;
                             System.Console.ReadKey();
                         }
@@ -171,78 +194,92 @@ namespace Aaru.Tests.Devices.SCSI
 
             start:
             System.Console.Clear();
+
             bool sense = dev.PlextorGetBitsetting(out byte[] buffer, out byte[] senseBuffer, dl, dev.Timeout,
                                                   out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}",       ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",         senseBuffer?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Print sense buffer.");
-            DicConsole.WriteLine("3.- Decode sense buffer.");
-            DicConsole.WriteLine("4.- Send command again.");
-            DicConsole.WriteLine("5.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to Plextor vendor commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending GET BOOK BITSETTING to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Print sense buffer.");
+            AaruConsole.WriteLine("3.- Decode sense buffer.");
+            AaruConsole.WriteLine("4.- Send command again.");
+            AaruConsole.WriteLine("5.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to Plextor vendor commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to Plextor vendor commands menu...");
+                    AaruConsole.WriteLine("Returning to Plextor vendor commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("GET BOOK BITSETTING response:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("GET BOOK BITSETTING response:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("GET BOOK BITSETTING sense:");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("GET BOOK BITSETTING sense:");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("GET BOOK BITSETTING decoded sense:");
-                    DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("GET BOOK BITSETTING decoded sense:");
+                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 4: goto start;
                 case 5: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -251,76 +288,90 @@ namespace Aaru.Tests.Devices.SCSI
         {
             start:
             System.Console.Clear();
+
             bool sense = dev.PlextorGetGigaRec(out byte[] buffer, out byte[] senseBuffer, dev.Timeout,
                                                out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}",       ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",         senseBuffer?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Print sense buffer.");
-            DicConsole.WriteLine("3.- Decode sense buffer.");
-            DicConsole.WriteLine("4.- Send command again.");
-            DicConsole.WriteLine("0.- Return to Plextor vendor commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending GET GIGAREC to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Print sense buffer.");
+            AaruConsole.WriteLine("3.- Decode sense buffer.");
+            AaruConsole.WriteLine("4.- Send command again.");
+            AaruConsole.WriteLine("0.- Return to Plextor vendor commands menu.");
+            AaruConsole.Write("Choose: ");
 
             string strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out int item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to Plextor vendor commands menu...");
+                    AaruConsole.WriteLine("Returning to Plextor vendor commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("GET GIGAREC response:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("GET GIGAREC response:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("GET GIGAREC sense:");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("GET GIGAREC sense:");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("GET GIGAREC decoded sense:");
-                    DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("GET GIGAREC decoded sense:");
+                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 4: goto start;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -329,76 +380,90 @@ namespace Aaru.Tests.Devices.SCSI
         {
             start:
             System.Console.Clear();
+
             bool sense = dev.PlextorGetSecuRec(out byte[] buffer, out byte[] senseBuffer, dev.Timeout,
                                                out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}",       ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",         senseBuffer?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Print sense buffer.");
-            DicConsole.WriteLine("3.- Decode sense buffer.");
-            DicConsole.WriteLine("4.- Send command again.");
-            DicConsole.WriteLine("0.- Return to Plextor vendor commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending GET SECUREC to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Print sense buffer.");
+            AaruConsole.WriteLine("3.- Decode sense buffer.");
+            AaruConsole.WriteLine("4.- Send command again.");
+            AaruConsole.WriteLine("0.- Return to Plextor vendor commands menu.");
+            AaruConsole.Write("Choose: ");
 
             string strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out int item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to Plextor vendor commands menu...");
+                    AaruConsole.WriteLine("Returning to Plextor vendor commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("GET SECUREC response:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("GET SECUREC response:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("GET SECUREC sense:");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("GET SECUREC sense:");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("GET SECUREC decoded sense:");
-                    DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("GET SECUREC decoded sense:");
+                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 4: goto start;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -407,76 +472,90 @@ namespace Aaru.Tests.Devices.SCSI
         {
             start:
             System.Console.Clear();
+
             bool sense = dev.PlextorGetSilentMode(out byte[] buffer, out byte[] senseBuffer, dev.Timeout,
                                                   out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}",       ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",         senseBuffer?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Print sense buffer.");
-            DicConsole.WriteLine("3.- Decode sense buffer.");
-            DicConsole.WriteLine("4.- Send command again.");
-            DicConsole.WriteLine("0.- Return to Plextor vendor commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending GET SILENT MODE to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Print sense buffer.");
+            AaruConsole.WriteLine("3.- Decode sense buffer.");
+            AaruConsole.WriteLine("4.- Send command again.");
+            AaruConsole.WriteLine("0.- Return to Plextor vendor commands menu.");
+            AaruConsole.Write("Choose: ");
 
             string strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out int item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to Plextor vendor commands menu...");
+                    AaruConsole.WriteLine("Returning to Plextor vendor commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("GET SILENT MODE response:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("GET SILENT MODE response:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("GET SILENT MODE sense:");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("GET SILENT MODE sense:");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("GET SILENT MODE decoded sense:");
-                    DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("GET SILENT MODE decoded sense:");
+                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 4: goto start;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -485,76 +564,90 @@ namespace Aaru.Tests.Devices.SCSI
         {
             start:
             System.Console.Clear();
+
             bool sense = dev.PlextorGetHiding(out byte[] buffer, out byte[] senseBuffer, dev.Timeout,
                                               out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}",       ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",         senseBuffer?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Print sense buffer.");
-            DicConsole.WriteLine("3.- Decode sense buffer.");
-            DicConsole.WriteLine("4.- Send command again.");
-            DicConsole.WriteLine("0.- Return to Plextor vendor commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending GET SINGLE-SESSION / HIDE CD-R to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Print sense buffer.");
+            AaruConsole.WriteLine("3.- Decode sense buffer.");
+            AaruConsole.WriteLine("4.- Send command again.");
+            AaruConsole.WriteLine("0.- Return to Plextor vendor commands menu.");
+            AaruConsole.Write("Choose: ");
 
             string strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out int item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to Plextor vendor commands menu...");
+                    AaruConsole.WriteLine("Returning to Plextor vendor commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("GET SINGLE-SESSION / HIDE CD-R response:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("GET SINGLE-SESSION / HIDE CD-R response:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("GET SINGLE-SESSION / HIDE CD-R sense:");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("GET SINGLE-SESSION / HIDE CD-R sense:");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("GET SINGLE-SESSION / HIDE CD-R decoded sense:");
-                    DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("GET SINGLE-SESSION / HIDE CD-R decoded sense:");
+                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 4: goto start;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -563,76 +656,90 @@ namespace Aaru.Tests.Devices.SCSI
         {
             start:
             System.Console.Clear();
+
             bool sense = dev.PlextorGetSpeedRead(out byte[] buffer, out byte[] senseBuffer, dev.Timeout,
                                                  out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}",       ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",         senseBuffer?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Print sense buffer.");
-            DicConsole.WriteLine("3.- Decode sense buffer.");
-            DicConsole.WriteLine("4.- Send command again.");
-            DicConsole.WriteLine("0.- Return to Plextor vendor commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending GET SPEEDREAD to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Print sense buffer.");
+            AaruConsole.WriteLine("3.- Decode sense buffer.");
+            AaruConsole.WriteLine("4.- Send command again.");
+            AaruConsole.WriteLine("0.- Return to Plextor vendor commands menu.");
+            AaruConsole.Write("Choose: ");
 
             string strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out int item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to Plextor vendor commands menu...");
+                    AaruConsole.WriteLine("Returning to Plextor vendor commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("GET SPEEDREAD response:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("GET SPEEDREAD response:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("GET SPEEDREAD sense:");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("GET SPEEDREAD sense:");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("GET SPEEDREAD decoded sense:");
-                    DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("GET SPEEDREAD decoded sense:");
+                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 4: goto start;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -641,77 +748,91 @@ namespace Aaru.Tests.Devices.SCSI
         {
             start:
             System.Console.Clear();
+
             bool sense =
                 dev.PlextorGetTestWriteDvdPlus(out byte[] buffer, out byte[] senseBuffer, dev.Timeout,
                                                out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}",       ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",         senseBuffer?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Print sense buffer.");
-            DicConsole.WriteLine("3.- Decode sense buffer.");
-            DicConsole.WriteLine("4.- Send command again.");
-            DicConsole.WriteLine("0.- Return to Plextor vendor commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending GET TEST WRITE DVD+ to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Print sense buffer.");
+            AaruConsole.WriteLine("3.- Decode sense buffer.");
+            AaruConsole.WriteLine("4.- Send command again.");
+            AaruConsole.WriteLine("0.- Return to Plextor vendor commands menu.");
+            AaruConsole.Write("Choose: ");
 
             string strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out int item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to Plextor vendor commands menu...");
+                    AaruConsole.WriteLine("Returning to Plextor vendor commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("GET TEST WRITE DVD+ response:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("GET TEST WRITE DVD+ response:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("GET TEST WRITE DVD+ sense:");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("GET TEST WRITE DVD+ sense:");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("GET TEST WRITE DVD+ decoded sense:");
-                    DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("GET TEST WRITE DVD+ decoded sense:");
+                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 4: goto start;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -723,37 +844,42 @@ namespace Aaru.Tests.Devices.SCSI
             int    item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Parameters for GET VARIREC command:");
-                DicConsole.WriteLine("DVD?: {0}", dvd);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to Plextor vendor commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for GET VARIREC command:");
+                AaruConsole.WriteLine("DVD?: {0}", dvd);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to Plextor vendor commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to Plextor vendor commands menu...");
+                        AaruConsole.WriteLine("Returning to Plextor vendor commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.Write("DVD?: ");
+                        AaruConsole.Write("DVD?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out dvd))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             dvd = false;
                             System.Console.ReadKey();
                         }
@@ -765,78 +891,92 @@ namespace Aaru.Tests.Devices.SCSI
 
             start:
             System.Console.Clear();
+
             bool sense = dev.PlextorGetVariRec(out byte[] buffer, out byte[] senseBuffer, dvd, dev.Timeout,
                                                out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}",       ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",         senseBuffer?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Print sense buffer.");
-            DicConsole.WriteLine("3.- Decode sense buffer.");
-            DicConsole.WriteLine("4.- Send command again.");
-            DicConsole.WriteLine("5.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to Plextor vendor commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending GET VARIREC to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Print sense buffer.");
+            AaruConsole.WriteLine("3.- Decode sense buffer.");
+            AaruConsole.WriteLine("4.- Send command again.");
+            AaruConsole.WriteLine("5.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to Plextor vendor commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to Plextor vendor commands menu...");
+                    AaruConsole.WriteLine("Returning to Plextor vendor commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("GET VARIREC response:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("GET VARIREC response:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("GET VARIREC sense:");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("GET VARIREC sense:");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("GET VARIREC decoded sense:");
-                    DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("GET VARIREC decoded sense:");
+                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 4: goto start;
                 case 5: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -845,56 +985,65 @@ namespace Aaru.Tests.Devices.SCSI
         {
             start:
             System.Console.Clear();
+
             bool sense = dev.PlextorGetPoweRec(out byte[] senseBuffer, out bool enabled, out ushort speed, dev.Timeout,
                                                out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            DicConsole.WriteLine("Sending POWEREC GET SPEEDS to the device:");
-            DicConsole.WriteLine("Command took {0} ms.",               duration);
-            DicConsole.WriteLine("Sense is {0}.",                      sense);
-            DicConsole.WriteLine("PoweRec is {0}.",                    enabled ? "enabled" : "disabled");
-            DicConsole.WriteLine("Speed: {0}",                         speed);
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",         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));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print sense buffer.");
-            DicConsole.WriteLine("2.- Send command again.");
-            DicConsole.WriteLine("0.- Return to Plextor vendor commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending POWEREC GET SPEEDS to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("PoweRec is {0}.", enabled ? "enabled" : "disabled");
+            AaruConsole.WriteLine("Speed: {0}", speed);
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine("POWEREC GET SPEEDS decoded sense:");
+            AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print sense buffer.");
+            AaruConsole.WriteLine("2.- Send command again.");
+            AaruConsole.WriteLine("0.- Return to Plextor vendor commands menu.");
+            AaruConsole.Write("Choose: ");
 
             string strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out int item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to Plextor vendor commands menu...");
+                    AaruConsole.WriteLine("Returning to Plextor vendor commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("POWEREC GET SPEEDS sense:");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("POWEREC GET SPEEDS sense:");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2: goto start;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -909,66 +1058,78 @@ namespace Aaru.Tests.Devices.SCSI
             int               item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Parameters for READ CD-DA command:");
-                DicConsole.WriteLine("LBA: {0}",                  address);
-                DicConsole.WriteLine("Will transfer {0} sectors", length);
-                DicConsole.WriteLine("Subchannel mode: {0}",      subchan);
-                DicConsole.WriteLine("{0} bytes per sectors",     blockSize);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to Plextor vendor commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for READ CD-DA command:");
+                AaruConsole.WriteLine("LBA: {0}", address);
+                AaruConsole.WriteLine("Will transfer {0} sectors", length);
+                AaruConsole.WriteLine("Subchannel mode: {0}", subchan);
+                AaruConsole.WriteLine("{0} bytes per sectors", blockSize);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to Plextor vendor commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to Plextor vendor commands menu...");
+                        AaruConsole.WriteLine("Returning to Plextor vendor commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.Write("Logical Block Address?: ");
+                        AaruConsole.Write("Logical Block Address?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!uint.TryParse(strDev, out address))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             address = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("How many sectors to transfer?: ");
+                        AaruConsole.Write("How many sectors to transfer?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!uint.TryParse(strDev, out length))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             length = 1;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.WriteLine("Subchannel mode");
-                        DicConsole.WriteLine("Available values: {0} {1} {2} {3} {4}", PlextorSubchannel.None,
-                                             PlextorSubchannel.Q16, PlextorSubchannel.All, PlextorSubchannel.Pack,
-                                             PlextorSubchannel.RawC2);
-                        DicConsole.Write("Choose?: ");
+                        AaruConsole.WriteLine("Subchannel mode");
+
+                        AaruConsole.WriteLine("Available values: {0} {1} {2} {3} {4}", PlextorSubchannel.None,
+                                              PlextorSubchannel.Q16, PlextorSubchannel.All, PlextorSubchannel.Pack,
+                                              PlextorSubchannel.RawC2);
+
+                        AaruConsole.Write("Choose?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!Enum.TryParse(strDev, true, out subchan))
                         {
-                            DicConsole.WriteLine("Not a correct subchannel mode. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a correct subchannel mode. Press any key to continue...");
                             subchan = PlextorSubchannel.None;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
@@ -976,16 +1137,20 @@ namespace Aaru.Tests.Devices.SCSI
                         {
                             case PlextorSubchannel.Q16:
                                 blockSize = 2368;
+
                                 break;
                             case PlextorSubchannel.Pack:
                             case PlextorSubchannel.All:
                                 blockSize = 2448;
+
                                 break;
                             case PlextorSubchannel.RawC2:
                                 blockSize = 2742;
+
                                 break;
                             default:
                                 blockSize = 2352;
+
                                 break;
                         }
 
@@ -996,78 +1161,92 @@ namespace Aaru.Tests.Devices.SCSI
 
             start:
             System.Console.Clear();
+
             bool sense = dev.PlextorReadCdDa(out byte[] buffer, out byte[] senseBuffer, address, blockSize, length,
                                              subchan, dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}",       ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",         senseBuffer?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Print sense buffer.");
-            DicConsole.WriteLine("3.- Decode sense buffer.");
-            DicConsole.WriteLine("4.- Send command again.");
-            DicConsole.WriteLine("5.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to Plextor vendor commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending READ CD-DA to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Print sense buffer.");
+            AaruConsole.WriteLine("3.- Decode sense buffer.");
+            AaruConsole.WriteLine("4.- Send command again.");
+            AaruConsole.WriteLine("5.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to Plextor vendor commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to Plextor vendor commands menu...");
+                    AaruConsole.WriteLine("Returning to Plextor vendor commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ CD-DA response:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ CD-DA response:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ CD-DA sense:");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ CD-DA sense:");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ CD-DA decoded sense:");
-                    DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ CD-DA decoded sense:");
+                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 4: goto start;
                 case 5: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -1080,48 +1259,55 @@ namespace Aaru.Tests.Devices.SCSI
             int    item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Parameters for READ DVD (RAW) command:");
-                DicConsole.WriteLine("LBA: {0}",   lba);
-                DicConsole.WriteLine("Count: {0}", count);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to Plextor vendor commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for READ DVD (RAW) command:");
+                AaruConsole.WriteLine("LBA: {0}", lba);
+                AaruConsole.WriteLine("Count: {0}", count);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to Plextor vendor commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to Plextor vendor commands menu...");
+                        AaruConsole.WriteLine("Returning to Plextor vendor commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.Write("How many sectors?: ");
+                        AaruConsole.Write("How many sectors?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!uint.TryParse(strDev, out count))
                         {
-                            DicConsole.WriteLine("Not a numbr. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a numbr. Press any key to continue...");
                             count = 1;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("LBA?: ");
+                        AaruConsole.Write("LBA?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!uint.TryParse(strDev, out lba))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             lba = 0;
                             System.Console.ReadKey();
                         }
@@ -1133,78 +1319,92 @@ namespace Aaru.Tests.Devices.SCSI
 
             start:
             System.Console.Clear();
+
             bool sense = dev.PlextorReadRawDvd(out byte[] buffer, out byte[] senseBuffer, lba, count, dev.Timeout,
                                                out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}",       ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",         senseBuffer?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Print sense buffer.");
-            DicConsole.WriteLine("3.- Decode sense buffer.");
-            DicConsole.WriteLine("4.- Send command again.");
-            DicConsole.WriteLine("5.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to Plextor vendor commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending READ DVD (RAW) to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Print sense buffer.");
+            AaruConsole.WriteLine("3.- Decode sense buffer.");
+            AaruConsole.WriteLine("4.- Send command again.");
+            AaruConsole.WriteLine("5.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to Plextor vendor commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to Plextor vendor commands menu...");
+                    AaruConsole.WriteLine("Returning to Plextor vendor commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ DVD (RAW) response:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ DVD (RAW) response:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ DVD (RAW) sense:");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ DVD (RAW) sense:");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ DVD (RAW) decoded sense:");
-                    DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ DVD (RAW) decoded sense:");
+                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 4: goto start;
                 case 5: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -1213,76 +1413,90 @@ namespace Aaru.Tests.Devices.SCSI
         {
             start:
             System.Console.Clear();
+
             bool sense = dev.PlextorReadEepromCdr(out byte[] buffer, out byte[] senseBuffer, dev.Timeout,
                                                   out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}",       ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",         senseBuffer?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Print sense buffer.");
-            DicConsole.WriteLine("3.- Decode sense buffer.");
-            DicConsole.WriteLine("4.- Send command again.");
-            DicConsole.WriteLine("0.- Return to Plextor vendor commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending READ EEPROM to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Print sense buffer.");
+            AaruConsole.WriteLine("3.- Decode sense buffer.");
+            AaruConsole.WriteLine("4.- Send command again.");
+            AaruConsole.WriteLine("0.- Return to Plextor vendor commands menu.");
+            AaruConsole.Write("Choose: ");
 
             string strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out int item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to Plextor vendor commands menu...");
+                    AaruConsole.WriteLine("Returning to Plextor vendor commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ EEPROM response:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ EEPROM response:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ EEPROM sense:");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ EEPROM sense:");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ EEPROM decoded sense:");
-                    DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ EEPROM decoded sense:");
+                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 4: goto start;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -1295,48 +1509,55 @@ namespace Aaru.Tests.Devices.SCSI
             int    item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Parameters for READ EEPROM command:");
-                DicConsole.WriteLine("EEPROM block to read: {0}", block);
-                DicConsole.WriteLine("EEPROM block size: {0}",    blockSize);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to Plextor vendor commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for READ EEPROM command:");
+                AaruConsole.WriteLine("EEPROM block to read: {0}", block);
+                AaruConsole.WriteLine("EEPROM block size: {0}", blockSize);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to Plextor vendor commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to Plextor vendor commands menu...");
+                        AaruConsole.WriteLine("Returning to Plextor vendor commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.Write("EEPROM block to read?: ");
+                        AaruConsole.Write("EEPROM block to read?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!byte.TryParse(strDev, out block))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             block = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("EEPROM block size?: ");
+                        AaruConsole.Write("EEPROM block size?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!ushort.TryParse(strDev, out blockSize))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             blockSize = 0;
                             System.Console.ReadKey();
                         }
@@ -1348,78 +1569,92 @@ namespace Aaru.Tests.Devices.SCSI
 
             start:
             System.Console.Clear();
+
             bool sense = dev.PlextorReadEepromBlock(out byte[] buffer, out byte[] senseBuffer, block, blockSize,
                                                     dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}",       ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",         senseBuffer?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Print sense buffer.");
-            DicConsole.WriteLine("3.- Decode sense buffer.");
-            DicConsole.WriteLine("4.- Send command again.");
-            DicConsole.WriteLine("5.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to Plextor vendor commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending READ EEPROM to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Print sense buffer.");
+            AaruConsole.WriteLine("3.- Decode sense buffer.");
+            AaruConsole.WriteLine("4.- Send command again.");
+            AaruConsole.WriteLine("5.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to Plextor vendor commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to Plextor vendor commands menu...");
+                    AaruConsole.WriteLine("Returning to Plextor vendor commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ EEPROM response:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ EEPROM response:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ EEPROM sense:");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ EEPROM sense:");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ EEPROM decoded sense:");
-                    DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ EEPROM decoded sense:");
+                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 4: goto start;
                 case 5: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -1428,76 +1663,90 @@ namespace Aaru.Tests.Devices.SCSI
         {
             start:
             System.Console.Clear();
+
             bool sense = dev.PlextorReadEeprom(out byte[] buffer, out byte[] senseBuffer, dev.Timeout,
                                                out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}",       ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",         senseBuffer?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Print sense buffer.");
-            DicConsole.WriteLine("3.- Decode sense buffer.");
-            DicConsole.WriteLine("4.- Send command again.");
-            DicConsole.WriteLine("0.- Return to Plextor vendor commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending READ EEPROM to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Print sense buffer.");
+            AaruConsole.WriteLine("3.- Decode sense buffer.");
+            AaruConsole.WriteLine("4.- Send command again.");
+            AaruConsole.WriteLine("0.- Return to Plextor vendor commands menu.");
+            AaruConsole.Write("Choose: ");
 
             string strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out int item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to Plextor vendor commands menu...");
+                    AaruConsole.WriteLine("Returning to Plextor vendor commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ EEPROM response:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ EEPROM response:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ EEPROM sense:");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ EEPROM sense:");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ EEPROM decoded sense:");
-                    DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ EEPROM decoded sense:");
+                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 4: goto start;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
diff --git a/Aaru.Tests.Devices/SCSI/SBC.cs b/Aaru.Tests.Devices/SCSI/SBC.cs
index b5a5d0a27..7e64cb5ef 100644
--- a/Aaru.Tests.Devices/SCSI/SBC.cs
+++ b/Aaru.Tests.Devices/SCSI/SBC.cs
@@ -32,66 +32,78 @@ using Aaru.Devices;
 
 namespace Aaru.Tests.Devices.SCSI
 {
-    static class Sbc
+    internal static class Sbc
     {
         internal static void Menu(string devPath, Device dev)
         {
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Send a SCSI Block Command to the device:");
-                DicConsole.WriteLine("1.- Send READ (6) command.");
-                DicConsole.WriteLine("2.- Send READ (10) command.");
-                DicConsole.WriteLine("3.- Send READ (12) command.");
-                DicConsole.WriteLine("4.- Send READ (16) command.");
-                DicConsole.WriteLine("5.- Send READ LONG (10) command.");
-                DicConsole.WriteLine("6.- Send READ LONG (16) command.");
-                DicConsole.WriteLine("7.- Send SEEK (6) command.");
-                DicConsole.WriteLine("8.- Send SEEK (10) command.");
-                DicConsole.WriteLine("0.- Return to SCSI commands menu.");
-                DicConsole.Write("Choose: ");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Send a SCSI Block Command to the device:");
+                AaruConsole.WriteLine("1.- Send READ (6) command.");
+                AaruConsole.WriteLine("2.- Send READ (10) command.");
+                AaruConsole.WriteLine("3.- Send READ (12) command.");
+                AaruConsole.WriteLine("4.- Send READ (16) command.");
+                AaruConsole.WriteLine("5.- Send READ LONG (10) command.");
+                AaruConsole.WriteLine("6.- Send READ LONG (16) command.");
+                AaruConsole.WriteLine("7.- Send SEEK (6) command.");
+                AaruConsole.WriteLine("8.- Send SEEK (10) command.");
+                AaruConsole.WriteLine("0.- Return to SCSI commands menu.");
+                AaruConsole.Write("Choose: ");
 
                 string strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out int item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to SCSI commands menu...");
+                        AaruConsole.WriteLine("Returning to SCSI commands menu...");
+
                         return;
                     case 1:
                         Read6(devPath, dev);
+
                         continue;
                     case 2:
                         Read10(devPath, dev);
+
                         continue;
                     case 3:
                         Read12(devPath, dev);
+
                         continue;
                     case 4:
                         Read16(devPath, dev);
+
                         continue;
                     case 5:
                         ReadLong10(devPath, dev);
+
                         continue;
                     case 6:
                         ReadLong16(devPath, dev);
+
                         continue;
                     case 7:
                         Seek6(devPath, dev);
+
                         continue;
                     case 8:
                         Seek10(devPath, dev);
+
                         continue;
                     default:
-                        DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                        AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                         System.Console.ReadKey();
+
                         continue;
                 }
             }
@@ -106,65 +118,74 @@ namespace Aaru.Tests.Devices.SCSI
             int    item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Parameters for READ (6) command:");
-                DicConsole.WriteLine("LBA: {0}",                     lba);
-                DicConsole.WriteLine("{0} blocks to read",           count == 0 ? 256 : count);
-                DicConsole.WriteLine("{0} bytes expected per block", blockSize);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to SCSI Block Commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for READ (6) command:");
+                AaruConsole.WriteLine("LBA: {0}", lba);
+                AaruConsole.WriteLine("{0} blocks to read", count == 0 ? 256 : count);
+                AaruConsole.WriteLine("{0} bytes expected per block", blockSize);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to SCSI Block Commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to SCSI Block Commands menu...");
+                        AaruConsole.WriteLine("Returning to SCSI Block Commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.Write("LBA?: ");
+                        AaruConsole.Write("LBA?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!uint.TryParse(strDev, out lba))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             lba = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
                         if(lba > 0x1FFFFF)
                         {
-                            DicConsole.WriteLine("Max LBA is {0}, setting to {0}", 0x1FFFFF);
+                            AaruConsole.WriteLine("Max LBA is {0}, setting to {0}", 0x1FFFFF);
                             lba = 0x1FFFFF;
                         }
 
-                        DicConsole.Write("Blocks to read (0 for 256 blocks)?: ");
+                        AaruConsole.Write("Blocks to read (0 for 256 blocks)?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!byte.TryParse(strDev, out count))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             count = 1;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("How many bytes to expect per block?: ");
+                        AaruConsole.Write("How many bytes to expect per block?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!uint.TryParse(strDev, out blockSize))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             blockSize = 512;
                             System.Console.ReadKey();
                         }
@@ -176,78 +197,92 @@ namespace Aaru.Tests.Devices.SCSI
 
             start:
             System.Console.Clear();
+
             bool sense = dev.Read6(out byte[] buffer, out byte[] senseBuffer, lba, blockSize, count, dev.Timeout,
                                    out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}",       ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",         senseBuffer?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Print sense buffer.");
-            DicConsole.WriteLine("3.- Decode sense buffer.");
-            DicConsole.WriteLine("4.- Send command again.");
-            DicConsole.WriteLine("5.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to SCSI Block Commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending READ (6) to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Print sense buffer.");
+            AaruConsole.WriteLine("3.- Decode sense buffer.");
+            AaruConsole.WriteLine("4.- Send command again.");
+            AaruConsole.WriteLine("5.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to SCSI Block Commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to SCSI Block Commands menu...");
+                    AaruConsole.WriteLine("Returning to SCSI Block Commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ (6) response:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ (6) response:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ (6) sense:");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ (6) sense:");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ (6) decoded sense:");
-                    DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ (6) decoded sense:");
+                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 4: goto start;
                 case 5: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -267,127 +302,146 @@ namespace Aaru.Tests.Devices.SCSI
             int    item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Parameters for READ (10) command:");
-                DicConsole.WriteLine("Address relative to current position?: {0}", relative);
-                DicConsole.WriteLine("{1}: {0}", lba,
-                                     relative ? "Address" : "LBA");
-                DicConsole.WriteLine("{0} blocks to read",
-                                     count == 0 ? 256 : count);
-                DicConsole.WriteLine("{0} bytes expected per block",                                    blockSize);
-                DicConsole.WriteLine("How to check protection information: {0}",                        rdprotect);
-                DicConsole.WriteLine("Give lowest cache priority?: {0}",                                dpo);
-                DicConsole.WriteLine("Force bypassing cache and reading from medium?: {0}",             fua);
-                DicConsole.WriteLine("Force bypassing cache and reading from non-volatile cache?: {0}", fuaNv);
-                DicConsole.WriteLine("Group number: {0}",                                               groupNumber);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to SCSI Block Commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for READ (10) command:");
+                AaruConsole.WriteLine("Address relative to current position?: {0}", relative);
+                AaruConsole.WriteLine("{1}: {0}", lba, relative ? "Address" : "LBA");
+                AaruConsole.WriteLine("{0} blocks to read", count == 0 ? 256 : count);
+                AaruConsole.WriteLine("{0} bytes expected per block", blockSize);
+                AaruConsole.WriteLine("How to check protection information: {0}", rdprotect);
+                AaruConsole.WriteLine("Give lowest cache priority?: {0}", dpo);
+                AaruConsole.WriteLine("Force bypassing cache and reading from medium?: {0}", fua);
+                AaruConsole.WriteLine("Force bypassing cache and reading from non-volatile cache?: {0}", fuaNv);
+                AaruConsole.WriteLine("Group number: {0}", groupNumber);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to SCSI Block Commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to SCSI Block Commands menu...");
+                        AaruConsole.WriteLine("Returning to SCSI Block Commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.Write("Address relative to current position?: ");
+                        AaruConsole.Write("Address relative to current position?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out relative))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             lba = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("{0}?: ", relative ? "Address" : "LBA");
+                        AaruConsole.Write("{0}?: ", relative ? "Address" : "LBA");
                         strDev = System.Console.ReadLine();
+
                         if(!uint.TryParse(strDev, out lba))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             lba = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Blocks to read (0 for 256 blocks)?: ");
+                        AaruConsole.Write("Blocks to read (0 for 256 blocks)?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!byte.TryParse(strDev, out count))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             count = 1;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("How many bytes to expect per block?: ");
+                        AaruConsole.Write("How many bytes to expect per block?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!uint.TryParse(strDev, out blockSize))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             blockSize = 512;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("How to check protection information?: ");
+                        AaruConsole.Write("How to check protection information?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!byte.TryParse(strDev, out rdprotect))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             count = 1;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Give lowest cache priority?: ");
+                        AaruConsole.Write("Give lowest cache priority?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out dpo))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             lba = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Force bypassing cache and reading from medium?: ");
+                        AaruConsole.Write("Force bypassing cache and reading from medium?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out fua))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             lba = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Force bypassing cache and reading from non-volatile cache?: ");
+                        AaruConsole.Write("Force bypassing cache and reading from non-volatile cache?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out fuaNv))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             lba = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Group number?: ");
+                        AaruConsole.Write("Group number?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!byte.TryParse(strDev, out count))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             count = 1;
                             System.Console.ReadKey();
                         }
@@ -399,78 +453,92 @@ namespace Aaru.Tests.Devices.SCSI
 
             start:
             System.Console.Clear();
+
             bool sense = dev.Read10(out byte[] buffer, out byte[] senseBuffer, rdprotect, dpo, fua, fuaNv, relative,
                                     lba, blockSize, groupNumber, count, dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}",       ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",         senseBuffer?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Print sense buffer.");
-            DicConsole.WriteLine("3.- Decode sense buffer.");
-            DicConsole.WriteLine("4.- Send command again.");
-            DicConsole.WriteLine("5.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to SCSI Block Commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending READ (10) to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Print sense buffer.");
+            AaruConsole.WriteLine("3.- Decode sense buffer.");
+            AaruConsole.WriteLine("4.- Send command again.");
+            AaruConsole.WriteLine("5.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to SCSI Block Commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to SCSI Block Commands menu...");
+                    AaruConsole.WriteLine("Returning to SCSI Block Commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ (10) response:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ (10) response:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ (10) sense:");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ (10) sense:");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ (10) decoded sense:");
-                    DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ (10) decoded sense:");
+                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 4: goto start;
                 case 5: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -491,138 +559,159 @@ namespace Aaru.Tests.Devices.SCSI
             int    item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Parameters for READ (12) command:");
-                DicConsole.WriteLine("Address relative to current position?: {0}", relative);
-                DicConsole.WriteLine("{1}: {0}", lba,
-                                     relative ? "Address" : "LBA");
-                DicConsole.WriteLine("{0} blocks to read",
-                                     count == 0 ? 256 : count);
-                DicConsole.WriteLine("{0} bytes expected per block",                                    blockSize);
-                DicConsole.WriteLine("How to check protection information: {0}",                        rdprotect);
-                DicConsole.WriteLine("Give lowest cache priority?: {0}",                                dpo);
-                DicConsole.WriteLine("Force bypassing cache and reading from medium?: {0}",             fua);
-                DicConsole.WriteLine("Force bypassing cache and reading from non-volatile cache?: {0}", fuaNv);
-                DicConsole.WriteLine("Group number: {0}",                                               groupNumber);
-                DicConsole.WriteLine("Use streaming?: {0}",                                             streaming);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to SCSI Block Commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for READ (12) command:");
+                AaruConsole.WriteLine("Address relative to current position?: {0}", relative);
+                AaruConsole.WriteLine("{1}: {0}", lba, relative ? "Address" : "LBA");
+                AaruConsole.WriteLine("{0} blocks to read", count == 0 ? 256 : count);
+                AaruConsole.WriteLine("{0} bytes expected per block", blockSize);
+                AaruConsole.WriteLine("How to check protection information: {0}", rdprotect);
+                AaruConsole.WriteLine("Give lowest cache priority?: {0}", dpo);
+                AaruConsole.WriteLine("Force bypassing cache and reading from medium?: {0}", fua);
+                AaruConsole.WriteLine("Force bypassing cache and reading from non-volatile cache?: {0}", fuaNv);
+                AaruConsole.WriteLine("Group number: {0}", groupNumber);
+                AaruConsole.WriteLine("Use streaming?: {0}", streaming);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to SCSI Block Commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to SCSI Block Commands menu...");
+                        AaruConsole.WriteLine("Returning to SCSI Block Commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.Write("Address relative to current position?: ");
+                        AaruConsole.Write("Address relative to current position?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out relative))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             lba = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("{0}?: ", relative ? "Address" : "LBA");
+                        AaruConsole.Write("{0}?: ", relative ? "Address" : "LBA");
                         strDev = System.Console.ReadLine();
+
                         if(!uint.TryParse(strDev, out lba))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             lba = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Blocks to read (0 for 256 blocks)?: ");
+                        AaruConsole.Write("Blocks to read (0 for 256 blocks)?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!byte.TryParse(strDev, out count))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             count = 1;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("How many bytes to expect per block?: ");
+                        AaruConsole.Write("How many bytes to expect per block?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!uint.TryParse(strDev, out blockSize))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             blockSize = 512;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("How to check protection information?: ");
+                        AaruConsole.Write("How to check protection information?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!byte.TryParse(strDev, out rdprotect))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             count = 1;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Give lowest cache priority?: ");
+                        AaruConsole.Write("Give lowest cache priority?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out dpo))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             lba = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Force bypassing cache and reading from medium?: ");
+                        AaruConsole.Write("Force bypassing cache and reading from medium?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out fua))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             lba = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Force bypassing cache and reading from non-volatile cache?: ");
+                        AaruConsole.Write("Force bypassing cache and reading from non-volatile cache?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out fuaNv))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             lba = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Group number?: ");
+                        AaruConsole.Write("Group number?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!byte.TryParse(strDev, out count))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             count = 1;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Use streaming?: ");
+                        AaruConsole.Write("Use streaming?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out streaming))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             lba = 0;
                             System.Console.ReadKey();
                         }
@@ -634,78 +723,92 @@ namespace Aaru.Tests.Devices.SCSI
 
             start:
             System.Console.Clear();
+
             bool sense = dev.Read12(out byte[] buffer, out byte[] senseBuffer, rdprotect, dpo, fua, fuaNv, relative,
                                     lba, blockSize, groupNumber, count, streaming, dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}",       ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",         senseBuffer?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Print sense buffer.");
-            DicConsole.WriteLine("3.- Decode sense buffer.");
-            DicConsole.WriteLine("4.- Send command again.");
-            DicConsole.WriteLine("5.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to SCSI Block Commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending READ (12) to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Print sense buffer.");
+            AaruConsole.WriteLine("3.- Decode sense buffer.");
+            AaruConsole.WriteLine("4.- Send command again.");
+            AaruConsole.WriteLine("5.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to SCSI Block Commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to SCSI Block Commands menu...");
+                    AaruConsole.WriteLine("Returning to SCSI Block Commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ (12) response:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ (12) response:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ (12) sense:");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ (12) sense:");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ (12) decoded sense:");
-                    DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ (12) decoded sense:");
+                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 4: goto start;
                 case 5: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -725,126 +828,146 @@ namespace Aaru.Tests.Devices.SCSI
             int    item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Parameters for READ (16) command:");
-                DicConsole.WriteLine("LBA: {0}", lba);
-                DicConsole.WriteLine("{0} blocks to read",
-                                     count == 0 ? 256 : count);
-                DicConsole.WriteLine("{0} bytes expected per block",                                    blockSize);
-                DicConsole.WriteLine("How to check protection information: {0}",                        rdprotect);
-                DicConsole.WriteLine("Give lowest cache priority?: {0}",                                dpo);
-                DicConsole.WriteLine("Force bypassing cache and reading from medium?: {0}",             fua);
-                DicConsole.WriteLine("Force bypassing cache and reading from non-volatile cache?: {0}", fuaNv);
-                DicConsole.WriteLine("Group number: {0}",                                               groupNumber);
-                DicConsole.WriteLine("Use streaming?: {0}",                                             streaming);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to SCSI Block Commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for READ (16) command:");
+                AaruConsole.WriteLine("LBA: {0}", lba);
+                AaruConsole.WriteLine("{0} blocks to read", count == 0 ? 256 : count);
+                AaruConsole.WriteLine("{0} bytes expected per block", blockSize);
+                AaruConsole.WriteLine("How to check protection information: {0}", rdprotect);
+                AaruConsole.WriteLine("Give lowest cache priority?: {0}", dpo);
+                AaruConsole.WriteLine("Force bypassing cache and reading from medium?: {0}", fua);
+                AaruConsole.WriteLine("Force bypassing cache and reading from non-volatile cache?: {0}", fuaNv);
+                AaruConsole.WriteLine("Group number: {0}", groupNumber);
+                AaruConsole.WriteLine("Use streaming?: {0}", streaming);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to SCSI Block Commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to SCSI Block Commands menu...");
+                        AaruConsole.WriteLine("Returning to SCSI Block Commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.Write("LBA?: ");
+                        AaruConsole.Write("LBA?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!ulong.TryParse(strDev, out lba))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             lba = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Blocks to read (0 for 256 blocks)?: ");
+                        AaruConsole.Write("Blocks to read (0 for 256 blocks)?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!byte.TryParse(strDev, out count))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             count = 1;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("How many bytes to expect per block?: ");
+                        AaruConsole.Write("How many bytes to expect per block?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!uint.TryParse(strDev, out blockSize))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             blockSize = 512;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("How to check protection information?: ");
+                        AaruConsole.Write("How to check protection information?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!byte.TryParse(strDev, out rdprotect))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             count = 1;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Give lowest cache priority?: ");
+                        AaruConsole.Write("Give lowest cache priority?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out dpo))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             lba = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Force bypassing cache and reading from medium?: ");
+                        AaruConsole.Write("Force bypassing cache and reading from medium?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out fua))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             lba = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Force bypassing cache and reading from non-volatile cache?: ");
+                        AaruConsole.Write("Force bypassing cache and reading from non-volatile cache?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out fuaNv))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             lba = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Group number?: ");
+                        AaruConsole.Write("Group number?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!byte.TryParse(strDev, out count))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             count = 1;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Use streaming?: ");
+                        AaruConsole.Write("Use streaming?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out streaming))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             lba = 0;
                             System.Console.ReadKey();
                         }
@@ -856,78 +979,92 @@ namespace Aaru.Tests.Devices.SCSI
 
             start:
             System.Console.Clear();
+
             bool sense = dev.Read16(out byte[] buffer, out byte[] senseBuffer, rdprotect, dpo, fua, fuaNv, lba,
                                     blockSize, groupNumber, count, streaming, dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}",       ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",         senseBuffer?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Print sense buffer.");
-            DicConsole.WriteLine("3.- Decode sense buffer.");
-            DicConsole.WriteLine("4.- Send command again.");
-            DicConsole.WriteLine("5.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to SCSI Block Commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending READ (16) to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Print sense buffer.");
+            AaruConsole.WriteLine("3.- Decode sense buffer.");
+            AaruConsole.WriteLine("4.- Send command again.");
+            AaruConsole.WriteLine("5.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to SCSI Block Commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to SCSI Block Commands menu...");
+                    AaruConsole.WriteLine("Returning to SCSI Block Commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ (16) response:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ (16) response:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ (16) sense:");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ (16) sense:");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ (16) decoded sense:");
-                    DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ (16) decoded sense:");
+                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 4: goto start;
                 case 5: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -942,70 +1079,81 @@ namespace Aaru.Tests.Devices.SCSI
             int    item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Parameters for READ LONG (10) command:");
-                DicConsole.WriteLine("Address relative to current position?: {0}", relative);
-                DicConsole.WriteLine("{1}: {0}",                                   lba, relative ? "Address" : "LBA");
-                DicConsole.WriteLine("{0} bytes expected per block",               blockSize);
-                DicConsole.WriteLine("Try to error correct block?: {0}",           correct);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to SCSI Block Commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for READ LONG (10) command:");
+                AaruConsole.WriteLine("Address relative to current position?: {0}", relative);
+                AaruConsole.WriteLine("{1}: {0}", lba, relative ? "Address" : "LBA");
+                AaruConsole.WriteLine("{0} bytes expected per block", blockSize);
+                AaruConsole.WriteLine("Try to error correct block?: {0}", correct);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to SCSI Block Commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to SCSI Block Commands menu...");
+                        AaruConsole.WriteLine("Returning to SCSI Block Commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.Write("Address relative to current position?: ");
+                        AaruConsole.Write("Address relative to current position?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out relative))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             lba = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("{0}?: ", relative ? "Address" : "LBA");
+                        AaruConsole.Write("{0}?: ", relative ? "Address" : "LBA");
                         strDev = System.Console.ReadLine();
+
                         if(!uint.TryParse(strDev, out lba))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             lba = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("How many bytes to expect per block?: ");
+                        AaruConsole.Write("How many bytes to expect per block?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!ushort.TryParse(strDev, out blockSize))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             blockSize = 512;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Try to error correct block?: ");
+                        AaruConsole.Write("Try to error correct block?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out correct))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             lba = 0;
                             System.Console.ReadKey();
                         }
@@ -1017,78 +1165,92 @@ namespace Aaru.Tests.Devices.SCSI
 
             start:
             System.Console.Clear();
+
             bool sense = dev.ReadLong10(out byte[] buffer, out byte[] senseBuffer, correct, relative, lba, blockSize,
                                         dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}",       ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",         senseBuffer?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Print sense buffer.");
-            DicConsole.WriteLine("3.- Decode sense buffer.");
-            DicConsole.WriteLine("4.- Send command again.");
-            DicConsole.WriteLine("5.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to SCSI Block Commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending READ LONG (10) to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Print sense buffer.");
+            AaruConsole.WriteLine("3.- Decode sense buffer.");
+            AaruConsole.WriteLine("4.- Send command again.");
+            AaruConsole.WriteLine("5.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to SCSI Block Commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to SCSI Block Commands menu...");
+                    AaruConsole.WriteLine("Returning to SCSI Block Commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ LONG (10) response:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ LONG (10) response:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ LONG (10) sense:");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ LONG (10) sense:");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ LONG (10) decoded sense:");
-                    DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ LONG (10) decoded sense:");
+                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 4: goto start;
                 case 5: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -1102,59 +1264,68 @@ namespace Aaru.Tests.Devices.SCSI
             int    item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Parameters for READ LONG (16) command:");
-                DicConsole.WriteLine("LBA: {0}",                         lba);
-                DicConsole.WriteLine("{0} bytes expected per block",     blockSize);
-                DicConsole.WriteLine("Try to error correct block?: {0}", correct);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to SCSI Block Commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for READ LONG (16) command:");
+                AaruConsole.WriteLine("LBA: {0}", lba);
+                AaruConsole.WriteLine("{0} bytes expected per block", blockSize);
+                AaruConsole.WriteLine("Try to error correct block?: {0}", correct);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to SCSI Block Commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to SCSI Block Commands menu...");
+                        AaruConsole.WriteLine("Returning to SCSI Block Commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.Write("LBA?: ");
+                        AaruConsole.Write("LBA?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!ulong.TryParse(strDev, out lba))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             lba = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("How many bytes to expect per block?: ");
+                        AaruConsole.Write("How many bytes to expect per block?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!uint.TryParse(strDev, out blockSize))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             blockSize = 512;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Try to error correct block?: ");
+                        AaruConsole.Write("Try to error correct block?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out correct))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             lba = 0;
                             System.Console.ReadKey();
                         }
@@ -1166,78 +1337,92 @@ namespace Aaru.Tests.Devices.SCSI
 
             start:
             System.Console.Clear();
+
             bool sense = dev.ReadLong16(out byte[] buffer, out byte[] senseBuffer, correct, lba, blockSize, dev.Timeout,
                                         out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}",       ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",         senseBuffer?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Print sense buffer.");
-            DicConsole.WriteLine("3.- Decode sense buffer.");
-            DicConsole.WriteLine("4.- Send command again.");
-            DicConsole.WriteLine("5.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to SCSI Block Commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending READ LONG (16) to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Print sense buffer.");
+            AaruConsole.WriteLine("3.- Decode sense buffer.");
+            AaruConsole.WriteLine("4.- Send command again.");
+            AaruConsole.WriteLine("5.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to SCSI Block Commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to SCSI Block Commands menu...");
+                    AaruConsole.WriteLine("Returning to SCSI Block Commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ LONG (16) response:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ LONG (16) response:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ LONG (16) sense:");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ LONG (16) sense:");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ LONG (16) decoded sense:");
-                    DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ LONG (16) decoded sense:");
+                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 4: goto start;
                 case 5: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -1249,45 +1434,51 @@ namespace Aaru.Tests.Devices.SCSI
             int    item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Parameters for SEEK (6) command:");
-                DicConsole.WriteLine("Descriptor: {0}", lba);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to SCSI Block Commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for SEEK (6) command:");
+                AaruConsole.WriteLine("Descriptor: {0}", lba);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to SCSI Block Commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to SCSI Block Commands menu...");
+                        AaruConsole.WriteLine("Returning to SCSI Block Commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.Write("LBA?: ");
+                        AaruConsole.Write("LBA?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!uint.TryParse(strDev, out lba))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             lba = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
                         if(lba > 0x1FFFFF)
                         {
-                            DicConsole.WriteLine("Max LBA is {0}, setting to {0}", 0x1FFFFF);
+                            AaruConsole.WriteLine("Max LBA is {0}, setting to {0}", 0x1FFFFF);
                             lba = 0x1FFFFF;
                         }
 
@@ -1301,52 +1492,60 @@ namespace Aaru.Tests.Devices.SCSI
             bool sense = dev.Seek6(out byte[] senseBuffer, lba, dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            DicConsole.WriteLine("Sending SEEK (6) to the device:");
-            DicConsole.WriteLine("Command took {0} ms.",               duration);
-            DicConsole.WriteLine("Sense is {0}.",                      sense);
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",         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));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print sense buffer.");
-            DicConsole.WriteLine("2.- Send command again.");
-            DicConsole.WriteLine("3.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to SCSI Block Commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending SEEK (6) to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine("SEEK (6) decoded sense:");
+            AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print sense buffer.");
+            AaruConsole.WriteLine("2.- Send command again.");
+            AaruConsole.WriteLine("3.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to SCSI Block Commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to SCSI Block Commands menu...");
+                    AaruConsole.WriteLine("Returning to SCSI Block Commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("SEEK (6) sense:");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("SEEK (6) sense:");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2: goto start;
                 case 3: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -1358,37 +1557,42 @@ namespace Aaru.Tests.Devices.SCSI
             int    item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Parameters for SEEK (10) command:");
-                DicConsole.WriteLine("Descriptor: {0}", lba);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to SCSI Block Commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for SEEK (10) command:");
+                AaruConsole.WriteLine("Descriptor: {0}", lba);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to SCSI Block Commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to SCSI Block Commands menu...");
+                        AaruConsole.WriteLine("Returning to SCSI Block Commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.Write("Descriptor?: ");
+                        AaruConsole.Write("Descriptor?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!uint.TryParse(strDev, out lba))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             lba = 0;
                             System.Console.ReadKey();
                         }
@@ -1403,52 +1607,60 @@ namespace Aaru.Tests.Devices.SCSI
             bool sense = dev.Seek10(out byte[] senseBuffer, lba, dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            DicConsole.WriteLine("Sending SEEK (10) to the device:");
-            DicConsole.WriteLine("Command took {0} ms.",               duration);
-            DicConsole.WriteLine("Sense is {0}.",                      sense);
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",         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));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print sense buffer.");
-            DicConsole.WriteLine("2.- Send command again.");
-            DicConsole.WriteLine("3.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to SCSI Block Commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending SEEK (10) to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine("SEEK (6) decoded sense:");
+            AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print sense buffer.");
+            AaruConsole.WriteLine("2.- Send command again.");
+            AaruConsole.WriteLine("3.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to SCSI Block Commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to SCSI Block Commands menu...");
+                    AaruConsole.WriteLine("Returning to SCSI Block Commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("SEEK (10) sense:");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("SEEK (10) sense:");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2: goto start;
                 case 3: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
diff --git a/Aaru.Tests.Devices/SCSI/SMC.cs b/Aaru.Tests.Devices/SCSI/SMC.cs
index aff840024..c786691c0 100644
--- a/Aaru.Tests.Devices/SCSI/SMC.cs
+++ b/Aaru.Tests.Devices/SCSI/SMC.cs
@@ -33,38 +33,43 @@ using Aaru.Devices;
 
 namespace Aaru.Tests.Devices.SCSI
 {
-    static class Smc
+    internal static class Smc
     {
         internal static void Menu(string devPath, Device dev)
         {
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Send a SCSI Media Changer command to the device:");
-                DicConsole.WriteLine("1.- Send READ ATTRIBUTE command.");
-                DicConsole.WriteLine("0.- Return to SCSI commands menu.");
-                DicConsole.Write("Choose: ");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Send a SCSI Media Changer command to the device:");
+                AaruConsole.WriteLine("1.- Send READ ATTRIBUTE command.");
+                AaruConsole.WriteLine("0.- Return to SCSI commands menu.");
+                AaruConsole.Write("Choose: ");
 
                 string strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out int item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to SCSI commands menu...");
+                        AaruConsole.WriteLine("Returning to SCSI commands menu...");
+
                         return;
                     case 1:
                         ReadAttribute(devPath, dev);
+
                         continue;
                     default:
-                        DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                        AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                         System.Console.ReadKey();
+
                         continue;
                 }
             }
@@ -83,108 +88,127 @@ namespace Aaru.Tests.Devices.SCSI
             int                 item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Parameters for READ ATTRIBUTE command:");
-                DicConsole.WriteLine("Action: {0}",          action);
-                DicConsole.WriteLine("Element: {0}",         element);
-                DicConsole.WriteLine("Element type: {0}",    elementType);
-                DicConsole.WriteLine("Volume: {0}",          volume);
-                DicConsole.WriteLine("Partition: {0}",       partition);
-                DicConsole.WriteLine("First attribute: {0}", firstAttribute);
-                DicConsole.WriteLine("Use cache?: {0}",      cache);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to SCSI Media Changer commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for READ ATTRIBUTE command:");
+                AaruConsole.WriteLine("Action: {0}", action);
+                AaruConsole.WriteLine("Element: {0}", element);
+                AaruConsole.WriteLine("Element type: {0}", elementType);
+                AaruConsole.WriteLine("Volume: {0}", volume);
+                AaruConsole.WriteLine("Partition: {0}", partition);
+                AaruConsole.WriteLine("First attribute: {0}", firstAttribute);
+                AaruConsole.WriteLine("Use cache?: {0}", cache);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to SCSI Media Changer commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to SCSI Media Changer commands menu...");
+                        AaruConsole.WriteLine("Returning to SCSI Media Changer commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.WriteLine("Attribute action");
-                        DicConsole.WriteLine("Available values: {0} {1} {2} {3} {4}", ScsiAttributeAction.Values,
-                                             ScsiAttributeAction.List, ScsiAttributeAction.VolumeList,
-                                             ScsiAttributeAction.PartitionList, ScsiAttributeAction.ElementList,
-                                             ScsiAttributeAction.Supported);
-                        DicConsole.Write("Choose?: ");
+                        AaruConsole.WriteLine("Attribute action");
+
+                        AaruConsole.WriteLine("Available values: {0} {1} {2} {3} {4}", ScsiAttributeAction.Values,
+                                              ScsiAttributeAction.List, ScsiAttributeAction.VolumeList,
+                                              ScsiAttributeAction.PartitionList, ScsiAttributeAction.ElementList,
+                                              ScsiAttributeAction.Supported);
+
+                        AaruConsole.Write("Choose?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!Enum.TryParse(strDev, true, out action))
                         {
-                            DicConsole.WriteLine("Not a valid attribute action. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a valid attribute action. Press any key to continue...");
                             action = ScsiAttributeAction.Values;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Element?: ");
+                        AaruConsole.Write("Element?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!ushort.TryParse(strDev, out element))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             element = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Element type?: ");
+                        AaruConsole.Write("Element type?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!byte.TryParse(strDev, out elementType))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             elementType = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Volume?: ");
+                        AaruConsole.Write("Volume?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!byte.TryParse(strDev, out volume))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             volume = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Partition?: ");
+                        AaruConsole.Write("Partition?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!byte.TryParse(strDev, out partition))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             partition = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("First attribute?: ");
+                        AaruConsole.Write("First attribute?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!ushort.TryParse(strDev, out firstAttribute))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             firstAttribute = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Use cache?: ");
+                        AaruConsole.Write("Use cache?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out cache))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             cache = false;
                             System.Console.ReadKey();
                         }
@@ -196,78 +220,92 @@ namespace Aaru.Tests.Devices.SCSI
 
             start:
             System.Console.Clear();
+
             bool sense = dev.ReadAttribute(out byte[] buffer, out byte[] senseBuffer, action, element, elementType,
                                            volume, partition, firstAttribute, cache, dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}",       ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",         senseBuffer?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Print sense buffer.");
-            DicConsole.WriteLine("3.- Decode sense buffer.");
-            DicConsole.WriteLine("4.- Send command again.");
-            DicConsole.WriteLine("5.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to SCSI Media Changer commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending READ ATTRIBUTE to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Print sense buffer.");
+            AaruConsole.WriteLine("3.- Decode sense buffer.");
+            AaruConsole.WriteLine("4.- Send command again.");
+            AaruConsole.WriteLine("5.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to SCSI Media Changer commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to SCSI Media Changer commands menu...");
+                    AaruConsole.WriteLine("Returning to SCSI Media Changer commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ ATTRIBUTE response:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ ATTRIBUTE response:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ ATTRIBUTE sense:");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ ATTRIBUTE sense:");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ ATTRIBUTE decoded sense:");
-                    DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ ATTRIBUTE decoded sense:");
+                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 4: goto start;
                 case 5: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
diff --git a/Aaru.Tests.Devices/SCSI/SPC.cs b/Aaru.Tests.Devices/SCSI/SPC.cs
index d45af7ff0..0037917f0 100644
--- a/Aaru.Tests.Devices/SCSI/SPC.cs
+++ b/Aaru.Tests.Devices/SCSI/SPC.cs
@@ -33,74 +33,88 @@ using Aaru.Devices;
 
 namespace Aaru.Tests.Devices.SCSI
 {
-    static class Spc
+    internal static class Spc
     {
         internal static void Menu(string devPath, Device dev)
         {
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Send a SCSI Primary Commands to the device:");
-                DicConsole.WriteLine("1.- Send INQUIRY command.");
-                DicConsole.WriteLine("2.- Send INQUIRY EVPD command.");
-                DicConsole.WriteLine("3.- Send MODE SENSE (6) command.");
-                DicConsole.WriteLine("4.- Send MODE SENSE (10) command.");
-                DicConsole.WriteLine("5.- Send PREVENT ALLOW MEDIUM REMOVAL command.");
-                DicConsole.WriteLine("6.- Send READ CAPACITY (10) command.");
-                DicConsole.WriteLine("7.- Send READ CAPACITY (16) command.");
-                DicConsole.WriteLine("8.- Send READ MEDIA SERIAL NUMBER command.");
-                DicConsole.WriteLine("9.- Send REQUEST SENSE command.");
-                DicConsole.WriteLine("10.- Send TEST UNIT READY command.");
-                DicConsole.WriteLine("0.- Return to SCSI commands menu.");
-                DicConsole.Write("Choose: ");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Send a SCSI Primary Commands to the device:");
+                AaruConsole.WriteLine("1.- Send INQUIRY command.");
+                AaruConsole.WriteLine("2.- Send INQUIRY EVPD command.");
+                AaruConsole.WriteLine("3.- Send MODE SENSE (6) command.");
+                AaruConsole.WriteLine("4.- Send MODE SENSE (10) command.");
+                AaruConsole.WriteLine("5.- Send PREVENT ALLOW MEDIUM REMOVAL command.");
+                AaruConsole.WriteLine("6.- Send READ CAPACITY (10) command.");
+                AaruConsole.WriteLine("7.- Send READ CAPACITY (16) command.");
+                AaruConsole.WriteLine("8.- Send READ MEDIA SERIAL NUMBER command.");
+                AaruConsole.WriteLine("9.- Send REQUEST SENSE command.");
+                AaruConsole.WriteLine("10.- Send TEST UNIT READY command.");
+                AaruConsole.WriteLine("0.- Return to SCSI commands menu.");
+                AaruConsole.Write("Choose: ");
 
                 string strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out int item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to SCSI commands menu...");
+                        AaruConsole.WriteLine("Returning to SCSI commands menu...");
+
                         return;
                     case 1:
                         Inquiry(devPath, dev);
+
                         continue;
                     case 2:
                         InquiryEvpd(devPath, dev);
+
                         continue;
                     case 3:
                         ModeSense6(devPath, dev);
+
                         continue;
                     case 4:
                         ModeSense10(devPath, dev);
+
                         continue;
                     case 5:
                         PreventAllowMediumRemoval(devPath, dev);
+
                         continue;
                     case 6:
                         ReadCapacity10(devPath, dev);
+
                         continue;
                     case 7:
                         ReadCapacity16(devPath, dev);
+
                         continue;
                     case 8:
                         ReadMediaSerialNumber(devPath, dev);
+
                         continue;
                     case 9:
                         RequestSense(devPath, dev);
+
                         continue;
                     case 10:
                         TestUnitReady(devPath, dev);
+
                         continue;
                     default:
-                        DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                        AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                         System.Console.ReadKey();
+
                         continue;
                 }
             }
@@ -113,83 +127,100 @@ namespace Aaru.Tests.Devices.SCSI
             bool sense = dev.ScsiInquiry(out byte[] buffer, out byte[] senseBuffer, dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}",       ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",         senseBuffer?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Decode buffer.");
-            DicConsole.WriteLine("3.- Print sense buffer.");
-            DicConsole.WriteLine("4.- Decode sense buffer.");
-            DicConsole.WriteLine("5.- Send command again.");
-            DicConsole.WriteLine("0.- Return to SCSI Primary Commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending INQUIRY to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Decode buffer.");
+            AaruConsole.WriteLine("3.- Print sense buffer.");
+            AaruConsole.WriteLine("4.- Decode sense buffer.");
+            AaruConsole.WriteLine("5.- Send command again.");
+            AaruConsole.WriteLine("0.- Return to SCSI Primary Commands menu.");
+            AaruConsole.Write("Choose: ");
 
             string strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out int item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to SCSI Primary Commands menu...");
+                    AaruConsole.WriteLine("Returning to SCSI Primary Commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("INQUIRY response:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("INQUIRY response:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("INQUIRY decoded response:");
-                    if(buffer != null) DicConsole.WriteLine("{0}", Decoders.SCSI.Inquiry.Prettify(buffer));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("INQUIRY decoded response:");
+
+                    if(buffer != null)
+                        AaruConsole.WriteLine("{0}", Decoders.SCSI.Inquiry.Prettify(buffer));
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("INQUIRY sense:");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("INQUIRY sense:");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 4:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("INQUIRY decoded sense:");
-                    DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("INQUIRY decoded sense:");
+                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 5: goto start;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -201,37 +232,42 @@ namespace Aaru.Tests.Devices.SCSI
             int    item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Parameters for INQUIRY command:");
-                DicConsole.WriteLine("EVPD page: {0}", page);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to SCSI Primary Commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for INQUIRY command:");
+                AaruConsole.WriteLine("EVPD page: {0}", page);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to SCSI Primary Commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to SCSI Primary Commands menu...");
+                        AaruConsole.WriteLine("Returning to SCSI Primary Commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.Write("Page?: ");
+                        AaruConsole.Write("Page?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!byte.TryParse(strDev, out page))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             page = 0;
                             System.Console.ReadKey();
                         }
@@ -243,78 +279,92 @@ namespace Aaru.Tests.Devices.SCSI
 
             start:
             System.Console.Clear();
+
             bool sense = dev.ScsiInquiry(out byte[] buffer, out byte[] senseBuffer, page, dev.Timeout,
                                          out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}",       ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",         senseBuffer?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Print sense buffer.");
-            DicConsole.WriteLine("3.- Decode sense buffer.");
-            DicConsole.WriteLine("4.- Send command again.");
-            DicConsole.WriteLine("5.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to SCSI Primary Commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending INQUIRY to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Print sense buffer.");
+            AaruConsole.WriteLine("3.- Decode sense buffer.");
+            AaruConsole.WriteLine("4.- Send command again.");
+            AaruConsole.WriteLine("5.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to SCSI Primary Commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to SCSI Primary Commands menu...");
+                    AaruConsole.WriteLine("Returning to SCSI Primary Commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("INQUIRY response:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("INQUIRY response:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("INQUIRY sense:");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("INQUIRY sense:");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("INQUIRY decoded sense:");
-                    DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("INQUIRY decoded sense:");
+                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 4: goto start;
                 case 5: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -329,74 +379,87 @@ namespace Aaru.Tests.Devices.SCSI
             int                      item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Parameters for MODE SENSE (6) command:");
-                DicConsole.WriteLine("DBD?: {0}",         dbd);
-                DicConsole.WriteLine("Page control: {0}", pageControl);
-                DicConsole.WriteLine("Page: {0}",         page);
-                DicConsole.WriteLine("Subpage: {0}",      subpage);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to SCSI Primary Commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for MODE SENSE (6) command:");
+                AaruConsole.WriteLine("DBD?: {0}", dbd);
+                AaruConsole.WriteLine("Page control: {0}", pageControl);
+                AaruConsole.WriteLine("Page: {0}", page);
+                AaruConsole.WriteLine("Subpage: {0}", subpage);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to SCSI Primary Commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to SCSI Primary Commands menu...");
+                        AaruConsole.WriteLine("Returning to SCSI Primary Commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.Write("DBD?: ");
+                        AaruConsole.Write("DBD?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out dbd))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             dbd = false;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.WriteLine("Page control");
-                        DicConsole.WriteLine("Available values: {0} {1} {2} {3}", ScsiModeSensePageControl.Changeable,
-                                             ScsiModeSensePageControl.Current, ScsiModeSensePageControl.Default,
-                                             ScsiModeSensePageControl.Saved);
-                        DicConsole.Write("Choose?: ");
+                        AaruConsole.WriteLine("Page control");
+
+                        AaruConsole.WriteLine("Available values: {0} {1} {2} {3}", ScsiModeSensePageControl.Changeable,
+                                              ScsiModeSensePageControl.Current, ScsiModeSensePageControl.Default,
+                                              ScsiModeSensePageControl.Saved);
+
+                        AaruConsole.Write("Choose?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!Enum.TryParse(strDev, true, out pageControl))
                         {
-                            DicConsole.WriteLine("Not a correct page control. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a correct page control. Press any key to continue...");
                             pageControl = ScsiModeSensePageControl.Current;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Page?: ");
+                        AaruConsole.Write("Page?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!byte.TryParse(strDev, out page))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             page = 0x3F;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Subpage?: ");
+                        AaruConsole.Write("Subpage?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!byte.TryParse(strDev, out subpage))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             subpage = 0xFF;
                             System.Console.ReadKey();
                         }
@@ -408,89 +471,107 @@ namespace Aaru.Tests.Devices.SCSI
 
             start:
             System.Console.Clear();
+
             bool sense = dev.ModeSense6(out byte[] buffer, out byte[] senseBuffer, dbd, pageControl, page, subpage,
                                         dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}",       ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",         senseBuffer?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Decode buffer.");
-            DicConsole.WriteLine("3.- Print sense buffer.");
-            DicConsole.WriteLine("4.- Decode sense buffer.");
-            DicConsole.WriteLine("5.- Send command again.");
-            DicConsole.WriteLine("6.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to SCSI Primary Commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending MODE SENSE (6) to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Decode buffer.");
+            AaruConsole.WriteLine("3.- Print sense buffer.");
+            AaruConsole.WriteLine("4.- Decode sense buffer.");
+            AaruConsole.WriteLine("5.- Send command again.");
+            AaruConsole.WriteLine("6.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to SCSI Primary Commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to SCSI Primary Commands menu...");
+                    AaruConsole.WriteLine("Returning to SCSI Primary Commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("MODE SENSE (6) response:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("MODE SENSE (6) response:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("MODE SENSE (6) decoded response:");
-                    if(buffer != null) DicConsole.WriteLine("{0}", Modes.PrettifyModeHeader6(buffer, dev.ScsiType));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("MODE SENSE (6) decoded response:");
+
+                    if(buffer != null)
+                        AaruConsole.WriteLine("{0}", Modes.PrettifyModeHeader6(buffer, dev.ScsiType));
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("MODE SENSE (6) sense:");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("MODE SENSE (6) sense:");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 4:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("MODE SENSE (6) decoded sense:");
-                    DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("MODE SENSE (6) decoded sense:");
+                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 5: goto start;
                 case 6: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -506,85 +587,100 @@ namespace Aaru.Tests.Devices.SCSI
             int                      item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Parameters for MODE SENSE (10) command:");
-                DicConsole.WriteLine("LLBA?: {0}",        llba);
-                DicConsole.WriteLine("DBD?: {0}",         dbd);
-                DicConsole.WriteLine("Page control: {0}", pageControl);
-                DicConsole.WriteLine("Page: {0}",         page);
-                DicConsole.WriteLine("Subpage: {0}",      subpage);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to SCSI Primary Commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for MODE SENSE (10) command:");
+                AaruConsole.WriteLine("LLBA?: {0}", llba);
+                AaruConsole.WriteLine("DBD?: {0}", dbd);
+                AaruConsole.WriteLine("Page control: {0}", pageControl);
+                AaruConsole.WriteLine("Page: {0}", page);
+                AaruConsole.WriteLine("Subpage: {0}", subpage);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to SCSI Primary Commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to SCSI Primary Commands menu...");
+                        AaruConsole.WriteLine("Returning to SCSI Primary Commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.Write("LLBA?: ");
+                        AaruConsole.Write("LLBA?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out llba))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             llba = false;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("DBD?: ");
+                        AaruConsole.Write("DBD?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out dbd))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             dbd = false;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.WriteLine("Page control");
-                        DicConsole.WriteLine("Available values: {0} {1} {2} {3}", ScsiModeSensePageControl.Changeable,
-                                             ScsiModeSensePageControl.Current, ScsiModeSensePageControl.Default,
-                                             ScsiModeSensePageControl.Saved);
-                        DicConsole.Write("Choose?: ");
+                        AaruConsole.WriteLine("Page control");
+
+                        AaruConsole.WriteLine("Available values: {0} {1} {2} {3}", ScsiModeSensePageControl.Changeable,
+                                              ScsiModeSensePageControl.Current, ScsiModeSensePageControl.Default,
+                                              ScsiModeSensePageControl.Saved);
+
+                        AaruConsole.Write("Choose?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!Enum.TryParse(strDev, true, out pageControl))
                         {
-                            DicConsole.WriteLine("Not a correct page control. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a correct page control. Press any key to continue...");
                             pageControl = ScsiModeSensePageControl.Current;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Page?: ");
+                        AaruConsole.Write("Page?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!byte.TryParse(strDev, out page))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             page = 0x3F;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Subpage?: ");
+                        AaruConsole.Write("Subpage?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!byte.TryParse(strDev, out subpage))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             subpage = 0xFF;
                             System.Console.ReadKey();
                         }
@@ -596,89 +692,107 @@ namespace Aaru.Tests.Devices.SCSI
 
             start:
             System.Console.Clear();
+
             bool sense = dev.ModeSense10(out byte[] buffer, out byte[] senseBuffer, llba, dbd, pageControl, page,
                                          subpage, dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}",       ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",         senseBuffer?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Decode buffer.");
-            DicConsole.WriteLine("3.- Print sense buffer.");
-            DicConsole.WriteLine("4.- Decode sense buffer.");
-            DicConsole.WriteLine("5.- Send command again.");
-            DicConsole.WriteLine("6.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to SCSI Primary Commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending MODE SENSE (10) to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Decode buffer.");
+            AaruConsole.WriteLine("3.- Print sense buffer.");
+            AaruConsole.WriteLine("4.- Decode sense buffer.");
+            AaruConsole.WriteLine("5.- Send command again.");
+            AaruConsole.WriteLine("6.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to SCSI Primary Commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to SCSI Primary Commands menu...");
+                    AaruConsole.WriteLine("Returning to SCSI Primary Commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("MODE SENSE (10) response:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("MODE SENSE (10) response:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("MODE SENSE (10) decoded response:");
-                    if(buffer != null) DicConsole.WriteLine("{0}", Modes.PrettifyModeHeader10(buffer, dev.ScsiType));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("MODE SENSE (10) decoded response:");
+
+                    if(buffer != null)
+                        AaruConsole.WriteLine("{0}", Modes.PrettifyModeHeader10(buffer, dev.ScsiType));
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("MODE SENSE (10) sense:");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("MODE SENSE (10) sense:");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 4:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("MODE SENSE (10) decoded sense:");
-                    DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("MODE SENSE (10) decoded sense:");
+                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 5: goto start;
                 case 6: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -690,41 +804,48 @@ namespace Aaru.Tests.Devices.SCSI
             int                  item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Parameters for PREVENT ALLOW MEDIUM REMOVAL command:");
-                DicConsole.WriteLine("Mode: {0}", mode);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to SCSI Primary Commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for PREVENT ALLOW MEDIUM REMOVAL command:");
+                AaruConsole.WriteLine("Mode: {0}", mode);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to SCSI Primary Commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to SCSI Primary Commands menu...");
+                        AaruConsole.WriteLine("Returning to SCSI Primary Commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.WriteLine("Mode");
-                        DicConsole.WriteLine("Available values: {0} {1} {2} {3}", ScsiPreventAllowMode.Allow,
-                                             ScsiPreventAllowMode.Prevent, ScsiPreventAllowMode.PreventAll,
-                                             ScsiPreventAllowMode.PreventChanger);
-                        DicConsole.Write("Choose?: ");
+                        AaruConsole.WriteLine("Mode");
+
+                        AaruConsole.WriteLine("Available values: {0} {1} {2} {3}", ScsiPreventAllowMode.Allow,
+                                              ScsiPreventAllowMode.Prevent, ScsiPreventAllowMode.PreventAll,
+                                              ScsiPreventAllowMode.PreventChanger);
+
+                        AaruConsole.Write("Choose?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!Enum.TryParse(strDev, true, out mode))
                         {
-                            DicConsole.WriteLine("Not a correct page control. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a correct page control. Press any key to continue...");
                             mode = ScsiPreventAllowMode.Allow;
                             System.Console.ReadKey();
                         }
@@ -736,43 +857,48 @@ namespace Aaru.Tests.Devices.SCSI
 
             start:
             System.Console.Clear();
+
             bool sense =
                 dev.SpcPreventAllowMediumRemoval(out byte[] senseBuffer, mode, dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            DicConsole.WriteLine("Sending PREVENT ALLOW MEDIUM REMOVAL to the device:");
-            DicConsole.WriteLine("Command took {0} ms.", duration);
-            DicConsole.WriteLine("Sense is {0}.",        sense);
-            DicConsole.WriteLine("PREVENT ALLOW MEDIUM REMOVAL decoded sense:");
-            DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Send command again.");
-            DicConsole.WriteLine("2.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to SCSI Primary Commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending PREVENT ALLOW MEDIUM REMOVAL to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("PREVENT ALLOW MEDIUM REMOVAL decoded sense:");
+            AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Send command again.");
+            AaruConsole.WriteLine("2.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to SCSI Primary Commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to SCSI Primary Commands menu...");
+                    AaruConsole.WriteLine("Returning to SCSI Primary Commands menu...");
+
                     return;
                 case 1: goto start;
                 case 2: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -786,59 +912,68 @@ namespace Aaru.Tests.Devices.SCSI
             int    item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Parameters for READ CAPACITY (10) command:");
-                DicConsole.WriteLine("Relative address?: {0}", relative);
-                DicConsole.WriteLine("Partial capacity?: {0}", partial);
-                DicConsole.WriteLine("Address: {0}",           address);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to SCSI Primary Commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for READ CAPACITY (10) command:");
+                AaruConsole.WriteLine("Relative address?: {0}", relative);
+                AaruConsole.WriteLine("Partial capacity?: {0}", partial);
+                AaruConsole.WriteLine("Address: {0}", address);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to SCSI Primary Commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to SCSI Primary Commands menu...");
+                        AaruConsole.WriteLine("Returning to SCSI Primary Commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.Write("Relative address?: ");
+                        AaruConsole.Write("Relative address?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out relative))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             relative = false;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Partial capacity?: ");
+                        AaruConsole.Write("Partial capacity?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out partial))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             partial = false;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Address?: ");
+                        AaruConsole.Write("Address?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!uint.TryParse(strDev, out address))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             address = 0;
                             System.Console.ReadKey();
                         }
@@ -850,78 +985,92 @@ namespace Aaru.Tests.Devices.SCSI
 
             start:
             System.Console.Clear();
+
             bool sense = dev.ReadCapacity(out byte[] buffer, out byte[] senseBuffer, relative, address, partial,
                                           dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}",       ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",         senseBuffer?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Print sense buffer.");
-            DicConsole.WriteLine("3.- Decode sense buffer.");
-            DicConsole.WriteLine("4.- Send command again.");
-            DicConsole.WriteLine("5.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to SCSI Primary Commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending READ CAPACITY (10) to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Print sense buffer.");
+            AaruConsole.WriteLine("3.- Decode sense buffer.");
+            AaruConsole.WriteLine("4.- Send command again.");
+            AaruConsole.WriteLine("5.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to SCSI Primary Commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to SCSI Primary Commands menu...");
+                    AaruConsole.WriteLine("Returning to SCSI Primary Commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ CAPACITY (10) response:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ CAPACITY (10) response:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ CAPACITY (10) sense:");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ CAPACITY (10) sense:");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ CAPACITY (10) decoded sense:");
-                    DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ CAPACITY (10) decoded sense:");
+                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 4: goto start;
                 case 5: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -934,48 +1083,55 @@ namespace Aaru.Tests.Devices.SCSI
             int    item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Parameters for READ CAPACITY (16) command:");
-                DicConsole.WriteLine("Partial capacity?: {0}", partial);
-                DicConsole.WriteLine("Address: {0}",           address);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to SCSI Primary Commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for READ CAPACITY (16) command:");
+                AaruConsole.WriteLine("Partial capacity?: {0}", partial);
+                AaruConsole.WriteLine("Address: {0}", address);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to SCSI Primary Commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to SCSI Primary Commands menu...");
+                        AaruConsole.WriteLine("Returning to SCSI Primary Commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.Write("Partial capacity?: ");
+                        AaruConsole.Write("Partial capacity?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out partial))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             partial = false;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Address?: ");
+                        AaruConsole.Write("Address?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!ulong.TryParse(strDev, out address))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             address = 0;
                             System.Console.ReadKey();
                         }
@@ -987,78 +1143,92 @@ namespace Aaru.Tests.Devices.SCSI
 
             start:
             System.Console.Clear();
+
             bool sense = dev.ReadCapacity16(out byte[] buffer, out byte[] senseBuffer, address, partial, dev.Timeout,
                                             out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}",       ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",         senseBuffer?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Print sense buffer.");
-            DicConsole.WriteLine("3.- Decode sense buffer.");
-            DicConsole.WriteLine("4.- Send command again.");
-            DicConsole.WriteLine("5.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to SCSI Primary Commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending READ CAPACITY (16) to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Print sense buffer.");
+            AaruConsole.WriteLine("3.- Decode sense buffer.");
+            AaruConsole.WriteLine("4.- Send command again.");
+            AaruConsole.WriteLine("5.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to SCSI Primary Commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to SCSI Primary Commands menu...");
+                    AaruConsole.WriteLine("Returning to SCSI Primary Commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ CAPACITY (16) response:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ CAPACITY (16) response:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ CAPACITY (16) sense:");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ CAPACITY (16) sense:");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ CAPACITY (16) decoded sense:");
-                    DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ CAPACITY (16) decoded sense:");
+                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 4: goto start;
                 case 5: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -1067,76 +1237,90 @@ namespace Aaru.Tests.Devices.SCSI
         {
             start:
             System.Console.Clear();
+
             bool sense = dev.ReadMediaSerialNumber(out byte[] buffer, out byte[] senseBuffer, dev.Timeout,
                                                    out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}",       ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",         senseBuffer?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Print sense buffer.");
-            DicConsole.WriteLine("3.- Decode sense buffer.");
-            DicConsole.WriteLine("4.- Send command again.");
-            DicConsole.WriteLine("0.- Return to SCSI Primary Commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending READ MEDIA SERIAL NUMBER to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Print sense buffer.");
+            AaruConsole.WriteLine("3.- Decode sense buffer.");
+            AaruConsole.WriteLine("4.- Send command again.");
+            AaruConsole.WriteLine("0.- Return to SCSI Primary Commands menu.");
+            AaruConsole.Write("Choose: ");
 
             string strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out int item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to SCSI Primary Commands menu...");
+                    AaruConsole.WriteLine("Returning to SCSI Primary Commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ MEDIA SERIAL NUMBER response:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ MEDIA SERIAL NUMBER response:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ MEDIA SERIAL NUMBER sense:");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ MEDIA SERIAL NUMBER sense:");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ MEDIA SERIAL NUMBER decoded sense:");
-                    DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ MEDIA SERIAL NUMBER decoded sense:");
+                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 4: goto start;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -1148,37 +1332,42 @@ namespace Aaru.Tests.Devices.SCSI
             int    item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Parameters for REQUEST SENSE command:");
-                DicConsole.WriteLine("Descriptor: {0}", descriptor);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to SCSI Primary Commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for REQUEST SENSE command:");
+                AaruConsole.WriteLine("Descriptor: {0}", descriptor);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to SCSI Primary Commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to SCSI Primary Commands menu...");
+                        AaruConsole.WriteLine("Returning to SCSI Primary Commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.Write("Descriptor?: ");
+                        AaruConsole.Write("Descriptor?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out descriptor))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             descriptor = false;
                             System.Console.ReadKey();
                         }
@@ -1193,52 +1382,60 @@ namespace Aaru.Tests.Devices.SCSI
             bool sense = dev.RequestSense(descriptor, out byte[] senseBuffer, dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            DicConsole.WriteLine("Sending REQUEST SENSE to the device:");
-            DicConsole.WriteLine("Command took {0} ms.",               duration);
-            DicConsole.WriteLine("Sense is {0}.",                      sense);
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",         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));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print sense buffer.");
-            DicConsole.WriteLine("2.- Send command again.");
-            DicConsole.WriteLine("3.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to SCSI Primary Commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending REQUEST SENSE to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine("REQUEST SENSE decoded sense:");
+            AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print sense buffer.");
+            AaruConsole.WriteLine("2.- Send command again.");
+            AaruConsole.WriteLine("3.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to SCSI Primary Commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to SCSI Primary Commands menu...");
+                    AaruConsole.WriteLine("Returning to SCSI Primary Commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("REQUEST SENSE sense:");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("REQUEST SENSE sense:");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2: goto start;
                 case 3: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -1250,50 +1447,58 @@ namespace Aaru.Tests.Devices.SCSI
             bool sense = dev.ScsiTestUnitReady(out byte[] senseBuffer, dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            DicConsole.WriteLine("Sending TEST UNIT READY to the device:");
-            DicConsole.WriteLine("Command took {0} ms.",               duration);
-            DicConsole.WriteLine("Sense is {0}.",                      sense);
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",         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));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print sense buffer.");
-            DicConsole.WriteLine("2.- Send command again.");
-            DicConsole.WriteLine("0.- Return to SCSI Primary Commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending TEST UNIT READY to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine("TEST UNIT READY decoded sense:");
+            AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print sense buffer.");
+            AaruConsole.WriteLine("2.- Send command again.");
+            AaruConsole.WriteLine("0.- Return to SCSI Primary Commands menu.");
+            AaruConsole.Write("Choose: ");
 
             string strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out int item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to SCSI Primary Commands menu...");
+                    AaruConsole.WriteLine("Returning to SCSI Primary Commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("TEST UNIT READY sense:");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("TEST UNIT READY sense:");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2: goto start;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
diff --git a/Aaru.Tests.Devices/SCSI/SSC.cs b/Aaru.Tests.Devices/SCSI/SSC.cs
index 04122c1b0..11874896e 100644
--- a/Aaru.Tests.Devices/SCSI/SSC.cs
+++ b/Aaru.Tests.Devices/SCSI/SSC.cs
@@ -34,90 +34,108 @@ using Aaru.Devices;
 
 namespace Aaru.Tests.Devices.SCSI
 {
-    static class Ssc
+    internal static class Ssc
     {
         internal static void Menu(string devPath, Device dev)
         {
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Send a SCSI Streaming Command to the device:");
-                DicConsole.WriteLine("1.- Send LOAD UNLOAD command.");
-                DicConsole.WriteLine("2.- Send LOCATE (10) command.");
-                DicConsole.WriteLine("3.- Send LOCATE (16) command.");
-                DicConsole.WriteLine("4.- Send READ (6) command.");
-                DicConsole.WriteLine("5.- Send READ (16) command.");
-                DicConsole.WriteLine("6.- Send READ BLOCK LIMITS command.");
-                DicConsole.WriteLine("7.- Send READ POSITION command.");
-                DicConsole.WriteLine("8.- Send READ REVERSE (6) command.");
-                DicConsole.WriteLine("9.- Send READ REVERSE (16) command.");
-                DicConsole.WriteLine("10.- Send RECOVER BUFFERED DATA command.");
-                DicConsole.WriteLine("11.- Send REPORT DENSITY SUPPORT command.");
-                DicConsole.WriteLine("12.- Send REWIND command.");
-                DicConsole.WriteLine("13.- Send SPACE command.");
-                DicConsole.WriteLine("14.- Send TRACK SELECT command.");
-                DicConsole.WriteLine("0.- Return to SCSI commands menu.");
-                DicConsole.Write("Choose: ");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Send a SCSI Streaming Command to the device:");
+                AaruConsole.WriteLine("1.- Send LOAD UNLOAD command.");
+                AaruConsole.WriteLine("2.- Send LOCATE (10) command.");
+                AaruConsole.WriteLine("3.- Send LOCATE (16) command.");
+                AaruConsole.WriteLine("4.- Send READ (6) command.");
+                AaruConsole.WriteLine("5.- Send READ (16) command.");
+                AaruConsole.WriteLine("6.- Send READ BLOCK LIMITS command.");
+                AaruConsole.WriteLine("7.- Send READ POSITION command.");
+                AaruConsole.WriteLine("8.- Send READ REVERSE (6) command.");
+                AaruConsole.WriteLine("9.- Send READ REVERSE (16) command.");
+                AaruConsole.WriteLine("10.- Send RECOVER BUFFERED DATA command.");
+                AaruConsole.WriteLine("11.- Send REPORT DENSITY SUPPORT command.");
+                AaruConsole.WriteLine("12.- Send REWIND command.");
+                AaruConsole.WriteLine("13.- Send SPACE command.");
+                AaruConsole.WriteLine("14.- Send TRACK SELECT command.");
+                AaruConsole.WriteLine("0.- Return to SCSI commands menu.");
+                AaruConsole.Write("Choose: ");
 
                 string strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out int item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to SCSI commands menu...");
+                        AaruConsole.WriteLine("Returning to SCSI commands menu...");
+
                         return;
                     case 1:
                         LoadUnload(devPath, dev);
+
                         continue;
                     case 2:
                         Locate10(devPath, dev);
+
                         continue;
                     case 3:
                         Locate16(devPath, dev);
+
                         continue;
                     case 4:
                         Read6(devPath, dev);
+
                         continue;
                     case 5:
                         Read16(devPath, dev);
+
                         continue;
                     case 6:
                         ReadBlockLimits(devPath, dev);
+
                         continue;
                     case 7:
                         ReadPosition(devPath, dev);
+
                         continue;
                     case 8:
                         ReadReverse6(devPath, dev);
+
                         continue;
                     case 9:
                         ReadReverse16(devPath, dev);
+
                         continue;
                     case 10:
                         RecoverBufferedData(devPath, dev);
+
                         continue;
                     case 11:
                         ReportDensitySupport(devPath, dev);
+
                         continue;
                     case 12:
                         Rewind(devPath, dev);
+
                         continue;
                     case 13:
                         Space(devPath, dev);
+
                         continue;
                     case 14:
                         TrackSelect(devPath, dev);
+
                         continue;
                     default:
-                        DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                        AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                         System.Console.ReadKey();
+
                         continue;
                 }
             }
@@ -134,81 +152,94 @@ namespace Aaru.Tests.Devices.SCSI
             int    item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Parameters for LOAD UNLOAD command:");
-                DicConsole.WriteLine("Load?: {0}",        load);
-                DicConsole.WriteLine("Immediate?: {0}",   immediate);
-                DicConsole.WriteLine("Retense?: {0}",     retense);
-                DicConsole.WriteLine("End of tape?: {0}", eot);
-                DicConsole.WriteLine("Hold?: {0}",        hold);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for LOAD UNLOAD command:");
+                AaruConsole.WriteLine("Load?: {0}", load);
+                AaruConsole.WriteLine("Immediate?: {0}", immediate);
+                AaruConsole.WriteLine("Retense?: {0}", retense);
+                AaruConsole.WriteLine("End of tape?: {0}", eot);
+                AaruConsole.WriteLine("Hold?: {0}", hold);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+                        AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.Write("Load?: ");
+                        AaruConsole.Write("Load?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out load))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             load = true;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Immediate?: ");
+                        AaruConsole.Write("Immediate?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out immediate))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             immediate = false;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Retense?: ");
+                        AaruConsole.Write("Retense?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out retense))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             retense = false;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("End of tape?: ");
+                        AaruConsole.Write("End of tape?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out eot))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             eot = false;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Hold?: ");
+                        AaruConsole.Write("Hold?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out hold))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             hold = false;
                             System.Console.ReadKey();
                         }
@@ -220,56 +251,65 @@ namespace Aaru.Tests.Devices.SCSI
 
             start:
             System.Console.Clear();
+
             bool sense = dev.LoadUnload(out byte[] senseBuffer, immediate, load, retense, eot, hold, dev.Timeout,
                                         out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            DicConsole.WriteLine("Sending LOAD UNLOAD to the device:");
-            DicConsole.WriteLine("Command took {0} ms.",               duration);
-            DicConsole.WriteLine("Sense is {0}.",                      sense);
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",         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));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print sense buffer.");
-            DicConsole.WriteLine("2.- Send command again.");
-            DicConsole.WriteLine("3.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending LOAD UNLOAD to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine("LOAD UNLOAD decoded sense:");
+            AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print sense buffer.");
+            AaruConsole.WriteLine("2.- Send command again.");
+            AaruConsole.WriteLine("3.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+                    AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("LOAD UNLOAD sense:");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("LOAD UNLOAD sense:");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2: goto start;
                 case 3: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -285,81 +325,94 @@ namespace Aaru.Tests.Devices.SCSI
             int    item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Parameters for LOCATE (10) command:");
-                DicConsole.WriteLine("Locate block?: {0}",     blockType);
-                DicConsole.WriteLine("Immediate?: {0}",        immediate);
-                DicConsole.WriteLine("Change partition?: {0}", changePartition);
-                DicConsole.WriteLine("Partition: {0}",         partition);
-                DicConsole.WriteLine("{1}: {0}",               objectId, blockType ? "Block" : "Object");
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for LOCATE (10) command:");
+                AaruConsole.WriteLine("Locate block?: {0}", blockType);
+                AaruConsole.WriteLine("Immediate?: {0}", immediate);
+                AaruConsole.WriteLine("Change partition?: {0}", changePartition);
+                AaruConsole.WriteLine("Partition: {0}", partition);
+                AaruConsole.WriteLine("{1}: {0}", objectId, blockType ? "Block" : "Object");
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+                        AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.Write("Load?: ");
+                        AaruConsole.Write("Load?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out blockType))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             blockType = true;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Immediate?: ");
+                        AaruConsole.Write("Immediate?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out immediate))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             immediate = false;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Change partition?: ");
+                        AaruConsole.Write("Change partition?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out changePartition))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             changePartition = false;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Partition?: ");
+                        AaruConsole.Write("Partition?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!byte.TryParse(strDev, out partition))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             partition = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("{0}?: ", blockType ? "Block" : "Object");
+                        AaruConsole.Write("{0}?: ", blockType ? "Block" : "Object");
                         strDev = System.Console.ReadLine();
+
                         if(!uint.TryParse(strDev, out objectId))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             objectId = 0;
                             System.Console.ReadKey();
                         }
@@ -371,56 +424,65 @@ namespace Aaru.Tests.Devices.SCSI
 
             start:
             System.Console.Clear();
+
             bool sense = dev.Locate(out byte[] senseBuffer, immediate, blockType, changePartition, partition, objectId,
                                     dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            DicConsole.WriteLine("Sending LOCATE (10) to the device:");
-            DicConsole.WriteLine("Command took {0} ms.",               duration);
-            DicConsole.WriteLine("Sense is {0}.",                      sense);
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",         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));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print sense buffer.");
-            DicConsole.WriteLine("2.- Send command again.");
-            DicConsole.WriteLine("3.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending LOCATE (10) to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine("LOCATE (10) decoded sense:");
+            AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print sense buffer.");
+            AaruConsole.WriteLine("2.- Send command again.");
+            AaruConsole.WriteLine("3.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+                    AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("LOCATE (10) sense:");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("LOCATE (10) sense:");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2: goto start;
                 case 3: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -437,96 +499,113 @@ namespace Aaru.Tests.Devices.SCSI
             int               item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Parameters for LOCATE (16) command:");
-                DicConsole.WriteLine("Object type: {0}",          destType);
-                DicConsole.WriteLine("Immediate?: {0}",           immediate);
-                DicConsole.WriteLine("Explicit identifier?: {0}", bam);
-                DicConsole.WriteLine("Change partition?: {0}",    changePartition);
-                DicConsole.WriteLine("Partition: {0}",            partition);
-                DicConsole.WriteLine("Object identifier: {0}",    objectId);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for LOCATE (16) command:");
+                AaruConsole.WriteLine("Object type: {0}", destType);
+                AaruConsole.WriteLine("Immediate?: {0}", immediate);
+                AaruConsole.WriteLine("Explicit identifier?: {0}", bam);
+                AaruConsole.WriteLine("Change partition?: {0}", changePartition);
+                AaruConsole.WriteLine("Partition: {0}", partition);
+                AaruConsole.WriteLine("Object identifier: {0}", objectId);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+                        AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.WriteLine("Object type");
-                        DicConsole.WriteLine("Available values: {0} {1} {2} {3}", SscLogicalIdTypes.FileId,
-                                             SscLogicalIdTypes.ObjectId, SscLogicalIdTypes.Reserved,
-                                             SscLogicalIdTypes.SetId);
-                        DicConsole.Write("Choose?: ");
+                        AaruConsole.WriteLine("Object type");
+
+                        AaruConsole.WriteLine("Available values: {0} {1} {2} {3}", SscLogicalIdTypes.FileId,
+                                              SscLogicalIdTypes.ObjectId, SscLogicalIdTypes.Reserved,
+                                              SscLogicalIdTypes.SetId);
+
+                        AaruConsole.Write("Choose?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!Enum.TryParse(strDev, true, out destType))
                         {
-                            DicConsole.WriteLine("Not a correct object type. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a correct object type. Press any key to continue...");
                             destType = SscLogicalIdTypes.FileId;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Immediate?: ");
+                        AaruConsole.Write("Immediate?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out immediate))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             immediate = false;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Explicit identifier?: ");
+                        AaruConsole.Write("Explicit identifier?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out bam))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             bam = false;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Change partition?: ");
+                        AaruConsole.Write("Change partition?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out changePartition))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             changePartition = false;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Partition?: ");
+                        AaruConsole.Write("Partition?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!byte.TryParse(strDev, out partition))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             partition = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Identifier");
+                        AaruConsole.Write("Identifier");
                         strDev = System.Console.ReadLine();
+
                         if(!ulong.TryParse(strDev, out objectId))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             objectId = 1;
                             System.Console.ReadKey();
                         }
@@ -538,56 +617,65 @@ namespace Aaru.Tests.Devices.SCSI
 
             start:
             System.Console.Clear();
+
             bool sense = dev.Locate16(out byte[] senseBuffer, immediate, changePartition, destType, bam, partition,
                                       objectId, dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            DicConsole.WriteLine("Sending LOCATE (16) to the device:");
-            DicConsole.WriteLine("Command took {0} ms.",               duration);
-            DicConsole.WriteLine("Sense is {0}.",                      sense);
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",         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));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print sense buffer.");
-            DicConsole.WriteLine("2.- Send command again.");
-            DicConsole.WriteLine("3.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending LOCATE (16) to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine("LOCATE (16) decoded sense:");
+            AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print sense buffer.");
+            AaruConsole.WriteLine("2.- Send command again.");
+            AaruConsole.WriteLine("3.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+                    AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("LOCATE (16) sense:");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("LOCATE (16) sense:");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2: goto start;
                 case 3: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -602,80 +690,95 @@ namespace Aaru.Tests.Devices.SCSI
             int    item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Parameters for READ (6) command:");
-                DicConsole.WriteLine("Fixed block size?: {0}", fixedLen);
-                DicConsole.WriteLine("Will read {0} {1}",      length, fixedLen ? "blocks" : "bytes");
-                if(fixedLen) DicConsole.WriteLine("{0} bytes expected per block", blockSize);
-                DicConsole.WriteLine("Suppress length indicator?: {0}", sili);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for READ (6) command:");
+                AaruConsole.WriteLine("Fixed block size?: {0}", fixedLen);
+                AaruConsole.WriteLine("Will read {0} {1}", length, fixedLen ? "blocks" : "bytes");
+
+                if(fixedLen)
+                    AaruConsole.WriteLine("{0} bytes expected per block", blockSize);
+
+                AaruConsole.WriteLine("Suppress length indicator?: {0}", sili);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+                        AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.Write("Fixed block size?: ");
+                        AaruConsole.Write("Fixed block size?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out fixedLen))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             fixedLen = true;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("How many {0} to read?: ", fixedLen ? "blocks" : "bytes");
+                        AaruConsole.Write("How many {0} to read?: ", fixedLen ? "blocks" : "bytes");
                         strDev = System.Console.ReadLine();
+
                         if(!uint.TryParse(strDev, out length))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             length = (uint)(fixedLen ? 1 : 512);
                             System.Console.ReadKey();
+
                             continue;
                         }
 
                         if(length > 0xFFFFFF)
                         {
-                            DicConsole.WriteLine("Max number of {1} is {0}, setting to {0}", 0xFFFFFF,
-                                                 fixedLen ? "blocks" : "bytes");
+                            AaruConsole.WriteLine("Max number of {1} is {0}, setting to {0}", 0xFFFFFF,
+                                                  fixedLen ? "blocks" : "bytes");
+
                             length = 0xFFFFFF;
                         }
 
                         if(fixedLen)
                         {
-                            DicConsole.Write("How many bytes to expect per block?: ");
+                            AaruConsole.Write("How many bytes to expect per block?: ");
                             strDev = System.Console.ReadLine();
+
                             if(!uint.TryParse(strDev, out blockSize))
                             {
-                                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                                 blockSize = 512;
                                 System.Console.ReadKey();
+
                                 continue;
                             }
                         }
 
-                        DicConsole.Write("Suppress length indicator?: ");
+                        AaruConsole.Write("Suppress length indicator?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out sili))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             sili = false;
                             System.Console.ReadKey();
                         }
@@ -687,78 +790,92 @@ namespace Aaru.Tests.Devices.SCSI
 
             start:
             System.Console.Clear();
+
             bool sense = dev.Read6(out byte[] buffer, out byte[] senseBuffer, sili, fixedLen, length, blockSize,
                                    dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}",       ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",         senseBuffer?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Print sense buffer.");
-            DicConsole.WriteLine("3.- Decode sense buffer.");
-            DicConsole.WriteLine("4.- Send command again.");
-            DicConsole.WriteLine("5.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending READ (6) to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Print sense buffer.");
+            AaruConsole.WriteLine("3.- Decode sense buffer.");
+            AaruConsole.WriteLine("4.- Send command again.");
+            AaruConsole.WriteLine("5.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+                    AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ (6) response:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ (6) response:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ (6) sense:");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ (6) sense:");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ (6) decoded sense:");
-                    DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ (6) decoded sense:");
+                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 4: goto start;
                 case 5: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -775,101 +892,120 @@ namespace Aaru.Tests.Devices.SCSI
             int    item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Parameters for READ (16) command:");
-                DicConsole.WriteLine("Fixed block size?: {0}", fixedLen);
-                DicConsole.WriteLine("Will read {0} {1}",      length, fixedLen ? "objects" : "bytes");
-                if(fixedLen) DicConsole.WriteLine("{0} bytes expected per object", objectSize);
-                DicConsole.WriteLine("Suppress length indicator?: {0}",    sili);
-                DicConsole.WriteLine("Read object {0} from partition {1}", objectId, partition);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for READ (16) command:");
+                AaruConsole.WriteLine("Fixed block size?: {0}", fixedLen);
+                AaruConsole.WriteLine("Will read {0} {1}", length, fixedLen ? "objects" : "bytes");
+
+                if(fixedLen)
+                    AaruConsole.WriteLine("{0} bytes expected per object", objectSize);
+
+                AaruConsole.WriteLine("Suppress length indicator?: {0}", sili);
+                AaruConsole.WriteLine("Read object {0} from partition {1}", objectId, partition);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+                        AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.Write("Fixed block size?: ");
+                        AaruConsole.Write("Fixed block size?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out fixedLen))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             fixedLen = true;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("How many {0} to read?: ", fixedLen ? "objects" : "bytes");
+                        AaruConsole.Write("How many {0} to read?: ", fixedLen ? "objects" : "bytes");
                         strDev = System.Console.ReadLine();
+
                         if(!uint.TryParse(strDev, out length))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             length = (uint)(fixedLen ? 1 : 512);
                             System.Console.ReadKey();
+
                             continue;
                         }
 
                         if(length > 0xFFFFFF)
                         {
-                            DicConsole.WriteLine("Max number of {1} is {0}, setting to {0}", 0xFFFFFF,
-                                                 fixedLen ? "blocks" : "bytes");
+                            AaruConsole.WriteLine("Max number of {1} is {0}, setting to {0}", 0xFFFFFF,
+                                                  fixedLen ? "blocks" : "bytes");
+
                             length = 0xFFFFFF;
                         }
 
                         if(fixedLen)
                         {
-                            DicConsole.Write("How many bytes to expect per object?: ");
+                            AaruConsole.Write("How many bytes to expect per object?: ");
                             strDev = System.Console.ReadLine();
+
                             if(!uint.TryParse(strDev, out objectSize))
                             {
-                                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                                 objectSize = 512;
                                 System.Console.ReadKey();
+
                                 continue;
                             }
                         }
 
-                        DicConsole.Write("Suppress length indicator?: ");
+                        AaruConsole.Write("Suppress length indicator?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out sili))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             sili = false;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Object identifier?: ");
+                        AaruConsole.Write("Object identifier?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!ulong.TryParse(strDev, out objectId))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             objectId = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Partition?: ");
+                        AaruConsole.Write("Partition?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!byte.TryParse(strDev, out partition))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             partition = 0;
                             System.Console.ReadKey();
                         }
@@ -881,78 +1017,92 @@ namespace Aaru.Tests.Devices.SCSI
 
             start:
             System.Console.Clear();
+
             bool sense = dev.Read16(out byte[] buffer, out byte[] senseBuffer, sili, fixedLen, partition, objectId,
                                     length, objectSize, dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}",       ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",         senseBuffer?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Print sense buffer.");
-            DicConsole.WriteLine("3.- Decode sense buffer.");
-            DicConsole.WriteLine("4.- Send command again.");
-            DicConsole.WriteLine("5.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending READ (16) to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Print sense buffer.");
+            AaruConsole.WriteLine("3.- Decode sense buffer.");
+            AaruConsole.WriteLine("4.- Send command again.");
+            AaruConsole.WriteLine("5.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+                    AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ (16) response:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ (16) response:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ (16) sense:");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ (16) sense:");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ (16) decoded sense:");
-                    DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ (16) decoded sense:");
+                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 4: goto start;
                 case 5: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -961,87 +1111,105 @@ namespace Aaru.Tests.Devices.SCSI
         {
             start:
             System.Console.Clear();
+
             bool sense = dev.ReadBlockLimits(out byte[] buffer, out byte[] senseBuffer, dev.Timeout,
                                              out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}",       ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",         senseBuffer?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Decode buffer.");
-            DicConsole.WriteLine("3.- Print sense buffer.");
-            DicConsole.WriteLine("4.- Decode sense buffer.");
-            DicConsole.WriteLine("5.- Send command again.");
-            DicConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending READ BLOCK LIMITS to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Decode buffer.");
+            AaruConsole.WriteLine("3.- Print sense buffer.");
+            AaruConsole.WriteLine("4.- Decode sense buffer.");
+            AaruConsole.WriteLine("5.- Send command again.");
+            AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
+            AaruConsole.Write("Choose: ");
 
             string strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out int item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+                    AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ BLOCK LIMITS response:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ BLOCK LIMITS response:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ BLOCK LIMITS decoded response:");
-                    if(buffer != null) DicConsole.WriteLine("{0}", BlockLimits.Prettify(buffer));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ BLOCK LIMITS decoded response:");
+
+                    if(buffer != null)
+                        AaruConsole.WriteLine("{0}", BlockLimits.Prettify(buffer));
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ BLOCK LIMITS sense:");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ BLOCK LIMITS sense:");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 4:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ BLOCK LIMITS decoded sense:");
-                    DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ BLOCK LIMITS decoded sense:");
+                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 5: goto start;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -1053,44 +1221,51 @@ namespace Aaru.Tests.Devices.SCSI
             int              item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Parameters for LOCATE (16) command:");
-                DicConsole.WriteLine("Response form: {0}", responseForm);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for LOCATE (16) command:");
+                AaruConsole.WriteLine("Response form: {0}", responseForm);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+                        AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.WriteLine("Response form");
-                        DicConsole.WriteLine("Available values: {0} {1} {2} {3} {4} {5} {6} {7} {8}",
-                                             SscPositionForms.Short, SscPositionForms.VendorShort,
-                                             SscPositionForms.OldLong, SscPositionForms.OldLongVendor,
-                                             SscPositionForms.OldTclp, SscPositionForms.OldTclpVendor,
-                                             SscPositionForms.Long, SscPositionForms.OldLongTclpVendor,
-                                             SscPositionForms.Extended);
-                        DicConsole.Write("Choose?: ");
+                        AaruConsole.WriteLine("Response form");
+
+                        AaruConsole.WriteLine("Available values: {0} {1} {2} {3} {4} {5} {6} {7} {8}",
+                                              SscPositionForms.Short, SscPositionForms.VendorShort,
+                                              SscPositionForms.OldLong, SscPositionForms.OldLongVendor,
+                                              SscPositionForms.OldTclp, SscPositionForms.OldTclpVendor,
+                                              SscPositionForms.Long, SscPositionForms.OldLongTclpVendor,
+                                              SscPositionForms.Extended);
+
+                        AaruConsole.Write("Choose?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!Enum.TryParse(strDev, true, out responseForm))
                         {
-                            DicConsole.WriteLine("Not a correct response form. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a correct response form. Press any key to continue...");
                             responseForm = SscPositionForms.Short;
                             System.Console.ReadKey();
                         }
@@ -1102,56 +1277,65 @@ namespace Aaru.Tests.Devices.SCSI
 
             start:
             System.Console.Clear();
+
             bool sense = dev.ReadPosition(out _, out byte[] senseBuffer, responseForm, dev.Timeout,
                                           out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            DicConsole.WriteLine("Sending READ POSITION to the device:");
-            DicConsole.WriteLine("Command took {0} ms.",               duration);
-            DicConsole.WriteLine("Sense is {0}.",                      sense);
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",         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));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print sense buffer.");
-            DicConsole.WriteLine("2.- Send command again.");
-            DicConsole.WriteLine("3.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending READ POSITION to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine("READ POSITION decoded sense:");
+            AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print sense buffer.");
+            AaruConsole.WriteLine("2.- Send command again.");
+            AaruConsole.WriteLine("3.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+                    AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ POSITION sense:");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ POSITION sense:");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2: goto start;
                 case 3: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -1167,91 +1351,108 @@ namespace Aaru.Tests.Devices.SCSI
             int    item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Parameters for READ REVERSE (6) command:");
-                DicConsole.WriteLine("Fixed block size?: {0}", fixedLen);
-                DicConsole.WriteLine("Will read {0} {1}",      length, fixedLen ? "blocks" : "bytes");
-                if(fixedLen) DicConsole.WriteLine("{0} bytes expected per block", blockSize);
-                DicConsole.WriteLine("Suppress length indicator?: {0}",    sili);
-                DicConsole.WriteLine("Drive should unreverse bytes?: {0}", byteOrder);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for READ REVERSE (6) command:");
+                AaruConsole.WriteLine("Fixed block size?: {0}", fixedLen);
+                AaruConsole.WriteLine("Will read {0} {1}", length, fixedLen ? "blocks" : "bytes");
+
+                if(fixedLen)
+                    AaruConsole.WriteLine("{0} bytes expected per block", blockSize);
+
+                AaruConsole.WriteLine("Suppress length indicator?: {0}", sili);
+                AaruConsole.WriteLine("Drive should unreverse bytes?: {0}", byteOrder);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+                        AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.Write("Fixed block size?: ");
+                        AaruConsole.Write("Fixed block size?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out fixedLen))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             fixedLen = true;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("How many {0} to read?: ", fixedLen ? "blocks" : "bytes");
+                        AaruConsole.Write("How many {0} to read?: ", fixedLen ? "blocks" : "bytes");
                         strDev = System.Console.ReadLine();
+
                         if(!uint.TryParse(strDev, out length))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             length = (uint)(fixedLen ? 1 : 512);
                             System.Console.ReadKey();
+
                             continue;
                         }
 
                         if(length > 0xFFFFFF)
                         {
-                            DicConsole.WriteLine("Max number of {1} is {0}, setting to {0}", 0xFFFFFF,
-                                                 fixedLen ? "blocks" : "bytes");
+                            AaruConsole.WriteLine("Max number of {1} is {0}, setting to {0}", 0xFFFFFF,
+                                                  fixedLen ? "blocks" : "bytes");
+
                             length = 0xFFFFFF;
                         }
 
                         if(fixedLen)
                         {
-                            DicConsole.Write("How many bytes to expect per block?: ");
+                            AaruConsole.Write("How many bytes to expect per block?: ");
                             strDev = System.Console.ReadLine();
+
                             if(!uint.TryParse(strDev, out blockSize))
                             {
-                                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                                 blockSize = 512;
                                 System.Console.ReadKey();
+
                                 continue;
                             }
                         }
 
-                        DicConsole.Write("Suppress length indicator?: ");
+                        AaruConsole.Write("Suppress length indicator?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out sili))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             sili = false;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Drive should unreverse bytes?: ");
+                        AaruConsole.Write("Drive should unreverse bytes?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out byteOrder))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             byteOrder = false;
                             System.Console.ReadKey();
                         }
@@ -1263,78 +1464,92 @@ namespace Aaru.Tests.Devices.SCSI
 
             start:
             System.Console.Clear();
+
             bool sense = dev.ReadReverse6(out byte[] buffer, out byte[] senseBuffer, byteOrder, sili, fixedLen, length,
                                           blockSize, dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}",       ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",         senseBuffer?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Print sense buffer.");
-            DicConsole.WriteLine("3.- Decode sense buffer.");
-            DicConsole.WriteLine("4.- Send command again.");
-            DicConsole.WriteLine("5.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending READ REVERSE (6) to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Print sense buffer.");
+            AaruConsole.WriteLine("3.- Decode sense buffer.");
+            AaruConsole.WriteLine("4.- Send command again.");
+            AaruConsole.WriteLine("5.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+                    AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ REVERSE (6) response:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ REVERSE (6) response:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ REVERSE (6) sense:");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ REVERSE (6) sense:");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ REVERSE (6) decoded sense:");
-                    DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ REVERSE (6) decoded sense:");
+                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 4: goto start;
                 case 5: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -1352,112 +1567,133 @@ namespace Aaru.Tests.Devices.SCSI
             int    item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Parameters for READ REVERSE (16) command:");
-                DicConsole.WriteLine("Fixed block size?: {0}", fixedLen);
-                DicConsole.WriteLine("Will read {0} {1}",      length, fixedLen ? "objects" : "bytes");
-                if(fixedLen) DicConsole.WriteLine("{0} bytes expected per object", objectSize);
-                DicConsole.WriteLine("Suppress length indicator?: {0}",    sili);
-                DicConsole.WriteLine("Read object {0} from partition {1}", objectId, partition);
-                DicConsole.WriteLine("Drive should unreverse bytes?: {0}", byteOrder);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for READ REVERSE (16) command:");
+                AaruConsole.WriteLine("Fixed block size?: {0}", fixedLen);
+                AaruConsole.WriteLine("Will read {0} {1}", length, fixedLen ? "objects" : "bytes");
+
+                if(fixedLen)
+                    AaruConsole.WriteLine("{0} bytes expected per object", objectSize);
+
+                AaruConsole.WriteLine("Suppress length indicator?: {0}", sili);
+                AaruConsole.WriteLine("Read object {0} from partition {1}", objectId, partition);
+                AaruConsole.WriteLine("Drive should unreverse bytes?: {0}", byteOrder);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+                        AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.Write("Fixed block size?: ");
+                        AaruConsole.Write("Fixed block size?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out fixedLen))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             fixedLen = true;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("How many {0} to read?: ", fixedLen ? "objects" : "bytes");
+                        AaruConsole.Write("How many {0} to read?: ", fixedLen ? "objects" : "bytes");
                         strDev = System.Console.ReadLine();
+
                         if(!uint.TryParse(strDev, out length))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             length = (uint)(fixedLen ? 1 : 512);
                             System.Console.ReadKey();
+
                             continue;
                         }
 
                         if(length > 0xFFFFFF)
                         {
-                            DicConsole.WriteLine("Max number of {1} is {0}, setting to {0}", 0xFFFFFF,
-                                                 fixedLen ? "blocks" : "bytes");
+                            AaruConsole.WriteLine("Max number of {1} is {0}, setting to {0}", 0xFFFFFF,
+                                                  fixedLen ? "blocks" : "bytes");
+
                             length = 0xFFFFFF;
                         }
 
                         if(fixedLen)
                         {
-                            DicConsole.Write("How many bytes to expect per object?: ");
+                            AaruConsole.Write("How many bytes to expect per object?: ");
                             strDev = System.Console.ReadLine();
+
                             if(!uint.TryParse(strDev, out objectSize))
                             {
-                                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                                 objectSize = 512;
                                 System.Console.ReadKey();
+
                                 continue;
                             }
                         }
 
-                        DicConsole.Write("Suppress length indicator?: ");
+                        AaruConsole.Write("Suppress length indicator?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out sili))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             sili = false;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Object identifier?: ");
+                        AaruConsole.Write("Object identifier?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!ulong.TryParse(strDev, out objectId))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             objectId = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Partition?: ");
+                        AaruConsole.Write("Partition?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!byte.TryParse(strDev, out partition))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             partition = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Drive should unreverse bytes?: ");
+                        AaruConsole.Write("Drive should unreverse bytes?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out byteOrder))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             byteOrder = false;
                             System.Console.ReadKey();
                         }
@@ -1469,78 +1705,92 @@ namespace Aaru.Tests.Devices.SCSI
 
             start:
             System.Console.Clear();
+
             bool sense = dev.ReadReverse16(out byte[] buffer, out byte[] senseBuffer, byteOrder, sili, fixedLen,
                                            partition, objectId, length, objectSize, dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}",       ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",         senseBuffer?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Print sense buffer.");
-            DicConsole.WriteLine("3.- Decode sense buffer.");
-            DicConsole.WriteLine("4.- Send command again.");
-            DicConsole.WriteLine("5.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending READ REVERSE (16) to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Print sense buffer.");
+            AaruConsole.WriteLine("3.- Decode sense buffer.");
+            AaruConsole.WriteLine("4.- Send command again.");
+            AaruConsole.WriteLine("5.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+                    AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ REVERSE (16) response:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ REVERSE (16) response:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ REVERSE (16) sense:");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ REVERSE (16) sense:");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ REVERSE (16) decoded sense:");
-                    DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ REVERSE (16) decoded sense:");
+                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 4: goto start;
                 case 5: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -1555,80 +1805,95 @@ namespace Aaru.Tests.Devices.SCSI
             int    item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Parameters for RECOVER BUFFERED DATA command:");
-                DicConsole.WriteLine("Fixed block size?: {0}", fixedLen);
-                DicConsole.WriteLine("Will read {0} {1}",      length, fixedLen ? "blocks" : "bytes");
-                if(fixedLen) DicConsole.WriteLine("{0} bytes expected per block", blockSize);
-                DicConsole.WriteLine("Suppress length indicator?: {0}", sili);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for RECOVER BUFFERED DATA command:");
+                AaruConsole.WriteLine("Fixed block size?: {0}", fixedLen);
+                AaruConsole.WriteLine("Will read {0} {1}", length, fixedLen ? "blocks" : "bytes");
+
+                if(fixedLen)
+                    AaruConsole.WriteLine("{0} bytes expected per block", blockSize);
+
+                AaruConsole.WriteLine("Suppress length indicator?: {0}", sili);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+                        AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.Write("Fixed block size?: ");
+                        AaruConsole.Write("Fixed block size?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out fixedLen))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             fixedLen = true;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("How many {0} to read?: ", fixedLen ? "blocks" : "bytes");
+                        AaruConsole.Write("How many {0} to read?: ", fixedLen ? "blocks" : "bytes");
                         strDev = System.Console.ReadLine();
+
                         if(!uint.TryParse(strDev, out length))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             length = (uint)(fixedLen ? 1 : 512);
                             System.Console.ReadKey();
+
                             continue;
                         }
 
                         if(length > 0xFFFFFF)
                         {
-                            DicConsole.WriteLine("Max number of {1} is {0}, setting to {0}", 0xFFFFFF,
-                                                 fixedLen ? "blocks" : "bytes");
+                            AaruConsole.WriteLine("Max number of {1} is {0}, setting to {0}", 0xFFFFFF,
+                                                  fixedLen ? "blocks" : "bytes");
+
                             length = 0xFFFFFF;
                         }
 
                         if(fixedLen)
                         {
-                            DicConsole.Write("How many bytes to expect per block?: ");
+                            AaruConsole.Write("How many bytes to expect per block?: ");
                             strDev = System.Console.ReadLine();
+
                             if(!uint.TryParse(strDev, out blockSize))
                             {
-                                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                                 blockSize = 512;
                                 System.Console.ReadKey();
+
                                 continue;
                             }
                         }
 
-                        DicConsole.Write("Suppress length indicator?: ");
+                        AaruConsole.Write("Suppress length indicator?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out sili))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             sili = false;
                             System.Console.ReadKey();
                         }
@@ -1640,78 +1905,92 @@ namespace Aaru.Tests.Devices.SCSI
 
             start:
             System.Console.Clear();
+
             bool sense = dev.RecoverBufferedData(out byte[] buffer, out byte[] senseBuffer, sili, fixedLen, length,
                                                  blockSize, dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}",       ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",         senseBuffer?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Print sense buffer.");
-            DicConsole.WriteLine("3.- Decode sense buffer.");
-            DicConsole.WriteLine("4.- Send command again.");
-            DicConsole.WriteLine("5.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending RECOVER BUFFERED DATA to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Print sense buffer.");
+            AaruConsole.WriteLine("3.- Decode sense buffer.");
+            AaruConsole.WriteLine("4.- Send command again.");
+            AaruConsole.WriteLine("5.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+                    AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("RECOVER BUFFERED DATA response:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("RECOVER BUFFERED DATA response:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("RECOVER BUFFERED DATA sense:");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("RECOVER BUFFERED DATA sense:");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("RECOVER BUFFERED DATA decoded sense:");
-                    DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("RECOVER BUFFERED DATA decoded sense:");
+                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 4: goto start;
                 case 5: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -1724,48 +2003,55 @@ namespace Aaru.Tests.Devices.SCSI
             int    item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Parameters for REPORT DENSITY SUPPORT command:");
-                DicConsole.WriteLine("Report about medium types?: {0}",   medium);
-                DicConsole.WriteLine("Report about current medium?: {0}", current);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for REPORT DENSITY SUPPORT command:");
+                AaruConsole.WriteLine("Report about medium types?: {0}", medium);
+                AaruConsole.WriteLine("Report about current medium?: {0}", current);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+                        AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.Write("Report about medium types?: ");
+                        AaruConsole.Write("Report about medium types?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out medium))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             medium = false;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Report about current medium?: ");
+                        AaruConsole.Write("Report about current medium?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out current))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             current = false;
                             System.Console.ReadKey();
                         }
@@ -1777,92 +2063,108 @@ namespace Aaru.Tests.Devices.SCSI
 
             start:
             System.Console.Clear();
+
             bool sense = dev.ReportDensitySupport(out byte[] buffer, out byte[] senseBuffer, medium, current,
                                                   dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}",       ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",         senseBuffer?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Decode buffer.");
-            DicConsole.WriteLine("3.- Print sense buffer.");
-            DicConsole.WriteLine("4.- Decode sense buffer.");
-            DicConsole.WriteLine("5.- Send command again.");
-            DicConsole.WriteLine("6.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending REPORT DENSITY SUPPORT to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Decode buffer.");
+            AaruConsole.WriteLine("3.- Print sense buffer.");
+            AaruConsole.WriteLine("4.- Decode sense buffer.");
+            AaruConsole.WriteLine("5.- Send command again.");
+            AaruConsole.WriteLine("6.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+                    AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("REPORT DENSITY SUPPORT response:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("REPORT DENSITY SUPPORT response:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("REPORT DENSITY SUPPORT decoded buffer:");
-                    DicConsole.Write("{0}",
-                                     medium
-                                         ? DensitySupport.PrettifyMediumType(buffer)
-                                         : DensitySupport.PrettifyDensity(buffer));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("REPORT DENSITY SUPPORT decoded buffer:");
+
+                    AaruConsole.Write("{0}",
+                                      medium ? DensitySupport.PrettifyMediumType(buffer)
+                                          : DensitySupport.PrettifyDensity(buffer));
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("REPORT DENSITY SUPPORT sense:");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("REPORT DENSITY SUPPORT sense:");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 4:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("REPORT DENSITY SUPPORT decoded sense:");
-                    DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("REPORT DENSITY SUPPORT decoded sense:");
+                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 5: goto start;
                 case 6: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -1874,37 +2176,42 @@ namespace Aaru.Tests.Devices.SCSI
             int    item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Parameters for REWIND command:");
-                DicConsole.WriteLine("Immediate?: {0}", immediate);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for REWIND command:");
+                AaruConsole.WriteLine("Immediate?: {0}", immediate);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+                        AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.Write("Immediate?: ");
+                        AaruConsole.Write("Immediate?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out immediate))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             immediate = false;
                             System.Console.ReadKey();
                         }
@@ -1919,52 +2226,60 @@ namespace Aaru.Tests.Devices.SCSI
             bool sense = dev.Rewind(out byte[] senseBuffer, immediate, dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            DicConsole.WriteLine("Sending REWIND to the device:");
-            DicConsole.WriteLine("Command took {0} ms.",               duration);
-            DicConsole.WriteLine("Sense is {0}.",                      sense);
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",         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));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print sense buffer.");
-            DicConsole.WriteLine("2.- Send command again.");
-            DicConsole.WriteLine("3.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending REWIND to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine("REWIND decoded sense:");
+            AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print sense buffer.");
+            AaruConsole.WriteLine("2.- Send command again.");
+            AaruConsole.WriteLine("3.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+                    AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("REWIND sense:");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("REWIND sense:");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2: goto start;
                 case 3: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -1977,52 +2292,62 @@ namespace Aaru.Tests.Devices.SCSI
             int           item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Parameters for SPACE command:");
-                DicConsole.WriteLine("What to space: {0}", what);
-                DicConsole.WriteLine("How many: {0}",      count);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for SPACE command:");
+                AaruConsole.WriteLine("What to space: {0}", what);
+                AaruConsole.WriteLine("How many: {0}", count);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+                        AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.WriteLine("What to space");
-                        DicConsole.WriteLine("Available values: {0} {1} {2} {3} {4} {5}", SscSpaceCodes.LogicalBlock,
-                                             SscSpaceCodes.Filemark, SscSpaceCodes.SequentialFilemark,
-                                             SscSpaceCodes.EndOfData, SscSpaceCodes.Obsolete1, SscSpaceCodes.Obsolete2);
-                        DicConsole.Write("Choose?: ");
+                        AaruConsole.WriteLine("What to space");
+
+                        AaruConsole.WriteLine("Available values: {0} {1} {2} {3} {4} {5}", SscSpaceCodes.LogicalBlock,
+                                              SscSpaceCodes.Filemark, SscSpaceCodes.SequentialFilemark,
+                                              SscSpaceCodes.EndOfData, SscSpaceCodes.Obsolete1,
+                                              SscSpaceCodes.Obsolete2);
+
+                        AaruConsole.Write("Choose?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!Enum.TryParse(strDev, true, out what))
                         {
-                            DicConsole.WriteLine("Not a correct object type. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a correct object type. Press any key to continue...");
                             what = SscSpaceCodes.LogicalBlock;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("How many (negative for reverse)?: ");
+                        AaruConsole.Write("How many (negative for reverse)?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!int.TryParse(strDev, out count))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             count = 0;
                             System.Console.ReadKey();
                         }
@@ -2037,52 +2362,60 @@ namespace Aaru.Tests.Devices.SCSI
             bool sense = dev.Space(out byte[] senseBuffer, what, count, dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            DicConsole.WriteLine("Sending SPACE to the device:");
-            DicConsole.WriteLine("Command took {0} ms.",               duration);
-            DicConsole.WriteLine("Sense is {0}.",                      sense);
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",         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));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print sense buffer.");
-            DicConsole.WriteLine("2.- Send command again.");
-            DicConsole.WriteLine("3.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending SPACE to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine("SPACE decoded sense:");
+            AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print sense buffer.");
+            AaruConsole.WriteLine("2.- Send command again.");
+            AaruConsole.WriteLine("3.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+                    AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("SPACE sense:");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("SPACE sense:");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2: goto start;
                 case 3: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -2094,37 +2427,42 @@ namespace Aaru.Tests.Devices.SCSI
             int    item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Parameters for TRACK SELECT command:");
-                DicConsole.WriteLine("Track: {0}", track);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for TRACK SELECT command:");
+                AaruConsole.WriteLine("Track: {0}", track);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+                        AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.Write("Track?: ");
+                        AaruConsole.Write("Track?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!byte.TryParse(strDev, out track))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             track = 0;
                             System.Console.ReadKey();
                         }
@@ -2139,52 +2477,60 @@ namespace Aaru.Tests.Devices.SCSI
             bool sense = dev.TrackSelect(out byte[] senseBuffer, track, dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            DicConsole.WriteLine("Sending TRACK SELECT to the device:");
-            DicConsole.WriteLine("Command took {0} ms.",               duration);
-            DicConsole.WriteLine("Sense is {0}.",                      sense);
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",         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));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print sense buffer.");
-            DicConsole.WriteLine("2.- Send command again.");
-            DicConsole.WriteLine("3.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending TRACK SELECT to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine("TRACK SELECT decoded sense:");
+            AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print sense buffer.");
+            AaruConsole.WriteLine("2.- Send command again.");
+            AaruConsole.WriteLine("3.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+                    AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("TRACK SELECT sense:");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("TRACK SELECT sense:");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2: goto start;
                 case 3: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
diff --git a/Aaru.Tests.Devices/SCSI/SyQuest.cs b/Aaru.Tests.Devices/SCSI/SyQuest.cs
index c58b5cf27..f49f9bc6c 100644
--- a/Aaru.Tests.Devices/SCSI/SyQuest.cs
+++ b/Aaru.Tests.Devices/SCSI/SyQuest.cs
@@ -32,54 +32,63 @@ using Aaru.Devices;
 
 namespace Aaru.Tests.Devices.SCSI
 {
-    static class SyQuest
+    internal static class SyQuest
     {
         internal static void Menu(string devPath, Device dev)
         {
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Send a SyQuest vendor command to the device:");
-                DicConsole.WriteLine("1.- Send READ (6) command.");
-                DicConsole.WriteLine("2.- Send READ (10) command.");
-                DicConsole.WriteLine("3.- Send READ LONG (6) command.");
-                DicConsole.WriteLine("4.- Send READ LONG (10) command.");
-                DicConsole.WriteLine("5.- Send READ/RESET USAGE COUNTER command.");
-                DicConsole.WriteLine("0.- Return to SCSI commands menu.");
-                DicConsole.Write("Choose: ");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Send a SyQuest vendor command to the device:");
+                AaruConsole.WriteLine("1.- Send READ (6) command.");
+                AaruConsole.WriteLine("2.- Send READ (10) command.");
+                AaruConsole.WriteLine("3.- Send READ LONG (6) command.");
+                AaruConsole.WriteLine("4.- Send READ LONG (10) command.");
+                AaruConsole.WriteLine("5.- Send READ/RESET USAGE COUNTER command.");
+                AaruConsole.WriteLine("0.- Return to SCSI commands menu.");
+                AaruConsole.Write("Choose: ");
 
                 string strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out int item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to SCSI commands menu...");
+                        AaruConsole.WriteLine("Returning to SCSI commands menu...");
+
                         return;
                     case 1:
                         Read6(devPath, dev, false);
+
                         continue;
                     case 2:
                         Read10(devPath, dev, false);
+
                         continue;
                     case 3:
                         Read6(devPath, dev, true);
+
                         continue;
                     case 4:
                         Read10(devPath, dev, true);
+
                         continue;
                     case 5:
                         ReadResetUsageCounter(devPath, dev);
+
                         continue;
                     default:
-                        DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                        AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                         System.Console.ReadKey();
+
                         continue;
                 }
             }
@@ -95,76 +104,87 @@ namespace Aaru.Tests.Devices.SCSI
             int    item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}",                         devPath);
-                DicConsole.WriteLine("Parameters for READ {0}(6) command:", readlong ? "LONG " : "");
-                DicConsole.WriteLine("LBA: {0}",                            lba);
-                DicConsole.WriteLine("{0} blocks to read",                  count == 0 ? 256 : count);
-                DicConsole.WriteLine("{0} bytes expected per block",        blockSize);
-                DicConsole.WriteLine("Inhibit DMA?: {0}",                   noDma);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to SyQuest vendor commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for READ {0}(6) command:", readlong ? "LONG " : "");
+                AaruConsole.WriteLine("LBA: {0}", lba);
+                AaruConsole.WriteLine("{0} blocks to read", count == 0 ? 256 : count);
+                AaruConsole.WriteLine("{0} bytes expected per block", blockSize);
+                AaruConsole.WriteLine("Inhibit DMA?: {0}", noDma);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to SyQuest vendor commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to SyQuest vendor commands menu...");
+                        AaruConsole.WriteLine("Returning to SyQuest vendor commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.Write("LBA?: ");
+                        AaruConsole.Write("LBA?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!uint.TryParse(strDev, out lba))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             lba = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
                         if(lba > 0x1FFFFF)
                         {
-                            DicConsole.WriteLine("Max LBA is {0}, setting to {0}", 0x1FFFFF);
+                            AaruConsole.WriteLine("Max LBA is {0}, setting to {0}", 0x1FFFFF);
                             lba = 0x1FFFFF;
                         }
 
-                        DicConsole.Write("Blocks to read (0 for 256 blocks)?: ");
+                        AaruConsole.Write("Blocks to read (0 for 256 blocks)?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!byte.TryParse(strDev, out count))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             count = 1;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("How many bytes to expect per block?: ");
+                        AaruConsole.Write("How many bytes to expect per block?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!uint.TryParse(strDev, out blockSize))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             blockSize = 512;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Inhibit DMA?: ");
+                        AaruConsole.Write("Inhibit DMA?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out noDma))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             noDma = false;
                             System.Console.ReadKey();
                         }
@@ -176,78 +196,92 @@ namespace Aaru.Tests.Devices.SCSI
 
             start:
             System.Console.Clear();
+
             bool sense = dev.SyQuestRead6(out byte[] buffer, out byte[] senseBuffer, lba, blockSize, count, noDma,
                                           readlong, dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}",                        devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}",       ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",         senseBuffer?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Print sense buffer.");
-            DicConsole.WriteLine("3.- Decode sense buffer.");
-            DicConsole.WriteLine("4.- Send command again.");
-            DicConsole.WriteLine("5.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to SyQuest vendor commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending READ {0}(6) to the device:", readlong ? "LONG " : "");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Print sense buffer.");
+            AaruConsole.WriteLine("3.- Decode sense buffer.");
+            AaruConsole.WriteLine("4.- Send command again.");
+            AaruConsole.WriteLine("5.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to SyQuest vendor commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to SyQuest vendor commands menu...");
+                    AaruConsole.WriteLine("Returning to SyQuest vendor commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}",           devPath);
-                    DicConsole.WriteLine("READ {0}(6) response:", readlong ? "LONG " : "");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ {0}(6) response:", readlong ? "LONG " : "");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}",        devPath);
-                    DicConsole.WriteLine("READ {0}(6) sense:", readlong ? "LONG " : "");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ {0}(6) sense:", readlong ? "LONG " : "");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}",                devPath);
-                    DicConsole.WriteLine("READ {0}(6) decoded sense:", readlong ? "LONG " : "");
-                    DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ {0}(6) decoded sense:", readlong ? "LONG " : "");
+                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 4: goto start;
                 case 5: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -262,70 +296,81 @@ namespace Aaru.Tests.Devices.SCSI
             int    item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}",                          devPath);
-                DicConsole.WriteLine("Parameters for READ {0}(10) command:", readlong ? "LONG " : "");
-                DicConsole.WriteLine("LBA: {0}",                             lba);
-                DicConsole.WriteLine("{0} blocks to read",                   count == 0 ? 256 : count);
-                DicConsole.WriteLine("{0} bytes expected per block",         blockSize);
-                DicConsole.WriteLine("Inhibit DMA?: {0}",                    noDma);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to SyQuest vendor commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for READ {0}(10) command:", readlong ? "LONG " : "");
+                AaruConsole.WriteLine("LBA: {0}", lba);
+                AaruConsole.WriteLine("{0} blocks to read", count == 0 ? 256 : count);
+                AaruConsole.WriteLine("{0} bytes expected per block", blockSize);
+                AaruConsole.WriteLine("Inhibit DMA?: {0}", noDma);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to SyQuest vendor commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to SyQuest vendor commands menu...");
+                        AaruConsole.WriteLine("Returning to SyQuest vendor commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.Write("LBA?: ");
+                        AaruConsole.Write("LBA?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!uint.TryParse(strDev, out lba))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             lba = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Blocks to read (0 for 256 blocks)?: ");
+                        AaruConsole.Write("Blocks to read (0 for 256 blocks)?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!byte.TryParse(strDev, out count))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             count = 1;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("How many bytes to expect per block?: ");
+                        AaruConsole.Write("How many bytes to expect per block?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!uint.TryParse(strDev, out blockSize))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             blockSize = 512;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Inhibit DMA?: ");
+                        AaruConsole.Write("Inhibit DMA?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out noDma))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             noDma = false;
                             System.Console.ReadKey();
                         }
@@ -337,78 +382,92 @@ namespace Aaru.Tests.Devices.SCSI
 
             start:
             System.Console.Clear();
+
             bool sense = dev.SyQuestRead10(out byte[] buffer, out byte[] senseBuffer, lba, blockSize, count, noDma,
                                            readlong, dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}",                         devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}",        ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",          senseBuffer?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Sense buffer is null or empty? {0}",  ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Print sense buffer.");
-            DicConsole.WriteLine("3.- Decode sense buffer.");
-            DicConsole.WriteLine("4.- Send command again.");
-            DicConsole.WriteLine("5.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to SyQuest vendor commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending READ {0}(10) to the device:", readlong ? "LONG " : "");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Print sense buffer.");
+            AaruConsole.WriteLine("3.- Decode sense buffer.");
+            AaruConsole.WriteLine("4.- Send command again.");
+            AaruConsole.WriteLine("5.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to SyQuest vendor commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to SyQuest vendor commands menu...");
+                    AaruConsole.WriteLine("Returning to SyQuest vendor commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}",            devPath);
-                    DicConsole.WriteLine("READ {0}(10) response:", readlong ? "LONG " : "");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ {0}(10) response:", readlong ? "LONG " : "");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}",         devPath);
-                    DicConsole.WriteLine("READ {0}(10) sense:", readlong ? "LONG " : "");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ {0}(10) sense:", readlong ? "LONG " : "");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}",                 devPath);
-                    DicConsole.WriteLine("READ {0}(10) decoded sense:", readlong ? "LONG " : "");
-                    DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ {0}(10) decoded sense:", readlong ? "LONG " : "");
+                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 4: goto start;
                 case 5: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -417,77 +476,91 @@ namespace Aaru.Tests.Devices.SCSI
         {
             start:
             System.Console.Clear();
+
             bool sense =
                 dev.SyQuestReadUsageCounter(out byte[] buffer, out byte[] senseBuffer, dev.Timeout,
                                             out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}",       ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Sense buffer is {0} bytes.",         senseBuffer?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Print sense buffer.");
-            DicConsole.WriteLine("3.- Decode sense buffer.");
-            DicConsole.WriteLine("4.- Send command again.");
-            DicConsole.WriteLine("0.- Return to SyQuest vendor commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending READ/RESET USAGE COUNTER to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Print sense buffer.");
+            AaruConsole.WriteLine("3.- Decode sense buffer.");
+            AaruConsole.WriteLine("4.- Send command again.");
+            AaruConsole.WriteLine("0.- Return to SyQuest vendor commands menu.");
+            AaruConsole.Write("Choose: ");
 
             string strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out int item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to SyQuest vendor commands menu...");
+                    AaruConsole.WriteLine("Returning to SyQuest vendor commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ/RESET USAGE COUNTER response:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ/RESET USAGE COUNTER response:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ/RESET USAGE COUNTER sense:");
-                    if(senseBuffer != null) PrintHex.PrintHexArray(senseBuffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ/RESET USAGE COUNTER sense:");
+
+                    if(senseBuffer != null)
+                        PrintHex.PrintHexArray(senseBuffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("READ/RESET USAGE COUNTER decoded sense:");
-                    DicConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ/RESET USAGE COUNTER decoded sense:");
+                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 4: goto start;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
diff --git a/Aaru.Tests.Devices/SecureDigital.cs b/Aaru.Tests.Devices/SecureDigital.cs
index 1ee6474f7..1792a44ca 100644
--- a/Aaru.Tests.Devices/SecureDigital.cs
+++ b/Aaru.Tests.Devices/SecureDigital.cs
@@ -26,48 +26,54 @@
 // Copyright © 2011-2019 Natalia Portillo
 // ****************************************************************************/
 
-using Aaru.Tests.Devices.SecureDigital;
 using Aaru.Console;
 using Aaru.Devices;
+using Aaru.Tests.Devices.SecureDigital;
 
 namespace Aaru.Tests.Devices
 {
-    static partial class MainClass
+    internal static partial class MainClass
     {
         public static void SecureDigital(string devPath, Device dev)
         {
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Send an SecureDigital/MultiMediaCard command to the device:");
-                DicConsole.WriteLine("1.- Send a SecureDigital command to the device.");
-                DicConsole.WriteLine("2.- Send a MultiMediaCard command to the device.");
-                DicConsole.WriteLine("0.- Return to command class menu.");
-                DicConsole.Write("Choose: ");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Send an SecureDigital/MultiMediaCard command to the device:");
+                AaruConsole.WriteLine("1.- Send a SecureDigital command to the device.");
+                AaruConsole.WriteLine("2.- Send a MultiMediaCard command to the device.");
+                AaruConsole.WriteLine("0.- Return to command class menu.");
+                AaruConsole.Write("Choose: ");
 
                 string strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out int item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to command class menu...");
+                        AaruConsole.WriteLine("Returning to command class menu...");
+
                         return;
                     case 1:
                         Devices.SecureDigital.SecureDigital.Menu(devPath, dev);
+
                         continue;
                     case 2:
                         MultiMediaCard.Menu(devPath, dev);
+
                         continue;
                     default:
-                        DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                        AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                         System.Console.ReadKey();
+
                         continue;
                 }
             }
diff --git a/Aaru.Tests.Devices/SecureDigital/MultiMediaCard.cs b/Aaru.Tests.Devices/SecureDigital/MultiMediaCard.cs
index bc91a6fff..fb9b1cdb2 100644
--- a/Aaru.Tests.Devices/SecureDigital/MultiMediaCard.cs
+++ b/Aaru.Tests.Devices/SecureDigital/MultiMediaCard.cs
@@ -31,66 +31,78 @@ using Aaru.Devices;
 
 namespace Aaru.Tests.Devices.SecureDigital
 {
-    static class MultiMediaCard
+    internal static class MultiMediaCard
     {
         internal static void Menu(string devPath, Device dev)
         {
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Send a MultiMediaCard command to the device:");
-                DicConsole.WriteLine("1.- Send READ_MULTIPLE_BLOCK command.");
-                DicConsole.WriteLine("2.- Send READ_SINGLE_BLOCK command.");
-                DicConsole.WriteLine("3.- Send SEND_CID command.");
-                DicConsole.WriteLine("4.- Send SEND_CSD command.");
-                DicConsole.WriteLine("5.- Send SEND_EXT_CSD command.");
-                DicConsole.WriteLine("6.- Send SEND_OP_COND command.");
-                DicConsole.WriteLine("7.- Send SEND_STATUS command.");
-                DicConsole.WriteLine("8.- Send SET_BLOCKLEN command.");
-                DicConsole.WriteLine("0.- Return to SecureDigital/MultiMediaCard commands menu.");
-                DicConsole.Write("Choose: ");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Send a MultiMediaCard command to the device:");
+                AaruConsole.WriteLine("1.- Send READ_MULTIPLE_BLOCK command.");
+                AaruConsole.WriteLine("2.- Send READ_SINGLE_BLOCK command.");
+                AaruConsole.WriteLine("3.- Send SEND_CID command.");
+                AaruConsole.WriteLine("4.- Send SEND_CSD command.");
+                AaruConsole.WriteLine("5.- Send SEND_EXT_CSD command.");
+                AaruConsole.WriteLine("6.- Send SEND_OP_COND command.");
+                AaruConsole.WriteLine("7.- Send SEND_STATUS command.");
+                AaruConsole.WriteLine("8.- Send SET_BLOCKLEN command.");
+                AaruConsole.WriteLine("0.- Return to SecureDigital/MultiMediaCard commands menu.");
+                AaruConsole.Write("Choose: ");
 
                 string strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out int item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to SecureDigital/MultiMediaCard commands menu...");
+                        AaruConsole.WriteLine("Returning to SecureDigital/MultiMediaCard commands menu...");
+
                         return;
                     case 1:
                         Read(devPath, dev, true);
+
                         continue;
                     case 2:
                         Read(devPath, dev, false);
+
                         continue;
                     case 3:
                         SendCid(devPath, dev);
+
                         continue;
                     case 4:
                         SendCsd(devPath, dev);
+
                         continue;
                     case 5:
                         SendExtendedCsd(devPath, dev);
+
                         continue;
                     case 6:
                         SendOpCond(devPath, dev);
+
                         continue;
                     case 7:
                         Status(devPath, dev);
+
                         continue;
                     case 8:
                         SetBlockLength(devPath, dev);
+
                         continue;
                     default:
-                        DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                        AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                         System.Console.ReadKey();
+
                         continue;
                 }
             }
@@ -106,72 +118,86 @@ namespace Aaru.Tests.Devices.SecureDigital
             int    item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}",                            devPath);
-                DicConsole.WriteLine("Parameters for READ_{0}_BLOCK command:", multiple ? "MULTIPLE" : "SINGLE");
-                DicConsole.WriteLine("Read from {1}: {0}",                     address, byteAddr ? "byte" : "block");
-                DicConsole.WriteLine("Expected block size: {0} bytes",         blockSize);
-                if(multiple) DicConsole.WriteLine("Will read {0} blocks", count);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to MultiMediaCard commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for READ_{0}_BLOCK command:", multiple ? "MULTIPLE" : "SINGLE");
+                AaruConsole.WriteLine("Read from {1}: {0}", address, byteAddr ? "byte" : "block");
+                AaruConsole.WriteLine("Expected block size: {0} bytes", blockSize);
+
+                if(multiple)
+                    AaruConsole.WriteLine("Will read {0} blocks", count);
+
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to MultiMediaCard commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to MultiMediaCard commands menu...");
+                        AaruConsole.WriteLine("Returning to MultiMediaCard commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.Write("Use byte addressing?: ");
+                        AaruConsole.Write("Use byte addressing?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out byteAddr))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             byteAddr = false;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Read from {0}?: ", byteAddr ? "byte" : "block");
+                        AaruConsole.Write("Read from {0}?: ", byteAddr ? "byte" : "block");
                         strDev = System.Console.ReadLine();
+
                         if(!uint.TryParse(strDev, out address))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             address = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
                         if(multiple)
                         {
-                            DicConsole.Write("How many blocks to read?");
+                            AaruConsole.Write("How many blocks to read?");
                             strDev = System.Console.ReadLine();
+
                             if(!uint.TryParse(strDev, out count))
                             {
-                                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                                 count = 1;
                                 System.Console.ReadKey();
+
                                 continue;
                             }
                         }
 
-                        DicConsole.Write("How many bytes to expect in a block?");
+                        AaruConsole.Write("How many bytes to expect in a block?");
                         strDev = System.Console.ReadLine();
+
                         if(!uint.TryParse(strDev, out blockSize))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             blockSize = 512;
                             System.Console.ReadKey();
                         }
@@ -183,72 +209,84 @@ namespace Aaru.Tests.Devices.SecureDigital
 
             start:
             System.Console.Clear();
+
             bool sense = dev.Read(out byte[] buffer, out uint[] response, address, blockSize, multiple ? count : 1,
                                   byteAddr, dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}",                           devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}",          ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Response has {0} elements.",            response?.Length.ToString() ?? "null");
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Print response buffer.");
-            DicConsole.WriteLine("3.- Send command again.");
-            DicConsole.WriteLine("4.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to MultiMediaCard commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending READ_{0}_BLOCK to the device:", multiple ? "MULTIPLE" : "SINGLE");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine("Response has {0} elements.", response?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Print response buffer.");
+            AaruConsole.WriteLine("3.- Send command again.");
+            AaruConsole.WriteLine("4.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to MultiMediaCard commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to MultiMediaCard commands menu...");
+                    AaruConsole.WriteLine("Returning to MultiMediaCard commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}",            devPath);
-                    DicConsole.WriteLine("READ_{0}_BLOCK buffer:", multiple ? "MULTIPLE" : "SINGLE");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ_{0}_BLOCK buffer:", multiple ? "MULTIPLE" : "SINGLE");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}",              devPath);
-                    DicConsole.WriteLine("READ_{0}_BLOCK response:", multiple ? "MULTIPLE" : "SINGLE");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ_{0}_BLOCK response:", multiple ? "MULTIPLE" : "SINGLE");
+
                     if(response != null)
                     {
-                        foreach(uint res in response) DicConsole.Write("0x{0:x8} ", res);
+                        foreach(uint res in response)
+                            AaruConsole.Write("0x{0:x8} ", res);
 
-                        DicConsole.WriteLine();
+                        AaruConsole.WriteLine();
                     }
 
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3: goto start;
                 case 4: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -260,77 +298,92 @@ namespace Aaru.Tests.Devices.SecureDigital
             bool sense = dev.ReadOcr(out byte[] buffer, out uint[] response, dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Response has {0} elements.",   response?.Length.ToString() ?? "null");
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Decode buffer.");
-            DicConsole.WriteLine("3.- Print response buffer.");
-            DicConsole.WriteLine("4.- Send command again.");
-            DicConsole.WriteLine("0.- Return to MultiMediaCard commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending SEND_OP_COND to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine("Response has {0} elements.", response?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Decode buffer.");
+            AaruConsole.WriteLine("3.- Print response buffer.");
+            AaruConsole.WriteLine("4.- Send command again.");
+            AaruConsole.WriteLine("0.- Return to MultiMediaCard commands menu.");
+            AaruConsole.Write("Choose: ");
 
             string strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out int item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to MultiMediaCard commands menu...");
+                    AaruConsole.WriteLine("Returning to MultiMediaCard commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("SEND_OP_COND buffer:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("SEND_OP_COND buffer:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("SEND_OP_COND decoded buffer:");
-                    if(buffer != null) DicConsole.WriteLine("{0}", Decoders.MMC.Decoders.PrettifyOCR(buffer));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("SEND_OP_COND decoded buffer:");
+
+                    if(buffer != null)
+                        AaruConsole.WriteLine("{0}", Decoders.MMC.Decoders.PrettifyOCR(buffer));
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("SEND_OP_COND response:");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("SEND_OP_COND response:");
+
                     if(response != null)
                     {
-                        foreach(uint res in response) DicConsole.Write("0x{0:x8} ", res);
+                        foreach(uint res in response)
+                            AaruConsole.Write("0x{0:x8} ", res);
 
-                        DicConsole.WriteLine();
+                        AaruConsole.WriteLine();
                     }
 
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 4: goto start;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -342,66 +395,77 @@ namespace Aaru.Tests.Devices.SecureDigital
             bool sense = dev.ReadSdStatus(out byte[] buffer, out uint[] response, dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Response has {0} elements.",   response?.Length.ToString() ?? "null");
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Print response buffer.");
-            DicConsole.WriteLine("3.- Send command again.");
-            DicConsole.WriteLine("0.- Return to MultiMediaCard commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending SEND_STATUS to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine("Response has {0} elements.", response?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Print response buffer.");
+            AaruConsole.WriteLine("3.- Send command again.");
+            AaruConsole.WriteLine("0.- Return to MultiMediaCard commands menu.");
+            AaruConsole.Write("Choose: ");
 
             string strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out int item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to MultiMediaCard commands menu...");
+                    AaruConsole.WriteLine("Returning to MultiMediaCard commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("SEND_STATUS buffer:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("SEND_STATUS buffer:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("SEND_STATUS response:");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("SEND_STATUS response:");
+
                     if(response != null)
                     {
-                        foreach(uint res in response) DicConsole.Write("0x{0:x8} ", res);
+                        foreach(uint res in response)
+                            AaruConsole.Write("0x{0:x8} ", res);
 
-                        DicConsole.WriteLine();
+                        AaruConsole.WriteLine();
                     }
 
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3: goto start;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -413,77 +477,92 @@ namespace Aaru.Tests.Devices.SecureDigital
             bool sense = dev.ReadCid(out byte[] buffer, out uint[] response, dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Response has {0} elements.",   response?.Length.ToString() ?? "null");
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Decode buffer.");
-            DicConsole.WriteLine("3.- Print response buffer.");
-            DicConsole.WriteLine("4.- Send command again.");
-            DicConsole.WriteLine("0.- Return to MultiMediaCard commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending SEND_CID to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine("Response has {0} elements.", response?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Decode buffer.");
+            AaruConsole.WriteLine("3.- Print response buffer.");
+            AaruConsole.WriteLine("4.- Send command again.");
+            AaruConsole.WriteLine("0.- Return to MultiMediaCard commands menu.");
+            AaruConsole.Write("Choose: ");
 
             string strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out int item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to MultiMediaCard commands menu...");
+                    AaruConsole.WriteLine("Returning to MultiMediaCard commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("SEND_CID buffer:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("SEND_CID buffer:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("SEND_CID decoded buffer:");
-                    if(buffer != null) DicConsole.WriteLine("{0}", Decoders.MMC.Decoders.PrettifyCID(buffer));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("SEND_CID decoded buffer:");
+
+                    if(buffer != null)
+                        AaruConsole.WriteLine("{0}", Decoders.MMC.Decoders.PrettifyCID(buffer));
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("SEND_CID response:");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("SEND_CID response:");
+
                     if(response != null)
                     {
-                        foreach(uint res in response) DicConsole.Write("0x{0:x8} ", res);
+                        foreach(uint res in response)
+                            AaruConsole.Write("0x{0:x8} ", res);
 
-                        DicConsole.WriteLine();
+                        AaruConsole.WriteLine();
                     }
 
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 4: goto start;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -495,77 +574,92 @@ namespace Aaru.Tests.Devices.SecureDigital
             bool sense = dev.ReadCsd(out byte[] buffer, out uint[] response, dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Response has {0} elements.",   response?.Length.ToString() ?? "null");
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Decode buffer.");
-            DicConsole.WriteLine("3.- Print response buffer.");
-            DicConsole.WriteLine("4.- Send command again.");
-            DicConsole.WriteLine("0.- Return to MultiMediaCard commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending SEND_CSD to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine("Response has {0} elements.", response?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Decode buffer.");
+            AaruConsole.WriteLine("3.- Print response buffer.");
+            AaruConsole.WriteLine("4.- Send command again.");
+            AaruConsole.WriteLine("0.- Return to MultiMediaCard commands menu.");
+            AaruConsole.Write("Choose: ");
 
             string strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out int item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to MultiMediaCard commands menu...");
+                    AaruConsole.WriteLine("Returning to MultiMediaCard commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("SEND_CSD buffer:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("SEND_CSD buffer:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("SEND_CSD decoded buffer:");
-                    if(buffer != null) DicConsole.WriteLine("{0}", Decoders.MMC.Decoders.PrettifyCSD(buffer));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("SEND_CSD decoded buffer:");
+
+                    if(buffer != null)
+                        AaruConsole.WriteLine("{0}", Decoders.MMC.Decoders.PrettifyCSD(buffer));
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("SEND_CSD response:");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("SEND_CSD response:");
+
                     if(response != null)
                     {
-                        foreach(uint res in response) DicConsole.Write("0x{0:x8} ", res);
+                        foreach(uint res in response)
+                            AaruConsole.Write("0x{0:x8} ", res);
 
-                        DicConsole.WriteLine();
+                        AaruConsole.WriteLine();
                     }
 
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 4: goto start;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -577,77 +671,92 @@ namespace Aaru.Tests.Devices.SecureDigital
             bool sense = dev.ReadExtendedCsd(out byte[] buffer, out uint[] response, dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Response has {0} elements.",   response?.Length.ToString() ?? "null");
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Decode buffer.");
-            DicConsole.WriteLine("3.- Print response buffer.");
-            DicConsole.WriteLine("4.- Send command again.");
-            DicConsole.WriteLine("0.- Return to MultiMediaCard commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending SEND_EXT_CSD to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine("Response has {0} elements.", response?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Decode buffer.");
+            AaruConsole.WriteLine("3.- Print response buffer.");
+            AaruConsole.WriteLine("4.- Send command again.");
+            AaruConsole.WriteLine("0.- Return to MultiMediaCard commands menu.");
+            AaruConsole.Write("Choose: ");
 
             string strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out int item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to MultiMediaCard commands menu...");
+                    AaruConsole.WriteLine("Returning to MultiMediaCard commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("SEND_EXT_CSD buffer:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("SEND_EXT_CSD buffer:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("SEND_EXT_CSD decoded buffer:");
-                    if(buffer != null) DicConsole.WriteLine("{0}", Decoders.MMC.Decoders.PrettifyExtendedCSD(buffer));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("SEND_EXT_CSD decoded buffer:");
+
+                    if(buffer != null)
+                        AaruConsole.WriteLine("{0}", Decoders.MMC.Decoders.PrettifyExtendedCSD(buffer));
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("SEND_EXT_CSD response:");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("SEND_EXT_CSD response:");
+
                     if(response != null)
                     {
-                        foreach(uint res in response) DicConsole.Write("0x{0:x8} ", res);
+                        foreach(uint res in response)
+                            AaruConsole.Write("0x{0:x8} ", res);
 
-                        DicConsole.WriteLine();
+                        AaruConsole.WriteLine();
                     }
 
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 4: goto start;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -659,37 +768,42 @@ namespace Aaru.Tests.Devices.SecureDigital
             int    item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Parameters for SET_BLOCKLEN command:");
-                DicConsole.WriteLine("Set block length to: {0} bytes", blockSize);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to MultiMediaCard commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for SET_BLOCKLEN command:");
+                AaruConsole.WriteLine("Set block length to: {0} bytes", blockSize);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to MultiMediaCard commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to MultiMediaCard commands menu...");
+                        AaruConsole.WriteLine("Returning to MultiMediaCard commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.Write("Set block length to?");
+                        AaruConsole.Write("Set block length to?");
                         strDev = System.Console.ReadLine();
+
                         if(!uint.TryParse(strDev, out blockSize))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             blockSize = 512;
                             System.Console.ReadKey();
                         }
@@ -704,46 +818,52 @@ namespace Aaru.Tests.Devices.SecureDigital
             bool sense = dev.SetBlockLength(blockSize, out uint[] response, dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("SET_BLOCKLEN response:");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending SET_BLOCKLEN to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Response has {0} elements.", response?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("SET_BLOCKLEN response:");
+
             if(response != null)
             {
-                foreach(uint res in response) DicConsole.Write("0x{0:x8} ", res);
+                foreach(uint res in response)
+                    AaruConsole.Write("0x{0:x8} ", res);
 
-                DicConsole.WriteLine();
+                AaruConsole.WriteLine();
             }
 
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Send command again.");
-            DicConsole.WriteLine("2.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to MultiMediaCard commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Send command again.");
+            AaruConsole.WriteLine("2.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to MultiMediaCard commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to MultiMediaCard commands menu...");
+                    AaruConsole.WriteLine("Returning to MultiMediaCard commands menu...");
+
                     return;
                 case 1: goto start;
                 case 2: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
diff --git a/Aaru.Tests.Devices/SecureDigital/SecureDigital.cs b/Aaru.Tests.Devices/SecureDigital/SecureDigital.cs
index 926d85f3d..a772ee76c 100644
--- a/Aaru.Tests.Devices/SecureDigital/SecureDigital.cs
+++ b/Aaru.Tests.Devices/SecureDigital/SecureDigital.cs
@@ -31,66 +31,78 @@ using Aaru.Devices;
 
 namespace Aaru.Tests.Devices.SecureDigital
 {
-    static class SecureDigital
+    internal static class SecureDigital
     {
         internal static void Menu(string devPath, Device dev)
         {
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Send a SecureDigital command to the device:");
-                DicConsole.WriteLine("1.- Send READ_MULTIPLE_BLOCK command.");
-                DicConsole.WriteLine("2.- Send READ_SINGLE_BLOCK command.");
-                DicConsole.WriteLine("3.- Send SD_SEND_OP_COND command.");
-                DicConsole.WriteLine("4.- Send SD_STATUS command.");
-                DicConsole.WriteLine("5.- Send SEND_CID command.");
-                DicConsole.WriteLine("6.- Send SEND_CSD command.");
-                DicConsole.WriteLine("7.- Send SEND_SCR command.");
-                DicConsole.WriteLine("8.- Send SET_BLOCKLEN command.");
-                DicConsole.WriteLine("0.- Return to SecureDigital/MultiMediaCard commands menu.");
-                DicConsole.Write("Choose: ");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Send a SecureDigital command to the device:");
+                AaruConsole.WriteLine("1.- Send READ_MULTIPLE_BLOCK command.");
+                AaruConsole.WriteLine("2.- Send READ_SINGLE_BLOCK command.");
+                AaruConsole.WriteLine("3.- Send SD_SEND_OP_COND command.");
+                AaruConsole.WriteLine("4.- Send SD_STATUS command.");
+                AaruConsole.WriteLine("5.- Send SEND_CID command.");
+                AaruConsole.WriteLine("6.- Send SEND_CSD command.");
+                AaruConsole.WriteLine("7.- Send SEND_SCR command.");
+                AaruConsole.WriteLine("8.- Send SET_BLOCKLEN command.");
+                AaruConsole.WriteLine("0.- Return to SecureDigital/MultiMediaCard commands menu.");
+                AaruConsole.Write("Choose: ");
 
                 string strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out int item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to SecureDigital/MultiMediaCard commands menu...");
+                        AaruConsole.WriteLine("Returning to SecureDigital/MultiMediaCard commands menu...");
+
                         return;
                     case 1:
                         Read(devPath, dev, true);
+
                         continue;
                     case 2:
                         Read(devPath, dev, false);
+
                         continue;
                     case 3:
                         SendOpCond(devPath, dev);
+
                         continue;
                     case 4:
                         Status(devPath, dev);
+
                         continue;
                     case 5:
                         SendCid(devPath, dev);
+
                         continue;
                     case 6:
                         SendCsd(devPath, dev);
+
                         continue;
                     case 7:
                         SendScr(devPath, dev);
+
                         continue;
                     case 8:
                         SetBlockLength(devPath, dev);
+
                         continue;
                     default:
-                        DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                        AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                         System.Console.ReadKey();
+
                         continue;
                 }
             }
@@ -106,72 +118,86 @@ namespace Aaru.Tests.Devices.SecureDigital
             int    item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}",                            devPath);
-                DicConsole.WriteLine("Parameters for READ_{0}_BLOCK command:", multiple ? "MULTIPLE" : "SINGLE");
-                DicConsole.WriteLine("Read from {1}: {0}",                     address, byteAddr ? "byte" : "block");
-                DicConsole.WriteLine("Expected block size: {0} bytes",         blockSize);
-                if(multiple) DicConsole.WriteLine("Will read {0} blocks", count);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to SecureDigital commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for READ_{0}_BLOCK command:", multiple ? "MULTIPLE" : "SINGLE");
+                AaruConsole.WriteLine("Read from {1}: {0}", address, byteAddr ? "byte" : "block");
+                AaruConsole.WriteLine("Expected block size: {0} bytes", blockSize);
+
+                if(multiple)
+                    AaruConsole.WriteLine("Will read {0} blocks", count);
+
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to SecureDigital commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to SecureDigital commands menu...");
+                        AaruConsole.WriteLine("Returning to SecureDigital commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.Write("Use byte addressing?: ");
+                        AaruConsole.Write("Use byte addressing?: ");
                         strDev = System.Console.ReadLine();
+
                         if(!bool.TryParse(strDev, out byteAddr))
                         {
-                            DicConsole.WriteLine("Not a boolean. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
                             byteAddr = false;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
-                        DicConsole.Write("Read from {0}?: ", byteAddr ? "byte" : "block");
+                        AaruConsole.Write("Read from {0}?: ", byteAddr ? "byte" : "block");
                         strDev = System.Console.ReadLine();
+
                         if(!uint.TryParse(strDev, out address))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             address = 0;
                             System.Console.ReadKey();
+
                             continue;
                         }
 
                         if(multiple)
                         {
-                            DicConsole.Write("How many blocks to read?");
+                            AaruConsole.Write("How many blocks to read?");
                             strDev = System.Console.ReadLine();
+
                             if(!uint.TryParse(strDev, out count))
                             {
-                                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                                 count = 1;
                                 System.Console.ReadKey();
+
                                 continue;
                             }
                         }
 
-                        DicConsole.Write("How many bytes to expect in a block?");
+                        AaruConsole.Write("How many bytes to expect in a block?");
                         strDev = System.Console.ReadLine();
+
                         if(!uint.TryParse(strDev, out blockSize))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             blockSize = 512;
                             System.Console.ReadKey();
                         }
@@ -183,72 +209,84 @@ namespace Aaru.Tests.Devices.SecureDigital
 
             start:
             System.Console.Clear();
+
             bool sense = dev.Read(out byte[] buffer, out uint[] response, address, blockSize, multiple ? count : 1,
                                   byteAddr, dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}",                           devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}",          ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Response has {0} elements.",            response?.Length.ToString() ?? "null");
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Print response buffer.");
-            DicConsole.WriteLine("3.- Send command again.");
-            DicConsole.WriteLine("4.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to SecureDigital commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending READ_{0}_BLOCK to the device:", multiple ? "MULTIPLE" : "SINGLE");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine("Response has {0} elements.", response?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Print response buffer.");
+            AaruConsole.WriteLine("3.- Send command again.");
+            AaruConsole.WriteLine("4.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to SecureDigital commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to SecureDigital commands menu...");
+                    AaruConsole.WriteLine("Returning to SecureDigital commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}",            devPath);
-                    DicConsole.WriteLine("READ_{0}_BLOCK buffer:", multiple ? "MULTIPLE" : "SINGLE");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ_{0}_BLOCK buffer:", multiple ? "MULTIPLE" : "SINGLE");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}",              devPath);
-                    DicConsole.WriteLine("READ_{0}_BLOCK response:", multiple ? "MULTIPLE" : "SINGLE");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("READ_{0}_BLOCK response:", multiple ? "MULTIPLE" : "SINGLE");
+
                     if(response != null)
                     {
-                        foreach(uint res in response) DicConsole.Write("0x{0:x8} ", res);
+                        foreach(uint res in response)
+                            AaruConsole.Write("0x{0:x8} ", res);
 
-                        DicConsole.WriteLine();
+                        AaruConsole.WriteLine();
                     }
 
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3: goto start;
                 case 4: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -260,77 +298,92 @@ namespace Aaru.Tests.Devices.SecureDigital
             bool sense = dev.ReadSdocr(out byte[] buffer, out uint[] response, dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Response has {0} elements.",   response?.Length.ToString() ?? "null");
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Decode buffer.");
-            DicConsole.WriteLine("3.- Print response buffer.");
-            DicConsole.WriteLine("4.- Send command again.");
-            DicConsole.WriteLine("0.- Return to SecureDigital commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending SD_SEND_OP_COND to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine("Response has {0} elements.", response?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Decode buffer.");
+            AaruConsole.WriteLine("3.- Print response buffer.");
+            AaruConsole.WriteLine("4.- Send command again.");
+            AaruConsole.WriteLine("0.- Return to SecureDigital commands menu.");
+            AaruConsole.Write("Choose: ");
 
             string strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out int item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to SecureDigital commands menu...");
+                    AaruConsole.WriteLine("Returning to SecureDigital commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("SD_SEND_OP_COND buffer:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("SD_SEND_OP_COND buffer:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("SD_SEND_OP_COND decoded buffer:");
-                    if(buffer != null) DicConsole.WriteLine("{0}", Decoders.SecureDigital.Decoders.PrettifyOCR(buffer));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("SD_SEND_OP_COND decoded buffer:");
+
+                    if(buffer != null)
+                        AaruConsole.WriteLine("{0}", Decoders.SecureDigital.Decoders.PrettifyOCR(buffer));
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("SD_SEND_OP_COND response:");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("SD_SEND_OP_COND response:");
+
                     if(response != null)
                     {
-                        foreach(uint res in response) DicConsole.Write("0x{0:x8} ", res);
+                        foreach(uint res in response)
+                            AaruConsole.Write("0x{0:x8} ", res);
 
-                        DicConsole.WriteLine();
+                        AaruConsole.WriteLine();
                     }
 
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 4: goto start;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -342,66 +395,77 @@ namespace Aaru.Tests.Devices.SecureDigital
             bool sense = dev.ReadSdStatus(out byte[] buffer, out uint[] response, dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Response has {0} elements.",   response?.Length.ToString() ?? "null");
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Print response buffer.");
-            DicConsole.WriteLine("3.- Send command again.");
-            DicConsole.WriteLine("0.- Return to SecureDigital commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending SD_STATUS to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine("Response has {0} elements.", response?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Print response buffer.");
+            AaruConsole.WriteLine("3.- Send command again.");
+            AaruConsole.WriteLine("0.- Return to SecureDigital commands menu.");
+            AaruConsole.Write("Choose: ");
 
             string strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out int item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to SecureDigital commands menu...");
+                    AaruConsole.WriteLine("Returning to SecureDigital commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("SD_STATUS buffer:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("SD_STATUS buffer:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("SD_STATUS response:");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("SD_STATUS response:");
+
                     if(response != null)
                     {
-                        foreach(uint res in response) DicConsole.Write("0x{0:x8} ", res);
+                        foreach(uint res in response)
+                            AaruConsole.Write("0x{0:x8} ", res);
 
-                        DicConsole.WriteLine();
+                        AaruConsole.WriteLine();
                     }
 
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3: goto start;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -413,77 +477,92 @@ namespace Aaru.Tests.Devices.SecureDigital
             bool sense = dev.ReadCid(out byte[] buffer, out uint[] response, dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Response has {0} elements.",   response?.Length.ToString() ?? "null");
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Decode buffer.");
-            DicConsole.WriteLine("3.- Print response buffer.");
-            DicConsole.WriteLine("4.- Send command again.");
-            DicConsole.WriteLine("0.- Return to SecureDigital commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending SEND_CID to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine("Response has {0} elements.", response?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Decode buffer.");
+            AaruConsole.WriteLine("3.- Print response buffer.");
+            AaruConsole.WriteLine("4.- Send command again.");
+            AaruConsole.WriteLine("0.- Return to SecureDigital commands menu.");
+            AaruConsole.Write("Choose: ");
 
             string strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out int item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to SecureDigital commands menu...");
+                    AaruConsole.WriteLine("Returning to SecureDigital commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("SEND_CID buffer:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("SEND_CID buffer:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("SEND_CID decoded buffer:");
-                    if(buffer != null) DicConsole.WriteLine("{0}", Decoders.SecureDigital.Decoders.PrettifyCID(buffer));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("SEND_CID decoded buffer:");
+
+                    if(buffer != null)
+                        AaruConsole.WriteLine("{0}", Decoders.SecureDigital.Decoders.PrettifyCID(buffer));
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("SEND_CID response:");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("SEND_CID response:");
+
                     if(response != null)
                     {
-                        foreach(uint res in response) DicConsole.Write("0x{0:x8} ", res);
+                        foreach(uint res in response)
+                            AaruConsole.Write("0x{0:x8} ", res);
 
-                        DicConsole.WriteLine();
+                        AaruConsole.WriteLine();
                     }
 
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 4: goto start;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -495,77 +574,92 @@ namespace Aaru.Tests.Devices.SecureDigital
             bool sense = dev.ReadCsd(out byte[] buffer, out uint[] response, dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Response has {0} elements.",   response?.Length.ToString() ?? "null");
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Decode buffer.");
-            DicConsole.WriteLine("3.- Print response buffer.");
-            DicConsole.WriteLine("4.- Send command again.");
-            DicConsole.WriteLine("0.- Return to SecureDigital commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending SEND_CSD to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine("Response has {0} elements.", response?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Decode buffer.");
+            AaruConsole.WriteLine("3.- Print response buffer.");
+            AaruConsole.WriteLine("4.- Send command again.");
+            AaruConsole.WriteLine("0.- Return to SecureDigital commands menu.");
+            AaruConsole.Write("Choose: ");
 
             string strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out int item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to SecureDigital commands menu...");
+                    AaruConsole.WriteLine("Returning to SecureDigital commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("SEND_CSD buffer:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("SEND_CSD buffer:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("SEND_CSD decoded buffer:");
-                    if(buffer != null) DicConsole.WriteLine("{0}", Decoders.SecureDigital.Decoders.PrettifyCSD(buffer));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("SEND_CSD decoded buffer:");
+
+                    if(buffer != null)
+                        AaruConsole.WriteLine("{0}", Decoders.SecureDigital.Decoders.PrettifyCSD(buffer));
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("SEND_CSD response:");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("SEND_CSD response:");
+
                     if(response != null)
                     {
-                        foreach(uint res in response) DicConsole.Write("0x{0:x8} ", res);
+                        foreach(uint res in response)
+                            AaruConsole.Write("0x{0:x8} ", res);
 
-                        DicConsole.WriteLine();
+                        AaruConsole.WriteLine();
                     }
 
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 4: goto start;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -577,77 +671,92 @@ namespace Aaru.Tests.Devices.SecureDigital
             bool sense = dev.ReadScr(out byte[] buffer, out uint[] response, dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            DicConsole.WriteLine("Response has {0} elements.",   response?.Length.ToString() ?? "null");
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Print buffer.");
-            DicConsole.WriteLine("2.- Decode buffer.");
-            DicConsole.WriteLine("3.- Print response buffer.");
-            DicConsole.WriteLine("4.- Send command again.");
-            DicConsole.WriteLine("0.- Return to SecureDigital commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending SEND_SCR to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+            AaruConsole.WriteLine("Response has {0} elements.", response?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Print buffer.");
+            AaruConsole.WriteLine("2.- Decode buffer.");
+            AaruConsole.WriteLine("3.- Print response buffer.");
+            AaruConsole.WriteLine("4.- Send command again.");
+            AaruConsole.WriteLine("0.- Return to SecureDigital commands menu.");
+            AaruConsole.Write("Choose: ");
 
             string strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out int item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to SecureDigital commands menu...");
+                    AaruConsole.WriteLine("Returning to SecureDigital commands menu...");
+
                     return;
                 case 1:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("SEND_SCR buffer:");
-                    if(buffer != null) PrintHex.PrintHexArray(buffer, 64);
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("SEND_SCR buffer:");
+
+                    if(buffer != null)
+                        PrintHex.PrintHexArray(buffer, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 2:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("SEND_SCR decoded buffer:");
-                    if(buffer != null) DicConsole.WriteLine("{0}", Decoders.SecureDigital.Decoders.PrettifySCR(buffer));
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("SEND_SCR decoded buffer:");
+
+                    if(buffer != null)
+                        AaruConsole.WriteLine("{0}", Decoders.SecureDigital.Decoders.PrettifySCR(buffer));
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 3:
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
-                    DicConsole.WriteLine("SEND_SCR response:");
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("SEND_SCR response:");
+
                     if(response != null)
                     {
-                        foreach(uint res in response) DicConsole.Write("0x{0:x8} ", res);
+                        foreach(uint res in response)
+                            AaruConsole.Write("0x{0:x8} ", res);
 
-                        DicConsole.WriteLine();
+                        AaruConsole.WriteLine();
                     }
 
-                    DicConsole.WriteLine("Press any key to continue...");
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
-                    DicConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+
                     goto menu;
                 case 4: goto start;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
@@ -659,37 +768,42 @@ namespace Aaru.Tests.Devices.SecureDigital
             int    item;
 
             parameters:
+
             while(true)
             {
                 System.Console.Clear();
-                DicConsole.WriteLine("Device: {0}", devPath);
-                DicConsole.WriteLine("Parameters for SET_BLOCKLEN command:");
-                DicConsole.WriteLine("Set block length to: {0} bytes", blockSize);
-                DicConsole.WriteLine();
-                DicConsole.WriteLine("Choose what to do:");
-                DicConsole.WriteLine("1.- Change parameters.");
-                DicConsole.WriteLine("2.- Send command with these parameters.");
-                DicConsole.WriteLine("0.- Return to SecureDigital commands menu.");
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("Parameters for SET_BLOCKLEN command:");
+                AaruConsole.WriteLine("Set block length to: {0} bytes", blockSize);
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Choose what to do:");
+                AaruConsole.WriteLine("1.- Change parameters.");
+                AaruConsole.WriteLine("2.- Send command with these parameters.");
+                AaruConsole.WriteLine("0.- Return to SecureDigital commands menu.");
 
                 strDev = System.Console.ReadLine();
+
                 if(!int.TryParse(strDev, out item))
                 {
-                    DicConsole.WriteLine("Not a number. Press any key to continue...");
+                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
                     System.Console.ReadKey();
+
                     continue;
                 }
 
                 switch(item)
                 {
                     case 0:
-                        DicConsole.WriteLine("Returning to SecureDigital commands menu...");
+                        AaruConsole.WriteLine("Returning to SecureDigital commands menu...");
+
                         return;
                     case 1:
-                        DicConsole.Write("Set block length to?");
+                        AaruConsole.Write("Set block length to?");
                         strDev = System.Console.ReadLine();
+
                         if(!uint.TryParse(strDev, out blockSize))
                         {
-                            DicConsole.WriteLine("Not a number. Press any key to continue...");
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
                             blockSize = 512;
                             System.Console.ReadKey();
                         }
@@ -704,46 +818,52 @@ namespace Aaru.Tests.Devices.SecureDigital
             bool sense = dev.SetBlockLength(blockSize, out uint[] response, dev.Timeout, out double duration);
 
             menu:
-            DicConsole.WriteLine("Device: {0}", devPath);
-            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?.Length.ToString() ?? "null");
-            DicConsole.WriteLine("SET_BLOCKLEN response:");
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Sending SET_BLOCKLEN to the device:");
+            AaruConsole.WriteLine("Command took {0} ms.", duration);
+            AaruConsole.WriteLine("Sense is {0}.", sense);
+            AaruConsole.WriteLine("Response has {0} elements.", response?.Length.ToString() ?? "null");
+            AaruConsole.WriteLine("SET_BLOCKLEN response:");
+
             if(response != null)
             {
-                foreach(uint res in response) DicConsole.Write("0x{0:x8} ", res);
+                foreach(uint res in response)
+                    AaruConsole.Write("0x{0:x8} ", res);
 
-                DicConsole.WriteLine();
+                AaruConsole.WriteLine();
             }
 
-            DicConsole.WriteLine();
-            DicConsole.WriteLine("Choose what to do:");
-            DicConsole.WriteLine("1.- Send command again.");
-            DicConsole.WriteLine("2.- Change parameters.");
-            DicConsole.WriteLine("0.- Return to SecureDigital commands menu.");
-            DicConsole.Write("Choose: ");
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Send command again.");
+            AaruConsole.WriteLine("2.- Change parameters.");
+            AaruConsole.WriteLine("0.- Return to SecureDigital commands menu.");
+            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
+
             if(!int.TryParse(strDev, out item))
             {
-                DicConsole.WriteLine("Not a number. Press any key to continue...");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
+
                 goto menu;
             }
 
             switch(item)
             {
                 case 0:
-                    DicConsole.WriteLine("Returning to SecureDigital commands menu...");
+                    AaruConsole.WriteLine("Returning to SecureDigital commands menu...");
+
                     return;
                 case 1: goto start;
                 case 2: goto parameters;
                 default:
-                    DicConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
                     System.Console.Clear();
+
                     goto menu;
             }
         }
diff --git a/Aaru.Tests/Checksums/Adler32.cs b/Aaru.Tests/Checksums/Adler32.cs
index c57b03e6e..84b122b83 100644
--- a/Aaru.Tests/Checksums/Adler32.cs
+++ b/Aaru.Tests/Checksums/Adler32.cs
@@ -36,8 +36,29 @@ namespace Aaru.Tests.Checksums
     [TestFixture]
     public class Adler32
     {
-        static readonly byte[] ExpectedEmpty  = {0x00, 0xf0, 0x00, 0x01};
-        static readonly byte[] ExpectedRandom = {0x37, 0x28, 0xd1, 0x86};
+        static readonly byte[] ExpectedEmpty =
+        {
+            0x00, 0xf0, 0x00, 0x01
+        };
+        static readonly byte[] ExpectedRandom =
+        {
+            0x37, 0x28, 0xd1, 0x86
+        };
+
+        [Test]
+        public void Adler32EmptyData()
+        {
+            byte[] data = new byte[1048576];
+
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "empty"), FileMode.Open,
+                                    FileAccess.Read);
+
+            fs.Read(data, 0, 1048576);
+            fs.Close();
+            fs.Dispose();
+            Adler32Context.Data(data, out byte[] result);
+            Assert.AreEqual(ExpectedEmpty, result);
+        }
 
         [Test]
         public void Adler32EmptyFile()
@@ -46,25 +67,14 @@ namespace Aaru.Tests.Checksums
             Assert.AreEqual(ExpectedEmpty, result);
         }
 
-        [Test]
-        public void Adler32EmptyData()
-        {
-            byte[] data = new byte[1048576];
-            FileStream fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "empty"), FileMode.Open,
-                                           FileAccess.Read);
-            fs.Read(data, 0, 1048576);
-            fs.Close();
-            fs.Dispose();
-            Adler32Context.Data(data, out byte[] result);
-            Assert.AreEqual(ExpectedEmpty, result);
-        }
-
         [Test]
         public void Adler32EmptyInstance()
         {
             byte[] data = new byte[1048576];
-            FileStream fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "empty"), FileMode.Open,
-                                           FileAccess.Read);
+
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "empty"), FileMode.Open,
+                                    FileAccess.Read);
+
             fs.Read(data, 0, 1048576);
             fs.Close();
             fs.Dispose();
@@ -74,6 +84,21 @@ namespace Aaru.Tests.Checksums
             Assert.AreEqual(ExpectedEmpty, result);
         }
 
+        [Test]
+        public void Adler32RandomData()
+        {
+            byte[] data = new byte[1048576];
+
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "random"), FileMode.Open,
+                                    FileAccess.Read);
+
+            fs.Read(data, 0, 1048576);
+            fs.Close();
+            fs.Dispose();
+            Adler32Context.Data(data, out byte[] result);
+            Assert.AreEqual(ExpectedRandom, result);
+        }
+
         [Test]
         public void Adler32RandomFile()
         {
@@ -81,25 +106,14 @@ namespace Aaru.Tests.Checksums
             Assert.AreEqual(ExpectedRandom, result);
         }
 
-        [Test]
-        public void Adler32RandomData()
-        {
-            byte[] data = new byte[1048576];
-            FileStream fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "random"), FileMode.Open,
-                                           FileAccess.Read);
-            fs.Read(data, 0, 1048576);
-            fs.Close();
-            fs.Dispose();
-            Adler32Context.Data(data, out byte[] result);
-            Assert.AreEqual(ExpectedRandom, result);
-        }
-
         [Test]
         public void Adler32RandomInstance()
         {
             byte[] data = new byte[1048576];
-            FileStream fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "random"), FileMode.Open,
-                                           FileAccess.Read);
+
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "random"), FileMode.Open,
+                                    FileAccess.Read);
+
             fs.Read(data, 0, 1048576);
             fs.Close();
             fs.Dispose();
diff --git a/Aaru.Tests/Checksums/CRC16.cs b/Aaru.Tests/Checksums/CRC16.cs
index e76a79229..d7948b71f 100644
--- a/Aaru.Tests/Checksums/CRC16.cs
+++ b/Aaru.Tests/Checksums/CRC16.cs
@@ -36,26 +36,34 @@ namespace Aaru.Tests.Checksums
     [TestFixture]
     public class Crc16
     {
-        static readonly byte[] ExpectedEmpty  = {0x00, 0x00};
-        static readonly byte[] ExpectedRandom = {0x2d, 0x6d};
-
-        [Test]
-        public void Crc16EmptyFile()
+        static readonly byte[] ExpectedEmpty =
         {
-            byte[] result = Crc16Context.File(Path.Combine(Consts.TestFilesRoot, "checksums", "empty"));
-            Assert.AreEqual(ExpectedEmpty, result);
-        }
+            0x00, 0x00
+        };
+        static readonly byte[] ExpectedRandom =
+        {
+            0x2d, 0x6d
+        };
 
         [Test]
         public void Crc16EmptyData()
         {
             byte[] data = new byte[1048576];
-            FileStream fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "empty"), FileMode.Open,
-                                           FileAccess.Read);
+
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "empty"), FileMode.Open,
+                                    FileAccess.Read);
+
             fs.Read(data, 0, 1048576);
             fs.Close();
             fs.Dispose();
-            Crc16Context.Data(data, out byte[] result);
+            CRC16CCITTContext.Data(data, out byte[] result);
+            Assert.AreEqual(ExpectedEmpty, result);
+        }
+
+        [Test]
+        public void Crc16EmptyFile()
+        {
+            byte[] result = CRC16CCITTContext.File(Path.Combine(Consts.TestFilesRoot, "checksums", "empty"));
             Assert.AreEqual(ExpectedEmpty, result);
         }
 
@@ -63,34 +71,38 @@ namespace Aaru.Tests.Checksums
         public void Crc16EmptyInstance()
         {
             byte[] data = new byte[1048576];
-            FileStream fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "empty"), FileMode.Open,
-                                           FileAccess.Read);
+
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "empty"), FileMode.Open,
+                                    FileAccess.Read);
+
             fs.Read(data, 0, 1048576);
             fs.Close();
             fs.Dispose();
-            IChecksum ctx = new Crc16Context();
+            IChecksum ctx = new CRC16CCITTContext();
             ctx.Update(data);
             byte[] result = ctx.Final();
             Assert.AreEqual(ExpectedEmpty, result);
         }
 
         [Test]
-        public void Crc16RandomFile()
+        public void Crc16RandomData()
         {
-            byte[] result = Crc16Context.File(Path.Combine(Consts.TestFilesRoot, "checksums", "random"));
+            byte[] data = new byte[1048576];
+
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "random"), FileMode.Open,
+                                    FileAccess.Read);
+
+            fs.Read(data, 0, 1048576);
+            fs.Close();
+            fs.Dispose();
+            CRC16CCITTContext.Data(data, out byte[] result);
             Assert.AreEqual(ExpectedRandom, result);
         }
 
         [Test]
-        public void Crc16RandomData()
+        public void Crc16RandomFile()
         {
-            byte[] data = new byte[1048576];
-            FileStream fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "random"), FileMode.Open,
-                                           FileAccess.Read);
-            fs.Read(data, 0, 1048576);
-            fs.Close();
-            fs.Dispose();
-            Crc16Context.Data(data, out byte[] result);
+            byte[] result = CRC16CCITTContext.File(Path.Combine(Consts.TestFilesRoot, "checksums", "random"));
             Assert.AreEqual(ExpectedRandom, result);
         }
 
@@ -98,12 +110,14 @@ namespace Aaru.Tests.Checksums
         public void Crc16RandomInstance()
         {
             byte[] data = new byte[1048576];
-            FileStream fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "random"), FileMode.Open,
-                                           FileAccess.Read);
+
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "random"), FileMode.Open,
+                                    FileAccess.Read);
+
             fs.Read(data, 0, 1048576);
             fs.Close();
             fs.Dispose();
-            IChecksum ctx = new Crc16Context();
+            IChecksum ctx = new CRC16CCITTContext();
             ctx.Update(data);
             byte[] result = ctx.Final();
             Assert.AreEqual(ExpectedRandom, result);
diff --git a/Aaru.Tests/Checksums/CRC32.cs b/Aaru.Tests/Checksums/CRC32.cs
index 49c3afe31..7ce858db3 100644
--- a/Aaru.Tests/Checksums/CRC32.cs
+++ b/Aaru.Tests/Checksums/CRC32.cs
@@ -36,8 +36,29 @@ namespace Aaru.Tests.Checksums
     [TestFixture]
     public class Crc32
     {
-        static readonly byte[] ExpectedEmpty  = {0xa7, 0x38, 0xea, 0x1c};
-        static readonly byte[] ExpectedRandom = {0x2b, 0x6e, 0x68, 0x54};
+        static readonly byte[] ExpectedEmpty =
+        {
+            0xa7, 0x38, 0xea, 0x1c
+        };
+        static readonly byte[] ExpectedRandom =
+        {
+            0x2b, 0x6e, 0x68, 0x54
+        };
+
+        [Test]
+        public void Crc32EmptyData()
+        {
+            byte[] data = new byte[1048576];
+
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "empty"), FileMode.Open,
+                                    FileAccess.Read);
+
+            fs.Read(data, 0, 1048576);
+            fs.Close();
+            fs.Dispose();
+            Crc32Context.Data(data, out byte[] result);
+            Assert.AreEqual(ExpectedEmpty, result);
+        }
 
         [Test]
         public void Crc32EmptyFile()
@@ -46,25 +67,14 @@ namespace Aaru.Tests.Checksums
             Assert.AreEqual(ExpectedEmpty, result);
         }
 
-        [Test]
-        public void Crc32EmptyData()
-        {
-            byte[] data = new byte[1048576];
-            FileStream fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "empty"), FileMode.Open,
-                                           FileAccess.Read);
-            fs.Read(data, 0, 1048576);
-            fs.Close();
-            fs.Dispose();
-            Crc32Context.Data(data, out byte[] result);
-            Assert.AreEqual(ExpectedEmpty, result);
-        }
-
         [Test]
         public void Crc32EmptyInstance()
         {
             byte[] data = new byte[1048576];
-            FileStream fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "empty"), FileMode.Open,
-                                           FileAccess.Read);
+
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "empty"), FileMode.Open,
+                                    FileAccess.Read);
+
             fs.Read(data, 0, 1048576);
             fs.Close();
             fs.Dispose();
@@ -74,6 +84,21 @@ namespace Aaru.Tests.Checksums
             Assert.AreEqual(ExpectedEmpty, result);
         }
 
+        [Test]
+        public void Crc32RandomData()
+        {
+            byte[] data = new byte[1048576];
+
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "random"), FileMode.Open,
+                                    FileAccess.Read);
+
+            fs.Read(data, 0, 1048576);
+            fs.Close();
+            fs.Dispose();
+            Crc32Context.Data(data, out byte[] result);
+            Assert.AreEqual(ExpectedRandom, result);
+        }
+
         [Test]
         public void Crc32RandomFile()
         {
@@ -81,25 +106,14 @@ namespace Aaru.Tests.Checksums
             Assert.AreEqual(ExpectedRandom, result);
         }
 
-        [Test]
-        public void Crc32RandomData()
-        {
-            byte[] data = new byte[1048576];
-            FileStream fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "random"), FileMode.Open,
-                                           FileAccess.Read);
-            fs.Read(data, 0, 1048576);
-            fs.Close();
-            fs.Dispose();
-            Crc32Context.Data(data, out byte[] result);
-            Assert.AreEqual(ExpectedRandom, result);
-        }
-
         [Test]
         public void Crc32RandomInstance()
         {
             byte[] data = new byte[1048576];
-            FileStream fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "random"), FileMode.Open,
-                                           FileAccess.Read);
+
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "random"), FileMode.Open,
+                                    FileAccess.Read);
+
             fs.Read(data, 0, 1048576);
             fs.Close();
             fs.Dispose();
diff --git a/Aaru.Tests/Checksums/CRC64.cs b/Aaru.Tests/Checksums/CRC64.cs
index 4227d3ced..5ce791309 100644
--- a/Aaru.Tests/Checksums/CRC64.cs
+++ b/Aaru.Tests/Checksums/CRC64.cs
@@ -36,8 +36,29 @@ namespace Aaru.Tests.Checksums
     [TestFixture]
     public class Crc64
     {
-        static readonly byte[] ExpectedEmpty  = {0x60, 0x6b, 0x70, 0xa2, 0x3e, 0xba, 0xf6, 0xc2};
-        static readonly byte[] ExpectedRandom = {0xbf, 0x09, 0x99, 0x2c, 0xc5, 0xed, 0xe3, 0x8e};
+        static readonly byte[] ExpectedEmpty =
+        {
+            0x60, 0x6b, 0x70, 0xa2, 0x3e, 0xba, 0xf6, 0xc2
+        };
+        static readonly byte[] ExpectedRandom =
+        {
+            0xbf, 0x09, 0x99, 0x2c, 0xc5, 0xed, 0xe3, 0x8e
+        };
+
+        [Test]
+        public void Crc64EmptyData()
+        {
+            byte[] data = new byte[1048576];
+
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "empty"), FileMode.Open,
+                                    FileAccess.Read);
+
+            fs.Read(data, 0, 1048576);
+            fs.Close();
+            fs.Dispose();
+            Crc64Context.Data(data, out byte[] result);
+            Assert.AreEqual(ExpectedEmpty, result);
+        }
 
         [Test]
         public void Crc64EmptyFile()
@@ -46,25 +67,14 @@ namespace Aaru.Tests.Checksums
             Assert.AreEqual(ExpectedEmpty, result);
         }
 
-        [Test]
-        public void Crc64EmptyData()
-        {
-            byte[] data = new byte[1048576];
-            FileStream fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "empty"), FileMode.Open,
-                                           FileAccess.Read);
-            fs.Read(data, 0, 1048576);
-            fs.Close();
-            fs.Dispose();
-            Crc64Context.Data(data, out byte[] result);
-            Assert.AreEqual(ExpectedEmpty, result);
-        }
-
         [Test]
         public void Crc64EmptyInstance()
         {
             byte[] data = new byte[1048576];
-            FileStream fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "empty"), FileMode.Open,
-                                           FileAccess.Read);
+
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "empty"), FileMode.Open,
+                                    FileAccess.Read);
+
             fs.Read(data, 0, 1048576);
             fs.Close();
             fs.Dispose();
@@ -74,6 +84,21 @@ namespace Aaru.Tests.Checksums
             Assert.AreEqual(ExpectedEmpty, result);
         }
 
+        [Test]
+        public void Crc64RandomData()
+        {
+            byte[] data = new byte[1048576];
+
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "random"), FileMode.Open,
+                                    FileAccess.Read);
+
+            fs.Read(data, 0, 1048576);
+            fs.Close();
+            fs.Dispose();
+            Crc64Context.Data(data, out byte[] result);
+            Assert.AreEqual(ExpectedRandom, result);
+        }
+
         [Test]
         public void Crc64RandomFile()
         {
@@ -81,25 +106,14 @@ namespace Aaru.Tests.Checksums
             Assert.AreEqual(ExpectedRandom, result);
         }
 
-        [Test]
-        public void Crc64RandomData()
-        {
-            byte[] data = new byte[1048576];
-            FileStream fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "random"), FileMode.Open,
-                                           FileAccess.Read);
-            fs.Read(data, 0, 1048576);
-            fs.Close();
-            fs.Dispose();
-            Crc64Context.Data(data, out byte[] result);
-            Assert.AreEqual(ExpectedRandom, result);
-        }
-
         [Test]
         public void Crc64RandomInstance()
         {
             byte[] data = new byte[1048576];
-            FileStream fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "random"), FileMode.Open,
-                                           FileAccess.Read);
+
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "random"), FileMode.Open,
+                                    FileAccess.Read);
+
             fs.Read(data, 0, 1048576);
             fs.Close();
             fs.Dispose();
diff --git a/Aaru.Tests/Checksums/MD5.cs b/Aaru.Tests/Checksums/MD5.cs
index 71bbf8a75..b2b310e36 100644
--- a/Aaru.Tests/Checksums/MD5.cs
+++ b/Aaru.Tests/Checksums/MD5.cs
@@ -45,19 +45,14 @@ namespace Aaru.Tests.Checksums
             0xd7, 0x8f, 0x0e, 0xec, 0x41, 0x7b, 0xe3, 0x86, 0x21, 0x9b, 0x21, 0xb7, 0x00, 0x04, 0x4b, 0x95
         };
 
-        [Test]
-        public void Md5EmptyFile()
-        {
-            byte[] result = Md5Context.File(Path.Combine(Consts.TestFilesRoot, "checksums", "empty"));
-            Assert.AreEqual(ExpectedEmpty, result);
-        }
-
         [Test]
         public void Md5EmptyData()
         {
             byte[] data = new byte[1048576];
-            FileStream fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "empty"), FileMode.Open,
-                                           FileAccess.Read);
+
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "empty"), FileMode.Open,
+                                    FileAccess.Read);
+
             fs.Read(data, 0, 1048576);
             fs.Close();
             fs.Dispose();
@@ -65,12 +60,21 @@ namespace Aaru.Tests.Checksums
             Assert.AreEqual(ExpectedEmpty, result);
         }
 
+        [Test]
+        public void Md5EmptyFile()
+        {
+            byte[] result = Md5Context.File(Path.Combine(Consts.TestFilesRoot, "checksums", "empty"));
+            Assert.AreEqual(ExpectedEmpty, result);
+        }
+
         [Test]
         public void Md5EmptyInstance()
         {
             byte[] data = new byte[1048576];
-            FileStream fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "empty"), FileMode.Open,
-                                           FileAccess.Read);
+
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "empty"), FileMode.Open,
+                                    FileAccess.Read);
+
             fs.Read(data, 0, 1048576);
             fs.Close();
             fs.Dispose();
@@ -80,6 +84,21 @@ namespace Aaru.Tests.Checksums
             Assert.AreEqual(ExpectedEmpty, result);
         }
 
+        [Test]
+        public void Md5RandomData()
+        {
+            byte[] data = new byte[1048576];
+
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "random"), FileMode.Open,
+                                    FileAccess.Read);
+
+            fs.Read(data, 0, 1048576);
+            fs.Close();
+            fs.Dispose();
+            Md5Context.Data(data, out byte[] result);
+            Assert.AreEqual(ExpectedRandom, result);
+        }
+
         [Test]
         public void Md5RandomFile()
         {
@@ -87,25 +106,14 @@ namespace Aaru.Tests.Checksums
             Assert.AreEqual(ExpectedRandom, result);
         }
 
-        [Test]
-        public void Md5RandomData()
-        {
-            byte[] data = new byte[1048576];
-            FileStream fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "random"), FileMode.Open,
-                                           FileAccess.Read);
-            fs.Read(data, 0, 1048576);
-            fs.Close();
-            fs.Dispose();
-            Md5Context.Data(data, out byte[] result);
-            Assert.AreEqual(ExpectedRandom, result);
-        }
-
         [Test]
         public void Md5RandomInstance()
         {
             byte[] data = new byte[1048576];
-            FileStream fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "random"), FileMode.Open,
-                                           FileAccess.Read);
+
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "random"), FileMode.Open,
+                                    FileAccess.Read);
+
             fs.Read(data, 0, 1048576);
             fs.Close();
             fs.Dispose();
diff --git a/Aaru.Tests/Checksums/SHA1.cs b/Aaru.Tests/Checksums/SHA1.cs
index 39f04bb57..65b80fae5 100644
--- a/Aaru.Tests/Checksums/SHA1.cs
+++ b/Aaru.Tests/Checksums/SHA1.cs
@@ -38,15 +38,30 @@ namespace Aaru.Tests.Checksums
     {
         static readonly byte[] ExpectedEmpty =
         {
-            0x3b, 0x71, 0xf4, 0x3f, 0xf3, 0x0f, 0x4b, 0x15, 0xb5, 0xcd, 0x85, 0xdd, 0x9e, 0x95, 0xeb, 0xc7, 0xe8,
-            0x4e, 0xb5, 0xa3
+            0x3b, 0x71, 0xf4, 0x3f, 0xf3, 0x0f, 0x4b, 0x15, 0xb5, 0xcd, 0x85, 0xdd, 0x9e, 0x95, 0xeb, 0xc7, 0xe8, 0x4e,
+            0xb5, 0xa3
         };
         static readonly byte[] ExpectedRandom =
         {
-            0x72, 0x0d, 0x3b, 0x71, 0x7d, 0xe0, 0xc7, 0x4c, 0x77, 0xdd, 0x9c, 0xaa, 0x9e, 0xba, 0x50, 0x60, 0xdc,
-            0xbd, 0x28, 0x8d
+            0x72, 0x0d, 0x3b, 0x71, 0x7d, 0xe0, 0xc7, 0x4c, 0x77, 0xdd, 0x9c, 0xaa, 0x9e, 0xba, 0x50, 0x60, 0xdc, 0xbd,
+            0x28, 0x8d
         };
 
+        [Test]
+        public void Sha1EmptyData()
+        {
+            byte[] data = new byte[1048576];
+
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "empty"), FileMode.Open,
+                                    FileAccess.Read);
+
+            fs.Read(data, 0, 1048576);
+            fs.Close();
+            fs.Dispose();
+            Sha1Context.Data(data, out byte[] result);
+            Assert.AreEqual(ExpectedEmpty, result);
+        }
+
         [Test]
         public void Sha1EmptyFile()
         {
@@ -54,25 +69,14 @@ namespace Aaru.Tests.Checksums
             Assert.AreEqual(ExpectedEmpty, result);
         }
 
-        [Test]
-        public void Sha1EmptyData()
-        {
-            byte[] data = new byte[1048576];
-            FileStream fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "empty"), FileMode.Open,
-                                           FileAccess.Read);
-            fs.Read(data, 0, 1048576);
-            fs.Close();
-            fs.Dispose();
-            Sha1Context.Data(data, out byte[] result);
-            Assert.AreEqual(ExpectedEmpty, result);
-        }
-
         [Test]
         public void Sha1EmptyInstance()
         {
             byte[] data = new byte[1048576];
-            FileStream fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "empty"), FileMode.Open,
-                                           FileAccess.Read);
+
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "empty"), FileMode.Open,
+                                    FileAccess.Read);
+
             fs.Read(data, 0, 1048576);
             fs.Close();
             fs.Dispose();
@@ -82,6 +86,21 @@ namespace Aaru.Tests.Checksums
             Assert.AreEqual(ExpectedEmpty, result);
         }
 
+        [Test]
+        public void Sha1RandomData()
+        {
+            byte[] data = new byte[1048576];
+
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "random"), FileMode.Open,
+                                    FileAccess.Read);
+
+            fs.Read(data, 0, 1048576);
+            fs.Close();
+            fs.Dispose();
+            Sha1Context.Data(data, out byte[] result);
+            Assert.AreEqual(ExpectedRandom, result);
+        }
+
         [Test]
         public void Sha1RandomFile()
         {
@@ -89,25 +108,14 @@ namespace Aaru.Tests.Checksums
             Assert.AreEqual(ExpectedRandom, result);
         }
 
-        [Test]
-        public void Sha1RandomData()
-        {
-            byte[] data = new byte[1048576];
-            FileStream fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "random"), FileMode.Open,
-                                           FileAccess.Read);
-            fs.Read(data, 0, 1048576);
-            fs.Close();
-            fs.Dispose();
-            Sha1Context.Data(data, out byte[] result);
-            Assert.AreEqual(ExpectedRandom, result);
-        }
-
         [Test]
         public void Sha1RandomInstance()
         {
             byte[] data = new byte[1048576];
-            FileStream fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "random"), FileMode.Open,
-                                           FileAccess.Read);
+
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "random"), FileMode.Open,
+                                    FileAccess.Read);
+
             fs.Read(data, 0, 1048576);
             fs.Close();
             fs.Dispose();
diff --git a/Aaru.Tests/Checksums/SHA256.cs b/Aaru.Tests/Checksums/SHA256.cs
index 16affee28..975a89dab 100644
--- a/Aaru.Tests/Checksums/SHA256.cs
+++ b/Aaru.Tests/Checksums/SHA256.cs
@@ -38,15 +38,30 @@ namespace Aaru.Tests.Checksums
     {
         static readonly byte[] ExpectedEmpty =
         {
-            0x30, 0xe1, 0x49, 0x55, 0xeb, 0xf1, 0x35, 0x22, 0x66, 0xdc, 0x2f, 0xf8, 0x06, 0x7e, 0x68, 0x10, 0x46,
-            0x07, 0xe7, 0x50, 0xab, 0xb9, 0xd3, 0xb3, 0x65, 0x82, 0xb8, 0xaf, 0x90, 0x9f, 0xcb, 0x58
+            0x30, 0xe1, 0x49, 0x55, 0xeb, 0xf1, 0x35, 0x22, 0x66, 0xdc, 0x2f, 0xf8, 0x06, 0x7e, 0x68, 0x10, 0x46, 0x07,
+            0xe7, 0x50, 0xab, 0xb9, 0xd3, 0xb3, 0x65, 0x82, 0xb8, 0xaf, 0x90, 0x9f, 0xcb, 0x58
         };
         static readonly byte[] ExpectedRandom =
         {
-            0x4d, 0x1a, 0x6b, 0x8a, 0x54, 0x67, 0x00, 0xc4, 0x8e, 0xda, 0x70, 0xd3, 0x39, 0x1c, 0x8f, 0x15, 0x8a,
-            0x8d, 0x12, 0xb2, 0x38, 0x92, 0x89, 0x29, 0x50, 0x47, 0x8c, 0x41, 0x8e, 0x25, 0xcc, 0x39
+            0x4d, 0x1a, 0x6b, 0x8a, 0x54, 0x67, 0x00, 0xc4, 0x8e, 0xda, 0x70, 0xd3, 0x39, 0x1c, 0x8f, 0x15, 0x8a, 0x8d,
+            0x12, 0xb2, 0x38, 0x92, 0x89, 0x29, 0x50, 0x47, 0x8c, 0x41, 0x8e, 0x25, 0xcc, 0x39
         };
 
+        [Test]
+        public void Sha256EmptyData()
+        {
+            byte[] data = new byte[1048576];
+
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "empty"), FileMode.Open,
+                                    FileAccess.Read);
+
+            fs.Read(data, 0, 1048576);
+            fs.Close();
+            fs.Dispose();
+            Sha256Context.Data(data, out byte[] result);
+            Assert.AreEqual(ExpectedEmpty, result);
+        }
+
         [Test]
         public void Sha256EmptyFile()
         {
@@ -54,25 +69,14 @@ namespace Aaru.Tests.Checksums
             Assert.AreEqual(ExpectedEmpty, result);
         }
 
-        [Test]
-        public void Sha256EmptyData()
-        {
-            byte[] data = new byte[1048576];
-            FileStream fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "empty"), FileMode.Open,
-                                           FileAccess.Read);
-            fs.Read(data, 0, 1048576);
-            fs.Close();
-            fs.Dispose();
-            Sha256Context.Data(data, out byte[] result);
-            Assert.AreEqual(ExpectedEmpty, result);
-        }
-
         [Test]
         public void Sha256EmptyInstance()
         {
             byte[] data = new byte[1048576];
-            FileStream fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "empty"), FileMode.Open,
-                                           FileAccess.Read);
+
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "empty"), FileMode.Open,
+                                    FileAccess.Read);
+
             fs.Read(data, 0, 1048576);
             fs.Close();
             fs.Dispose();
@@ -82,6 +86,21 @@ namespace Aaru.Tests.Checksums
             Assert.AreEqual(ExpectedEmpty, result);
         }
 
+        [Test]
+        public void Sha256RandomData()
+        {
+            byte[] data = new byte[1048576];
+
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "random"), FileMode.Open,
+                                    FileAccess.Read);
+
+            fs.Read(data, 0, 1048576);
+            fs.Close();
+            fs.Dispose();
+            Sha256Context.Data(data, out byte[] result);
+            Assert.AreEqual(ExpectedRandom, result);
+        }
+
         [Test]
         public void Sha256RandomFile()
         {
@@ -89,25 +108,14 @@ namespace Aaru.Tests.Checksums
             Assert.AreEqual(ExpectedRandom, result);
         }
 
-        [Test]
-        public void Sha256RandomData()
-        {
-            byte[] data = new byte[1048576];
-            FileStream fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "random"), FileMode.Open,
-                                           FileAccess.Read);
-            fs.Read(data, 0, 1048576);
-            fs.Close();
-            fs.Dispose();
-            Sha256Context.Data(data, out byte[] result);
-            Assert.AreEqual(ExpectedRandom, result);
-        }
-
         [Test]
         public void Sha256RandomInstance()
         {
             byte[] data = new byte[1048576];
-            FileStream fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "random"), FileMode.Open,
-                                           FileAccess.Read);
+
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "random"), FileMode.Open,
+                                    FileAccess.Read);
+
             fs.Read(data, 0, 1048576);
             fs.Close();
             fs.Dispose();
diff --git a/Aaru.Tests/Checksums/SHA384.cs b/Aaru.Tests/Checksums/SHA384.cs
index 3b5a0da22..08b198117 100644
--- a/Aaru.Tests/Checksums/SHA384.cs
+++ b/Aaru.Tests/Checksums/SHA384.cs
@@ -38,17 +38,32 @@ namespace Aaru.Tests.Checksums
     {
         static readonly byte[] ExpectedEmpty =
         {
-            0x31, 0x64, 0x67, 0x3a, 0x8a, 0xc2, 0x75, 0x76, 0xab, 0x5f, 0xc0, 0x6b, 0x9a, 0xdc, 0x4c, 0xe0, 0xac,
-            0xa5, 0xbd, 0x30, 0x25, 0x38, 0x4b, 0x1c, 0xf2, 0x12, 0x8a, 0x87, 0x95, 0xe7, 0x47, 0xc4, 0x31, 0xe8,
-            0x82, 0x78, 0x5a, 0x0b, 0xf8, 0xdc, 0x70, 0xb4, 0x29, 0x95, 0xdb, 0x38, 0x85, 0x75
+            0x31, 0x64, 0x67, 0x3a, 0x8a, 0xc2, 0x75, 0x76, 0xab, 0x5f, 0xc0, 0x6b, 0x9a, 0xdc, 0x4c, 0xe0, 0xac, 0xa5,
+            0xbd, 0x30, 0x25, 0x38, 0x4b, 0x1c, 0xf2, 0x12, 0x8a, 0x87, 0x95, 0xe7, 0x47, 0xc4, 0x31, 0xe8, 0x82, 0x78,
+            0x5a, 0x0b, 0xf8, 0xdc, 0x70, 0xb4, 0x29, 0x95, 0xdb, 0x38, 0x85, 0x75
         };
         static readonly byte[] ExpectedRandom =
         {
-            0xdb, 0x53, 0x0e, 0x17, 0x9b, 0x81, 0xfe, 0x5f, 0x6d, 0x20, 0x41, 0x04, 0x6e, 0x77, 0xd9, 0x85, 0xf2,
-            0x85, 0x8a, 0x66, 0xca, 0xd3, 0x8d, 0x1a, 0xd5, 0xac, 0x67, 0xa9, 0x74, 0xe1, 0xef, 0x3f, 0x4d, 0xdf,
-            0x94, 0x15, 0x2e, 0xac, 0x2e, 0xfe, 0x16, 0x95, 0x81, 0x54, 0xdc, 0x59, 0xd4, 0xc3
+            0xdb, 0x53, 0x0e, 0x17, 0x9b, 0x81, 0xfe, 0x5f, 0x6d, 0x20, 0x41, 0x04, 0x6e, 0x77, 0xd9, 0x85, 0xf2, 0x85,
+            0x8a, 0x66, 0xca, 0xd3, 0x8d, 0x1a, 0xd5, 0xac, 0x67, 0xa9, 0x74, 0xe1, 0xef, 0x3f, 0x4d, 0xdf, 0x94, 0x15,
+            0x2e, 0xac, 0x2e, 0xfe, 0x16, 0x95, 0x81, 0x54, 0xdc, 0x59, 0xd4, 0xc3
         };
 
+        [Test]
+        public void Sha384EmptyData()
+        {
+            byte[] data = new byte[1048576];
+
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "empty"), FileMode.Open,
+                                    FileAccess.Read);
+
+            fs.Read(data, 0, 1048576);
+            fs.Close();
+            fs.Dispose();
+            Sha384Context.Data(data, out byte[] result);
+            Assert.AreEqual(ExpectedEmpty, result);
+        }
+
         [Test]
         public void Sha384EmptyFile()
         {
@@ -56,25 +71,14 @@ namespace Aaru.Tests.Checksums
             Assert.AreEqual(ExpectedEmpty, result);
         }
 
-        [Test]
-        public void Sha384EmptyData()
-        {
-            byte[] data = new byte[1048576];
-            FileStream fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "empty"), FileMode.Open,
-                                           FileAccess.Read);
-            fs.Read(data, 0, 1048576);
-            fs.Close();
-            fs.Dispose();
-            Sha384Context.Data(data, out byte[] result);
-            Assert.AreEqual(ExpectedEmpty, result);
-        }
-
         [Test]
         public void Sha384EmptyInstance()
         {
             byte[] data = new byte[1048576];
-            FileStream fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "empty"), FileMode.Open,
-                                           FileAccess.Read);
+
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "empty"), FileMode.Open,
+                                    FileAccess.Read);
+
             fs.Read(data, 0, 1048576);
             fs.Close();
             fs.Dispose();
@@ -84,6 +88,21 @@ namespace Aaru.Tests.Checksums
             Assert.AreEqual(ExpectedEmpty, result);
         }
 
+        [Test]
+        public void Sha384RandomData()
+        {
+            byte[] data = new byte[1048576];
+
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "random"), FileMode.Open,
+                                    FileAccess.Read);
+
+            fs.Read(data, 0, 1048576);
+            fs.Close();
+            fs.Dispose();
+            Sha384Context.Data(data, out byte[] result);
+            Assert.AreEqual(ExpectedRandom, result);
+        }
+
         [Test]
         public void Sha384RandomFile()
         {
@@ -91,25 +110,14 @@ namespace Aaru.Tests.Checksums
             Assert.AreEqual(ExpectedRandom, result);
         }
 
-        [Test]
-        public void Sha384RandomData()
-        {
-            byte[] data = new byte[1048576];
-            FileStream fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "random"), FileMode.Open,
-                                           FileAccess.Read);
-            fs.Read(data, 0, 1048576);
-            fs.Close();
-            fs.Dispose();
-            Sha384Context.Data(data, out byte[] result);
-            Assert.AreEqual(ExpectedRandom, result);
-        }
-
         [Test]
         public void Sha384RandomInstance()
         {
             byte[] data = new byte[1048576];
-            FileStream fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "random"), FileMode.Open,
-                                           FileAccess.Read);
+
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "random"), FileMode.Open,
+                                    FileAccess.Read);
+
             fs.Read(data, 0, 1048576);
             fs.Close();
             fs.Dispose();
diff --git a/Aaru.Tests/Checksums/SHA512.cs b/Aaru.Tests/Checksums/SHA512.cs
index 47dbfc748..ce204b86a 100644
--- a/Aaru.Tests/Checksums/SHA512.cs
+++ b/Aaru.Tests/Checksums/SHA512.cs
@@ -38,19 +38,34 @@ namespace Aaru.Tests.Checksums
     {
         static readonly byte[] ExpectedEmpty =
         {
-            0xd6, 0x29, 0x26, 0x85, 0xb3, 0x80, 0xe3, 0x38, 0xe0, 0x25, 0xb3, 0x41, 0x5a, 0x90, 0xfe, 0x8f, 0x9d,
-            0x39, 0xa4, 0x6e, 0x7b, 0xdb, 0xa8, 0xcb, 0x78, 0xc5, 0x0a, 0x33, 0x8c, 0xef, 0xca, 0x74, 0x1f, 0x69,
-            0xe4, 0xe4, 0x64, 0x11, 0xc3, 0x2d, 0xe1, 0xaf, 0xde, 0xdf, 0xb2, 0x68, 0xe5, 0x79, 0xa5, 0x1f, 0x81,
-            0xff, 0x85, 0xe5, 0x6f, 0x55, 0xb0, 0xee, 0x7c, 0x33, 0xfe, 0x8c, 0x25, 0xc9
+            0xd6, 0x29, 0x26, 0x85, 0xb3, 0x80, 0xe3, 0x38, 0xe0, 0x25, 0xb3, 0x41, 0x5a, 0x90, 0xfe, 0x8f, 0x9d, 0x39,
+            0xa4, 0x6e, 0x7b, 0xdb, 0xa8, 0xcb, 0x78, 0xc5, 0x0a, 0x33, 0x8c, 0xef, 0xca, 0x74, 0x1f, 0x69, 0xe4, 0xe4,
+            0x64, 0x11, 0xc3, 0x2d, 0xe1, 0xaf, 0xde, 0xdf, 0xb2, 0x68, 0xe5, 0x79, 0xa5, 0x1f, 0x81, 0xff, 0x85, 0xe5,
+            0x6f, 0x55, 0xb0, 0xee, 0x7c, 0x33, 0xfe, 0x8c, 0x25, 0xc9
         };
         static readonly byte[] ExpectedRandom =
         {
-            0x6a, 0x0a, 0x18, 0xc2, 0xad, 0xf8, 0x83, 0xac, 0x58, 0xe6, 0x21, 0x96, 0xdb, 0x8d, 0x3d, 0x0e, 0xb9,
-            0x87, 0xd1, 0x49, 0x24, 0x97, 0xdb, 0x15, 0xb9, 0xfc, 0xcc, 0xb0, 0x36, 0xdf, 0x64, 0xae, 0xdb, 0x3e,
-            0x82, 0xa0, 0x4d, 0xdc, 0xd1, 0x37, 0x48, 0x92, 0x95, 0x51, 0xf9, 0xdd, 0xab, 0x82, 0xf4, 0x8a, 0x85,
-            0x3f, 0x9a, 0x01, 0xb5, 0xf2, 0x8c, 0xbb, 0x4a, 0xa5, 0x1b, 0x40, 0x7c, 0xb6
+            0x6a, 0x0a, 0x18, 0xc2, 0xad, 0xf8, 0x83, 0xac, 0x58, 0xe6, 0x21, 0x96, 0xdb, 0x8d, 0x3d, 0x0e, 0xb9, 0x87,
+            0xd1, 0x49, 0x24, 0x97, 0xdb, 0x15, 0xb9, 0xfc, 0xcc, 0xb0, 0x36, 0xdf, 0x64, 0xae, 0xdb, 0x3e, 0x82, 0xa0,
+            0x4d, 0xdc, 0xd1, 0x37, 0x48, 0x92, 0x95, 0x51, 0xf9, 0xdd, 0xab, 0x82, 0xf4, 0x8a, 0x85, 0x3f, 0x9a, 0x01,
+            0xb5, 0xf2, 0x8c, 0xbb, 0x4a, 0xa5, 0x1b, 0x40, 0x7c, 0xb6
         };
 
+        [Test]
+        public void Sha512EmptyData()
+        {
+            byte[] data = new byte[1048576];
+
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "empty"), FileMode.Open,
+                                    FileAccess.Read);
+
+            fs.Read(data, 0, 1048576);
+            fs.Close();
+            fs.Dispose();
+            Sha512Context.Data(data, out byte[] result);
+            Assert.AreEqual(ExpectedEmpty, result);
+        }
+
         [Test]
         public void Sha512EmptyFile()
         {
@@ -58,25 +73,14 @@ namespace Aaru.Tests.Checksums
             Assert.AreEqual(ExpectedEmpty, result);
         }
 
-        [Test]
-        public void Sha512EmptyData()
-        {
-            byte[] data = new byte[1048576];
-            FileStream fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "empty"), FileMode.Open,
-                                           FileAccess.Read);
-            fs.Read(data, 0, 1048576);
-            fs.Close();
-            fs.Dispose();
-            Sha512Context.Data(data, out byte[] result);
-            Assert.AreEqual(ExpectedEmpty, result);
-        }
-
         [Test]
         public void Sha512EmptyInstance()
         {
             byte[] data = new byte[1048576];
-            FileStream fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "empty"), FileMode.Open,
-                                           FileAccess.Read);
+
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "empty"), FileMode.Open,
+                                    FileAccess.Read);
+
             fs.Read(data, 0, 1048576);
             fs.Close();
             fs.Dispose();
@@ -86,6 +90,21 @@ namespace Aaru.Tests.Checksums
             Assert.AreEqual(ExpectedEmpty, result);
         }
 
+        [Test]
+        public void Sha512RandomData()
+        {
+            byte[] data = new byte[1048576];
+
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "random"), FileMode.Open,
+                                    FileAccess.Read);
+
+            fs.Read(data, 0, 1048576);
+            fs.Close();
+            fs.Dispose();
+            Sha512Context.Data(data, out byte[] result);
+            Assert.AreEqual(ExpectedRandom, result);
+        }
+
         [Test]
         public void Sha512RandomFile()
         {
@@ -93,25 +112,14 @@ namespace Aaru.Tests.Checksums
             Assert.AreEqual(ExpectedRandom, result);
         }
 
-        [Test]
-        public void Sha512RandomData()
-        {
-            byte[] data = new byte[1048576];
-            FileStream fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "random"), FileMode.Open,
-                                           FileAccess.Read);
-            fs.Read(data, 0, 1048576);
-            fs.Close();
-            fs.Dispose();
-            Sha512Context.Data(data, out byte[] result);
-            Assert.AreEqual(ExpectedRandom, result);
-        }
-
         [Test]
         public void Sha512RandomInstance()
         {
             byte[] data = new byte[1048576];
-            FileStream fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "random"), FileMode.Open,
-                                           FileAccess.Read);
+
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "random"), FileMode.Open,
+                                    FileAccess.Read);
+
             fs.Read(data, 0, 1048576);
             fs.Close();
             fs.Dispose();
diff --git a/Aaru.Tests/Checksums/SpamSum.cs b/Aaru.Tests/Checksums/SpamSum.cs
index b2437e6b0..e275c3b6a 100644
--- a/Aaru.Tests/Checksums/SpamSum.cs
+++ b/Aaru.Tests/Checksums/SpamSum.cs
@@ -43,8 +43,10 @@ namespace Aaru.Tests.Checksums
         public void SpamSumEmptyData()
         {
             byte[] data = new byte[1048576];
-            FileStream fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "empty"), FileMode.Open,
-                                           FileAccess.Read);
+
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "empty"), FileMode.Open,
+                                    FileAccess.Read);
+
             fs.Read(data, 0, 1048576);
             fs.Close();
             fs.Dispose();
@@ -56,8 +58,10 @@ namespace Aaru.Tests.Checksums
         public void SpamSumEmptyInstance()
         {
             byte[] data = new byte[1048576];
-            FileStream fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "empty"), FileMode.Open,
-                                           FileAccess.Read);
+
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "empty"), FileMode.Open,
+                                    FileAccess.Read);
+
             fs.Read(data, 0, 1048576);
             fs.Close();
             fs.Dispose();
@@ -71,8 +75,10 @@ namespace Aaru.Tests.Checksums
         public void SpamSumRandomData()
         {
             byte[] data = new byte[1048576];
-            FileStream fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "random"), FileMode.Open,
-                                           FileAccess.Read);
+
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "random"), FileMode.Open,
+                                    FileAccess.Read);
+
             fs.Read(data, 0, 1048576);
             fs.Close();
             fs.Dispose();
@@ -84,8 +90,10 @@ namespace Aaru.Tests.Checksums
         public void SpamSumRandomInstance()
         {
             byte[] data = new byte[1048576];
-            FileStream fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "random"), FileMode.Open,
-                                           FileAccess.Read);
+
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "checksums", "random"), FileMode.Open,
+                                    FileAccess.Read);
+
             fs.Read(data, 0, 1048576);
             fs.Close();
             fs.Dispose();
diff --git a/Aaru.Tests/Consts.cs b/Aaru.Tests/Consts.cs
index 4b231964f..1161d28f8 100644
--- a/Aaru.Tests/Consts.cs
+++ b/Aaru.Tests/Consts.cs
@@ -28,7 +28,7 @@
 
 namespace Aaru.Tests
 {
-    static class Consts
+    internal static class Consts
     {
         public const string TestFilesRoot = "/mnt/DiscImageChef/tests";
     }
diff --git a/Aaru.Tests/Devices/IomegaJaz.cs b/Aaru.Tests/Devices/IomegaJaz.cs
index e0747130a..b5578a52d 100644
--- a/Aaru.Tests/Devices/IomegaJaz.cs
+++ b/Aaru.Tests/Devices/IomegaJaz.cs
@@ -38,13 +38,25 @@ namespace Aaru.Tests.Devices
     [TestFixture]
     public class IomegaJaz
     {
-        readonly string[] testfiles = {"jaz1.bin.lz"};
+        readonly string[] testfiles =
+        {
+            "jaz1.bin.lz"
+        };
 
-        readonly MediaType[] mediatypes = {MediaType.Jaz};
+        readonly MediaType[] mediatypes =
+        {
+            MediaType.Jaz
+        };
 
-        readonly ulong[] sectors = {2091050};
+        readonly ulong[] sectors =
+        {
+            2091050
+        };
 
-        readonly uint[] sectorsize = {512};
+        readonly uint[] sectorsize =
+        {
+            512
+        };
 
         [Test]
         public void Test()
@@ -55,9 +67,9 @@ namespace Aaru.Tests.Devices
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new ZZZRawImage();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(mediatypes[i], image.Info.MediaType,  testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(mediatypes[i], image.Info.MediaType, testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
             }
         }
diff --git a/Aaru.Tests/Devices/LS120.cs b/Aaru.Tests/Devices/LS120.cs
index 88e6b9e09..2fed27349 100644
--- a/Aaru.Tests/Devices/LS120.cs
+++ b/Aaru.Tests/Devices/LS120.cs
@@ -38,13 +38,25 @@ namespace Aaru.Tests.Devices
     [TestFixture]
     public class Ls120
     {
-        readonly string[] testfiles = {"ls120.bin.lz", "mf2dd.bin.lz", "mf2hd.bin.lz"};
+        readonly string[] testfiles =
+        {
+            "ls120.bin.lz", "mf2dd.bin.lz", "mf2hd.bin.lz"
+        };
 
-        readonly MediaType[] mediatypes = {MediaType.LS120, MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_HD};
+        readonly MediaType[] mediatypes =
+        {
+            MediaType.LS120, MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_HD
+        };
 
-        readonly ulong[] sectors = {246528, 1440, 2880};
+        readonly ulong[] sectors =
+        {
+            246528, 1440, 2880
+        };
 
-        readonly uint[] sectorsize = {512, 512, 512};
+        readonly uint[] sectorsize =
+        {
+            512, 512, 512
+        };
 
         [Test]
         public void Test()
@@ -55,9 +67,9 @@ namespace Aaru.Tests.Devices
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new ZZZRawImage();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(mediatypes[i], image.Info.MediaType,  testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(mediatypes[i], image.Info.MediaType, testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
             }
         }
diff --git a/Aaru.Tests/Devices/PocketZip.cs b/Aaru.Tests/Devices/PocketZip.cs
index 9a9225f0a..5cd4c6688 100644
--- a/Aaru.Tests/Devices/PocketZip.cs
+++ b/Aaru.Tests/Devices/PocketZip.cs
@@ -38,13 +38,25 @@ namespace Aaru.Tests.Devices
     [TestFixture]
     public class PocketZip
     {
-        readonly string[] testfiles = {"clik!.bin.lz", "pocketzip.bin.lz"};
+        readonly string[] testfiles =
+        {
+            "clik!.bin.lz", "pocketzip.bin.lz"
+        };
 
-        readonly MediaType[] mediatypes = {MediaType.PocketZip, MediaType.PocketZip};
+        readonly MediaType[] mediatypes =
+        {
+            MediaType.PocketZip, MediaType.PocketZip
+        };
 
-        readonly ulong[] sectors = {78882, 78882};
+        readonly ulong[] sectors =
+        {
+            78882, 78882
+        };
 
-        readonly uint[] sectorsize = {512, 512};
+        readonly uint[] sectorsize =
+        {
+            512, 512
+        };
 
         [Test]
         public void Test()
@@ -55,9 +67,9 @@ namespace Aaru.Tests.Devices
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new ZZZRawImage();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(mediatypes[i], image.Info.MediaType,  testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(mediatypes[i], image.Info.MediaType, testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
             }
         }
diff --git a/Aaru.Tests/Filesystems/ADFS.cs b/Aaru.Tests/Filesystems/ADFS.cs
index 29082d1be..50765fdea 100644
--- a/Aaru.Tests/Filesystems/ADFS.cs
+++ b/Aaru.Tests/Filesystems/ADFS.cs
@@ -52,22 +52,40 @@ namespace Aaru.Tests.Filesystems
             MediaType.ACORN_525_DS_DD, MediaType.GENERIC_HDD, MediaType.GENERIC_HDD
         };
 
-        readonly ulong[] sectors = {800, 800, 1600, 800, 1600, 640, 1280, 2560, 78336, 78336};
+        readonly ulong[] sectors =
+        {
+            800, 800, 1600, 800, 1600, 640, 1280, 2560, 78336, 78336
+        };
 
-        readonly uint[] sectorsize = {1024, 1024, 1024, 1024, 1024, 256, 256, 256, 256, 256};
+        readonly uint[] sectorsize =
+        {
+            1024, 1024, 1024, 1024, 1024, 256, 256, 256, 256, 256
+        };
 
-        readonly bool[] bootable = {false, false, false, false, false, false, false, false, false, false};
+        readonly bool[] bootable =
+        {
+            false, false, false, false, false, false, false, false, false, false
+        };
 
-        readonly long[] clusters = {800, 800, 1600, 800, 1600, 640, 1280, 2560, 78336, 78336};
+        readonly long[] clusters =
+        {
+            800, 800, 1600, 800, 1600, 640, 1280, 2560, 78336, 78336
+        };
 
-        readonly uint[] clustersize = {1024, 1024, 1024, 1024, 1024, 256, 256, 256, 256, 256};
+        readonly uint[] clustersize =
+        {
+            1024, 1024, 1024, 1024, 1024, 256, 256, 256, 256, 256
+        };
 
         readonly string[] volumename =
         {
             "ADFSD", "ADFSE     ", null, "ADFSE+    ", null, "$", "$", "$", "VolLablOld", null
         };
 
-        readonly string[] volumeserial = {"3E48", "E13A", null, "1142", null, "F20D", "D6CA", "0CA6", "080E", null};
+        readonly string[] volumeserial =
+        {
+            "3E48", "E13A", null, "1142", null, "F20D", "D6CA", "0CA6", "080E", null
+        };
 
         [Test]
         public void Test()
@@ -78,25 +96,26 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new ZZZRawImage();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(mediatypes[i], image.Info.MediaType,  testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(mediatypes[i], image.Info.MediaType, testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 IFilesystem fs = new AcornADFS();
-                Partition wholePart = new Partition
+
+                var wholePart = new Partition
                 {
-                    Name   = "Whole device",
-                    Length = image.Info.Sectors,
-                    Size   = image.Info.Sectors * image.Info.SectorSize
+                    Name = "Whole device", Length = image.Info.Sectors,
+                    Size = image.Info.Sectors * image.Info.SectorSize
                 };
+
                 Assert.AreEqual(true, fs.Identify(image, wholePart), testfiles[i]);
                 fs.GetInformation(image, wholePart, out _, null);
-                Assert.AreEqual(bootable[i],                         fs.XmlFsType.Bootable,     testfiles[i]);
-                Assert.AreEqual(clusters[i],                         fs.XmlFsType.Clusters,     testfiles[i]);
-                Assert.AreEqual(clustersize[i],                      fs.XmlFsType.ClusterSize,  testfiles[i]);
-                Assert.AreEqual("Acorn Advanced Disc Filing System", fs.XmlFsType.Type,         testfiles[i]);
-                Assert.AreEqual(volumename[i],                       fs.XmlFsType.VolumeName,   testfiles[i]);
-                Assert.AreEqual(volumeserial[i],                     fs.XmlFsType.VolumeSerial, testfiles[i]);
+                Assert.AreEqual(bootable[i], fs.XmlFsType.Bootable, testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual("Acorn Advanced Disc Filing System", fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
+                Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
             }
         }
     }
diff --git a/Aaru.Tests/Filesystems/AFFS.cs b/Aaru.Tests/Filesystems/AFFS.cs
index 005630ddd..a34a5a03d 100644
--- a/Aaru.Tests/Filesystems/AFFS.cs
+++ b/Aaru.Tests/Filesystems/AFFS.cs
@@ -40,21 +40,45 @@ namespace Aaru.Tests.Filesystems
     [TestFixture]
     public class Affs
     {
-        readonly string[] testfiles = {"amigaos_3.9.adf.lz", "amigaos_3.9_intl.adf.lz"};
+        readonly string[] testfiles =
+        {
+            "amigaos_3.9.adf.lz", "amigaos_3.9_intl.adf.lz"
+        };
 
-        readonly MediaType[] mediatypes = {MediaType.CBM_AMIGA_35_DD, MediaType.CBM_AMIGA_35_DD};
+        readonly MediaType[] mediatypes =
+        {
+            MediaType.CBM_AMIGA_35_DD, MediaType.CBM_AMIGA_35_DD
+        };
 
-        readonly ulong[] sectors = {1760, 1760};
+        readonly ulong[] sectors =
+        {
+            1760, 1760
+        };
 
-        readonly uint[] sectorsize = {512, 512};
+        readonly uint[] sectorsize =
+        {
+            512, 512
+        };
 
-        readonly long[] clusters = {1760, 1760};
+        readonly long[] clusters =
+        {
+            1760, 1760
+        };
 
-        readonly int[] clustersize = {512, 512};
+        readonly int[] clustersize =
+        {
+            512, 512
+        };
 
-        readonly string[] volumename = {"Volume label", "Volume label"};
+        readonly string[] volumename =
+        {
+            "Volume label", "Volume label"
+        };
 
-        readonly string[] volumeserial = {"A5D9FAE2", "A5DA0CC9"};
+        readonly string[] volumeserial =
+        {
+            "A5D9FAE2", "A5DA0CC9"
+        };
 
         [Test]
         public void Test()
@@ -65,23 +89,24 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new ZZZRawImage();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(mediatypes[i], image.Info.MediaType,  testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(mediatypes[i], image.Info.MediaType, testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 IFilesystem fs = new AmigaDOSPlugin();
-                Partition wholePart = new Partition
+
+                var wholePart = new Partition
                 {
-                    Name   = "Whole device",
-                    Length = image.Info.Sectors,
-                    Size   = image.Info.Sectors * image.Info.SectorSize
+                    Name = "Whole device", Length = image.Info.Sectors,
+                    Size = image.Info.Sectors * image.Info.SectorSize
                 };
+
                 Assert.AreEqual(true, fs.Identify(image, wholePart), testfiles[i]);
                 fs.GetInformation(image, wholePart, out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,     testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,  testfiles[i]);
-                Assert.AreEqual("Amiga FFS",     fs.XmlFsType.Type,         testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,   testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual("Amiga FFS", fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
                 Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
             }
         }
@@ -90,19 +115,40 @@ namespace Aaru.Tests.Filesystems
     [TestFixture]
     public class AffsMbr
     {
-        readonly string[] testfiles = {"aros.vdi.lz", "aros_intl.vdi.lz"};
+        readonly string[] testfiles =
+        {
+            "aros.vdi.lz", "aros_intl.vdi.lz"
+        };
 
-        readonly ulong[] sectors = {409600, 409600};
+        readonly ulong[] sectors =
+        {
+            409600, 409600
+        };
 
-        readonly uint[] sectorsize = {512, 512};
+        readonly uint[] sectorsize =
+        {
+            512, 512
+        };
 
-        readonly long[] clusters = {408240, 408240};
+        readonly long[] clusters =
+        {
+            408240, 408240
+        };
 
-        readonly int[] clustersize = {512, 512};
+        readonly int[] clustersize =
+        {
+            512, 512
+        };
 
-        readonly string[] volumename = {"Volume label", "Volume label"};
+        readonly string[] volumename =
+        {
+            "Volume label", "Volume label"
+        };
 
-        readonly string[] volumeserial = {"A582DCA4", "A582BC91"};
+        readonly string[] volumeserial =
+        {
+            "A582DCA4", "A582BC91"
+        };
 
         [Test]
         public void Test()
@@ -113,26 +159,29 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new Vdi();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 IFilesystem     fs         = new AmigaDOSPlugin();
                 int             part       = -1;
+
                 for(int j = 0; j < partitions.Count; j++)
-                    if(partitions[j].Type == "0x2D" || partitions[j].Type == "0x2E")
+                    if(partitions[j].Type == "0x2D" ||
+                       partitions[j].Type == "0x2E")
                     {
                         part = j;
+
                         break;
                     }
 
                 Assert.AreNotEqual(-1, part, $"Partition not found on {testfiles[i]}");
                 Assert.AreEqual(true, fs.Identify(image, partitions[part]), testfiles[i]);
                 fs.GetInformation(image, partitions[part], out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,     testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,  testfiles[i]);
-                Assert.AreEqual("Amiga FFS",     fs.XmlFsType.Type,         testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,   testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual("Amiga FFS", fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
                 Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
             }
         }
@@ -141,19 +190,40 @@ namespace Aaru.Tests.Filesystems
     [TestFixture]
     public class AffsMbrRdb
     {
-        readonly string[] testfiles = {"aros.vdi.lz", "aros_intl.vdi.lz"};
+        readonly string[] testfiles =
+        {
+            "aros.vdi.lz", "aros_intl.vdi.lz"
+        };
 
-        readonly ulong[] sectors = {409600, 409600};
+        readonly ulong[] sectors =
+        {
+            409600, 409600
+        };
 
-        readonly uint[] sectorsize = {512, 512};
+        readonly uint[] sectorsize =
+        {
+            512, 512
+        };
 
-        readonly long[] clusters = {406224, 406224};
+        readonly long[] clusters =
+        {
+            406224, 406224
+        };
 
-        readonly int[] clustersize = {512, 512};
+        readonly int[] clustersize =
+        {
+            512, 512
+        };
 
-        readonly string[] volumename = {"Volume label", "Volume label"};
+        readonly string[] volumename =
+        {
+            "Volume label", "Volume label"
+        };
 
-        readonly string[] volumeserial = {"A58348CE", "A5833CD0"};
+        readonly string[] volumeserial =
+        {
+            "A58348CE", "A5833CD0"
+        };
 
         [Test]
         public void Test()
@@ -164,26 +234,29 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new Vdi();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 IFilesystem     fs         = new AmigaDOSPlugin();
                 int             part       = -1;
+
                 for(int j = 0; j < partitions.Count; j++)
-                    if(partitions[j].Type == "\"DOS\\1\"" || partitions[j].Type == "\"DOS\\3\"")
+                    if(partitions[j].Type == "\"DOS\\1\"" ||
+                       partitions[j].Type == "\"DOS\\3\"")
                     {
                         part = j;
+
                         break;
                     }
 
                 Assert.AreNotEqual(-1, part, $"Partition not found on {testfiles[i]}");
                 Assert.AreEqual(true, fs.Identify(image, partitions[part]), testfiles[i]);
                 fs.GetInformation(image, partitions[part], out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,     testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,  testfiles[i]);
-                Assert.AreEqual("Amiga FFS",     fs.XmlFsType.Type,         testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,   testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual("Amiga FFS", fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
                 Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
             }
         }
@@ -194,17 +267,29 @@ namespace Aaru.Tests.Filesystems
     {
         readonly string[] testfiles =
         {
-            "amigaos_3.9.vdi.lz", "amigaos_3.9_intl.vdi.lz", "aros.vdi.lz", "aros_intl.vdi.lz",
-            "amigaos_4.0.vdi.lz", "amigaos_4.0_intl.vdi.lz", "amigaos_4.0_cache.vdi.lz"
+            "amigaos_3.9.vdi.lz", "amigaos_3.9_intl.vdi.lz", "aros.vdi.lz", "aros_intl.vdi.lz", "amigaos_4.0.vdi.lz",
+            "amigaos_4.0_intl.vdi.lz", "amigaos_4.0_cache.vdi.lz"
         };
 
-        readonly ulong[] sectors = {1024128, 1024128, 409600, 409600, 1024128, 1024128, 1024128};
+        readonly ulong[] sectors =
+        {
+            1024128, 1024128, 409600, 409600, 1024128, 1024128, 1024128
+        };
 
-        readonly uint[] sectorsize = {512, 512, 512, 512, 512, 512, 512};
+        readonly uint[] sectorsize =
+        {
+            512, 512, 512, 512, 512, 512, 512
+        };
 
-        readonly long[] clusters = {510032, 510032, 407232, 407232, 511040, 511040, 511040};
+        readonly long[] clusters =
+        {
+            510032, 510032, 407232, 407232, 511040, 511040, 511040
+        };
 
-        readonly int[] clustersize = {1024, 1024, 512, 512, 1024, 1024, 1024};
+        readonly int[] clustersize =
+        {
+            1024, 1024, 512, 512, 1024, 1024, 1024
+        };
 
         readonly string[] volumename =
         {
@@ -226,27 +311,30 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new Vdi();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 IFilesystem     fs         = new AmigaDOSPlugin();
                 int             part       = -1;
+
                 for(int j = 0; j < partitions.Count; j++)
-                    if(partitions[j].Type == "\"DOS\\1\"" || partitions[j].Type == "\"DOS\\3\"" ||
+                    if(partitions[j].Type == "\"DOS\\1\"" ||
+                       partitions[j].Type == "\"DOS\\3\"" ||
                        partitions[j].Type == "\"DOS\\5\"")
                     {
                         part = j;
+
                         break;
                     }
 
                 Assert.AreNotEqual(-1, part, $"Partition not found on {testfiles[i]}");
                 Assert.AreEqual(true, fs.Identify(image, partitions[part]), testfiles[i]);
                 fs.GetInformation(image, partitions[part], out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,     testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,  testfiles[i]);
-                Assert.AreEqual("Amiga FFS",     fs.XmlFsType.Type,         testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,   testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual("Amiga FFS", fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
                 Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
             }
         }
diff --git a/Aaru.Tests/Filesystems/AFFS2.cs b/Aaru.Tests/Filesystems/AFFS2.cs
index 2ca4930d3..c1ff150b9 100644
--- a/Aaru.Tests/Filesystems/AFFS2.cs
+++ b/Aaru.Tests/Filesystems/AFFS2.cs
@@ -40,19 +40,40 @@ namespace Aaru.Tests.Filesystems
     [TestFixture]
     public class Affs2Rdb
     {
-        readonly string[] testfiles = {"amigaos_4.0.vdi.lz"};
+        readonly string[] testfiles =
+        {
+            "amigaos_4.0.vdi.lz"
+        };
 
-        readonly ulong[] sectors = {1024128};
+        readonly ulong[] sectors =
+        {
+            1024128
+        };
 
-        readonly uint[] sectorsize = {512};
+        readonly uint[] sectorsize =
+        {
+            512
+        };
 
-        readonly long[] clusters = {511040};
+        readonly long[] clusters =
+        {
+            511040
+        };
 
-        readonly int[] clustersize = {1024};
+        readonly int[] clustersize =
+        {
+            1024
+        };
 
-        readonly string[] volumename = {"Volume label"};
+        readonly string[] volumename =
+        {
+            "Volume label"
+        };
 
-        readonly string[] volumeserial = {"611D85E5"};
+        readonly string[] volumeserial =
+        {
+            "611D85E5"
+        };
 
         [Test]
         public void Test()
@@ -63,26 +84,28 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new Vdi();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 IFilesystem     fs         = new AmigaDOSPlugin();
                 int             part       = -1;
+
                 for(int j = 0; j < partitions.Count; j++)
                     if(partitions[j].Type == "\"DOS\\7\"")
                     {
                         part = j;
+
                         break;
                     }
 
                 Assert.AreNotEqual(-1, part, $"Partition not found on {testfiles[i]}");
                 Assert.AreEqual(true, fs.Identify(image, partitions[part]), testfiles[i]);
                 fs.GetInformation(image, partitions[part], out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,     testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,  testfiles[i]);
-                Assert.AreEqual("Amiga FFS2",    fs.XmlFsType.Type,         testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,   testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual("Amiga FFS2", fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
                 Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
             }
         }
diff --git a/Aaru.Tests/Filesystems/AFS.cs b/Aaru.Tests/Filesystems/AFS.cs
index d7e0f32fc..390cc285a 100644
--- a/Aaru.Tests/Filesystems/AFS.cs
+++ b/Aaru.Tests/Filesystems/AFS.cs
@@ -52,17 +52,35 @@ namespace Aaru.Tests.Filesystems
             MediaType.DMF, MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_ED, MediaType.DOS_35_HD
         };
 
-        readonly ulong[] sectors = {3360, 2400, 1440, 5760, 2880};
+        readonly ulong[] sectors =
+        {
+            3360, 2400, 1440, 5760, 2880
+        };
 
-        readonly uint[] sectorsize = {512, 512, 512, 512, 512};
+        readonly uint[] sectorsize =
+        {
+            512, 512, 512, 512, 512
+        };
 
-        readonly long[] clusters = {1680, 1200, 720, 2880, 1440};
+        readonly long[] clusters =
+        {
+            1680, 1200, 720, 2880, 1440
+        };
 
-        readonly int[] clustersize = {1024, 1024, 1024, 1024, 1024};
+        readonly int[] clustersize =
+        {
+            1024, 1024, 1024, 1024, 1024
+        };
 
-        readonly string[] volumename = {"", "", "", "", ""};
+        readonly string[] volumename =
+        {
+            "", "", "", "", ""
+        };
 
-        readonly string[] volumeserial = {null, null, null, null, null};
+        readonly string[] volumeserial =
+        {
+            null, null, null, null, null
+        };
 
         readonly string[] type =
         {
@@ -79,23 +97,24 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new ZZZRawImage();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(mediatypes[i], image.Info.MediaType,  testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(mediatypes[i], image.Info.MediaType, testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 IFilesystem fs = new SysVfs();
-                Partition wholePart = new Partition
+
+                var wholePart = new Partition
                 {
-                    Name   = "Whole device",
-                    Length = image.Info.Sectors,
-                    Size   = image.Info.Sectors * image.Info.SectorSize
+                    Name = "Whole device", Length = image.Info.Sectors,
+                    Size = image.Info.Sectors * image.Info.SectorSize
                 };
+
                 Assert.AreEqual(true, fs.Identify(image, wholePart), testfiles[i]);
                 fs.GetInformation(image, wholePart, out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,     testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,  testfiles[i]);
-                Assert.AreEqual(type[i],         fs.XmlFsType.Type,         testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,   testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual(type[i], fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
                 Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
             }
         }
@@ -104,21 +123,45 @@ namespace Aaru.Tests.Filesystems
     [TestFixture]
     public class AfsMbr
     {
-        readonly string[] testfiles = {"scoopenserver_5.0.7hw.vdi.lz"};
+        readonly string[] testfiles =
+        {
+            "scoopenserver_5.0.7hw.vdi.lz"
+        };
 
-        readonly ulong[] sectors = {1024000};
+        readonly ulong[] sectors =
+        {
+            1024000
+        };
 
-        readonly uint[] sectorsize = {512};
+        readonly uint[] sectorsize =
+        {
+            512
+        };
 
-        readonly long[] clusters = {510048};
+        readonly long[] clusters =
+        {
+            510048
+        };
 
-        readonly int[] clustersize = {1024};
+        readonly int[] clustersize =
+        {
+            1024
+        };
 
-        readonly string[] volumename = {"Volume label"};
+        readonly string[] volumename =
+        {
+            "Volume label"
+        };
 
-        readonly string[] volumeserial = {null, null};
+        readonly string[] volumeserial =
+        {
+            null, null
+        };
 
-        readonly string[] type = {"Acer Fast Filesystem"};
+        readonly string[] type =
+        {
+            "Acer Fast Filesystem"
+        };
 
         [Test]
         public void Test()
@@ -129,26 +172,28 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new Vdi();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 IFilesystem     fs         = new SysVfs();
                 int             part       = -1;
+
                 for(int j = 0; j < partitions.Count; j++)
                     if(partitions[j].Type == "XENIX")
                     {
                         part = j;
+
                         break;
                     }
 
                 Assert.AreNotEqual(-1, part, $"Partition not found on {testfiles[i]}");
                 Assert.AreEqual(true, fs.Identify(image, partitions[part]), testfiles[i]);
                 fs.GetInformation(image, partitions[part], out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,     testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,  testfiles[i]);
-                Assert.AreEqual(type[i],         fs.XmlFsType.Type,         testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,   testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual(type[i], fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
                 Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
             }
         }
diff --git a/Aaru.Tests/Filesystems/AOFS.cs b/Aaru.Tests/Filesystems/AOFS.cs
index 6f077ba1f..897552586 100644
--- a/Aaru.Tests/Filesystems/AOFS.cs
+++ b/Aaru.Tests/Filesystems/AOFS.cs
@@ -40,21 +40,45 @@ namespace Aaru.Tests.Filesystems
     [TestFixture]
     public class Aofs
     {
-        readonly string[] testfiles = {"amigaos_3.9.adf.lz", "amigaos_3.9_intl.adf.lz"};
+        readonly string[] testfiles =
+        {
+            "amigaos_3.9.adf.lz", "amigaos_3.9_intl.adf.lz"
+        };
 
-        readonly MediaType[] mediatypes = {MediaType.CBM_AMIGA_35_DD, MediaType.CBM_AMIGA_35_DD};
+        readonly MediaType[] mediatypes =
+        {
+            MediaType.CBM_AMIGA_35_DD, MediaType.CBM_AMIGA_35_DD
+        };
 
-        readonly ulong[] sectors = {1760, 1760};
+        readonly ulong[] sectors =
+        {
+            1760, 1760
+        };
 
-        readonly uint[] sectorsize = {512, 512};
+        readonly uint[] sectorsize =
+        {
+            512, 512
+        };
 
-        readonly long[] clusters = {1760, 1760};
+        readonly long[] clusters =
+        {
+            1760, 1760
+        };
 
-        readonly int[] clustersize = {512, 512};
+        readonly int[] clustersize =
+        {
+            512, 512
+        };
 
-        readonly string[] volumename = {"Volume label", "Volume label"};
+        readonly string[] volumename =
+        {
+            "Volume label", "Volume label"
+        };
 
-        readonly string[] volumeserial = {"A5D9FE71", "A5D9F14F"};
+        readonly string[] volumeserial =
+        {
+            "A5D9FE71", "A5D9F14F"
+        };
 
         [Test]
         public void Test()
@@ -65,23 +89,24 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new ZZZRawImage();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(mediatypes[i], image.Info.MediaType,  testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(mediatypes[i], image.Info.MediaType, testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 IFilesystem fs = new AmigaDOSPlugin();
-                Partition wholePart = new Partition
+
+                var wholePart = new Partition
                 {
-                    Name   = "Whole device",
-                    Length = image.Info.Sectors,
-                    Size   = image.Info.Sectors * image.Info.SectorSize
+                    Name = "Whole device", Length = image.Info.Sectors,
+                    Size = image.Info.Sectors * image.Info.SectorSize
                 };
+
                 Assert.AreEqual(true, fs.Identify(image, wholePart), testfiles[i]);
                 fs.GetInformation(image, wholePart, out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,     testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,  testfiles[i]);
-                Assert.AreEqual("Amiga OFS",     fs.XmlFsType.Type,         testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,   testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual("Amiga OFS", fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
                 Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
             }
         }
@@ -90,19 +115,40 @@ namespace Aaru.Tests.Filesystems
     [TestFixture]
     public class AofsMbr
     {
-        readonly string[] testfiles = {"aros.vdi.lz", "aros_intl.vdi.lz"};
+        readonly string[] testfiles =
+        {
+            "aros.vdi.lz", "aros_intl.vdi.lz"
+        };
 
-        readonly ulong[] sectors = {409600, 409600};
+        readonly ulong[] sectors =
+        {
+            409600, 409600
+        };
 
-        readonly uint[] sectorsize = {512, 512};
+        readonly uint[] sectorsize =
+        {
+            512, 512
+        };
 
-        readonly long[] clusters = {408240, 408240};
+        readonly long[] clusters =
+        {
+            408240, 408240
+        };
 
-        readonly int[] clustersize = {512, 512};
+        readonly int[] clustersize =
+        {
+            512, 512
+        };
 
-        readonly string[] volumename = {"Volume label", "Volume label"};
+        readonly string[] volumename =
+        {
+            "Volume label", "Volume label"
+        };
 
-        readonly string[] volumeserial = {"A582C90C", "A582CE0D"};
+        readonly string[] volumeserial =
+        {
+            "A582C90C", "A582CE0D"
+        };
 
         [Test]
         public void Test()
@@ -113,26 +159,28 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new Vdi();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 IFilesystem     fs         = new AmigaDOSPlugin();
                 int             part       = -1;
+
                 for(int j = 0; j < partitions.Count; j++)
                     if(partitions[j].Type == "0x2C")
                     {
                         part = j;
+
                         break;
                     }
 
                 Assert.AreNotEqual(-1, part, $"Partition not found on {testfiles[i]}");
                 Assert.AreEqual(true, fs.Identify(image, partitions[part]), testfiles[i]);
                 fs.GetInformation(image, partitions[part], out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,     testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,  testfiles[i]);
-                Assert.AreEqual("Amiga OFS",     fs.XmlFsType.Type,         testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,   testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual("Amiga OFS", fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
                 Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
             }
         }
@@ -141,19 +189,40 @@ namespace Aaru.Tests.Filesystems
     [TestFixture]
     public class AofsMbrRdb
     {
-        readonly string[] testfiles = {"aros.vdi.lz", "aros_intl.vdi.lz"};
+        readonly string[] testfiles =
+        {
+            "aros.vdi.lz", "aros_intl.vdi.lz"
+        };
 
-        readonly ulong[] sectors = {409600, 409600};
+        readonly ulong[] sectors =
+        {
+            409600, 409600
+        };
 
-        readonly uint[] sectorsize = {512, 512};
+        readonly uint[] sectorsize =
+        {
+            512, 512
+        };
 
-        readonly long[] clusters = {406224, 406224};
+        readonly long[] clusters =
+        {
+            406224, 406224
+        };
 
-        readonly int[] clustersize = {512, 512};
+        readonly int[] clustersize =
+        {
+            512, 512
+        };
 
-        readonly string[] volumename = {"Volume label", "Volume label"};
+        readonly string[] volumename =
+        {
+            "Volume label", "Volume label"
+        };
 
-        readonly string[] volumeserial = {"A5833C5B", "A5833085"};
+        readonly string[] volumeserial =
+        {
+            "A5833C5B", "A5833085"
+        };
 
         [Test]
         public void Test()
@@ -164,26 +233,28 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new Vdi();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 IFilesystem     fs         = new AmigaDOSPlugin();
                 int             part       = -1;
+
                 for(int j = 0; j < partitions.Count; j++)
                     if(partitions[j].Type == "\"DOS\\0\"")
                     {
                         part = j;
+
                         break;
                     }
 
                 Assert.AreNotEqual(-1, part, $"Partition not found on {testfiles[i]}");
                 Assert.AreEqual(true, fs.Identify(image, partitions[part]), testfiles[i]);
                 fs.GetInformation(image, partitions[part], out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,     testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,  testfiles[i]);
-                Assert.AreEqual("Amiga OFS",     fs.XmlFsType.Type,         testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,   testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual("Amiga OFS", fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
                 Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
             }
         }
@@ -197,17 +268,35 @@ namespace Aaru.Tests.Filesystems
             "amigaos_3.9.vdi.lz", "amigaos_3.9_intl.vdi.lz", "aros.vdi.lz", "aros_intl.vdi.lz"
         };
 
-        readonly ulong[] sectors = {1024128, 1024128, 409600, 409600};
+        readonly ulong[] sectors =
+        {
+            1024128, 1024128, 409600, 409600
+        };
 
-        readonly uint[] sectorsize = {512, 512, 512, 512};
+        readonly uint[] sectorsize =
+        {
+            512, 512, 512, 512
+        };
 
-        readonly long[] clusters = {510032, 510032, 407232, 407232};
+        readonly long[] clusters =
+        {
+            510032, 510032, 407232, 407232
+        };
 
-        readonly int[] clustersize = {1024, 1024, 512, 512};
+        readonly int[] clustersize =
+        {
+            1024, 1024, 512, 512
+        };
 
-        readonly string[] volumename = {"Volume label", "Volume label", "Volume label", "Volume label"};
+        readonly string[] volumename =
+        {
+            "Volume label", "Volume label", "Volume label", "Volume label"
+        };
 
-        readonly string[] volumeserial = {"A56D13BB", "A56D0415", "A582F3A0", "A5830B06"};
+        readonly string[] volumeserial =
+        {
+            "A56D13BB", "A56D0415", "A582F3A0", "A5830B06"
+        };
 
         [Test]
         public void Test()
@@ -218,27 +307,30 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new Vdi();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 IFilesystem     fs         = new AmigaDOSPlugin();
                 int             part       = -1;
+
                 for(int j = 0; j < partitions.Count; j++)
-                    if(partitions[j].Type == "\"DOS\\0\"" || partitions[j].Type == "\"DOS\\2\"" ||
+                    if(partitions[j].Type == "\"DOS\\0\"" ||
+                       partitions[j].Type == "\"DOS\\2\"" ||
                        partitions[j].Type == "\"DOS\\4\"")
                     {
                         part = j;
+
                         break;
                     }
 
                 Assert.AreNotEqual(-1, part, $"Partition not found on {testfiles[i]}");
                 Assert.AreEqual(true, fs.Identify(image, partitions[part]), testfiles[i]);
                 fs.GetInformation(image, partitions[part], out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,     testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,  testfiles[i]);
-                Assert.AreEqual("Amiga OFS",     fs.XmlFsType.Type,         testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,   testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual("Amiga OFS", fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
                 Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
             }
         }
diff --git a/Aaru.Tests/Filesystems/Atheos.cs b/Aaru.Tests/Filesystems/Atheos.cs
index 93fee2a9c..6917849ae 100644
--- a/Aaru.Tests/Filesystems/Atheos.cs
+++ b/Aaru.Tests/Filesystems/Atheos.cs
@@ -40,19 +40,40 @@ namespace Aaru.Tests.Filesystems
     [TestFixture]
     public class AtheosMbr
     {
-        readonly string[] testfiles = {"syllable_0.6.7.vdi.lz"};
+        readonly string[] testfiles =
+        {
+            "syllable_0.6.7.vdi.lz"
+        };
 
-        readonly ulong[] sectors = {4194304};
+        readonly ulong[] sectors =
+        {
+            4194304
+        };
 
-        readonly uint[] sectorsize = {512};
+        readonly uint[] sectorsize =
+        {
+            512
+        };
 
-        readonly long[] clusters = {2097120};
+        readonly long[] clusters =
+        {
+            2097120
+        };
 
-        readonly int[] clustersize = {1024};
+        readonly int[] clustersize =
+        {
+            1024
+        };
 
-        readonly string[] volumename = {"Volume label"};
+        readonly string[] volumename =
+        {
+            "Volume label"
+        };
 
-        readonly string[] volumeserial = {null};
+        readonly string[] volumeserial =
+        {
+            null
+        };
 
         [Test]
         public void Test()
@@ -63,27 +84,29 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new Vdi();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 IFilesystem     fs         = new AtheOS();
                 int             part       = -1;
+
                 for(int j = 0; j < partitions.Count; j++)
                     if(partitions[j].Type == "0x2A")
                     {
                         part = j;
+
                         break;
                     }
 
                 Assert.AreNotEqual(-1, part, $"Partition not found on {testfiles[i]}");
                 Assert.AreEqual(true, fs.Identify(image, partitions[part]), testfiles[i]);
                 fs.GetInformation(image, partitions[part], out _, null);
-                Assert.AreEqual(clusters[i],         fs.XmlFsType.Clusters,     testfiles[i]);
-                Assert.AreEqual(clustersize[i],      fs.XmlFsType.ClusterSize,  testfiles[i]);
-                Assert.AreEqual("AtheOS filesystem", fs.XmlFsType.Type,         testfiles[i]);
-                Assert.AreEqual(volumename[i],       fs.XmlFsType.VolumeName,   testfiles[i]);
-                Assert.AreEqual(volumeserial[i],     fs.XmlFsType.VolumeSerial, testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual("AtheOS filesystem", fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
+                Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
             }
         }
     }
diff --git a/Aaru.Tests/Filesystems/BeFS.cs b/Aaru.Tests/Filesystems/BeFS.cs
index c6d12ee80..285c8fbd9 100644
--- a/Aaru.Tests/Filesystems/BeFS.cs
+++ b/Aaru.Tests/Filesystems/BeFS.cs
@@ -40,23 +40,50 @@ namespace Aaru.Tests.Filesystems
     [TestFixture]
     public class BeFs
     {
-        readonly string[] testfiles = {"beos_r3.1.img.lz", "beos_r4.5.img.lz"};
+        readonly string[] testfiles =
+        {
+            "beos_r3.1.img.lz", "beos_r4.5.img.lz"
+        };
 
-        readonly MediaType[] mediatypes = {MediaType.DOS_35_HD, MediaType.DOS_35_HD};
+        readonly MediaType[] mediatypes =
+        {
+            MediaType.DOS_35_HD, MediaType.DOS_35_HD
+        };
 
-        readonly ulong[] sectors = {2880, 2880};
+        readonly ulong[] sectors =
+        {
+            2880, 2880
+        };
 
-        readonly uint[] sectorsize = {512, 512};
+        readonly uint[] sectorsize =
+        {
+            512, 512
+        };
 
-        readonly long[] clusters = {1440, 1440};
+        readonly long[] clusters =
+        {
+            1440, 1440
+        };
 
-        readonly int[] clustersize = {1024, 1024};
+        readonly int[] clustersize =
+        {
+            1024, 1024
+        };
 
-        readonly string[] volumename = {"Volume label", "Volume label"};
+        readonly string[] volumename =
+        {
+            "Volume label", "Volume label"
+        };
 
-        readonly string[] volumeserial = {null, null};
+        readonly string[] volumeserial =
+        {
+            null, null
+        };
 
-        readonly string[] oemid = {null, null};
+        readonly string[] oemid =
+        {
+            null, null
+        };
 
         [Test]
         public void Test()
@@ -67,25 +94,26 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new ZZZRawImage();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(mediatypes[i], image.Info.MediaType,  testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(mediatypes[i], image.Info.MediaType, testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 IFilesystem fs = new BeFS();
-                Partition wholePart = new Partition
+
+                var wholePart = new Partition
                 {
-                    Name   = "Whole device",
-                    Length = image.Info.Sectors,
-                    Size   = image.Info.Sectors * image.Info.SectorSize
+                    Name = "Whole device", Length = image.Info.Sectors,
+                    Size = image.Info.Sectors * image.Info.SectorSize
                 };
+
                 Assert.AreEqual(true, fs.Identify(image, wholePart), testfiles[i]);
                 fs.GetInformation(image, wholePart, out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,         testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,      testfiles[i]);
-                Assert.AreEqual("BeFS",          fs.XmlFsType.Type,             testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,       testfiles[i]);
-                Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial,     testfiles[i]);
-                Assert.AreEqual(oemid[i],        fs.XmlFsType.SystemIdentifier, testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual("BeFS", fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
+                Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
+                Assert.AreEqual(oemid[i], fs.XmlFsType.SystemIdentifier, testfiles[i]);
             }
         }
     }
@@ -93,21 +121,45 @@ namespace Aaru.Tests.Filesystems
     [TestFixture]
     public class BeFsApm
     {
-        readonly string[] testfiles = {"beos_r3.1.vdi.lz", "beos_r4.5.vdi.lz"};
+        readonly string[] testfiles =
+        {
+            "beos_r3.1.vdi.lz", "beos_r4.5.vdi.lz"
+        };
 
-        readonly ulong[] sectors = {1572864, 1572864};
+        readonly ulong[] sectors =
+        {
+            1572864, 1572864
+        };
 
-        readonly uint[] sectorsize = {512, 512};
+        readonly uint[] sectorsize =
+        {
+            512, 512
+        };
 
-        readonly long[] clusters = {786336, 786336};
+        readonly long[] clusters =
+        {
+            786336, 786336
+        };
 
-        readonly int[] clustersize = {1024, 1024};
+        readonly int[] clustersize =
+        {
+            1024, 1024
+        };
 
-        readonly string[] volumename = {"Volume label", "Volume label"};
+        readonly string[] volumename =
+        {
+            "Volume label", "Volume label"
+        };
 
-        readonly string[] volumeserial = {null, null};
+        readonly string[] volumeserial =
+        {
+            null, null
+        };
 
-        readonly string[] oemid = {null, null};
+        readonly string[] oemid =
+        {
+            null, null
+        };
 
         [Test]
         public void Test()
@@ -118,28 +170,30 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new Vdi();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 IFilesystem     fs         = new BeFS();
                 int             part       = -1;
+
                 for(int j = 0; j < partitions.Count; j++)
                     if(partitions[j].Type == "Be_BFS")
                     {
                         part = j;
+
                         break;
                     }
 
                 Assert.AreNotEqual(-1, part, $"Partition not found on {testfiles[i]}");
                 Assert.AreEqual(true, fs.Identify(image, partitions[part]), testfiles[i]);
                 fs.GetInformation(image, partitions[part], out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,         testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,      testfiles[i]);
-                Assert.AreEqual("BeFS",          fs.XmlFsType.Type,             testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,       testfiles[i]);
-                Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial,     testfiles[i]);
-                Assert.AreEqual(oemid[i],        fs.XmlFsType.SystemIdentifier, testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual("BeFS", fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
+                Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
+                Assert.AreEqual(oemid[i], fs.XmlFsType.SystemIdentifier, testfiles[i]);
             }
         }
     }
@@ -147,19 +201,40 @@ namespace Aaru.Tests.Filesystems
     [TestFixture]
     public class BeFsGpt
     {
-        readonly string[] testfiles = {"haiku_hrev51259.vdi.lz"};
+        readonly string[] testfiles =
+        {
+            "haiku_hrev51259.vdi.lz"
+        };
 
-        readonly ulong[] sectors = {8388608};
+        readonly ulong[] sectors =
+        {
+            8388608
+        };
 
-        readonly uint[] sectorsize = {512};
+        readonly uint[] sectorsize =
+        {
+            512
+        };
 
-        readonly long[] clusters = {2096640};
+        readonly long[] clusters =
+        {
+            2096640
+        };
 
-        readonly int[] clustersize = {2048};
+        readonly int[] clustersize =
+        {
+            2048
+        };
 
-        readonly string[] volumename = {"Volume label"};
+        readonly string[] volumename =
+        {
+            "Volume label"
+        };
 
-        readonly string[] volumeserial = {null, null};
+        readonly string[] volumeserial =
+        {
+            null, null
+        };
 
         [Test]
         public void Test()
@@ -170,26 +245,28 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new Vdi();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 IFilesystem     fs         = new BeFS();
                 int             part       = -1;
+
                 for(int j = 0; j < partitions.Count; j++)
                     if(partitions[j].Type == "Haiku BFS")
                     {
                         part = j;
+
                         break;
                     }
 
                 Assert.AreNotEqual(-1, part, $"Partition not found on {testfiles[i]}");
                 Assert.AreEqual(true, fs.Identify(image, partitions[part]), testfiles[i]);
                 fs.GetInformation(image, partitions[part], out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,     testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,  testfiles[i]);
-                Assert.AreEqual("BeFS",          fs.XmlFsType.Type,         testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,   testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual("BeFS", fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
                 Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
             }
         }
@@ -203,17 +280,35 @@ namespace Aaru.Tests.Filesystems
             "beos_r3.1.vdi.lz", "beos_r4.5.vdi.lz", "haiku_hrev51259.vdi.lz", "syllable_0.6.7.vdi.lz"
         };
 
-        readonly ulong[] sectors = {1572864, 1572864, 8388608, 2097152};
+        readonly ulong[] sectors =
+        {
+            1572864, 1572864, 8388608, 2097152
+        };
 
-        readonly uint[] sectorsize = {512, 512, 512, 512};
+        readonly uint[] sectorsize =
+        {
+            512, 512, 512, 512
+        };
 
-        readonly long[] clusters = {786400, 785232, 2096640, 524272};
+        readonly long[] clusters =
+        {
+            786400, 785232, 2096640, 524272
+        };
 
-        readonly int[] clustersize = {1024, 1024, 2048, 2048};
+        readonly int[] clustersize =
+        {
+            1024, 1024, 2048, 2048
+        };
 
-        readonly string[] volumename = {"Volume label", "Volume label", "Volume label", "Volume label"};
+        readonly string[] volumename =
+        {
+            "Volume label", "Volume label", "Volume label", "Volume label"
+        };
 
-        readonly string[] volumeserial = {null, null, null, null};
+        readonly string[] volumeserial =
+        {
+            null, null, null, null
+        };
 
         [Test]
         public void Test()
@@ -224,26 +319,28 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new Vdi();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 IFilesystem     fs         = new BeFS();
                 int             part       = -1;
+
                 for(int j = 0; j < partitions.Count; j++)
                     if(partitions[j].Type == "0xEB")
                     {
                         part = j;
+
                         break;
                     }
 
                 Assert.AreNotEqual(-1, part, $"Partition not found on {testfiles[i]}");
                 Assert.AreEqual(true, fs.Identify(image, partitions[part]), testfiles[i]);
                 fs.GetInformation(image, partitions[part], out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,     testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,  testfiles[i]);
-                Assert.AreEqual("BeFS",          fs.XmlFsType.Type,         testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,   testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual("BeFS", fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
                 Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
             }
         }
diff --git a/Aaru.Tests/Filesystems/COHERENT.cs b/Aaru.Tests/Filesystems/COHERENT.cs
index bc7e96677..834c14dc7 100644
--- a/Aaru.Tests/Filesystems/COHERENT.cs
+++ b/Aaru.Tests/Filesystems/COHERENT.cs
@@ -42,8 +42,8 @@ namespace Aaru.Tests.Filesystems
     {
         readonly string[] testfiles =
         {
-            "coherentunix_4.2.10_dsdd.img.lz", "coherentunix_4.2.10_dshd.img.lz",
-            "coherentunix_4.2.10_mf2dd.img.lz", "coherentunix_4.2.10_mf2hd.img.lz"
+            "coherentunix_4.2.10_dsdd.img.lz", "coherentunix_4.2.10_dshd.img.lz", "coherentunix_4.2.10_mf2dd.img.lz",
+            "coherentunix_4.2.10_mf2hd.img.lz"
         };
 
         readonly MediaType[] mediatypes =
@@ -51,19 +51,40 @@ namespace Aaru.Tests.Filesystems
             MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_HD
         };
 
-        readonly ulong[] sectors = {720, 2400, 1440, 2880};
+        readonly ulong[] sectors =
+        {
+            720, 2400, 1440, 2880
+        };
 
-        readonly uint[] sectorsize = {512, 512, 512, 512};
+        readonly uint[] sectorsize =
+        {
+            512, 512, 512, 512
+        };
 
-        readonly long[] clusters = {720, 2400, 1440, 2880};
+        readonly long[] clusters =
+        {
+            720, 2400, 1440, 2880
+        };
 
-        readonly int[] clustersize = {512, 512, 512, 512};
+        readonly int[] clustersize =
+        {
+            512, 512, 512, 512
+        };
 
-        readonly string[] volumename = {"noname", "noname", "noname", "noname"};
+        readonly string[] volumename =
+        {
+            "noname", "noname", "noname", "noname"
+        };
 
-        readonly string[] volumeserial = {null, null, null, null, null};
+        readonly string[] volumeserial =
+        {
+            null, null, null, null, null
+        };
 
-        readonly string[] type = {"Coherent fs", "Coherent fs", "Coherent fs", "Coherent fs"};
+        readonly string[] type =
+        {
+            "Coherent fs", "Coherent fs", "Coherent fs", "Coherent fs"
+        };
 
         [Test]
         public void Test()
@@ -74,23 +95,24 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new ZZZRawImage();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(mediatypes[i], image.Info.MediaType,  testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(mediatypes[i], image.Info.MediaType, testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 IFilesystem fs = new SysVfs();
-                Partition wholePart = new Partition
+
+                var wholePart = new Partition
                 {
-                    Name   = "Whole device",
-                    Length = image.Info.Sectors,
-                    Size   = image.Info.Sectors * image.Info.SectorSize
+                    Name = "Whole device", Length = image.Info.Sectors,
+                    Size = image.Info.Sectors * image.Info.SectorSize
                 };
+
                 Assert.AreEqual(true, fs.Identify(image, wholePart), testfiles[i]);
                 fs.GetInformation(image, wholePart, out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,     testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,  testfiles[i]);
-                Assert.AreEqual(type[i],         fs.XmlFsType.Type,         testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,   testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual(type[i], fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
                 Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
             }
         }
@@ -99,21 +121,45 @@ namespace Aaru.Tests.Filesystems
     [TestFixture]
     public class CoherentMbr
     {
-        readonly string[] testfiles = {"coherentunix_4.2.10.vdi.lz"};
+        readonly string[] testfiles =
+        {
+            "coherentunix_4.2.10.vdi.lz"
+        };
 
-        readonly ulong[] sectors = {1024000};
+        readonly ulong[] sectors =
+        {
+            1024000
+        };
 
-        readonly uint[] sectorsize = {512};
+        readonly uint[] sectorsize =
+        {
+            512
+        };
 
-        readonly long[] clusters = {510048};
+        readonly long[] clusters =
+        {
+            510048
+        };
 
-        readonly int[] clustersize = {1024};
+        readonly int[] clustersize =
+        {
+            1024
+        };
 
-        readonly string[] volumename = {"Volume label"};
+        readonly string[] volumename =
+        {
+            "Volume label"
+        };
 
-        readonly string[] volumeserial = {null};
+        readonly string[] volumeserial =
+        {
+            null
+        };
 
-        readonly string[] type = {"Coherent fs"};
+        readonly string[] type =
+        {
+            "Coherent fs"
+        };
 
         [Test]
         public void Test()
@@ -124,26 +170,28 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new Vdi();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 IFilesystem     fs         = new SysVfs();
                 int             part       = -1;
+
                 for(int j = 0; j < partitions.Count; j++)
                     if(partitions[j].Type == "0x09")
                     {
                         part = j;
+
                         break;
                     }
 
                 Assert.AreNotEqual(-1, part, $"Partition not found on {testfiles[i]}");
                 Assert.AreEqual(true, fs.Identify(image, partitions[part]), testfiles[i]);
                 fs.GetInformation(image, partitions[part], out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,     testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,  testfiles[i]);
-                Assert.AreEqual(type[i],         fs.XmlFsType.Type,         testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,   testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual(type[i], fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
                 Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
             }
         }
diff --git a/Aaru.Tests/Filesystems/DTFS.cs b/Aaru.Tests/Filesystems/DTFS.cs
index b60c525c1..087908bb7 100644
--- a/Aaru.Tests/Filesystems/DTFS.cs
+++ b/Aaru.Tests/Filesystems/DTFS.cs
@@ -52,19 +52,40 @@ namespace Aaru.Tests.Filesystems
             MediaType.DMF, MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_ED, MediaType.DOS_35_HD
         };
 
-        readonly ulong[] sectors = {3360, 2400, 1440, 5760, 2880};
+        readonly ulong[] sectors =
+        {
+            3360, 2400, 1440, 5760, 2880
+        };
 
-        readonly uint[] sectorsize = {512, 512, 512, 512, 512};
+        readonly uint[] sectorsize =
+        {
+            512, 512, 512, 512, 512
+        };
 
-        readonly long[] clusters = {1680, 1200, 720, 2880, 1440};
+        readonly long[] clusters =
+        {
+            1680, 1200, 720, 2880, 1440
+        };
 
-        readonly int[] clustersize = {1024, 1024, 1024, 1024, 1024};
+        readonly int[] clustersize =
+        {
+            1024, 1024, 1024, 1024, 1024
+        };
 
-        readonly string[] volumename = {"", "", "", "", ""};
+        readonly string[] volumename =
+        {
+            "", "", "", "", ""
+        };
 
-        readonly string[] volumeserial = {null, null, null, null, null};
+        readonly string[] volumeserial =
+        {
+            null, null, null, null, null
+        };
 
-        readonly string[] type = {"DTFS", "DTFS", "DTFS", "DTFS", "DTFS"};
+        readonly string[] type =
+        {
+            "DTFS", "DTFS", "DTFS", "DTFS", "DTFS"
+        };
 
         [Test]
         public void Test()
@@ -75,23 +96,24 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new ZZZRawImage();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(mediatypes[i], image.Info.MediaType,  testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(mediatypes[i], image.Info.MediaType, testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 IFilesystem fs = new SysVfs();
-                Partition wholePart = new Partition
+
+                var wholePart = new Partition
                 {
-                    Name   = "Whole device",
-                    Length = image.Info.Sectors,
-                    Size   = image.Info.Sectors * image.Info.SectorSize
+                    Name = "Whole device", Length = image.Info.Sectors,
+                    Size = image.Info.Sectors * image.Info.SectorSize
                 };
+
                 Assert.AreEqual(true, fs.Identify(image, wholePart), testfiles[i]);
                 fs.GetInformation(image, wholePart, out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,     testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,  testfiles[i]);
-                Assert.AreEqual(type[i],         fs.XmlFsType.Type,         testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,   testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual(type[i], fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
                 Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
             }
         }
@@ -100,21 +122,45 @@ namespace Aaru.Tests.Filesystems
     [TestFixture]
     public class DtfsMbr
     {
-        readonly string[] testfiles = {"scoopenserver_5.0.7hw.vdi.lz"};
+        readonly string[] testfiles =
+        {
+            "scoopenserver_5.0.7hw.vdi.lz"
+        };
 
-        readonly ulong[] sectors = {1024000};
+        readonly ulong[] sectors =
+        {
+            1024000
+        };
 
-        readonly uint[] sectorsize = {512};
+        readonly uint[] sectorsize =
+        {
+            512
+        };
 
-        readonly long[] clusters = {510048};
+        readonly long[] clusters =
+        {
+            510048
+        };
 
-        readonly int[] clustersize = {1024};
+        readonly int[] clustersize =
+        {
+            1024
+        };
 
-        readonly string[] volumename = {"Volume label"};
+        readonly string[] volumename =
+        {
+            "Volume label"
+        };
 
-        readonly string[] volumeserial = {null};
+        readonly string[] volumeserial =
+        {
+            null
+        };
 
-        readonly string[] type = {"DTFS"};
+        readonly string[] type =
+        {
+            "DTFS"
+        };
 
         [Test]
         public void Test()
@@ -125,26 +171,28 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new Vdi();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 IFilesystem     fs         = new SysVfs();
                 int             part       = -1;
+
                 for(int j = 0; j < partitions.Count; j++)
                     if(partitions[j].Type == "XENIX")
                     {
                         part = j;
+
                         break;
                     }
 
                 Assert.AreNotEqual(-1, part, $"Partition not found on {testfiles[i]}");
                 Assert.AreEqual(true, fs.Identify(image, partitions[part]), testfiles[i]);
                 fs.GetInformation(image, partitions[part], out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,     testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,  testfiles[i]);
-                Assert.AreEqual(type[i],         fs.XmlFsType.Type,         testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,   testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual(type[i], fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
                 Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
             }
         }
diff --git a/Aaru.Tests/Filesystems/EAFS.cs b/Aaru.Tests/Filesystems/EAFS.cs
index 4c9487bad..53d0bcbba 100644
--- a/Aaru.Tests/Filesystems/EAFS.cs
+++ b/Aaru.Tests/Filesystems/EAFS.cs
@@ -52,17 +52,35 @@ namespace Aaru.Tests.Filesystems
             MediaType.DMF, MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_ED, MediaType.DOS_35_HD
         };
 
-        readonly ulong[] sectors = {3360, 2400, 1440, 5760, 2880};
+        readonly ulong[] sectors =
+        {
+            3360, 2400, 1440, 5760, 2880
+        };
 
-        readonly uint[] sectorsize = {512, 512, 512, 512, 512};
+        readonly uint[] sectorsize =
+        {
+            512, 512, 512, 512, 512
+        };
 
-        readonly long[] clusters = {1680, 1200, 720, 2880, 1440};
+        readonly long[] clusters =
+        {
+            1680, 1200, 720, 2880, 1440
+        };
 
-        readonly int[] clustersize = {1024, 1024, 1024, 1024, 1024};
+        readonly int[] clustersize =
+        {
+            1024, 1024, 1024, 1024, 1024
+        };
 
-        readonly string[] volumename = {"", "", "", "", ""};
+        readonly string[] volumename =
+        {
+            "", "", "", "", ""
+        };
 
-        readonly string[] volumeserial = {null, null, null, null, null};
+        readonly string[] volumeserial =
+        {
+            null, null, null, null, null
+        };
 
         readonly string[] type =
         {
@@ -79,23 +97,24 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new ZZZRawImage();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(mediatypes[i], image.Info.MediaType,  testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(mediatypes[i], image.Info.MediaType, testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 IFilesystem fs = new SysVfs();
-                Partition wholePart = new Partition
+
+                var wholePart = new Partition
                 {
-                    Name   = "Whole device",
-                    Length = image.Info.Sectors,
-                    Size   = image.Info.Sectors * image.Info.SectorSize
+                    Name = "Whole device", Length = image.Info.Sectors,
+                    Size = image.Info.Sectors * image.Info.SectorSize
                 };
+
                 Assert.AreEqual(true, fs.Identify(image, wholePart), testfiles[i]);
                 fs.GetInformation(image, wholePart, out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,     testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,  testfiles[i]);
-                Assert.AreEqual(type[i],         fs.XmlFsType.Type,         testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,   testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual(type[i], fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
                 Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
             }
         }
@@ -104,21 +123,45 @@ namespace Aaru.Tests.Filesystems
     [TestFixture]
     public class EafsMbr
     {
-        readonly string[] testfiles = {"scoopenserver_5.0.7hw.vdi.lz"};
+        readonly string[] testfiles =
+        {
+            "scoopenserver_5.0.7hw.vdi.lz"
+        };
 
-        readonly ulong[] sectors = {1024000};
+        readonly ulong[] sectors =
+        {
+            1024000
+        };
 
-        readonly uint[] sectorsize = {512};
+        readonly uint[] sectorsize =
+        {
+            512
+        };
 
-        readonly long[] clusters = {510048};
+        readonly long[] clusters =
+        {
+            510048
+        };
 
-        readonly int[] clustersize = {1024};
+        readonly int[] clustersize =
+        {
+            1024
+        };
 
-        readonly string[] volumename = {"Volume label"};
+        readonly string[] volumename =
+        {
+            "Volume label"
+        };
 
-        readonly string[] volumeserial = {null};
+        readonly string[] volumeserial =
+        {
+            null
+        };
 
-        readonly string[] type = {"Extended Acer Fast Filesystem"};
+        readonly string[] type =
+        {
+            "Extended Acer Fast Filesystem"
+        };
 
         [Test]
         public void Test()
@@ -129,26 +172,28 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new Vdi();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 IFilesystem     fs         = new SysVfs();
                 int             part       = -1;
+
                 for(int j = 0; j < partitions.Count; j++)
                     if(partitions[j].Type == "XENIX")
                     {
                         part = j;
+
                         break;
                     }
 
                 Assert.AreNotEqual(-1, part, $"Partition not found on {testfiles[i]}");
                 Assert.AreEqual(true, fs.Identify(image, partitions[part]), testfiles[i]);
                 fs.GetInformation(image, partitions[part], out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,     testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,  testfiles[i]);
-                Assert.AreEqual(type[i],         fs.XmlFsType.Type,         testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,   testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual(type[i], fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
                 Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
             }
         }
diff --git a/Aaru.Tests/Filesystems/F2FS.cs b/Aaru.Tests/Filesystems/F2FS.cs
index c208f6efc..7a1a064d1 100644
--- a/Aaru.Tests/Filesystems/F2FS.cs
+++ b/Aaru.Tests/Filesystems/F2FS.cs
@@ -41,17 +41,35 @@ namespace Aaru.Tests.Filesystems
     [TestFixture]
     public class F2Fs
     {
-        readonly string[] testfiles = {"linux.vdi.lz", "linux_4.19_f2fs_flashdrive.vdi.lz"};
+        readonly string[] testfiles =
+        {
+            "linux.vdi.lz", "linux_4.19_f2fs_flashdrive.vdi.lz"
+        };
 
-        readonly ulong[] sectors = {262144, 2097152};
+        readonly ulong[] sectors =
+        {
+            262144, 2097152
+        };
 
-        readonly uint[] sectorsize = {512, 512};
+        readonly uint[] sectorsize =
+        {
+            512, 512
+        };
 
-        readonly long[] clusters = {32512, 261888};
+        readonly long[] clusters =
+        {
+            32512, 261888
+        };
 
-        readonly int[] clustersize = {4096, 4096};
+        readonly int[] clustersize =
+        {
+            4096, 4096
+        };
 
-        readonly string[] volumename = {"VolumeLabel", "DicSetter"};
+        readonly string[] volumename =
+        {
+            "VolumeLabel", "DicSetter"
+        };
 
         readonly string[] volumeserial =
         {
@@ -67,28 +85,30 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new Vdi();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 IPartition parts = new MBR();
                 Assert.AreEqual(true, parts.GetInformation(image, out List<Partition> partitions, 0), testfiles[i]);
                 IFilesystem fs   = new F2FS();
                 int         part = -1;
+
                 for(int j = 0; j < partitions.Count; j++)
                     if(partitions[j].Type == "0x83")
                     {
                         part = j;
+
                         break;
                     }
 
                 Assert.AreNotEqual(-1, part, $"Partition not found on {testfiles[i]}");
                 Assert.AreEqual(true, fs.Identify(image, partitions[part]), testfiles[i]);
                 fs.GetInformation(image, partitions[part], out _, null);
-                Assert.AreEqual(clusters[i],       fs.XmlFsType.Clusters,     testfiles[i]);
-                Assert.AreEqual(clustersize[i],    fs.XmlFsType.ClusterSize,  testfiles[i]);
-                Assert.AreEqual("F2FS filesystem", fs.XmlFsType.Type,         testfiles[i]);
-                Assert.AreEqual(volumename[i],     fs.XmlFsType.VolumeName,   testfiles[i]);
-                Assert.AreEqual(volumeserial[i],   fs.XmlFsType.VolumeSerial, testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual("F2FS filesystem", fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
+                Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
             }
         }
     }
diff --git a/Aaru.Tests/Filesystems/FAT12.cs b/Aaru.Tests/Filesystems/FAT12.cs
index 39b7c1a20..4e3640850 100644
--- a/Aaru.Tests/Filesystems/FAT12.cs
+++ b/Aaru.Tests/Filesystems/FAT12.cs
@@ -44,245 +44,333 @@ namespace Aaru.Tests.Filesystems
         {
             // Concurrent DOS 6.00
             "concurrentdos_6.00_dshd.img.lz", "concurrentdos_6.00_mf2dd.img.lz", "concurrentdos_6.00_mf2hd.img.lz",
+
             // DR-DOS 3.40
             "drdos_3.40_dsdd.img.lz", "drdos_3.40_dsdd8.img.lz", "drdos_3.40_dshd.img.lz", "drdos_3.40_mf2dd.img.lz",
             "drdos_3.40_mf2hd.img.lz", "drdos_3.40_ssdd.img.lz", "drdos_3.40_ssdd8.img.lz",
+
             // DR-DOS 3.41
             "drdos_3.41_dsdd.img.lz", "drdos_3.41_dsdd8.img.lz", "drdos_3.41_dshd.img.lz", "drdos_3.41_mf2dd.img.lz",
             "drdos_3.41_mf2hd.img.lz", "drdos_3.41_ssdd.img.lz", "drdos_3.41_ssdd8.img.lz",
+
             // DR-DOS 5.00
             "drdos_5.00_dsdd.img.lz", "drdos_5.00_dsdd8.img.lz", "drdos_5.00_dshd.img.lz", "drdos_5.00_mf2dd.img.lz",
             "drdos_5.00_mf2hd.img.lz", "drdos_5.00_ssdd.img.lz", "drdos_5.00_ssdd8.img.lz",
+
             // DR-DOS 6.00
             "drdos_6.00_dsdd.img.lz", "drdos_6.00_dsdd8.img.lz", "drdos_6.00_dshd.img.lz", "drdos_6.00_mf2dd.img.lz",
             "drdos_6.00_mf2ed.img.lz", "drdos_6.00_mf2hd.img.lz", "drdos_6.00_ssdd.img.lz", "drdos_6.00_ssdd8.img.lz",
+
             // DR-DOS 7.02
             "drdos_7.02_dsdd.img.lz", "drdos_7.02_dsdd8.img.lz", "drdos_7.02_dshd.img.lz", "drdos_7.02_mf2dd.img.lz",
             "drdos_7.02_mf2ed.img.lz", "drdos_7.02_mf2hd.img.lz", "drdos_7.02_ssdd.img.lz", "drdos_7.02_ssdd8.img.lz",
+
             // DR-DOS 7.03
             "drdos_7.03_dsdd.img.lz", "drdos_7.03_dsdd8.img.lz", "drdos_7.03_dshd.img.lz", "drdos_7.03_mf2dd.img.lz",
             "drdos_7.03_mf2ed.img.lz", "drdos_7.03_mf2hd.img.lz",
+
             // DR-DOS 8.00
             "drdos_8.00_dsdd.img.lz", "drdos_8.00_dsdd8.img.lz", "drdos_8.00_dshd.img.lz", "drdos_8.00_mf2dd.img.lz",
             "drdos_8.00_mf2ed.img.lz", "drdos_8.00_mf2hd.img.lz", "drdos_8.00_ssdd.img.lz", "drdos_8.00_ssdd8.img.lz",
+
             // MS-DOS 3.30A
             "msdos_3.30A_dsdd.img.lz", "msdos_3.30A_dsdd8.img.lz", "msdos_3.30A_dshd.img.lz",
             "msdos_3.30A_mf2dd.img.lz", "msdos_3.30A_mf2hd.img.lz", "msdos_3.30A_ssdd.img.lz",
             "msdos_3.30A_ssdd8.img.lz",
+
             // MS-DOS 3.31
             "msdos_3.31_dsdd.img.lz", "msdos_3.31_dsdd8.img.lz", "msdos_3.31_dshd.img.lz", "msdos_3.31_mf2dd.img.lz",
             "msdos_3.31_mf2hd.img.lz", "msdos_3.31_ssdd.img.lz", "msdos_3.31_ssdd8.img.lz",
+
             // MS-DOS 4.01
             "msdos_4.01_dsdd.img.lz", "msdos_4.01_dsdd8.img.lz", "msdos_4.01_dshd.img.lz", "msdos_4.01_mf2dd.img.lz",
             "msdos_4.01_mf2hd.img.lz", "msdos_4.01_ssdd.img.lz", "msdos_4.01_ssdd8.img.lz",
+
             // MS-DOS 5.00
             "msdos_5.00_dsdd.img.lz", "msdos_5.00_dsdd8.img.lz", "msdos_5.00_dshd.img.lz", "msdos_5.00_mf2dd.img.lz",
             "msdos_5.00_mf2ed.img.lz", "msdos_5.00_mf2hd.img.lz", "msdos_5.00_ssdd.img.lz", "msdos_5.00_ssdd8.img.lz",
+
             // MS-DOS 6.00
             "msdos_6.00_dsdd.img.lz", "msdos_6.00_dsdd8.img.lz", "msdos_6.00_dshd.img.lz", "msdos_6.00_mf2dd.img.lz",
             "msdos_6.00_mf2ed.img.lz", "msdos_6.00_mf2hd.img.lz", "msdos_6.00_ssdd.img.lz", "msdos_6.00_ssdd8.img.lz",
+
             // MS-DOS 6.20
             "msdos_6.20_dsdd.img.lz", "msdos_6.20_dsdd8.img.lz", "msdos_6.20_dshd.img.lz", "msdos_6.20_mf2dd.img.lz",
             "msdos_6.20_mf2ed.img.lz", "msdos_6.20_mf2hd.img.lz", "msdos_6.20_ssdd.img.lz", "msdos_6.20_ssdd8.img.lz",
+
             // MS-DOS 6.20 RC1
             "msdos_6.20rc1_dsdd.img.lz", "msdos_6.20rc1_dsdd8.img.lz", "msdos_6.20rc1_dshd.img.lz",
             "msdos_6.20rc1_mf2dd.img.lz", "msdos_6.20rc1_mf2ed.img.lz", "msdos_6.20rc1_mf2hd.img.lz",
             "msdos_6.20rc1_ssdd.img.lz", "msdos_6.20rc1_ssdd8.img.lz",
+
             // MS-DOS 6.21
             "msdos_6.21_dsdd.img.lz", "msdos_6.21_dsdd8.img.lz", "msdos_6.21_dshd.img.lz", "msdos_6.21_mf2dd.img.lz",
             "msdos_6.21_mf2ed.img.lz", "msdos_6.21_mf2hd.img.lz", "msdos_6.21_ssdd.img.lz", "msdos_6.21_ssdd8.img.lz",
+
             // MS-DOS 6.22
             "msdos_6.22_dsdd.img.lz", "msdos_6.22_dsdd8.img.lz", "msdos_6.22_dshd.img.lz", "msdos_6.22_mf2dd.img.lz",
             "msdos_6.22_mf2ed.img.lz", "msdos_6.22_mf2hd.img.lz", "msdos_6.22_ssdd.img.lz", "msdos_6.22_ssdd8.img.lz",
+
             // MS-DOS 7.10
             "msdos_7.10_dsdd.img.lz", "msdos_7.10_dsdd8.img.lz", "msdos_7.10_dshd.img.lz", "msdos_7.10_mf2dd.img.lz",
             "msdos_7.10_mf2ed.img.lz", "msdos_7.10_mf2hd.img.lz", "msdos_7.10_ssdd.img.lz", "msdos_7.10_ssdd8.img.lz",
+
             // MS-DOS 3.20 for Amstrad
             "msdos_amstrad_3.20_dsdd.img.lz", "msdos_amstrad_3.20_dsdd8.img.lz", "msdos_amstrad_3.20_dshd.img.lz",
             "msdos_amstrad_3.20_mf2dd.img.lz", "msdos_amstrad_3.20_ssdd.img.lz", "msdos_amstrad_3.20_ssdd8.img.lz",
+
             // MS-DOS 2.11 for AT&T
             "msdos_att_2.11_dsdd.img.lz",
+
             // MS-DOS 3.30 for DeLL
             "msdos_dell_3.30_dsdd.img.lz", "msdos_dell_3.30_dsdd8.img.lz", "msdos_dell_3.30_dshd.img.lz",
             "msdos_dell_3.30_mf2dd.img.lz", "msdos_dell_3.30_mf2hd.img.lz", "msdos_dell_3.30_ssdd.img.lz",
             "msdos_dell_3.30_ssdd8.img.lz",
+
             // MS-DOS 3.10 for Epson
             "msdos_epson_3.10_dsdd.img.lz", "msdos_epson_3.10_dsdd8.img.lz", "msdos_epson_3.10_dshd.img.lz",
+
             // MS-DOS 3.20 for Epson
             "msdos_epson_3.20_dsdd.img.lz", "msdos_epson_3.20_dsdd8.img.lz", "msdos_epson_3.20_dshd.img.lz",
             "msdos_epson_3.20_mf2dd.img.lz", "msdos_epson_3.20_ssdd.img.lz", "msdos_epson_3.20_ssdd8.img.lz",
+
             // MS-DOS 3.20 for HP
             "msdos_hp_3.20_dsdd.img.lz", "msdos_hp_3.20_dsdd8.img.lz", "msdos_hp_3.20_dshd.img.lz",
             "msdos_hp_3.20_mf2dd.img.lz", "msdos_hp_3.20_mf2hd.img.lz", "msdos_hp_3.20_ssdd.img.lz",
             "msdos_hp_3.20_ssdd8.img.lz",
+
             // MS-DOS 3.21 for Hyosung
             "msdos_hyonsung_3.21_dsdd.img.lz", "msdos_hyonsung_3.21_dsdd8.img.lz", "msdos_hyonsung_3.21_dshd.img.lz",
             "msdos_hyonsung_3.21_mf2dd.img.lz", "msdos_hyonsung_3.21_mf2hd.img.lz", "msdos_hyonsung_3.21_ssdd.img.lz",
             "msdos_hyonsung_3.21_ssdd8.img.lz",
+
             // MS-DOS 3.21 for Kaypro
             "msdos_kaypro_3.21_dsdd.img.lz", "msdos_kaypro_3.21_dsdd8.img.lz", "msdos_kaypro_3.21_dshd.img.lz",
             "msdos_kaypro_3.21_mf2dd.img.lz", "msdos_kaypro_3.21_mf2hd.img.lz", "msdos_kaypro_3.21_ssdd.img.lz",
             "msdos_kaypro_3.21_ssdd8.img.lz",
+
             // MS-DOS 3.10 for Olivetti
             "msdos_olivetti_3.10_dsdd.img.lz", "msdos_olivetti_3.10_dshd.img.lz", "msdos_olivetti_3.10_ssdd.img.lz",
+
             // MS-DOS 3.30 for Toshiba
             "msdos_toshiba_3.30_dsdd.img.lz", "msdos_toshiba_3.30_dsdd8.img.lz", "msdos_toshiba_3.30_dshd.img.lz",
             "msdos_toshiba_3.30_mf2dd.img.lz", "msdos_toshiba_3.30_mf2hd.img.lz", "msdos_toshiba_3.30_ssdd.img.lz",
             "msdos_toshiba_3.30_ssdd8.img.lz",
+
             // MS-DOS 4.01 for Toshiba
             "msdos_toshiba_4.01_dsdd.img.lz", "msdos_toshiba_4.01_dsdd8.img.lz", "msdos_toshiba_4.01_dshd.img.lz",
             "msdos_toshiba_4.01_mf2dd.img.lz", "msdos_toshiba_4.01_mf2hd.img.lz", "msdos_toshiba_4.01_ssdd.img.lz",
             "msdos_toshiba_4.01_ssdd8.img.lz",
+
             // Novell DOS 7.00
             "novelldos_7.00_dsdd.img.lz", "novelldos_7.00_dsdd8.img.lz", "novelldos_7.00_dshd.img.lz",
             "novelldos_7.00_mf2dd.img.lz", "novelldos_7.00_mf2ed.img.lz", "novelldos_7.00_mf2hd.img.lz",
             "novelldos_7.00_ssdd.img.lz", "novelldos_7.00_ssdd8.img.lz",
+
             // OpenDOS 7.01
             "opendos_7.01_dsdd.img.lz", "opendos_7.01_dsdd8.img.lz", "opendos_7.01_dshd.img.lz",
             "opendos_7.01_mf2dd.img.lz", "opendos_7.01_mf2ed.img.lz", "opendos_7.01_mf2hd.img.lz",
             "opendos_7.01_ssdd.img.lz", "opendos_7.01_ssdd8.img.lz",
+
             // PC-DOS 2.00
             "pcdos_2.00_dsdd.img.lz",
+
             // PC-DOS 2.10
             "pcdos_2.10_dsdd.img.lz",
+
             // PC-DOS 2000
             "pcdos_2000_dsdd.img.lz", "pcdos_2000_dsdd8.img.lz", "pcdos_2000_dshd.img.lz", "pcdos_2000_mf2dd.img.lz",
             "pcdos_2000_mf2ed.img.lz", "pcdos_2000_mf2hd.img.lz", "pcdos_2000_ssdd.img.lz", "pcdos_2000_ssdd8.img.lz",
+
             // PC-DOS 3.00
             "pcdos_3.00_dshd.img.lz",
+
             // PC-DOS 3.10
             "pcdos_3.10_dshd.img.lz",
+
             // PC-DOS 3.30
             "pcdos_3.30_dshd.img.lz", "pcdos_3.30_mf2hd.img.lz",
+
             // PC-DOS 4.00
             "pcdos_4.00_dshd.img.lz", "pcdos_4.00_mf2hd.img.lz",
+
             // PC-DOS 5.00
             "pcdos_5.00_dsdd.img.lz", "pcdos_5.00_dsdd8.img.lz", "pcdos_5.00_dshd.img.lz", "pcdos_5.00_mf2dd.img.lz",
             "pcdos_5.00_mf2ed.img.lz", "pcdos_5.00_mf2hd.img.lz", "pcdos_5.00_ssdd.img.lz", "pcdos_5.00_ssdd8.img.lz",
+
             // PC-DOS 5.02
             "pcdos_5.02_dsdd.img.lz", "pcdos_5.02_dsdd8.img.lz", "pcdos_5.02_dshd.img.lz", "pcdos_5.02_mf2dd.img.lz",
             "pcdos_5.02_mf2ed.img.lz", "pcdos_5.02_mf2hd.img.lz", "pcdos_5.02_ssdd.img.lz", "pcdos_5.02_ssdd8.img.lz",
+
             // PC-DOS 6.10
             "pcdos_6.10_dsdd.img.lz", "pcdos_6.10_dsdd8.img.lz", "pcdos_6.10_dshd.img.lz", "pcdos_6.10_mf2dd.img.lz",
             "pcdos_6.10_mf2ed.img.lz", "pcdos_6.10_mf2hd.img.lz", "pcdos_6.10_ssdd.img.lz", "pcdos_6.10_ssdd8.img.lz",
+
             // PC-DOS 6.30
             "pcdos_6.30_dsdd.img.lz", "pcdos_6.30_dsdd8.img.lz", "pcdos_6.30_dshd.img.lz", "pcdos_6.30_mf2dd.img.lz",
             "pcdos_6.30_mf2ed.img.lz", "pcdos_6.30_mf2hd.img.lz", "pcdos_6.30_ssdd.img.lz", "pcdos_6.30_ssdd8.img.lz",
+
             // mkfs.vfat
             "mkfs.vfat_dshd.img.lz", "mkfs.vfat_mf2dd.img.lz", "mkfs.vfat_mf2ed.img.lz", "mkfs.vfat_mf2hd.img.lz",
+
             // mkfs.vfat for Atari
             "mkfs.vfat_atari_dshd.img.lz", "mkfs.vfat_atari_mf2dd.img.lz", "mkfs.vfat_atari_mf2ed.img.lz",
             "mkfs.vfat_atari_mf2hd.img.lz",
+
             // Microsoft OS/2 1.00 for Tandy
             "msos2_1.00_tandy_dsdd.img.lz", "msos2_1.00_tandy_dshd.img.lz", "msos2_1.00_tandy_mf2dd.img.lz",
             "msos2_1.00_tandy_mf2hd.img.lz",
+
             // Microsoft OS/2 1.10 for AST
             "msos2_1.10_ast_dsdd.img.lz", "msos2_1.10_ast_dshd.img.lz", "msos2_1.10_ast_mf2dd.img.lz",
             "msos2_1.10_ast_mf2hd.img.lz",
+
             // Microsoft OS/2 1.10 for Nokia
             "msos2_1.10_nokia_dsdd.img.lz", "msos2_1.10_nokia_dshd.img.lz", "msos2_1.10_nokia_mf2dd.img.lz",
             "msos2_1.10_nokia_mf2hd.img.lz",
+
             // Microsoft OS/2 1.21
             "msos2_1.21_dsdd.img.lz", "msos2_1.21_dshd.img.lz", "msos2_1.21_mf2dd.img.lz", "msos2_1.21_mf2hd.img.lz",
+
             // Microsoft OS/2 1.30.1
             "msos2_1.30.1_dsdd.img.lz", "msos2_1.30.1_dshd.img.lz", "msos2_1.30.1_mf2dd.img.lz",
             "msos2_1.30.1_mf2ed.img.lz", "msos2_1.30.1_mf2hd.img.lz",
+
             // OS/2 1.20
             "os2_1.20_dsdd.img.lz", "os2_1.20_dshd.img.lz", "os2_1.20_mf2dd.img.lz", "os2_1.20_mf2hd.img.lz",
+
             // OS/2 1.30
             "os2_1.30_dsdd.img.lz", "os2_1.30_dshd.img.lz", "os2_1.30_mf2dd.img.lz", "os2_1.30_mf2hd.img.lz",
+
             // OS/2 2.00
             "os2_6.307_dsdd.img.lz", "os2_6.307_dshd.img.lz", "os2_6.307_mf2dd.img.lz", "os2_6.307_mf2ed.img.lz",
             "os2_6.307_mf2hd.img.lz",
+
             // OS/2 2.10
             "os2_6.514_dsdd.img.lz", "os2_6.514_dshd.img.lz", "os2_6.514_mf2dd.img.lz", "os2_6.514_mf2ed.img.lz",
             "os2_6.514_mf2hd.img.lz",
+
             // OS/2 2.11
             "os2_6.617_dsdd.img.lz", "os2_6.617_dshd.img.lz", "os2_6.617_mf2dd.img.lz", "os2_6.617_mf2ed.img.lz",
             "os2_6.617_mf2hd.img.lz",
+
             // OS/2 Warp 3
             "os2_8.162_dshd.img.lz", "os2_8.162_mf2dd.img.lz", "os2_8.162_mf2ed.img.lz", "os2_8.162_mf2hd.img.lz",
+
             // OS/2 Warp 4
             "os2_9.023_dshd.img.lz", "os2_9.023_mf2dd.img.lz", "os2_9.023_mf2ed.img.lz", "os2_9.023_mf2hd.img.lz",
+
             // eComStation
             "ecs_dshd.img.lz", "ecs_mf2dd.img.lz", "ecs_mf2ed.img.lz", "ecs_mf2hd.img.lz",
             "ecs20_mf2hd_fstester.img.lz",
+
             // Windows 95
             "win95_dsdd8.img.lz", "win95_dsdd.img.lz", "win95_dshd.img.lz", "win95_mf2dd.img.lz", "win95_mf2ed.img.lz",
             "win95_mf2hd.img.lz", "win95_ssdd8.img.lz", "win95_ssdd.img.lz",
+
             // Windows 95 OSR 2
             "win95osr2_dsdd8.img.lz", "win95osr2_dsdd.img.lz", "win95osr2_dshd.img.lz", "win95osr2_mf2dd.img.lz",
             "win95osr2_mf2ed.img.lz", "win95osr2_mf2hd.img.lz", "win95osr2_ssdd8.img.lz", "win95osr2_ssdd.img.lz",
+
             // Windows 95 OSR 2.1
             "win95osr2.1_dsdd8.img.lz", "win95osr2.1_dsdd.img.lz", "win95osr2.1_dshd.img.lz",
             "win95osr2.1_mf2dd.img.lz", "win95osr2.1_mf2ed.img.lz", "win95osr2.1_mf2hd.img.lz",
             "win95osr2.1_ssdd8.img.lz", "win95osr2.1_ssdd.img.lz",
+
             // Windows 95 OSR 2.5
             "win95osr2.5_dsdd8.img.lz", "win95osr2.5_dsdd.img.lz", "win95osr2.5_dshd.img.lz",
             "win95osr2.5_mf2dd.img.lz", "win95osr2.5_mf2ed.img.lz", "win95osr2.5_mf2hd.img.lz",
             "win95osr2.5_ssdd8.img.lz", "win95osr2.5_ssdd.img.lz",
+
             // Windows 98
             "win98_dsdd8.img.lz", "win98_dsdd.img.lz", "win98_dshd.img.lz", "win98_mf2dd.img.lz", "win98_mf2ed.img.lz",
             "win98_mf2hd.img.lz", "win98_ssdd8.img.lz", "win98_ssdd.img.lz",
+
             // Windows 98 Second Edition
             "win98se_dsdd8.img.lz", "win98se_dsdd.img.lz", "win98se_dshd.img.lz", "win98se_mf2dd.img.lz",
             "win98se_mf2ed.img.lz", "win98se_mf2hd.img.lz", "win98se_ssdd8.img.lz", "win98se_ssdd.img.lz",
+
             // Windows Me
             "winme_dsdd.img.lz", "winme_dshd.img.lz", "winme_mf2dd.img.lz", "winme_mf2ed.img.lz", "winme_mf2hd.img.lz",
+
             // Windows NT 3.10
             "winnt_3.10_dshd.img.lz", "winnt_3.10_mf2dd.img.lz", "winnt_3.10_mf2ed.img.lz", "winnt_3.10_mf2hd.img.lz",
+
             // Windows NT 3.50
             "winnt_3.50_dshd.img.lz", "winnt_3.50_mf2dd.img.lz", "winnt_3.50_mf2ed.img.lz", "winnt_3.50_mf2hd.img.lz",
+
             // Windows NT 3.51
             "winnt_3.51_dshd.img.lz", "winnt_3.51_mf2dd.img.lz", "winnt_3.51_mf2ed.img.lz", "winnt_3.51_mf2hd.img.lz",
+
             // Windows NT 4.00
             "winnt_4_dsdd.img.lz", "winnt_4_dshd.img.lz", "winnt_4_mf2dd.img.lz", "winnt_4_mf2ed.img.lz",
             "winnt_4_mf2hd.img.lz", "winnt_4_ssdd.img.lz",
+
             // Windows 2000
             "win2000_dsdd.img.lz", "win2000_dshd.img.lz", "win2000_mf2dd.img.lz", "win2000_mf2ed.img.lz",
             "win2000_mf2hd.img.lz",
+
             // Windows Vista
             "winvista_dsdd.img.lz", "winvista_dshd.img.lz", "winvista_mf2dd.img.lz", "winvista_mf2ed.img.lz",
             "winvista_mf2hd.img.lz",
+
             // BeOS R4.5
             "beos_r4.5_mf2hd.img.lz",
+
             // Hatari
             "hatari_mf1dd.st.lz", "hatari_mf1dd_10.st.lz", "hatari_mf1dd_11.st.lz", "hatari_mf2dd.st.lz",
             "hatari_mf2dd_10.st.lz", "hatari_mf2dd_11.st.lz", "hatari_mf2ed.st.lz", "hatari_mf2hd.st.lz",
+
             // Atari TOS 1.04
             "tos_1.04_mf1dd.st.lz", "tos_1.04_mf2dd.st.lz",
+
             // NetBSD 1.6
             "netbsd_1.6_mf2dd.img.lz", "netbsd_1.6_mf2hd.img.lz",
+
             // NeXTStep 3.3
             "nextstep_3.3_mf2dd.img.lz", "nextstep_3.3_mf2hd.img.lz",
+
             // OpenStep for Mach 4.0
             "openstep_4.0_mf2dd.img.lz", "openstep_4.0_mf2hd.img.lz",
+
             // OpenStep for Mach 4.2
             "openstep_4.2_mf2dd.img.lz", "openstep_4.2_mf2hd.img.lz",
+
             // Solaris 2.4
             "solaris_2.4_mf2dd.img.lz", "solaris_2.4_mf2hd.img.lz",
+
             // COHERENT UNIX 4.2.10
             "coherentunix_4.2.10_dsdd.img.lz", "coherentunix_4.2.10_dshd.img.lz", "coherentunix_4.2.10_mf2dd.img.lz",
             "coherentunix_4.2.10_mf2hd.img.lz",
+
             // SCO OpenServer 5.0.7Hw
             "scoopenserver_5.0.7hw_dshd.img.lz", "scoopenserver_5.0.7hw_mf2dd.img.lz",
             "scoopenserver_5.0.7hw_mf2hd.img.lz",
+
             // Epson MS-DOS 5.00 for PC-98
             "msdos_epson_pc98_5.00_md2dd.img.lz", "msdos_epson_pc98_5.00_md2hd.img.lz",
+
             // NEC MS-DOS 3.30 for PC-98
             "msdos_pc98_3.30_md2dd.img.lz", "msdos_pc98_3.30_md2hd.img.lz",
+
             // NEC MS-DOS 5.00 for PC-98
             "msdos_pc98_5.00_md2dd.img.lz", "msdos_pc98_5.00_md2hd.img.lz",
+
             // NEC MS-DOS 6.20 for PC-98
             "msdos_pc98_6.20_md2dd.img.lz", "msdos_pc98_6.20_md2hd.img.lz",
+
             // GEOS 1.2
             "geos12_md2hd.img.lz",
+
             // GEOS 2.0
             "geos20_mf2hd.img.lz",
+
             // GEOS 3.1
             "geos31_mf2hd.img.lz",
+
             // GEOS 3.2
             "geos32_mf2hd.img.lz",
+
             // GEOS 4.1
             "geos41_mf2hd.img.lz"
         };
@@ -291,228 +379,316 @@ namespace Aaru.Tests.Filesystems
         {
             // Concurrent DOS 6.00
             MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_HD,
+
             // DR-DOS 3.40
             MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_DS_DD_8, MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9,
             MediaType.DOS_35_HD, MediaType.DOS_525_SS_DD_9, MediaType.DOS_525_SS_DD_8,
+
             // DR-DOS 3.41
             MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_DS_DD_8, MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9,
             MediaType.DOS_35_HD, MediaType.DOS_525_SS_DD_9, MediaType.DOS_525_SS_DD_8,
+
             // DR-DOS 5.00
             MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_DS_DD_8, MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9,
             MediaType.DOS_35_HD, MediaType.DOS_525_SS_DD_9, MediaType.DOS_525_SS_DD_8,
+
             // DR-DOS 6.00
             MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_DS_DD_8, MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9,
             MediaType.DOS_35_ED, MediaType.DOS_35_HD, MediaType.DOS_525_SS_DD_9, MediaType.DOS_525_SS_DD_8,
+
             // DR-DOS 7.02
             MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_DS_DD_8, MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9,
             MediaType.DOS_35_ED, MediaType.DOS_35_HD, MediaType.DOS_525_SS_DD_9, MediaType.DOS_525_SS_DD_8,
+
             // DR-DOS 7.03
             MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_DS_DD_8, MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9,
             MediaType.DOS_35_ED, MediaType.DOS_35_HD,
+
             // DR-DOS 8.00
             MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_DS_DD_8, MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9,
             MediaType.DOS_35_ED, MediaType.DOS_35_HD, MediaType.DOS_525_SS_DD_9, MediaType.DOS_525_SS_DD_8,
+
             // MS-DOS 3.30A
             MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_DS_DD_8, MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9,
             MediaType.DOS_35_HD, MediaType.DOS_525_SS_DD_9, MediaType.DOS_525_SS_DD_8,
+
             // MS-DOS 3.31
             MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_DS_DD_8, MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9,
             MediaType.DOS_35_HD, MediaType.DOS_525_SS_DD_9, MediaType.DOS_525_SS_DD_8,
+
             // MS-DOS 4.01
             MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_DS_DD_8, MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9,
             MediaType.DOS_35_HD, MediaType.DOS_525_SS_DD_9, MediaType.DOS_525_SS_DD_8,
+
             // MS-DOS 5.00
             MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_DS_DD_8, MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9,
             MediaType.DOS_35_ED, MediaType.DOS_35_HD, MediaType.DOS_525_SS_DD_9, MediaType.DOS_525_SS_DD_8,
+
             // MS-DOS 6.00
             MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_DS_DD_8, MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9,
             MediaType.DOS_35_ED, MediaType.DOS_35_HD, MediaType.DOS_525_SS_DD_9, MediaType.DOS_525_SS_DD_8,
+
             // MS-DOS 6.20
             MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_DS_DD_8, MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9,
             MediaType.DOS_35_ED, MediaType.DOS_35_HD, MediaType.DOS_525_SS_DD_9, MediaType.DOS_525_SS_DD_8,
+
             // MS-DOS 6.20 RC1
             MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_DS_DD_8, MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9,
             MediaType.DOS_35_ED, MediaType.DOS_35_HD, MediaType.DOS_525_SS_DD_9, MediaType.DOS_525_SS_DD_8,
+
             // MS-DOS 6.21
             MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_DS_DD_8, MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9,
             MediaType.DOS_35_ED, MediaType.DOS_35_HD, MediaType.DOS_525_SS_DD_9, MediaType.DOS_525_SS_DD_8,
+
             // MS-DOS 6.22
             MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_DS_DD_8, MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9,
             MediaType.DOS_35_ED, MediaType.DOS_35_HD, MediaType.DOS_525_SS_DD_9, MediaType.DOS_525_SS_DD_8,
+
             // MS-DOS 7.10
             MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_DS_DD_8, MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9,
             MediaType.DOS_35_ED, MediaType.DOS_35_HD, MediaType.DOS_525_SS_DD_9, MediaType.DOS_525_SS_DD_8,
+
             // MS-DOS 3.20 for Amstrad
             MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_DS_DD_8, MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9,
             MediaType.DOS_525_SS_DD_9, MediaType.DOS_525_SS_DD_8,
+
             // MS-DOS 2.11 for AT&T
             MediaType.DOS_525_DS_DD_9,
+
             // MS-DOS 3.30 for DeLL
             MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_DS_DD_8, MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9,
             MediaType.DOS_35_HD, MediaType.DOS_525_SS_DD_9, MediaType.DOS_525_SS_DD_8,
+
             // MS-DOS 3.10 for Epson
             MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_DS_DD_8, MediaType.DOS_525_HD,
+
             // MS-DOS 3.20 for Epson
             MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_DS_DD_8, MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9,
             MediaType.DOS_525_SS_DD_9, MediaType.DOS_525_SS_DD_8,
+
             // MS-DOS 3.20 for HP
             MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_DS_DD_8, MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9,
             MediaType.DOS_35_HD, MediaType.DOS_525_SS_DD_9, MediaType.DOS_525_SS_DD_8,
+
             // MS-DOS 3.21 for Hyosung
             MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_DS_DD_8, MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9,
             MediaType.DOS_35_HD, MediaType.DOS_525_SS_DD_9, MediaType.DOS_525_SS_DD_8,
+
             // MS-DOS 3.21 for Kaypro
             MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_DS_DD_8, MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9,
             MediaType.DOS_35_HD, MediaType.DOS_525_SS_DD_9, MediaType.DOS_525_SS_DD_8,
+
             // MS-DOS 3.10 for Olivetti
             MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_HD, MediaType.DOS_525_SS_DD_9,
+
             // MS-DOS 3.30 for Toshiba
             MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_DS_DD_8, MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9,
             MediaType.DOS_35_HD, MediaType.DOS_525_SS_DD_9, MediaType.DOS_525_SS_DD_8,
+
             // MS-DOS 4.01 for Toshiba
             MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_DS_DD_8, MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9,
             MediaType.DOS_35_HD, MediaType.DOS_525_SS_DD_9, MediaType.DOS_525_SS_DD_8,
+
             // Novell DOS 7.00
             MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_DS_DD_8, MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9,
             MediaType.DOS_35_ED, MediaType.DOS_35_HD, MediaType.DOS_525_SS_DD_9, MediaType.DOS_525_SS_DD_8,
+
             // OpenDOS 7.01
             MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_DS_DD_8, MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9,
             MediaType.DOS_35_ED, MediaType.DOS_35_HD, MediaType.DOS_525_SS_DD_9, MediaType.DOS_525_SS_DD_8,
+
             // PC-DOS 2.00
             MediaType.DOS_525_DS_DD_9,
+
             // PC-DOS 2.10
             MediaType.DOS_525_DS_DD_9,
+
             // PC-DOS 2000
             MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_DS_DD_8, MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9,
             MediaType.DOS_35_ED, MediaType.DOS_35_HD, MediaType.DOS_525_SS_DD_9, MediaType.DOS_525_SS_DD_8,
+
             // PC-DOS 3.00
             MediaType.DOS_525_HD,
+
             // PC-DOS 3.10
             MediaType.DOS_525_HD,
+
             // PC-DOS 3.30
             MediaType.DOS_525_HD, MediaType.DOS_35_HD,
+
             // PC-DOS 4.00
             MediaType.DOS_525_HD, MediaType.DOS_35_HD,
+
             // PC-DOS 5.00
             MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_DS_DD_8, MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9,
             MediaType.DOS_35_ED, MediaType.DOS_35_HD, MediaType.DOS_525_SS_DD_9, MediaType.DOS_525_SS_DD_8,
+
             // PC-DOS 5.02
             MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_DS_DD_8, MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9,
             MediaType.DOS_35_ED, MediaType.DOS_35_HD, MediaType.DOS_525_SS_DD_9, MediaType.DOS_525_SS_DD_8,
+
             // PC-DOS 6.10
             MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_DS_DD_8, MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9,
             MediaType.DOS_35_ED, MediaType.DOS_35_HD, MediaType.DOS_525_SS_DD_9, MediaType.DOS_525_SS_DD_8,
+
             // PC-DOS 6.30
             MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_DS_DD_8, MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9,
             MediaType.DOS_35_ED, MediaType.DOS_35_HD, MediaType.DOS_525_SS_DD_9, MediaType.DOS_525_SS_DD_8,
+
             // mkfs.vfat
             MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_ED, MediaType.DOS_35_HD,
+
             // mkfs.vfat for Atari
             MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_ED, MediaType.DOS_35_HD,
+
             // Microsoft OS/2 1.00 for Tandy
             MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_HD,
+
             // Microsoft OS/2 1.10 for AST
             MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_HD,
+
             // Microsoft OS/2 1.10 for Nokia
             MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_HD,
+
             // Microsoft OS/2 1.21
             MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_HD,
+
             // Microsoft OS/2 1.30.1
             MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_ED,
             MediaType.DOS_35_HD,
+
             // OS/2 1.20
             MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_HD,
+
             // OS/2 1.30
             MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_HD,
+
             // OS/2 2.00
             MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_ED,
             MediaType.DOS_35_HD,
+
             // OS/2 2.10
             MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_ED,
             MediaType.DOS_35_HD,
+
             // OS/2 2.11
             MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_ED,
             MediaType.DOS_35_HD,
+
             // OS/2 Warp 3
             MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_ED, MediaType.DOS_35_HD,
+
             // OS/2 Warp 4
             MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_ED, MediaType.DOS_35_HD,
+
             // eComStation
             MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_ED, MediaType.DOS_35_HD,
             MediaType.DOS_35_HD,
+
             // Windows 95
             MediaType.DOS_525_DS_DD_8, MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9,
             MediaType.DOS_35_ED, MediaType.DOS_35_HD, MediaType.DOS_525_SS_DD_8, MediaType.DOS_525_SS_DD_9,
+
             // Windows 95 OSR 2
             MediaType.DOS_525_DS_DD_8, MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9,
             MediaType.DOS_35_ED, MediaType.DOS_35_HD, MediaType.DOS_525_SS_DD_8, MediaType.DOS_525_SS_DD_9,
+
             // Windows 95 OSR 2.1
             MediaType.DOS_525_DS_DD_8, MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9,
             MediaType.DOS_35_ED, MediaType.DOS_35_HD, MediaType.DOS_525_SS_DD_8, MediaType.DOS_525_SS_DD_9,
+
             // Windows 95 OSR 2.5
             MediaType.DOS_525_DS_DD_8, MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9,
             MediaType.DOS_35_ED, MediaType.DOS_35_HD, MediaType.DOS_525_SS_DD_8, MediaType.DOS_525_SS_DD_9,
+
             // Windows 98
             MediaType.DOS_525_DS_DD_8, MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9,
             MediaType.DOS_35_ED, MediaType.DOS_35_HD, MediaType.DOS_525_SS_DD_8, MediaType.DOS_525_SS_DD_9,
+
             // Windows 98 Second Edition
             MediaType.DOS_525_DS_DD_8, MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9,
             MediaType.DOS_35_ED, MediaType.DOS_35_HD, MediaType.DOS_525_SS_DD_8, MediaType.DOS_525_SS_DD_9,
+
             // Windows Me
             MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_ED,
             MediaType.DOS_35_HD,
+
             // Windows NT 3.10
             MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_ED, MediaType.DOS_35_HD,
+
             // Windows NT 3.50
             MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_ED, MediaType.DOS_35_HD,
+
             // Windows NT 3.51
             MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_ED, MediaType.DOS_35_HD,
+
             // Windows NT 4.00
             MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_ED,
             MediaType.DOS_35_HD, MediaType.DOS_525_SS_DD_9,
+
             // Windows 2000
             MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_ED,
             MediaType.DOS_35_HD,
+
             // Windows Vista
             MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_ED,
             MediaType.DOS_35_HD,
+
             // BeOS R4.5
             MediaType.DOS_35_HD,
+
             // Hatari
             MediaType.DOS_35_SS_DD_9, MediaType.ATARI_35_SS_DD, MediaType.ATARI_35_SS_DD_11, MediaType.DOS_35_DS_DD_9,
             MediaType.ATARI_35_DS_DD, MediaType.ATARI_35_DS_DD_11, MediaType.DOS_35_ED, MediaType.DOS_35_HD,
+
             // Atari TOS 1.04
             MediaType.DOS_35_SS_DD_9, MediaType.DOS_35_DS_DD_9,
+
             // NetBSD 1.6
             MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_HD,
+
             // NeXTStep 3.3
             MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_HD,
+
             // OpenStep for Mach 4.0
             MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_HD,
+
             // OpenStep for Mach 4.2
             MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_HD,
+
             // Solaris 2.4
             MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_HD,
+
             // COHERENT UNIX 4.2.10
             MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_HD,
+
             // SCO OpenServer 5.0.7Hw
             MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_HD,
+
             // Epson MS-DOS 5.00 for PC-98
             MediaType.DOS_35_DS_DD_9, MediaType.NEC_525_HD,
+
             // NEC MS-DOS 3.30 for PC-98
             MediaType.DOS_35_DS_DD_9, MediaType.NEC_525_HD,
+
             // NEC MS-DOS 5.00 for PC-98
             MediaType.DOS_35_DS_DD_9, MediaType.NEC_525_HD,
+
             // NEC MS-DOS 6.20 for PC-98
             MediaType.DOS_35_DS_DD_9, MediaType.NEC_525_HD,
+
             // GEOS 1.2
             MediaType.DOS_525_HD,
+
             // GEOS 2.0
             MediaType.DOS_35_HD,
+
             // GEOS 3.1
             MediaType.DOS_35_HD,
+
             // GEOS 3.2
             MediaType.DOS_35_HD,
+
             // GEOS 4.1
             MediaType.DOS_35_HD
         };
@@ -521,180 +697,268 @@ namespace Aaru.Tests.Filesystems
         {
             // Concurrent DOS 6.00
             2400, 1440, 2880,
+
             // DR-DOS 3.40
             720, 640, 2400, 1440, 2880, 360, 320,
+
             // DR-DOS 3.41
             720, 640, 2400, 1440, 2880, 360, 320,
+
             // DR-DOS 5.00
             720, 640, 2400, 1440, 2880, 360, 320,
+
             // DR-DOS 6.00
             720, 640, 2400, 1440, 5760, 2880, 360, 320,
+
             // DR-DOS 7.02
             720, 640, 2400, 1440, 5760, 2880, 360, 320,
+
             // DR-DOS 7.03
             720, 640, 2400, 1440, 5760, 2880,
+
             // DR-DOS 8.00
             720, 640, 2400, 1440, 5760, 2880, 360, 320,
+
             // MS-DOS 3.30A
             720, 640, 2400, 1440, 2880, 360, 320,
+
             // MS-DOS 3.31
             720, 640, 2400, 1440, 2880, 360, 320,
+
             // MS-DOS 4.01
             720, 640, 2400, 1440, 2880, 360, 320,
+
             // MS-DOS 5.00
             720, 640, 2400, 1440, 5760, 2880, 360, 320,
+
             // MS-DOS 6.00
             720, 640, 2400, 1440, 5760, 2880, 360, 320,
+
             // MS-DOS 6.20
             720, 640, 2400, 1440, 5760, 2880, 360, 320,
+
             // MS-DOS 6.20 RC1
             720, 640, 2400, 1440, 5760, 2880, 360, 320,
+
             // MS-DOS 6.21
             720, 640, 2400, 1440, 5760, 2880, 360, 320,
+
             // MS-DOS 6.22
             720, 640, 2400, 1440, 5760, 2880, 360, 320,
+
             // MS-DOS 7.10
             720, 640, 2400, 1440, 5760, 2880, 360, 320,
+
             // MS-DOS 3.20 for Amstrad
             720, 640, 2400, 1440, 360, 320,
+
             // MS-DOS 2.11 for AT&T
             720,
+
             // MS-DOS 3.30 for DeLL
             720, 640, 2400, 1440, 2880, 360, 320,
+
             // MS-DOS 3.10 for Epson
             720, 640, 2400,
+
             // MS-DOS 3.20 for Epson
             720, 640, 2400, 1440, 360, 320,
+
             // MS-DOS 3.20 for HP
             720, 640, 2400, 1440, 2880, 360, 320,
+
             // MS-DOS 3.21 for Hyosung
             720, 640, 2400, 1440, 2880, 360, 320,
+
             // MS-DOS 3.21 for Kaypro
             720, 640, 2400, 1440, 2880, 360, 320,
+
             // MS-DOS 3.10 for Olivetti
             720, 2400, 360,
+
             // MS-DOS 3.30 for Toshiba
             720, 640, 2400, 1440, 2880, 360, 320,
+
             // MS-DOS 4.01 for Toshiba
             720, 640, 2400, 1440, 2880, 360, 320,
+
             // Novell DOS 7.00
             720, 640, 2400, 1440, 5760, 2880, 360, 320,
+
             // OpenDOS 7.01
             720, 640, 2400, 1440, 5760, 2880, 360, 320,
+
             // PC-DOS 2.00
             720,
+
             // PC-DOS 2.10
             720,
+
             // PC-DOS 2000
             720, 640, 2400, 1440, 5760, 2880, 360, 320,
+
             // PC-DOS 3.00
             2400,
+
             // PC-DOS 3.10
             2400,
+
             // PC-DOS 3.30
             2400, 2880,
+
             // PC-DOS 4.00
             2400, 2880,
+
             // PC-DOS 5.00
             720, 640, 2400, 1440, 5760, 2880, 360, 320,
+
             // PC-DOS 5.02
             720, 640, 2400, 1440, 5760, 2880, 360, 320,
+
             // PC-DOS 6.10
             720, 640, 2400, 1440, 5760, 2880, 360, 320,
+
             // PC-DOS 6.30
             720, 640, 2400, 1440, 5760, 2880, 360, 320,
+
             // mkfs.vfat
             2400, 1440, 5760, 2880,
+
             // mkfs.vfat for Atari
             2400, 1440, 5760, 2880,
+
             // Microsoft OS/2 1.00 for Tandy
             720, 2400, 1440, 2880,
+
             // Microsoft OS/2 1.10 for AST
             720, 2400, 1440, 2880,
+
             // Microsoft OS/2 1.10 for Nokia
             720, 2400, 1440, 2880,
+
             // Microsoft OS/2 1.21
             720, 2400, 1440, 2880,
+
             // Microsoft OS/2 1.30.1
             720, 2400, 1440, 5760, 2880,
+
             // OS/2 1.20
             720, 2400, 1440, 2880,
+
             // OS/2 1.30
             720, 2400, 1440, 2880,
+
             // OS/2 2.00
             720, 2400, 1440, 5760, 2880,
+
             // OS/2 2.10
             720, 2400, 1440, 5760, 2880,
+
             // OS/2 2.11
             720, 2400, 1440, 5760, 2880,
+
             // OS/2 Warp 3
             2400, 1440, 5760, 2880,
+
             // OS/2 Warp 4
             2400, 1440, 5760, 2880,
+
             // eComStation
             2400, 1440, 5760, 2880, 2880,
+
             // Windows 95
             640, 720, 2400, 1440, 5760, 2880, 320, 360,
+
             // Windows 95 OSR 2
             640, 720, 2400, 1440, 5760, 2880, 320, 360,
+
             // Windows 95 OSR 2.1
             640, 720, 2400, 1440, 5760, 2880, 320, 360,
+
             // Windows 95 OSR 2.5
             640, 720, 2400, 1440, 5760, 2880, 320, 360,
+
             // Windows 98
             640, 720, 2400, 1440, 5760, 2880, 320, 360,
+
             // Windows 98 Second Edition
             640, 720, 2400, 1440, 5760, 2880, 320, 360,
+
             // Windows Me
             720, 2400, 1440, 5760, 2880,
+
             // Windows NT 3.10
             2400, 1440, 5760, 2880,
+
             // Windows NT 3.50
             2400, 1440, 5760, 2880,
+
             // Windows NT 3.51
             2400, 1440, 5760, 2880,
+
             // Windows NT 4.00
             720, 2400, 1440, 5760, 2880, 360,
+
             // Windows 2000
             720, 2400, 1440, 5760, 2880,
+
             // Windows Vista
             720, 2400, 1440, 5760, 2880,
+
             // BeOS R4.5
             2880,
+
             // Hatari
             720, 800, 880, 1440, 1600, 1760, 5760, 2880,
+
             // Atari TOS 1.04
             720, 1440,
+
             // NetBSD 1.6
             1440, 2880,
+
             // NeXTStep 3.3
             1440, 2880,
+
             // OpenStep for Mach 4.0
             1440, 2880,
+
             // OpenStep for Mach 4.2
             1440, 2880,
+
             // Solaris 2.4
             1440, 2880,
+
             // COHERENT UNIX 4.2.10
             720, 2400, 1440, 2880,
+
             // SCO OpenServer 5.0.7Hw
             2400, 1440, 2880,
+
             // Epson MS-DOS 5.00 for PC-98
             1440, 1232,
+
             // NEC MS-DOS 3.30 for PC-98
             1440, 1232,
+
             // NEC MS-DOS 5.00 for PC-98
             1440, 1232,
+
             // NEC MS-DOS 6.20 for PC-98
             1440, 1232,
+
             // GEOS 1.2
             2400,
+
             // GEOS 2.0
             2880,
+
             // GEOS 3.1
             2880,
+
             // GEOS 3.2
             2880,
+
             // GEOS 4.1
             2880
         };
@@ -703,180 +967,268 @@ namespace Aaru.Tests.Filesystems
         {
             // Concurrent DOS 6.00
             512, 512, 512,
+
             // DR-DOS 3.40
             512, 512, 512, 512, 512, 512, 512,
+
             // DR-DOS 3.41
             512, 512, 512, 512, 512, 512, 512,
+
             // DR-DOS 5.00
             512, 512, 512, 512, 512, 512, 512,
+
             // DR-DOS 6.00
             512, 512, 512, 512, 512, 512, 512, 512,
+
             // DR-DOS 7.02
             512, 512, 512, 512, 512, 512, 512, 512,
+
             // DR-DOS 7.03
             512, 512, 512, 512, 512, 512,
+
             // DR-DOS 8.00
             512, 512, 512, 512, 512, 512, 512, 512,
+
             // MS-DOS 3.30A
             512, 512, 512, 512, 512, 512, 512,
+
             // MS-DOS 3.31
             512, 512, 512, 512, 512, 512, 512,
+
             // MS-DOS 4.01
             512, 512, 512, 512, 512, 512, 512,
+
             // MS-DOS 5.00
             512, 512, 512, 512, 512, 512, 512, 512,
+
             // MS-DOS 6.00
             512, 512, 512, 512, 512, 512, 512, 512,
+
             // MS-DOS 6.20
             512, 512, 512, 512, 512, 512, 512, 512,
+
             // MS-DOS 6.20 RC1
             512, 512, 512, 512, 512, 512, 512, 512,
+
             // MS-DOS 6.21
             512, 512, 512, 512, 512, 512, 512, 512,
+
             // MS-DOS 6.22
             512, 512, 512, 512, 512, 512, 512, 512,
+
             // MS-DOS 7.10
             512, 512, 512, 512, 512, 512, 512, 512,
+
             // MS-DOS 3.20 for Amstrad
             512, 512, 512, 512, 512, 512,
+
             // MS-DOS 2.11 for AT&T
             512,
+
             // MS-DOS 3.30 for DeLL
             512, 512, 512, 512, 512, 512, 512,
+
             // MS-DOS 3.10 for Epson
             512, 512, 512,
+
             // MS-DOS 3.20 for Epson
             512, 512, 512, 512, 512, 512,
+
             // MS-DOS 3.20 for HP
             512, 512, 512, 512, 512, 512, 512,
+
             // MS-DOS 3.21 for Hyosung
             512, 512, 512, 512, 512, 512, 512,
+
             // MS-DOS 3.21 for Kaypro
             512, 512, 512, 512, 512, 512, 512,
+
             // MS-DOS 3.10 for Olivetti
             512, 512, 512,
+
             // MS-DOS 3.30 for Toshiba
             512, 512, 512, 512, 512, 512, 512,
+
             // MS-DOS 4.01 for Toshiba
             512, 512, 512, 512, 512, 512, 512,
+
             // Novell DOS 7.00
             512, 512, 512, 512, 512, 512, 512, 512,
+
             // OpenDOS 7.01
             512, 512, 512, 512, 512, 512, 512, 512,
+
             // PC-DOS 2.00
             512,
+
             // PC-DOS 2.10
             512,
+
             // PC-DOS 2000
             512, 512, 512, 512, 512, 512, 512, 512,
+
             // PC-DOS 3.00
             512,
+
             // PC-DOS 3.10
             512,
+
             // PC-DOS 3.30
             512, 512,
+
             // PC-DOS 4.00
             512, 512,
+
             // PC-DOS 5.00
             512, 512, 512, 512, 512, 512, 512, 512,
+
             // PC-DOS 5.02
             512, 512, 512, 512, 512, 512, 512, 512,
+
             // PC-DOS 6.10
             512, 512, 512, 512, 512, 512, 512, 512,
+
             // PC-DOS 6.30
             512, 512, 512, 512, 512, 512, 512, 512,
+
             // mkfs.vfat
             512, 512, 512, 512,
+
             // mkfs.vfat for Atari
             512, 512, 512, 512,
+
             // Microsoft OS/2 1.00 for Tandy
             512, 512, 512, 512,
+
             // Microsoft OS/2 1.10 for AST
             512, 512, 512, 512,
+
             // Microsoft OS/2 1.10 for Nokia
             512, 512, 512, 512,
+
             // Microsoft OS/2 1.21
             512, 512, 512, 512,
+
             // Microsoft OS/2 1.30.1
             512, 512, 512, 512, 512,
+
             // OS/2 1.20
             512, 512, 512, 512,
+
             // OS/2 1.30
             512, 512, 512, 512,
+
             // OS/2 2.00
             512, 512, 512, 512, 512,
+
             // OS/2 2.10
             512, 512, 512, 512, 512,
+
             // OS/2 2.11
             512, 512, 512, 512, 512,
+
             // OS/2 Warp 3
             512, 512, 512, 512,
+
             // OS/2 Warp 4
             512, 512, 512, 512,
+
             // eComStation
             512, 512, 512, 512, 512,
+
             // Windows 95
             512, 512, 512, 512, 512, 512, 512, 512,
+
             // Windows 95 OSR 2
             512, 512, 512, 512, 512, 512, 512, 512,
+
             // Windows 95 OSR 2.1
             512, 512, 512, 512, 512, 512, 512, 512,
+
             // Windows 95 OSR 2.5
             512, 512, 512, 512, 512, 512, 512, 512,
+
             // Windows 98
             512, 512, 512, 512, 512, 512, 512, 512,
+
             // Windows 98 Second Edition
             512, 512, 512, 512, 512, 512, 512, 512,
+
             // Windows Me
             512, 512, 512, 512, 512,
+
             // Windows NT 3.10
             512, 512, 512, 512,
+
             // Windows NT 3.50
             512, 512, 512, 512,
+
             // Windows NT 3.51
             512, 512, 512, 512,
+
             // Windows NT 4.00
             512, 512, 512, 512, 512, 512,
+
             // Windows 2000
             512, 512, 512, 512, 512,
+
             // Windows Vista
             512, 512, 512, 512, 512,
+
             // BeOS R4.5
             512,
+
             // Hatari
             512, 512, 512, 512, 512, 512, 512, 512,
+
             // Atari TOS 1.04
             512, 512,
+
             // NetBSD 1.6
             512, 512,
+
             // NeXTStep 3.3
             512, 512,
+
             // OpenStep for Mach 4.0
             512, 512,
+
             // OpenStep for Mach 4.2
             512, 512,
+
             // Solaris 2.4
             512, 512,
+
             // COHERENT UNIX 4.2.10
             512, 512, 512, 512,
+
             // SCO OpenServer 5.0.7Hw
             512, 512, 512,
+
             // Epson MS-DOS 5.00 for PC-98
             512, 1024,
+
             // NEC MS-DOS 3.30 for PC-98
             512, 1024,
+
             // NEC MS-DOS 5.00 for PC-98
             512, 1024,
+
             // NEC MS-DOS 6.20 for PC-98
             512, 1024,
+
             // GEOS 1.2
             512,
+
             // GEOS 2.0
             512,
+
             // GEOS 3.1
             512,
+
             // GEOS 3.2
             512,
+
             // GEOS 4.1
             512
         };
@@ -885,180 +1237,268 @@ namespace Aaru.Tests.Filesystems
         {
             // Concurrent DOS 6.00
             2400, 720, 2880,
+
             // DR-DOS 3.40
             360, 320, 2400, 720, 2880, 360, 320,
+
             // DR-DOS 3.41
             360, 320, 2400, 720, 2880, 360, 320,
+
             // DR-DOS 5.00
             360, 320, 2400, 720, 2880, 360, 320,
+
             // DR-DOS 6.00
             360, 320, 2400, 720, 2880, 2880, 360, 320,
+
             // DR-DOS 7.02
             360, 320, 2400, 720, 2880, 2880, 360, 320,
+
             // DR-DOS 7.03
             360, 320, 2400, 720, 2880, 2880,
+
             // DR-DOS 8.00
             360, 320, 2400, 720, 2880, 2880, 360, 320,
+
             // MS-DOS 3.30A
             360, 320, 2400, 720, 2880, 360, 320,
+
             // MS-DOS 3.31
             360, 320, 2400, 720, 2880, 360, 320,
+
             // MS-DOS 4.01
             360, 320, 2400, 720, 2880, 360, 320,
+
             // MS-DOS 5.00
             360, 320, 2400, 720, 2880, 2880, 360, 320,
+
             // MS-DOS 6.00
             360, 320, 2400, 720, 2880, 2880, 360, 320,
+
             // MS-DOS 6.20
             360, 320, 2400, 720, 2880, 2880, 360, 320,
+
             // MS-DOS 6.20 RC1
             360, 320, 2400, 720, 2880, 2880, 360, 320,
+
             // MS-DOS 6.21
             360, 320, 2400, 720, 2880, 2880, 360, 320,
+
             // MS-DOS 6.22
             360, 320, 2400, 720, 2880, 2880, 360, 320,
+
             // MS-DOS 7.10
             360, 320, 2400, 720, 2880, 2880, 360, 320,
+
             // MS-DOS 3.20 for Amstrad
             360, 320, 2400, 720, 360, 320,
+
             // MS-DOS 2.11 for AT&T
             360,
+
             // MS-DOS 3.30 for DeLL
             360, 320, 2400, 720, 2880, 360, 320,
+
             // MS-DOS 3.10 for Epson
             360, 320, 2400,
+
             // MS-DOS 3.20 for Epson
             360, 320, 2400, 720, 360, 320,
+
             // MS-DOS 3.20 for HP
             360, 320, 2400, 720, 2880, 360, 320,
+
             // MS-DOS 3.21 for Hyosung
             360, 320, 2400, 720, 2880, 360, 320,
+
             // MS-DOS 3.21 for Kaypro
             360, 320, 2400, 720, 2880, 360, 320,
+
             // MS-DOS 3.10 for Olivetti
             360, 2400, 360,
+
             // MS-DOS 3.30 for Toshiba
             360, 320, 2400, 720, 2880, 360, 320,
+
             // MS-DOS 4.01 for Toshiba
             360, 320, 2400, 720, 2880, 360, 320,
+
             // Novell DOS 7.00
             360, 320, 2400, 720, 2880, 2880, 360, 320,
+
             // OpenDOS 7.01
             360, 320, 2400, 720, 2880, 2880, 360, 320,
+
             // PC-DOS 2.00
             360,
+
             // PC-DOS 2.10
             360,
+
             // PC-DOS 2000
             360, 320, 2400, 720, 2880, 2880, 360, 320,
+
             // PC-DOS 3.00
             2400,
+
             // PC-DOS 3.10
             2400,
+
             // PC-DOS 3.30
             2400, 2880,
+
             // PC-DOS 4.00
             2400, 2880,
+
             // PC-DOS 5.00
             360, 320, 2400, 720, 2880, 2880, 360, 320,
+
             // PC-DOS 5.02
             360, 320, 2400, 720, 2880, 2880, 360, 320,
+
             // PC-DOS 6.10
             360, 320, 2400, 720, 2880, 2880, 360, 320,
+
             // PC-DOS 6.30
             360, 320, 2400, 720, 2880, 2880, 360, 320,
+
             // mkfs.vfat
             2400, 720, 2880, 2880,
+
             // mkfs.vfat for Atari
             1200, 720, 2880, 1440,
+
             // Microsoft OS/2 1.00 for Tandy
             360, 2400, 720, 2880,
+
             // Microsoft OS/2 1.10 for AST
             360, 2400, 720, 2880,
+
             // Microsoft OS/2 1.10 for Nokia
             360, 2400, 720, 2880,
+
             // Microsoft OS/2 1.21
             360, 2400, 720, 2880,
+
             // Microsoft OS/2 1.30.1
             360, 2400, 720, 2880, 2880,
+
             // OS/2 1.20
             360, 2400, 720, 2880,
+
             // OS/2 1.30
             360, 2400, 720, 2880,
+
             // OS/2 2.00
             360, 2400, 720, 2880, 2880,
+
             // OS/2 2.10
             360, 2400, 720, 2880, 2880,
+
             // OS/2 2.11
             360, 2400, 720, 2880, 2880,
+
             // OS/2 Warp 3
             2400, 720, 2880, 2880,
+
             // OS/2 Warp 4
             2400, 720, 2880, 2880,
+
             // eComStation
             2400, 720, 2880, 2880, 2880,
+
             // Windows 95
             320, 360, 2400, 720, 2880, 2880, 320, 360,
+
             // Windows 95 OSR 2
             320, 360, 2400, 720, 2880, 2880, 320, 360,
+
             // Windows 95 OSR 2.1
             320, 360, 2400, 720, 2880, 2880, 320, 360,
+
             // Windows 95 OSR 2.5
             320, 360, 2400, 720, 2880, 2880, 320, 360,
+
             // Windows 98
             320, 360, 2400, 720, 2880, 2880, 320, 360,
+
             // Windows 98 Second Edition
             320, 360, 2400, 720, 2880, 2880, 320, 360,
+
             // Windows Me
             360, 2400, 720, 2880, 2880,
+
             // Windows NT 3.10
             2400, 720, 2880, 2880,
+
             // Windows NT 3.50
             2400, 720, 2880, 2880,
+
             // Windows NT 3.51
             2400, 720, 2880, 2880,
+
             // Windows NT 4.00
             360, 2400, 720, 2880, 2880, 360,
+
             // Windows 2000
             360, 2400, 720, 2880, 2880,
+
             // Windows Vista
             360, 2400, 720, 2880, 2880,
+
             // BeOS R4.5
             2880,
+
             // Hatari
             360, 400, 440, 720, 800, 880, 2880, 1440,
+
             // Atari TOS 1.04
             360, 720,
+
             // NetBSD 1.6
             720, 2880,
+
             // NeXTStep 3.3
             720, 2880,
+
             // OpenStep for Mach 4.0
             720, 2880,
+
             // OpenStep for Mach 4.2
             720, 2880,
+
             // Solaris 2.4
             720, 2880,
+
             // COHERENT UNIX 4.2.10
             360, 2400, 720, 2880,
+
             // SCO OpenServer 5.0.7Hw
             2400, 1440, 2880,
+
             // Epson MS-DOS 5.00 for PC-98
             640, 1232,
+
             // NEC MS-DOS 3.30 for PC-98
             640, 1232,
+
             // NEC MS-DOS 5.00 for PC-98
             640, 1232,
+
             // NEC MS-DOS 6.20 for PC-98
             640, 1232,
+
             // GEOS 1.2
             2400,
+
             // GEOS 2.0
             2880,
+
             // GEOS 3.1
             2880,
+
             // GEOS 3.2
             2880,
+
             // GEOS 4.1
             2880
         };
@@ -1067,180 +1507,268 @@ namespace Aaru.Tests.Filesystems
         {
             // Concurrent DOS 6.00
             512, 1024, 512,
+
             // DR-DOS 3.40
             1024, 1024, 512, 1024, 512, 512, 512,
+
             // DR-DOS 3.41
             1024, 1024, 512, 1024, 512, 512, 512,
+
             // DR-DOS 5.00
             1024, 1024, 512, 1024, 512, 512, 512,
+
             // DR-DOS 6.00
             1024, 1024, 512, 1024, 1024, 512, 512, 512,
+
             // DR-DOS 7.02
             1024, 1024, 512, 1024, 1024, 512, 512, 512,
+
             // DR-DOS 7.03
             1024, 1024, 512, 1024, 1024, 512,
+
             // DR-DOS 8.00
             1024, 1024, 512, 1024, 1024, 512, 512, 512,
+
             // MS-DOS 3.30A
             1024, 1024, 512, 1024, 512, 512, 512,
+
             // MS-DOS 3.31
             1024, 1024, 512, 1024, 512, 512, 512,
+
             // MS-DOS 4.01
             1024, 1024, 512, 1024, 512, 512, 512,
+
             // MS-DOS 5.00
             1024, 1024, 512, 1024, 1024, 512, 512, 512,
+
             // MS-DOS 6.00
             1024, 1024, 512, 1024, 1024, 512, 512, 512,
+
             // MS-DOS 6.20
             1024, 1024, 512, 1024, 1024, 512, 512, 512,
+
             // MS-DOS 6.20 RC1
             1024, 1024, 512, 1024, 1024, 512, 512, 512,
+
             // MS-DOS 6.21
             1024, 1024, 512, 1024, 1024, 512, 512, 512,
+
             // MS-DOS 6.22
             1024, 1024, 512, 1024, 1024, 512, 512, 512,
+
             // MS-DOS 7.10
             1024, 1024, 512, 1024, 1024, 512, 512, 512,
+
             // MS-DOS 3.20 for Amstrad
             1024, 1024, 512, 1024, 512, 512,
+
             // MS-DOS 2.11 for AT&T
             1024,
+
             // MS-DOS 3.30 for DeLL
             1024, 1024, 512, 1024, 512, 512, 512,
+
             // MS-DOS 3.10 for Epson
             1024, 1024, 512,
+
             // MS-DOS 3.20 for Epson
             1024, 1024, 512, 1024, 512, 512,
+
             // MS-DOS 3.20 for HP
             1024, 1024, 512, 1024, 512, 512, 512,
+
             // MS-DOS 3.21 for Hyosung
             1024, 1024, 512, 1024, 512, 512, 512,
+
             // MS-DOS 3.21 for Kaypro
             1024, 1024, 512, 1024, 512, 512, 512,
+
             // MS-DOS 3.10 for Olivetti
             1024, 512, 512,
+
             // MS-DOS 3.30 for Toshiba
             1024, 1024, 512, 1024, 512, 512, 512,
+
             // MS-DOS 4.01 for Toshiba
             1024, 1024, 512, 1024, 512, 512, 512,
+
             // Novell DOS 7.00
             1024, 1024, 512, 1024, 1024, 512, 512, 512,
+
             // OpenDOS 7.01
             1024, 1024, 512, 1024, 1024, 512, 512, 512,
+
             // PC-DOS 2.00
             1024,
+
             // PC-DOS 2.10
             1024,
+
             // PC-DOS 2000
             1024, 1024, 512, 1024, 1024, 512, 512, 512,
+
             // PC-DOS 3.00
             512,
+
             // PC-DOS 3.10
             512,
+
             // PC-DOS 3.30
             512, 512,
+
             // PC-DOS 4.00
             512, 512,
+
             // PC-DOS 5.00
             1024, 1024, 512, 1024, 1024, 512, 512, 512,
+
             // PC-DOS 5.02
             1024, 1024, 512, 1024, 1024, 512, 512, 512,
+
             // PC-DOS 6.10
             1024, 1024, 512, 1024, 1024, 512, 512, 512,
+
             // PC-DOS 6.30
             1024, 1024, 512, 1024, 1024, 512, 512, 512,
+
             // mkfs.vfat
             512, 1024, 1024, 512,
+
             // mkfs.vfat for Atari
             1024, 1024, 1024, 1024,
+
             // Microsoft OS/2 1.00 for Tandy
             1024, 512, 1024, 512,
+
             // Microsoft OS/2 1.10 for AST
             1024, 512, 1024, 512,
+
             // Microsoft OS/2 1.10 for Nokia
             1024, 512, 1024, 512,
+
             // Microsoft OS/2 1.21
             1024, 512, 1024, 512,
+
             // Microsoft OS/2 1.30.1
             1024, 512, 1024, 1024, 512,
+
             // OS/2 1.20
             1024, 512, 1024, 512,
+
             // OS/2 1.30
             1024, 512, 1024, 512,
+
             // OS/2 2.00
             1024, 512, 1024, 1024, 512,
+
             // OS/2 2.10
             1024, 512, 1024, 1024, 512,
+
             // OS/2 2.11
             1024, 512, 1024, 1024, 512,
+
             // OS/2 Warp 3
             512, 1024, 1024, 512,
+
             // OS/2 Warp 4
             512, 1024, 1024, 512,
+
             // eComStation
             512, 1024, 1024, 512, 512,
+
             // Windows 95
             1024, 1024, 512, 1024, 1024, 512, 512, 512,
+
             // Windows 95 OSR 2
             1024, 1024, 512, 1024, 1024, 512, 512, 512,
+
             // Windows 95 OSR 2.1
             1024, 1024, 512, 1024, 1024, 512, 512, 512,
+
             // Windows 95 OSR 2.5
             1024, 1024, 512, 1024, 1024, 512, 512, 512,
+
             // Windows 98
             1024, 1024, 512, 1024, 1024, 512, 512, 512,
+
             // Windows 98 Second Edition
             1024, 1024, 512, 1024, 1024, 512, 512, 512,
+
             // Windows Me
             1024, 512, 1024, 1024, 512,
+
             // Windows NT 3.10
             512, 1024, 1024, 512,
+
             // Windows NT 3.50
             512, 1024, 1024, 512,
+
             // Windows NT 3.51
             512, 1024, 1024, 512,
+
             // Windows NT 4.00
             1024, 512, 1024, 512, 512, 512,
+
             // Windows 2000
             1024, 512, 1024, 1024, 512,
+
             // Windows Vista
             1024, 512, 1024, 1024, 512,
+
             // BeOS R4.5
             512,
+
             // Hatari
             1024, 1024, 1024, 1024, 1024, 1024, 1024, 1024,
+
             // Atari TOS 1.04
             1024, 1024,
+
             // NetBSD 1.6
             1024, 512,
+
             // NeXTStep 3.3
             1024, 512,
+
             // OpenStep for Mach 4.0
             1024, 512,
+
             // OpenStep for Mach 4.2
             1024, 512,
+
             // Solaris 2.4
             1024, 512,
+
             // COHERENT UNIX 4.2.10
             1024, 512, 1024, 512,
+
             // SCO OpenServer 5.0.7Hw
             512, 512, 512,
+
             // Epson MS-DOS 5.00 for PC-98
             1024, 1024,
+
             // NEC MS-DOS 3.30 for PC-98
             1024, 1024,
+
             // NEC MS-DOS 5.00 for PC-98
             1024, 1024,
+
             // NEC MS-DOS 6.20 for PC-98
             1024, 1024,
+
             // GEOS 1.2
             512,
+
             // GEOS 2.0
             512,
+
             // GEOS 3.1
             512,
+
             // GEOS 3.2
             512,
+
             // GEOS 4.1
             512
         };
@@ -1249,186 +1777,274 @@ namespace Aaru.Tests.Filesystems
         {
             // Concurrent DOS 6.00
             null, null, null,
+
             // DR-DOS 3.40
             null, null, null, null, null, null, null,
+
             // DR-DOS 3.41
             null, null, null, null, null, null, null,
+
             // DR-DOS 5.00
             null, null, null, null, null, null, null,
+
             // DR-DOS 6.00
             "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL",
             "VOLUMELABEL",
+
             // DR-DOS 7.02
             "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL",
             "VOLUMELABEL",
+
             // DR-DOS 7.03
             "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL",
+
             // DR-DOS 8.00
             "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL",
             "VOLUMELABEL",
+
             // MS-DOS 3.30A
             null, null, null, null, null, null, null,
+
             // MS-DOS 3.31
             null, null, null, null, null, null, null,
+
             // MS-DOS 4.01
             "VOLUMELABEL", null, "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", null,
+
             // MS-DOS 5.00
             "VOLUMELABEL", null, "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", null,
+
             // MS-DOS 6.00
             "VOLUMELABEL", null, "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", null,
+
             // MS-DOS 6.20
             "VOLUMELABEL", null, "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", null,
+
             // MS-DOS 6.20 RC1
             "VOLUMELABEL", null, "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", null,
+
             // MS-DOS 6.21
             "VOLUMELABEL", null, "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", null,
+
             // MS-DOS 6.22
             "VOLUMELABEL", null, "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", null,
+
             // MS-DOS 7.10
             "VOLUMELABEL", null, "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", null,
+
             // MS-DOS 3.20 for Amstrad
             null, null, null, null, null, null,
+
             // MS-DOS 2.11 for AT&T
             null,
+
             // MS-DOS 3.30 for DeLL
             null, null, null, null, null, null, null,
+
             // MS-DOS 3.10 for Epson
             null, null, null,
+
             // MS-DOS 3.20 for Epson
             null, null, null, null, null, null,
+
             // MS-DOS 3.20 for HP
             null, null, null, null, null, null, null,
+
             // MS-DOS 3.21 for Hyosung
             null, null, null, null, null, null, null,
+
             // MS-DOS 3.21 for Kaypro
             null, null, null, null, null, null, null,
+
             // MS-DOS 3.10 for Olivetti
             null, null, null,
+
             // MS-DOS 3.30 for Toshiba
             null, null, null, null, null, null, null,
+
             // MS-DOS 4.01 for Toshiba
             "VOLUMELABEL", "NO NAME    ", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "NO NAME    ",
+
             // Novell DOS 7.00
             "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL",
             "VOLUMELABEL",
+
             // OpenDOS 7.01
             "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL",
             "VOLUMELABEL",
+
             // PC-DOS 2.00
             null,
+
             // PC-DOS 2.10
             null,
+
             // PC-DOS 2000
             "VOLUMELABEL", null, "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", null,
+
             // PC-DOS 3.00
             null,
+
             // PC-DOS 3.10
             null,
+
             // PC-DOS 3.30
             null, null,
+
             // PC-DOS 4.00
             "VOLUMELABEL", "VOLUMELABEL",
+
             // PC-DOS 5.00
             "VOLUMELABEL", null, "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", null,
+
             // PC-DOS 5.02
             "VOLUMELABEL", null, "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", null,
+
             // PC-DOS 6.10
             "VOLUMELABEL", null, "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", null,
+
             // PC-DOS 6.30
             "VOLUMELABEL", null, "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", null,
+
             // mkfs.vfat
             "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL",
+
             // mkfs.vfat for Atari
             "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL",
+
             // Microsoft OS/2 1.00 for Tandy
             "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL",
+
             // Microsoft OS/2 1.10 for AST
             "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL",
+
             // Microsoft OS/2 1.10 for Nokia
             "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL",
+
             // Microsoft OS/2 1.21
             "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL",
+
             // Microsoft OS/2 1.30.1
             "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL",
+
             // OS/2 1.20
             "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL",
+
             // OS/2 1.30
             "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL",
+
             // OS/2 2.00
             "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL",
+
             // OS/2 2.10
             "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL",
+
             // OS/2 2.11
             "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL",
+
             // OS/2 Warp 3
             "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL",
+
             // OS/2 Warp 4
             "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL",
+
             // eComStation
             "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL",
+
             // Windows 95
             null, "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", null, "VOLUMELABEL",
+
             // Windows 95 OSR 2
             null, "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", null, "VOLUMELABEL",
+
             // Windows 95 OSR 2.1
             null, "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", null, "VOLUMELABEL",
+
             // Windows 95 OSR 2.5
             null, "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", null, "VOLUMELABEL",
+
             // Windows 98
             null, "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", null, "VOLUMELABEL",
+
             // Windows 98 Second Edition
             null, "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", null, "VOLUMELABEL",
+
             // Windows Me
             "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL",
+
             // Windows NT 3.10
             "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL",
+
             // Windows NT 3.50
             "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL",
+
             // Windows NT 3.51
             "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL",
+
             // Windows NT 4.00
             "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL",
+
             // Windows 2000
             "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL",
+
             // Windows Vista
             "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL",
+
             // BeOS R4.5
             "VOLUMELABEL",
+
             // Hatari
             "volumelabel", "volumelabel", "volumelabel", "volumelabel", "volumelabel", "volumelabel", "volumelabel",
             "volumelabel",
+
             // Atari TOS 1.04
             "VOLUMELABEL", "VOLUMELABEL",
+
             // NetBSD 1.6
             "VOLUMELABEL", "VOLUMELABEL",
+
             // NeXTStep 3.3
             "VOLUMELABEL", "VOLUME LABE",
+
             // OpenStep for Mach 4.0
             "VOLUMELABEL", "VOLUMELABEL",
+
             // OpenStep for Mach 4.2
             "VOLUMELABEL", "VOLUMELABEL",
+
             // Solaris 2.4
             null, null,
+
             // COHERENT UNIX 4.2.10
             "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL",
+
             // SCO OpenServer 5.0.7Hw
             null, null, null,
+
             // Epson MS-DOS 5.00 for PC-98
             "NO NAME    ", "NO NAME    ",
+
             // NEC MS-DOS 3.30 for PC-98
             null, null,
+
             // NEC MS-DOS 5.00 for PC-98
             "NO NAME    ", "NO NAME    ",
+
             // NEC MS-DOS 6.20 for PC-98
             "NO NAME    ", "NO NAME    ",
+
             // GEOS 1.2
             "GEOS12",
+
             // GEOS 2.0
             "GEOS20",
+
             // GEOS 3.1
             "GEOS32",
+
             // GEOS 3.2
             "NDO2000",
+
             // GEOS 4.1
             "GEOS41"
         };
@@ -1437,180 +2053,268 @@ namespace Aaru.Tests.Filesystems
         {
             // Concurrent DOS 6.00
             null, null, null,
+
             // DR-DOS 3.40
             null, null, null, null, null, null, null,
+
             // DR-DOS 3.41
             null, null, null, null, null, null, null,
+
             // DR-DOS 5.00
             null, null, null, null, null, null, null,
+
             // DR-DOS 6.00
             null, null, null, null, null, null, null, null,
+
             // DR-DOS 7.02
             "1BF63C69", "1BF70E75", "1BF7185F", "1BF80C4F", "1BF90F1D", "1BF82777", "1BF72430", "1BF72F1E",
+
             // DR-DOS 7.03
             "0C1A2013", "0CE22B5B", "0CEA1D3E", "0CEE102F", "0CEE3760", "0CEF2739",
+
             // DR-DOS 8.00
             "1BFD1977", "1BFD2D3F", "1BFD3531", "1BFC3231", "1BFA1D58", "1BFC117D", "1BFE0971", "1BFE1423",
+
             // MS-DOS 3.30A
             null, null, null, null, null, null, null,
+
             // MS-DOS 3.31
             null, null, null, null, null, null, null,
+
             // MS-DOS 4.01
             "122C190A", null, "2480190A", "2D471909", "0F5A1908", "2F3D190A", null,
+
             // MS-DOS 5.00
             "0B6018F8", null, "1E3518F8", "285A18FB", "231D18FE", "415118FC", "316118F8", null,
+
             // MS-DOS 6.00
             "067B18F6", null, "193418F6", "1F3A18F5", "165318F3", "172418F4", "234918F6", null,
+
             // MS-DOS 6.20
             "265418ED", null, "0B7018EE", "127418F0", "137F18F2", "364C18F0", "185C18EE", null,
+
             // MS-DOS 6.20 RC1
             "064B18EB", null, "192518EB", "244C18EA", "3C3118E7", "344118E9", "267E18EB", null,
+
             // MS-DOS 6.21
             "2A41181B", null, "0641181C", "3B26181C", "082518E2", "237118E1", "123F181C", null,
+
             // MS-DOS 6.22
             "317C1818", null, "0D3A1819", "3C251817", "387A1815", "185E1817", "18231819", null,
+
             // MS-DOS 7.10
             "1156180A", null, "2951180A", "3057180B", "2B4A1811", "344B180C", "352D180A", null,
+
             // MS-DOS 3.20 for Amstrad
             null, null, null, null, null, null,
+
             // MS-DOS 2.11 for AT&T
             null,
+
             // MS-DOS 3.30 for DeLL
             null, null, null, null, null, null, null,
+
             // MS-DOS 3.10 for Epson
             null, null, null,
+
             // MS-DOS 3.20 for Epson
             null, null, null, null, null, null,
+
             // MS-DOS 3.20 for HP
             null, null, null, null, null, null, null,
+
             // MS-DOS 3.21 for Hyosung
             null, null, null, null, null, null, null,
+
             // MS-DOS 3.21 for Kaypro
             null, null, null, null, null, null, null,
+
             // MS-DOS 3.10 for Olivetti
             null, null, null,
+
             // MS-DOS 3.30 for Toshiba
             null, null, null, null, null, null, null,
+
             // MS-DOS 4.01 for Toshiba
             "0B2519E7", "163419E7", "1E3119E7", "133919E9", "177419EA", "317E19E7", "3B7319E7",
+
             // Novell DOS 7.00
             "1BE7254C", "1BE73024", "1BE7397C", "1BE63635", "1BE51661", "1BE61143", "1BE80A5D", "1BE8144C",
+
             // OpenDOS 7.01
             "1BE93E2B", "1BEA234D", "1BEA325D", "1BEB294F", "1BEC2C2E", "1BEC0C5D", "1BEA3E60", "1BEB0E26",
+
             // PC-DOS 2.00
             null,
+
             // PC-DOS 2.10
             null,
+
             // PC-DOS 2000
             "2634100E", null, "3565100E", "3B6B1012", "3B2D1013", "1D491013", "4136100E", null,
+
             // PC-DOS 3.00
             null,
+
             // PC-DOS 3.10
             null,
+
             // PC-DOS 3.30
             null, null,
+
             // PC-DOS 4.00
             "3C240FE3", "2E3E0FE1",
+
             // PC-DOS 5.00
             "33260FF9", null, "11550FFA", "234F0FFB", "2F600FFC", "0D550FFC", "1D630FFA", null,
+
             // PC-DOS 5.02
             "06231000", null, "1A3E1000", "1F3B0FFF", "3D750FFD", "3F4F0FFE", "26471000", null,
+
             // PC-DOS 6.10
             "25551004", null, "3E5F1004", "142D1006", "17541007", "355A1006", "0D5E1005", null,
+
             // PC-DOS 6.30
             "2B22100C", null, "3B47100C", "0C55100C", "1B80100A", "0B59100B", "0A3A100D", null,
+
             // mkfs.vfat
             "20C279B1", "20FD9501", "2132D70A", "2118F1AA",
+
             // mkfs.vfat for Atari
             "83E030", "C53F06", "A154CD", "D54DEE",
+
             // Microsoft OS/2 1.00 for Tandy
             "9C170C15", "9BFB0C15", "9C13FC15", "9BF99C15",
+
             // Microsoft OS/2 1.10 for AST
             "66A42C15", "67696C15", "66DEBC15", "66DC4C15",
+
             // Microsoft OS/2 1.10 for Nokia
             "676B4C15", "67768C15", "9C12DC15", "66A74C15",
+
             // Microsoft OS/2 1.21
             "9C074C15", "66BCFC15", "66C1AC15", "66C7FC15",
+
             // Microsoft OS/2 1.30.1
             "66C47C15", "66CBEC15", "9C167C15", "9C147C15", "9C0FEC15",
+
             // OS/2 1.20
             "5BF5E015", "5BE61015", "5C26F015", "5C376015",
+
             // OS/2 1.30
             "5C418015", "5BE20015", "5C7F1015", "5B83C015",
+
             // OS/2 2.00
             "5C3BD015", "5B807015", "5BE69015", "5C187015", "5C390015",
+
             // OS/2 2.10
             "1BFCB414", "E6C6C414", "E6CCF414", "E6AF6414", "1C005414",
+
             // OS/2 2.11
             "E6AEB414", "1C00D414", "1C03B414", "E6C90414", "E6B6E414",
+
             // OS/2 Warp 3
             "E6AF7414", "E6D63414", "E6A65414", "E6AE6414",
+
             // OS/2 Warp 4
             "E6CD9414", "1BFAD414", "E6DFF414", "E6D4C414",
+
             // eComStation
             "E6CA5814", "E6CBC814", "E6B81814", "1C013814", "9BF37814",
+
             // Windows 95
             null, "3B360D0D", "24240D0D", "3C260D11", "30050D10", "275A0D11", null, "3B100D0F",
+
             // Windows 95 OSR 2
             null, "1C5B0D19", "11510D19", "0F1F0D15", "40200D17", "3D610D14", null, "280B0D19",
+
             // Windows 95 OSR 2.1
             null, "1F3B0D1C", "14470D1C", "1C510DE4", "2E250DE2", "10640DE4", null, "2B3E0D1C",
+
             // Windows 95 OSR 2.5
             null, "18190DFB", "0A240DFB", "1E320DE7", "33230DE8", "125B0DE7", null, "21410DFB",
+
             // Windows 98
             null, "40090E0F", "28140E0F", "0E620E0A", "14390E0D", "0E081246", null, "30600E10",
+
             // Windows 98 Second Edition
             null, "1B550EEC", "1B100EEB", "08410EE6", "0E0F0EE8", "325D0EE4", null, "13380EEC",
+
             // Windows Me
             "2F200F02", "103A0F01", "2F1C0EFC", "21570EFF", "07040EFB",
+
             // Windows NT 3.10
             "60EA50BC", "6C857D51", "4009440C", "30761EDC",
+
             // Windows NT 3.50
             "0C478404", "7CBEB35B", "7C1E8DCB", "ECB276AF",
+
             // Windows NT 3.51
             "482D8681", "8889C95E", "54DE6C39", "F47D2516",
+
             // Windows NT 4.00
             "D8CAAC1F", "E0BB6D70", "C08C3C60", "9C44B411", "4C7DD099", "4CD82982",
+
             // Windows 2000
             "4019989C", "78F30AF8", "E4217DDE", "80B3B996", "28043527",
+
             // Windows Vista
             "3C9F0BD2", "3A8E465C", "B2EFB822", "3C30C632", "16DAB07A",
+
             // BeOS R4.5
             "00000000",
+
             // Hatari
             "A82270", "D08917", "37AD91", "1ED910", "299DFE", "94AE59", "3A1757", "C08249",
+
             // Atari TOS 1.04
             "2356F0", "51C7A3",
+
             // NetBSD 1.6
             "EEB51A0C", "CCFD1A06",
+
             // NeXTStep 3.3
             null, null,
+
             // OpenStep for Mach 4.0
             null, null,
+
             // OpenStep for Mach 4.2
             null, null,
+
             // Solaris 2.4
             null, null,
+
             // COHERENT UNIX 4.2.10
             null, null, null, null,
+
             // SCO OpenServer 5.0.7Hw
             null, null, null,
+
             // Epson MS-DOS 5.00 for PC-98
             "27021316", "11021317",
+
             // NEC MS-DOS 3.30 for PC-98
             null, null,
+
             // NEC MS-DOS 5.00 for PC-98
             "1002120E", "41021209",
+
             // NEC MS-DOS 6.20 for PC-98
             "3D021418", "16021409",
+
             // GEOS 1.2
             "0000049C",
+
             // GEOS 2.0
             "8DC94C67",
+
             // GEOS 3.1
             "8E0D4C67",
+
             // GEOS 3.2
             "8EDB4C67",
+
             // GEOS 4.1
             "8D684C67"
         };
@@ -1619,180 +2323,268 @@ namespace Aaru.Tests.Filesystems
         {
             // Concurrent DOS 6.00
             "DIGITAL ", "DIGITAL ", "DIGITAL ",
+
             // DR-DOS 3.40
             "DIGITAL ", "DIGITAL ", "DIGITAL ", "DIGITAL ", "DIGITAL ", "DIGITAL ", "DIGITAL ",
+
             // DR-DOS 3.41
             "DIGITAL ", "DIGITAL ", "DIGITAL ", "DIGITAL ", "DIGITAL ", "DIGITAL ", "DIGITAL ",
+
             // DR-DOS 5.00
             "IBM  3.3", "IBM  3.3", "IBM  3.3", "IBM  3.3", "IBM  3.3", "IBM  3.3", "IBM  3.3",
+
             // DR-DOS 6.00
             "IBM  3.3", "IBM  3.3", "IBM  3.3", "IBM  3.3", "IBM  3.3", "IBM  3.3", "IBM  3.3", "IBM  3.3",
+
             // DR-DOS 7.02
             "DRDOS  7", "DRDOS  7", "DRDOS  7", "DRDOS  7", "DRDOS  7", "DRDOS  7", "DRDOS  7", "DRDOS  7",
+
             // DR-DOS 7.03
             "DRDOS  7", "DRDOS  7", "DRDOS  7", "DRDOS  7", "DRDOS  7", "DRDOS  7",
+
             // DR-DOS 8.00
             "DRDOS  7", "DRDOS  7", "DRDOS  7", "DRDOS  7", "DRDOS  7", "DRDOS  7", "DRDOS  7", "DRDOS  7",
+
             // MS-DOS 3.30A
             "MSDOS3.3", null, "MSDOS3.3", "MSDOS3.3", "MSDOS3.3", "MSDOS3.3", null,
+
             // MS-DOS 3.31
             "IBM  3.3", null, "IBM  3.3", "IBM  3.3", "IBM  3.3", "IBM  3.3", null,
+
             // MS-DOS 4.01
             "MSDOS4.0", null, "MSDOS4.0", "MSDOS4.0", "MSDOS4.0", "MSDOS4.0", null,
+
             // MS-DOS 5.00
             "MSDOS5.0", null, "MSDOS5.0", "MSDOS5.0", "MSDOS5.0", "MSDOS5.0", "MSDOS5.0", null,
+
             // MS-DOS 6.00
             "MSDOS5.0", null, "MSDOS5.0", "MSDOS5.0", "MSDOS5.0", "MSDOS5.0", "MSDOS5.0", null,
+
             // MS-DOS 6.20
             "MSDOS5.0", null, "MSDOS5.0", "MSDOS5.0", "MSDOS5.0", "MSDOS5.0", "MSDOS5.0", null,
+
             // MS-DOS 6.20 RC1
             "MSDOS5.0", null, "MSDOS5.0", "MSDOS5.0", "MSDOS5.0", "MSDOS5.0", "MSDOS5.0", null,
+
             // MS-DOS 6.21
             "MSDOS5.0", null, "MSDOS5.0", "MSDOS5.0", "MSDOS5.0", "MSDOS5.0", "MSDOS5.0", null,
+
             // MS-DOS 6.22
             "MSDOS5.0", null, "MSDOS5.0", "MSDOS5.0", "MSDOS5.0", "MSDOS5.0", "MSDOS5.0", null,
+
             // MS-DOS 7.10
             "MSWIN4.1", null, "MSWIN4.1", "MSWIN4.1", "MSWIN4.1", "MSWIN4.1", "MSWIN4.1", null,
+
             // MS-DOS 3.20 for Amstrad
             "MSDOS3.2", null, "MSDOS3.2", "MSDOS3.2", "MSDOS3.2", null,
+
             // MS-DOS 2.11 for AT&T
             "PSA 1.04",
+
             // MS-DOS 3.30 for DeLL
             "IBM  3.3", null, "IBM  3.3", "IBM  3.3", "IBM  3.3", "IBM  3.3", null,
+
             // MS-DOS 3.10 for Epson
             "EPS 3.10", "EPS 3.10", "EPS 3.10",
+
             // MS-DOS 3.20 for Epson
             "IBM  3.2", "IBM  3.2", "IBM  3.2", "IBM  3.2", "IBM  3.2", "IBM  3.2",
+
             // MS-DOS 3.20 for HP
             "MSDOS3.2", null, "MSDOS3.2", "MSDOS3.2", "MSDOS3.2", "MSDOS3.2", null,
+
             // MS-DOS 3.21 for Hyosung
             "MSDOS3.2", null, "MSDOS3.2", "MSDOS3.2", "MSDOS3.2", "MSDOS3.2", null,
+
             // MS-DOS 3.21 for Kaypro
             "MSDOS3.2", null, "MSDOS3.2", "MSDOS3.2", "MSDOS3.2", "MSDOS3.2", null,
+
             // MS-DOS 3.10 for Olivetti
             "IBM  3.1", "IBM  3.1", "IBM  3.1",
+
             // MS-DOS 3.30 for Toshiba
             "IBM  3.3", null, "IBM  3.3", "IBM  3.3", "IBM  3.3", "IBM  3.3", null,
+
             // MS-DOS 4.01 for Toshiba
             "T V4.00 ", "T V4.00 ", "T V4.00 ", "T V4.00 ", "T V4.00 ", "T V4.00 ", "T V4.00 ",
+
             // Novell DOS 7.00
             "NWDOS7.0", "NWDOS7.0", "NWDOS7.0", "NWDOS7.0", "NWDOS7.0", "NWDOS7.0", "NWDOS7.0", "NWDOS7.0",
+
             // OpenDOS 7.01
             "OPENDOS7", "OPENDOS7", "OPENDOS7", "OPENDOS7", "OPENDOS7", "OPENDOS7", "OPENDOS7", "OPENDOS7",
+
             // PC-DOS 2.00
             "IBM  2.0",
+
             // PC-DOS 2.10
             "IBM  2.0",
+
             // PC-DOS 2000
             "IBM  7.0", null, "IBM  7.0", "IBM  7.0", "IBM  7.0", "IBM  7.0", "IBM  7.0", null,
+
             // PC-DOS 3.00
             "IBM  3.0",
+
             // PC-DOS 3.10
             "IBM  3.1",
+
             // PC-DOS 3.30
             "IBM  3.3", "IBM  3.3",
+
             // PC-DOS 4.00
             "IBM  4.0", "IBM  4.0",
+
             // PC-DOS 5.00
             "IBM  5.0", null, "IBM  5.0", "IBM  5.0", "IBM  5.0", "IBM  5.0", "IBM  5.0", null,
+
             // PC-DOS 5.02
             "IBM  5.0", null, "IBM  5.0", "IBM  5.0", "IBM  5.0", "IBM  5.0", "IBM  5.0", null,
+
             // PC-DOS 6.10
             "IBM  6.0", null, "IBM  6.0", "IBM  6.0", "IBM  6.0", "IBM  6.0", "IBM  6.0", null,
+
             // PC-DOS 6.30
             "IBM  6.0", null, "IBM  6.0", "IBM  6.0", "IBM  6.0", "IBM  6.0", "IBM  6.0", null,
+
             // mkfs.vfat
             "mkfs.fat", "mkfs.fat", "mkfs.fat", "mkfs.fat",
+
             // mkfs.vfat for Atari
             "mkdosf", "mkdosf", "mkdosf", "mkdosf",
+
             // Microsoft OS/2 1.00 for Tandy
             "TAN 10.0", "TAN 10.0", "TAN 10.0", "TAN 10.0",
+
             // Microsoft OS/2 1.10 for AST
             "IBM 10.1", "IBM 10.1", "IBM 10.1", "IBM 10.1",
+
             // Microsoft OS/2 1.10 for Nokia
             "IBM 10.1", "IBM 10.1", "IBM 10.1", "IBM 10.1",
+
             // Microsoft OS/2 1.21
             "IBM 10.2", "IBM 10.2", "IBM 10.2", "IBM 10.2",
+
             // Microsoft OS/2 1.30.1
             "IBM 10.2", "IBM 10.2", "IBM 10.2", "IBM 10.2", "IBM 10.2",
+
             // OS/2 1.20
             "IBM 10.2", "IBM 10.2", "IBM 10.2", "IBM 10.2",
+
             // OS/2 1.30
             "IBM 10.2", "IBM 10.2", "IBM 10.2", "IBM 10.2",
+
             // OS/2 2.00
             "IBM 20.0", "IBM 20.0", "IBM 20.0", "IBM 20.0", "IBM 20.0",
+
             // OS/2 2.10
             "IBM 20.0", "IBM 20.0", "IBM 20.0", "IBM 20.0", "IBM 20.0",
+
             // OS/2 2.11
             "IBM 20.0", "IBM 20.0", "IBM 20.0", "IBM 20.0", "IBM 20.0",
+
             // OS/2 Warp 3
             "IBM 20.0", "IBM 20.0", "IBM 20.0", "IBM 20.0",
+
             // OS/2 Warp 4
             "IBM 20.0", "IBM 20.0", "IBM 20.0", "IBM 20.0",
+
             // eComStation
             "IBM 4.50", "IBM 4.50", "IBM 4.50", "IBM 4.50", "IBM 4.50",
+
             // Windows 95
             null, "MSWIN4.0", "MSWIN4.0", "MSWIN4.0", "MSWIN4.0", "MSWIN4.0", null, "MSWIN4.0",
+
             // Windows 95 OSR 2
             null, "MSWIN4.1", "MSWIN4.1", "MSWIN4.1", "MSWIN4.1", "MSWIN4.1", null, "MSWIN4.1",
+
             // Windows 95 OSR 2.1
             null, "MSWIN4.1", "MSWIN4.1", "MSWIN4.1", "MSWIN4.1", "MSWIN4.1", null, "MSWIN4.1",
+
             // Windows 95 OSR 2.5
             null, "MSWIN4.1", "MSWIN4.1", "MSWIN4.1", "MSWIN4.1", "MSWIN4.1", null, "MSWIN4.1",
+
             // Windows 98
             null, "MSWIN4.1", "MSWIN4.1", "MSWIN4.1", "MSWIN4.1", "MSWIN4.1", null, "MSWIN4.1",
+
             // Windows 98 Second Edition
             null, "MSWIN4.1", "MSWIN4.1", "MSWIN4.1", "MSWIN4.1", "MSWIN4.1", null, "MSWIN4.1",
+
             // Windows Me
             "MSWIN4.1", "MSWIN4.1", "MSWIN4.1", "MSWIN4.1", "MSWIN4.1",
+
             // Windows NT 3.10
             "MSDOS5.0", "MSDOS5.0", "MSDOS5.0", "MSDOS5.0",
+
             // Windows NT 3.50
             "MSDOS5.0", "MSDOS5.0", "MSDOS5.0", "MSDOS5.0",
+
             // Windows NT 3.51
             "MSDOS5.0", "MSDOS5.0", "MSDOS5.0", "MSDOS5.0",
+
             // Windows NT 4.00
             "MSDOS5.0", "MSDOS5.0", "MSDOS5.0", "MSDOS5.0", "MSDOS5.0", "MSDOS5.0",
+
             // Windows 2000
             "MSDOS5.0", "MSDOS5.0", "MSDOS5.0", "MSDOS5.0", "MSDOS5.0",
+
             // Windows Vista
             "MSDOS5.0", "MSDOS5.0", "MSDOS5.0", "MSDOS5.0", "MSDOS5.0",
+
             // BeOS R4.5
             "BeOS    ",
+
             // Hatari
             "NNNNNN", "NNNNNN", "NNNNNN", "NNNNNN", "NNNNNN", "NNNNNN", "NNNNNN", "NNNNNN",
+
             // Atari TOS 1.04
             "NNNNNN", "NNNNNN",
+
             // NetBSD 1.6
             "BSD  4.4", "BSD  4.4",
+
             // NeXTStep 3.3
             "NEXT    ", "NEXT    ",
+
             // OpenStep for Mach 4.0
             "NEXT    ", "NEXT    ",
+
             // OpenStep for Mach 4.2
             "NEXT    ", "NEXT    ",
+
             // Solaris 2.4
             "MSDOS3.3", "MSDOS3.3",
+
             // COHERENT UNIX 4.2.10
             "COHERENT", "COHERENT", "COHERENT", "COHERENT",
+
             // SCO OpenServer 5.0.7Hw
             "SCO BOOT", "SCO BOOT", "SCO BOOT",
+
             // Epson MS-DOS 5.00 for PC-98
             "EPSON5.0", "EPSON5.0",
+
             // NEC MS-DOS 3.30 for PC-98
             "NEC 2.00", "NEC 2.00",
+
             // NEC MS-DOS 5.00 for PC-98
             "NEC  5.0", "NEC  5.0",
+
             // NEC MS-DOS 6.20 for PC-98
             "NEC  5.0", "NEC  5.0",
+
             // GEOS 1.2
             "GEOWORKS",
+
             // GEOS 2.0
             "GEOWORKS",
+
             // GEOS 3.1
             "GEOWORKS",
+
             // GEOS 3.2
             "GEOWORKS",
+
             // GEOS 4.1
             "GEOWORKS"
         };
@@ -1806,25 +2598,26 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new ZZZRawImage();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(mediatypes[i], image.Info.MediaType,  testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(mediatypes[i], image.Info.MediaType, testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 IFilesystem fs = new FAT();
-                Partition wholePart = new Partition
+
+                var wholePart = new Partition
                 {
-                    Name   = "Whole device",
-                    Length = image.Info.Sectors,
-                    Size   = image.Info.Sectors * image.Info.SectorSize
+                    Name = "Whole device", Length = image.Info.Sectors,
+                    Size = image.Info.Sectors * image.Info.SectorSize
                 };
+
                 Assert.AreEqual(true, fs.Identify(image, wholePart), testfiles[i]);
                 fs.GetInformation(image, wholePart, out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,         testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,      testfiles[i]);
-                Assert.AreEqual("FAT12",         fs.XmlFsType.Type,             testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,       testfiles[i]);
-                Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial,     testfiles[i]);
-                Assert.AreEqual(oemid[i],        fs.XmlFsType.SystemIdentifier, testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual("FAT12", fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
+                Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
+                Assert.AreEqual(oemid[i], fs.XmlFsType.SystemIdentifier, testfiles[i]);
             }
         }
     }
@@ -1832,21 +2625,45 @@ namespace Aaru.Tests.Filesystems
     [TestFixture]
     public class Fat12Apm
     {
-        readonly string[] testfiles = {"macosx_10.11.vdi.lz"};
+        readonly string[] testfiles =
+        {
+            "macosx_10.11.vdi.lz"
+        };
 
-        readonly ulong[] sectors = {16384};
+        readonly ulong[] sectors =
+        {
+            16384
+        };
 
-        readonly uint[] sectorsize = {512};
+        readonly uint[] sectorsize =
+        {
+            512
+        };
 
-        readonly long[] clusters = {4076};
+        readonly long[] clusters =
+        {
+            4076
+        };
 
-        readonly int[] clustersize = {2048};
+        readonly int[] clustersize =
+        {
+            2048
+        };
 
-        readonly string[] volumename = {"VOLUMELABEL"};
+        readonly string[] volumename =
+        {
+            "VOLUMELABEL"
+        };
 
-        readonly string[] volumeserial = {"32181F09"};
+        readonly string[] volumeserial =
+        {
+            "32181F09"
+        };
 
-        readonly string[] oemid = {"BSD  4.4"};
+        readonly string[] oemid =
+        {
+            "BSD  4.4"
+        };
 
         [Test]
         public void Test()
@@ -1857,28 +2674,30 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new Vdi();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 IFilesystem     fs         = new FAT();
                 int             part       = -1;
+
                 for(int j = 0; j < partitions.Count; j++)
                     if(partitions[j].Type == "DOS_FAT_12")
                     {
                         part = j;
+
                         break;
                     }
 
                 Assert.AreNotEqual(-1, part, $"Partition not found on {testfiles[i]}");
                 Assert.AreEqual(true, fs.Identify(image, partitions[part]), testfiles[i]);
                 fs.GetInformation(image, partitions[part], out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,         testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,      testfiles[i]);
-                Assert.AreEqual("FAT12",         fs.XmlFsType.Type,             testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,       testfiles[i]);
-                Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial,     testfiles[i]);
-                Assert.AreEqual(oemid[i],        fs.XmlFsType.SystemIdentifier, testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual("FAT12", fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
+                Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
+                Assert.AreEqual(oemid[i], fs.XmlFsType.SystemIdentifier, testfiles[i]);
             }
         }
     }
@@ -1886,21 +2705,45 @@ namespace Aaru.Tests.Filesystems
     [TestFixture]
     public class Fat12Gpt
     {
-        readonly string[] testfiles = {"macosx_10.11.vdi.lz"};
+        readonly string[] testfiles =
+        {
+            "macosx_10.11.vdi.lz"
+        };
 
-        readonly ulong[] sectors = {16384};
+        readonly ulong[] sectors =
+        {
+            16384
+        };
 
-        readonly uint[] sectorsize = {512};
+        readonly uint[] sectorsize =
+        {
+            512
+        };
 
-        readonly long[] clusters = {4076};
+        readonly long[] clusters =
+        {
+            4076
+        };
 
-        readonly int[] clustersize = {2048};
+        readonly int[] clustersize =
+        {
+            2048
+        };
 
-        readonly string[] volumename = {"VOLUMELABEL"};
+        readonly string[] volumename =
+        {
+            "VOLUMELABEL"
+        };
 
-        readonly string[] volumeserial = {"66901F1B"};
+        readonly string[] volumeserial =
+        {
+            "66901F1B"
+        };
 
-        readonly string[] oemid = {"BSD  4.4"};
+        readonly string[] oemid =
+        {
+            "BSD  4.4"
+        };
 
         [Test]
         public void Test()
@@ -1911,28 +2754,30 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new Vdi();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 IFilesystem     fs         = new FAT();
                 int             part       = -1;
+
                 for(int j = 0; j < partitions.Count; j++)
                     if(partitions[j].Type == "Microsoft Basic data")
                     {
                         part = j;
+
                         break;
                     }
 
                 Assert.AreNotEqual(-1, part, $"Partition not found on {testfiles[i]}");
                 Assert.AreEqual(true, fs.Identify(image, partitions[part]), testfiles[i]);
                 fs.GetInformation(image, partitions[part], out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,         testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,      testfiles[i]);
-                Assert.AreEqual("FAT12",         fs.XmlFsType.Type,             testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,       testfiles[i]);
-                Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial,     testfiles[i]);
-                Assert.AreEqual(oemid[i],        fs.XmlFsType.SystemIdentifier, testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual("FAT12", fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
+                Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
+                Assert.AreEqual(oemid[i], fs.XmlFsType.SystemIdentifier, testfiles[i]);
             }
         }
     }
@@ -1942,20 +2787,19 @@ namespace Aaru.Tests.Filesystems
     {
         readonly string[] testfiles =
         {
-            "compaqmsdos331.vdi.lz", "drdos_3.40.vdi.lz", "drdos_3.41.vdi.lz", "drdos_5.00.vdi.lz",
-            "drdos_6.00.vdi.lz", "drdos_7.02.vdi.lz", "drdos_7.03.vdi.lz", "drdos_8.00.vdi.lz", "msdos331.vdi.lz",
-            "msdos401.vdi.lz", "msdos500.vdi.lz", "msdos600.vdi.lz", "msdos620rc1.vdi.lz", "msdos620.vdi.lz",
-            "msdos621.vdi.lz", "msdos622.vdi.lz", "msdos710.vdi.lz", "novelldos_7.00.vdi.lz", "opendos_7.01.vdi.lz",
-            "pcdos2000.vdi.lz", "pcdos200.vdi.lz", "pcdos210.vdi.lz", "pcdos300.vdi.lz", "pcdos310.vdi.lz",
-            "pcdos330.vdi.lz", "pcdos400.vdi.lz", "pcdos500.vdi.lz", "pcdos502.vdi.lz", "pcdos610.vdi.lz",
-            "pcdos630.vdi.lz", "toshibamsdos330.vdi.lz", "toshibamsdos401.vdi.lz", "msos2_1.21.vdi.lz",
-            "msos2_1.30.1.vdi.lz", "multiuserdos_7.22r4.vdi.lz", "os2_1.20.vdi.lz", "os2_1.30.vdi.lz",
-            "os2_6.307.vdi.lz", "os2_6.514.vdi.lz", "os2_6.617.vdi.lz", "os2_8.162.vdi.lz", "os2_9.023.vdi.lz",
-            "ecs.vdi.lz", "macosx_10.11.vdi.lz", "win10.vdi.lz", "win2000.vdi.lz", "win95.vdi.lz",
-            "win95osr2.1.vdi.lz", "win95osr2.5.vdi.lz", "win95osr2.vdi.lz", "win98.vdi.lz", "win98se.vdi.lz",
-            "winme.vdi.lz", "winnt_3.10.vdi.lz", "winnt_3.50.vdi.lz", "winnt_3.51.vdi.lz", "winnt_4.00.vdi.lz",
-            "winvista.vdi.lz", "beos_r4.5.vdi.lz", "linux.vdi.lz", "freebsd_6.1.vdi.lz", "freebsd_7.0.vdi.lz",
-            "freebsd_8.2.vdi.lz"
+            "compaqmsdos331.vdi.lz", "drdos_3.40.vdi.lz", "drdos_3.41.vdi.lz", "drdos_5.00.vdi.lz", "drdos_6.00.vdi.lz",
+            "drdos_7.02.vdi.lz", "drdos_7.03.vdi.lz", "drdos_8.00.vdi.lz", "msdos331.vdi.lz", "msdos401.vdi.lz",
+            "msdos500.vdi.lz", "msdos600.vdi.lz", "msdos620rc1.vdi.lz", "msdos620.vdi.lz", "msdos621.vdi.lz",
+            "msdos622.vdi.lz", "msdos710.vdi.lz", "novelldos_7.00.vdi.lz", "opendos_7.01.vdi.lz", "pcdos2000.vdi.lz",
+            "pcdos200.vdi.lz", "pcdos210.vdi.lz", "pcdos300.vdi.lz", "pcdos310.vdi.lz", "pcdos330.vdi.lz",
+            "pcdos400.vdi.lz", "pcdos500.vdi.lz", "pcdos502.vdi.lz", "pcdos610.vdi.lz", "pcdos630.vdi.lz",
+            "toshibamsdos330.vdi.lz", "toshibamsdos401.vdi.lz", "msos2_1.21.vdi.lz", "msos2_1.30.1.vdi.lz",
+            "multiuserdos_7.22r4.vdi.lz", "os2_1.20.vdi.lz", "os2_1.30.vdi.lz", "os2_6.307.vdi.lz", "os2_6.514.vdi.lz",
+            "os2_6.617.vdi.lz", "os2_8.162.vdi.lz", "os2_9.023.vdi.lz", "ecs.vdi.lz", "macosx_10.11.vdi.lz",
+            "win10.vdi.lz", "win2000.vdi.lz", "win95.vdi.lz", "win95osr2.1.vdi.lz", "win95osr2.5.vdi.lz",
+            "win95osr2.vdi.lz", "win98.vdi.lz", "win98se.vdi.lz", "winme.vdi.lz", "winnt_3.10.vdi.lz",
+            "winnt_3.50.vdi.lz", "winnt_3.51.vdi.lz", "winnt_4.00.vdi.lz", "winvista.vdi.lz", "beos_r4.5.vdi.lz",
+            "linux.vdi.lz", "freebsd_6.1.vdi.lz", "freebsd_7.0.vdi.lz", "freebsd_8.2.vdi.lz"
         };
 
         readonly ulong[] sectors =
@@ -1976,54 +2820,53 @@ namespace Aaru.Tests.Filesystems
 
         readonly long[] clusters =
         {
-            1000, 3654, 3520, 3520, 3520, 3520, 3520, 3520, 1000, 1000, 1000, 1000, 1000, 1000, 1000, 1000, 2008,
-            3520, 3520, 4024, 4031, 4031, 4024, 4024, 4024, 4024, 4024, 4024, 4024, 4024, 1000, 1000, 2008, 2008,
-            2008, 2008, 2008, 2008, 2008, 2008, 2008, 2008, 1890, 4079, 3552, 4088, 2008, 2008, 2008, 2008, 2044,
-            2044, 2044, 4016, 2044, 2044, 4016, 3072, 2040, 3584, 2044, 2044, 2044
+            1000, 3654, 3520, 3520, 3520, 3520, 3520, 3520, 1000, 1000, 1000, 1000, 1000, 1000, 1000, 1000, 2008, 3520,
+            3520, 4024, 4031, 4031, 4024, 4024, 4024, 4024, 4024, 4024, 4024, 4024, 1000, 1000, 2008, 2008, 2008, 2008,
+            2008, 2008, 2008, 2008, 2008, 2008, 1890, 4079, 3552, 4088, 2008, 2008, 2008, 2008, 2044, 2044, 2044, 4016,
+            2044, 2044, 4016, 3072, 2040, 3584, 2044, 2044, 2044
         };
 
         readonly int[] clustersize =
         {
-            4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096,
-            4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096,
-            4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 2048, 2048, 2048, 4096, 4096, 4096, 4096, 4096,
-            4096, 4096, 2048, 4096, 4096, 2048, 2048, 4096, 2048, 4096, 4096, 4096
+            4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096,
+            4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096,
+            4096, 4096, 4096, 4096, 4096, 4096, 4096, 2048, 2048, 2048, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 2048,
+            4096, 4096, 2048, 2048, 4096, 2048, 4096, 4096, 4096
         };
 
         readonly string[] volumename =
         {
             null, "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL",
             "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL",
-            "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", null, null,
-            null, null, null, "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL",
+            "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", null, null, null,
+            null, null, "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL",
             "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL",
             "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL",
             "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL",
             "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL",
-            "VOLUMELABEL", "VolumeLabel", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL"
+            "VolumeLabel", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL"
         };
 
         readonly string[] volumeserial =
         {
-            null, null, null, null, null, null, null, "1BFB1273", null, "407D1907", "345D18FB", "332518F4",
-            "395718E9", "076718EF", "1371181B", "23281816", "2F781809", null, null, "294F100F", null, null, null,
-            null, null, "0F340FE4", "1A5E0FF9", "1D2F0FFE", "076C1004", "2C481009", null, "3C2319E8", "66CC3C15",
-            "66A54C15", null, "5C578015", "5B845015", "5C4BF015", "E6B5F414", "E6B15414", "E6A41414", "E6A39414",
-            "E6B0B814", "26A21EF4", "74F4921D", "C4B64D11", "29200D0C", "234F0DE4", "074C0DFC", "33640D18",
-            "0E121460", "094C0EED", "38310F02", "50489A1B", "2CE52101", "94313E7E", "BC184FE6", "BAD08A1E",
-            "00000000", "8D418102", "8FC80E0A", "34FA0E0B", "02140E0B"
+            null, null, null, null, null, null, null, "1BFB1273", null, "407D1907", "345D18FB", "332518F4", "395718E9",
+            "076718EF", "1371181B", "23281816", "2F781809", null, null, "294F100F", null, null, null, null, null,
+            "0F340FE4", "1A5E0FF9", "1D2F0FFE", "076C1004", "2C481009", null, "3C2319E8", "66CC3C15", "66A54C15", null,
+            "5C578015", "5B845015", "5C4BF015", "E6B5F414", "E6B15414", "E6A41414", "E6A39414", "E6B0B814", "26A21EF4",
+            "74F4921D", "C4B64D11", "29200D0C", "234F0DE4", "074C0DFC", "33640D18", "0E121460", "094C0EED", "38310F02",
+            "50489A1B", "2CE52101", "94313E7E", "BC184FE6", "BAD08A1E", "00000000", "8D418102", "8FC80E0A", "34FA0E0B",
+            "02140E0B"
         };
 
         readonly string[] oemid =
         {
-            "IBM  3.3", "IBM  3.2", "IBM  3.2", "IBM  3.3", "IBM  3.3", "IBM  3.3", "DRDOS  7", "IBM  5.0",
-            "IBM  3.3", "MSDOS4.0", "MSDOS5.0", "MSDOS5.0", "MSDOS5.0", "MSDOS5.0", "MSDOS5.0", "MSDOS5.0",
-            "MSWIN4.1", "IBM  3.3", "IBM  3.3", "IBM  7.0", "IBM  2.0", "IBM  2.0", "IBM  3.0", "IBM  3.1",
-            "IBM  3.3", "IBM  4.0", "IBM  5.0", "IBM  5.0", "IBM  6.0", "IBM  6.0", "T V3.30 ", "T V4.00 ",
-            "IBM 10.2", "IBM 10.2", "IBM  3.2", "IBM 10.2", "IBM 10.2", "IBM 20.0", "IBM 20.0", "IBM 20.0",
-            "IBM 20.0", "IBM 20.0", "IBM 4.50", "BSD  4.4", "MSDOS5.0", "MSDOS5.0", "MSWIN4.0", "MSWIN4.1",
-            "MSWIN4.1", "MSWIN4.1", "MSWIN4.1", "MSWIN4.1", "MSWIN4.1", "MSDOS5.0", "MSDOS5.0", "MSDOS5.0",
-            "MSDOS5.0", "MSDOS5.0", "BeOS    ", "mkfs.fat", "BSD  4.4", "BSD  4.4", "BSD4.4  "
+            "IBM  3.3", "IBM  3.2", "IBM  3.2", "IBM  3.3", "IBM  3.3", "IBM  3.3", "DRDOS  7", "IBM  5.0", "IBM  3.3",
+            "MSDOS4.0", "MSDOS5.0", "MSDOS5.0", "MSDOS5.0", "MSDOS5.0", "MSDOS5.0", "MSDOS5.0", "MSWIN4.1", "IBM  3.3",
+            "IBM  3.3", "IBM  7.0", "IBM  2.0", "IBM  2.0", "IBM  3.0", "IBM  3.1", "IBM  3.3", "IBM  4.0", "IBM  5.0",
+            "IBM  5.0", "IBM  6.0", "IBM  6.0", "T V3.30 ", "T V4.00 ", "IBM 10.2", "IBM 10.2", "IBM  3.2", "IBM 10.2",
+            "IBM 10.2", "IBM 20.0", "IBM 20.0", "IBM 20.0", "IBM 20.0", "IBM 20.0", "IBM 4.50", "BSD  4.4", "MSDOS5.0",
+            "MSDOS5.0", "MSWIN4.0", "MSWIN4.1", "MSWIN4.1", "MSWIN4.1", "MSWIN4.1", "MSWIN4.1", "MSWIN4.1", "MSDOS5.0",
+            "MSDOS5.0", "MSDOS5.0", "MSDOS5.0", "MSDOS5.0", "BeOS    ", "mkfs.fat", "BSD  4.4", "BSD  4.4", "BSD4.4  "
         };
 
         [Test]
@@ -2035,19 +2878,19 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new Vdi();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 IFilesystem     fs         = new FAT();
                 Assert.AreEqual(true, fs.Identify(image, partitions[0]), testfiles[i]);
                 fs.GetInformation(image, partitions[0], out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,         testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,      testfiles[i]);
-                Assert.AreEqual("FAT12",         fs.XmlFsType.Type,             testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,       testfiles[i]);
-                Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial,     testfiles[i]);
-                Assert.AreEqual(oemid[i],        fs.XmlFsType.SystemIdentifier, testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual("FAT12", fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
+                Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
+                Assert.AreEqual(oemid[i], fs.XmlFsType.SystemIdentifier, testfiles[i]);
             }
         }
     }
@@ -2055,23 +2898,50 @@ namespace Aaru.Tests.Filesystems
     [TestFixture]
     public class Fat12Human
     {
-        readonly string[] testfiles = {"diska.d88.lz", "diskb.d88.lz"};
+        readonly string[] testfiles =
+        {
+            "diska.d88.lz", "diskb.d88.lz"
+        };
 
-        readonly MediaType[] mediatypes = {MediaType.SHARP_525, MediaType.SHARP_525};
+        readonly MediaType[] mediatypes =
+        {
+            MediaType.SHARP_525, MediaType.SHARP_525
+        };
 
-        readonly ulong[] sectors = {1232, 1232};
+        readonly ulong[] sectors =
+        {
+            1232, 1232
+        };
 
-        readonly uint[] sectorsize = {1024, 1024};
+        readonly uint[] sectorsize =
+        {
+            1024, 1024
+        };
 
-        readonly long[] clusters = {1232, 1232};
+        readonly long[] clusters =
+        {
+            1232, 1232
+        };
 
-        readonly int[] clustersize = {1024, 1024};
+        readonly int[] clustersize =
+        {
+            1024, 1024
+        };
 
-        readonly string[] volumename = {null, null};
+        readonly string[] volumename =
+        {
+            null, null
+        };
 
-        readonly string[] volumeserial = {null, null};
+        readonly string[] volumeserial =
+        {
+            null, null
+        };
 
-        readonly string[] oemid = {"Hudson soft 2.00", "Hudson soft 2.00"};
+        readonly string[] oemid =
+        {
+            "Hudson soft 2.00", "Hudson soft 2.00"
+        };
 
         [Test]
         public void Test()
@@ -2082,25 +2952,26 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new D88();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(mediatypes[i], image.Info.MediaType,  testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(mediatypes[i], image.Info.MediaType, testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 IFilesystem fs = new FAT();
-                Partition wholePart = new Partition
+
+                var wholePart = new Partition
                 {
-                    Name   = "Whole device",
-                    Length = image.Info.Sectors,
-                    Size   = image.Info.Sectors * image.Info.SectorSize
+                    Name = "Whole device", Length = image.Info.Sectors,
+                    Size = image.Info.Sectors * image.Info.SectorSize
                 };
+
                 Assert.AreEqual(true, fs.Identify(image, wholePart), testfiles[i]);
                 fs.GetInformation(image, wholePart, out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,         testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,      testfiles[i]);
-                Assert.AreEqual("FAT12",         fs.XmlFsType.Type,             testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,       testfiles[i]);
-                Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial,     testfiles[i]);
-                Assert.AreEqual(oemid[i],        fs.XmlFsType.SystemIdentifier, testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual("FAT12", fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
+                Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
+                Assert.AreEqual(oemid[i], fs.XmlFsType.SystemIdentifier, testfiles[i]);
             }
         }
     }
diff --git a/Aaru.Tests/Filesystems/FAT16.cs b/Aaru.Tests/Filesystems/FAT16.cs
index 49cc3fe96..6b5360b68 100644
--- a/Aaru.Tests/Filesystems/FAT16.cs
+++ b/Aaru.Tests/Filesystems/FAT16.cs
@@ -44,6 +44,7 @@ namespace Aaru.Tests.Filesystems
         {
             // MS-DOS 3.30A
             "msdos_3.30A_mf2ed.img.lz",
+
             // MS-DOS 3.31
             "msdos_3.31_mf2ed.img.lz"
         };
@@ -52,6 +53,7 @@ namespace Aaru.Tests.Filesystems
         {
             // MS-DOS 3.30A
             MediaType.DOS_35_ED,
+
             // MS-DOS 3.31
             MediaType.DOS_35_ED
         };
@@ -60,6 +62,7 @@ namespace Aaru.Tests.Filesystems
         {
             // MS-DOS 3.30A
             5760,
+
             // MS-DOS 3.31
             5760
         };
@@ -68,6 +71,7 @@ namespace Aaru.Tests.Filesystems
         {
             // MS-DOS 3.30A
             512,
+
             // MS-DOS 3.31
             512
         };
@@ -76,6 +80,7 @@ namespace Aaru.Tests.Filesystems
         {
             // MS-DOS 3.30A
             5760,
+
             // MS-DOS 3.31
             5760
         };
@@ -84,6 +89,7 @@ namespace Aaru.Tests.Filesystems
         {
             // MS-DOS 3.30A
             512,
+
             // MS-DOS 3.31
             512
         };
@@ -92,6 +98,7 @@ namespace Aaru.Tests.Filesystems
         {
             // MS-DOS 3.30A
             null,
+
             // MS-DOS 3.31
             null
         };
@@ -100,6 +107,7 @@ namespace Aaru.Tests.Filesystems
         {
             // MS-DOS 3.30A
             null,
+
             // MS-DOS 3.31
             null
         };
@@ -108,6 +116,7 @@ namespace Aaru.Tests.Filesystems
         {
             // MS-DOS 3.30A
             "MSDOS3.3",
+
             // MS-DOS 3.31
             "IBM  3.3"
         };
@@ -121,25 +130,26 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new ZZZRawImage();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(mediatypes[i], image.Info.MediaType,  testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(mediatypes[i], image.Info.MediaType, testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 IFilesystem fs = new FAT();
-                Partition wholePart = new Partition
+
+                var wholePart = new Partition
                 {
-                    Name   = "Whole device",
-                    Length = image.Info.Sectors,
-                    Size   = image.Info.Sectors * image.Info.SectorSize
+                    Name = "Whole device", Length = image.Info.Sectors,
+                    Size = image.Info.Sectors * image.Info.SectorSize
                 };
+
                 Assert.AreEqual(true, fs.Identify(image, wholePart), testfiles[i]);
                 fs.GetInformation(image, wholePart, out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,         testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,      testfiles[i]);
-                Assert.AreEqual("FAT16",         fs.XmlFsType.Type,             testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,       testfiles[i]);
-                Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial,     testfiles[i]);
-                Assert.AreEqual(oemid[i],        fs.XmlFsType.SystemIdentifier, testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual("FAT16", fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
+                Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
+                Assert.AreEqual(oemid[i], fs.XmlFsType.SystemIdentifier, testfiles[i]);
             }
         }
     }
@@ -147,21 +157,45 @@ namespace Aaru.Tests.Filesystems
     [TestFixture]
     public class Fat16Apm
     {
-        readonly string[] testfiles = {"macosx_10.11.vdi.lz"};
+        readonly string[] testfiles =
+        {
+            "macosx_10.11.vdi.lz"
+        };
 
-        readonly ulong[] sectors = {1024000};
+        readonly ulong[] sectors =
+        {
+            1024000
+        };
 
-        readonly uint[] sectorsize = {512};
+        readonly uint[] sectorsize =
+        {
+            512
+        };
 
-        readonly long[] clusters = {63995};
+        readonly long[] clusters =
+        {
+            63995
+        };
 
-        readonly int[] clustersize = {8192};
+        readonly int[] clustersize =
+        {
+            8192
+        };
 
-        readonly string[] volumename = {"VOLUMELABEL"};
+        readonly string[] volumename =
+        {
+            "VOLUMELABEL"
+        };
 
-        readonly string[] volumeserial = {"063D1F09"};
+        readonly string[] volumeserial =
+        {
+            "063D1F09"
+        };
 
-        readonly string[] oemid = {"BSD  4.4"};
+        readonly string[] oemid =
+        {
+            "BSD  4.4"
+        };
 
         [Test]
         public void Test()
@@ -172,28 +206,30 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new Vdi();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 IFilesystem     fs         = new FAT();
                 int             part       = -1;
+
                 for(int j = 0; j < partitions.Count; j++)
                     if(partitions[j].Type == "DOS_FAT_16")
                     {
                         part = j;
+
                         break;
                     }
 
                 Assert.AreNotEqual(-1, part, $"Partition not found on {testfiles[i]}");
                 Assert.AreEqual(true, fs.Identify(image, partitions[part]), testfiles[i]);
                 fs.GetInformation(image, partitions[part], out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,         testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,      testfiles[i]);
-                Assert.AreEqual("FAT16",         fs.XmlFsType.Type,             testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,       testfiles[i]);
-                Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial,     testfiles[i]);
-                Assert.AreEqual(oemid[i],        fs.XmlFsType.SystemIdentifier, testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual("FAT16", fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
+                Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
+                Assert.AreEqual(oemid[i], fs.XmlFsType.SystemIdentifier, testfiles[i]);
             }
         }
     }
@@ -201,21 +237,45 @@ namespace Aaru.Tests.Filesystems
     [TestFixture]
     public class Fat16Atari
     {
-        readonly string[] testfiles = {"tos_1.04.vdi.lz", "tos_1.04_small.vdi.lz"};
+        readonly string[] testfiles =
+        {
+            "tos_1.04.vdi.lz", "tos_1.04_small.vdi.lz"
+        };
 
-        readonly ulong[] sectors = {81920, 16384};
+        readonly ulong[] sectors =
+        {
+            81920, 16384
+        };
 
-        readonly uint[] sectorsize = {512, 512};
+        readonly uint[] sectorsize =
+        {
+            512, 512
+        };
 
-        readonly long[] clusters = {10239, 8191};
+        readonly long[] clusters =
+        {
+            10239, 8191
+        };
 
-        readonly int[] clustersize = {4096, 1024};
+        readonly int[] clustersize =
+        {
+            4096, 1024
+        };
 
-        readonly string[] volumename = {null, null};
+        readonly string[] volumename =
+        {
+            null, null
+        };
 
-        readonly string[] volumeserial = {"BA9831", "2019E1"};
+        readonly string[] volumeserial =
+        {
+            "BA9831", "2019E1"
+        };
 
-        readonly string[] oemid = {null, null};
+        readonly string[] oemid =
+        {
+            null, null
+        };
 
         [Test]
         public void Test()
@@ -226,28 +286,31 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new Vdi();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 IFilesystem     fs         = new FAT();
                 int             part       = -1;
+
                 for(int j = 0; j < partitions.Count; j++)
-                    if(partitions[j].Type == "GEM" || partitions[j].Type == "BGM")
+                    if(partitions[j].Type == "GEM" ||
+                       partitions[j].Type == "BGM")
                     {
                         part = j;
+
                         break;
                     }
 
                 Assert.AreNotEqual(-1, part, $"Partition not found on {testfiles[i]}");
                 Assert.AreEqual(true, fs.Identify(image, partitions[part]), testfiles[i]);
                 fs.GetInformation(image, partitions[part], out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,         testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,      testfiles[i]);
-                Assert.AreEqual("FAT16",         fs.XmlFsType.Type,             testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,       testfiles[i]);
-                Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial,     testfiles[i]);
-                Assert.AreEqual(oemid[i],        fs.XmlFsType.SystemIdentifier, testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual("FAT16", fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
+                Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
+                Assert.AreEqual(oemid[i], fs.XmlFsType.SystemIdentifier, testfiles[i]);
             }
         }
     }
@@ -255,21 +318,45 @@ namespace Aaru.Tests.Filesystems
     [TestFixture]
     public class Fat16Gpt
     {
-        readonly string[] testfiles = {"macosx_10.11.vdi.lz"};
+        readonly string[] testfiles =
+        {
+            "macosx_10.11.vdi.lz"
+        };
 
-        readonly ulong[] sectors = {1024000};
+        readonly ulong[] sectors =
+        {
+            1024000
+        };
 
-        readonly uint[] sectorsize = {512};
+        readonly uint[] sectorsize =
+        {
+            512
+        };
 
-        readonly long[] clusters = {63995};
+        readonly long[] clusters =
+        {
+            63995
+        };
 
-        readonly int[] clustersize = {8192};
+        readonly int[] clustersize =
+        {
+            8192
+        };
 
-        readonly string[] volumename = {"VOLUMELABEL"};
+        readonly string[] volumename =
+        {
+            "VOLUMELABEL"
+        };
 
-        readonly string[] volumeserial = {"2E8A1F1B"};
+        readonly string[] volumeserial =
+        {
+            "2E8A1F1B"
+        };
 
-        readonly string[] oemid = {"BSD  4.4"};
+        readonly string[] oemid =
+        {
+            "BSD  4.4"
+        };
 
         [Test]
         public void Test()
@@ -280,28 +367,30 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new Vdi();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 IFilesystem     fs         = new FAT();
                 int             part       = -1;
+
                 for(int j = 0; j < partitions.Count; j++)
                     if(partitions[j].Type == "Microsoft Basic data")
                     {
                         part = j;
+
                         break;
                     }
 
                 Assert.AreNotEqual(-1, part, $"Partition not found on {testfiles[i]}");
                 Assert.AreEqual(true, fs.Identify(image, partitions[part]), testfiles[i]);
                 fs.GetInformation(image, partitions[part], out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,         testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,      testfiles[i]);
-                Assert.AreEqual("FAT16",         fs.XmlFsType.Type,             testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,       testfiles[i]);
-                Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial,     testfiles[i]);
-                Assert.AreEqual(oemid[i],        fs.XmlFsType.SystemIdentifier, testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual("FAT16", fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
+                Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
+                Assert.AreEqual(oemid[i], fs.XmlFsType.SystemIdentifier, testfiles[i]);
             }
         }
     }
@@ -314,28 +403,27 @@ namespace Aaru.Tests.Filesystems
             "drdos_3.40.vdi.lz", "drdos_3.41.vdi.lz", "drdos_5.00.vdi.lz", "drdos_6.00.vdi.lz", "drdos_7.02.vdi.lz",
             "drdos_7.03.vdi.lz", "drdos_8.00.vdi.lz", "msdos331.vdi.lz", "msdos401.vdi.lz", "msdos500.vdi.lz",
             "msdos600.vdi.lz", "msdos620rc1.vdi.lz", "msdos620.vdi.lz", "msdos621.vdi.lz", "msdos622.vdi.lz",
-            "msdos710.vdi.lz", "novelldos_7.00.vdi.lz", "opendos_7.01.vdi.lz", "pcdos2000.vdi.lz",
-            "pcdos400.vdi.lz", "pcdos500.vdi.lz", "pcdos502.vdi.lz", "pcdos610.vdi.lz", "pcdos630.vdi.lz",
-            "msos2_1.21.vdi.lz", "msos2_1.30.1.vdi.lz", "multiuserdos_7.22r4.vdi.lz", "os2_1.20.vdi.lz",
-            "os2_1.30.vdi.lz", "os2_6.307.vdi.lz", "os2_6.514.vdi.lz", "os2_6.617.vdi.lz", "os2_8.162.vdi.lz",
-            "os2_9.023.vdi.lz", "ecs.vdi.lz", "macosx_10.11.vdi.lz", "win10.vdi.lz", "win2000.vdi.lz",
-            "win95osr2.1.vdi.lz", "win95osr2.5.vdi.lz", "win95osr2.vdi.lz", "win95.vdi.lz", "win98se.vdi.lz",
-            "win98.vdi.lz", "winme.vdi.lz", "winnt_3.10.vdi.lz", "winnt_3.50.vdi.lz", "winnt_3.51.vdi.lz",
-            "winnt_4.00.vdi.lz", "winvista.vdi.lz", "beos_r4.5.vdi.lz", "linux.vdi.lz", "amigaos_3.9.vdi.lz",
-            "aros.vdi.lz", "freebsd_6.1.vdi.lz", "freebsd_7.0.vdi.lz", "freebsd_8.2.vdi.lz", "macos_7.5.3.vdi.lz",
-            "macos_7.5.vdi.lz", "macos_7.6.vdi.lz", "macos_8.0.vdi.lz", "ecs20_fstester.vdi.lz",
-            "linux_2.2_umsdos16_flashdrive.vdi.lz", "linux_4.19_fat16_msdos_flashdrive.vdi.lz",
-            "linux_4.19_vfat16_flashdrive.vdi.lz"
+            "msdos710.vdi.lz", "novelldos_7.00.vdi.lz", "opendos_7.01.vdi.lz", "pcdos2000.vdi.lz", "pcdos400.vdi.lz",
+            "pcdos500.vdi.lz", "pcdos502.vdi.lz", "pcdos610.vdi.lz", "pcdos630.vdi.lz", "msos2_1.21.vdi.lz",
+            "msos2_1.30.1.vdi.lz", "multiuserdos_7.22r4.vdi.lz", "os2_1.20.vdi.lz", "os2_1.30.vdi.lz",
+            "os2_6.307.vdi.lz", "os2_6.514.vdi.lz", "os2_6.617.vdi.lz", "os2_8.162.vdi.lz", "os2_9.023.vdi.lz",
+            "ecs.vdi.lz", "macosx_10.11.vdi.lz", "win10.vdi.lz", "win2000.vdi.lz", "win95osr2.1.vdi.lz",
+            "win95osr2.5.vdi.lz", "win95osr2.vdi.lz", "win95.vdi.lz", "win98se.vdi.lz", "win98.vdi.lz", "winme.vdi.lz",
+            "winnt_3.10.vdi.lz", "winnt_3.50.vdi.lz", "winnt_3.51.vdi.lz", "winnt_4.00.vdi.lz", "winvista.vdi.lz",
+            "beos_r4.5.vdi.lz", "linux.vdi.lz", "amigaos_3.9.vdi.lz", "aros.vdi.lz", "freebsd_6.1.vdi.lz",
+            "freebsd_7.0.vdi.lz", "freebsd_8.2.vdi.lz", "macos_7.5.3.vdi.lz", "macos_7.5.vdi.lz", "macos_7.6.vdi.lz",
+            "macos_8.0.vdi.lz", "ecs20_fstester.vdi.lz", "linux_2.2_umsdos16_flashdrive.vdi.lz",
+            "linux_4.19_fat16_msdos_flashdrive.vdi.lz", "linux_4.19_vfat16_flashdrive.vdi.lz"
         };
 
         readonly ulong[] sectors =
         {
-            1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000,
-            1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000,
-            1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000,
-            1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000,
-            1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 262144, 1024128, 1024000, 1024000,
-            1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000
+            1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000,
+            1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000,
+            1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000,
+            1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000,
+            1024000, 1024000, 1024000, 262144, 1024128, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000,
+            1024000, 1024000, 1024000, 1024000, 1024000
         };
 
         readonly uint[] sectorsize =
@@ -357,10 +445,10 @@ namespace Aaru.Tests.Filesystems
 
         readonly int[] clustersize =
         {
-            8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192,
-            8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192,
-            8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192,
-            2048, 8192, 8192, 8192, 8192, 16384, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192
+            8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192,
+            8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192,
+            8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 2048, 8192, 8192,
+            8192, 8192, 16384, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192
         };
 
         readonly string[] volumename =
@@ -380,25 +468,24 @@ namespace Aaru.Tests.Filesystems
         readonly string[] volumeserial =
         {
             null, null, null, null, null, null, "1BFB0748", null, "217B1909", "0C6D18FC", "382B18F4", "3E2018E9",
-            "0D2418EF", "195A181B", "27761816", "356B1809", null, null, "2272100F", "07280FE1", "1F630FF9",
-            "18340FFE", "3F3F1003", "273D1009", "9C162C15", "9C1E2C15", null, "5BE66015", "5BE43015", "5BEAC015",
-            "E6B18414", "E6C63414", "1C069414", "1C059414", "1BE5B814", "3EF71EF4", "DAF97911", "305637BD",
-            "275B0DE4", "09650DFC", "38270D18", "2E620D0C", "0B4F0EED", "0E122464", "3B5F0F02", "C84CB6F2",
-            "D0E9AD4E", "C039A2EC", "501F9FA6", "9AAA4216", "00000000", "A132D985", "374D3BD1", "52BEA34A",
-            "3CF10E0D", "C6C30E0D", "44770E0D", "27761816", "27761816", "27761816", "27761816", "66AAF014",
-            "5CC78D47", "A552A493", "FCC308A7"
+            "0D2418EF", "195A181B", "27761816", "356B1809", null, null, "2272100F", "07280FE1", "1F630FF9", "18340FFE",
+            "3F3F1003", "273D1009", "9C162C15", "9C1E2C15", null, "5BE66015", "5BE43015", "5BEAC015", "E6B18414",
+            "E6C63414", "1C069414", "1C059414", "1BE5B814", "3EF71EF4", "DAF97911", "305637BD", "275B0DE4", "09650DFC",
+            "38270D18", "2E620D0C", "0B4F0EED", "0E122464", "3B5F0F02", "C84CB6F2", "D0E9AD4E", "C039A2EC", "501F9FA6",
+            "9AAA4216", "00000000", "A132D985", "374D3BD1", "52BEA34A", "3CF10E0D", "C6C30E0D", "44770E0D", "27761816",
+            "27761816", "27761816", "27761816", "66AAF014", "5CC78D47", "A552A493", "FCC308A7"
         };
 
         readonly string[] oemid =
         {
-            "IBM  3.2", "IBM  3.2", "IBM  3.3", "IBM  3.3", "IBM  3.3", "DRDOS  7", "IBM  5.0", "IBM  3.3",
-            "MSDOS4.0", "MSDOS5.0", "MSDOS5.0", "MSDOS5.0", "MSDOS5.0", "MSDOS5.0", "MSDOS5.0", "MSWIN4.1",
-            "IBM  3.3", "IBM  3.3", "IBM  7.0", "IBM  4.0", "IBM  5.0", "IBM  5.0", "IBM  6.0", "IBM  6.0",
-            "IBM 10.2", "IBM 10.2", "IBM  3.2", "IBM 10.2", "IBM 10.2", "IBM 20.0", "IBM 20.0", "IBM 20.0",
-            "IBM 20.0", "IBM 20.0", "IBM 4.50", "BSD  4.4", "MSDOS5.0", "MSDOS5.0", "MSWIN4.1", "MSWIN4.1",
-            "MSWIN4.1", "MSWIN4.0", "MSWIN4.1", "MSWIN4.1", "MSWIN4.1", "MSDOS5.0", "MSDOS5.0", "MSDOS5.0",
-            "MSDOS5.0", "MSDOS5.0", "BeOS    ", "mkfs.fat", "CDP  5.0", "MSWIN4.1", "BSD  4.4", "BSD  4.4",
-            "BSD4.4  ", "PCX 2.0 ", "PCX 2.0 ", "PCX 2.0 ", "PCX 2.0 ", "IBM 4.50", null, "mkfs.fat", "mkfs.fat"
+            "IBM  3.2", "IBM  3.2", "IBM  3.3", "IBM  3.3", "IBM  3.3", "DRDOS  7", "IBM  5.0", "IBM  3.3", "MSDOS4.0",
+            "MSDOS5.0", "MSDOS5.0", "MSDOS5.0", "MSDOS5.0", "MSDOS5.0", "MSDOS5.0", "MSWIN4.1", "IBM  3.3", "IBM  3.3",
+            "IBM  7.0", "IBM  4.0", "IBM  5.0", "IBM  5.0", "IBM  6.0", "IBM  6.0", "IBM 10.2", "IBM 10.2", "IBM  3.2",
+            "IBM 10.2", "IBM 10.2", "IBM 20.0", "IBM 20.0", "IBM 20.0", "IBM 20.0", "IBM 20.0", "IBM 4.50", "BSD  4.4",
+            "MSDOS5.0", "MSDOS5.0", "MSWIN4.1", "MSWIN4.1", "MSWIN4.1", "MSWIN4.0", "MSWIN4.1", "MSWIN4.1", "MSWIN4.1",
+            "MSDOS5.0", "MSDOS5.0", "MSDOS5.0", "MSDOS5.0", "MSDOS5.0", "BeOS    ", "mkfs.fat", "CDP  5.0", "MSWIN4.1",
+            "BSD  4.4", "BSD  4.4", "BSD4.4  ", "PCX 2.0 ", "PCX 2.0 ", "PCX 2.0 ", "PCX 2.0 ", "IBM 4.50", null,
+            "mkfs.fat", "mkfs.fat"
         };
 
         [Test]
@@ -410,19 +497,19 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new Vdi();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 IFilesystem     fs         = new FAT();
                 Assert.AreEqual(true, fs.Identify(image, partitions[0]), testfiles[i]);
                 fs.GetInformation(image, partitions[0], out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,         testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,      testfiles[i]);
-                Assert.AreEqual("FAT16",         fs.XmlFsType.Type,             testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,       testfiles[i]);
-                Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial,     testfiles[i]);
-                Assert.AreEqual(oemid[i],        fs.XmlFsType.SystemIdentifier, testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual("FAT16", fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
+                Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
+                Assert.AreEqual(oemid[i], fs.XmlFsType.SystemIdentifier, testfiles[i]);
             }
         }
     }
@@ -430,21 +517,45 @@ namespace Aaru.Tests.Filesystems
     [TestFixture]
     public class Fat16Rdb
     {
-        readonly string[] testfiles = {"amigaos_3.9.vdi.lz"};
+        readonly string[] testfiles =
+        {
+            "amigaos_3.9.vdi.lz"
+        };
 
-        readonly ulong[] sectors = {1024128};
+        readonly ulong[] sectors =
+        {
+            1024128
+        };
 
-        readonly uint[] sectorsize = {512};
+        readonly uint[] sectorsize =
+        {
+            512
+        };
 
-        readonly long[] clusters = {63689};
+        readonly long[] clusters =
+        {
+            63689
+        };
 
-        readonly int[] clustersize = {8192};
+        readonly int[] clustersize =
+        {
+            8192
+        };
 
-        readonly string[] volumename = {"VOLUMELABEL"};
+        readonly string[] volumename =
+        {
+            "VOLUMELABEL"
+        };
 
-        readonly string[] volumeserial = {"374D40D1"};
+        readonly string[] volumeserial =
+        {
+            "374D40D1"
+        };
 
-        readonly string[] oemid = {"CDP  5.0"};
+        readonly string[] oemid =
+        {
+            "CDP  5.0"
+        };
 
         [Test]
         public void Test()
@@ -455,28 +566,30 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new Vdi();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 IFilesystem     fs         = new FAT();
                 int             part       = -1;
+
                 for(int j = 0; j < partitions.Count; j++)
                     if(partitions[j].Type == "0x06")
                     {
                         part = j;
+
                         break;
                     }
 
                 Assert.AreNotEqual(-1, part, $"Partition not found on {testfiles[i]}");
                 Assert.AreEqual(true, fs.Identify(image, partitions[part]), testfiles[i]);
                 fs.GetInformation(image, partitions[part], out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,         testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,      testfiles[i]);
-                Assert.AreEqual("FAT16",         fs.XmlFsType.Type,             testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,       testfiles[i]);
-                Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial,     testfiles[i]);
-                Assert.AreEqual(oemid[i],        fs.XmlFsType.SystemIdentifier, testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual("FAT16", fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
+                Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
+                Assert.AreEqual(oemid[i], fs.XmlFsType.SystemIdentifier, testfiles[i]);
             }
         }
     }
@@ -484,21 +597,45 @@ namespace Aaru.Tests.Filesystems
     [TestFixture]
     public class Fat16Human
     {
-        readonly string[] testfiles = {"sasidisk.hdf.lz", "scsidisk.hds.lz"};
+        readonly string[] testfiles =
+        {
+            "sasidisk.hdf.lz", "scsidisk.hds.lz"
+        };
 
-        readonly ulong[] sectors = {162096, 204800};
+        readonly ulong[] sectors =
+        {
+            162096, 204800
+        };
 
-        readonly uint[] sectorsize = {256, 512};
+        readonly uint[] sectorsize =
+        {
+            256, 512
+        };
 
-        readonly long[] clusters = {40510, 102367};
+        readonly long[] clusters =
+        {
+            40510, 102367
+        };
 
-        readonly int[] clustersize = {1024, 1024};
+        readonly int[] clustersize =
+        {
+            1024, 1024
+        };
 
-        readonly string[] volumename = {null, null};
+        readonly string[] volumename =
+        {
+            null, null
+        };
 
-        readonly string[] volumeserial = {null, null};
+        readonly string[] volumeserial =
+        {
+            null, null
+        };
 
-        readonly string[] oemid = {"Hudson soft 2.00", " Hero Soft V1.10"};
+        readonly string[] oemid =
+        {
+            "Hudson soft 2.00", " Hero Soft V1.10"
+        };
 
         [Test]
         public void Test()
@@ -509,28 +646,30 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new ZZZRawImage();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 IFilesystem     fs         = new FAT();
                 int             part       = -1;
+
                 for(int j = 0; j < partitions.Count; j++)
                     if(partitions[j].Type == "Human68k")
                     {
                         part = j;
+
                         break;
                     }
 
                 Assert.AreNotEqual(-1, part, $"Partition not found on {testfiles[i]}");
                 Assert.AreEqual(true, fs.Identify(image, partitions[part]), testfiles[i]);
                 fs.GetInformation(image, partitions[part], out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,         testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,      testfiles[i]);
-                Assert.AreEqual("FAT16",         fs.XmlFsType.Type,             testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,       testfiles[i]);
-                Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial,     testfiles[i]);
-                Assert.AreEqual(oemid[i],        fs.XmlFsType.SystemIdentifier, testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual("FAT16", fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
+                Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
+                Assert.AreEqual(oemid[i], fs.XmlFsType.SystemIdentifier, testfiles[i]);
             }
         }
     }
diff --git a/Aaru.Tests/Filesystems/FAT32.cs b/Aaru.Tests/Filesystems/FAT32.cs
index ef198d577..70fb9ae7d 100644
--- a/Aaru.Tests/Filesystems/FAT32.cs
+++ b/Aaru.Tests/Filesystems/FAT32.cs
@@ -40,21 +40,45 @@ namespace Aaru.Tests.Filesystems
     [TestFixture]
     public class Fat32Apm
     {
-        readonly string[] testfiles = {"macosx_10.11.vdi.lz"};
+        readonly string[] testfiles =
+        {
+            "macosx_10.11.vdi.lz"
+        };
 
-        readonly ulong[] sectors = {4194304};
+        readonly ulong[] sectors =
+        {
+            4194304
+        };
 
-        readonly uint[] sectorsize = {512};
+        readonly uint[] sectorsize =
+        {
+            512
+        };
 
-        readonly long[] clusters = {524278};
+        readonly long[] clusters =
+        {
+            524278
+        };
 
-        readonly int[] clustersize = {4096};
+        readonly int[] clustersize =
+        {
+            4096
+        };
 
-        readonly string[] volumename = {"VOLUMELABEL"};
+        readonly string[] volumename =
+        {
+            "VOLUMELABEL"
+        };
 
-        readonly string[] volumeserial = {"35BD1F0A"};
+        readonly string[] volumeserial =
+        {
+            "35BD1F0A"
+        };
 
-        readonly string[] oemid = {"BSD  4.4"};
+        readonly string[] oemid =
+        {
+            "BSD  4.4"
+        };
 
         [Test]
         public void Test()
@@ -65,28 +89,30 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new Vdi();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 IFilesystem     fs         = new FAT();
                 int             part       = -1;
+
                 for(int j = 0; j < partitions.Count; j++)
                     if(partitions[j].Type == "DOS_FAT_32")
                     {
                         part = j;
+
                         break;
                     }
 
                 Assert.AreNotEqual(-1, part, $"Partition not found on {testfiles[i]}");
                 Assert.AreEqual(true, fs.Identify(image, partitions[part]), testfiles[i]);
                 fs.GetInformation(image, partitions[part], out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,         testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,      testfiles[i]);
-                Assert.AreEqual("FAT32",         fs.XmlFsType.Type,             testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,       testfiles[i]);
-                Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial,     testfiles[i]);
-                Assert.AreEqual(oemid[i],        fs.XmlFsType.SystemIdentifier, testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual("FAT32", fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
+                Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
+                Assert.AreEqual(oemid[i], fs.XmlFsType.SystemIdentifier, testfiles[i]);
             }
         }
     }
@@ -94,21 +120,45 @@ namespace Aaru.Tests.Filesystems
     [TestFixture]
     public class Fat32Gpt
     {
-        readonly string[] testfiles = {"macosx_10.11.vdi.lz"};
+        readonly string[] testfiles =
+        {
+            "macosx_10.11.vdi.lz"
+        };
 
-        readonly ulong[] sectors = {4194304};
+        readonly ulong[] sectors =
+        {
+            4194304
+        };
 
-        readonly uint[] sectorsize = {512};
+        readonly uint[] sectorsize =
+        {
+            512
+        };
 
-        readonly long[] clusters = {523775};
+        readonly long[] clusters =
+        {
+            523775
+        };
 
-        readonly int[] clustersize = {4096};
+        readonly int[] clustersize =
+        {
+            4096
+        };
 
-        readonly string[] volumename = {"VOLUMELABEL"};
+        readonly string[] volumename =
+        {
+            "VOLUMELABEL"
+        };
 
-        readonly string[] volumeserial = {"7ABE1F1B"};
+        readonly string[] volumeserial =
+        {
+            "7ABE1F1B"
+        };
 
-        readonly string[] oemid = {"BSD  4.4"};
+        readonly string[] oemid =
+        {
+            "BSD  4.4"
+        };
 
         [Test]
         public void Test()
@@ -119,28 +169,30 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new Vdi();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 IFilesystem     fs         = new FAT();
                 int             part       = -1;
+
                 for(int j = 0; j < partitions.Count; j++)
                     if(partitions[j].Type == "Microsoft Basic data")
                     {
                         part = j;
+
                         break;
                     }
 
                 Assert.AreNotEqual(-1, part, $"Partition not found on {testfiles[i]}");
                 Assert.AreEqual(true, fs.Identify(image, partitions[part]), testfiles[i]);
                 fs.GetInformation(image, partitions[part], out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,         testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,      testfiles[i]);
-                Assert.AreEqual("FAT32",         fs.XmlFsType.Type,             testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,       testfiles[i]);
-                Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial,     testfiles[i]);
-                Assert.AreEqual(oemid[i],        fs.XmlFsType.SystemIdentifier, testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual("FAT32", fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
+                Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
+                Assert.AreEqual(oemid[i], fs.XmlFsType.SystemIdentifier, testfiles[i]);
             }
         }
     }
@@ -154,15 +206,14 @@ namespace Aaru.Tests.Filesystems
             "win2000.vdi.lz", "win95osr2.1.vdi.lz", "win95osr2.5.vdi.lz", "win95osr2.vdi.lz", "win98se.vdi.lz",
             "win98.vdi.lz", "winme.vdi.lz", "winvista.vdi.lz", "beos_r4.5.vdi.lz", "linux.vdi.lz", "aros.vdi.lz",
             "freebsd_6.1.vdi.lz", "freebsd_7.0.vdi.lz", "freebsd_8.2.vdi.lz", "freedos_1.2.vdi.lz",
-            "ecs20_fstester.vdi.lz", "linux_2.2_umsdos32_flashdrive.vdi.lz",
-            "linux_4.19_fat32_msdos_flashdrive.vdi.lz", "linux_4.19_vfat32_flashdrive.vdi.lz"
+            "ecs20_fstester.vdi.lz", "linux_2.2_umsdos32_flashdrive.vdi.lz", "linux_4.19_fat32_msdos_flashdrive.vdi.lz",
+            "linux_4.19_vfat32_flashdrive.vdi.lz"
         };
 
         readonly ulong[] sectors =
         {
-            8388608, 8388608, 8388608, 4194304, 4194304, 8388608, 4194304, 4194304, 4194304, 4194304, 4194304,
-            4194304, 4194304, 4194304, 262144, 4194304, 4194304, 4194304, 4194304, 8388608, 1024000, 1024000,
-            1024000, 1024000
+            8388608, 8388608, 8388608, 4194304, 4194304, 8388608, 4194304, 4194304, 4194304, 4194304, 4194304, 4194304,
+            4194304, 4194304, 262144, 4194304, 4194304, 4194304, 4194304, 8388608, 1024000, 1024000, 1024000, 1024000
         };
 
         readonly uint[] sectorsize =
@@ -173,14 +224,14 @@ namespace Aaru.Tests.Filesystems
 
         readonly long[] clusters =
         {
-            1048233, 1048233, 1048233, 524287, 524016, 1048233, 524152, 524152, 524152, 524112, 524112, 524112,
-            523520, 1048560, 260096, 524160, 524112, 524112, 65514, 1048233, 127744, 127882, 127744, 127744
+            1048233, 1048233, 1048233, 524287, 524016, 1048233, 524152, 524152, 524152, 524112, 524112, 524112, 523520,
+            1048560, 260096, 524160, 524112, 524112, 65514, 1048233, 127744, 127882, 127744, 127744
         };
 
         readonly int[] clustersize =
         {
-            4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 2048, 512, 4096, 4096,
-            4096, 32768, 4096, 4096, 4096, 4096, 4096
+            4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 2048, 512, 4096, 4096, 4096,
+            32768, 4096, 4096, 4096, 4096, 4096
         };
 
         readonly string[] volumename =
@@ -193,16 +244,16 @@ namespace Aaru.Tests.Filesystems
 
         readonly string[] volumeserial =
         {
-            "5955996C", "1BFB1A43", "3B331809", "42D51EF1", "48073346", "EC62E6DE", "2A310DE4", "0C140DFC",
-            "3E310D18", "0D3D0EED", "0E131162", "3F500F02", "82EB4C04", "00000000", "B488C502", "5CAC9B4E",
-            "41540E0E", "4E600E0F", "26E20E0F", "3E0C1BE8", "63084BBA", "5CC7908D", "D1290612", "79BCA86E"
+            "5955996C", "1BFB1A43", "3B331809", "42D51EF1", "48073346", "EC62E6DE", "2A310DE4", "0C140DFC", "3E310D18",
+            "0D3D0EED", "0E131162", "3F500F02", "82EB4C04", "00000000", "B488C502", "5CAC9B4E", "41540E0E", "4E600E0F",
+            "26E20E0F", "3E0C1BE8", "63084BBA", "5CC7908D", "D1290612", "79BCA86E"
         };
 
         readonly string[] oemid =
         {
-            "DRDOS7.X", "IBM  7.1", "MSWIN4.1", "BSD  4.4", "MSDOS5.0", "MSDOS5.0", "MSWIN4.1", "MSWIN4.1",
-            "MSWIN4.1", "MSWIN4.1", "MSWIN4.1", "MSWIN4.1", "MSDOS5.0", "BeOS    ", "mkfs.fat", "MSWIN4.1",
-            "BSD  4.4", "BSD  4.4", "BSD4.4  ", "FRDOS4.1", "mkfs.fat", "mkdosfs", "mkfs.fat", "mkfs.fat"
+            "DRDOS7.X", "IBM  7.1", "MSWIN4.1", "BSD  4.4", "MSDOS5.0", "MSDOS5.0", "MSWIN4.1", "MSWIN4.1", "MSWIN4.1",
+            "MSWIN4.1", "MSWIN4.1", "MSWIN4.1", "MSDOS5.0", "BeOS    ", "mkfs.fat", "MSWIN4.1", "BSD  4.4", "BSD  4.4",
+            "BSD4.4  ", "FRDOS4.1", "mkfs.fat", "mkdosfs", "mkfs.fat", "mkfs.fat"
         };
 
         [Test]
@@ -214,19 +265,19 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new Vdi();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 IFilesystem     fs         = new FAT();
                 Assert.AreEqual(true, fs.Identify(image, partitions[0]), testfiles[i]);
                 fs.GetInformation(image, partitions[0], out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,         testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,      testfiles[i]);
-                Assert.AreEqual("FAT32",         fs.XmlFsType.Type,             testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,       testfiles[i]);
-                Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial,     testfiles[i]);
-                Assert.AreEqual(oemid[i],        fs.XmlFsType.SystemIdentifier, testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual("FAT32", fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
+                Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
+                Assert.AreEqual(oemid[i], fs.XmlFsType.SystemIdentifier, testfiles[i]);
             }
         }
     }
diff --git a/Aaru.Tests/Filesystems/FATX.cs b/Aaru.Tests/Filesystems/FATX.cs
index c710a6a6b..e8d6e5a19 100644
--- a/Aaru.Tests/Filesystems/FATX.cs
+++ b/Aaru.Tests/Filesystems/FATX.cs
@@ -45,12 +45,6 @@ namespace Aaru.Tests.Filesystems
     [TestFixture]
     public class XboxFat
     {
-        string              location;
-        IFilter             filter;
-        IMediaImage         image;
-        IReadOnlyFilesystem fs;
-        Partition           wholePart;
-
         [SetUp]
         public void Init()
         {
@@ -60,88 +54,38 @@ namespace Aaru.Tests.Filesystems
             image = new ZZZRawImage();
             Assert.AreEqual(true, image.Open(filter));
             fs = new XboxFatPlugin();
+
             wholePart = new Partition
             {
-                Name   = "Whole device",
-                Length = image.Info.Sectors,
-                Size   = image.Info.Sectors * image.Info.SectorSize
+                Name = "Whole device", Length = image.Info.Sectors, Size = image.Info.Sectors * image.Info.SectorSize
             };
 
             Errno error = fs.Mount(image, wholePart, null, null, null);
             Assert.AreEqual(Errno.NoError, error);
         }
 
+        [TearDown]
+        public void Destroy()
+        {
+            fs?.Unmount();
+            fs = null;
+        }
+
+        string              location;
+        IFilter             filter;
+        IMediaImage         image;
+        IReadOnlyFilesystem fs;
+        Partition           wholePart;
+
         [Test]
         public void Information()
         {
-            Assert.AreEqual(62720,             image.Info.Sectors);
-            Assert.AreEqual(1960,              fs.XmlFsType.Clusters);
-            Assert.AreEqual(16384,             fs.XmlFsType.ClusterSize);
+            Assert.AreEqual(62720, image.Info.Sectors);
+            Assert.AreEqual(1960, fs.XmlFsType.Clusters);
+            Assert.AreEqual(16384, fs.XmlFsType.ClusterSize);
             Assert.AreEqual("FATX filesystem", fs.XmlFsType.Type);
-            Assert.AreEqual("Volume láb€l",    fs.XmlFsType.VolumeName);
-            Assert.AreEqual("4639B7D0",        fs.XmlFsType.VolumeSerial);
-        }
-
-        [Test]
-        public void RootDirectory()
-        {
-            Errno error = fs.ReadDir("", out List<string> directory);
-            Assert.AreEqual(Errno.NoError, error);
-            Assert.AreEqual(6,             directory.Count);
-
-            Assert.AreEqual(true, directory.Contains("49470015"));
-            Assert.AreEqual(true, directory.Contains("4d5300d1"));
-            Assert.AreEqual(true, directory.Contains("4d53006e"));
-            Assert.AreEqual(true, directory.Contains("4d530004"));
-            Assert.AreEqual(true, directory.Contains("4947007c"));
-            Assert.AreEqual(true, directory.Contains("4541003e"));
-
-            Assert.AreEqual(false, directory.Contains("d530004"));
-            Assert.AreEqual(false, directory.Contains("4947007"));
-        }
-
-        [Test]
-        public void SubDirectory()
-        {
-            Errno error = fs.ReadDir("49470015", out List<string> directory);
-            Assert.AreEqual(Errno.NoError, error);
-            Assert.AreEqual(4,             directory.Count);
-
-            Assert.AreEqual(true, directory.Contains("TitleImage.xbx"));
-            Assert.AreEqual(true, directory.Contains("SaveImage.xbx"));
-            Assert.AreEqual(true, directory.Contains("7AC2FE88C908"));
-            Assert.AreEqual(true, directory.Contains("TitleMeta.xbx"));
-
-            Assert.AreEqual(false, directory.Contains("TitleImage"));
-            Assert.AreEqual(false, directory.Contains(".xbx"));
-            Assert.AreEqual(false, directory.Contains("7ac2fe88c908"));
-            Assert.AreEqual(false, directory.Contains("xbx"));
-
-            error = fs.ReadDir("49470015/7AC2FE88C908", out directory);
-            Assert.AreEqual(Errno.NoError, error);
-            Assert.AreEqual(3,             directory.Count);
-
-            Assert.AreEqual(true, directory.Contains("SaveMeta.xbx"));
-            Assert.AreEqual(true, directory.Contains("savedata.dat"));
-            Assert.AreEqual(true, directory.Contains("saveimage.xbx"));
-
-            Assert.AreEqual(false, directory.Contains("savemeta.xbx"));
-            Assert.AreEqual(false, directory.Contains("SaveData.dat"));
-            Assert.AreEqual(false, directory.Contains("SaveImage.xbx"));
-        }
-
-        [Test]
-        public void Statfs()
-        {
-            Errno error = fs.StatFs(out FileSystemInfo stat);
-            Assert.AreEqual(Errno.NoError, error);
-            Assert.AreEqual(1960,          stat.Blocks);
-            Assert.AreEqual(42,            stat.FilenameLength);
-            Assert.AreEqual(0,             stat.Files);
-            Assert.AreEqual(0,             stat.FreeBlocks);
-            Assert.AreEqual(0,             stat.FreeFiles);
-            Assert.AreEqual(0x58544146,    stat.Id.Serial32);
-            Assert.AreEqual("Xbox FAT",    stat.Type);
+            Assert.AreEqual("Volume láb€l", fs.XmlFsType.VolumeName);
+            Assert.AreEqual("4639B7D0", fs.XmlFsType.VolumeSerial);
         }
 
         [Test]
@@ -155,59 +99,16 @@ namespace Aaru.Tests.Filesystems
 
             error = fs.MapBlock("49470015/TitleImage.xbx", 0, out block);
             Assert.AreEqual(Errno.NoError, error);
-            Assert.AreEqual(80,            block);
+            Assert.AreEqual(80, block);
 
             error = fs.MapBlock("49470015/7AC2FE88C908/savedata.dat", 2, out block);
             Assert.AreEqual(Errno.NoError, error);
-            Assert.AreEqual(272,           block);
+            Assert.AreEqual(272, block);
 
             error = fs.MapBlock("49470015/7AC2FE88C908/savedata.dat", 200, out block);
             Assert.AreEqual(Errno.InvalidArgument, error);
         }
 
-        [Test]
-        public void Stat()
-        {
-            Errno error = fs.Stat("49470015", out FileEntryInfo stat);
-            Assert.AreEqual(Errno.NoError,                                         error);
-            Assert.AreEqual(new DateTime(2007, 3, 6, 15, 8, 44, DateTimeKind.Utc), stat.AccessTimeUtc);
-            Assert.AreEqual(FileAttributes.Directory,                              stat.Attributes);
-            Assert.AreEqual(DateTime.MinValue,                                     stat.BackupTimeUtc);
-            Assert.AreEqual(1,                                                     stat.Blocks);
-            Assert.AreEqual(16384,                                                 stat.BlockSize);
-            Assert.AreEqual(new DateTime(2007, 3, 6, 15, 8, 44, DateTimeKind.Utc), stat.CreationTimeUtc);
-            Assert.AreEqual(0,                                                     stat.DeviceNo);
-            Assert.AreEqual(0,                                                     stat.GID);
-            Assert.AreEqual(2,                                                     stat.Inode);
-            Assert.AreEqual(new DateTime(2007, 3, 6, 15, 8, 44, DateTimeKind.Utc), stat.LastWriteTimeUtc);
-            Assert.AreEqual(16384,                                                 stat.Length);
-            Assert.AreEqual(1,                                                     stat.Links);
-            Assert.AreEqual(365,                                                   stat.Mode);
-            Assert.AreEqual(DateTime.MinValue,                                     stat.StatusChangeTimeUtc);
-            Assert.AreEqual(0,                                                     stat.UID);
-
-            error = fs.Stat("49470015/TitleImage", out stat);
-            Assert.AreEqual(Errno.NoSuchFile, error);
-
-            error = fs.Stat("49470015/TitleImage.xbx", out stat);
-            Assert.AreEqual(Errno.NoError,                                          error);
-            Assert.AreEqual(new DateTime(2013, 5, 14, 12, 50, 8, DateTimeKind.Utc), stat.AccessTimeUtc);
-            Assert.AreEqual(FileAttributes.None,                                    stat.Attributes);
-            Assert.AreEqual(DateTime.MinValue,                                      stat.BackupTimeUtc);
-            Assert.AreEqual(1,                                                      stat.Blocks);
-            Assert.AreEqual(16384,                                                  stat.BlockSize);
-            Assert.AreEqual(new DateTime(2013, 5, 14, 12, 50, 8, DateTimeKind.Utc), stat.CreationTimeUtc);
-            Assert.AreEqual(0,                                                      stat.DeviceNo);
-            Assert.AreEqual(0,                                                      stat.GID);
-            Assert.AreEqual(3,                                                      stat.Inode);
-            Assert.AreEqual(new DateTime(2013, 5, 14, 12, 50, 8, DateTimeKind.Utc), stat.LastWriteTimeUtc);
-            Assert.AreEqual(10240,                                                  stat.Length);
-            Assert.AreEqual(1,                                                      stat.Links);
-            Assert.AreEqual(292,                                                    stat.Mode);
-            Assert.AreEqual(DateTime.MinValue,                                      stat.StatusChangeTimeUtc);
-            Assert.AreEqual(0,                                                      stat.UID);
-        }
-
         [Test]
         public void Read()
         {
@@ -220,19 +121,22 @@ namespace Aaru.Tests.Filesystems
 
             error = fs.Read("49470015/7AC2FE88C908/savedata.dat", 0, 0, ref buffer);
             Assert.AreEqual(Errno.NoError, error);
-            Assert.AreEqual(0,             buffer.Length);
+            Assert.AreEqual(0, buffer.Length);
+
             Assert.AreEqual("e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
                             Sha256Context.Data(buffer, out _));
 
             error = fs.Read("49470015/7AC2FE88C908/savedata.dat", 1, 16, ref buffer);
             Assert.AreEqual(Errno.NoError, error);
-            Assert.AreEqual(16,            buffer.Length);
+            Assert.AreEqual(16, buffer.Length);
+
             Assert.AreEqual("ff82559d2d0c610ac25b78dcb53a8312e32b56192044deb1f01540581bd54e80",
                             Sha256Context.Data(buffer, out _));
 
             error = fs.Read("49470015/7AC2FE88C908/savedata.dat", 248, 131072, ref buffer);
             Assert.AreEqual(Errno.NoError, error);
-            Assert.AreEqual(61996,         buffer.Length);
+            Assert.AreEqual(61996, buffer.Length);
+
             Assert.AreEqual("2eb0d62a96ad28473ce0dd67052efdfae31f371992e1d8309beeeff6f2b46a59",
                             Sha256Context.Data(buffer, out _));
 
@@ -240,23 +144,115 @@ namespace Aaru.Tests.Filesystems
             Assert.AreEqual(Errno.InvalidArgument, error);
         }
 
-        [TearDown]
-        public void Destroy()
+        [Test]
+        public void RootDirectory()
         {
-            fs?.Unmount();
-            fs = null;
+            Errno error = fs.ReadDir("", out List<string> directory);
+            Assert.AreEqual(Errno.NoError, error);
+            Assert.AreEqual(6, directory.Count);
+
+            Assert.AreEqual(true, directory.Contains("49470015"));
+            Assert.AreEqual(true, directory.Contains("4d5300d1"));
+            Assert.AreEqual(true, directory.Contains("4d53006e"));
+            Assert.AreEqual(true, directory.Contains("4d530004"));
+            Assert.AreEqual(true, directory.Contains("4947007c"));
+            Assert.AreEqual(true, directory.Contains("4541003e"));
+
+            Assert.AreEqual(false, directory.Contains("d530004"));
+            Assert.AreEqual(false, directory.Contains("4947007"));
+        }
+
+        [Test]
+        public void Stat()
+        {
+            Errno error = fs.Stat("49470015", out FileEntryInfo stat);
+            Assert.AreEqual(Errno.NoError, error);
+            Assert.AreEqual(new DateTime(2007, 3, 6, 15, 8, 44, DateTimeKind.Utc), stat.AccessTimeUtc);
+            Assert.AreEqual(FileAttributes.Directory, stat.Attributes);
+            Assert.AreEqual(DateTime.MinValue, stat.BackupTimeUtc);
+            Assert.AreEqual(1, stat.Blocks);
+            Assert.AreEqual(16384, stat.BlockSize);
+            Assert.AreEqual(new DateTime(2007, 3, 6, 15, 8, 44, DateTimeKind.Utc), stat.CreationTimeUtc);
+            Assert.AreEqual(0, stat.DeviceNo);
+            Assert.AreEqual(0, stat.GID);
+            Assert.AreEqual(2, stat.Inode);
+            Assert.AreEqual(new DateTime(2007, 3, 6, 15, 8, 44, DateTimeKind.Utc), stat.LastWriteTimeUtc);
+            Assert.AreEqual(16384, stat.Length);
+            Assert.AreEqual(1, stat.Links);
+            Assert.AreEqual(365, stat.Mode);
+            Assert.AreEqual(DateTime.MinValue, stat.StatusChangeTimeUtc);
+            Assert.AreEqual(0, stat.UID);
+
+            error = fs.Stat("49470015/TitleImage", out stat);
+            Assert.AreEqual(Errno.NoSuchFile, error);
+
+            error = fs.Stat("49470015/TitleImage.xbx", out stat);
+            Assert.AreEqual(Errno.NoError, error);
+            Assert.AreEqual(new DateTime(2013, 5, 14, 12, 50, 8, DateTimeKind.Utc), stat.AccessTimeUtc);
+            Assert.AreEqual(FileAttributes.None, stat.Attributes);
+            Assert.AreEqual(DateTime.MinValue, stat.BackupTimeUtc);
+            Assert.AreEqual(1, stat.Blocks);
+            Assert.AreEqual(16384, stat.BlockSize);
+            Assert.AreEqual(new DateTime(2013, 5, 14, 12, 50, 8, DateTimeKind.Utc), stat.CreationTimeUtc);
+            Assert.AreEqual(0, stat.DeviceNo);
+            Assert.AreEqual(0, stat.GID);
+            Assert.AreEqual(3, stat.Inode);
+            Assert.AreEqual(new DateTime(2013, 5, 14, 12, 50, 8, DateTimeKind.Utc), stat.LastWriteTimeUtc);
+            Assert.AreEqual(10240, stat.Length);
+            Assert.AreEqual(1, stat.Links);
+            Assert.AreEqual(292, stat.Mode);
+            Assert.AreEqual(DateTime.MinValue, stat.StatusChangeTimeUtc);
+            Assert.AreEqual(0, stat.UID);
+        }
+
+        [Test]
+        public void Statfs()
+        {
+            Errno error = fs.StatFs(out FileSystemInfo stat);
+            Assert.AreEqual(Errno.NoError, error);
+            Assert.AreEqual(1960, stat.Blocks);
+            Assert.AreEqual(42, stat.FilenameLength);
+            Assert.AreEqual(0, stat.Files);
+            Assert.AreEqual(0, stat.FreeBlocks);
+            Assert.AreEqual(0, stat.FreeFiles);
+            Assert.AreEqual(0x58544146, stat.Id.Serial32);
+            Assert.AreEqual("Xbox FAT", stat.Type);
+        }
+
+        [Test]
+        public void SubDirectory()
+        {
+            Errno error = fs.ReadDir("49470015", out List<string> directory);
+            Assert.AreEqual(Errno.NoError, error);
+            Assert.AreEqual(4, directory.Count);
+
+            Assert.AreEqual(true, directory.Contains("TitleImage.xbx"));
+            Assert.AreEqual(true, directory.Contains("SaveImage.xbx"));
+            Assert.AreEqual(true, directory.Contains("7AC2FE88C908"));
+            Assert.AreEqual(true, directory.Contains("TitleMeta.xbx"));
+
+            Assert.AreEqual(false, directory.Contains("TitleImage"));
+            Assert.AreEqual(false, directory.Contains(".xbx"));
+            Assert.AreEqual(false, directory.Contains("7ac2fe88c908"));
+            Assert.AreEqual(false, directory.Contains("xbx"));
+
+            error = fs.ReadDir("49470015/7AC2FE88C908", out directory);
+            Assert.AreEqual(Errno.NoError, error);
+            Assert.AreEqual(3, directory.Count);
+
+            Assert.AreEqual(true, directory.Contains("SaveMeta.xbx"));
+            Assert.AreEqual(true, directory.Contains("savedata.dat"));
+            Assert.AreEqual(true, directory.Contains("saveimage.xbx"));
+
+            Assert.AreEqual(false, directory.Contains("savemeta.xbx"));
+            Assert.AreEqual(false, directory.Contains("SaveData.dat"));
+            Assert.AreEqual(false, directory.Contains("SaveImage.xbx"));
         }
     }
 
     [TestFixture]
     public class Xbox360Fat
     {
-        string              location;
-        IFilter             filter;
-        IMediaImage         image;
-        IReadOnlyFilesystem fs;
-        Partition           dataPartition;
-
         [SetUp]
         public void Init()
         {
@@ -273,69 +269,28 @@ namespace Aaru.Tests.Filesystems
             Assert.AreEqual(Errno.NoError, error);
         }
 
+        [TearDown]
+        public void Destroy()
+        {
+            fs?.Unmount();
+            fs = null;
+        }
+
+        string              location;
+        IFilter             filter;
+        IMediaImage         image;
+        IReadOnlyFilesystem fs;
+        Partition           dataPartition;
+
         [Test]
         public void Information()
         {
-            Assert.AreEqual(491520,            image.Info.Sectors);
-            Assert.AreEqual(14848,             fs.XmlFsType.Clusters);
-            Assert.AreEqual(16384,             fs.XmlFsType.ClusterSize);
+            Assert.AreEqual(491520, image.Info.Sectors);
+            Assert.AreEqual(14848, fs.XmlFsType.Clusters);
+            Assert.AreEqual(16384, fs.XmlFsType.ClusterSize);
             Assert.AreEqual("FATX filesystem", fs.XmlFsType.Type);
-            Assert.AreEqual(string.Empty,      fs.XmlFsType.VolumeName);
-            Assert.AreEqual("66C2E9D0",        fs.XmlFsType.VolumeSerial);
-        }
-
-        [Test]
-        public void RootDirectory()
-        {
-            Errno error = fs.ReadDir("", out List<string> directory);
-            Assert.AreEqual(Errno.NoError, error);
-            Assert.AreEqual(2,             directory.Count);
-
-            Assert.AreEqual(true, directory.Contains("name.txt"));
-            Assert.AreEqual(true, directory.Contains("Content"));
-
-            Assert.AreEqual(false, directory.Contains("name"));
-            Assert.AreEqual(false, directory.Contains("content"));
-        }
-
-        [Test]
-        public void SubDirectory()
-        {
-            Errno error = fs.ReadDir("Content", out List<string> directory);
-            Assert.AreEqual(Errno.NoError, error);
-            Assert.AreEqual(2,             directory.Count);
-
-            Assert.AreEqual(true, directory.Contains("0000000000000000"));
-            Assert.AreEqual(true, directory.Contains("EBA4FD1C82295965"));
-
-            Assert.AreEqual(false, directory.Contains("000000000000000"));
-            Assert.AreEqual(false, directory.Contains("eba4FD1C82295965"));
-
-            error = fs.ReadDir("Content/EBA4FD1C82295965/454108CF/00000001", out directory);
-            Assert.AreEqual(Errno.NoError, error);
-            Assert.AreEqual(3,             directory.Count);
-
-            Assert.AreEqual(true, directory.Contains("DICP1-ES-PROFILE000000000000000"));
-            Assert.AreEqual(true, directory.Contains("DI1-ES-117218325276118302153627"));
-            Assert.AreEqual(true, directory.Contains("DI1-ES-120060617014626142312477"));
-
-            Assert.AreEqual(false, directory.Contains("DICP1-es-PROFILE000000000000000"));
-            Assert.AreEqual(false, directory.Contains("di1-ES-117218325276118302153627"));
-            Assert.AreEqual(false, directory.Contains("DI1ES120060617014626142312477"));
-        }
-
-        [Test]
-        public void Statfs()
-        {
-            Errno error = fs.StatFs(out FileSystemInfo stat);
-            Assert.AreEqual(Errno.NoError,  error);
-            Assert.AreEqual(14848,          stat.Blocks);
-            Assert.AreEqual(42,             stat.FilenameLength);
-            Assert.AreEqual(0,              stat.Files);
-            Assert.AreEqual(0,              stat.FreeBlocks);
-            Assert.AreEqual(0,              stat.FreeFiles);
-            Assert.AreEqual(0x58544146,     stat.Id.Serial32);
-            Assert.AreEqual("Xbox 360 FAT", stat.Type);
+            Assert.AreEqual(string.Empty, fs.XmlFsType.VolumeName);
+            Assert.AreEqual("66C2E9D0", fs.XmlFsType.VolumeSerial);
         }
 
         [Test]
@@ -349,59 +304,16 @@ namespace Aaru.Tests.Filesystems
 
             error = fs.MapBlock("Content/0000000000000000/FFFE07DF/00040000/ContentCache.pkg", 0, out block);
             Assert.AreEqual(Errno.NoError, error);
-            Assert.AreEqual(16992,         block);
+            Assert.AreEqual(16992, block);
 
             error = fs.MapBlock("Content/0000000000000000/FFFE07DF/00040000/ContentCache.pkg", 2, out block);
             Assert.AreEqual(Errno.NoError, error);
-            Assert.AreEqual(17056,         block);
+            Assert.AreEqual(17056, block);
 
             error = fs.MapBlock("Content/0000000000000000/FFFE07DF/00040000/ContentCache.pkg", 2000000, out block);
             Assert.AreEqual(Errno.InvalidArgument, error);
         }
 
-        [Test]
-        public void Stat()
-        {
-            Errno error = fs.Stat("Content/0000000000000000/FFFE07DF/00040000", out FileEntryInfo stat);
-            Assert.AreEqual(Errno.NoError,                                           error);
-            Assert.AreEqual(new DateTime(2013, 9, 25, 12, 49, 46, DateTimeKind.Utc), stat.AccessTimeUtc);
-            Assert.AreEqual(FileAttributes.Directory,                                stat.Attributes);
-            Assert.AreEqual(DateTime.MinValue,                                       stat.BackupTimeUtc);
-            Assert.AreEqual(1,                                                       stat.Blocks);
-            Assert.AreEqual(16384,                                                   stat.BlockSize);
-            Assert.AreEqual(new DateTime(2013, 9, 25, 12, 49, 46, DateTimeKind.Utc), stat.CreationTimeUtc);
-            Assert.AreEqual(0,                                                       stat.DeviceNo);
-            Assert.AreEqual(0,                                                       stat.GID);
-            Assert.AreEqual(12,                                                      stat.Inode);
-            Assert.AreEqual(new DateTime(2013, 9, 25, 12, 49, 46, DateTimeKind.Utc), stat.LastWriteTimeUtc);
-            Assert.AreEqual(16384,                                                   stat.Length);
-            Assert.AreEqual(1,                                                       stat.Links);
-            Assert.AreEqual(365,                                                     stat.Mode);
-            Assert.AreEqual(DateTime.MinValue,                                       stat.StatusChangeTimeUtc);
-            Assert.AreEqual(0,                                                       stat.UID);
-
-            error = fs.Stat("Content/0000000000000000/FFFE07DF/00040000/ContentCache", out stat);
-            Assert.AreEqual(Errno.NoSuchFile, error);
-
-            error = fs.Stat("Content/0000000000000000/FFFE07DF/00040000/ContentCache.pkg", out stat);
-            Assert.AreEqual(Errno.NoError,                                            error);
-            Assert.AreEqual(new DateTime(2016, 11, 18, 20, 34, 48, DateTimeKind.Utc), stat.AccessTimeUtc);
-            Assert.AreEqual(FileAttributes.None,                                      stat.Attributes);
-            Assert.AreEqual(DateTime.MinValue,                                        stat.BackupTimeUtc);
-            Assert.AreEqual(6,                                                        stat.Blocks);
-            Assert.AreEqual(16384,                                                    stat.BlockSize);
-            Assert.AreEqual(new DateTime(2016, 11, 18, 20, 34, 48, DateTimeKind.Utc), stat.CreationTimeUtc);
-            Assert.AreEqual(0,                                                        stat.DeviceNo);
-            Assert.AreEqual(0,                                                        stat.GID);
-            Assert.AreEqual(18,                                                       stat.Inode);
-            Assert.AreEqual(new DateTime(2016, 11, 18, 20, 34, 48, DateTimeKind.Utc), stat.LastWriteTimeUtc);
-            Assert.AreEqual(86016,                                                    stat.Length);
-            Assert.AreEqual(1,                                                        stat.Links);
-            Assert.AreEqual(292,                                                      stat.Mode);
-            Assert.AreEqual(DateTime.MinValue,                                        stat.StatusChangeTimeUtc);
-            Assert.AreEqual(0,                                                        stat.UID);
-        }
-
         [Test]
         public void Read()
         {
@@ -414,19 +326,22 @@ namespace Aaru.Tests.Filesystems
 
             error = fs.Read("Content/0000000000000000/FFFE07DF/00040000/ContentCache.pkg", 0, 0, ref buffer);
             Assert.AreEqual(Errno.NoError, error);
-            Assert.AreEqual(0,             buffer.Length);
+            Assert.AreEqual(0, buffer.Length);
+
             Assert.AreEqual("e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
                             Sha256Context.Data(buffer, out _));
 
             error = fs.Read("Content/0000000000000000/FFFE07DF/00040000/ContentCache.pkg", 1, 16, ref buffer);
             Assert.AreEqual(Errno.NoError, error);
-            Assert.AreEqual(16,            buffer.Length);
+            Assert.AreEqual(16, buffer.Length);
+
             Assert.AreEqual("f73a941675b8df16b0fc908f242c3c51382c5b159e709e0f9ffc1e5aac35f77d",
                             Sha256Context.Data(buffer, out _));
 
             error = fs.Read("Content/0000000000000000/FFFE07DF/00040000/ContentCache.pkg", 248, 131072, ref buffer);
             Assert.AreEqual(Errno.NoError, error);
-            Assert.AreEqual(85768,         buffer.Length);
+            Assert.AreEqual(85768, buffer.Length);
+
             Assert.AreEqual("19caf1365e1b7d5446ca0c2518d15e94c3ab0faaf2f8f3b31c9e1656dff57bd9",
                             Sha256Context.Data(buffer, out _));
 
@@ -434,11 +349,101 @@ namespace Aaru.Tests.Filesystems
             Assert.AreEqual(Errno.InvalidArgument, error);
         }
 
-        [TearDown]
-        public void Destroy()
+        [Test]
+        public void RootDirectory()
         {
-            fs?.Unmount();
-            fs = null;
+            Errno error = fs.ReadDir("", out List<string> directory);
+            Assert.AreEqual(Errno.NoError, error);
+            Assert.AreEqual(2, directory.Count);
+
+            Assert.AreEqual(true, directory.Contains("name.txt"));
+            Assert.AreEqual(true, directory.Contains("Content"));
+
+            Assert.AreEqual(false, directory.Contains("name"));
+            Assert.AreEqual(false, directory.Contains("content"));
+        }
+
+        [Test]
+        public void Stat()
+        {
+            Errno error = fs.Stat("Content/0000000000000000/FFFE07DF/00040000", out FileEntryInfo stat);
+            Assert.AreEqual(Errno.NoError, error);
+            Assert.AreEqual(new DateTime(2013, 9, 25, 12, 49, 46, DateTimeKind.Utc), stat.AccessTimeUtc);
+            Assert.AreEqual(FileAttributes.Directory, stat.Attributes);
+            Assert.AreEqual(DateTime.MinValue, stat.BackupTimeUtc);
+            Assert.AreEqual(1, stat.Blocks);
+            Assert.AreEqual(16384, stat.BlockSize);
+            Assert.AreEqual(new DateTime(2013, 9, 25, 12, 49, 46, DateTimeKind.Utc), stat.CreationTimeUtc);
+            Assert.AreEqual(0, stat.DeviceNo);
+            Assert.AreEqual(0, stat.GID);
+            Assert.AreEqual(12, stat.Inode);
+            Assert.AreEqual(new DateTime(2013, 9, 25, 12, 49, 46, DateTimeKind.Utc), stat.LastWriteTimeUtc);
+            Assert.AreEqual(16384, stat.Length);
+            Assert.AreEqual(1, stat.Links);
+            Assert.AreEqual(365, stat.Mode);
+            Assert.AreEqual(DateTime.MinValue, stat.StatusChangeTimeUtc);
+            Assert.AreEqual(0, stat.UID);
+
+            error = fs.Stat("Content/0000000000000000/FFFE07DF/00040000/ContentCache", out stat);
+            Assert.AreEqual(Errno.NoSuchFile, error);
+
+            error = fs.Stat("Content/0000000000000000/FFFE07DF/00040000/ContentCache.pkg", out stat);
+            Assert.AreEqual(Errno.NoError, error);
+            Assert.AreEqual(new DateTime(2016, 11, 18, 20, 34, 48, DateTimeKind.Utc), stat.AccessTimeUtc);
+            Assert.AreEqual(FileAttributes.None, stat.Attributes);
+            Assert.AreEqual(DateTime.MinValue, stat.BackupTimeUtc);
+            Assert.AreEqual(6, stat.Blocks);
+            Assert.AreEqual(16384, stat.BlockSize);
+            Assert.AreEqual(new DateTime(2016, 11, 18, 20, 34, 48, DateTimeKind.Utc), stat.CreationTimeUtc);
+            Assert.AreEqual(0, stat.DeviceNo);
+            Assert.AreEqual(0, stat.GID);
+            Assert.AreEqual(18, stat.Inode);
+            Assert.AreEqual(new DateTime(2016, 11, 18, 20, 34, 48, DateTimeKind.Utc), stat.LastWriteTimeUtc);
+            Assert.AreEqual(86016, stat.Length);
+            Assert.AreEqual(1, stat.Links);
+            Assert.AreEqual(292, stat.Mode);
+            Assert.AreEqual(DateTime.MinValue, stat.StatusChangeTimeUtc);
+            Assert.AreEqual(0, stat.UID);
+        }
+
+        [Test]
+        public void Statfs()
+        {
+            Errno error = fs.StatFs(out FileSystemInfo stat);
+            Assert.AreEqual(Errno.NoError, error);
+            Assert.AreEqual(14848, stat.Blocks);
+            Assert.AreEqual(42, stat.FilenameLength);
+            Assert.AreEqual(0, stat.Files);
+            Assert.AreEqual(0, stat.FreeBlocks);
+            Assert.AreEqual(0, stat.FreeFiles);
+            Assert.AreEqual(0x58544146, stat.Id.Serial32);
+            Assert.AreEqual("Xbox 360 FAT", stat.Type);
+        }
+
+        [Test]
+        public void SubDirectory()
+        {
+            Errno error = fs.ReadDir("Content", out List<string> directory);
+            Assert.AreEqual(Errno.NoError, error);
+            Assert.AreEqual(2, directory.Count);
+
+            Assert.AreEqual(true, directory.Contains("0000000000000000"));
+            Assert.AreEqual(true, directory.Contains("EBA4FD1C82295965"));
+
+            Assert.AreEqual(false, directory.Contains("000000000000000"));
+            Assert.AreEqual(false, directory.Contains("eba4FD1C82295965"));
+
+            error = fs.ReadDir("Content/EBA4FD1C82295965/454108CF/00000001", out directory);
+            Assert.AreEqual(Errno.NoError, error);
+            Assert.AreEqual(3, directory.Count);
+
+            Assert.AreEqual(true, directory.Contains("DICP1-ES-PROFILE000000000000000"));
+            Assert.AreEqual(true, directory.Contains("DI1-ES-117218325276118302153627"));
+            Assert.AreEqual(true, directory.Contains("DI1-ES-120060617014626142312477"));
+
+            Assert.AreEqual(false, directory.Contains("DICP1-es-PROFILE000000000000000"));
+            Assert.AreEqual(false, directory.Contains("di1-ES-117218325276118302153627"));
+            Assert.AreEqual(false, directory.Contains("DI1ES120060617014626142312477"));
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/HAMMER.cs b/Aaru.Tests/Filesystems/HAMMER.cs
index 7dfba06bc..85272187a 100644
--- a/Aaru.Tests/Filesystems/HAMMER.cs
+++ b/Aaru.Tests/Filesystems/HAMMER.cs
@@ -40,17 +40,35 @@ namespace Aaru.Tests.Filesystems
     [TestFixture]
     public class HammerMbr
     {
-        readonly string[] testfiles = {"dflybsd_3.6.1.vdi.lz", "dflybsd_4.0.5.vdi.lz"};
+        readonly string[] testfiles =
+        {
+            "dflybsd_3.6.1.vdi.lz", "dflybsd_4.0.5.vdi.lz"
+        };
 
-        readonly ulong[] sectors = {104857600, 104857600};
+        readonly ulong[] sectors =
+        {
+            104857600, 104857600
+        };
 
-        readonly uint[] sectorsize = {512, 512};
+        readonly uint[] sectorsize =
+        {
+            512, 512
+        };
 
-        readonly long[] clusters = {6310, 6310};
+        readonly long[] clusters =
+        {
+            6310, 6310
+        };
 
-        readonly int[] clustersize = {8388608, 8388608};
+        readonly int[] clustersize =
+        {
+            8388608, 8388608
+        };
 
-        readonly string[] volumename = {"Volume label", "Volume label"};
+        readonly string[] volumename =
+        {
+            "Volume label", "Volume label"
+        };
 
         readonly string[] volumeserial =
         {
@@ -66,26 +84,28 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new Vdi();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 IFilesystem     fs         = new HAMMER();
                 int             part       = -1;
+
                 for(int j = 0; j < partitions.Count; j++)
                     if(partitions[j].Type == "Hammer")
                     {
                         part = j;
+
                         break;
                     }
 
                 Assert.AreNotEqual(-1, part, $"Partition not found on {testfiles[i]}");
                 Assert.AreEqual(true, fs.Identify(image, partitions[part]), testfiles[i]);
                 fs.GetInformation(image, partitions[part], out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,     testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,  testfiles[i]);
-                Assert.AreEqual("HAMMER",        fs.XmlFsType.Type,         testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,   testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual("HAMMER", fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
                 Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
             }
         }
diff --git a/Aaru.Tests/Filesystems/HFS.cs b/Aaru.Tests/Filesystems/HFS.cs
index f255efbca..0d7a72cd0 100644
--- a/Aaru.Tests/Filesystems/HFS.cs
+++ b/Aaru.Tests/Filesystems/HFS.cs
@@ -42,9 +42,9 @@ namespace Aaru.Tests.Filesystems
     {
         readonly string[] testfiles =
         {
-            "macos_1.1_mf2dd.img.lz", "macos_2.0_mf2dd.img.lz", "macos_6.0.7_mf2dd.img.lz",
-            "nextstep_3.3_mf2hd.img.lz", "openstep_4.0_mf2hd.img.lz", "openstep_4.2_mf2hd.img.lz",
-            "rhapsody_dr1_mf2hd.img.lz", "ecs20_mf2hd_fstester.img.lz"
+            "macos_1.1_mf2dd.img.lz", "macos_2.0_mf2dd.img.lz", "macos_6.0.7_mf2dd.img.lz", "nextstep_3.3_mf2hd.img.lz",
+            "openstep_4.0_mf2hd.img.lz", "openstep_4.2_mf2hd.img.lz", "rhapsody_dr1_mf2hd.img.lz",
+            "ecs20_mf2hd_fstester.img.lz"
         };
 
         readonly MediaType[] mediatypes =
@@ -53,13 +53,25 @@ namespace Aaru.Tests.Filesystems
             MediaType.DOS_35_HD, MediaType.DOS_35_HD, MediaType.DOS_35_HD, MediaType.DOS_35_HD
         };
 
-        readonly ulong[] sectors = {1600, 1600, 1600, 2880, 2880, 2880, 2880, 2880};
+        readonly ulong[] sectors =
+        {
+            1600, 1600, 1600, 2880, 2880, 2880, 2880, 2880
+        };
 
-        readonly uint[] sectorsize = {512, 512, 512, 512, 512, 512, 512, 512};
+        readonly uint[] sectorsize =
+        {
+            512, 512, 512, 512, 512, 512, 512, 512
+        };
 
-        readonly long[] clusters = {1594, 1594, 1594, 2874, 2874, 2874, 2874, 2874};
+        readonly long[] clusters =
+        {
+            1594, 1594, 1594, 2874, 2874, 2874, 2874, 2874
+        };
 
-        readonly int[] clustersize = {512, 512, 512, 512, 512, 512, 512, 512};
+        readonly int[] clustersize =
+        {
+            512, 512, 512, 512, 512, 512, 512, 512
+        };
 
         readonly string[] volumename =
         {
@@ -67,7 +79,10 @@ namespace Aaru.Tests.Filesystems
             "Volume label", "VOLUME LABEL"
         };
 
-        readonly string[] volumeserial = {null, null, null, null, null, null, null, null};
+        readonly string[] volumeserial =
+        {
+            null, null, null, null, null, null, null, null
+        };
 
         [Test]
         public void Test()
@@ -78,23 +93,24 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new ZZZRawImage();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(mediatypes[i], image.Info.MediaType,  testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(mediatypes[i], image.Info.MediaType, testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 IFilesystem fs = new AppleHFS();
-                Partition wholePart = new Partition
+
+                var wholePart = new Partition
                 {
-                    Name   = "Whole device",
-                    Length = image.Info.Sectors,
-                    Size   = image.Info.Sectors * image.Info.SectorSize
+                    Name = "Whole device", Length = image.Info.Sectors,
+                    Size = image.Info.Sectors * image.Info.SectorSize
                 };
+
                 Assert.AreEqual(true, fs.Identify(image, wholePart), testfiles[i]);
                 fs.GetInformation(image, wholePart, out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,     testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,  testfiles[i]);
-                Assert.AreEqual("HFS",           fs.XmlFsType.Type,         testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,   testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual("HFS", fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
                 Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
             }
         }
@@ -106,21 +122,20 @@ namespace Aaru.Tests.Filesystems
         readonly string[] testfiles =
         {
             "amigaos_3.9.vdi.lz", "darwin_1.3.1.vdi.lz", "darwin_1.4.1.vdi.lz", "darwin_6.0.2.vdi.lz",
-            "darwin_8.0.1.vdi.lz", "macos_1.1.vdi.lz", "macos_2.0.vdi.lz", "macos_6.0.7.vdi.lz",
-            "macos_7.5.3.vdi.lz", "macos_7.5.vdi.lz", "macos_7.6.vdi.lz", "macos_8.0.vdi.lz", "macos_8.1.vdi.lz",
-            "macos_9.0.4.vdi.lz", "macos_9.1.vdi.lz", "macos_9.2.1.vdi.lz", "macos_9.2.2.vdi.lz",
-            "macosx_10.2.vdi.lz", "macosx_10.3.vdi.lz", "macosx_10.4.vdi.lz", "rhapsody_dr1.vdi.lz",
-            "d2_driver.vdi.lz", "hdt_1.8.vdi.lz", "macos_4.2.vdi.lz", "macos_4.3.vdi.lz", "macos_6.0.2.vdi.lz",
-            "macos_6.0.3.vdi.lz", "macos_6.0.4.vdi.lz", "macos_6.0.5.vdi.lz", "macos_6.0.8.vdi.lz",
-            "macos_6.0.vdi.lz", "macos_7.0.vdi.lz", "macos_7.1.1.vdi.lz", "parted.vdi.lz",
+            "darwin_8.0.1.vdi.lz", "macos_1.1.vdi.lz", "macos_2.0.vdi.lz", "macos_6.0.7.vdi.lz", "macos_7.5.3.vdi.lz",
+            "macos_7.5.vdi.lz", "macos_7.6.vdi.lz", "macos_8.0.vdi.lz", "macos_8.1.vdi.lz", "macos_9.0.4.vdi.lz",
+            "macos_9.1.vdi.lz", "macos_9.2.1.vdi.lz", "macos_9.2.2.vdi.lz", "macosx_10.2.vdi.lz", "macosx_10.3.vdi.lz",
+            "macosx_10.4.vdi.lz", "rhapsody_dr1.vdi.lz", "d2_driver.vdi.lz", "hdt_1.8.vdi.lz", "macos_4.2.vdi.lz",
+            "macos_4.3.vdi.lz", "macos_6.0.2.vdi.lz", "macos_6.0.3.vdi.lz", "macos_6.0.4.vdi.lz", "macos_6.0.5.vdi.lz",
+            "macos_6.0.8.vdi.lz", "macos_6.0.vdi.lz", "macos_7.0.vdi.lz", "macos_7.1.1.vdi.lz", "parted.vdi.lz",
             "silverlining_2.2.1.vdi.lz", "speedtools_3.6.vdi.lz", "vcpformatter_2.1.1.vdi.lz"
         };
 
         readonly ulong[] sectors =
         {
-            1024128, 409600, 409600, 409600, 409600, 41820, 41820, 81648, 1024000, 1024000, 1024000, 1024000,
-            1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 409600, 51200, 51200, 41820,
-            41820, 54840, 54840, 54840, 54840, 54840, 41820, 54840, 54840, 262144, 51200, 51200, 54840
+            1024128, 409600, 409600, 409600, 409600, 41820, 41820, 81648, 1024000, 1024000, 1024000, 1024000, 1024000,
+            1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 409600, 51200, 51200, 41820, 41820, 54840,
+            54840, 54840, 54840, 54840, 41820, 54840, 54840, 262144, 51200, 51200, 54840
         };
 
         readonly uint[] sectorsize =
@@ -138,8 +153,8 @@ namespace Aaru.Tests.Filesystems
 
         readonly int[] clustersize =
         {
-            8192, 4096, 4096, 3584, 3584, 512, 512, 1024, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192,
-            8192, 8192, 8192, 3584, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 1024, 512, 512, 512
+            8192, 4096, 4096, 3584, 3584, 512, 512, 1024, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192,
+            8192, 8192, 3584, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 1024, 512, 512, 512
         };
 
         readonly string[] volumename =
@@ -148,15 +163,15 @@ namespace Aaru.Tests.Filesystems
             "Volume label", "Volume label", "Volume label", "Volume label", "Volume label", "Volume label",
             "Volume label", "Volume label", "Volume label", "Volume label", "Volume label", "Volume label",
             "Volume label", "Volume label", "Volume label", "Volume label", "Volume label", "Volume label",
-            "Volume label", "Volume label", "Volume label", "Test disk", "Volume label", "Volume label",
-            "Volume label", "Volume label", "Volume label", "Untitled", "Untitled  #1", "24 MB Disk", "Volume label"
+            "Volume label", "Volume label", "Volume label", "Test disk", "Volume label", "Volume label", "Volume label",
+            "Volume label", "Volume label", "Untitled", "Untitled  #1", "24 MB Disk", "Volume label"
         };
 
         readonly string[] volumeserial =
         {
             null, null, null, null, "AAFE1382AF5AA898", null, null, null, null, null, null, null, null, null, null,
-            null, null, "5A7C38B0CAF279C4", "FB49083EBD150509", "632C0B1DB46FD188", null, null, null, null, null,
-            null, null, null, null, null, null, null, null, null, null, null, null
+            null, null, "5A7C38B0CAF279C4", "FB49083EBD150509", "632C0B1DB46FD188", null, null, null, null, null, null,
+            null, null, null, null, null, null, null, null, null, null, null
         };
 
         [Test]
@@ -168,26 +183,28 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new Vdi();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 IFilesystem     fs         = new AppleHFS();
                 int             part       = -1;
+
                 for(int j = 0; j < partitions.Count; j++)
                     if(partitions[j].Type == "Apple_HFS")
                     {
                         part = j;
+
                         break;
                     }
 
                 Assert.AreNotEqual(-1, part, $"Partition not found on {testfiles[i]}");
                 Assert.AreEqual(true, fs.Identify(image, partitions[part]), testfiles[i]);
                 fs.GetInformation(image, partitions[part], out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,     testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,  testfiles[i]);
-                Assert.AreEqual("HFS",           fs.XmlFsType.Type,         testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,   testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual("HFS", fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
                 Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
             }
         }
@@ -199,24 +216,39 @@ namespace Aaru.Tests.Filesystems
         readonly string[] testfiles =
         {
             "toast_3.5.7_hfs_from_volume.iso.lz", "toast_3.5.7_iso9660_hfs.iso.lz",
-            "toast_4.1.3_hfs_from_volume.iso.lz", "toast_4.1.3_iso9660_hfs.iso.lz",
-            "toast_3.5.7_hfs_from_files.iso.lz", "toast_4.1.3_hfs_from_files.iso.lz"
+            "toast_4.1.3_hfs_from_volume.iso.lz", "toast_4.1.3_iso9660_hfs.iso.lz", "toast_3.5.7_hfs_from_files.iso.lz",
+            "toast_4.1.3_hfs_from_files.iso.lz"
         };
 
-        readonly ulong[] sectors = {942, 1880, 943, 1882, 1509, 1529};
+        readonly ulong[] sectors =
+        {
+            942, 1880, 943, 1882, 1509, 1529
+        };
 
-        readonly uint[] sectorsize = {2048, 2048, 2048, 2048, 2048, 2048};
+        readonly uint[] sectorsize =
+        {
+            2048, 2048, 2048, 2048, 2048, 2048
+        };
 
-        readonly long[] clusters = {3724, 931, 931, 931, 249, 249};
+        readonly long[] clusters =
+        {
+            3724, 931, 931, 931, 249, 249
+        };
 
-        readonly int[] clustersize = {512, 2048, 2048, 2048, 12288, 12288};
+        readonly int[] clustersize =
+        {
+            512, 2048, 2048, 2048, 12288, 12288
+        };
 
         readonly string[] volumename =
         {
             "Disk utils", "Disk utils", "Disk utils", "Disk utils", "Disk utils", "Disk utils"
         };
 
-        readonly string[] volumeserial = {null, null, null, null, null, null};
+        readonly string[] volumeserial =
+        {
+            null, null, null, null, null, null
+        };
 
         [Test]
         public void Test()
@@ -227,26 +259,28 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new ZZZRawImage();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 IFilesystem     fs         = new AppleHFS();
                 int             part       = -1;
+
                 for(int j = 0; j < partitions.Count; j++)
                     if(partitions[j].Type == "Apple_HFS")
                     {
                         part = j;
+
                         break;
                     }
 
                 Assert.AreNotEqual(-1, part, $"Partition not found on {testfiles[i]}");
                 Assert.AreEqual(true, fs.Identify(image, partitions[part]), testfiles[i]);
                 fs.GetInformation(image, partitions[part], out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,     testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,  testfiles[i]);
-                Assert.AreEqual("HFS",           fs.XmlFsType.Type,         testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,   testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual("HFS", fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
                 Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
             }
         }
@@ -257,24 +291,39 @@ namespace Aaru.Tests.Filesystems
     {
         readonly string[] testfiles =
         {
-            "linux.vdi.lz", "darwin_1.3.1.vdi.lz", "darwin_1.4.1.vdi.lz", "darwin_6.0.2.vdi.lz",
-            "darwin_8.0.1.vdi.lz", "linux_4.19_hfs_flashdrive.vdi.lz"
+            "linux.vdi.lz", "darwin_1.3.1.vdi.lz", "darwin_1.4.1.vdi.lz", "darwin_6.0.2.vdi.lz", "darwin_8.0.1.vdi.lz",
+            "linux_4.19_hfs_flashdrive.vdi.lz"
         };
 
-        readonly ulong[] sectors = {262144, 409600, 409600, 409600, 409600, 1024000};
+        readonly ulong[] sectors =
+        {
+            262144, 409600, 409600, 409600, 409600, 1024000
+        };
 
-        readonly uint[] sectorsize = {512, 512, 512, 512, 512, 512};
+        readonly uint[] sectorsize =
+        {
+            512, 512, 512, 512, 512, 512
+        };
 
-        readonly long[] clusters = {65018, 51145, 51145, 58452, 58502, 63870};
+        readonly long[] clusters =
+        {
+            65018, 51145, 51145, 58452, 58502, 63870
+        };
 
-        readonly int[] clustersize = {2048, 4096, 4096, 3584, 3584, 8192};
+        readonly int[] clustersize =
+        {
+            2048, 4096, 4096, 3584, 3584, 8192
+        };
 
         readonly string[] volumename =
         {
             "Volume label", "Volume label", "Volume label", "Volume label", "Volume label", "DicSetter"
         };
 
-        readonly string[] volumeserial = {null, null, null, null, "81FE805D61458753", null};
+        readonly string[] volumeserial =
+        {
+            null, null, null, null, "81FE805D61458753", null
+        };
 
         [Test]
         public void Test()
@@ -285,26 +334,28 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new Vdi();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 IFilesystem     fs         = new AppleHFS();
                 int             part       = -1;
+
                 for(int j = 0; j < partitions.Count; j++)
                     if(partitions[j].Type == "0xAF")
                     {
                         part = j;
+
                         break;
                     }
 
                 Assert.AreNotEqual(-1, part, $"Partition not found on {testfiles[i]}");
                 Assert.AreEqual(true, fs.Identify(image, partitions[part]), testfiles[i]);
                 fs.GetInformation(image, partitions[part], out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,     testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,  testfiles[i]);
-                Assert.AreEqual("HFS",           fs.XmlFsType.Type,         testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,   testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual("HFS", fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
                 Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
             }
         }
@@ -313,19 +364,40 @@ namespace Aaru.Tests.Filesystems
     [TestFixture]
     public class HfsRdb
     {
-        readonly string[] testfiles = {"amigaos_3.9.vdi.lz"};
+        readonly string[] testfiles =
+        {
+            "amigaos_3.9.vdi.lz"
+        };
 
-        readonly ulong[] sectors = {1024128};
+        readonly ulong[] sectors =
+        {
+            1024128
+        };
 
-        readonly uint[] sectorsize = {512};
+        readonly uint[] sectorsize =
+        {
+            512
+        };
 
-        readonly long[] clusters = {63752};
+        readonly long[] clusters =
+        {
+            63752
+        };
 
-        readonly int[] clustersize = {8192};
+        readonly int[] clustersize =
+        {
+            8192
+        };
 
-        readonly string[] volumename = {"Volume label"};
+        readonly string[] volumename =
+        {
+            "Volume label"
+        };
 
-        readonly string[] volumeserial = {null};
+        readonly string[] volumeserial =
+        {
+            null
+        };
 
         [Test]
         public void Test()
@@ -336,26 +408,28 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new Vdi();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 IFilesystem     fs         = new AppleHFS();
                 int             part       = -1;
+
                 for(int j = 0; j < partitions.Count; j++)
                     if(partitions[j].Type == "\"RES\\86\"")
                     {
                         part = j;
+
                         break;
                     }
 
                 Assert.AreNotEqual(-1, part, $"Partition not found on {testfiles[i]}");
                 Assert.AreEqual(true, fs.Identify(image, partitions[part]), testfiles[i]);
                 fs.GetInformation(image, partitions[part], out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,     testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,  testfiles[i]);
-                Assert.AreEqual("HFS",           fs.XmlFsType.Type,         testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,   testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual("HFS", fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
                 Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
             }
         }
diff --git a/Aaru.Tests/Filesystems/HFSPlus.cs b/Aaru.Tests/Filesystems/HFSPlus.cs
index f22d4c0f2..4be55d642 100644
--- a/Aaru.Tests/Filesystems/HFSPlus.cs
+++ b/Aaru.Tests/Filesystems/HFSPlus.cs
@@ -43,18 +43,17 @@ namespace Aaru.Tests.Filesystems
         // Missing Darwin 1.4.1
         readonly string[] testfiles =
         {
-            "macosx_10.11.vdi.lz", "macosx_10.11_journal.vdi.lz", "darwin_1.3.1.vdi.lz",
-            "darwin_1.3.1_wrapped.vdi.lz", "darwin_1.4.1_wrapped.vdi.lz", "darwin_6.0.2.vdi.lz",
-            "darwin_6.0.2_wrapped.vdi.lz", "darwin_8.0.1_journal.vdi.lz", "darwin_8.0.1.vdi.lz",
-            "darwin_8.0.1_wrapped.vdi.lz", "macos_8.1.vdi.lz", "macos_9.0.4.vdi.lz", "macos_9.1.vdi.lz",
-            "macos_9.2.1.vdi.lz", "macos_9.2.2.vdi.lz", "macosx_10.2.vdi.lz", "macosx_10.3_journal.vdi.lz",
-            "macosx_10.3.vdi.lz", "macosx_10.4_journal.vdi.lz", "macosx_10.4.vdi.lz"
+            "macosx_10.11.vdi.lz", "macosx_10.11_journal.vdi.lz", "darwin_1.3.1.vdi.lz", "darwin_1.3.1_wrapped.vdi.lz",
+            "darwin_1.4.1_wrapped.vdi.lz", "darwin_6.0.2.vdi.lz", "darwin_6.0.2_wrapped.vdi.lz",
+            "darwin_8.0.1_journal.vdi.lz", "darwin_8.0.1.vdi.lz", "darwin_8.0.1_wrapped.vdi.lz", "macos_8.1.vdi.lz",
+            "macos_9.0.4.vdi.lz", "macos_9.1.vdi.lz", "macos_9.2.1.vdi.lz", "macos_9.2.2.vdi.lz", "macosx_10.2.vdi.lz",
+            "macosx_10.3_journal.vdi.lz", "macosx_10.3.vdi.lz", "macosx_10.4_journal.vdi.lz", "macosx_10.4.vdi.lz"
         };
 
         readonly ulong[] sectors =
         {
-            409600, 614400, 819200, 614400, 614400, 819200, 614400, 1228800, 819200, 614400, 4194304, 4194304,
-            4194304, 4194304, 4194304, 4194304, 2097152, 4194304, 2097152, 4194304
+            409600, 614400, 819200, 614400, 614400, 819200, 614400, 1228800, 819200, 614400, 4194304, 4194304, 4194304,
+            4194304, 4194304, 4194304, 2097152, 4194304, 2097152, 4194304
         };
 
         readonly uint[] sectorsize =
@@ -64,20 +63,20 @@ namespace Aaru.Tests.Filesystems
 
         readonly long[] clusters =
         {
-            51190, 76790, 102392, 76774, 76774, 102392, 76774, 153592, 102392, 76774, 524152, 524088, 524088,
-            524088, 524088, 524008, 261884, 491240, 261884, 491240
+            51190, 76790, 102392, 76774, 76774, 102392, 76774, 153592, 102392, 76774, 524152, 524088, 524088, 524088,
+            524088, 524008, 261884, 491240, 261884, 491240
         };
 
         readonly int[] clustersize =
         {
-            4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096,
-            4096, 4096, 4096
+            4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096,
+            4096, 4096
         };
 
         readonly string[] volumename =
         {
-            null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
-            null, null, null
+            null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
+            null, null
         };
 
         readonly string[] volumeserial =
@@ -102,28 +101,30 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new Vdi();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 IFilesystem     fs         = new AppleHFSPlus();
                 int             part       = -1;
+
                 for(int j = 0; j < partitions.Count; j++)
                     if(partitions[j].Type == "Apple_HFS")
                     {
                         part = j;
+
                         break;
                     }
 
                 Assert.AreNotEqual(-1, part, $"Partition not found on {testfiles[i]}");
                 Assert.AreEqual(true, fs.Identify(image, partitions[part]), testfiles[i]);
                 fs.GetInformation(image, partitions[part], out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,         testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,      testfiles[i]);
-                Assert.AreEqual("HFS+",          fs.XmlFsType.Type,             testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,       testfiles[i]);
-                Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial,     testfiles[i]);
-                Assert.AreEqual(oemid[i],        fs.XmlFsType.SystemIdentifier, testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual("HFS+", fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
+                Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
+                Assert.AreEqual(oemid[i], fs.XmlFsType.SystemIdentifier, testfiles[i]);
             }
         }
     }
@@ -131,21 +132,45 @@ namespace Aaru.Tests.Filesystems
     [TestFixture]
     public class HfsPlusGpt
     {
-        readonly string[] testfiles = {"macosx_10.11.vdi.lz", "macosx_10.11_journal.vdi.lz"};
+        readonly string[] testfiles =
+        {
+            "macosx_10.11.vdi.lz", "macosx_10.11_journal.vdi.lz"
+        };
 
-        readonly ulong[] sectors = {409600, 614400};
+        readonly ulong[] sectors =
+        {
+            409600, 614400
+        };
 
-        readonly uint[] sectorsize = {512, 512};
+        readonly uint[] sectorsize =
+        {
+            512, 512
+        };
 
-        readonly long[] clusters = {51190, 76790};
+        readonly long[] clusters =
+        {
+            51190, 76790
+        };
 
-        readonly int[] clustersize = {4096, 4096};
+        readonly int[] clustersize =
+        {
+            4096, 4096
+        };
 
-        readonly string[] volumename = {null, null};
+        readonly string[] volumename =
+        {
+            null, null
+        };
 
-        readonly string[] volumeserial = {"D8C68470046E67BE", "FD3CB598F3C6294A"};
+        readonly string[] volumeserial =
+        {
+            "D8C68470046E67BE", "FD3CB598F3C6294A"
+        };
 
-        readonly string[] oemid = {"10.0", "HFSJ"};
+        readonly string[] oemid =
+        {
+            "10.0", "HFSJ"
+        };
 
         [Test]
         public void Test()
@@ -156,28 +181,30 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new Vdi();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 IFilesystem     fs         = new AppleHFSPlus();
                 int             part       = -1;
+
                 for(int j = 0; j < partitions.Count; j++)
                     if(partitions[j].Type == "Apple HFS")
                     {
                         part = j;
+
                         break;
                     }
 
                 Assert.AreNotEqual(-1, part, $"Partition not found on {testfiles[i]}");
                 Assert.AreEqual(true, fs.Identify(image, partitions[part]), testfiles[i]);
                 fs.GetInformation(image, partitions[part], out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,         testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,      testfiles[i]);
-                Assert.AreEqual("HFS+",          fs.XmlFsType.Type,             testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,       testfiles[i]);
-                Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial,     testfiles[i]);
-                Assert.AreEqual(oemid[i],        fs.XmlFsType.SystemIdentifier, testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual("HFS+", fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
+                Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
+                Assert.AreEqual(oemid[i], fs.XmlFsType.SystemIdentifier, testfiles[i]);
             }
         }
     }
@@ -189,9 +216,9 @@ namespace Aaru.Tests.Filesystems
         readonly string[] testfiles =
         {
             "macosx_10.11.vdi.lz", "macosx_10.11_journal.vdi.lz", "linux.vdi.lz", "linux_journal.vdi.lz",
-            "darwin_1.3.1.vdi.lz", "darwin_1.3.1_wrapped.vdi.lz", "darwin_1.4.1.vdi.lz",
-            "darwin_1.4.1_wrapped.vdi.lz", "darwin_6.0.2.vdi.lz", "darwin_8.0.1_journal.vdi.lz",
-            "darwin_8.0.1.vdi.lz", "darwin_8.0.1_wrapped.vdi.lz", "linux_4.19_hfs+_flashdrive.vdi.lz"
+            "darwin_1.3.1.vdi.lz", "darwin_1.3.1_wrapped.vdi.lz", "darwin_1.4.1.vdi.lz", "darwin_1.4.1_wrapped.vdi.lz",
+            "darwin_6.0.2.vdi.lz", "darwin_8.0.1_journal.vdi.lz", "darwin_8.0.1.vdi.lz", "darwin_8.0.1_wrapped.vdi.lz",
+            "linux_4.19_hfs+_flashdrive.vdi.lz"
         };
 
         readonly ulong[] sectors =
@@ -199,16 +226,25 @@ namespace Aaru.Tests.Filesystems
             303104, 352256, 262144, 262144, 819200, 614400, 819200, 614400, 819200, 1228800, 819200, 614400, 1024000
         };
 
-        readonly uint[] sectorsize = {512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512};
+        readonly uint[] sectorsize =
+        {
+            512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512
+        };
 
         readonly long[] clusters =
         {
             37878, 44021, 32512, 32512, 102178, 76708, 102178, 76708, 102178, 153592, 102392, 76774, 127744
         };
 
-        readonly int[] clustersize = {4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096};
+        readonly int[] clustersize =
+        {
+            4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096
+        };
 
-        readonly string[] volumename = {null, null, null, null, null, null, null, null, null, null, null, null, null};
+        readonly string[] volumename =
+        {
+            null, null, null, null, null, null, null, null, null, null, null, null, null
+        };
 
         readonly string[] volumeserial =
         {
@@ -230,28 +266,30 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new Vdi();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 IFilesystem     fs         = new AppleHFSPlus();
                 int             part       = -1;
+
                 for(int j = 0; j < partitions.Count; j++)
                     if(partitions[j].Type == "0xAF")
                     {
                         part = j;
+
                         break;
                     }
 
                 Assert.AreNotEqual(-1, part, $"Partition not found on {testfiles[i]}");
                 Assert.AreEqual(true, fs.Identify(image, partitions[part]), testfiles[i]);
                 fs.GetInformation(image, partitions[part], out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,         testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,      testfiles[i]);
-                Assert.AreEqual("HFS+",          fs.XmlFsType.Type,             testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,       testfiles[i]);
-                Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial,     testfiles[i]);
-                Assert.AreEqual(oemid[i],        fs.XmlFsType.SystemIdentifier, testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual("HFS+", fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
+                Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
+                Assert.AreEqual(oemid[i], fs.XmlFsType.SystemIdentifier, testfiles[i]);
             }
         }
     }
diff --git a/Aaru.Tests/Filesystems/HFSX.cs b/Aaru.Tests/Filesystems/HFSX.cs
index ac34367ad..4abd5811f 100644
--- a/Aaru.Tests/Filesystems/HFSX.cs
+++ b/Aaru.Tests/Filesystems/HFSX.cs
@@ -42,19 +42,34 @@ namespace Aaru.Tests.Filesystems
     {
         readonly string[] testfiles =
         {
-            "macosx_10.11.vdi.lz", "macosx_10.11_journal.vdi.lz", "darwin_8.0.1_journal.vdi.lz",
-            "darwin_8.0.1.vdi.lz", "macosx_10.4_journal.vdi.lz", "macosx_10.4.vdi.lz"
+            "macosx_10.11.vdi.lz", "macosx_10.11_journal.vdi.lz", "darwin_8.0.1_journal.vdi.lz", "darwin_8.0.1.vdi.lz",
+            "macosx_10.4_journal.vdi.lz", "macosx_10.4.vdi.lz"
         };
 
-        readonly ulong[] sectors = {819200, 1228800, 1638400, 1433600, 4194304, 1024000};
+        readonly ulong[] sectors =
+        {
+            819200, 1228800, 1638400, 1433600, 4194304, 1024000
+        };
 
-        readonly uint[] sectorsize = {512, 512, 512, 512, 512, 512};
+        readonly uint[] sectorsize =
+        {
+            512, 512, 512, 512, 512, 512
+        };
 
-        readonly long[] clusters = {102390, 153590, 204792, 179192, 491290, 127770};
+        readonly long[] clusters =
+        {
+            102390, 153590, 204792, 179192, 491290, 127770
+        };
 
-        readonly int[] clustersize = {4096, 4096, 4096, 4096, 4096, 4096};
+        readonly int[] clustersize =
+        {
+            4096, 4096, 4096, 4096, 4096, 4096
+        };
 
-        readonly string[] volumename = {null, null, null, null, null, null};
+        readonly string[] volumename =
+        {
+            null, null, null, null, null, null
+        };
 
         readonly string[] volumeserial =
         {
@@ -62,7 +77,10 @@ namespace Aaru.Tests.Filesystems
             "258C51A750F6A485"
         };
 
-        readonly string[] oemid = {"10.0", "HFSJ", "10.0", "10.0", "HFSJ", "10.0"};
+        readonly string[] oemid =
+        {
+            "10.0", "HFSJ", "10.0", "10.0", "HFSJ", "10.0"
+        };
 
         [Test]
         public void Test()
@@ -73,28 +91,30 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new Vdi();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 IFilesystem     fs         = new AppleHFSPlus();
                 int             part       = -1;
+
                 for(int j = 0; j < partitions.Count; j++)
                     if(partitions[j].Type == "Apple_HFSX")
                     {
                         part = j;
+
                         break;
                     }
 
                 Assert.AreNotEqual(-1, part, $"Partition not found on {testfiles[i]}");
                 Assert.AreEqual(true, fs.Identify(image, partitions[part]), testfiles[i]);
                 fs.GetInformation(image, partitions[part], out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,         testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,      testfiles[i]);
-                Assert.AreEqual("HFSX",          fs.XmlFsType.Type,             testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,       testfiles[i]);
-                Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial,     testfiles[i]);
-                Assert.AreEqual(oemid[i],        fs.XmlFsType.SystemIdentifier, testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual("HFSX", fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
+                Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
+                Assert.AreEqual(oemid[i], fs.XmlFsType.SystemIdentifier, testfiles[i]);
             }
         }
     }
@@ -102,21 +122,45 @@ namespace Aaru.Tests.Filesystems
     [TestFixture]
     public class HfsxGpt
     {
-        readonly string[] testfiles = {"macosx_10.11.vdi.lz", "macosx_10.11_journal.vdi.lz"};
+        readonly string[] testfiles =
+        {
+            "macosx_10.11.vdi.lz", "macosx_10.11_journal.vdi.lz"
+        };
 
-        readonly ulong[] sectors = {819200, 1228800};
+        readonly ulong[] sectors =
+        {
+            819200, 1228800
+        };
 
-        readonly uint[] sectorsize = {512, 512};
+        readonly uint[] sectorsize =
+        {
+            512, 512
+        };
 
-        readonly long[] clusters = {102390, 153590};
+        readonly long[] clusters =
+        {
+            102390, 153590
+        };
 
-        readonly int[] clustersize = {4096, 4096};
+        readonly int[] clustersize =
+        {
+            4096, 4096
+        };
 
-        readonly string[] volumename = {null, null};
+        readonly string[] volumename =
+        {
+            null, null
+        };
 
-        readonly string[] volumeserial = {"328343989312AE9F", "FB98504073464C5C"};
+        readonly string[] volumeserial =
+        {
+            "328343989312AE9F", "FB98504073464C5C"
+        };
 
-        readonly string[] oemid = {"10.0", "HFSJ"};
+        readonly string[] oemid =
+        {
+            "10.0", "HFSJ"
+        };
 
         [Test]
         public void Test()
@@ -127,28 +171,30 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new Vdi();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 IFilesystem     fs         = new AppleHFSPlus();
                 int             part       = -1;
+
                 for(int j = 0; j < partitions.Count; j++)
                     if(partitions[j].Type == "Apple HFS")
                     {
                         part = j;
+
                         break;
                     }
 
                 Assert.AreNotEqual(-1, part, $"Partition not found on {testfiles[i]}");
                 Assert.AreEqual(true, fs.Identify(image, partitions[part]), testfiles[i]);
                 fs.GetInformation(image, partitions[part], out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,         testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,      testfiles[i]);
-                Assert.AreEqual("HFSX",          fs.XmlFsType.Type,             testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,       testfiles[i]);
-                Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial,     testfiles[i]);
-                Assert.AreEqual(oemid[i],        fs.XmlFsType.SystemIdentifier, testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual("HFSX", fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
+                Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
+                Assert.AreEqual(oemid[i], fs.XmlFsType.SystemIdentifier, testfiles[i]);
             }
         }
     }
@@ -162,15 +208,30 @@ namespace Aaru.Tests.Filesystems
             "darwin_8.0.1_journal.vdi.lz", "darwin_8.0.1.vdi.lz", "linux_4.19_hfsx_flashdrive.vdi.lz"
         };
 
-        readonly ulong[] sectors = {393216, 409600, 262144, 262144, 1638400, 1433600, 1024000};
+        readonly ulong[] sectors =
+        {
+            393216, 409600, 262144, 262144, 1638400, 1433600, 1024000
+        };
 
-        readonly uint[] sectorsize = {512, 512, 512, 512, 512, 512, 512};
+        readonly uint[] sectorsize =
+        {
+            512, 512, 512, 512, 512, 512, 512
+        };
 
-        readonly long[] clusters = {49140, 51187, 32512, 32512, 204792, 179192, 127744};
+        readonly long[] clusters =
+        {
+            49140, 51187, 32512, 32512, 204792, 179192, 127744
+        };
 
-        readonly int[] clustersize = {4096, 4096, 4096, 4096, 4096, 4096, 4096};
+        readonly int[] clustersize =
+        {
+            4096, 4096, 4096, 4096, 4096, 4096, 4096
+        };
 
-        readonly string[] volumename = {null, null, null, null, null, null, null};
+        readonly string[] volumename =
+        {
+            null, null, null, null, null, null, null
+        };
 
         readonly string[] volumeserial =
         {
@@ -178,7 +239,10 @@ namespace Aaru.Tests.Filesystems
             "5E4A8781D3C9286C"
         };
 
-        readonly string[] oemid = {"10.0", "HFSJ", "10.0", "10.0", "10.0", "10.0", "H+Lx"};
+        readonly string[] oemid =
+        {
+            "10.0", "HFSJ", "10.0", "10.0", "10.0", "10.0", "H+Lx"
+        };
 
         [Test]
         public void Test()
@@ -189,28 +253,30 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new Vdi();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 IFilesystem     fs         = new AppleHFSPlus();
                 int             part       = -1;
+
                 for(int j = 0; j < partitions.Count; j++)
                     if(partitions[j].Type == "0xAF")
                     {
                         part = j;
+
                         break;
                     }
 
                 Assert.AreNotEqual(-1, part, $"Partition not found on {testfiles[i]}");
                 Assert.AreEqual(true, fs.Identify(image, partitions[part]), testfiles[i]);
                 fs.GetInformation(image, partitions[part], out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,         testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,      testfiles[i]);
-                Assert.AreEqual("HFSX",          fs.XmlFsType.Type,             testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,       testfiles[i]);
-                Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial,     testfiles[i]);
-                Assert.AreEqual(oemid[i],        fs.XmlFsType.SystemIdentifier, testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual("HFSX", fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
+                Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
+                Assert.AreEqual(oemid[i], fs.XmlFsType.SystemIdentifier, testfiles[i]);
             }
         }
     }
diff --git a/Aaru.Tests/Filesystems/HPFS.cs b/Aaru.Tests/Filesystems/HPFS.cs
index 4e13d7a1f..69fb76dbf 100644
--- a/Aaru.Tests/Filesystems/HPFS.cs
+++ b/Aaru.Tests/Filesystems/HPFS.cs
@@ -49,19 +49,23 @@ namespace Aaru.Tests.Filesystems
 
         readonly ulong[] sectors =
         {
-            262144, 1024000, 1024000, 1024000, 1024000, 1024000, 262144, 262144, 262144, 262144, 262144, 262144,
-            1024000
+            262144, 1024000, 1024000, 1024000, 1024000, 1024000, 262144, 262144, 262144, 262144, 262144, 262144, 1024000
         };
 
-        readonly uint[] sectorsize = {512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512};
+        readonly uint[] sectorsize =
+        {
+            512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512
+        };
 
         readonly long[] clusters =
         {
-            261072, 1023056, 1023056, 1023056, 1023056, 1023056, 262016, 262016, 262016, 262016, 262016, 262112,
-            1022112
+            261072, 1023056, 1023056, 1023056, 1023056, 1023056, 262016, 262016, 262016, 262016, 262016, 262112, 1022112
         };
 
-        readonly int[] clustersize = {512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512};
+        readonly int[] clustersize =
+        {
+            512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512
+        };
 
         readonly string[] volumename =
         {
@@ -71,14 +75,14 @@ namespace Aaru.Tests.Filesystems
 
         readonly string[] volumeserial =
         {
-            "2BBBD814", "AC0DDC15", "ABEB2C15", "6C4EE015", "6C406015", "6C49B015", "2BCEB414", "2C157414",
-            "2BF55414", "2BE31414", "E851CB14", "A4EDC29C", "AC096014"
+            "2BBBD814", "AC0DDC15", "ABEB2C15", "6C4EE015", "6C406015", "6C49B015", "2BCEB414", "2C157414", "2BF55414",
+            "2BE31414", "E851CB14", "A4EDC29C", "AC096014"
         };
 
         readonly string[] oemid =
         {
-            "IBM 4.50", "OS2 10.1", "OS2 10.0", "OS2 10.0", "OS2 10.0", "OS2 20.0", "OS2 20.0", "OS2 20.1",
-            "OS2 20.0", "OS2 20.0", "MSDOS5.0", "MSDOS5.0", "IBM 4.50"
+            "IBM 4.50", "OS2 10.1", "OS2 10.0", "OS2 10.0", "OS2 10.0", "OS2 20.0", "OS2 20.0", "OS2 20.1", "OS2 20.0",
+            "OS2 20.0", "MSDOS5.0", "MSDOS5.0", "IBM 4.50"
         };
 
         [Test]
@@ -90,19 +94,19 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new Vdi();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 IFilesystem     fs         = new HPFS();
                 Assert.AreEqual(true, fs.Identify(image, partitions[0]), testfiles[i]);
                 fs.GetInformation(image, partitions[0], out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,         testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,      testfiles[i]);
-                Assert.AreEqual("HPFS",          fs.XmlFsType.Type,             testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,       testfiles[i]);
-                Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial,     testfiles[i]);
-                Assert.AreEqual(oemid[i],        fs.XmlFsType.SystemIdentifier, testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual("HPFS", fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
+                Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
+                Assert.AreEqual(oemid[i], fs.XmlFsType.SystemIdentifier, testfiles[i]);
             }
         }
     }
diff --git a/Aaru.Tests/Filesystems/HPOFS.cs b/Aaru.Tests/Filesystems/HPOFS.cs
index e434e542f..cb658158d 100644
--- a/Aaru.Tests/Filesystems/HPOFS.cs
+++ b/Aaru.Tests/Filesystems/HPOFS.cs
@@ -39,26 +39,50 @@ namespace Aaru.Tests.Filesystems
     [TestFixture]
     public class Hpofs
     {
-        readonly string[] testfiles = {"rid1.img.lz", "rid10.img.lz", "rid66percent.img.lz", "rid266.img.lz"};
+        readonly string[] testfiles =
+        {
+            "rid1.img.lz", "rid10.img.lz", "rid66percent.img.lz", "rid266.img.lz"
+        };
 
         readonly MediaType[] mediatypes =
         {
             MediaType.DOS_35_HD, MediaType.DOS_35_HD, MediaType.DOS_35_HD, MediaType.DOS_35_HD
         };
 
-        readonly ulong[] sectors = {2880, 2880, 2880, 2880};
+        readonly ulong[] sectors =
+        {
+            2880, 2880, 2880, 2880
+        };
 
-        readonly uint[] sectorsize = {512, 512, 512, 512};
+        readonly uint[] sectorsize =
+        {
+            512, 512, 512, 512
+        };
 
-        readonly long[] clusters = {2880, 2880, 2880, 2880};
+        readonly long[] clusters =
+        {
+            2880, 2880, 2880, 2880
+        };
 
-        readonly int[] clustersize = {512, 512, 512, 512};
+        readonly int[] clustersize =
+        {
+            512, 512, 512, 512
+        };
 
-        readonly string[] volumename = {"VOLUME LABEL", "VOLUME LABEL", "VOLUME LABEL", "VOLUME LABEL"};
+        readonly string[] volumename =
+        {
+            "VOLUME LABEL", "VOLUME LABEL", "VOLUME LABEL", "VOLUME LABEL"
+        };
 
-        readonly string[] volumeserial = {"AC226814", "AC160814", "AC306C14", "ABEF2C14"};
+        readonly string[] volumeserial =
+        {
+            "AC226814", "AC160814", "AC306C14", "ABEF2C14"
+        };
 
-        readonly string[] oemid = {"IBM 10.2", "IBM 10.2", "IBM 10.2", "IBM 10.2"};
+        readonly string[] oemid =
+        {
+            "IBM 10.2", "IBM 10.2", "IBM 10.2", "IBM 10.2"
+        };
 
         [Test]
         public void Test()
@@ -69,25 +93,26 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new ZZZRawImage();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(mediatypes[i], image.Info.MediaType,  testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(mediatypes[i], image.Info.MediaType, testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 IFilesystem fs = new HPOFS();
-                Partition wholePart = new Partition
+
+                var wholePart = new Partition
                 {
-                    Name   = "Whole device",
-                    Length = image.Info.Sectors,
-                    Size   = image.Info.Sectors * image.Info.SectorSize
+                    Name = "Whole device", Length = image.Info.Sectors,
+                    Size = image.Info.Sectors * image.Info.SectorSize
                 };
+
                 Assert.AreEqual(true, fs.Identify(image, wholePart), testfiles[i]);
                 fs.GetInformation(image, wholePart, out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,         testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,      testfiles[i]);
-                Assert.AreEqual("HPOFS",         fs.XmlFsType.Type,             testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,       testfiles[i]);
-                Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial,     testfiles[i]);
-                Assert.AreEqual(oemid[i],        fs.XmlFsType.SystemIdentifier, testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual("HPOFS", fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
+                Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
+                Assert.AreEqual(oemid[i], fs.XmlFsType.SystemIdentifier, testfiles[i]);
             }
         }
     }
diff --git a/Aaru.Tests/Filesystems/HTFS.cs b/Aaru.Tests/Filesystems/HTFS.cs
index e546c1862..8f7e9a8a3 100644
--- a/Aaru.Tests/Filesystems/HTFS.cs
+++ b/Aaru.Tests/Filesystems/HTFS.cs
@@ -52,19 +52,40 @@ namespace Aaru.Tests.Filesystems
             MediaType.DMF, MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_ED, MediaType.DOS_35_HD
         };
 
-        readonly ulong[] sectors = {3360, 2400, 1440, 5760, 2880};
+        readonly ulong[] sectors =
+        {
+            3360, 2400, 1440, 5760, 2880
+        };
 
-        readonly uint[] sectorsize = {512, 512, 512, 512, 512};
+        readonly uint[] sectorsize =
+        {
+            512, 512, 512, 512, 512
+        };
 
-        readonly long[] clusters = {1680, 1200, 720, 2880, 1440};
+        readonly long[] clusters =
+        {
+            1680, 1200, 720, 2880, 1440
+        };
 
-        readonly int[] clustersize = {1024, 1024, 1024, 1024, 1024};
+        readonly int[] clustersize =
+        {
+            1024, 1024, 1024, 1024, 1024
+        };
 
-        readonly string[] volumename = {"", "", "", "", ""};
+        readonly string[] volumename =
+        {
+            "", "", "", "", ""
+        };
 
-        readonly string[] volumeserial = {null, null, null, null, null};
+        readonly string[] volumeserial =
+        {
+            null, null, null, null, null
+        };
 
-        readonly string[] type = {"HTFS", "HTFS", "HTFS", "HTFS", "HTFS"};
+        readonly string[] type =
+        {
+            "HTFS", "HTFS", "HTFS", "HTFS", "HTFS"
+        };
 
         [Test]
         public void Test()
@@ -75,23 +96,24 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new ZZZRawImage();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(mediatypes[i], image.Info.MediaType,  testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(mediatypes[i], image.Info.MediaType, testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 IFilesystem fs = new SysVfs();
-                Partition wholePart = new Partition
+
+                var wholePart = new Partition
                 {
-                    Name   = "Whole device",
-                    Length = image.Info.Sectors,
-                    Size   = image.Info.Sectors * image.Info.SectorSize
+                    Name = "Whole device", Length = image.Info.Sectors,
+                    Size = image.Info.Sectors * image.Info.SectorSize
                 };
+
                 Assert.AreEqual(true, fs.Identify(image, wholePart), testfiles[i]);
                 fs.GetInformation(image, wholePart, out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,     testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,  testfiles[i]);
-                Assert.AreEqual(type[i],         fs.XmlFsType.Type,         testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,   testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual(type[i], fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
                 Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
             }
         }
@@ -100,21 +122,45 @@ namespace Aaru.Tests.Filesystems
     [TestFixture]
     public class HtfsMbr
     {
-        readonly string[] testfiles = {"scoopenserver_5.0.7hw.vdi.lz"};
+        readonly string[] testfiles =
+        {
+            "scoopenserver_5.0.7hw.vdi.lz"
+        };
 
-        readonly ulong[] sectors = {2097152};
+        readonly ulong[] sectors =
+        {
+            2097152
+        };
 
-        readonly uint[] sectorsize = {512};
+        readonly uint[] sectorsize =
+        {
+            512
+        };
 
-        readonly long[] clusters = {1020096};
+        readonly long[] clusters =
+        {
+            1020096
+        };
 
-        readonly int[] clustersize = {1024};
+        readonly int[] clustersize =
+        {
+            1024
+        };
 
-        readonly string[] volumename = {"Volume label"};
+        readonly string[] volumename =
+        {
+            "Volume label"
+        };
 
-        readonly string[] volumeserial = {null};
+        readonly string[] volumeserial =
+        {
+            null
+        };
 
-        readonly string[] type = {"HTFS"};
+        readonly string[] type =
+        {
+            "HTFS"
+        };
 
         [Test]
         public void Test()
@@ -125,26 +171,28 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new Vdi();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 IFilesystem     fs         = new SysVfs();
                 int             part       = -1;
+
                 for(int j = 0; j < partitions.Count; j++)
                     if(partitions[j].Type == "XENIX")
                     {
                         part = j;
+
                         break;
                     }
 
                 Assert.AreNotEqual(-1, part, $"Partition not found on {testfiles[i]}");
                 Assert.AreEqual(true, fs.Identify(image, partitions[part]), testfiles[i]);
                 fs.GetInformation(image, partitions[part], out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,     testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,  testfiles[i]);
-                Assert.AreEqual(type[i],         fs.XmlFsType.Type,         testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,   testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual(type[i], fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
                 Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
             }
         }
diff --git a/Aaru.Tests/Filesystems/ISO9660.cs b/Aaru.Tests/Filesystems/ISO9660.cs
index 16acfcbb3..0c05d9528 100644
--- a/Aaru.Tests/Filesystems/ISO9660.cs
+++ b/Aaru.Tests/Filesystems/ISO9660.cs
@@ -50,13 +50,16 @@ namespace Aaru.Tests.Filesystems
             "toast_3.5.7_iso9660_ver_dos.iso.lz", "toast_3.5.7_iso9660_ver.iso.lz",
             "toast_3.5.7_iso9660_ver_joliet_apple.iso.lz", "toast_3.5.7_iso9660_ver_joliet.iso.lz",
             "toast_3.5.7_iso9660.iso.lz",
+
             // Toast 4.1.3
             "toast_4.1.3_iso9660_hfs.iso.lz",
+
             // Toast 4.0.3
             "toast_4.0.3_iso9660_apple.iso.lz", "toast_4.0.3_iso9660_dos_apple.iso.lz",
             "toast_4.0.3_iso9660_dos.iso.lz", "toast_4.0.3_iso9660_hfs.iso.lz", "toast_4.0.3_iso9660.iso.lz",
             "toast_4.0.3_iso9660_joliet_apple.iso.lz", "toast_4.0.3_iso9660_joliet.iso.lz",
             "toast_4.0.3_iso9660_mac_apple.iso.lz", "toast_4.0.3_iso9660_mac.iso.lz",
+
             // Toast 4.0.3 (CD-ROM XA)
             // "toast_4.0.3_iso9660_apple_xa.iso.lz","toast_4.0.3_iso9660_dos_apple_xa.iso.lz",
             // "toast_4.0.3_iso9660_dos_xa.iso.lz","toast_4.0.3_iso9660_joliet_apple_xa.iso.lz",
@@ -76,10 +79,12 @@ namespace Aaru.Tests.Filesystems
             "mkisofs_rockridge.iso.lz", "mkisofs_rockridge_old.iso.lz", "mkisofs_rockridge_rational.iso.lz",
             "mkisofs_udf.iso.lz", "mkisofs_violating.iso.lz", "mkisofs_xa.iso.lz", "mkisofs_zisofs.iso.lz",
             "mkisofs_zisofs_rockridge.iso.lz",
+
             // Nero MAX
             "neromax_iso_mode1_apple.iso.lz", "neromax_iso_mode1_joliet.iso.lz", "neromax_iso_mode1_level1.iso.lz",
             "neromax_iso_mode1_level2.iso.lz", "neromax_iso_mode2_apple.iso.lz", "neromax_iso_mode2_joliet.iso.lz",
             "neromax_iso_mode2_level1.iso.lz", "neromax_iso_mode2_level2.iso.lz",
+
             // XorrISO
             "xorriso_hybrid.iso.lz", "xorriso_joliet.iso.lz", "xorriso_joliet_utf.iso.lz",
             "xorriso_joliet_violating.iso.lz", "xorriso_level1.iso.lz", "xorriso_level2.iso.lz",
@@ -93,11 +98,14 @@ namespace Aaru.Tests.Filesystems
             MediaType.CD, MediaType.CD, MediaType.CD, MediaType.CD, MediaType.CD, MediaType.CD, MediaType.CD,
             MediaType.CD, MediaType.CD, MediaType.CD, MediaType.CD, MediaType.CD, MediaType.CD, MediaType.CD,
             MediaType.CD, MediaType.CD,
+
             // Toast 4.1.3
             MediaType.CD,
+
             // Toast 4.0.3
             MediaType.CD, MediaType.CD, MediaType.CD, MediaType.CD, MediaType.CD, MediaType.CD, MediaType.CD,
             MediaType.CD, MediaType.CD,
+
             // Toast 4.0.3 (CD-ROM XA)
             // MediaType.CD, MediaType.CD, MediaType.CD, MediaType.CD, MediaType.CD, MediaType.CD, MediaType.CD,
             // MediaType.CD, MediaType.CD,
@@ -107,9 +115,11 @@ namespace Aaru.Tests.Filesystems
             MediaType.CD, MediaType.CD, MediaType.CD, MediaType.CD, MediaType.CD, MediaType.CD, MediaType.CD,
             MediaType.CD, MediaType.CD, MediaType.CD, MediaType.CD, MediaType.CD, MediaType.CD, MediaType.CD,
             MediaType.CD, MediaType.CD, MediaType.CD, MediaType.CD,
+
             // Nero MAX
             MediaType.CD, MediaType.CD, MediaType.CD, MediaType.CD, MediaType.CD, MediaType.CD, MediaType.CD,
             MediaType.CD,
+
             // XorrISO
             MediaType.CD, MediaType.CD, MediaType.CD, MediaType.CD, MediaType.CD, MediaType.CD, MediaType.CD,
             MediaType.CD, MediaType.CD, MediaType.CD, MediaType.CD, MediaType.CD
@@ -119,17 +129,22 @@ namespace Aaru.Tests.Filesystems
         {
             // Toast 3.5.7
             946, 946, 300, 1880, 300, 951, 300, 946, 300, 946, 946, 300, 300, 951, 300, 300,
+
             // Toast 4.1.3
             1882,
+
             // Toast 4.0.3
             305, 305, 300, 954, 300, 323, 300, 305, 300,
+
             // Toast 4.0.3 (CD-ROM XA)
             // 10, 11, 12, 13, 14, 15, 16, 17, 18,
             // mkisofs
             3662, 3606, 3800, 3800, 2983, 2531, 2983, 2531, 2983, 2531, 2894, 2894, 106589, 105241, 5055, 3651, 3651,
             3651, 3651, 3637, 3637, 3637, 3689, 7481, 7487, 3693, 7487, 3925, 3637, 3637, 3637, 3693,
+
             // Nero MAX
             389, 417, 257, 266, 55, 56, 57, 58,
+
             // XorrISO
             59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70
         };
@@ -138,17 +153,22 @@ namespace Aaru.Tests.Filesystems
         {
             // Toast 3.5.7
             2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048,
+
             // Toast 4.1.3
             2048,
+
             // Toast 4.0.3
             2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048,
+
             // Toast 4.0.3 (CD-ROM XA)
             // 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048,
             // mkisofs
             2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048,
             2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048,
+
             // Nero MAX
             2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048,
+
             // XorrISO
             2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048
         };
@@ -157,17 +177,22 @@ namespace Aaru.Tests.Filesystems
         {
             // Toast 3.5.7
             946, 946, 244, 946, 244, 951, 249, 946, 244, 946, 946, 244, 244, 951, 249, 244,
+
             // Toast 4.1.3
             948,
+
             // Toast 4.0.3
             305, 305, 220, 954, 220, 323, 234, 305, 220,
+
             // Toast 4.0.3 (CD-ROM XA)
             // 10, 11, 12, 13, 14, 15, 16, 17, 18,
             // mkisofs
             3662, 3606, 3800, 3800, 2983, 2531, 2983, 2531, 2983, 2531, 2894, 2894, 106589, 105241, 5055, 3651, 3651,
             3651, 3651, 3637, 3637, 3637, 3689, 7481, 7487, 3693, 7487, 3925, 3637, 3637, 3637, 3693,
+
             // Nero MAX
             389, 417, 257, 266, 55, 56, 57, 58,
+
             // XorrISO
             59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70
         };
@@ -176,17 +201,22 @@ namespace Aaru.Tests.Filesystems
         {
             // Toast 3.5.7
             2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048,
+
             // Toast 4.1.3
             2048,
+
             // Toast 4.0.3
             2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048,
+
             // Toast 4.0.3 (CD-ROM XA)
             // 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048,
             // mkisofs
             2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048,
             2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048,
+
             // Nero MAX
             2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048,
+
             // XorrISO
             2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048
         };
@@ -197,11 +227,14 @@ namespace Aaru.Tests.Filesystems
             "DISK_UTILS", "DISK_UTILS", "DISK_UTILS", "DISK_UTILS", "DISK_UTILS", "Disk utils", "Disk utils",
             "Disk utils", "Disk utils", "DISK_UTILS", "DISK_UTILS", "DISK_UTILS", "DISK_UTILS", "Disk utils",
             "Disk utils", "DISK_UTILS",
+
             // Toast 4.1.3
             "DISK_UTILS",
+
             // Toast 4.0.3
             "UNTITLED_CD", "UNTITLED_CD", "UNTITLED_CD", "Untitled CD", "UNTITLED_CD", "Untitled CD", "Untitled CD",
             "Untitled CD", "Untitled CD",
+
             // Toast 4.0.3 (CD-ROM XA)
             // "UNTITLED_CD", "UNTITLED_CD", "UNTITLED_CD", "UNTITLED_CD", "UNTITLED_CD", "UNTITLED_CD", "UNTITLED_CD",
             // "UNTITLED_CD", "UNTITLED_CD",
@@ -209,8 +242,10 @@ namespace Aaru.Tests.Filesystems
             "test", "test", "test", "test", "CDROM", "CDROM", "CDROM", "CDROM", "CDROM", "CDROM", "CDROM", "CDROM",
             "CDROM", "CDROM", "CDROM", "test", "test", "test", "test", "test", "test", "test", "test", "CDROM", "CDROM",
             "test", "CDROM", "test", "test", "test", "test", "test",
+
             // Nero MAX
             "Root", "Root", "Root", "Root", "Root", "Root", "Root", "Root",
+
             // XorrISO
             "DISK_UTILS", "DISK_UTILS", "DISK_UTILS", "DISK_UTILS", "DISK_UTILS", "DISK_UTILS", "DISK_UTILS",
             "DISK_UTILS", "DISK_UTILS", "DISK_UTILS", "DISK_UTILS", "DISK_UTILS"
@@ -220,17 +255,22 @@ namespace Aaru.Tests.Filesystems
         {
             // Toast 3.5.7
             null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
+
             // Toast 4.1.3
             null,
+
             // Toast 4.0.3
             null, null, null, null, null, null, null, null, null, null,
+
             // Toast 4.0.3 (CD-ROM XA)
             // null, null, null, null, null, null, null, null,
             // mkisofs
             null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
             null, null, null, null, null, null, null, null, null, null, null, null, null, null,
+
             // Nero MAX
             null, null, null, null, null, null, null, null,
+
             // XorrISO
             null, null, null, null, null, null, null, null, null, null, null, null
         };
@@ -244,12 +284,15 @@ namespace Aaru.Tests.Filesystems
             "APPLE COMPUTER, INC., TYPE: 0002", "APPLE COMPUTER, INC., TYPE: 0002", "APPLE COMPUTER, INC., TYPE: 0002",
             "APPLE COMPUTER, INC., TYPE: 0002", "APPLE COMPUTER, INC., TYPE: 0002", "APPLE COMPUTER, INC., TYPE: 0002",
             "APPLE COMPUTER, INC., TYPE: 0002",
+
             // Toast 4.1.3
             "APPLE COMPUTER, INC., TYPE: 0002",
+
             // Toast 4.0.3
             "APPLE COMPUTER, INC., TYPE: 0002", "APPLE COMPUTER, INC., TYPE: 0002", "APPLE COMPUTER, INC., TYPE: 0002",
             "APPLE COMPUTER, INC., TYPE: 0002", "APPLE COMPUTER, INC., TYPE: 0002", "APPLE COMPUTER, INC., TYPE: 0002",
             "APPLE COMPUTER, INC., TYPE: 0002", "APPLE COMPUTER, INC., TYPE: 0002", "APPLE COMPUTER, INC., TYPE: 0002",
+
             // Toast 4.0.3 (CD-ROM XA)
             // "APPLE COMPUTER, INC., TYPE: 0002", "APPLE COMPUTER, INC., TYPE: 0002", "APPLE COMPUTER, INC., TYPE: 0002",
             // "APPLE COMPUTER, INC., TYPE: 0002", "APPLE COMPUTER, INC., TYPE: 0002", "APPLE COMPUTER, INC., TYPE: 0002",
@@ -258,8 +301,10 @@ namespace Aaru.Tests.Filesystems
             "LINUX", "LINUX", "LINUX", "LINUX", "LINUX", "LINUX", "LINUX", "LINUX", "LINUX", "LINUX", "LINUX", "LINUX",
             "LINUX", "LINUX", "LINUX", "LINUX", "LINUX", "LINUX", "LINUX", "LINUX", "LINUX", "LINUX", "LINUX", "LINUX",
             "LINUX", "LINUX", "LINUX", "LINUX", "LINUX", "LINUX", "LINUX", "LINUX",
+
             // Nero MAX
             "", "", "", "", "", "", "", "",
+
             // XorrISO
             "APPLE COMPUTER, INC., TYPE: 0002", "APPLE COMPUTER, INC., TYPE: 0002", "APPLE COMPUTER, INC., TYPE: 0002",
             "APPLE COMPUTER, INC., TYPE: 0002", "APPLE COMPUTER, INC., TYPE: 0002", "APPLE COMPUTER, INC., TYPE: 0002",
@@ -290,8 +335,10 @@ namespace Aaru.Tests.Filesystems
             "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY",
             "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY",
             "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY",
+
             // Toast 4.1.3
             "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY",
+
             // Toast 4.0.3
             "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY",
             "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY",
@@ -302,6 +349,7 @@ namespace Aaru.Tests.Filesystems
             "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY",
             "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY",
             "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY",
+
             // Toast 4.0.3 (CD-ROM XA)
             // "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY",
             // "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY",
@@ -345,8 +393,10 @@ namespace Aaru.Tests.Filesystems
             "MKISOFS ISO9660/HFS/UDF FILESYSTEM BUILDER & CDRECORD CD/DVD/BluRay CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING",
             "MKISOFS ISO9660/HFS/UDF FILESYSTEM BUILDER & CDRECORD CD/DVD/BluRay CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING",
             "MKISOFS ISO9660/HFS/UDF FILESYSTEM BUILDER & CDRECORD CD/DVD/BluRay CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING",
+
             // Nero MAX
             "", "", "", "", "", "", "", "",
+
             // XorrISO
             "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY",
             "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY",
@@ -371,28 +421,27 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new ZZZRawImage();
-                Assert.AreEqual(true,          image.Open(filter),    $"{testfiles[i]}: Open()");
-                Assert.AreEqual(mediatypes[i], image.Info.MediaType,  $"{testfiles[i]}: MediaType");
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    $"{testfiles[i]}: Sectors");
+                Assert.AreEqual(true, image.Open(filter), $"{testfiles[i]}: Open()");
+                Assert.AreEqual(mediatypes[i], image.Info.MediaType, $"{testfiles[i]}: MediaType");
+                Assert.AreEqual(sectors[i], image.Info.Sectors, $"{testfiles[i]}: Sectors");
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, $"{testfiles[i]}: SectorSize");
                 IFilesystem fs = new ISO9660();
-                Partition wholePart = new Partition
+
+                var wholePart = new Partition
                 {
-                    Name   = "Whole device",
-                    Length = image.Info.Sectors,
-                    Size   = image.Info.Sectors * image.Info.SectorSize
+                    Name = "Whole device", Length = image.Info.Sectors,
+                    Size = image.Info.Sectors * image.Info.SectorSize
                 };
+
                 Assert.AreEqual(true, fs.Identify(image, wholePart), $"{testfiles[i]}: Identify()");
                 fs.GetInformation(image, wholePart, out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,     $"{testfiles[i]}: Clusters");
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,  $"{testfiles[i]}: ClusterSize");
-                Assert.AreEqual("ISO9660",       fs.XmlFsType.Type,         $"{testfiles[i]}: Type");
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,   $"{testfiles[i]}: VolumeName");
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, $"{testfiles[i]}: Clusters");
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, $"{testfiles[i]}: ClusterSize");
+                Assert.AreEqual("ISO9660", fs.XmlFsType.Type, $"{testfiles[i]}: Type");
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, $"{testfiles[i]}: VolumeName");
                 Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, $"{testfiles[i]}: VolumeSerial");
-                Assert.AreEqual(sysid[i], fs.XmlFsType.SystemIdentifier,
-                                $"{testfiles[i]}: SystemIdentifier");
-                Assert.AreEqual(appid[i], fs.XmlFsType.ApplicationIdentifier,
-                                $"{testfiles[i]}: ApplicationIdentifier");
+                Assert.AreEqual(sysid[i], fs.XmlFsType.SystemIdentifier, $"{testfiles[i]}: SystemIdentifier");
+                Assert.AreEqual(appid[i], fs.XmlFsType.ApplicationIdentifier, $"{testfiles[i]}: ApplicationIdentifier");
             }
         }
     }
diff --git a/Aaru.Tests/Filesystems/JFS2.cs b/Aaru.Tests/Filesystems/JFS2.cs
index ae0c4eb4a..e7500f244 100644
--- a/Aaru.Tests/Filesystems/JFS2.cs
+++ b/Aaru.Tests/Filesystems/JFS2.cs
@@ -42,19 +42,34 @@ namespace Aaru.Tests.Filesystems
     {
         readonly string[] testfiles =
         {
-            "linux.vdi.lz", "linux_caseinsensitive.vdi.lz", "ecs20_fstester.vdi.lz",
-            "linux_4.19_jfs_flashdrive.vdi.lz", "linux_4.19_jfs_os2_flashdrive.vdi.lz"
+            "linux.vdi.lz", "linux_caseinsensitive.vdi.lz", "ecs20_fstester.vdi.lz", "linux_4.19_jfs_flashdrive.vdi.lz",
+            "linux_4.19_jfs_os2_flashdrive.vdi.lz"
         };
 
-        readonly ulong[] sectors = {262144, 262144, 1024000, 1024000, 1024000};
+        readonly ulong[] sectors =
+        {
+            262144, 262144, 1024000, 1024000, 1024000
+        };
 
-        readonly uint[] sectorsize = {512, 512, 512, 512, 512};
+        readonly uint[] sectorsize =
+        {
+            512, 512, 512, 512, 512
+        };
 
-        readonly long[] clusters = {257632, 257632, 1017512, 1017416, 1017416};
+        readonly long[] clusters =
+        {
+            257632, 257632, 1017512, 1017416, 1017416
+        };
 
-        readonly int[] clustersize = {4096, 4096, 4096, 4096, 4096};
+        readonly int[] clustersize =
+        {
+            4096, 4096, 4096, 4096, 4096
+        };
 
-        readonly string[] volumename = {"Volume labe", "Volume labe", "Volume labe", "DicSetter", "DicSetter"};
+        readonly string[] volumename =
+        {
+            "Volume labe", "Volume labe", "Volume labe", "DicSetter", "DicSetter"
+        };
 
         readonly string[] volumeserial =
         {
@@ -72,27 +87,30 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new Vdi();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 IFilesystem     fs         = new JFS();
                 int             part       = -1;
+
                 for(int j = 0; j < partitions.Count; j++)
-                    if(partitions[j].Type == "0x83" || partitions[j].Type == "0x07")
+                    if(partitions[j].Type == "0x83" ||
+                       partitions[j].Type == "0x07")
                     {
                         part = j;
+
                         break;
                     }
 
                 Assert.AreNotEqual(-1, part, $"Partition not found on {testfiles[i]}");
                 Assert.AreEqual(true, fs.Identify(image, partitions[part]), testfiles[i]);
                 fs.GetInformation(image, partitions[part], out _, null);
-                Assert.AreEqual(clusters[i],      fs.XmlFsType.Clusters,     testfiles[i]);
-                Assert.AreEqual(clustersize[i],   fs.XmlFsType.ClusterSize,  testfiles[i]);
-                Assert.AreEqual("JFS filesystem", fs.XmlFsType.Type,         testfiles[i]);
-                Assert.AreEqual(volumename[i],    fs.XmlFsType.VolumeName,   testfiles[i]);
-                Assert.AreEqual(volumeserial[i],  fs.XmlFsType.VolumeSerial, testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual("JFS filesystem", fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
+                Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
             }
         }
     }
diff --git a/Aaru.Tests/Filesystems/LFS.cs b/Aaru.Tests/Filesystems/LFS.cs
index 56645ed2d..bca1348f8 100644
--- a/Aaru.Tests/Filesystems/LFS.cs
+++ b/Aaru.Tests/Filesystems/LFS.cs
@@ -34,26 +34,45 @@ namespace Aaru.Tests.Filesystems
     [TestFixture]
     public class LfsMbr
     {
-        readonly string[] testfiles = {"netbsd_1.6.vdi.lz"};
+        readonly string[] testfiles =
+        {
+            "netbsd_1.6.vdi.lz"
+        };
 
-        readonly ulong[] sectors = {409600};
+        readonly ulong[] sectors =
+        {
+            409600
+        };
 
-        readonly uint[] sectorsize = {512};
+        readonly uint[] sectorsize =
+        {
+            512
+        };
 
-        readonly long[] clusters = {409600};
+        readonly long[] clusters =
+        {
+            409600
+        };
 
-        readonly int[] clustersize = {512};
+        readonly int[] clustersize =
+        {
+            512
+        };
 
-        readonly string[] volumename = {null};
+        readonly string[] volumename =
+        {
+            null
+        };
 
-        readonly string[] volumeserial = {null};
+        readonly string[] volumeserial =
+        {
+            null
+        };
 
         [Test]
-        public void Test()
-        {
-            throw new NotImplementedException("LFS filesystem is not yet implemented");
+        public void Test() => throw new NotImplementedException("LFS filesystem is not yet implemented");
 
-            /*
+        /*
             for(int i = 0; i < testfiles.Length; i++)
             {
                 string location = Path.Combine(Consts.TestFilesRoot, "filesystems", "hammer_mbr", testfiles[i]);
@@ -83,6 +102,5 @@ namespace Aaru.Tests.Filesystems
                 Assert.AreEqual(volumename[i], fs.XmlFSType.VolumeName, testfiles[i]);
                 Assert.AreEqual(volumeserial[i], fs.XmlFSType.VolumeSerial, testfiles[i]);
             }*/
-        }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/LisaFS.cs b/Aaru.Tests/Filesystems/LisaFS.cs
index 1b944c991..31d21ad3e 100644
--- a/Aaru.Tests/Filesystems/LisaFS.cs
+++ b/Aaru.Tests/Filesystems/LisaFS.cs
@@ -43,9 +43,8 @@ namespace Aaru.Tests.Filesystems
         readonly string[] testfiles =
         {
             "166files.dc42.lz", "222files.dc42.lz", "blank2.0.dc42.lz", "blank-disk.dc42.lz",
-            "file-with-a-password.dc42.lz", "tfwdndrc-has-been-erased.dc42.lz",
-            "tfwdndrc-has-been-restored.dc42.lz", "three-empty-folders.dc42.lz",
-            "three-folders-with-differently-named-docs.dc42.lz",
+            "file-with-a-password.dc42.lz", "tfwdndrc-has-been-erased.dc42.lz", "tfwdndrc-has-been-restored.dc42.lz",
+            "three-empty-folders.dc42.lz", "three-folders-with-differently-named-docs.dc42.lz",
             "three-folders-with-differently-named-docs-root-alphabetical.dc42.lz",
             "three-folders-with-differently-named-docs-root-chronological.dc42.lz",
             "three-folders-with-identically-named-docs.dc42.lz", "lisafs1.dc42.lz", "lisafs2.dc42.lz",
@@ -60,13 +59,25 @@ namespace Aaru.Tests.Filesystems
             MediaType.AppleFileWare, MediaType.AppleSonySS, MediaType.AppleSonySS, MediaType.AppleSonySS
         };
 
-        readonly ulong[] sectors = {800, 800, 800, 800, 800, 800, 800, 800, 800, 800, 800, 800, 1702, 800, 800, 800};
+        readonly ulong[] sectors =
+        {
+            800, 800, 800, 800, 800, 800, 800, 800, 800, 800, 800, 800, 1702, 800, 800, 800
+        };
 
-        readonly uint[] sectorsize = {512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512};
+        readonly uint[] sectorsize =
+        {
+            512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512
+        };
 
-        readonly long[] clusters = {800, 800, 792, 800, 800, 800, 800, 800, 800, 800, 800, 800, 1684, 792, 800, 800};
+        readonly long[] clusters =
+        {
+            800, 800, 792, 800, 800, 800, 800, 800, 800, 800, 800, 800, 1684, 792, 800, 800
+        };
 
-        readonly int[] clustersize = {512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512};
+        readonly int[] clustersize =
+        {
+            512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512
+        };
 
         readonly string[] volumename =
         {
@@ -97,32 +108,30 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new DiskCopy42();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(mediatypes[i], image.Info.MediaType,  testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(mediatypes[i], image.Info.MediaType, testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 IFilesystem fs = new LisaFS();
-                Partition wholePart = new Partition
+
+                var wholePart = new Partition
                 {
-                    Name   = "Whole device",
-                    Length = image.Info.Sectors,
-                    Size   = image.Info.Sectors * image.Info.SectorSize
+                    Name = "Whole device", Length = image.Info.Sectors,
+                    Size = image.Info.Sectors * image.Info.SectorSize
                 };
+
                 Assert.AreEqual(true, fs.Identify(image, wholePart), testfiles[i]);
                 fs.GetInformation(image, wholePart, out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,         testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,      testfiles[i]);
-                Assert.AreEqual("LisaFS",        fs.XmlFsType.Type,             testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,       testfiles[i]);
-                Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial,     testfiles[i]);
-                Assert.AreEqual(oemid[i],        fs.XmlFsType.SystemIdentifier, testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual("LisaFS", fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
+                Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
+                Assert.AreEqual(oemid[i], fs.XmlFsType.SystemIdentifier, testfiles[i]);
             }
         }
 
         [Test]
-        public void TestContents()
-        {
-            throw new NotImplementedException();
-        }
+        public void TestContents() => throw new NotImplementedException();
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/Locus.cs b/Aaru.Tests/Filesystems/Locus.cs
index bba5cc411..c57999645 100644
--- a/Aaru.Tests/Filesystems/Locus.cs
+++ b/Aaru.Tests/Filesystems/Locus.cs
@@ -38,23 +38,50 @@ namespace Aaru.Tests.Filesystems
     [TestFixture]
     public class Locus
     {
-        readonly string[] testfiles = {"mf2dd.img.lz", "mf2hd.img.lz"};
+        readonly string[] testfiles =
+        {
+            "mf2dd.img.lz", "mf2hd.img.lz"
+        };
 
-        readonly MediaType[] mediatypes = {MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_HD};
+        readonly MediaType[] mediatypes =
+        {
+            MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_HD
+        };
 
-        readonly ulong[] sectors = {1440, 2880};
+        readonly ulong[] sectors =
+        {
+            1440, 2880
+        };
 
-        readonly uint[] sectorsize = {512, 512};
+        readonly uint[] sectorsize =
+        {
+            512, 512
+        };
 
-        readonly long[] clusters = {180, 360};
+        readonly long[] clusters =
+        {
+            180, 360
+        };
 
-        readonly int[] clustersize = {4096, 4096};
+        readonly int[] clustersize =
+        {
+            4096, 4096
+        };
 
-        readonly string[] volumename = {"Label", "Label"};
+        readonly string[] volumename =
+        {
+            "Label", "Label"
+        };
 
-        readonly string[] volumeserial = {null, null};
+        readonly string[] volumeserial =
+        {
+            null, null
+        };
 
-        readonly string[] oemid = {null, null};
+        readonly string[] oemid =
+        {
+            null, null
+        };
 
         [Test]
         public void Test()
@@ -65,25 +92,26 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new ZZZRawImage();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(mediatypes[i], image.Info.MediaType,  testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(mediatypes[i], image.Info.MediaType, testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 IFilesystem fs = new Aaru.Filesystems.Locus();
-                Partition wholePart = new Partition
+
+                var wholePart = new Partition
                 {
-                    Name   = "Whole device",
-                    Length = image.Info.Sectors,
-                    Size   = image.Info.Sectors * image.Info.SectorSize
+                    Name = "Whole device", Length = image.Info.Sectors,
+                    Size = image.Info.Sectors * image.Info.SectorSize
                 };
+
                 Assert.AreEqual(true, fs.Identify(image, wholePart), testfiles[i]);
                 fs.GetInformation(image, wholePart, out _, null);
-                Assert.AreEqual(clusters[i],        fs.XmlFsType.Clusters,         testfiles[i]);
-                Assert.AreEqual(clustersize[i],     fs.XmlFsType.ClusterSize,      testfiles[i]);
-                Assert.AreEqual("Locus filesystem", fs.XmlFsType.Type,             testfiles[i]);
-                Assert.AreEqual(volumename[i],      fs.XmlFsType.VolumeName,       testfiles[i]);
-                Assert.AreEqual(volumeserial[i],    fs.XmlFsType.VolumeSerial,     testfiles[i]);
-                Assert.AreEqual(oemid[i],           fs.XmlFsType.SystemIdentifier, testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual("Locus filesystem", fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
+                Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
+                Assert.AreEqual(oemid[i], fs.XmlFsType.SystemIdentifier, testfiles[i]);
             }
         }
     }
diff --git a/Aaru.Tests/Filesystems/MFS.cs b/Aaru.Tests/Filesystems/MFS.cs
index c34a6a4c5..7c0c6c601 100644
--- a/Aaru.Tests/Filesystems/MFS.cs
+++ b/Aaru.Tests/Filesystems/MFS.cs
@@ -51,17 +51,35 @@ namespace Aaru.Tests.Filesystems
             MediaType.AppleSonySS
         };
 
-        readonly ulong[] sectors = {800, 800, 800, 800, 800};
+        readonly ulong[] sectors =
+        {
+            800, 800, 800, 800, 800
+        };
 
-        readonly uint[] sectorsize = {512, 512, 512, 512, 512, 512, 512};
+        readonly uint[] sectorsize =
+        {
+            512, 512, 512, 512, 512, 512, 512
+        };
 
-        readonly long[] clusters = {391, 391, 391, 391, 391};
+        readonly long[] clusters =
+        {
+            391, 391, 391, 391, 391
+        };
 
-        readonly int[] clustersize = {1024, 1024, 1024, 1024, 1024};
+        readonly int[] clustersize =
+        {
+            1024, 1024, 1024, 1024, 1024
+        };
 
-        readonly string[] volumename = {"Volume label", "Volume label", "Volume label", "Volume label", "Volume label"};
+        readonly string[] volumename =
+        {
+            "Volume label", "Volume label", "Volume label", "Volume label", "Volume label"
+        };
 
-        readonly string[] volumeserial = {null, null, null, null, null, null, null};
+        readonly string[] volumeserial =
+        {
+            null, null, null, null, null, null, null
+        };
 
         [Test]
         public void Test()
@@ -72,23 +90,24 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new ZZZRawImage();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(mediatypes[i], image.Info.MediaType,  testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(mediatypes[i], image.Info.MediaType, testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 IFilesystem fs = new AppleMFS();
-                Partition wholePart = new Partition
+
+                var wholePart = new Partition
                 {
-                    Name   = "Whole device",
-                    Length = image.Info.Sectors,
-                    Size   = image.Info.Sectors * image.Info.SectorSize
+                    Name = "Whole device", Length = image.Info.Sectors,
+                    Size = image.Info.Sectors * image.Info.SectorSize
                 };
+
                 Assert.AreEqual(true, fs.Identify(image, wholePart), testfiles[i]);
                 fs.GetInformation(image, wholePart, out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,     testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,  testfiles[i]);
-                Assert.AreEqual("MFS",           fs.XmlFsType.Type,         testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,   testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual("MFS", fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
                 Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
             }
         }
diff --git a/Aaru.Tests/Filesystems/MINIX.cs b/Aaru.Tests/Filesystems/MINIX.cs
index 7bcb32ee1..b396877f7 100644
--- a/Aaru.Tests/Filesystems/MINIX.cs
+++ b/Aaru.Tests/Filesystems/MINIX.cs
@@ -51,15 +51,30 @@ namespace Aaru.Tests.Filesystems
             MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_HD
         };
 
-        readonly ulong[] sectors = {720, 2400, 1440, 2880};
+        readonly ulong[] sectors =
+        {
+            720, 2400, 1440, 2880
+        };
 
-        readonly uint[] sectorsize = {512, 512, 512, 512};
+        readonly uint[] sectorsize =
+        {
+            512, 512, 512, 512
+        };
 
-        readonly long[] clusters = {360, 1200, 720, 1440};
+        readonly long[] clusters =
+        {
+            360, 1200, 720, 1440
+        };
 
-        readonly int[] clustersize = {1024, 1024, 1024, 1024};
+        readonly int[] clustersize =
+        {
+            1024, 1024, 1024, 1024
+        };
 
-        readonly string[] types = {"Minix 3 v1", "Minix 3 v1", "Minix 3 v1", "Minix 3 v1"};
+        readonly string[] types =
+        {
+            "Minix 3 v1", "Minix 3 v1", "Minix 3 v1", "Minix 3 v1"
+        };
 
         [Test]
         public void Test()
@@ -70,22 +85,23 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new ZZZRawImage();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(mediatypes[i], image.Info.MediaType,  testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(mediatypes[i], image.Info.MediaType, testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 IFilesystem fs = new MinixFS();
-                Partition wholePart = new Partition
+
+                var wholePart = new Partition
                 {
-                    Name   = "Whole device",
-                    Length = image.Info.Sectors,
-                    Size   = image.Info.Sectors * image.Info.SectorSize
+                    Name = "Whole device", Length = image.Info.Sectors,
+                    Size = image.Info.Sectors * image.Info.SectorSize
                 };
+
                 Assert.AreEqual(true, fs.Identify(image, wholePart), testfiles[i]);
                 fs.GetInformation(image, wholePart, out _, null);
-                Assert.AreEqual(clusters[i],    fs.XmlFsType.Clusters,    testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
                 Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
-                Assert.AreEqual(types[i],       fs.XmlFsType.Type,        testfiles[i]);
+                Assert.AreEqual(types[i], fs.XmlFsType.Type, testfiles[i]);
             }
         }
     }
@@ -93,17 +109,35 @@ namespace Aaru.Tests.Filesystems
     [TestFixture]
     public class MinixV1Mbr
     {
-        readonly string[] testfiles = {"linux.vdi.lz", "minix_3.1.2a.vdi.lz", "linux_4.19_minix1_flashdrive.vdi.lz"};
+        readonly string[] testfiles =
+        {
+            "linux.vdi.lz", "minix_3.1.2a.vdi.lz", "linux_4.19_minix1_flashdrive.vdi.lz"
+        };
 
-        readonly ulong[] sectors = {262144, 102400, 131072};
+        readonly ulong[] sectors =
+        {
+            262144, 102400, 131072
+        };
 
-        readonly uint[] sectorsize = {512, 512, 512};
+        readonly uint[] sectorsize =
+        {
+            512, 512, 512
+        };
 
-        readonly long[] clusters = {65535, 50399, 64512};
+        readonly long[] clusters =
+        {
+            65535, 50399, 64512
+        };
 
-        readonly int[] clustersize = {1024, 1024, 1024};
+        readonly int[] clustersize =
+        {
+            1024, 1024, 1024
+        };
 
-        readonly string[] types = {"Minix v1", "Minix 3 v1", "Minix v1"};
+        readonly string[] types =
+        {
+            "Minix v1", "Minix 3 v1", "Minix v1"
+        };
 
         [Test]
         public void Test()
@@ -114,25 +148,29 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new Vdi();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 IFilesystem     fs         = new MinixFS();
                 int             part       = -1;
+
                 for(int j = 0; j < partitions.Count; j++)
-                    if(partitions[j].Type == "0x80" || partitions[j].Type == "0x81" || partitions[j].Type == "MINIX")
+                    if(partitions[j].Type == "0x80" ||
+                       partitions[j].Type == "0x81" ||
+                       partitions[j].Type == "MINIX")
                     {
                         part = j;
+
                         break;
                     }
 
                 Assert.AreNotEqual(-1, part, $"Partition not found on {testfiles[i]}");
                 Assert.AreEqual(true, fs.Identify(image, partitions[part]), testfiles[i]);
                 fs.GetInformation(image, partitions[part], out _, null);
-                Assert.AreEqual(clusters[i],    fs.XmlFsType.Clusters,    testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
                 Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
-                Assert.AreEqual(types[i],       fs.XmlFsType.Type,        testfiles[i]);
+                Assert.AreEqual(types[i], fs.XmlFsType.Type, testfiles[i]);
             }
         }
     }
@@ -151,15 +189,30 @@ namespace Aaru.Tests.Filesystems
             MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_HD
         };
 
-        readonly ulong[] sectors = {720, 2400, 1440, 2880};
+        readonly ulong[] sectors =
+        {
+            720, 2400, 1440, 2880
+        };
 
-        readonly uint[] sectorsize = {512, 512, 512, 512};
+        readonly uint[] sectorsize =
+        {
+            512, 512, 512, 512
+        };
 
-        readonly long[] clusters = {360, 1200, 720, 1440};
+        readonly long[] clusters =
+        {
+            360, 1200, 720, 1440
+        };
 
-        readonly int[] clustersize = {1024, 1024, 1024, 1024};
+        readonly int[] clustersize =
+        {
+            1024, 1024, 1024, 1024
+        };
 
-        readonly string[] types = {"Minix 3 v2", "Minix 3 v2", "Minix 3 v2", "Minix 3 v2"};
+        readonly string[] types =
+        {
+            "Minix 3 v2", "Minix 3 v2", "Minix 3 v2", "Minix 3 v2"
+        };
 
         [Test]
         public void Test()
@@ -170,22 +223,23 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new ZZZRawImage();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(mediatypes[i], image.Info.MediaType,  testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(mediatypes[i], image.Info.MediaType, testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 IFilesystem fs = new MinixFS();
-                Partition wholePart = new Partition
+
+                var wholePart = new Partition
                 {
-                    Name   = "Whole device",
-                    Length = image.Info.Sectors,
-                    Size   = image.Info.Sectors * image.Info.SectorSize
+                    Name = "Whole device", Length = image.Info.Sectors,
+                    Size = image.Info.Sectors * image.Info.SectorSize
                 };
+
                 Assert.AreEqual(true, fs.Identify(image, wholePart), testfiles[i]);
                 fs.GetInformation(image, wholePart, out _, null);
-                Assert.AreEqual(clusters[i],    fs.XmlFsType.Clusters,    testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
                 Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
-                Assert.AreEqual(types[i],       fs.XmlFsType.Type,        testfiles[i]);
+                Assert.AreEqual(types[i], fs.XmlFsType.Type, testfiles[i]);
             }
         }
     }
@@ -193,17 +247,35 @@ namespace Aaru.Tests.Filesystems
     [TestFixture]
     public class MinixV2Mbr
     {
-        readonly string[] testfiles = {"minix_3.1.2a.vdi.lz", "linux_4.19_minix2_flashdrive.vdi.lz"};
+        readonly string[] testfiles =
+        {
+            "minix_3.1.2a.vdi.lz", "linux_4.19_minix2_flashdrive.vdi.lz"
+        };
 
-        readonly ulong[] sectors = {1024000, 1024000};
+        readonly ulong[] sectors =
+        {
+            1024000, 1024000
+        };
 
-        readonly uint[] sectorsize = {512, 512};
+        readonly uint[] sectorsize =
+        {
+            512, 512
+        };
 
-        readonly long[] clusters = {511055, 510976};
+        readonly long[] clusters =
+        {
+            511055, 510976
+        };
 
-        readonly int[] clustersize = {1024, 1024};
+        readonly int[] clustersize =
+        {
+            1024, 1024
+        };
 
-        readonly string[] types = {"Minix 3 v2", "Minix v2"};
+        readonly string[] types =
+        {
+            "Minix 3 v2", "Minix v2"
+        };
 
         [Test]
         public void Test()
@@ -214,25 +286,28 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new Vdi();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 IFilesystem     fs         = new MinixFS();
                 int             part       = -1;
+
                 for(int j = 0; j < partitions.Count; j++)
-                    if(partitions[j].Type == "0x81" || partitions[j].Type == "MINIX")
+                    if(partitions[j].Type == "0x81" ||
+                       partitions[j].Type == "MINIX")
                     {
                         part = j;
+
                         break;
                     }
 
                 Assert.AreNotEqual(-1, part, $"Partition not found on {testfiles[i]}");
                 Assert.AreEqual(true, fs.Identify(image, partitions[part]), testfiles[i]);
                 fs.GetInformation(image, partitions[part], out _, null);
-                Assert.AreEqual(clusters[i],    fs.XmlFsType.Clusters,    testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
                 Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
-                Assert.AreEqual(types[i],       fs.XmlFsType.Type,        testfiles[i]);
+                Assert.AreEqual(types[i], fs.XmlFsType.Type, testfiles[i]);
             }
         }
     }
@@ -251,15 +326,30 @@ namespace Aaru.Tests.Filesystems
             MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_HD
         };
 
-        readonly ulong[] sectors = {720, 2400, 1440, 2880};
+        readonly ulong[] sectors =
+        {
+            720, 2400, 1440, 2880
+        };
 
-        readonly uint[] sectorsize = {512, 512, 512, 512};
+        readonly uint[] sectorsize =
+        {
+            512, 512, 512, 512
+        };
 
-        readonly long[] clusters = {90, 300, 180, 360};
+        readonly long[] clusters =
+        {
+            90, 300, 180, 360
+        };
 
-        readonly int[] clustersize = {4096, 4096, 4096, 4096};
+        readonly int[] clustersize =
+        {
+            4096, 4096, 4096, 4096
+        };
 
-        readonly string[] types = {"Minix v3", "Minix v3", "Minix v3", "Minix v3"};
+        readonly string[] types =
+        {
+            "Minix v3", "Minix v3", "Minix v3", "Minix v3"
+        };
 
         [Test]
         public void Test()
@@ -270,22 +360,23 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new ZZZRawImage();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(mediatypes[i], image.Info.MediaType,  testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(mediatypes[i], image.Info.MediaType, testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 IFilesystem fs = new MinixFS();
-                Partition wholePart = new Partition
+
+                var wholePart = new Partition
                 {
-                    Name   = "Whole device",
-                    Length = image.Info.Sectors,
-                    Size   = image.Info.Sectors * image.Info.SectorSize
+                    Name = "Whole device", Length = image.Info.Sectors,
+                    Size = image.Info.Sectors * image.Info.SectorSize
                 };
+
                 Assert.AreEqual(true, fs.Identify(image, wholePart), testfiles[i]);
                 fs.GetInformation(image, wholePart, out _, null);
-                Assert.AreEqual(clusters[i],    fs.XmlFsType.Clusters,    testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
                 Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
-                Assert.AreEqual(types[i],       fs.XmlFsType.Type,        testfiles[i]);
+                Assert.AreEqual(types[i], fs.XmlFsType.Type, testfiles[i]);
             }
         }
     }
@@ -293,17 +384,35 @@ namespace Aaru.Tests.Filesystems
     [TestFixture]
     public class MinixV3Mbr
     {
-        readonly string[] testfiles = {"minix_3.1.2a.vdi.lz", "linux_4.19_minix3_flashdrive.vdi.lz"};
+        readonly string[] testfiles =
+        {
+            "minix_3.1.2a.vdi.lz", "linux_4.19_minix3_flashdrive.vdi.lz"
+        };
 
-        readonly ulong[] sectors = {4194304, 1024000};
+        readonly ulong[] sectors =
+        {
+            4194304, 1024000
+        };
 
-        readonly uint[] sectorsize = {512, 512};
+        readonly uint[] sectorsize =
+        {
+            512, 512
+        };
 
-        readonly long[] clusters = {523151, 510976};
+        readonly long[] clusters =
+        {
+            523151, 510976
+        };
 
-        readonly int[] clustersize = {4096, 1024};
+        readonly int[] clustersize =
+        {
+            4096, 1024
+        };
 
-        readonly string[] types = {"Minix v3", "Minix v3"};
+        readonly string[] types =
+        {
+            "Minix v3", "Minix v3"
+        };
 
         [Test]
         public void Test()
@@ -314,25 +423,28 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new Vdi();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 IFilesystem     fs         = new MinixFS();
                 int             part       = -1;
+
                 for(int j = 0; j < partitions.Count; j++)
-                    if(partitions[j].Type == "0x81" || partitions[j].Type == "MINIX")
+                    if(partitions[j].Type == "0x81" ||
+                       partitions[j].Type == "MINIX")
                     {
                         part = j;
+
                         break;
                     }
 
                 Assert.AreNotEqual(-1, part, $"Partition not found on {testfiles[i]}");
                 Assert.AreEqual(true, fs.Identify(image, partitions[part]), testfiles[i]);
                 fs.GetInformation(image, partitions[part], out _, null);
-                Assert.AreEqual(clusters[i],    fs.XmlFsType.Clusters,    testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
                 Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
-                Assert.AreEqual(types[i],       fs.XmlFsType.Type,        testfiles[i]);
+                Assert.AreEqual(types[i], fs.XmlFsType.Type, testfiles[i]);
             }
         }
     }
diff --git a/Aaru.Tests/Filesystems/NILFS2.cs b/Aaru.Tests/Filesystems/NILFS2.cs
index e91cd968f..113169fbe 100644
--- a/Aaru.Tests/Filesystems/NILFS2.cs
+++ b/Aaru.Tests/Filesystems/NILFS2.cs
@@ -40,19 +40,40 @@ namespace Aaru.Tests.Filesystems
     [TestFixture]
     public class Nilfs2
     {
-        readonly string[] testfiles = {"linux.vdi.lz"};
+        readonly string[] testfiles =
+        {
+            "linux.vdi.lz"
+        };
 
-        readonly ulong[] sectors = {262144};
+        readonly ulong[] sectors =
+        {
+            262144
+        };
 
-        readonly uint[] sectorsize = {512};
+        readonly uint[] sectorsize =
+        {
+            512
+        };
 
-        readonly long[] clusters = {32512};
+        readonly long[] clusters =
+        {
+            32512
+        };
 
-        readonly int[] clustersize = {4096};
+        readonly int[] clustersize =
+        {
+            4096
+        };
 
-        readonly string[] volumename = {"Volume label"};
+        readonly string[] volumename =
+        {
+            "Volume label"
+        };
 
-        readonly string[] volumeserial = {"6b1ca79e-7048-a748-93a0-89c74b02cb5a"};
+        readonly string[] volumeserial =
+        {
+            "6b1ca79e-7048-a748-93a0-89c74b02cb5a"
+        };
 
         [Test]
         public void Test()
@@ -63,27 +84,29 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new Vdi();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 IFilesystem     fs         = new NILFS2();
                 int             part       = -1;
+
                 for(int j = 0; j < partitions.Count; j++)
                     if(partitions[j].Type == "0x83")
                     {
                         part = j;
+
                         break;
                     }
 
                 Assert.AreNotEqual(-1, part, $"Partition not found on {testfiles[i]}");
                 Assert.AreEqual(true, fs.Identify(image, partitions[part]), testfiles[i]);
                 fs.GetInformation(image, partitions[part], out _, null);
-                Assert.AreEqual(clusters[i],         fs.XmlFsType.Clusters,     testfiles[i]);
-                Assert.AreEqual(clustersize[i],      fs.XmlFsType.ClusterSize,  testfiles[i]);
-                Assert.AreEqual("NILFS2 filesystem", fs.XmlFsType.Type,         testfiles[i]);
-                Assert.AreEqual(volumename[i],       fs.XmlFsType.VolumeName,   testfiles[i]);
-                Assert.AreEqual(volumeserial[i],     fs.XmlFsType.VolumeSerial, testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual("NILFS2 filesystem", fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
+                Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
             }
         }
     }
diff --git a/Aaru.Tests/Filesystems/NTFS.cs b/Aaru.Tests/Filesystems/NTFS.cs
index 26d0fd531..d05d1c142 100644
--- a/Aaru.Tests/Filesystems/NTFS.cs
+++ b/Aaru.Tests/Filesystems/NTFS.cs
@@ -40,21 +40,45 @@ namespace Aaru.Tests.Filesystems
     [TestFixture]
     public class NtfsGpt
     {
-        readonly string[] testfiles = {"haiku_hrev51259.vdi.lz"};
+        readonly string[] testfiles =
+        {
+            "haiku_hrev51259.vdi.lz"
+        };
 
-        readonly ulong[] sectors = {2097152};
+        readonly ulong[] sectors =
+        {
+            2097152
+        };
 
-        readonly uint[] sectorsize = {512};
+        readonly uint[] sectorsize =
+        {
+            512
+        };
 
-        readonly long[] clusters = {261887};
+        readonly long[] clusters =
+        {
+            261887
+        };
 
-        readonly int[] clustersize = {4096};
+        readonly int[] clustersize =
+        {
+            4096
+        };
 
-        readonly string[] volumename = {null, null, null, null, null, null, null, null};
+        readonly string[] volumename =
+        {
+            null, null, null, null, null, null, null, null
+        };
 
-        readonly string[] volumeserial = {"106DA7693F7F6B3F"};
+        readonly string[] volumeserial =
+        {
+            "106DA7693F7F6B3F"
+        };
 
-        readonly string[] oemid = {null};
+        readonly string[] oemid =
+        {
+            null
+        };
 
         [Test]
         public void Test()
@@ -65,28 +89,30 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new Vdi();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 IFilesystem     fs         = new NTFS();
                 int             part       = -1;
+
                 for(int j = 0; j < partitions.Count; j++)
                     if(partitions[j].Type == "Microsoft Basic data")
                     {
                         part = j;
+
                         break;
                     }
 
                 Assert.AreNotEqual(-1, part, $"Partition not found on {testfiles[i]}");
                 Assert.AreEqual(true, fs.Identify(image, partitions[part]), testfiles[i]);
                 fs.GetInformation(image, partitions[part], out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,         testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,      testfiles[i]);
-                Assert.AreEqual("NTFS",          fs.XmlFsType.Type,             testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,       testfiles[i]);
-                Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial,     testfiles[i]);
-                Assert.AreEqual(oemid[i],        fs.XmlFsType.SystemIdentifier, testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual("NTFS", fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
+                Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
+                Assert.AreEqual(oemid[i], fs.XmlFsType.SystemIdentifier, testfiles[i]);
             }
         }
     }
@@ -101,15 +127,30 @@ namespace Aaru.Tests.Filesystems
             "linux_4.19_ntfs3g_flashdrive.vdi.lz"
         };
 
-        readonly ulong[] sectors = {524288, 2097152, 1024000, 524288, 524288, 524288, 524288, 262144, 2097152, 1024000};
+        readonly ulong[] sectors =
+        {
+            524288, 2097152, 1024000, 524288, 524288, 524288, 524288, 262144, 2097152, 1024000
+        };
 
-        readonly uint[] sectorsize = {512, 512, 512, 512, 512, 512, 512, 512, 512, 512};
+        readonly uint[] sectorsize =
+        {
+            512, 512, 512, 512, 512, 512, 512, 512, 512, 512
+        };
 
-        readonly long[] clusters = {65263, 1046511, 1023057, 524256, 524256, 524096, 64767, 32511, 261887, 127743};
+        readonly long[] clusters =
+        {
+            65263, 1046511, 1023057, 524256, 524256, 524096, 64767, 32511, 261887, 127743
+        };
 
-        readonly int[] clustersize = {4096, 1024, 512, 512, 512, 512, 4096, 4096, 4096, 4096};
+        readonly int[] clustersize =
+        {
+            4096, 1024, 512, 512, 512, 512, 4096, 4096, 4096, 4096
+        };
 
-        readonly string[] volumename = {null, null, null, null, null, null, null, null, null, null};
+        readonly string[] volumename =
+        {
+            null, null, null, null, null, null, null, null, null, null
+        };
 
         readonly string[] volumeserial =
         {
@@ -117,7 +158,10 @@ namespace Aaru.Tests.Filesystems
             "822C288D2C287E73", "E20AF54B0AF51D6B", "065BB96B7C1BCFDA", "46EC796749C6FA66", "1FC3802B52F9611C"
         };
 
-        readonly string[] oemid = {null, null, null, null, null, null, null, null, null, null};
+        readonly string[] oemid =
+        {
+            null, null, null, null, null, null, null, null, null, null
+        };
 
         [Test]
         public void Test()
@@ -128,30 +172,33 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new Vdi();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 IFilesystem     fs         = new NTFS();
                 int             part       = -1;
+
                 for(int j = 0; j < partitions.Count; j++)
                     if(partitions[j].Type == "0x07" ||
+
                        // Value incorrectly set by Haiku
                        partitions[j].Type == "0x86")
                     {
                         part = j;
+
                         break;
                     }
 
                 Assert.AreNotEqual(-1, part, $"Partition not found on {testfiles[i]}");
                 Assert.AreEqual(true, fs.Identify(image, partitions[part]), testfiles[i]);
                 fs.GetInformation(image, partitions[part], out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,         testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,      testfiles[i]);
-                Assert.AreEqual("NTFS",          fs.XmlFsType.Type,             testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,       testfiles[i]);
-                Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial,     testfiles[i]);
-                Assert.AreEqual(oemid[i],        fs.XmlFsType.SystemIdentifier, testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual("NTFS", fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
+                Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
+                Assert.AreEqual(oemid[i], fs.XmlFsType.SystemIdentifier, testfiles[i]);
             }
         }
     }
diff --git a/Aaru.Tests/Filesystems/NWFS386.cs b/Aaru.Tests/Filesystems/NWFS386.cs
index 6ef295d80..8f587c697 100644
--- a/Aaru.Tests/Filesystems/NWFS386.cs
+++ b/Aaru.Tests/Filesystems/NWFS386.cs
@@ -34,26 +34,45 @@ namespace Aaru.Tests.Filesystems
     [TestFixture]
     public class Nwfs386
     {
-        readonly string[] testfiles = {"netware_3.12.vdi.lz"};
+        readonly string[] testfiles =
+        {
+            "netware_3.12.vdi.lz"
+        };
 
-        readonly ulong[] sectors = {104857600};
+        readonly ulong[] sectors =
+        {
+            104857600
+        };
 
-        readonly uint[] sectorsize = {512};
+        readonly uint[] sectorsize =
+        {
+            512
+        };
 
-        readonly long[] clusters = {104856192};
+        readonly long[] clusters =
+        {
+            104856192
+        };
 
-        readonly int[] clustersize = {512};
+        readonly int[] clustersize =
+        {
+            512
+        };
 
-        readonly string[] volumename = {"Volume label"};
+        readonly string[] volumename =
+        {
+            "Volume label"
+        };
 
-        readonly string[] volumeserial = {"UNKNOWN"};
+        readonly string[] volumeserial =
+        {
+            "UNKNOWN"
+        };
 
         [Test]
-        public void Test()
-        {
-            throw new NotImplementedException("NWFS386 filesystem is not yet implemented");
+        public void Test() => throw new NotImplementedException("NWFS386 filesystem is not yet implemented");
 
-            /*
+        /*
             for(int i = 0; i < testfiles.Length; i++)
             {
                 string location = Path.Combine(Consts.TestFilesRoot, "filesystems", "nwfs386", testfiles[i]);
@@ -83,6 +102,5 @@ namespace Aaru.Tests.Filesystems
                 Assert.AreEqual(volumename[i], fs.XmlFSType.VolumeName, testfiles[i]);
                 Assert.AreEqual(volumeserial[i], fs.XmlFSType.VolumeSerial, testfiles[i]);
             }*/
-        }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/OCFS2.cs b/Aaru.Tests/Filesystems/OCFS2.cs
index 644d1b4e4..03f9a2fae 100644
--- a/Aaru.Tests/Filesystems/OCFS2.cs
+++ b/Aaru.Tests/Filesystems/OCFS2.cs
@@ -34,26 +34,45 @@ namespace Aaru.Tests.Filesystems
     [TestFixture]
     public class Ocfs2
     {
-        readonly string[] testfiles = {"linux.vdi.lz"};
+        readonly string[] testfiles =
+        {
+            "linux.vdi.lz"
+        };
 
-        readonly ulong[] sectors = {104857600};
+        readonly ulong[] sectors =
+        {
+            104857600
+        };
 
-        readonly uint[] sectorsize = {512};
+        readonly uint[] sectorsize =
+        {
+            512
+        };
 
-        readonly long[] clusters = {104856192};
+        readonly long[] clusters =
+        {
+            104856192
+        };
 
-        readonly int[] clustersize = {512};
+        readonly int[] clustersize =
+        {
+            512
+        };
 
-        readonly string[] volumename = {"Volume label"};
+        readonly string[] volumename =
+        {
+            "Volume label"
+        };
 
-        readonly string[] volumeserial = {"UNKNOWN"};
+        readonly string[] volumeserial =
+        {
+            "UNKNOWN"
+        };
 
         [Test]
-        public void Test()
-        {
-            throw new NotImplementedException("OCFS2 filesystem is not yet implemented");
+        public void Test() => throw new NotImplementedException("OCFS2 filesystem is not yet implemented");
 
-            /*
+        /*
             for(int i = 0; i < testfiles.Length; i++)
             {
                 string location = Path.Combine(Consts.TestFilesRoot, "filesystems", "ocfs2", testfiles[i]);
@@ -83,6 +102,5 @@ namespace Aaru.Tests.Filesystems
                 Assert.AreEqual(volumename[i], fs.XmlFSType.VolumeName, testfiles[i]);
                 Assert.AreEqual(volumeserial[i], fs.XmlFSType.VolumeSerial, testfiles[i]);
             }*/
-        }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/PFS3.cs b/Aaru.Tests/Filesystems/PFS3.cs
index 9a105826d..a5e968bd4 100644
--- a/Aaru.Tests/Filesystems/PFS3.cs
+++ b/Aaru.Tests/Filesystems/PFS3.cs
@@ -40,21 +40,45 @@ namespace Aaru.Tests.Filesystems
     [TestFixture]
     public class Pfs3Rdb
     {
-        readonly string[] testfiles = {"uae.vdi.lz"};
+        readonly string[] testfiles =
+        {
+            "uae.vdi.lz"
+        };
 
-        readonly ulong[] sectors = {1024128};
+        readonly ulong[] sectors =
+        {
+            1024128
+        };
 
-        readonly uint[] sectorsize = {512};
+        readonly uint[] sectorsize =
+        {
+            512
+        };
 
-        readonly long[] clusters = {1023552};
+        readonly long[] clusters =
+        {
+            1023552
+        };
 
-        readonly int[] clustersize = {512};
+        readonly int[] clustersize =
+        {
+            512
+        };
 
-        readonly string[] volumename = {"PFS"};
+        readonly string[] volumename =
+        {
+            "PFS"
+        };
 
-        readonly string[] volumeserial = {null};
+        readonly string[] volumeserial =
+        {
+            null
+        };
 
-        readonly string[] oemid = {null};
+        readonly string[] oemid =
+        {
+            null
+        };
 
         [Test]
         public void Test()
@@ -65,28 +89,30 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new Vdi();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 IFilesystem     fs         = new PFS();
                 int             part       = -1;
+
                 for(int j = 0; j < partitions.Count; j++)
                     if(partitions[j].Type == "\"PFS\\1\"")
                     {
                         part = j;
+
                         break;
                     }
 
                 Assert.AreNotEqual(-1, part, $"Partition not found on {testfiles[i]}");
                 Assert.AreEqual(true, fs.Identify(image, partitions[part]), testfiles[i]);
                 fs.GetInformation(image, partitions[part], out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,         testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,      testfiles[i]);
-                Assert.AreEqual("PFS v3",        fs.XmlFsType.Type,             testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,       testfiles[i]);
-                Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial,     testfiles[i]);
-                Assert.AreEqual(oemid[i],        fs.XmlFsType.SystemIdentifier, testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual("PFS v3", fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
+                Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
+                Assert.AreEqual(oemid[i], fs.XmlFsType.SystemIdentifier, testfiles[i]);
             }
         }
     }
diff --git a/Aaru.Tests/Filesystems/ProDOS.cs b/Aaru.Tests/Filesystems/ProDOS.cs
index 649854840..1a5b66063 100644
--- a/Aaru.Tests/Filesystems/ProDOS.cs
+++ b/Aaru.Tests/Filesystems/ProDOS.cs
@@ -46,13 +46,25 @@ namespace Aaru.Tests.Filesystems
             "macos_9.1.vdi.lz", "macos_9.2.1.vdi.lz", "macos_9.2.2.vdi.lz"
         };
 
-        readonly ulong[] sectors = {49152, 49152, 49152, 49152, 49152, 49152, 49152, 49152};
+        readonly ulong[] sectors =
+        {
+            49152, 49152, 49152, 49152, 49152, 49152, 49152, 49152
+        };
 
-        readonly uint[] sectorsize = {512, 512, 512, 512, 512, 512, 512, 512};
+        readonly uint[] sectorsize =
+        {
+            512, 512, 512, 512, 512, 512, 512, 512
+        };
 
-        readonly long[] clusters = {48438, 48438, 48438, 48438, 46326, 46326, 46326, 46326};
+        readonly long[] clusters =
+        {
+            48438, 48438, 48438, 48438, 46326, 46326, 46326, 46326
+        };
 
-        readonly int[] clustersize = {512, 512, 512, 512, 512, 512, 512, 512};
+        readonly int[] clustersize =
+        {
+            512, 512, 512, 512, 512, 512, 512, 512
+        };
 
         readonly string[] volumename =
         {
@@ -60,7 +72,10 @@ namespace Aaru.Tests.Filesystems
             "VOLUME.LABEL", "VOLUME.LABEL"
         };
 
-        readonly string[] volumeserial = {null, null, null, null, null, null, null, null};
+        readonly string[] volumeserial =
+        {
+            null, null, null, null, null, null, null, null
+        };
 
         [Test]
         public void Test()
@@ -71,26 +86,28 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new Vdi();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 IFilesystem     fs         = new ProDOSPlugin();
                 int             part       = -1;
+
                 for(int j = 0; j < partitions.Count; j++)
                     if(partitions[j].Type == "Apple_ProDOS")
                     {
                         part = j;
+
                         break;
                     }
 
                 Assert.AreNotEqual(-1, part, $"Partition not found on {testfiles[i]}");
                 Assert.AreEqual(true, fs.Identify(image, partitions[part]), testfiles[i]);
                 fs.GetInformation(image, partitions[part], out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,     testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,  testfiles[i]);
-                Assert.AreEqual("ProDOS",        fs.XmlFsType.Type,         testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,   testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual("ProDOS", fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
                 Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
             }
         }
diff --git a/Aaru.Tests/Filesystems/QNX4.cs b/Aaru.Tests/Filesystems/QNX4.cs
index c46eb2aa0..d43cbfb26 100644
--- a/Aaru.Tests/Filesystems/QNX4.cs
+++ b/Aaru.Tests/Filesystems/QNX4.cs
@@ -50,13 +50,25 @@ namespace Aaru.Tests.Filesystems
             MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_HD
         };
 
-        readonly ulong[] sectors = {720, 2400, 1440, 2880};
+        readonly ulong[] sectors =
+        {
+            720, 2400, 1440, 2880
+        };
 
-        readonly uint[] sectorsize = {512, 512, 512, 512};
+        readonly uint[] sectorsize =
+        {
+            512, 512, 512, 512
+        };
 
-        readonly long[] clusters = {720, 2400, 1440, 2880};
+        readonly long[] clusters =
+        {
+            720, 2400, 1440, 2880
+        };
 
-        readonly int[] clustersize = {512, 512, 512, 512};
+        readonly int[] clustersize =
+        {
+            512, 512, 512, 512
+        };
 
         [Test]
         public void Test()
@@ -67,22 +79,23 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new ZZZRawImage();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(mediatypes[i], image.Info.MediaType,  testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(mediatypes[i], image.Info.MediaType, testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 IFilesystem fs = new QNX4();
-                Partition wholePart = new Partition
+
+                var wholePart = new Partition
                 {
-                    Name   = "Whole device",
-                    Length = image.Info.Sectors,
-                    Size   = image.Info.Sectors * image.Info.SectorSize
+                    Name = "Whole device", Length = image.Info.Sectors,
+                    Size = image.Info.Sectors * image.Info.SectorSize
                 };
+
                 Assert.AreEqual(true, fs.Identify(image, wholePart), testfiles[i]);
                 fs.GetInformation(image, wholePart, out _, null);
-                Assert.AreEqual(clusters[i],       fs.XmlFsType.Clusters,    testfiles[i]);
-                Assert.AreEqual(clustersize[i],    fs.XmlFsType.ClusterSize, testfiles[i]);
-                Assert.AreEqual("QNX4 filesystem", fs.XmlFsType.Type,        testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual("QNX4 filesystem", fs.XmlFsType.Type, testfiles[i]);
             }
         }
     }
@@ -90,15 +103,30 @@ namespace Aaru.Tests.Filesystems
     [TestFixture]
     public class Qnx4Mbr
     {
-        readonly string[] testfiles = {"qnx_4.24.vdi.lz"};
+        readonly string[] testfiles =
+        {
+            "qnx_4.24.vdi.lz"
+        };
 
-        readonly ulong[] sectors = {1024000};
+        readonly ulong[] sectors =
+        {
+            1024000
+        };
 
-        readonly uint[] sectorsize = {512};
+        readonly uint[] sectorsize =
+        {
+            512
+        };
 
-        readonly long[] clusters = {1023104};
+        readonly long[] clusters =
+        {
+            1023104
+        };
 
-        readonly int[] clustersize = {512};
+        readonly int[] clustersize =
+        {
+            512
+        };
 
         [Test]
         public void Test()
@@ -109,25 +137,27 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new Vdi();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 IFilesystem     fs         = new QNX4();
                 int             part       = -1;
+
                 for(int j = 0; j < partitions.Count; j++)
                     if(partitions[j].Type == "0x4D")
                     {
                         part = j;
+
                         break;
                     }
 
                 Assert.AreNotEqual(-1, part, $"Partition not found on {testfiles[i]}");
                 Assert.AreEqual(true, fs.Identify(image, partitions[part]), testfiles[i]);
                 fs.GetInformation(image, partitions[part], out _, null);
-                Assert.AreEqual(clusters[i],       fs.XmlFsType.Clusters,    testfiles[i]);
-                Assert.AreEqual(clustersize[i],    fs.XmlFsType.ClusterSize, testfiles[i]);
-                Assert.AreEqual("QNX4 filesystem", fs.XmlFsType.Type,        testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual("QNX4 filesystem", fs.XmlFsType.Type, testfiles[i]);
             }
         }
     }
diff --git a/Aaru.Tests/Filesystems/ReFS.cs b/Aaru.Tests/Filesystems/ReFS.cs
index 36af72d79..b5352b6aa 100644
--- a/Aaru.Tests/Filesystems/ReFS.cs
+++ b/Aaru.Tests/Filesystems/ReFS.cs
@@ -40,21 +40,45 @@ namespace Aaru.Tests.Filesystems
     [TestFixture]
     public class ReFsMbr
     {
-        readonly string[] testfiles = {"win10.vdi.lz"};
+        readonly string[] testfiles =
+        {
+            "win10.vdi.lz"
+        };
 
-        readonly ulong[] sectors = {67108864};
+        readonly ulong[] sectors =
+        {
+            67108864
+        };
 
-        readonly uint[] sectorsize = {512};
+        readonly uint[] sectorsize =
+        {
+            512
+        };
 
-        readonly long[] clusters = {8372224};
+        readonly long[] clusters =
+        {
+            8372224
+        };
 
-        readonly int[] clustersize = {4096};
+        readonly int[] clustersize =
+        {
+            4096
+        };
 
-        readonly string[] volumename = {null};
+        readonly string[] volumename =
+        {
+            null
+        };
 
-        readonly string[] volumeserial = {null};
+        readonly string[] volumeserial =
+        {
+            null
+        };
 
-        readonly string[] oemid = {null};
+        readonly string[] oemid =
+        {
+            null
+        };
 
         [Test]
         public void Test()
@@ -65,15 +89,17 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new Vdi();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 int             part       = -1;
+
                 for(int j = 0; j < partitions.Count; j++)
                     if(partitions[j].Type == "0x07")
                     {
                         part = j;
+
                         break;
                     }
 
@@ -81,12 +107,12 @@ namespace Aaru.Tests.Filesystems
                 IFilesystem fs = new ReFS();
                 Assert.AreEqual(true, fs.Identify(image, partitions[part]), testfiles[i]);
                 fs.GetInformation(image, partitions[part], out _, null);
-                Assert.AreEqual(clusters[i],             fs.XmlFsType.Clusters,         testfiles[i]);
-                Assert.AreEqual(clustersize[i],          fs.XmlFsType.ClusterSize,      testfiles[i]);
-                Assert.AreEqual("Resilient File System", fs.XmlFsType.Type,             testfiles[i]);
-                Assert.AreEqual(volumename[i],           fs.XmlFsType.VolumeName,       testfiles[i]);
-                Assert.AreEqual(volumeserial[i],         fs.XmlFsType.VolumeSerial,     testfiles[i]);
-                Assert.AreEqual(oemid[i],                fs.XmlFsType.SystemIdentifier, testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual("Resilient File System", fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
+                Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
+                Assert.AreEqual(oemid[i], fs.XmlFsType.SystemIdentifier, testfiles[i]);
             }
         }
     }
diff --git a/Aaru.Tests/Filesystems/Reiser3.cs b/Aaru.Tests/Filesystems/Reiser3.cs
index b3a877a03..28709bc4b 100644
--- a/Aaru.Tests/Filesystems/Reiser3.cs
+++ b/Aaru.Tests/Filesystems/Reiser3.cs
@@ -46,13 +46,25 @@ namespace Aaru.Tests.Filesystems
             "linux_4.19_reiser_3.6_flashdrive.vdi.lz"
         };
 
-        readonly ulong[] sectors = {262144, 262144, 1024000, 1024000};
+        readonly ulong[] sectors =
+        {
+            262144, 262144, 1024000, 1024000
+        };
 
-        readonly uint[] sectorsize = {512, 512, 512, 512};
+        readonly uint[] sectorsize =
+        {
+            512, 512, 512, 512
+        };
 
-        readonly long[] clusters = {32512, 32512, 127744, 127744};
+        readonly long[] clusters =
+        {
+            32512, 32512, 127744, 127744
+        };
 
-        readonly int[] clustersize = {4096, 4096, 4096, 4096};
+        readonly int[] clustersize =
+        {
+            4096, 4096, 4096, 4096
+        };
 
         readonly string[] reiserversion =
         {
@@ -68,25 +80,27 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new Vdi();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 IFilesystem     fs         = new Reiser();
                 int             part       = -1;
+
                 for(int j = 0; j < partitions.Count; j++)
                     if(partitions[j].Type == "0x83")
                     {
                         part = j;
+
                         break;
                     }
 
                 Assert.AreNotEqual(-1, part, $"Partition not found on {testfiles[i]}");
                 Assert.AreEqual(true, fs.Identify(image, partitions[part]), testfiles[i]);
                 fs.GetInformation(image, partitions[part], out _, null);
-                Assert.AreEqual(clusters[i],      fs.XmlFsType.Clusters,    testfiles[i]);
-                Assert.AreEqual(clustersize[i],   fs.XmlFsType.ClusterSize, testfiles[i]);
-                Assert.AreEqual(reiserversion[i], fs.XmlFsType.Type,        testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual(reiserversion[i], fs.XmlFsType.Type, testfiles[i]);
             }
         }
     }
diff --git a/Aaru.Tests/Filesystems/Reiser4.cs b/Aaru.Tests/Filesystems/Reiser4.cs
index 031a441a8..533177871 100644
--- a/Aaru.Tests/Filesystems/Reiser4.cs
+++ b/Aaru.Tests/Filesystems/Reiser4.cs
@@ -39,19 +39,40 @@ namespace Aaru.Tests.Filesystems
     [TestFixture]
     public class Reiser4
     {
-        readonly string[] testfiles = {"linux.vdi.lz"};
+        readonly string[] testfiles =
+        {
+            "linux.vdi.lz"
+        };
 
-        readonly ulong[] sectors = {262144};
+        readonly ulong[] sectors =
+        {
+            262144
+        };
 
-        readonly uint[] sectorsize = {512};
+        readonly uint[] sectorsize =
+        {
+            512
+        };
 
-        readonly long[] clusters = {32511};
+        readonly long[] clusters =
+        {
+            32511
+        };
 
-        readonly int[] clustersize = {4096};
+        readonly int[] clustersize =
+        {
+            4096
+        };
 
-        readonly string[] volumename = {"Volume label"};
+        readonly string[] volumename =
+        {
+            "Volume label"
+        };
 
-        readonly string[] volumeserial = {"b0c1924e-6f10-8c42-b6c5-66a457896460"};
+        readonly string[] volumeserial =
+        {
+            "b0c1924e-6f10-8c42-b6c5-66a457896460"
+        };
 
         [Test]
         public void Test()
@@ -62,27 +83,29 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new Vdi();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 IFilesystem     fs         = new Aaru.Filesystems.Reiser4();
                 int             part       = -1;
+
                 for(int j = 0; j < partitions.Count; j++)
                     if(partitions[j].Type == "0x83")
                     {
                         part = j;
+
                         break;
                     }
 
                 Assert.AreNotEqual(-1, part, $"Partition not found on {testfiles[i]}");
                 Assert.AreEqual(true, fs.Identify(image, partitions[part]), testfiles[i]);
                 fs.GetInformation(image, partitions[part], out _, null);
-                Assert.AreEqual(clusters[i],           fs.XmlFsType.Clusters,     testfiles[i]);
-                Assert.AreEqual(clustersize[i],        fs.XmlFsType.ClusterSize,  testfiles[i]);
-                Assert.AreEqual("Reiser 4 filesystem", fs.XmlFsType.Type,         testfiles[i]);
-                Assert.AreEqual(volumename[i],         fs.XmlFsType.VolumeName,   testfiles[i]);
-                Assert.AreEqual(volumeserial[i],       fs.XmlFsType.VolumeSerial, testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual("Reiser 4 filesystem", fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
+                Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
             }
         }
     }
diff --git a/Aaru.Tests/Filesystems/SFS.cs b/Aaru.Tests/Filesystems/SFS.cs
index c55699d06..13ac23f90 100644
--- a/Aaru.Tests/Filesystems/SFS.cs
+++ b/Aaru.Tests/Filesystems/SFS.cs
@@ -40,19 +40,40 @@ namespace Aaru.Tests.Filesystems
     [TestFixture]
     public class SfsMbr
     {
-        readonly string[] testfiles = {"aros.vdi.lz"};
+        readonly string[] testfiles =
+        {
+            "aros.vdi.lz"
+        };
 
-        readonly ulong[] sectors = {409600};
+        readonly ulong[] sectors =
+        {
+            409600
+        };
 
-        readonly uint[] sectorsize = {512};
+        readonly uint[] sectorsize =
+        {
+            512
+        };
 
-        readonly long[] clusters = {408240};
+        readonly long[] clusters =
+        {
+            408240
+        };
 
-        readonly int[] clustersize = {512};
+        readonly int[] clustersize =
+        {
+            512
+        };
 
-        readonly string[] volumename = {null};
+        readonly string[] volumename =
+        {
+            null
+        };
 
-        readonly string[] volumeserial = {null};
+        readonly string[] volumeserial =
+        {
+            null
+        };
 
         [Test]
         public void Test()
@@ -63,27 +84,29 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new Vdi();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 IFilesystem     fs         = new SFS();
                 int             part       = -1;
+
                 for(int j = 0; j < partitions.Count; j++)
                     if(partitions[j].Type == "0x2F")
                     {
                         part = j;
+
                         break;
                     }
 
                 Assert.AreNotEqual(-1, part, $"Partition not found on {testfiles[i]}");
                 Assert.AreEqual(true, fs.Identify(image, partitions[part]), testfiles[i]);
                 fs.GetInformation(image, partitions[part], out _, null);
-                Assert.AreEqual(clusters[i],       fs.XmlFsType.Clusters,     testfiles[i]);
-                Assert.AreEqual(clustersize[i],    fs.XmlFsType.ClusterSize,  testfiles[i]);
-                Assert.AreEqual("SmartFileSystem", fs.XmlFsType.Type,         testfiles[i]);
-                Assert.AreEqual(volumename[i],     fs.XmlFsType.VolumeName,   testfiles[i]);
-                Assert.AreEqual(volumeserial[i],   fs.XmlFsType.VolumeSerial, testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual("SmartFileSystem", fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
+                Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
             }
         }
     }
@@ -91,19 +114,40 @@ namespace Aaru.Tests.Filesystems
     [TestFixture]
     public class SfsMbrRdb
     {
-        readonly string[] testfiles = {"aros.vdi.lz"};
+        readonly string[] testfiles =
+        {
+            "aros.vdi.lz"
+        };
 
-        readonly ulong[] sectors = {409600};
+        readonly ulong[] sectors =
+        {
+            409600
+        };
 
-        readonly uint[] sectorsize = {512};
+        readonly uint[] sectorsize =
+        {
+            512
+        };
 
-        readonly long[] clusters = {406224};
+        readonly long[] clusters =
+        {
+            406224
+        };
 
-        readonly int[] clustersize = {512};
+        readonly int[] clustersize =
+        {
+            512
+        };
 
-        readonly string[] volumename = {null};
+        readonly string[] volumename =
+        {
+            null
+        };
 
-        readonly string[] volumeserial = {null};
+        readonly string[] volumeserial =
+        {
+            null
+        };
 
         [Test]
         public void Test()
@@ -114,27 +158,29 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new Vdi();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 IFilesystem     fs         = new SFS();
                 int             part       = -1;
+
                 for(int j = 0; j < partitions.Count; j++)
                     if(partitions[j].Type == "\"SFS\\0\"")
                     {
                         part = j;
+
                         break;
                     }
 
                 Assert.AreNotEqual(-1, part, $"Partition not found on {testfiles[i]}");
                 Assert.AreEqual(true, fs.Identify(image, partitions[part]), testfiles[i]);
                 fs.GetInformation(image, partitions[part], out _, null);
-                Assert.AreEqual(clusters[i],       fs.XmlFsType.Clusters,     testfiles[i]);
-                Assert.AreEqual(clustersize[i],    fs.XmlFsType.ClusterSize,  testfiles[i]);
-                Assert.AreEqual("SmartFileSystem", fs.XmlFsType.Type,         testfiles[i]);
-                Assert.AreEqual(volumename[i],     fs.XmlFsType.VolumeName,   testfiles[i]);
-                Assert.AreEqual(volumeserial[i],   fs.XmlFsType.VolumeSerial, testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual("SmartFileSystem", fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
+                Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
             }
         }
     }
@@ -142,19 +188,40 @@ namespace Aaru.Tests.Filesystems
     [TestFixture]
     public class SfsRdb
     {
-        readonly string[] testfiles = {"uae.vdi.lz", "aros.vdi.lz", "amigaos_4.0.vdi.lz", "amigaos_4.0_sfs2.vdi.lz"};
+        readonly string[] testfiles =
+        {
+            "uae.vdi.lz", "aros.vdi.lz", "amigaos_4.0.vdi.lz", "amigaos_4.0_sfs2.vdi.lz"
+        };
 
-        readonly ulong[] sectors = {1024128, 409600, 1024128, 1024128};
+        readonly ulong[] sectors =
+        {
+            1024128, 409600, 1024128, 1024128
+        };
 
-        readonly uint[] sectorsize = {512, 512, 512, 512};
+        readonly uint[] sectorsize =
+        {
+            512, 512, 512, 512
+        };
 
-        readonly long[] clusters = {127000, 407232, 511040, 511040};
+        readonly long[] clusters =
+        {
+            127000, 407232, 511040, 511040
+        };
 
-        readonly int[] clustersize = {2048, 512, 1024, 1024};
+        readonly int[] clustersize =
+        {
+            2048, 512, 1024, 1024
+        };
 
-        readonly string[] volumename = {null, null, null, null};
+        readonly string[] volumename =
+        {
+            null, null, null, null
+        };
 
-        readonly string[] volumeserial = {null, null, null, null};
+        readonly string[] volumeserial =
+        {
+            null, null, null, null
+        };
 
         [Test]
         public void Test()
@@ -165,27 +232,30 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new Vdi();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 IFilesystem     fs         = new SFS();
                 int             part       = -1;
+
                 for(int j = 0; j < partitions.Count; j++)
-                    if(partitions[j].Type == "\"SFS\\0\"" || partitions[j].Type == "\"SFS\\2\"")
+                    if(partitions[j].Type == "\"SFS\\0\"" ||
+                       partitions[j].Type == "\"SFS\\2\"")
                     {
                         part = j;
+
                         break;
                     }
 
                 Assert.AreNotEqual(-1, part, $"Partition not found on {testfiles[i]}");
                 Assert.AreEqual(true, fs.Identify(image, partitions[part]), testfiles[i]);
                 fs.GetInformation(image, partitions[part], out _, null);
-                Assert.AreEqual(clusters[i],       fs.XmlFsType.Clusters,     testfiles[i]);
-                Assert.AreEqual(clustersize[i],    fs.XmlFsType.ClusterSize,  testfiles[i]);
-                Assert.AreEqual("SmartFileSystem", fs.XmlFsType.Type,         testfiles[i]);
-                Assert.AreEqual(volumename[i],     fs.XmlFsType.VolumeName,   testfiles[i]);
-                Assert.AreEqual(volumeserial[i],   fs.XmlFsType.VolumeSerial, testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual("SmartFileSystem", fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
+                Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
             }
         }
     }
diff --git a/Aaru.Tests/Filesystems/SysV.cs b/Aaru.Tests/Filesystems/SysV.cs
index 7c8b4bb8a..83ffc96e7 100644
--- a/Aaru.Tests/Filesystems/SysV.cs
+++ b/Aaru.Tests/Filesystems/SysV.cs
@@ -43,9 +43,9 @@ namespace Aaru.Tests.Filesystems
         readonly string[] testfiles =
         {
             "amix.adf.lz", "att_unix_svr4v2.1_dsdd.img.lz", "att_unix_svr4v2.1_mf2dd.img.lz",
-            "att_unix_svr4v2.1_mf2hd.img.lz", "scoopenserver_5.0.7hw_dmf.img.lz",
-            "scoopenserver_5.0.7hw_dshd.img.lz", "scoopenserver_5.0.7hw_mf2dd.img.lz",
-            "scoopenserver_5.0.7hw_mf2ed.img.lz", "scoopenserver_5.0.7hw_mf2hd.img.lz"
+            "att_unix_svr4v2.1_mf2hd.img.lz", "scoopenserver_5.0.7hw_dmf.img.lz", "scoopenserver_5.0.7hw_dshd.img.lz",
+            "scoopenserver_5.0.7hw_mf2dd.img.lz", "scoopenserver_5.0.7hw_mf2ed.img.lz",
+            "scoopenserver_5.0.7hw_mf2hd.img.lz"
         };
 
         readonly MediaType[] mediatypes =
@@ -54,17 +54,35 @@ namespace Aaru.Tests.Filesystems
             MediaType.DMF, MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_ED, MediaType.DOS_35_HD
         };
 
-        readonly ulong[] sectors = {1760, 720, 1440, 2880, 3360, 2400, 1440, 5760, 2880};
+        readonly ulong[] sectors =
+        {
+            1760, 720, 1440, 2880, 3360, 2400, 1440, 5760, 2880
+        };
 
-        readonly uint[] sectorsize = {512, 512, 512, 512, 512, 512, 512, 512, 512};
+        readonly uint[] sectorsize =
+        {
+            512, 512, 512, 512, 512, 512, 512, 512, 512
+        };
 
-        readonly long[] clusters = {880, 360, 720, 1440, 1680, 1200, 720, 2880, 1440};
+        readonly long[] clusters =
+        {
+            880, 360, 720, 1440, 1680, 1200, 720, 2880, 1440
+        };
 
-        readonly int[] clustersize = {1024, 1024, 1024, 1024, 1024, 1024, 1024, 1024, 1024};
+        readonly int[] clustersize =
+        {
+            1024, 1024, 1024, 1024, 1024, 1024, 1024, 1024, 1024
+        };
 
-        readonly string[] volumename = {"", "", "", "", "", "", "", "", ""};
+        readonly string[] volumename =
+        {
+            "", "", "", "", "", "", "", "", ""
+        };
 
-        readonly string[] volumeserial = {null, null, null, null, null, null, null, null, null};
+        readonly string[] volumeserial =
+        {
+            null, null, null, null, null, null, null, null, null
+        };
 
         readonly string[] type =
         {
@@ -80,23 +98,24 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new ZZZRawImage();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(mediatypes[i], image.Info.MediaType,  testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(mediatypes[i], image.Info.MediaType, testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 IFilesystem fs = new SysVfs();
-                Partition wholePart = new Partition
+
+                var wholePart = new Partition
                 {
-                    Name   = "Whole device",
-                    Length = image.Info.Sectors,
-                    Size   = image.Info.Sectors * image.Info.SectorSize
+                    Name = "Whole device", Length = image.Info.Sectors,
+                    Size = image.Info.Sectors * image.Info.SectorSize
                 };
+
                 Assert.AreEqual(true, fs.Identify(image, wholePart), testfiles[i]);
                 fs.GetInformation(image, wholePart, out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,     testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,  testfiles[i]);
-                Assert.AreEqual(type[i],         fs.XmlFsType.Type,         testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,   testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual(type[i], fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
                 Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
             }
         }
@@ -110,19 +129,40 @@ namespace Aaru.Tests.Filesystems
             "att_unix_svr4v2.1.vdi.lz", "att_unix_svr4v2.1_2k.vdi.lz", "scoopenserver_5.0.7hw.vdi.lz"
         };
 
-        readonly ulong[] sectors = {1024000, 1024000, 2097152};
+        readonly ulong[] sectors =
+        {
+            1024000, 1024000, 2097152
+        };
 
-        readonly uint[] sectorsize = {512, 512, 512};
+        readonly uint[] sectorsize =
+        {
+            512, 512, 512
+        };
 
-        readonly long[] clusters = {511056, 255528, 1020096};
+        readonly long[] clusters =
+        {
+            511056, 255528, 1020096
+        };
 
-        readonly int[] clustersize = {1024, 2048, 1024};
+        readonly int[] clustersize =
+        {
+            1024, 2048, 1024
+        };
 
-        readonly string[] volumename = {"/usr3", "/usr3", "Volume label"};
+        readonly string[] volumename =
+        {
+            "/usr3", "/usr3", "Volume label"
+        };
 
-        readonly string[] volumeserial = {null, null, null};
+        readonly string[] volumeserial =
+        {
+            null, null, null
+        };
 
-        readonly string[] type = {"SVR4 fs", "SVR4 fs", "SVR4 fs"};
+        readonly string[] type =
+        {
+            "SVR4 fs", "SVR4 fs", "SVR4 fs"
+        };
 
         [Test]
         public void Test()
@@ -133,26 +173,29 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new Vdi();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 IFilesystem     fs         = new SysVfs();
                 int             part       = -1;
+
                 for(int j = 0; j < partitions.Count; j++)
-                    if(partitions[j].Type == "UNIX: /usr" || partitions[j].Type == "XENIX")
+                    if(partitions[j].Type == "UNIX: /usr" ||
+                       partitions[j].Type == "XENIX")
                     {
                         part = j;
+
                         break;
                     }
 
                 Assert.AreNotEqual(-1, part, $"Partition not found on {testfiles[i]}");
                 Assert.AreEqual(true, fs.Identify(image, partitions[part]), testfiles[i]);
                 fs.GetInformation(image, partitions[part], out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,     testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,  testfiles[i]);
-                Assert.AreEqual(type[i],         fs.XmlFsType.Type,         testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,   testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual(type[i], fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
                 Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
             }
         }
@@ -161,21 +204,45 @@ namespace Aaru.Tests.Filesystems
     [TestFixture]
     public class SysVRdb
     {
-        readonly string[] testfiles = {"amix.vdi.lz"};
+        readonly string[] testfiles =
+        {
+            "amix.vdi.lz"
+        };
 
-        readonly ulong[] sectors = {1024128};
+        readonly ulong[] sectors =
+        {
+            1024128
+        };
 
-        readonly uint[] sectorsize = {512};
+        readonly uint[] sectorsize =
+        {
+            512
+        };
 
-        readonly long[] clusters = {511424};
+        readonly long[] clusters =
+        {
+            511424
+        };
 
-        readonly int[] clustersize = {1024};
+        readonly int[] clustersize =
+        {
+            1024
+        };
 
-        readonly string[] volumename = {""};
+        readonly string[] volumename =
+        {
+            ""
+        };
 
-        readonly string[] volumeserial = {null};
+        readonly string[] volumeserial =
+        {
+            null
+        };
 
-        readonly string[] type = {"SVR4 fs"};
+        readonly string[] type =
+        {
+            "SVR4 fs"
+        };
 
         [Test]
         public void Test()
@@ -186,26 +253,28 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new Vdi();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 IFilesystem     fs         = new SysVfs();
                 int             part       = -1;
+
                 for(int j = 0; j < partitions.Count; j++)
                     if(partitions[j].Type == "\"UNI\\1\"")
                     {
                         part = j;
+
                         break;
                     }
 
                 Assert.AreNotEqual(-1, part, $"Partition not found on {testfiles[i]}");
                 Assert.AreEqual(true, fs.Identify(image, partitions[part]), testfiles[i]);
                 fs.GetInformation(image, partitions[part], out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,     testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,  testfiles[i]);
-                Assert.AreEqual(type[i],         fs.XmlFsType.Type,         testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,   testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual(type[i], fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
                 Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
             }
         }
diff --git a/Aaru.Tests/Filesystems/UDF.cs b/Aaru.Tests/Filesystems/UDF.cs
index 72f4e8894..f8e797091 100644
--- a/Aaru.Tests/Filesystems/UDF.cs
+++ b/Aaru.Tests/Filesystems/UDF.cs
@@ -81,8 +81,8 @@ namespace Aaru.Tests.Filesystems
         readonly string[] volumename =
         {
             "Volume label", "Volume label", "Volume label", "Volume label", "Volume label", "Volume label",
-            "Volume label", "Volume label", "Volume label", "Volume label", "Volume label", "*NoLabel*",
-            "*NoLabel*", "anonymous", "DicSetter", "DicSetter", "DicSetter", "DicSetter", "DicSetter", "DicSetter"
+            "Volume label", "Volume label", "Volume label", "Volume label", "Volume label", "*NoLabel*", "*NoLabel*",
+            "anonymous", "DicSetter", "DicSetter", "DicSetter", "DicSetter", "DicSetter", "DicSetter"
         };
 
         readonly string[] volumeserial =
@@ -91,8 +91,8 @@ namespace Aaru.Tests.Filesystems
             "4DD0458B (Mac OS X newfs_udf) UDF Volume Set", "595c5d07f4fc8e8dLinuxUDF",
             "5D91CB4F (Mac OS X newfs_udf) UDF Volume Set", "595c5d0bee60c3bbLinuxUDF",
             "48847EB3 (Mac OS X newfs_udf) UDF Volume Set", "595c5d0e4f338552LinuxUDF",
-            "709E84A1 (Mac OS X newfs_udf) UDF Volume Set", "78CE3237 (Mac OS X newfs_udf) UDF Volume Set",
-            "595EB2A9", "595EB55A", "7cc94d726669d773", "5cc7882441a86e93LinuxUDF", "5cc78f8bba4dfe00LinuxUDF",
+            "709E84A1 (Mac OS X newfs_udf) UDF Volume Set", "78CE3237 (Mac OS X newfs_udf) UDF Volume Set", "595EB2A9",
+            "595EB55A", "7cc94d726669d773", "5cc7882441a86e93LinuxUDF", "5cc78f8bba4dfe00LinuxUDF",
             "5cc7f4183e0d5f7aLinuxUDF", "5cc8816fcb3a3b38LinuxUDF", "595EB55A", "7cc94d726669d773"
         };
 
@@ -114,24 +114,25 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new Vdi();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 IFilesystem fs = new UDF();
-                Partition wholePart = new Partition
+
+                var wholePart = new Partition
                 {
-                    Name   = "Whole device",
-                    Length = image.Info.Sectors,
-                    Size   = image.Info.Sectors * image.Info.SectorSize
+                    Name = "Whole device", Length = image.Info.Sectors,
+                    Size = image.Info.Sectors * image.Info.SectorSize
                 };
+
                 Assert.AreEqual(true, fs.Identify(image, wholePart), testfiles[i]);
                 fs.GetInformation(image, wholePart, out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,            testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,         testfiles[i]);
-                Assert.AreEqual(udfversion[i],   fs.XmlFsType.Type,                testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,          testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual(udfversion[i], fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
                 Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSetIdentifier, testfiles[i]);
-                Assert.AreEqual(oemid[i],        fs.XmlFsType.SystemIdentifier,    testfiles[i]);
+                Assert.AreEqual(oemid[i], fs.XmlFsType.SystemIdentifier, testfiles[i]);
             }
         }
     }
@@ -144,25 +145,45 @@ namespace Aaru.Tests.Filesystems
             "1.50/ecs20.iso.lz", "2.00/ecs20.iso.lz", "2.01/ecs20.iso.lz", "2.01/ecs20_cdrw.iso.lz"
         };
 
-        readonly ulong[] sectors = {2295104, 2295104, 2295104, 295264};
+        readonly ulong[] sectors =
+        {
+            2295104, 2295104, 2295104, 295264
+        };
 
-        readonly uint[] sectorsize = {2048, 2048, 2048, 2048};
+        readonly uint[] sectorsize =
+        {
+            2048, 2048, 2048, 2048
+        };
 
-        readonly long[] clusters = {2295104, 2295104, 2295104, 295264};
+        readonly long[] clusters =
+        {
+            2295104, 2295104, 2295104, 295264
+        };
 
-        readonly int[] clustersize = {2048, 2048, 2048, 2048};
+        readonly int[] clustersize =
+        {
+            2048, 2048, 2048, 2048
+        };
 
-        readonly string[] udfversion = {"UDF v2.01", "UDF v2.01", "UDF v2.01", "UDF v2.01"};
+        readonly string[] udfversion =
+        {
+            "UDF v2.01", "UDF v2.01", "UDF v2.01", "UDF v2.01"
+        };
 
-        readonly string[] volumename = {"Volume label", "UDF5A5DEF48", "VolLabel", "UDF5A5DFF10"};
+        readonly string[] volumename =
+        {
+            "Volume label", "UDF5A5DEF48", "VolLabel", "UDF5A5DFF10"
+        };
 
         readonly string[] volumeserial =
         {
-            "Volume Set ID not specified", "Volume Set ID not specified", "VolumeSetId",
-            "Volume Set ID not specified"
+            "Volume Set ID not specified", "Volume Set ID not specified", "VolumeSetId", "Volume Set ID not specified"
         };
 
-        readonly string[] oemid = {"*ExpressUDF", "*ExpressUDF", "*ExpressUDF", "*ExpressUDF"};
+        readonly string[] oemid =
+        {
+            "*ExpressUDF", "*ExpressUDF", "*ExpressUDF", "*ExpressUDF"
+        };
 
         [Test]
         public void Test()
@@ -173,24 +194,25 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new ZZZRawImage();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 IFilesystem fs = new UDF();
-                Partition wholePart = new Partition
+
+                var wholePart = new Partition
                 {
-                    Name   = "Whole device",
-                    Length = image.Info.Sectors,
-                    Size   = image.Info.Sectors * image.Info.SectorSize
+                    Name = "Whole device", Length = image.Info.Sectors,
+                    Size = image.Info.Sectors * image.Info.SectorSize
                 };
+
                 Assert.AreEqual(true, fs.Identify(image, wholePart), testfiles[i]);
                 fs.GetInformation(image, wholePart, out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,            testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,         testfiles[i]);
-                Assert.AreEqual(udfversion[i],   fs.XmlFsType.Type,                testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,          testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual(udfversion[i], fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
                 Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSetIdentifier, testfiles[i]);
-                Assert.AreEqual(oemid[i],        fs.XmlFsType.SystemIdentifier,    testfiles[i]);
+                Assert.AreEqual(oemid[i], fs.XmlFsType.SystemIdentifier, testfiles[i]);
             }
         }
     }
diff --git a/Aaru.Tests/Filesystems/UFS.cs b/Aaru.Tests/Filesystems/UFS.cs
index 7816f0b78..596fb3ca2 100644
--- a/Aaru.Tests/Filesystems/UFS.cs
+++ b/Aaru.Tests/Filesystems/UFS.cs
@@ -53,19 +53,40 @@ namespace Aaru.Tests.Filesystems
             MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_HD, MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_HD
         };
 
-        readonly ulong[] sectors = {1760, 2880, 720, 2400, 1440, 2880, 1440, 2880};
+        readonly ulong[] sectors =
+        {
+            1760, 2880, 720, 2400, 1440, 2880, 1440, 2880
+        };
 
-        readonly uint[] sectorsize = {512, 512, 512, 512, 512, 512, 512, 512};
+        readonly uint[] sectorsize =
+        {
+            512, 512, 512, 512, 512, 512, 512, 512
+        };
 
-        readonly long[] clusters = {880, 2880, 360, 1200, 720, 1440, 711, 1422};
+        readonly long[] clusters =
+        {
+            880, 2880, 360, 1200, 720, 1440, 711, 1422
+        };
 
-        readonly int[] clustersize = {1024, 512, 1024, 1024, 1024, 1024, 1024, 1024};
+        readonly int[] clustersize =
+        {
+            1024, 512, 1024, 1024, 1024, 1024, 1024, 1024
+        };
 
-        readonly string[] volumename = {null, null, null, null, null, null, null, null};
+        readonly string[] volumename =
+        {
+            null, null, null, null, null, null, null, null
+        };
 
-        readonly string[] volumeserial = {null, null, null, null, null, null, null, null};
+        readonly string[] volumeserial =
+        {
+            null, null, null, null, null, null, null, null
+        };
 
-        readonly string[] type = {"UFS", "UFS", "UFS", "UFS", "UFS", "UFS", "UFS", "UFS"};
+        readonly string[] type =
+        {
+            "UFS", "UFS", "UFS", "UFS", "UFS", "UFS", "UFS", "UFS"
+        };
 
         [Test]
         public void Test()
@@ -76,23 +97,24 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new ZZZRawImage();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(mediatypes[i], image.Info.MediaType,  testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(mediatypes[i], image.Info.MediaType, testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 IFilesystem fs = new FFSPlugin();
-                Partition wholePart = new Partition
+
+                var wholePart = new Partition
                 {
-                    Name   = "Whole device",
-                    Length = image.Info.Sectors,
-                    Size   = image.Info.Sectors * image.Info.SectorSize
+                    Name = "Whole device", Length = image.Info.Sectors,
+                    Size = image.Info.Sectors * image.Info.SectorSize
                 };
+
                 Assert.AreEqual(true, fs.Identify(image, wholePart), testfiles[i]);
                 fs.GetInformation(image, wholePart, out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,     testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,  testfiles[i]);
-                Assert.AreEqual(type[i],         fs.XmlFsType.Type,         testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,   testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual(type[i], fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
                 Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
             }
         }
@@ -114,20 +136,35 @@ namespace Aaru.Tests.Filesystems
             1024000, 1024000, 1024000, 1024000, 204800, 204800, 204800, 204800, 2097152, 2097152, 2097152
         };
 
-        readonly uint[] sectorsize = {512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512};
+        readonly uint[] sectorsize =
+        {
+            512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512
+        };
 
         readonly long[] clusters =
         {
             511488, 511488, 511488, 511488, 102368, 102368, 102368, 102368, 1047660, 1038952, 1038952
         };
 
-        readonly int[] clustersize = {1024, 1024, 1024, 1024, 1024, 1024, 1024, 1024, 1024, 1024, 1024};
+        readonly int[] clustersize =
+        {
+            1024, 1024, 1024, 1024, 1024, 1024, 1024, 1024, 1024, 1024, 1024
+        };
 
-        readonly string[] volumename = {null, null, null, null, null, null, null, null, null, null, null};
+        readonly string[] volumename =
+        {
+            null, null, null, null, null, null, null, null, null, null, null
+        };
 
-        readonly string[] volumeserial = {null, null, null, null, null, null, null, null, null, null, null};
+        readonly string[] volumeserial =
+        {
+            null, null, null, null, null, null, null, null, null, null, null
+        };
 
-        readonly string[] type = {"UFS", "UFS", "UFS", "UFS", "UFS", "UFS", "UFS", "UFS", "UFS", "UFS", "UFS"};
+        readonly string[] type =
+        {
+            "UFS", "UFS", "UFS", "UFS", "UFS", "UFS", "UFS", "UFS", "UFS", "UFS", "UFS"
+        };
 
         [Test]
         public void Test()
@@ -138,26 +175,28 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new Vdi();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 IFilesystem     fs         = new FFSPlugin();
                 int             part       = -1;
+
                 for(int j = 0; j < partitions.Count; j++)
                     if(partitions[j].Type == "Apple_UFS")
                     {
                         part = j;
+
                         break;
                     }
 
                 Assert.AreNotEqual(-1, part, $"Partition not found on {testfiles[i]}");
                 Assert.AreEqual(true, fs.Identify(image, partitions[part]), testfiles[i]);
                 fs.GetInformation(image, partitions[part], out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,     testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,  testfiles[i]);
-                Assert.AreEqual(type[i],         fs.XmlFsType.Type,         testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,   testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual(type[i], fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
                 Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
             }
         }
@@ -174,9 +213,9 @@ namespace Aaru.Tests.Filesystems
             "ffs43/netbsd_7.1.vdi.lz", "ufs1/darwin_1.3.1.vdi.lz", "ufs1/darwin_1.4.1.vdi.lz",
             "ufs1/darwin_6.0.2.vdi.lz", "ufs1/darwin_8.0.1.vdi.lz", "ufs1/dflybsd_1.2.0.vdi.lz",
             "ufs1/dflybsd_3.6.1.vdi.lz", "ufs1/dflybsd_4.0.5.vdi.lz", "ufs1/freebsd_6.1.vdi.lz",
-            "ufs1/freebsd_7.0.vdi.lz", "ufs1/freebsd_8.2.vdi.lz", "ufs1/netbsd_1.6.vdi.lz",
-            "ufs1/netbsd_7.1.vdi.lz", "ufs1/solaris_7.vdi.lz", "ufs1/solaris_9.vdi.lz", "ufs2/freebsd_6.1.vdi.lz",
-            "ufs2/freebsd_7.0.vdi.lz", "ufs2/freebsd_8.2.vdi.lz", "ufs2/netbsd_7.1.vdi.lz"
+            "ufs1/freebsd_7.0.vdi.lz", "ufs1/freebsd_8.2.vdi.lz", "ufs1/netbsd_1.6.vdi.lz", "ufs1/netbsd_7.1.vdi.lz",
+            "ufs1/solaris_7.vdi.lz", "ufs1/solaris_9.vdi.lz", "ufs2/freebsd_6.1.vdi.lz", "ufs2/freebsd_7.0.vdi.lz",
+            "ufs2/freebsd_8.2.vdi.lz", "ufs2/netbsd_7.1.vdi.lz"
         };
 
         readonly ulong[] sectors =
@@ -201,8 +240,8 @@ namespace Aaru.Tests.Filesystems
 
         readonly int[] clustersize =
         {
-            2048, 2048, 1024, 1024, 1024, 1024, 1024, 2048, 2048, 1024, 1024, 1024, 1024, 1024, 1024, 1024, 2048,
-            2048, 4096, 4096, 2048, 2048, 1024, 1024, 1024, 4096, 4096, 2048, 2048
+            2048, 2048, 1024, 1024, 1024, 1024, 1024, 2048, 2048, 1024, 1024, 1024, 1024, 1024, 1024, 1024, 2048, 2048,
+            4096, 4096, 2048, 2048, 1024, 1024, 1024, 4096, 4096, 2048, 2048
         };
 
         readonly string[] volumename =
@@ -213,15 +252,14 @@ namespace Aaru.Tests.Filesystems
 
         readonly string[] volumeserial =
         {
-            null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
-            null, null, null, null, null, null, null, null, null, null, null, null
+            null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
+            null, null, null, null, null, null, null, null, null, null, null
         };
 
         readonly string[] type =
         {
-            "UFS", "UFS2", "UFS", "UFS", "UFS", "UFS", "UFS", "UFS", "UFS", "UFS", "UFS", "UFS", "UFS", "UFS",
-            "UFS", "UFS", "UFS", "UFS", "UFS", "UFS", "UFS", "UFS", "UFS", "UFS", "UFS", "UFS2", "UFS2", "UFS2",
-            "UFS2"
+            "UFS", "UFS2", "UFS", "UFS", "UFS", "UFS", "UFS", "UFS", "UFS", "UFS", "UFS", "UFS", "UFS", "UFS", "UFS",
+            "UFS", "UFS", "UFS", "UFS", "UFS", "UFS", "UFS", "UFS", "UFS", "UFS", "UFS2", "UFS2", "UFS2", "UFS2"
         };
 
         [Test]
@@ -233,30 +271,35 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new Vdi();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 IFilesystem     fs         = new FFSPlugin();
                 int             part       = -1;
+
                 for(int j = 0; j < partitions.Count; j++)
-                    if(partitions[j].Type == "0x63"                    || partitions[j].Type == "0xA8" ||
+                    if(partitions[j].Type == "0x63"                    ||
+                       partitions[j].Type == "0xA8"                    ||
                        partitions[j].Type == "0xA5"                    ||
-                       partitions[j].Type == "0xA9"                    || partitions[j].Type == "0x82" ||
+                       partitions[j].Type == "0xA9"                    ||
+                       partitions[j].Type == "0x82"                    ||
                        partitions[j].Type == "0x83"                    ||
-                       partitions[j].Type == "4.2BSD Fast File System" || partitions[j].Type == "Sun boot")
+                       partitions[j].Type == "4.2BSD Fast File System" ||
+                       partitions[j].Type == "Sun boot")
                     {
                         part = j;
+
                         break;
                     }
 
                 Assert.AreNotEqual(-1, part, $"Partition not found on {testfiles[i]}");
                 Assert.AreEqual(true, fs.Identify(image, partitions[part]), testfiles[i]);
                 fs.GetInformation(image, partitions[part], out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,     testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,  testfiles[i]);
-                Assert.AreEqual(type[i],         fs.XmlFsType.Type,         testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,   testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual(type[i], fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
                 Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
             }
         }
@@ -271,19 +314,40 @@ namespace Aaru.Tests.Filesystems
             "rhapsody_dr2.vdi.lz"
         };
 
-        readonly ulong[] sectors = {409600, 409600, 409600, 409600, 409600};
+        readonly ulong[] sectors =
+        {
+            409600, 409600, 409600, 409600, 409600
+        };
 
-        readonly uint[] sectorsize = {512, 512, 512, 512, 512};
+        readonly uint[] sectorsize =
+        {
+            512, 512, 512, 512, 512
+        };
 
-        readonly long[] clusters = {204640, 204640, 204640, 204640, 204464};
+        readonly long[] clusters =
+        {
+            204640, 204640, 204640, 204640, 204464
+        };
 
-        readonly int[] clustersize = {1024, 1024, 1024, 1024, 1024};
+        readonly int[] clustersize =
+        {
+            1024, 1024, 1024, 1024, 1024
+        };
 
-        readonly string[] volumename = {null, null, null, null, null};
+        readonly string[] volumename =
+        {
+            null, null, null, null, null
+        };
 
-        readonly string[] volumeserial = {null, null, null, null, null};
+        readonly string[] volumeserial =
+        {
+            null, null, null, null, null
+        };
 
-        readonly string[] type = {"UFS", "UFS", "UFS", "UFS", "UFS"};
+        readonly string[] type =
+        {
+            "UFS", "UFS", "UFS", "UFS", "UFS"
+        };
 
         [Test]
         public void Test()
@@ -294,26 +358,29 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new Vdi();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 IFilesystem     fs         = new FFSPlugin();
                 int             part       = -1;
+
                 for(int j = 0; j < partitions.Count; j++)
-                    if(partitions[j].Type == "4.3BSD" || partitions[j].Type == "4.4BSD")
+                    if(partitions[j].Type == "4.3BSD" ||
+                       partitions[j].Type == "4.4BSD")
                     {
                         part = j;
+
                         break;
                     }
 
                 Assert.AreNotEqual(-1, part, $"Partition not found on {testfiles[i]}");
                 Assert.AreEqual(true, fs.Identify(image, partitions[part]), testfiles[i]);
                 fs.GetInformation(image, partitions[part], out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,     testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,  testfiles[i]);
-                Assert.AreEqual(type[i],         fs.XmlFsType.Type,         testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,   testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual(type[i], fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
                 Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
             }
         }
@@ -330,19 +397,40 @@ namespace Aaru.Tests.Filesystems
             "rhapsody_dr2_mf2hd.img.lz"
         };
 
-        readonly ulong[] sectors = {1440, 2880, 1440, 2880, 1440, 2880, 1440, 2880, 1440, 2880};
+        readonly ulong[] sectors =
+        {
+            1440, 2880, 1440, 2880, 1440, 2880, 1440, 2880, 1440, 2880
+        };
 
-        readonly uint[] sectorsize = {512, 512, 512, 512, 512, 512, 512, 512, 512, 512};
+        readonly uint[] sectorsize =
+        {
+            512, 512, 512, 512, 512, 512, 512, 512, 512, 512
+        };
 
-        readonly long[] clusters = {624, 1344, 624, 1344, 624, 1344, 624, 1344, 624, 1344};
+        readonly long[] clusters =
+        {
+            624, 1344, 624, 1344, 624, 1344, 624, 1344, 624, 1344
+        };
 
-        readonly int[] clustersize = {1024, 1024, 1024, 1024, 1024, 1024, 1024, 1024, 1024, 1024};
+        readonly int[] clustersize =
+        {
+            1024, 1024, 1024, 1024, 1024, 1024, 1024, 1024, 1024, 1024
+        };
 
-        readonly string[] volumename = {null, null, null, null, null, null, null, null, null, null};
+        readonly string[] volumename =
+        {
+            null, null, null, null, null, null, null, null, null, null
+        };
 
-        readonly string[] volumeserial = {null, null, null, null, null, null, null, null, null, null};
+        readonly string[] volumeserial =
+        {
+            null, null, null, null, null, null, null, null, null, null
+        };
 
-        readonly string[] type = {"UFS", "UFS", "UFS", "UFS", "UFS", "UFS", "UFS", "UFS", "UFS", "UFS"};
+        readonly string[] type =
+        {
+            "UFS", "UFS", "UFS", "UFS", "UFS", "UFS", "UFS", "UFS", "UFS", "UFS"
+        };
 
         [Test]
         public void Test()
@@ -353,26 +441,29 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new ZZZRawImage();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 IFilesystem     fs         = new FFSPlugin();
                 int             part       = -1;
+
                 for(int j = 0; j < partitions.Count; j++)
-                    if(partitions[j].Type == "4.3BSD" || partitions[j].Type == "4.4BSD")
+                    if(partitions[j].Type == "4.3BSD" ||
+                       partitions[j].Type == "4.4BSD")
                     {
                         part = j;
+
                         break;
                     }
 
                 Assert.AreNotEqual(-1, part, $"Partition not found on {testfiles[i]}");
                 Assert.AreEqual(true, fs.Identify(image, partitions[part]), testfiles[i]);
                 fs.GetInformation(image, partitions[part], out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,     testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,  testfiles[i]);
-                Assert.AreEqual(type[i],         fs.XmlFsType.Type,         testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,   testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual(type[i], fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
                 Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
             }
         }
@@ -381,21 +472,45 @@ namespace Aaru.Tests.Filesystems
     [TestFixture]
     public class UfsRdb
     {
-        readonly string[] testfiles = {"amix.vdi.lz"};
+        readonly string[] testfiles =
+        {
+            "amix.vdi.lz"
+        };
 
-        readonly ulong[] sectors = {1024128};
+        readonly ulong[] sectors =
+        {
+            1024128
+        };
 
-        readonly uint[] sectorsize = {512};
+        readonly uint[] sectorsize =
+        {
+            512
+        };
 
-        readonly long[] clusters = {511424};
+        readonly long[] clusters =
+        {
+            511424
+        };
 
-        readonly int[] clustersize = {1024};
+        readonly int[] clustersize =
+        {
+            1024
+        };
 
-        readonly string[] volumename = {null};
+        readonly string[] volumename =
+        {
+            null
+        };
 
-        readonly string[] volumeserial = {null};
+        readonly string[] volumeserial =
+        {
+            null
+        };
 
-        readonly string[] type = {"UFS"};
+        readonly string[] type =
+        {
+            "UFS"
+        };
 
         [Test]
         public void Test()
@@ -406,26 +521,28 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new Vdi();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 IFilesystem     fs         = new FFSPlugin();
                 int             part       = -1;
+
                 for(int j = 0; j < partitions.Count; j++)
                     if(partitions[j].Type == "\"UNI\\2\"")
                     {
                         part = j;
+
                         break;
                     }
 
                 Assert.AreNotEqual(-1, part, $"Partition not found on {testfiles[i]}");
                 Assert.AreEqual(true, fs.Identify(image, partitions[part]), testfiles[i]);
                 fs.GetInformation(image, partitions[part], out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,     testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,  testfiles[i]);
-                Assert.AreEqual(type[i],         fs.XmlFsType.Type,         testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,   testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual(type[i], fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
                 Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
             }
         }
@@ -434,21 +551,45 @@ namespace Aaru.Tests.Filesystems
     [TestFixture]
     public class UfsSuni86
     {
-        readonly string[] testfiles = {"solaris_7.vdi.lz"};
+        readonly string[] testfiles =
+        {
+            "solaris_7.vdi.lz"
+        };
 
-        readonly ulong[] sectors = {4194304};
+        readonly ulong[] sectors =
+        {
+            4194304
+        };
 
-        readonly uint[] sectorsize = {512};
+        readonly uint[] sectorsize =
+        {
+            512
+        };
 
-        readonly long[] clusters = {2063376};
+        readonly long[] clusters =
+        {
+            2063376
+        };
 
-        readonly int[] clustersize = {1024};
+        readonly int[] clustersize =
+        {
+            1024
+        };
 
-        readonly string[] volumename = {null};
+        readonly string[] volumename =
+        {
+            null
+        };
 
-        readonly string[] volumeserial = {null};
+        readonly string[] volumeserial =
+        {
+            null
+        };
 
-        readonly string[] type = {"UFS"};
+        readonly string[] type =
+        {
+            "UFS"
+        };
 
         [Test]
         public void Test()
@@ -459,26 +600,28 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new Vdi();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 IFilesystem     fs         = new FFSPlugin();
                 int             part       = -1;
+
                 for(int j = 0; j < partitions.Count; j++)
                     if(partitions[j].Type == "Replacement sectors")
                     {
                         part = j;
+
                         break;
                     }
 
                 Assert.AreNotEqual(-1, part, $"Partition not found on {testfiles[i]}");
                 Assert.AreEqual(true, fs.Identify(image, partitions[part]), testfiles[i]);
                 fs.GetInformation(image, partitions[part], out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,     testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,  testfiles[i]);
-                Assert.AreEqual(type[i],         fs.XmlFsType.Type,         testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,   testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual(type[i], fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
                 Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
             }
         }
diff --git a/Aaru.Tests/Filesystems/UNIXBFS.cs b/Aaru.Tests/Filesystems/UNIXBFS.cs
index 84ecf5d63..0f48defba 100644
--- a/Aaru.Tests/Filesystems/UNIXBFS.cs
+++ b/Aaru.Tests/Filesystems/UNIXBFS.cs
@@ -52,15 +52,30 @@ namespace Aaru.Tests.Filesystems
             MediaType.DOS_35_HD
         };
 
-        readonly ulong[] sectors = {1760, 720, 2400, 1440, 2880};
+        readonly ulong[] sectors =
+        {
+            1760, 720, 2400, 1440, 2880
+        };
 
-        readonly uint[] sectorsize = {512, 512, 512, 512, 512};
+        readonly uint[] sectorsize =
+        {
+            512, 512, 512, 512, 512
+        };
 
-        readonly long[] clusters = {1760, 720, 2400, 1440, 2880};
+        readonly long[] clusters =
+        {
+            1760, 720, 2400, 1440, 2880
+        };
 
-        readonly int[] clustersize = {512, 512, 512, 512, 512};
+        readonly int[] clustersize =
+        {
+            512, 512, 512, 512, 512
+        };
 
-        readonly string[] volumename = {"Label", null, null, null, null};
+        readonly string[] volumename =
+        {
+            "Label", null, null, null, null
+        };
 
         [Test]
         public void Test()
@@ -71,23 +86,24 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new ZZZRawImage();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(mediatypes[i], image.Info.MediaType,  testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(mediatypes[i], image.Info.MediaType, testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 IFilesystem fs = new BFS();
-                Partition wholePart = new Partition
+
+                var wholePart = new Partition
                 {
-                    Name   = "Whole device",
-                    Length = image.Info.Sectors,
-                    Size   = image.Info.Sectors * image.Info.SectorSize
+                    Name = "Whole device", Length = image.Info.Sectors,
+                    Size = image.Info.Sectors * image.Info.SectorSize
                 };
+
                 Assert.AreEqual(true, fs.Identify(image, wholePart), testfiles[i]);
                 fs.GetInformation(image, wholePart, out _, null);
-                Assert.AreEqual(clusters[i],    fs.XmlFsType.Clusters,    testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
                 Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
-                Assert.AreEqual("BFS",          fs.XmlFsType.Type,        testfiles[i]);
-                Assert.AreEqual(volumename[i],  fs.XmlFsType.VolumeName,  testfiles[i]);
+                Assert.AreEqual("BFS", fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
             }
         }
     }
@@ -95,17 +111,35 @@ namespace Aaru.Tests.Filesystems
     [TestFixture]
     public class UnixbfsMbr
     {
-        readonly string[] testfiles = {"linux.vdi.lz"};
+        readonly string[] testfiles =
+        {
+            "linux.vdi.lz"
+        };
 
-        readonly ulong[] sectors = {262144};
+        readonly ulong[] sectors =
+        {
+            262144
+        };
 
-        readonly uint[] sectorsize = {512};
+        readonly uint[] sectorsize =
+        {
+            512
+        };
 
-        readonly long[] clusters = {260096};
+        readonly long[] clusters =
+        {
+            260096
+        };
 
-        readonly int[] clustersize = {512};
+        readonly int[] clustersize =
+        {
+            512
+        };
 
-        readonly string[] volumename = {"Label"};
+        readonly string[] volumename =
+        {
+            "Label"
+        };
 
         [Test]
         public void Test()
@@ -116,26 +150,28 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new Vdi();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 IFilesystem     fs         = new BFS();
                 int             part       = -1;
+
                 for(int j = 0; j < partitions.Count; j++)
                     if(partitions[j].Type == "0x83")
                     {
                         part = j;
+
                         break;
                     }
 
                 Assert.AreNotEqual(-1, part, $"Partition not found on {testfiles[i]}");
                 Assert.AreEqual(true, fs.Identify(image, partitions[part]), testfiles[i]);
                 fs.GetInformation(image, partitions[part], out _, null);
-                Assert.AreEqual(clusters[i],    fs.XmlFsType.Clusters,    testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
                 Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
-                Assert.AreEqual("BFS",          fs.XmlFsType.Type,        testfiles[i]);
-                Assert.AreEqual(volumename[i],  fs.XmlFsType.VolumeName,  testfiles[i]);
+                Assert.AreEqual("BFS", fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
             }
         }
     }
@@ -143,21 +179,45 @@ namespace Aaru.Tests.Filesystems
     [TestFixture]
     public class UnixbfsRdb
     {
-        readonly string[] testfiles = {"amix.vdi.lz"};
+        readonly string[] testfiles =
+        {
+            "amix.vdi.lz"
+        };
 
-        readonly ulong[] sectors = {1024128};
+        readonly ulong[] sectors =
+        {
+            1024128
+        };
 
-        readonly uint[] sectorsize = {512};
+        readonly uint[] sectorsize =
+        {
+            512
+        };
 
-        readonly long[] clusters = {65024};
+        readonly long[] clusters =
+        {
+            65024
+        };
 
-        readonly int[] clustersize = {2048};
+        readonly int[] clustersize =
+        {
+            2048
+        };
 
-        readonly string[] volumename = {null};
+        readonly string[] volumename =
+        {
+            null
+        };
 
-        readonly string[] volumeserial = {"UNKNOWN"};
+        readonly string[] volumeserial =
+        {
+            "UNKNOWN"
+        };
 
-        readonly string[] type = {"UFS"};
+        readonly string[] type =
+        {
+            "UFS"
+        };
 
         [Test]
         public void Test()
@@ -168,26 +228,28 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new Vdi();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 IFilesystem     fs         = new BFS();
                 int             part       = -1;
+
                 for(int j = 0; j < partitions.Count; j++)
                     if(partitions[j].Type == "\"UNI\\0\"")
                     {
                         part = j;
+
                         break;
                     }
 
                 Assert.AreNotEqual(-1, part, $"Partition not found on {testfiles[i]}");
                 Assert.AreEqual(true, fs.Identify(image, partitions[part]), testfiles[i]);
                 fs.GetInformation(image, partitions[part], out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,     testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,  testfiles[i]);
-                Assert.AreEqual(type[i],         fs.XmlFsType.Type,         testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,   testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual(type[i], fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
                 Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
             }
         }
diff --git a/Aaru.Tests/Filesystems/XENIX.cs b/Aaru.Tests/Filesystems/XENIX.cs
index 7b28d2396..faab3d71c 100644
--- a/Aaru.Tests/Filesystems/XENIX.cs
+++ b/Aaru.Tests/Filesystems/XENIX.cs
@@ -52,19 +52,40 @@ namespace Aaru.Tests.Filesystems
             MediaType.DMF, MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_ED, MediaType.DOS_35_HD
         };
 
-        readonly ulong[] sectors = {3360, 2400, 1440, 5760, 2880};
+        readonly ulong[] sectors =
+        {
+            3360, 2400, 1440, 5760, 2880
+        };
 
-        readonly uint[] sectorsize = {512, 512, 512, 512, 512};
+        readonly uint[] sectorsize =
+        {
+            512, 512, 512, 512, 512
+        };
 
-        readonly long[] clusters = {0, 0, 0, 0, 0, 1680, 1200, 720, 2880, 1440};
+        readonly long[] clusters =
+        {
+            0, 0, 0, 0, 0, 1680, 1200, 720, 2880, 1440
+        };
 
-        readonly int[] clustersize = {1024, 1024, 1024, 1024, 1024};
+        readonly int[] clustersize =
+        {
+            1024, 1024, 1024, 1024, 1024
+        };
 
-        readonly string[] volumename = {"", "", "", "", ""};
+        readonly string[] volumename =
+        {
+            "", "", "", "", ""
+        };
 
-        readonly string[] volumeserial = {null, null, null, null, null};
+        readonly string[] volumeserial =
+        {
+            null, null, null, null, null
+        };
 
-        readonly string[] type = {"XENIX fs", "XENIX fs", "XENIX fs", "XENIX fs", "XENIX fs"};
+        readonly string[] type =
+        {
+            "XENIX fs", "XENIX fs", "XENIX fs", "XENIX fs", "XENIX fs"
+        };
 
         [Test]
         public void Test()
@@ -75,23 +96,24 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new ZZZRawImage();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(mediatypes[i], image.Info.MediaType,  testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(mediatypes[i], image.Info.MediaType, testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 IFilesystem fs = new SysVfs();
-                Partition wholePart = new Partition
+
+                var wholePart = new Partition
                 {
-                    Name   = "Whole device",
-                    Length = image.Info.Sectors,
-                    Size   = image.Info.Sectors * image.Info.SectorSize
+                    Name = "Whole device", Length = image.Info.Sectors,
+                    Size = image.Info.Sectors * image.Info.SectorSize
                 };
+
                 Assert.AreEqual(true, fs.Identify(image, wholePart), testfiles[i]);
                 fs.GetInformation(image, wholePart, out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,     testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,  testfiles[i]);
-                Assert.AreEqual(type[i],         fs.XmlFsType.Type,         testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,   testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual(type[i], fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
                 Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
             }
         }
@@ -100,21 +122,45 @@ namespace Aaru.Tests.Filesystems
     [TestFixture]
     public class XenixMbr
     {
-        readonly string[] testfiles = {"xenix_2.3.2d.vdi.lz", "xenix_2.3.4h.vdi.lz", "scoopenserver_5.0.7hw.vdi.lz"};
+        readonly string[] testfiles =
+        {
+            "xenix_2.3.2d.vdi.lz", "xenix_2.3.4h.vdi.lz", "scoopenserver_5.0.7hw.vdi.lz"
+        };
 
-        readonly ulong[] sectors = {40960, 40960, 2097152};
+        readonly ulong[] sectors =
+        {
+            40960, 40960, 2097152
+        };
 
-        readonly uint[] sectorsize = {512, 512, 512};
+        readonly uint[] sectorsize =
+        {
+            512, 512, 512
+        };
 
-        readonly long[] clusters = {0, 0, 0, 19624, 19624, 19624};
+        readonly long[] clusters =
+        {
+            0, 0, 0, 19624, 19624, 19624
+        };
 
-        readonly int[] clustersize = {1024, 1024, 1024};
+        readonly int[] clustersize =
+        {
+            1024, 1024, 1024
+        };
 
-        readonly string[] volumename = {"", "", ""};
+        readonly string[] volumename =
+        {
+            "", "", ""
+        };
 
-        readonly string[] volumeserial = {null, null, null};
+        readonly string[] volumeserial =
+        {
+            null, null, null
+        };
 
-        readonly string[] type = {"XENIX fs", "XENIX fs", "XENIX fs"};
+        readonly string[] type =
+        {
+            "XENIX fs", "XENIX fs", "XENIX fs"
+        };
 
         [Test]
         public void Test()
@@ -125,26 +171,28 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new Vdi();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 IFilesystem     fs         = new SysVfs();
                 int             part       = -1;
+
                 for(int j = 0; j < partitions.Count; j++)
                     if(partitions[j].Type == "XENIX")
                     {
                         part = j;
+
                         break;
                     }
 
                 Assert.AreNotEqual(-1, part, $"Partition not found on {testfiles[i]}");
                 Assert.AreEqual(true, fs.Identify(image, partitions[part]), testfiles[i]);
                 fs.GetInformation(image, partitions[part], out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,     testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,  testfiles[i]);
-                Assert.AreEqual(type[i],         fs.XmlFsType.Type,         testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,   testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual(type[i], fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
                 Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
             }
         }
diff --git a/Aaru.Tests/Filesystems/XFS.cs b/Aaru.Tests/Filesystems/XFS.cs
index 76aee49a9..d1bb869e5 100644
--- a/Aaru.Tests/Filesystems/XFS.cs
+++ b/Aaru.Tests/Filesystems/XFS.cs
@@ -40,17 +40,35 @@ namespace Aaru.Tests.Filesystems
     [TestFixture]
     public class XfsMbr
     {
-        readonly string[] testfiles = {"linux.vdi.lz", "linux_4.19_xfs_flashdrive.vdi.lz"};
+        readonly string[] testfiles =
+        {
+            "linux.vdi.lz", "linux_4.19_xfs_flashdrive.vdi.lz"
+        };
 
-        readonly ulong[] sectors = {1048576, 1024000};
+        readonly ulong[] sectors =
+        {
+            1048576, 1024000
+        };
 
-        readonly uint[] sectorsize = {512, 512};
+        readonly uint[] sectorsize =
+        {
+            512, 512
+        };
 
-        readonly long[] clusters = {130816, 127744};
+        readonly long[] clusters =
+        {
+            130816, 127744
+        };
 
-        readonly int[] clustersize = {4096, 4096};
+        readonly int[] clustersize =
+        {
+            4096, 4096
+        };
 
-        readonly string[] volumename = {"Volume label", "DicSetter"};
+        readonly string[] volumename =
+        {
+            "Volume label", "DicSetter"
+        };
 
         readonly string[] volumeserial =
         {
@@ -66,27 +84,29 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new Vdi();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 IFilesystem     fs         = new XFS();
                 int             part       = -1;
+
                 for(int j = 0; j < partitions.Count; j++)
                     if(partitions[j].Type == "0x83")
                     {
                         part = j;
+
                         break;
                     }
 
                 Assert.AreNotEqual(-1, part, $"Partition not found on {testfiles[i]}");
                 Assert.AreEqual(true, fs.Identify(image, partitions[part]), testfiles[i]);
                 fs.GetInformation(image, partitions[part], out _, null);
-                Assert.AreEqual(clusters[i],      fs.XmlFsType.Clusters,     testfiles[i]);
-                Assert.AreEqual(clustersize[i],   fs.XmlFsType.ClusterSize,  testfiles[i]);
-                Assert.AreEqual("XFS filesystem", fs.XmlFsType.Type,         testfiles[i]);
-                Assert.AreEqual(volumename[i],    fs.XmlFsType.VolumeName,   testfiles[i]);
-                Assert.AreEqual(volumeserial[i],  fs.XmlFsType.VolumeSerial, testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual("XFS filesystem", fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
+                Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
             }
         }
     }
diff --git a/Aaru.Tests/Filesystems/Xia.cs b/Aaru.Tests/Filesystems/Xia.cs
index fc28ff27b..ccdb5f05d 100644
--- a/Aaru.Tests/Filesystems/Xia.cs
+++ b/Aaru.Tests/Filesystems/Xia.cs
@@ -40,19 +40,40 @@ namespace Aaru.Tests.Filesystems
     [TestFixture]
     public class XiaMbr
     {
-        readonly string[] testfiles = {"linux.vdi.lz", "linux-files.vdi.lz"};
+        readonly string[] testfiles =
+        {
+            "linux.vdi.lz", "linux-files.vdi.lz"
+        };
 
-        readonly ulong[] sectors = {1024000, 2048000};
+        readonly ulong[] sectors =
+        {
+            1024000, 2048000
+        };
 
-        readonly uint[] sectorsize = {512, 512};
+        readonly uint[] sectorsize =
+        {
+            512, 512
+        };
 
-        readonly long[] clusters = {511528, 1023088};
+        readonly long[] clusters =
+        {
+            511528, 1023088
+        };
 
-        readonly int[] clustersize = {1024, 1024};
+        readonly int[] clustersize =
+        {
+            1024, 1024
+        };
 
-        readonly string[] volumename = {null, null};
+        readonly string[] volumename =
+        {
+            null, null
+        };
 
-        readonly string[] volumeserial = {null, null};
+        readonly string[] volumeserial =
+        {
+            null, null
+        };
 
         [Test]
         public void Test()
@@ -63,27 +84,29 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new Vdi();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 IFilesystem     fs         = new Xia();
                 int             part       = -1;
+
                 for(int j = 0; j < partitions.Count; j++)
                     if(partitions[j].Type == "0x83")
                     {
                         part = j;
+
                         break;
                     }
 
                 Assert.AreNotEqual(-1, part, $"Partition not found on {testfiles[i]}");
                 Assert.AreEqual(true, fs.Identify(image, partitions[part]), testfiles[i]);
                 fs.GetInformation(image, partitions[part], out _, null);
-                Assert.AreEqual(clusters[i],      fs.XmlFsType.Clusters,     testfiles[i]);
-                Assert.AreEqual(clustersize[i],   fs.XmlFsType.ClusterSize,  testfiles[i]);
-                Assert.AreEqual("Xia filesystem", fs.XmlFsType.Type,         testfiles[i]);
-                Assert.AreEqual(volumename[i],    fs.XmlFsType.VolumeName,   testfiles[i]);
-                Assert.AreEqual(volumeserial[i],  fs.XmlFsType.VolumeSerial, testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual("Xia filesystem", fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
+                Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
             }
         }
     }
diff --git a/Aaru.Tests/Filesystems/ZFS.cs b/Aaru.Tests/Filesystems/ZFS.cs
index 4730cef92..bc87cdd5b 100644
--- a/Aaru.Tests/Filesystems/ZFS.cs
+++ b/Aaru.Tests/Filesystems/ZFS.cs
@@ -39,19 +39,40 @@ namespace Aaru.Tests.Filesystems
     [TestFixture]
     public class Zfs
     {
-        readonly string[] testfiles = {"netbsd_7.1.vdi.lz"};
+        readonly string[] testfiles =
+        {
+            "netbsd_7.1.vdi.lz"
+        };
 
-        readonly ulong[] sectors = {33554432};
+        readonly ulong[] sectors =
+        {
+            33554432
+        };
 
-        readonly uint[] sectorsize = {512};
+        readonly uint[] sectorsize =
+        {
+            512
+        };
 
-        readonly long[] clusters = {0};
+        readonly long[] clusters =
+        {
+            0
+        };
 
-        readonly int[] clustersize = {0};
+        readonly int[] clustersize =
+        {
+            0
+        };
 
-        readonly string[] volumename = {"NetBSD 7.1"};
+        readonly string[] volumename =
+        {
+            "NetBSD 7.1"
+        };
 
-        readonly string[] volumeserial = {"2639895335654686206"};
+        readonly string[] volumeserial =
+        {
+            "2639895335654686206"
+        };
 
         [Test]
         public void Test()
@@ -62,23 +83,24 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new Vdi();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 IFilesystem fs = new ZFS();
-                Partition wholePart = new Partition
+
+                var wholePart = new Partition
                 {
-                    Name   = "Whole device",
-                    Length = image.Info.Sectors,
-                    Size   = image.Info.Sectors * image.Info.SectorSize
+                    Name = "Whole device", Length = image.Info.Sectors,
+                    Size = image.Info.Sectors * image.Info.SectorSize
                 };
+
                 Assert.AreEqual(true, fs.Identify(image, wholePart), testfiles[i]);
                 fs.GetInformation(image, wholePart, out _, null);
-                Assert.AreEqual(clusters[i],      fs.XmlFsType.Clusters,     testfiles[i]);
-                Assert.AreEqual(clustersize[i],   fs.XmlFsType.ClusterSize,  testfiles[i]);
-                Assert.AreEqual("ZFS filesystem", fs.XmlFsType.Type,         testfiles[i]);
-                Assert.AreEqual(volumename[i],    fs.XmlFsType.VolumeName,   testfiles[i]);
-                Assert.AreEqual(volumeserial[i],  fs.XmlFsType.VolumeSerial, testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual("ZFS filesystem", fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
+                Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
             }
         }
     }
diff --git a/Aaru.Tests/Filesystems/btrfs.cs b/Aaru.Tests/Filesystems/btrfs.cs
index 066a06fdd..538512161 100644
--- a/Aaru.Tests/Filesystems/btrfs.cs
+++ b/Aaru.Tests/Filesystems/btrfs.cs
@@ -41,17 +41,35 @@ namespace Aaru.Tests.Filesystems
     [TestFixture]
     public class Btrfs
     {
-        readonly string[] testfiles = {"linux.vdi.lz", "linux_4.19_btrfs_flashdrive.vdi.lz"};
+        readonly string[] testfiles =
+        {
+            "linux.vdi.lz", "linux_4.19_btrfs_flashdrive.vdi.lz"
+        };
 
-        readonly ulong[] sectors = {262144, 1024000};
+        readonly ulong[] sectors =
+        {
+            262144, 1024000
+        };
 
-        readonly uint[] sectorsize = {512, 512};
+        readonly uint[] sectorsize =
+        {
+            512, 512
+        };
 
-        readonly long[] clusters = {32512, 127744};
+        readonly long[] clusters =
+        {
+            32512, 127744
+        };
 
-        readonly int[] clustersize = {4096, 4096};
+        readonly int[] clustersize =
+        {
+            4096, 4096
+        };
 
-        readonly string[] volumename = {"VolumeLabel", "btrfs"};
+        readonly string[] volumename =
+        {
+            "VolumeLabel", "btrfs"
+        };
 
         readonly string[] volumeserial =
         {
@@ -67,28 +85,30 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new Vdi();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 IPartition parts = new MBR();
                 Assert.AreEqual(true, parts.GetInformation(image, out List<Partition> partitions, 0), testfiles[i]);
                 IFilesystem fs   = new BTRFS();
                 int         part = -1;
+
                 for(int j = 0; j < partitions.Count; j++)
                     if(partitions[j].Type == "0x83")
                     {
                         part = j;
+
                         break;
                     }
 
                 Assert.AreNotEqual(-1, part, $"Partition not found on {testfiles[i]}");
                 Assert.AreEqual(true, fs.Identify(image, partitions[part]), testfiles[i]);
                 fs.GetInformation(image, partitions[part], out _, null);
-                Assert.AreEqual(clusters[i],          fs.XmlFsType.Clusters,     testfiles[i]);
-                Assert.AreEqual(clustersize[i],       fs.XmlFsType.ClusterSize,  testfiles[i]);
-                Assert.AreEqual("B-tree file system", fs.XmlFsType.Type,         testfiles[i]);
-                Assert.AreEqual(volumename[i],        fs.XmlFsType.VolumeName,   testfiles[i]);
-                Assert.AreEqual(volumeserial[i],      fs.XmlFsType.VolumeSerial, testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual("B-tree file system", fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
+                Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
             }
         }
     }
diff --git a/Aaru.Tests/Filesystems/exFAT.cs b/Aaru.Tests/Filesystems/exFAT.cs
index d511d7b18..7596122cf 100644
--- a/Aaru.Tests/Filesystems/exFAT.cs
+++ b/Aaru.Tests/Filesystems/exFAT.cs
@@ -40,19 +40,40 @@ namespace Aaru.Tests.Filesystems
     [TestFixture]
     public class ExFatApm
     {
-        readonly string[] testfiles = {"macosx_10.11.vdi.lz"};
+        readonly string[] testfiles =
+        {
+            "macosx_10.11.vdi.lz"
+        };
 
-        readonly ulong[] sectors = {262144};
+        readonly ulong[] sectors =
+        {
+            262144
+        };
 
-        readonly uint[] sectorsize = {512};
+        readonly uint[] sectorsize =
+        {
+            512
+        };
 
-        readonly long[] clusters = {32710};
+        readonly long[] clusters =
+        {
+            32710
+        };
 
-        readonly int[] clustersize = {4096};
+        readonly int[] clustersize =
+        {
+            4096
+        };
 
-        readonly string[] volumename = {null};
+        readonly string[] volumename =
+        {
+            null
+        };
 
-        readonly string[] volumeserial = {"595AC82C"};
+        readonly string[] volumeserial =
+        {
+            "595AC82C"
+        };
 
         [Test]
         public void Test()
@@ -63,26 +84,28 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new Vdi();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 IFilesystem     fs         = new exFAT();
                 int             part       = -1;
+
                 for(int j = 0; j < partitions.Count; j++)
                     if(partitions[j].Type == "Windows_NTFS")
                     {
                         part = j;
+
                         break;
                     }
 
                 Assert.AreNotEqual(-1, part, $"Partition not found on {testfiles[i]}");
                 Assert.AreEqual(true, fs.Identify(image, partitions[part]), testfiles[i]);
                 fs.GetInformation(image, partitions[part], out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,     testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,  testfiles[i]);
-                Assert.AreEqual("exFAT",         fs.XmlFsType.Type,         testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,   testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual("exFAT", fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
                 Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
             }
         }
@@ -91,19 +114,40 @@ namespace Aaru.Tests.Filesystems
     [TestFixture]
     public class ExFatGpt
     {
-        readonly string[] testfiles = {"macosx_10.11.vdi.lz"};
+        readonly string[] testfiles =
+        {
+            "macosx_10.11.vdi.lz"
+        };
 
-        readonly ulong[] sectors = {262144};
+        readonly ulong[] sectors =
+        {
+            262144
+        };
 
-        readonly uint[] sectorsize = {512};
+        readonly uint[] sectorsize =
+        {
+            512
+        };
 
-        readonly long[] clusters = {32208};
+        readonly long[] clusters =
+        {
+            32208
+        };
 
-        readonly int[] clustersize = {4096};
+        readonly int[] clustersize =
+        {
+            4096
+        };
 
-        readonly string[] volumename = {null};
+        readonly string[] volumename =
+        {
+            null
+        };
 
-        readonly string[] volumeserial = {"595ACC39"};
+        readonly string[] volumeserial =
+        {
+            "595ACC39"
+        };
 
         [Test]
         public void Test()
@@ -114,26 +158,28 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new Vdi();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 IFilesystem     fs         = new exFAT();
                 int             part       = -1;
+
                 for(int j = 0; j < partitions.Count; j++)
                     if(partitions[j].Type == "Microsoft Basic data")
                     {
                         part = j;
+
                         break;
                     }
 
                 Assert.AreNotEqual(-1, part, $"Partition not found on {testfiles[i]}");
                 Assert.AreEqual(true, fs.Identify(image, partitions[part]), testfiles[i]);
                 fs.GetInformation(image, partitions[part], out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,     testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,  testfiles[i]);
-                Assert.AreEqual("exFAT",         fs.XmlFsType.Type,         testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,   testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual("exFAT", fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
                 Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
             }
         }
@@ -148,17 +194,35 @@ namespace Aaru.Tests.Filesystems
             "linux_4.19_exfat_flashdrive.vdi.lz"
         };
 
-        readonly ulong[] sectors = {262144, 262144, 262144, 262144, 1024000};
+        readonly ulong[] sectors =
+        {
+            262144, 262144, 262144, 262144, 1024000
+        };
 
-        readonly uint[] sectorsize = {512, 512, 512, 512, 512};
+        readonly uint[] sectorsize =
+        {
+            512, 512, 512, 512, 512
+        };
 
-        readonly long[] clusters = {32464, 32712, 32448, 32208, 15964};
+        readonly long[] clusters =
+        {
+            32464, 32712, 32448, 32208, 15964
+        };
 
-        readonly int[] clustersize = {4096, 4096, 4096, 4096, 32768};
+        readonly int[] clustersize =
+        {
+            4096, 4096, 4096, 4096, 32768
+        };
 
-        readonly string[] volumename = {null, null, null, null, null};
+        readonly string[] volumename =
+        {
+            null, null, null, null, null
+        };
 
-        readonly string[] volumeserial = {"603565AC", "595AC21E", "20126663", "0AC5CA52", "636E083B"};
+        readonly string[] volumeserial =
+        {
+            "603565AC", "595AC21E", "20126663", "0AC5CA52", "636E083B"
+        };
 
         [Test]
         public void Test()
@@ -169,26 +233,28 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new Vdi();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 IFilesystem     fs         = new exFAT();
                 int             part       = -1;
+
                 for(int j = 0; j < partitions.Count; j++)
                     if(partitions[j].Type == "0x07")
                     {
                         part = j;
+
                         break;
                     }
 
                 Assert.AreNotEqual(-1, part, $"Partition not found on {testfiles[i]}");
                 Assert.AreEqual(true, fs.Identify(image, partitions[part]), testfiles[i]);
                 fs.GetInformation(image, partitions[part], out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,     testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,  testfiles[i]);
-                Assert.AreEqual("exFAT",         fs.XmlFsType.Type,         testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,   testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual("exFAT", fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
                 Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
             }
         }
diff --git a/Aaru.Tests/Filesystems/ext2.cs b/Aaru.Tests/Filesystems/ext2.cs
index 58272e1cf..8d530e143 100644
--- a/Aaru.Tests/Filesystems/ext2.cs
+++ b/Aaru.Tests/Filesystems/ext2.cs
@@ -43,18 +43,30 @@ namespace Aaru.Tests.Filesystems
     {
         readonly string[] testfiles =
         {
-            "linux_ext2.vdi.lz", "linux_ext3.vdi.lz", "linux_ext4.vdi.lz", "netbsd_7.1.vdi.lz",
-            "netbsd_7.1_r0.vdi.lz", "linux_4.19_ext2_flashdrive.vdi.lz", "linux_4.19_ext3_flashdrive.vdi.lz",
+            "linux_ext2.vdi.lz", "linux_ext3.vdi.lz", "linux_ext4.vdi.lz", "netbsd_7.1.vdi.lz", "netbsd_7.1_r0.vdi.lz",
+            "linux_4.19_ext2_flashdrive.vdi.lz", "linux_4.19_ext3_flashdrive.vdi.lz",
             "linux_4.19_ext4_flashdrive.vdi.lz"
         };
 
-        readonly ulong[] sectors = {262144, 262144, 262144, 8388608, 2097152, 1024000, 1024000, 1024000};
+        readonly ulong[] sectors =
+        {
+            262144, 262144, 262144, 8388608, 2097152, 1024000, 1024000, 1024000
+        };
 
-        readonly uint[] sectorsize = {512, 512, 512, 512, 512, 512, 512, 512};
+        readonly uint[] sectorsize =
+        {
+            512, 512, 512, 512, 512, 512, 512, 512
+        };
 
-        readonly long[] clusters = {130048, 130048, 130048, 1046567, 260135, 510976, 510976, 510976};
+        readonly long[] clusters =
+        {
+            130048, 130048, 130048, 1046567, 260135, 510976, 510976, 510976
+        };
 
-        readonly int[] clustersize = {1024, 1024, 1024, 4096, 4096, 1024, 1024, 1024};
+        readonly int[] clustersize =
+        {
+            1024, 1024, 1024, 4096, 4096, 1024, 1024, 1024
+        };
 
         readonly string[] volumename =
         {
@@ -70,7 +82,10 @@ namespace Aaru.Tests.Filesystems
             "a3914b55-260f-7245-8c72-7ccdf45436cb", "10413797-43d1-6545-8fbc-6ebc9d328be9"
         };
 
-        readonly string[] extversion = {"ext2", "ext3", "ext4", "ext2", "ext2", "ext2", "ext3", "ext4"};
+        readonly string[] extversion =
+        {
+            "ext2", "ext3", "ext4", "ext2", "ext2", "ext2", "ext3", "ext4"
+        };
 
         [Test]
         public void Test()
@@ -81,27 +96,29 @@ namespace Aaru.Tests.Filesystems
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new Vdi();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
                 IPartition parts = new MBR();
                 Assert.AreEqual(true, parts.GetInformation(image, out List<Partition> partitions, 0), testfiles[i]);
                 IFilesystem fs   = new ext2FS();
                 int         part = -1;
+
                 for(int j = 0; j < partitions.Count; j++)
                     if(partitions[j].Type == "0x83")
                     {
                         part = j;
+
                         break;
                     }
 
                 Assert.AreNotEqual(-1, part, $"Partition not found on {testfiles[i]}");
                 Assert.AreEqual(true, fs.Identify(image, partitions[part]), testfiles[i]);
                 fs.GetInformation(image, partitions[part], out _, null);
-                Assert.AreEqual(clusters[i],     fs.XmlFsType.Clusters,     testfiles[i]);
-                Assert.AreEqual(clustersize[i],  fs.XmlFsType.ClusterSize,  testfiles[i]);
-                Assert.AreEqual(extversion[i],   fs.XmlFsType.Type,         testfiles[i]);
-                Assert.AreEqual(volumename[i],   fs.XmlFsType.VolumeName,   testfiles[i]);
+                Assert.AreEqual(clusters[i], fs.XmlFsType.Clusters, testfiles[i]);
+                Assert.AreEqual(clustersize[i], fs.XmlFsType.ClusterSize, testfiles[i]);
+                Assert.AreEqual(extversion[i], fs.XmlFsType.Type, testfiles[i]);
+                Assert.AreEqual(volumename[i], fs.XmlFsType.VolumeName, testfiles[i]);
                 Assert.AreEqual(volumeserial[i], fs.XmlFsType.VolumeSerial, testfiles[i]);
             }
         }
diff --git a/Aaru.Tests/Filters/AppleDoubleDave.cs b/Aaru.Tests/Filters/AppleDoubleDave.cs
index a6c10626d..502fdd7e7 100644
--- a/Aaru.Tests/Filters/AppleDoubleDave.cs
+++ b/Aaru.Tests/Filters/AppleDoubleDave.cs
@@ -47,10 +47,26 @@ namespace Aaru.Tests.Filters
         public AppleDoubleDave()
         {
             location = Path.Combine(Consts.TestFilesRoot, "filters", "appledouble", "dave", "DOS_720.dmg");
+
             sidecar = Path.Combine(Consts.TestFilesRoot, "filters", "appledouble", "dave", "resource.frk",
                                    "DOS_720.dmg");
         }
 
+        [Test]
+        public void CheckContents()
+        {
+            IFilter filter = new AppleDouble();
+            filter.Open(location);
+            Stream str  = filter.GetDataForkStream();
+            byte[] data = new byte[737280];
+            str.Read(data, 0, 737280);
+            str.Close();
+            str.Dispose();
+            filter.Close();
+            string result = Md5Context.Data(data, out _);
+            Assert.AreEqual(EXPECTED_CONTENTS, result);
+        }
+
         [Test]
         public void CheckCorrectFile()
         {
@@ -68,35 +84,6 @@ namespace Aaru.Tests.Filters
             Assert.AreEqual(true, filter.Identify(location));
         }
 
-        [Test]
-        public void Test()
-        {
-            IFilter filter = new AppleDouble();
-            filter.Open(location);
-            Assert.AreEqual(true,   filter.IsOpened());
-            Assert.AreEqual(737280, filter.GetDataForkLength());
-            Assert.AreNotEqual(null, filter.GetDataForkStream());
-            Assert.AreEqual(286, filter.GetResourceForkLength());
-            Assert.AreNotEqual(null, filter.GetResourceForkStream());
-            Assert.AreEqual(true, filter.HasResourceFork());
-            filter.Close();
-        }
-
-        [Test]
-        public void CheckContents()
-        {
-            IFilter filter = new AppleDouble();
-            filter.Open(location);
-            Stream str  = filter.GetDataForkStream();
-            byte[] data = new byte[737280];
-            str.Read(data, 0, 737280);
-            str.Close();
-            str.Dispose();
-            filter.Close();
-            string result = Md5Context.Data(data, out _);
-            Assert.AreEqual(EXPECTED_CONTENTS, result);
-        }
-
         [Test]
         public void CheckResource()
         {
@@ -111,5 +98,19 @@ namespace Aaru.Tests.Filters
             string result = Md5Context.Data(data, out _);
             Assert.AreEqual(EXPECTED_RESOURCE, result);
         }
+
+        [Test]
+        public void Test()
+        {
+            IFilter filter = new AppleDouble();
+            filter.Open(location);
+            Assert.AreEqual(true, filter.IsOpened());
+            Assert.AreEqual(737280, filter.GetDataForkLength());
+            Assert.AreNotEqual(null, filter.GetDataForkStream());
+            Assert.AreEqual(286, filter.GetResourceForkLength());
+            Assert.AreNotEqual(null, filter.GetResourceForkStream());
+            Assert.AreEqual(true, filter.HasResourceFork());
+            filter.Close();
+        }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filters/AppleDoubleDos.cs b/Aaru.Tests/Filters/AppleDoubleDos.cs
index 0bd6d70e7..69916e434 100644
--- a/Aaru.Tests/Filters/AppleDoubleDos.cs
+++ b/Aaru.Tests/Filters/AppleDoubleDos.cs
@@ -50,6 +50,21 @@ namespace Aaru.Tests.Filters
             sidecar  = Path.Combine(Consts.TestFilesRoot, "filters", "appledouble", "dos", "DOS_720.adf");
         }
 
+        [Test]
+        public void CheckContents()
+        {
+            IFilter filter = new AppleDouble();
+            filter.Open(location);
+            Stream str  = filter.GetDataForkStream();
+            byte[] data = new byte[737280];
+            str.Read(data, 0, 737280);
+            str.Close();
+            str.Dispose();
+            filter.Close();
+            string result = Md5Context.Data(data, out _);
+            Assert.AreEqual(EXPECTED_CONTENTS, result);
+        }
+
         [Test]
         public void CheckCorrectFile()
         {
@@ -67,35 +82,6 @@ namespace Aaru.Tests.Filters
             Assert.AreEqual(true, filter.Identify(location));
         }
 
-        [Test]
-        public void Test()
-        {
-            IFilter filter = new AppleDouble();
-            filter.Open(location);
-            Assert.AreEqual(true,   filter.IsOpened());
-            Assert.AreEqual(737280, filter.GetDataForkLength());
-            Assert.AreNotEqual(null, filter.GetDataForkStream());
-            Assert.AreEqual(286, filter.GetResourceForkLength());
-            Assert.AreNotEqual(null, filter.GetResourceForkStream());
-            Assert.AreEqual(true, filter.HasResourceFork());
-            filter.Close();
-        }
-
-        [Test]
-        public void CheckContents()
-        {
-            IFilter filter = new AppleDouble();
-            filter.Open(location);
-            Stream str  = filter.GetDataForkStream();
-            byte[] data = new byte[737280];
-            str.Read(data, 0, 737280);
-            str.Close();
-            str.Dispose();
-            filter.Close();
-            string result = Md5Context.Data(data, out _);
-            Assert.AreEqual(EXPECTED_CONTENTS, result);
-        }
-
         [Test]
         public void CheckResource()
         {
@@ -110,5 +96,19 @@ namespace Aaru.Tests.Filters
             string result = Md5Context.Data(data, out _);
             Assert.AreEqual(EXPECTED_RESOURCE, result);
         }
+
+        [Test]
+        public void Test()
+        {
+            IFilter filter = new AppleDouble();
+            filter.Open(location);
+            Assert.AreEqual(true, filter.IsOpened());
+            Assert.AreEqual(737280, filter.GetDataForkLength());
+            Assert.AreNotEqual(null, filter.GetDataForkStream());
+            Assert.AreEqual(286, filter.GetResourceForkLength());
+            Assert.AreNotEqual(null, filter.GetResourceForkStream());
+            Assert.AreEqual(true, filter.HasResourceFork());
+            filter.Close();
+        }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filters/AppleDoubleNetatalk.cs b/Aaru.Tests/Filters/AppleDoubleNetatalk.cs
index 35f728e33..f4a4c0317 100644
--- a/Aaru.Tests/Filters/AppleDoubleNetatalk.cs
+++ b/Aaru.Tests/Filters/AppleDoubleNetatalk.cs
@@ -47,10 +47,26 @@ namespace Aaru.Tests.Filters
         public AppleDoubleNetatalk()
         {
             location = Path.Combine(Consts.TestFilesRoot, "filters", "appledouble", "netatalk", "DOS_720.dmg");
+
             sidecar = Path.Combine(Consts.TestFilesRoot, "filters", "appledouble", "netatalk", ".AppleDouble",
                                    "DOS_720.dmg");
         }
 
+        [Test]
+        public void CheckContents()
+        {
+            IFilter filter = new AppleDouble();
+            filter.Open(location);
+            Stream str  = filter.GetDataForkStream();
+            byte[] data = new byte[737280];
+            str.Read(data, 0, 737280);
+            str.Close();
+            str.Dispose();
+            filter.Close();
+            string result = Md5Context.Data(data, out _);
+            Assert.AreEqual(EXPECTED_CONTENTS, result);
+        }
+
         [Test]
         public void CheckCorrectFile()
         {
@@ -68,35 +84,6 @@ namespace Aaru.Tests.Filters
             Assert.AreEqual(true, filter.Identify(location));
         }
 
-        [Test]
-        public void Test()
-        {
-            IFilter filter = new AppleDouble();
-            filter.Open(location);
-            Assert.AreEqual(true,   filter.IsOpened());
-            Assert.AreEqual(737280, filter.GetDataForkLength());
-            Assert.AreNotEqual(null, filter.GetDataForkStream());
-            Assert.AreEqual(286, filter.GetResourceForkLength());
-            Assert.AreNotEqual(null, filter.GetResourceForkStream());
-            Assert.AreEqual(true, filter.HasResourceFork());
-            filter.Close();
-        }
-
-        [Test]
-        public void CheckContents()
-        {
-            IFilter filter = new AppleDouble();
-            filter.Open(location);
-            Stream str  = filter.GetDataForkStream();
-            byte[] data = new byte[737280];
-            str.Read(data, 0, 737280);
-            str.Close();
-            str.Dispose();
-            filter.Close();
-            string result = Md5Context.Data(data, out _);
-            Assert.AreEqual(EXPECTED_CONTENTS, result);
-        }
-
         [Test]
         public void CheckResource()
         {
@@ -111,5 +98,19 @@ namespace Aaru.Tests.Filters
             string result = Md5Context.Data(data, out _);
             Assert.AreEqual(EXPECTED_RESOURCE, result);
         }
+
+        [Test]
+        public void Test()
+        {
+            IFilter filter = new AppleDouble();
+            filter.Open(location);
+            Assert.AreEqual(true, filter.IsOpened());
+            Assert.AreEqual(737280, filter.GetDataForkLength());
+            Assert.AreNotEqual(null, filter.GetDataForkStream());
+            Assert.AreEqual(286, filter.GetResourceForkLength());
+            Assert.AreNotEqual(null, filter.GetResourceForkStream());
+            Assert.AreEqual(true, filter.HasResourceFork());
+            filter.Close();
+        }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filters/AppleDoubleOsX.cs b/Aaru.Tests/Filters/AppleDoubleOsX.cs
index 53ec86edf..ab5db7a55 100644
--- a/Aaru.Tests/Filters/AppleDoubleOsX.cs
+++ b/Aaru.Tests/Filters/AppleDoubleOsX.cs
@@ -50,11 +50,27 @@ namespace Aaru.Tests.Filters
             sidecar  = Path.Combine(Consts.TestFilesRoot, "filters", "appledouble", "osx", "._DOS_720.dmg");
         }
 
+        [Test]
+        public void CheckContents()
+        {
+            IFilter filter = new AppleDouble();
+            filter.Open(location);
+            Stream str  = filter.GetDataForkStream();
+            byte[] data = new byte[737280];
+            str.Read(data, 0, 737280);
+            str.Close();
+            str.Dispose();
+            filter.Close();
+            var    ctx    = new Md5Context();
+            string result = Md5Context.Data(data, out _);
+            Assert.AreEqual(EXPECTED_CONTENTS, result);
+        }
+
         [Test]
         public void CheckCorrectFile()
         {
-            Md5Context ctx    = new Md5Context();
-            string     result = Md5Context.File(location, out _);
+            var    ctx    = new Md5Context();
+            string result = Md5Context.File(location, out _);
             Assert.AreEqual(EXPECTED_FILE, result);
 
             ctx    = new Md5Context();
@@ -69,36 +85,6 @@ namespace Aaru.Tests.Filters
             Assert.AreEqual(true, filter.Identify(location));
         }
 
-        [Test]
-        public void Test()
-        {
-            IFilter filter = new AppleDouble();
-            filter.Open(location);
-            Assert.AreEqual(true,   filter.IsOpened());
-            Assert.AreEqual(737280, filter.GetDataForkLength());
-            Assert.AreNotEqual(null, filter.GetDataForkStream());
-            Assert.AreEqual(286, filter.GetResourceForkLength());
-            Assert.AreNotEqual(null, filter.GetResourceForkStream());
-            Assert.AreEqual(true, filter.HasResourceFork());
-            filter.Close();
-        }
-
-        [Test]
-        public void CheckContents()
-        {
-            IFilter filter = new AppleDouble();
-            filter.Open(location);
-            Stream str  = filter.GetDataForkStream();
-            byte[] data = new byte[737280];
-            str.Read(data, 0, 737280);
-            str.Close();
-            str.Dispose();
-            filter.Close();
-            Md5Context ctx    = new Md5Context();
-            string     result = Md5Context.Data(data, out _);
-            Assert.AreEqual(EXPECTED_CONTENTS, result);
-        }
-
         [Test]
         public void CheckResource()
         {
@@ -110,9 +96,23 @@ namespace Aaru.Tests.Filters
             str.Close();
             str.Dispose();
             filter.Close();
-            Md5Context ctx    = new Md5Context();
-            string     result = Md5Context.Data(data, out _);
+            var    ctx    = new Md5Context();
+            string result = Md5Context.Data(data, out _);
             Assert.AreEqual(EXPECTED_RESOURCE, result);
         }
+
+        [Test]
+        public void Test()
+        {
+            IFilter filter = new AppleDouble();
+            filter.Open(location);
+            Assert.AreEqual(true, filter.IsOpened());
+            Assert.AreEqual(737280, filter.GetDataForkLength());
+            Assert.AreNotEqual(null, filter.GetDataForkStream());
+            Assert.AreEqual(286, filter.GetResourceForkLength());
+            Assert.AreNotEqual(null, filter.GetResourceForkStream());
+            Assert.AreEqual(true, filter.HasResourceFork());
+            filter.Close();
+        }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filters/AppleDoubleProDos.cs b/Aaru.Tests/Filters/AppleDoubleProDos.cs
index a9a74a9c2..9a1ba6505 100644
--- a/Aaru.Tests/Filters/AppleDoubleProDos.cs
+++ b/Aaru.Tests/Filters/AppleDoubleProDos.cs
@@ -50,6 +50,21 @@ namespace Aaru.Tests.Filters
             sidecar  = Path.Combine(Consts.TestFilesRoot, "filters", "appledouble", "prodos", "R.DOS_720.dmg");
         }
 
+        [Test]
+        public void CheckContents()
+        {
+            IFilter filter = new AppleDouble();
+            filter.Open(location);
+            Stream str  = filter.GetDataForkStream();
+            byte[] data = new byte[737280];
+            str.Read(data, 0, 737280);
+            str.Close();
+            str.Dispose();
+            filter.Close();
+            string result = Md5Context.Data(data, out _);
+            Assert.AreEqual(EXPECTED_CONTENTS, result);
+        }
+
         [Test]
         public void CheckCorrectFile()
         {
@@ -67,35 +82,6 @@ namespace Aaru.Tests.Filters
             Assert.AreEqual(true, filter.Identify(location));
         }
 
-        [Test]
-        public void Test()
-        {
-            IFilter filter = new AppleDouble();
-            filter.Open(location);
-            Assert.AreEqual(true,   filter.IsOpened());
-            Assert.AreEqual(737280, filter.GetDataForkLength());
-            Assert.AreNotEqual(null, filter.GetDataForkStream());
-            Assert.AreEqual(286, filter.GetResourceForkLength());
-            Assert.AreNotEqual(null, filter.GetResourceForkStream());
-            Assert.AreEqual(true, filter.HasResourceFork());
-            filter.Close();
-        }
-
-        [Test]
-        public void CheckContents()
-        {
-            IFilter filter = new AppleDouble();
-            filter.Open(location);
-            Stream str  = filter.GetDataForkStream();
-            byte[] data = new byte[737280];
-            str.Read(data, 0, 737280);
-            str.Close();
-            str.Dispose();
-            filter.Close();
-            string result = Md5Context.Data(data, out _);
-            Assert.AreEqual(EXPECTED_CONTENTS, result);
-        }
-
         [Test]
         public void CheckResource()
         {
@@ -110,5 +96,19 @@ namespace Aaru.Tests.Filters
             string result = Md5Context.Data(data, out _);
             Assert.AreEqual(EXPECTED_RESOURCE, result);
         }
+
+        [Test]
+        public void Test()
+        {
+            IFilter filter = new AppleDouble();
+            filter.Open(location);
+            Assert.AreEqual(true, filter.IsOpened());
+            Assert.AreEqual(737280, filter.GetDataForkLength());
+            Assert.AreNotEqual(null, filter.GetDataForkStream());
+            Assert.AreEqual(286, filter.GetResourceForkLength());
+            Assert.AreNotEqual(null, filter.GetResourceForkStream());
+            Assert.AreEqual(true, filter.HasResourceFork());
+            filter.Close();
+        }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filters/AppleDoubleUnAr.cs b/Aaru.Tests/Filters/AppleDoubleUnAr.cs
index 121be8e40..781c795d1 100644
--- a/Aaru.Tests/Filters/AppleDoubleUnAr.cs
+++ b/Aaru.Tests/Filters/AppleDoubleUnAr.cs
@@ -50,6 +50,21 @@ namespace Aaru.Tests.Filters
             sidecar  = Path.Combine(Consts.TestFilesRoot, "filters", "appledouble", "unar", "DOS_720.dmg.rsrc");
         }
 
+        [Test]
+        public void CheckContents()
+        {
+            IFilter filter = new AppleDouble();
+            filter.Open(location);
+            Stream str  = filter.GetDataForkStream();
+            byte[] data = new byte[737280];
+            str.Read(data, 0, 737280);
+            str.Close();
+            str.Dispose();
+            filter.Close();
+            string result = Md5Context.Data(data, out _);
+            Assert.AreEqual(EXPECTED_CONTENTS, result);
+        }
+
         [Test]
         public void CheckCorrectFile()
         {
@@ -67,35 +82,6 @@ namespace Aaru.Tests.Filters
             Assert.AreEqual(true, filter.Identify(location));
         }
 
-        [Test]
-        public void Test()
-        {
-            IFilter filter = new AppleDouble();
-            filter.Open(location);
-            Assert.AreEqual(true,   filter.IsOpened());
-            Assert.AreEqual(737280, filter.GetDataForkLength());
-            Assert.AreNotEqual(null, filter.GetDataForkStream());
-            Assert.AreEqual(286, filter.GetResourceForkLength());
-            Assert.AreNotEqual(null, filter.GetResourceForkStream());
-            Assert.AreEqual(true, filter.HasResourceFork());
-            filter.Close();
-        }
-
-        [Test]
-        public void CheckContents()
-        {
-            IFilter filter = new AppleDouble();
-            filter.Open(location);
-            Stream str  = filter.GetDataForkStream();
-            byte[] data = new byte[737280];
-            str.Read(data, 0, 737280);
-            str.Close();
-            str.Dispose();
-            filter.Close();
-            string result = Md5Context.Data(data, out _);
-            Assert.AreEqual(EXPECTED_CONTENTS, result);
-        }
-
         [Test]
         public void CheckResource()
         {
@@ -110,5 +96,19 @@ namespace Aaru.Tests.Filters
             string result = Md5Context.Data(data, out _);
             Assert.AreEqual(EXPECTED_RESOURCE, result);
         }
+
+        [Test]
+        public void Test()
+        {
+            IFilter filter = new AppleDouble();
+            filter.Open(location);
+            Assert.AreEqual(true, filter.IsOpened());
+            Assert.AreEqual(737280, filter.GetDataForkLength());
+            Assert.AreNotEqual(null, filter.GetDataForkStream());
+            Assert.AreEqual(286, filter.GetResourceForkLength());
+            Assert.AreNotEqual(null, filter.GetResourceForkStream());
+            Assert.AreEqual(true, filter.HasResourceFork());
+            filter.Close();
+        }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filters/AppleDoubleUnix.cs b/Aaru.Tests/Filters/AppleDoubleUnix.cs
index 52d8ff60c..f16a25806 100644
--- a/Aaru.Tests/Filters/AppleDoubleUnix.cs
+++ b/Aaru.Tests/Filters/AppleDoubleUnix.cs
@@ -50,6 +50,21 @@ namespace Aaru.Tests.Filters
             sidecar  = Path.Combine(Consts.TestFilesRoot, "filters", "appledouble", "unix", "%DOS_720.dmg");
         }
 
+        [Test]
+        public void CheckContents()
+        {
+            IFilter filter = new AppleDouble();
+            filter.Open(location);
+            Stream str  = filter.GetDataForkStream();
+            byte[] data = new byte[737280];
+            str.Read(data, 0, 737280);
+            str.Close();
+            str.Dispose();
+            filter.Close();
+            string result = Md5Context.Data(data, out _);
+            Assert.AreEqual(EXPECTED_CONTENTS, result);
+        }
+
         [Test]
         public void CheckCorrectFile()
         {
@@ -67,35 +82,6 @@ namespace Aaru.Tests.Filters
             Assert.AreEqual(true, filter.Identify(location));
         }
 
-        [Test]
-        public void Test()
-        {
-            IFilter filter = new AppleDouble();
-            filter.Open(location);
-            Assert.AreEqual(true,   filter.IsOpened());
-            Assert.AreEqual(737280, filter.GetDataForkLength());
-            Assert.AreNotEqual(null, filter.GetDataForkStream());
-            Assert.AreEqual(286, filter.GetResourceForkLength());
-            Assert.AreNotEqual(null, filter.GetResourceForkStream());
-            Assert.AreEqual(true, filter.HasResourceFork());
-            filter.Close();
-        }
-
-        [Test]
-        public void CheckContents()
-        {
-            IFilter filter = new AppleDouble();
-            filter.Open(location);
-            Stream str  = filter.GetDataForkStream();
-            byte[] data = new byte[737280];
-            str.Read(data, 0, 737280);
-            str.Close();
-            str.Dispose();
-            filter.Close();
-            string result = Md5Context.Data(data, out _);
-            Assert.AreEqual(EXPECTED_CONTENTS, result);
-        }
-
         [Test]
         public void CheckResource()
         {
@@ -110,5 +96,19 @@ namespace Aaru.Tests.Filters
             string result = Md5Context.Data(data, out _);
             Assert.AreEqual(EXPECTED_RESOURCE, result);
         }
+
+        [Test]
+        public void Test()
+        {
+            IFilter filter = new AppleDouble();
+            filter.Open(location);
+            Assert.AreEqual(true, filter.IsOpened());
+            Assert.AreEqual(737280, filter.GetDataForkLength());
+            Assert.AreNotEqual(null, filter.GetDataForkStream());
+            Assert.AreEqual(286, filter.GetResourceForkLength());
+            Assert.AreNotEqual(null, filter.GetResourceForkStream());
+            Assert.AreEqual(true, filter.HasResourceFork());
+            filter.Close();
+        }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filters/AppleSingle.cs b/Aaru.Tests/Filters/AppleSingle.cs
index 67aac1aa5..a9cc39b6b 100644
--- a/Aaru.Tests/Filters/AppleSingle.cs
+++ b/Aaru.Tests/Filters/AppleSingle.cs
@@ -41,38 +41,7 @@ namespace Aaru.Tests.Filters
         const    string EXPECTED_RESOURCE = "a972d27c44193a7587b21416c0953cc3";
         readonly string location;
 
-        public AppleSingle()
-        {
-            location = Path.Combine(Consts.TestFilesRoot, "filters", "applesingle", "DOS_720.ASF");
-        }
-
-        [Test]
-        public void CheckCorrectFile()
-        {
-            string result = Md5Context.File(location, out _);
-            Assert.AreEqual(EXPECTED_FILE, result);
-        }
-
-        [Test]
-        public void CheckFilterId()
-        {
-            IFilter filter = new Aaru.Filters.AppleSingle();
-            Assert.AreEqual(true, filter.Identify(location));
-        }
-
-        [Test]
-        public void Test()
-        {
-            IFilter filter = new Aaru.Filters.AppleSingle();
-            filter.Open(location);
-            Assert.AreEqual(true,   filter.IsOpened());
-            Assert.AreEqual(737280, filter.GetDataForkLength());
-            Assert.AreNotEqual(null, filter.GetDataForkStream());
-            Assert.AreEqual(286, filter.GetResourceForkLength());
-            Assert.AreNotEqual(null, filter.GetResourceForkStream());
-            Assert.AreEqual(true, filter.HasResourceFork());
-            filter.Close();
-        }
+        public AppleSingle() => location = Path.Combine(Consts.TestFilesRoot, "filters", "applesingle", "DOS_720.ASF");
 
         [Test]
         public void CheckContents()
@@ -89,6 +58,20 @@ namespace Aaru.Tests.Filters
             Assert.AreEqual(EXPECTED_CONTENTS, result);
         }
 
+        [Test]
+        public void CheckCorrectFile()
+        {
+            string result = Md5Context.File(location, out _);
+            Assert.AreEqual(EXPECTED_FILE, result);
+        }
+
+        [Test]
+        public void CheckFilterId()
+        {
+            IFilter filter = new Aaru.Filters.AppleSingle();
+            Assert.AreEqual(true, filter.Identify(location));
+        }
+
         [Test]
         public void CheckResource()
         {
@@ -103,5 +86,19 @@ namespace Aaru.Tests.Filters
             string result = Md5Context.Data(data, out _);
             Assert.AreEqual(EXPECTED_RESOURCE, result);
         }
+
+        [Test]
+        public void Test()
+        {
+            IFilter filter = new Aaru.Filters.AppleSingle();
+            filter.Open(location);
+            Assert.AreEqual(true, filter.IsOpened());
+            Assert.AreEqual(737280, filter.GetDataForkLength());
+            Assert.AreNotEqual(null, filter.GetDataForkStream());
+            Assert.AreEqual(286, filter.GetResourceForkLength());
+            Assert.AreNotEqual(null, filter.GetResourceForkStream());
+            Assert.AreEqual(true, filter.HasResourceFork());
+            filter.Close();
+        }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filters/BZip2.cs b/Aaru.Tests/Filters/BZip2.cs
index bcd562179..06bc81b7c 100644
--- a/Aaru.Tests/Filters/BZip2.cs
+++ b/Aaru.Tests/Filters/BZip2.cs
@@ -46,9 +46,21 @@ namespace Aaru.Tests.Filters
         };
         readonly string location;
 
-        public BZip2()
+        public BZip2() => location = Path.Combine(Consts.TestFilesRoot, "filters", "bzip2.bz2");
+
+        [Test]
+        public void CheckContents()
         {
-            location = Path.Combine(Consts.TestFilesRoot, "filters", "bzip2.bz2");
+            IFilter filter = new Aaru.Filters.BZip2();
+            filter.Open(location);
+            Stream str  = filter.GetDataForkStream();
+            byte[] data = new byte[1048576];
+            str.Read(data, 0, 1048576);
+            str.Close();
+            str.Dispose();
+            filter.Close();
+            Md5Context.Data(data, out byte[] result);
+            Assert.AreEqual(ExpectedContents, result);
         }
 
         [Test]
@@ -70,28 +82,13 @@ namespace Aaru.Tests.Filters
         {
             IFilter filter = new Aaru.Filters.BZip2();
             filter.Open(location);
-            Assert.AreEqual(true,    filter.IsOpened());
+            Assert.AreEqual(true, filter.IsOpened());
             Assert.AreEqual(1048576, filter.GetDataForkLength());
             Assert.AreNotEqual(null, filter.GetDataForkStream());
-            Assert.AreEqual(0,     filter.GetResourceForkLength());
-            Assert.AreEqual(null,  filter.GetResourceForkStream());
+            Assert.AreEqual(0, filter.GetResourceForkLength());
+            Assert.AreEqual(null, filter.GetResourceForkStream());
             Assert.AreEqual(false, filter.HasResourceFork());
             filter.Close();
         }
-
-        [Test]
-        public void CheckContents()
-        {
-            IFilter filter = new Aaru.Filters.BZip2();
-            filter.Open(location);
-            Stream str  = filter.GetDataForkStream();
-            byte[] data = new byte[1048576];
-            str.Read(data, 0, 1048576);
-            str.Close();
-            str.Dispose();
-            filter.Close();
-            Md5Context.Data(data, out byte[] result);
-            Assert.AreEqual(ExpectedContents, result);
-        }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filters/GZip.cs b/Aaru.Tests/Filters/GZip.cs
index 309be6aa3..bd6eb6b03 100644
--- a/Aaru.Tests/Filters/GZip.cs
+++ b/Aaru.Tests/Filters/GZip.cs
@@ -46,9 +46,21 @@ namespace Aaru.Tests.Filters
         };
         readonly string location;
 
-        public GZip()
+        public GZip() => location = Path.Combine(Consts.TestFilesRoot, "filters", "gzip.gz");
+
+        [Test]
+        public void CheckContents()
         {
-            location = Path.Combine(Consts.TestFilesRoot, "filters", "gzip.gz");
+            IFilter filter = new Aaru.Filters.GZip();
+            filter.Open(location);
+            Stream str  = filter.GetDataForkStream();
+            byte[] data = new byte[1048576];
+            str.Read(data, 0, 1048576);
+            str.Close();
+            str.Dispose();
+            filter.Close();
+            Md5Context.Data(data, out byte[] result);
+            Assert.AreEqual(ExpectedContents, result);
         }
 
         [Test]
@@ -70,28 +82,13 @@ namespace Aaru.Tests.Filters
         {
             IFilter filter = new Aaru.Filters.GZip();
             filter.Open(location);
-            Assert.AreEqual(true,    filter.IsOpened());
+            Assert.AreEqual(true, filter.IsOpened());
             Assert.AreEqual(1048576, filter.GetDataForkLength());
             Assert.AreNotEqual(null, filter.GetDataForkStream());
-            Assert.AreEqual(0,     filter.GetResourceForkLength());
-            Assert.AreEqual(null,  filter.GetResourceForkStream());
+            Assert.AreEqual(0, filter.GetResourceForkLength());
+            Assert.AreEqual(null, filter.GetResourceForkStream());
             Assert.AreEqual(false, filter.HasResourceFork());
             filter.Close();
         }
-
-        [Test]
-        public void CheckContents()
-        {
-            IFilter filter = new Aaru.Filters.GZip();
-            filter.Open(location);
-            Stream str  = filter.GetDataForkStream();
-            byte[] data = new byte[1048576];
-            str.Read(data, 0, 1048576);
-            str.Close();
-            str.Dispose();
-            filter.Close();
-            Md5Context.Data(data, out byte[] result);
-            Assert.AreEqual(ExpectedContents, result);
-        }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filters/LZip.cs b/Aaru.Tests/Filters/LZip.cs
index 842d6be2a..2f873a1c2 100644
--- a/Aaru.Tests/Filters/LZip.cs
+++ b/Aaru.Tests/Filters/LZip.cs
@@ -46,9 +46,21 @@ namespace Aaru.Tests.Filters
         };
         readonly string location;
 
-        public LZip()
+        public LZip() => location = Path.Combine(Consts.TestFilesRoot, "filters", "lzip.lz");
+
+        [Test]
+        public void CheckContents()
         {
-            location = Path.Combine(Consts.TestFilesRoot, "filters", "lzip.lz");
+            IFilter filter = new Aaru.Filters.LZip();
+            filter.Open(location);
+            Stream str  = filter.GetDataForkStream();
+            byte[] data = new byte[1048576];
+            str.Read(data, 0, 1048576);
+            str.Close();
+            str.Dispose();
+            filter.Close();
+            Md5Context.Data(data, out byte[] result);
+            Assert.AreEqual(ExpectedContents, result);
         }
 
         [Test]
@@ -70,28 +82,13 @@ namespace Aaru.Tests.Filters
         {
             IFilter filter = new Aaru.Filters.LZip();
             filter.Open(location);
-            Assert.AreEqual(true,    filter.IsOpened());
+            Assert.AreEqual(true, filter.IsOpened());
             Assert.AreEqual(1048576, filter.GetDataForkLength());
             Assert.AreNotEqual(null, filter.GetDataForkStream());
-            Assert.AreEqual(0,     filter.GetResourceForkLength());
-            Assert.AreEqual(null,  filter.GetResourceForkStream());
+            Assert.AreEqual(0, filter.GetResourceForkLength());
+            Assert.AreEqual(null, filter.GetResourceForkStream());
             Assert.AreEqual(false, filter.HasResourceFork());
             filter.Close();
         }
-
-        [Test]
-        public void CheckContents()
-        {
-            IFilter filter = new Aaru.Filters.LZip();
-            filter.Open(location);
-            Stream str  = filter.GetDataForkStream();
-            byte[] data = new byte[1048576];
-            str.Read(data, 0, 1048576);
-            str.Close();
-            str.Dispose();
-            filter.Close();
-            Md5Context.Data(data, out byte[] result);
-            Assert.AreEqual(ExpectedContents, result);
-        }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filters/MacBinary1.cs b/Aaru.Tests/Filters/MacBinary1.cs
index 3b366dd9e..451ee8781 100644
--- a/Aaru.Tests/Filters/MacBinary1.cs
+++ b/Aaru.Tests/Filters/MacBinary1.cs
@@ -41,38 +41,7 @@ namespace Aaru.Tests.Filters
         const    string EXPECTED_RESOURCE = "a972d27c44193a7587b21416c0953cc3";
         readonly string location;
 
-        public MacBinary1()
-        {
-            location = Path.Combine(Consts.TestFilesRoot, "filters", "macbinary", "macbinary1.bin");
-        }
-
-        [Test]
-        public void CheckCorrectFile()
-        {
-            string result = Md5Context.File(location, out _);
-            Assert.AreEqual(EXPECTED_FILE, result);
-        }
-
-        [Test]
-        public void CheckFilterId()
-        {
-            IFilter filter = new Aaru.Filters.AppleSingle();
-            Assert.AreEqual(true, filter.Identify(location));
-        }
-
-        [Test]
-        public void Test()
-        {
-            IFilter filter = new Aaru.Filters.AppleSingle();
-            filter.Open(location);
-            Assert.AreEqual(true,   filter.IsOpened());
-            Assert.AreEqual(737280, filter.GetDataForkLength());
-            Assert.AreNotEqual(null, filter.GetDataForkStream());
-            Assert.AreEqual(286, filter.GetResourceForkLength());
-            Assert.AreNotEqual(null, filter.GetResourceForkStream());
-            Assert.AreEqual(true, filter.HasResourceFork());
-            filter.Close();
-        }
+        public MacBinary1() => location = Path.Combine(Consts.TestFilesRoot, "filters", "macbinary", "macbinary1.bin");
 
         [Test]
         public void CheckContents()
@@ -89,6 +58,20 @@ namespace Aaru.Tests.Filters
             Assert.AreEqual(EXPECTED_CONTENTS, result);
         }
 
+        [Test]
+        public void CheckCorrectFile()
+        {
+            string result = Md5Context.File(location, out _);
+            Assert.AreEqual(EXPECTED_FILE, result);
+        }
+
+        [Test]
+        public void CheckFilterId()
+        {
+            IFilter filter = new Aaru.Filters.AppleSingle();
+            Assert.AreEqual(true, filter.Identify(location));
+        }
+
         [Test]
         public void CheckResource()
         {
@@ -103,5 +86,19 @@ namespace Aaru.Tests.Filters
             string result = Md5Context.Data(data, out _);
             Assert.AreEqual(EXPECTED_RESOURCE, result);
         }
+
+        [Test]
+        public void Test()
+        {
+            IFilter filter = new Aaru.Filters.AppleSingle();
+            filter.Open(location);
+            Assert.AreEqual(true, filter.IsOpened());
+            Assert.AreEqual(737280, filter.GetDataForkLength());
+            Assert.AreNotEqual(null, filter.GetDataForkStream());
+            Assert.AreEqual(286, filter.GetResourceForkLength());
+            Assert.AreNotEqual(null, filter.GetResourceForkStream());
+            Assert.AreEqual(true, filter.HasResourceFork());
+            filter.Close();
+        }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filters/MacBinary2.cs b/Aaru.Tests/Filters/MacBinary2.cs
index 4c8ca6d55..b4a8b513b 100644
--- a/Aaru.Tests/Filters/MacBinary2.cs
+++ b/Aaru.Tests/Filters/MacBinary2.cs
@@ -42,38 +42,7 @@ namespace Aaru.Tests.Filters
         const    string EXPECTED_RESOURCE = "a972d27c44193a7587b21416c0953cc3";
         readonly string location;
 
-        public MacBinary2()
-        {
-            location = Path.Combine(Consts.TestFilesRoot, "filters", "macbinary", "macbinary2.bin");
-        }
-
-        [Test]
-        public void CheckCorrectFile()
-        {
-            string result = Md5Context.File(location, out _);
-            Assert.AreEqual(EXPECTED_FILE, result);
-        }
-
-        [Test]
-        public void CheckFilterId()
-        {
-            IFilter filter = new MacBinary();
-            Assert.AreEqual(true, filter.Identify(location));
-        }
-
-        [Test]
-        public void Test()
-        {
-            IFilter filter = new MacBinary();
-            filter.Open(location);
-            Assert.AreEqual(true,   filter.IsOpened());
-            Assert.AreEqual(737280, filter.GetDataForkLength());
-            Assert.AreNotEqual(null, filter.GetDataForkStream());
-            Assert.AreEqual(286, filter.GetResourceForkLength());
-            Assert.AreNotEqual(null, filter.GetResourceForkStream());
-            Assert.AreEqual(true, filter.HasResourceFork());
-            filter.Close();
-        }
+        public MacBinary2() => location = Path.Combine(Consts.TestFilesRoot, "filters", "macbinary", "macbinary2.bin");
 
         [Test]
         public void CheckContents()
@@ -90,6 +59,20 @@ namespace Aaru.Tests.Filters
             Assert.AreEqual(EXPECTED_CONTENTS, result);
         }
 
+        [Test]
+        public void CheckCorrectFile()
+        {
+            string result = Md5Context.File(location, out _);
+            Assert.AreEqual(EXPECTED_FILE, result);
+        }
+
+        [Test]
+        public void CheckFilterId()
+        {
+            IFilter filter = new MacBinary();
+            Assert.AreEqual(true, filter.Identify(location));
+        }
+
         [Test]
         public void CheckResource()
         {
@@ -104,5 +87,19 @@ namespace Aaru.Tests.Filters
             string result = Md5Context.Data(data, out _);
             Assert.AreEqual(EXPECTED_RESOURCE, result);
         }
+
+        [Test]
+        public void Test()
+        {
+            IFilter filter = new MacBinary();
+            filter.Open(location);
+            Assert.AreEqual(true, filter.IsOpened());
+            Assert.AreEqual(737280, filter.GetDataForkLength());
+            Assert.AreNotEqual(null, filter.GetDataForkStream());
+            Assert.AreEqual(286, filter.GetResourceForkLength());
+            Assert.AreNotEqual(null, filter.GetResourceForkStream());
+            Assert.AreEqual(true, filter.HasResourceFork());
+            filter.Close();
+        }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filters/MacBinary3.cs b/Aaru.Tests/Filters/MacBinary3.cs
index 7f3ff039a..f12ef953b 100644
--- a/Aaru.Tests/Filters/MacBinary3.cs
+++ b/Aaru.Tests/Filters/MacBinary3.cs
@@ -42,38 +42,7 @@ namespace Aaru.Tests.Filters
         const    string EXPECTED_RESOURCE = "a972d27c44193a7587b21416c0953cc3";
         readonly string location;
 
-        public MacBinary3()
-        {
-            location = Path.Combine(Consts.TestFilesRoot, "filters", "macbinary", "macbinary3.bin");
-        }
-
-        [Test]
-        public void CheckCorrectFile()
-        {
-            string result = Md5Context.File(location, out _);
-            Assert.AreEqual(EXPECTED_FILE, result);
-        }
-
-        [Test]
-        public void CheckFilterId()
-        {
-            IFilter filter = new MacBinary();
-            Assert.AreEqual(true, filter.Identify(location));
-        }
-
-        [Test]
-        public void Test()
-        {
-            IFilter filter = new MacBinary();
-            filter.Open(location);
-            Assert.AreEqual(true,   filter.IsOpened());
-            Assert.AreEqual(737280, filter.GetDataForkLength());
-            Assert.AreNotEqual(null, filter.GetDataForkStream());
-            Assert.AreEqual(286, filter.GetResourceForkLength());
-            Assert.AreNotEqual(null, filter.GetResourceForkStream());
-            Assert.AreEqual(true, filter.HasResourceFork());
-            filter.Close();
-        }
+        public MacBinary3() => location = Path.Combine(Consts.TestFilesRoot, "filters", "macbinary", "macbinary3.bin");
 
         [Test]
         public void CheckContents()
@@ -90,6 +59,20 @@ namespace Aaru.Tests.Filters
             Assert.AreEqual(EXPECTED_CONTENTS, result);
         }
 
+        [Test]
+        public void CheckCorrectFile()
+        {
+            string result = Md5Context.File(location, out _);
+            Assert.AreEqual(EXPECTED_FILE, result);
+        }
+
+        [Test]
+        public void CheckFilterId()
+        {
+            IFilter filter = new MacBinary();
+            Assert.AreEqual(true, filter.Identify(location));
+        }
+
         [Test]
         public void CheckResource()
         {
@@ -104,5 +87,19 @@ namespace Aaru.Tests.Filters
             string result = Md5Context.Data(data, out _);
             Assert.AreEqual(EXPECTED_RESOURCE, result);
         }
+
+        [Test]
+        public void Test()
+        {
+            IFilter filter = new MacBinary();
+            filter.Open(location);
+            Assert.AreEqual(true, filter.IsOpened());
+            Assert.AreEqual(737280, filter.GetDataForkLength());
+            Assert.AreNotEqual(null, filter.GetDataForkStream());
+            Assert.AreEqual(286, filter.GetResourceForkLength());
+            Assert.AreNotEqual(null, filter.GetResourceForkStream());
+            Assert.AreEqual(true, filter.HasResourceFork());
+            filter.Close();
+        }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filters/PCExchange.cs b/Aaru.Tests/Filters/PCExchange.cs
index 84c0d1411..51f4b2347 100644
--- a/Aaru.Tests/Filters/PCExchange.cs
+++ b/Aaru.Tests/Filters/PCExchange.cs
@@ -42,39 +42,8 @@ namespace Aaru.Tests.Filters
         const    string EXPECTED_RESOURCE = "5cb168d60ce8b2b1b3133c2faaf47165";
         readonly string location;
 
-        public PcExchange()
-        {
+        public PcExchange() =>
             location = Path.Combine(Consts.TestFilesRoot, "filters", "pcexchange", "DC6_RW_DOS_720.img");
-        }
-
-        [Test]
-        public void CheckCorrectFile()
-        {
-            string result = Md5Context.File(Path.Combine(Consts.TestFilesRoot, "filters", "pcexchange", "FINDER.DAT"),
-                                            out _);
-            Assert.AreEqual(EXPECTED_FILE, result);
-        }
-
-        [Test]
-        public void CheckFilterId()
-        {
-            IFilter filter = new PCExchange();
-            Assert.AreEqual(true, filter.Identify(location));
-        }
-
-        [Test]
-        public void Test()
-        {
-            IFilter filter = new PCExchange();
-            filter.Open(location);
-            Assert.AreEqual(true,   filter.IsOpened());
-            Assert.AreEqual(737280, filter.GetDataForkLength());
-            Assert.AreNotEqual(null, filter.GetDataForkStream());
-            Assert.AreEqual(546, filter.GetResourceForkLength());
-            Assert.AreNotEqual(null, filter.GetResourceForkStream());
-            Assert.AreEqual(true, filter.HasResourceFork());
-            filter.Close();
-        }
 
         [Test]
         public void CheckContents()
@@ -91,6 +60,22 @@ namespace Aaru.Tests.Filters
             Assert.AreEqual(EXPECTED_CONTENTS, result);
         }
 
+        [Test]
+        public void CheckCorrectFile()
+        {
+            string result = Md5Context.File(Path.Combine(Consts.TestFilesRoot, "filters", "pcexchange", "FINDER.DAT"),
+                                            out _);
+
+            Assert.AreEqual(EXPECTED_FILE, result);
+        }
+
+        [Test]
+        public void CheckFilterId()
+        {
+            IFilter filter = new PCExchange();
+            Assert.AreEqual(true, filter.Identify(location));
+        }
+
         [Test]
         public void CheckResource()
         {
@@ -105,5 +90,19 @@ namespace Aaru.Tests.Filters
             string result = Md5Context.Data(data, out _);
             Assert.AreEqual(EXPECTED_RESOURCE, result);
         }
+
+        [Test]
+        public void Test()
+        {
+            IFilter filter = new PCExchange();
+            filter.Open(location);
+            Assert.AreEqual(true, filter.IsOpened());
+            Assert.AreEqual(737280, filter.GetDataForkLength());
+            Assert.AreNotEqual(null, filter.GetDataForkStream());
+            Assert.AreEqual(546, filter.GetResourceForkLength());
+            Assert.AreNotEqual(null, filter.GetResourceForkStream());
+            Assert.AreEqual(true, filter.HasResourceFork());
+            filter.Close();
+        }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filters/XZ.cs b/Aaru.Tests/Filters/XZ.cs
index e50f6e956..2bc317ce8 100644
--- a/Aaru.Tests/Filters/XZ.cs
+++ b/Aaru.Tests/Filters/XZ.cs
@@ -47,9 +47,21 @@ namespace Aaru.Tests.Filters
         };
         readonly string location;
 
-        public Xz()
+        public Xz() => location = Path.Combine(Consts.TestFilesRoot, "filters", "xz.xz");
+
+        [Test]
+        public void CheckContents()
         {
-            location = Path.Combine(Consts.TestFilesRoot, "filters", "xz.xz");
+            IFilter filter = new XZ();
+            filter.Open(location);
+            Stream str  = filter.GetDataForkStream();
+            byte[] data = new byte[1048576];
+            str.Read(data, 0, 1048576);
+            str.Close();
+            str.Dispose();
+            filter.Close();
+            Md5Context.Data(data, out byte[] result);
+            Assert.AreEqual(ExpectedContents, result);
         }
 
         [Test]
@@ -71,28 +83,13 @@ namespace Aaru.Tests.Filters
         {
             IFilter filter = new XZ();
             filter.Open(location);
-            Assert.AreEqual(true,    filter.IsOpened());
+            Assert.AreEqual(true, filter.IsOpened());
             Assert.AreEqual(1048576, filter.GetDataForkLength());
             Assert.AreNotEqual(null, filter.GetDataForkStream());
-            Assert.AreEqual(0,     filter.GetResourceForkLength());
-            Assert.AreEqual(null,  filter.GetResourceForkStream());
+            Assert.AreEqual(0, filter.GetResourceForkLength());
+            Assert.AreEqual(null, filter.GetResourceForkStream());
             Assert.AreEqual(false, filter.HasResourceFork());
             filter.Close();
         }
-
-        [Test]
-        public void CheckContents()
-        {
-            IFilter filter = new XZ();
-            filter.Open(location);
-            Stream str  = filter.GetDataForkStream();
-            byte[] data = new byte[1048576];
-            str.Read(data, 0, 1048576);
-            str.Close();
-            str.Dispose();
-            filter.Close();
-            Md5Context.Data(data, out byte[] result);
-            Assert.AreEqual(ExpectedContents, result);
-        }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/2MG.cs b/Aaru.Tests/Images/2MG.cs
index b3c62b255..f580dfd5f 100644
--- a/Aaru.Tests/Images/2MG.cs
+++ b/Aaru.Tests/Images/2MG.cs
@@ -44,9 +44,15 @@ namespace Aaru.Tests.Images
             "prodos1440.2mg.lz"
         };
 
-        readonly ulong[] sectors = {560, 415, 560, 560, 560, 2880};
+        readonly ulong[] sectors =
+        {
+            560, 415, 560, 560, 560, 2880
+        };
 
-        readonly uint[] sectorsize = {256, 256, 256, 256, 256, 512};
+        readonly uint[] sectorsize =
+        {
+            256, 256, 256, 256, 256, 512
+        };
 
         readonly MediaType[] mediatypes =
         {
@@ -56,9 +62,8 @@ namespace Aaru.Tests.Images
 
         readonly string[] md5S =
         {
-            "7db5d585270ab858043d50e60068d45f", "c62ee4dac8835f9acc999e7531d3b5f8",
-            "86bc7879bb477917aab3976057a6a7b2", "32b8f8163238d4f3ea2a3db95ad1a812",
-            "a5acba4cbaddd9c53ea0e8210f4aba55", "eb9b60c78b30d2b6541ed0781944b6da"
+            "7db5d585270ab858043d50e60068d45f", "c62ee4dac8835f9acc999e7531d3b5f8", "86bc7879bb477917aab3976057a6a7b2",
+            "32b8f8163238d4f3ea2a3db95ad1a812", "a5acba4cbaddd9c53ea0e8210f4aba55", "eb9b60c78b30d2b6541ed0781944b6da"
         };
 
         [Test]
@@ -70,16 +75,16 @@ namespace Aaru.Tests.Images
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new DiscImages.Apple2Mg();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
-                Assert.AreEqual(mediatypes[i], image.Info.MediaType,  testfiles[i]);
+                Assert.AreEqual(mediatypes[i], image.Info.MediaType, testfiles[i]);
 
                 // How many sectors to read at once
                 const uint SECTORS_TO_READ = 256;
                 ulong      doneSectors     = 0;
 
-                Md5Context ctx = new Md5Context();
+                var ctx = new Md5Context();
 
                 while(doneSectors < image.Info.Sectors)
                 {
diff --git a/Aaru.Tests/Images/Anex86.cs b/Aaru.Tests/Images/Anex86.cs
index 370e6cfb1..d4bf97d30 100644
--- a/Aaru.Tests/Images/Anex86.cs
+++ b/Aaru.Tests/Images/Anex86.cs
@@ -45,9 +45,15 @@ namespace Aaru.Tests.Images
             "msdos50_epson_md2hd.fdi.lz", "msdos50_md2hd.fdi.lz", "msdos62_md2hd.fdi.lz"
         };
 
-        readonly ulong[] sectors = {40920, 61380, 81840, 121770, 162360, 20196, 1232, 1232, 1232, 1232, 1232};
+        readonly ulong[] sectors =
+        {
+            40920, 61380, 81840, 121770, 162360, 20196, 1232, 1232, 1232, 1232, 1232
+        };
 
-        readonly uint[] sectorsize = {256, 256, 256, 256, 256, 256, 1024, 1024, 1024, 1024, 1024};
+        readonly uint[] sectorsize =
+        {
+            256, 256, 256, 256, 256, 256, 1024, 1024, 1024, 1024, 1024
+        };
 
         readonly MediaType[] mediatypes =
         {
@@ -58,12 +64,10 @@ namespace Aaru.Tests.Images
 
         readonly string[] md5S =
         {
-            "1c5387e38e58165c517c059e5d48905d", "a84366658c1c3bd09af4d0d42fbf716e",
-            "919c9eecf1b65b10870f617cb976668a", "02d35af02581afb2e56792dcaba2c1af",
-            "b8c3f858f1a9d300d3e74f36eea04354", "c348bbbaf99fcb8c8e66de157aef62f4",
-            "c3587f7020743067cf948c9d5c5edb27", "a23874a4474334b035a24c6924140744",
-            "bc1ef3236e75cb09575037b884ee9dce", "243036c4617b666a6c886cc23d7274e0",
-            "09bb2ff964a0c5c223a1900f085e3955"
+            "1c5387e38e58165c517c059e5d48905d", "a84366658c1c3bd09af4d0d42fbf716e", "919c9eecf1b65b10870f617cb976668a",
+            "02d35af02581afb2e56792dcaba2c1af", "b8c3f858f1a9d300d3e74f36eea04354", "c348bbbaf99fcb8c8e66de157aef62f4",
+            "c3587f7020743067cf948c9d5c5edb27", "a23874a4474334b035a24c6924140744", "bc1ef3236e75cb09575037b884ee9dce",
+            "243036c4617b666a6c886cc23d7274e0", "09bb2ff964a0c5c223a1900f085e3955"
         };
 
         [Test]
@@ -75,16 +79,16 @@ namespace Aaru.Tests.Images
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new DiscImages.Anex86();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
-                Assert.AreEqual(mediatypes[i], image.Info.MediaType,  testfiles[i]);
+                Assert.AreEqual(mediatypes[i], image.Info.MediaType, testfiles[i]);
 
                 // How many sectors to read at once
                 const uint SECTORS_TO_READ = 256;
                 ulong      doneSectors     = 0;
 
-                Md5Context ctx = new Md5Context();
+                var ctx = new Md5Context();
 
                 while(doneSectors < image.Info.Sectors)
                 {
diff --git a/Aaru.Tests/Images/CisCopy.cs b/Aaru.Tests/Images/CisCopy.cs
index 066e12ef3..2699ba9ff 100644
--- a/Aaru.Tests/Images/CisCopy.cs
+++ b/Aaru.Tests/Images/CisCopy.cs
@@ -43,16 +43,15 @@ namespace Aaru.Tests.Images
         {
             "md1dd8_all.dcf.lz", "md1dd8_belelung.dcf.lz", "md1dd8_fat.dcf.lz", "md1dd_all.dcf.lz",
             "md1dd_belelung.dcf.lz", "md1dd_fat.dcf.lz", "md2dd8_all.dcf.lz", "md2dd8_belelung.dcf.lz",
-            "md2dd8_fat.dcf.lz", "md2dd_all.dcf.lz", "md2dd_belelung.dcf.lz", "md2dd_fat.dcf.lz",
-            "md2hd_all.dcf.lz", "md2hd_belelung.dcf.lz", "md2hd_fat.dcf.lz", "mf2dd_all.dcf.lz",
-            "mf2dd_belelung.dcf.lz", "mf2dd_fat.dcf.lz", "mf2hd_all.dcf.lz", "mf2hd_belelung.dcf.lz",
-            "mf2hd_fat.dcf.lz"
+            "md2dd8_fat.dcf.lz", "md2dd_all.dcf.lz", "md2dd_belelung.dcf.lz", "md2dd_fat.dcf.lz", "md2hd_all.dcf.lz",
+            "md2hd_belelung.dcf.lz", "md2hd_fat.dcf.lz", "mf2dd_all.dcf.lz", "mf2dd_belelung.dcf.lz",
+            "mf2dd_fat.dcf.lz", "mf2hd_all.dcf.lz", "mf2hd_belelung.dcf.lz", "mf2hd_fat.dcf.lz"
         };
 
         readonly ulong[] sectors =
         {
-            320, 320, 320, 360, 360, 360, 640, 640, 640, 720, 720, 720, 2400, 2400, 2400, 1440, 1440, 1440, 2880,
-            2880, 2880
+            320, 320, 320, 360, 360, 360, 640, 640, 640, 720, 720, 720, 2400, 2400, 2400, 1440, 1440, 1440, 2880, 2880,
+            2880
         };
 
         readonly uint[] sectorsize =
@@ -62,27 +61,23 @@ namespace Aaru.Tests.Images
 
         readonly MediaType[] mediatypes =
         {
-            MediaType.DOS_525_SS_DD_8, MediaType.DOS_525_SS_DD_8, MediaType.DOS_525_SS_DD_8,
-            MediaType.DOS_525_SS_DD_9, MediaType.DOS_525_SS_DD_9, MediaType.DOS_525_SS_DD_9,
-            MediaType.DOS_525_DS_DD_8, MediaType.DOS_525_DS_DD_8, MediaType.DOS_525_DS_DD_8,
-            MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_HD,
-            MediaType.DOS_525_HD, MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_DS_DD_9,
-            MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_HD, MediaType.DOS_35_HD, MediaType.DOS_35_HD
+            MediaType.DOS_525_SS_DD_8, MediaType.DOS_525_SS_DD_8, MediaType.DOS_525_SS_DD_8, MediaType.DOS_525_SS_DD_9,
+            MediaType.DOS_525_SS_DD_9, MediaType.DOS_525_SS_DD_9, MediaType.DOS_525_DS_DD_8, MediaType.DOS_525_DS_DD_8,
+            MediaType.DOS_525_DS_DD_8, MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_DS_DD_9,
+            MediaType.DOS_525_HD, MediaType.DOS_525_HD, MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9,
+            MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_HD, MediaType.DOS_35_HD,
+            MediaType.DOS_35_HD
         };
 
         readonly string[] md5S =
         {
-            "95c0b76419c1c74db6dbe1d790f97dde", "95c0b76419c1c74db6dbe1d790f97dde",
-            "6f6507e416b7320d583dc347b8e57844", "48b93e8619c4c13f4a3724b550e4b371",
-            "48b93e8619c4c13f4a3724b550e4b371", "1d060d2e2543e1c2e8569f5451660060",
-            "0c93155bbc5e412f5014e037d08c2745", "0c93155bbc5e412f5014e037d08c2745",
-            "0c93155bbc5e412f5014e037d08c2745", "d2a33090ec03bfb536e7356deacf4bbc",
-            "d2a33090ec03bfb536e7356deacf4bbc", "d2a33090ec03bfb536e7356deacf4bbc",
-            "181f3bc62f0b90f74af9d8027ebf7512", "181f3bc62f0b90f74af9d8027ebf7512",
-            "181f3bc62f0b90f74af9d8027ebf7512", "783559ee5e774515d5e7d2feab9c333e",
-            "783559ee5e774515d5e7d2feab9c333e", "783559ee5e774515d5e7d2feab9c333e",
-            "91f3fde8d56a536cdda4c6758e5dbc93", "91f3fde8d56a536cdda4c6758e5dbc93",
-            "91f3fde8d56a536cdda4c6758e5dbc93"
+            "95c0b76419c1c74db6dbe1d790f97dde", "95c0b76419c1c74db6dbe1d790f97dde", "6f6507e416b7320d583dc347b8e57844",
+            "48b93e8619c4c13f4a3724b550e4b371", "48b93e8619c4c13f4a3724b550e4b371", "1d060d2e2543e1c2e8569f5451660060",
+            "0c93155bbc5e412f5014e037d08c2745", "0c93155bbc5e412f5014e037d08c2745", "0c93155bbc5e412f5014e037d08c2745",
+            "d2a33090ec03bfb536e7356deacf4bbc", "d2a33090ec03bfb536e7356deacf4bbc", "d2a33090ec03bfb536e7356deacf4bbc",
+            "181f3bc62f0b90f74af9d8027ebf7512", "181f3bc62f0b90f74af9d8027ebf7512", "181f3bc62f0b90f74af9d8027ebf7512",
+            "783559ee5e774515d5e7d2feab9c333e", "783559ee5e774515d5e7d2feab9c333e", "783559ee5e774515d5e7d2feab9c333e",
+            "91f3fde8d56a536cdda4c6758e5dbc93", "91f3fde8d56a536cdda4c6758e5dbc93", "91f3fde8d56a536cdda4c6758e5dbc93"
         };
 
         [Test]
@@ -94,16 +89,16 @@ namespace Aaru.Tests.Images
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new DiscImages.CisCopy();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
-                Assert.AreEqual(mediatypes[i], image.Info.MediaType,  testfiles[i]);
+                Assert.AreEqual(mediatypes[i], image.Info.MediaType, testfiles[i]);
 
                 // How many sectors to read at once
                 const uint SECTORS_TO_READ = 256;
                 ulong      doneSectors     = 0;
 
-                Md5Context ctx = new Md5Context();
+                var ctx = new Md5Context();
 
                 while(doneSectors < image.Info.Sectors)
                 {
diff --git a/Aaru.Tests/Images/CopyQM.cs b/Aaru.Tests/Images/CopyQM.cs
index 95f614fd1..5988c12ca 100644
--- a/Aaru.Tests/Images/CopyQM.cs
+++ b/Aaru.Tests/Images/CopyQM.cs
@@ -40,13 +40,19 @@ namespace Aaru.Tests.Images
     {
         readonly string[] testfiles =
         {
-            "mf2dd.cqm.lz", "mf2dd_fdformat_800.cqm.lz", "mf2dd_freedos.cqm.lz", "mf2hd_blind.cqm.lz",
-            "mf2hd.cqm.lz", "mf2hd_fdformat_168.cqm.lz", "mf2hd_freedos.cqm.lz"
+            "mf2dd.cqm.lz", "mf2dd_fdformat_800.cqm.lz", "mf2dd_freedos.cqm.lz", "mf2hd_blind.cqm.lz", "mf2hd.cqm.lz",
+            "mf2hd_fdformat_168.cqm.lz", "mf2hd_freedos.cqm.lz"
         };
 
-        readonly ulong[] sectors = {1440, 1600, 1600, 2880, 2880, 3360, 3360};
+        readonly ulong[] sectors =
+        {
+            1440, 1600, 1600, 2880, 2880, 3360, 3360
+        };
 
-        readonly uint[] sectorsize = {512, 512, 512, 512, 512, 512, 512};
+        readonly uint[] sectorsize =
+        {
+            512, 512, 512, 512, 512, 512, 512
+        };
 
         // TODO: Add "unknown" media types
         readonly MediaType[] mediatypes =
@@ -57,9 +63,8 @@ namespace Aaru.Tests.Images
 
         readonly string[] md5S =
         {
-            "de3f85896f771b7e5bc4c9e3926d64e4", "c533488a21098a62c85f1649abda2803",
-            "1ff7649b679ba22ff20d39ff717dbec8", "b4a602f67903c46eef62addb0780aa56",
-            "b4a602f67903c46eef62addb0780aa56", "03c2af6a8ebf4bd6f530335de34ae5dd",
+            "de3f85896f771b7e5bc4c9e3926d64e4", "c533488a21098a62c85f1649abda2803", "1ff7649b679ba22ff20d39ff717dbec8",
+            "b4a602f67903c46eef62addb0780aa56", "b4a602f67903c46eef62addb0780aa56", "03c2af6a8ebf4bd6f530335de34ae5dd",
             "1a9f2eeb3cbeeb057b9a9a5c6e9b0cc6"
         };
 
@@ -72,16 +77,16 @@ namespace Aaru.Tests.Images
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new DiscImages.CopyQm();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
-                Assert.AreEqual(mediatypes[i], image.Info.MediaType,  testfiles[i]);
+                Assert.AreEqual(mediatypes[i], image.Info.MediaType, testfiles[i]);
 
                 // How many sectors to read at once
                 const uint SECTORS_TO_READ = 256;
                 ulong      doneSectors     = 0;
 
-                Md5Context ctx = new Md5Context();
+                var ctx = new Md5Context();
 
                 while(doneSectors < image.Info.Sectors)
                 {
diff --git a/Aaru.Tests/Images/D88.cs b/Aaru.Tests/Images/D88.cs
index b4784a1a0..9ba949b78 100644
--- a/Aaru.Tests/Images/D88.cs
+++ b/Aaru.Tests/Images/D88.cs
@@ -45,16 +45,16 @@ namespace Aaru.Tests.Images
             "D-Side - Lagrange L-2 Part II (1986)(Compaq)(JP).d88.lz",
             "File Master FM, The v1.01 (1986)(Kyoto Media)(JP).d77.lz", "Gandhara (1987)(Enix)(JP).d88.lz",
             "Might & Magic (198x)(Star Craft)(Disk 1 of 3)(Disk A).d88.lz", "msdos33d_md2dd.d88.lz",
-            "msdos33d_md2hd.d88.lz", "msdos50_epson_md2dd.d88.lz", "msdos50_epson_md2hd.d88.lz",
-            "msdos50_md2dd.d88.lz", "msdos50_md2hd.d88.lz", "msdos62_md2dd.d88.lz", "msdos62_md2hd.d88.lz",
+            "msdos33d_md2hd.d88.lz", "msdos50_epson_md2dd.d88.lz", "msdos50_epson_md2hd.d88.lz", "msdos50_md2dd.d88.lz",
+            "msdos50_md2hd.d88.lz", "msdos62_md2dd.d88.lz", "msdos62_md2hd.d88.lz",
             "R-Type (1988)(Irem)(Disk 1 of 2).d88.lz", "Towns System Software v1.1L30 (1992)(Fujitsu)(JP).d88.lz",
             "Visual Instrument Player (198x)(Kamiya)(JP)(Disk 1 of 2).d88.lz"
         };
 
         readonly ulong[] sectors =
         {
-            1280, 1280, 1280, 411, 1440, 1280, 1280, 4033, 1440, 1232, 1440, 1232, 1440, 1232, 1440, 1232, 1284,
-            1232, 1280
+            1280, 1280, 1280, 411, 1440, 1280, 1280, 4033, 1440, 1232, 1440, 1232, 1440, 1232, 1440, 1232, 1284, 1232,
+            1280
         };
 
         readonly uint[] sectorsize =
@@ -73,15 +73,12 @@ namespace Aaru.Tests.Images
 
         readonly string[] md5S =
         {
-            "a4103c39cd7fd9fc3de8418dfcf22364", "b948048c03e0b3d34d77f5c9dced0b41",
-            "f91152fab791d4dc0677a289d90478a5", "39b01df04a6312b09f1b83c9f3a46b22",
-            "ef775ec1f41b8b725ea83ec8c5ca04e2", "5c2b22f824524cd6c539aaeb2ecb84cd",
-            "6bddf3dd32877f7b552cbf9da6b89f76", "003cd0292879733b6eab7ca79ab9cfeb",
-            "acb738a5a945e4e2ba1504a14a529933", "106068dbdf13803979c7bbb63612f43d",
-            "be916f25847b9cfc9776d88cc150ae7e", "ccc7f98e216db35c2b7a08634a9f3e20",
-            "7a3332e82b0fe8c5673a2615f6c0b9a2", "62f5be96a8b8ccab9ee4aebf557cfcf7",
-            "07fb4c225d4b5a2e2a1046ae66fc153c", "1f73980e45a384bed331eaa33c9ef65b",
-            "9d675e5147b55cee0b2bc05476eef825", "bb48546ced9c61462e1c89dca4987143",
+            "a4103c39cd7fd9fc3de8418dfcf22364", "b948048c03e0b3d34d77f5c9dced0b41", "f91152fab791d4dc0677a289d90478a5",
+            "39b01df04a6312b09f1b83c9f3a46b22", "ef775ec1f41b8b725ea83ec8c5ca04e2", "5c2b22f824524cd6c539aaeb2ecb84cd",
+            "6bddf3dd32877f7b552cbf9da6b89f76", "003cd0292879733b6eab7ca79ab9cfeb", "acb738a5a945e4e2ba1504a14a529933",
+            "106068dbdf13803979c7bbb63612f43d", "be916f25847b9cfc9776d88cc150ae7e", "ccc7f98e216db35c2b7a08634a9f3e20",
+            "7a3332e82b0fe8c5673a2615f6c0b9a2", "62f5be96a8b8ccab9ee4aebf557cfcf7", "07fb4c225d4b5a2e2a1046ae66fc153c",
+            "1f73980e45a384bed331eaa33c9ef65b", "9d675e5147b55cee0b2bc05476eef825", "bb48546ced9c61462e1c89dca4987143",
             "c7df67f4e66dad658fe856d3c8b36c7a"
         };
 
@@ -94,16 +91,16 @@ namespace Aaru.Tests.Images
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new DiscImages.D88();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
-                Assert.AreEqual(mediatypes[i], image.Info.MediaType,  testfiles[i]);
+                Assert.AreEqual(mediatypes[i], image.Info.MediaType, testfiles[i]);
 
                 // How many sectors to read at once
                 const uint SECTORS_TO_READ = 256;
                 ulong      doneSectors     = 0;
 
-                Md5Context ctx = new Md5Context();
+                var ctx = new Md5Context();
 
                 while(doneSectors < image.Info.Sectors)
                 {
diff --git a/Aaru.Tests/Images/DART.cs b/Aaru.Tests/Images/DART.cs
index f70bc0265..4edd5c4ef 100644
--- a/Aaru.Tests/Images/DART.cs
+++ b/Aaru.Tests/Images/DART.cs
@@ -44,9 +44,15 @@ namespace Aaru.Tests.Images
             "mf2dd_hfs_best.dart.lz", "mf2dd_hfs_fast.dart.lz", "mf2dd_mfs_best.dart.lz", "mf2dd_mfs_fast.dart.lz"
         };
 
-        readonly ulong[] sectors = {800, 800, 800, 800, 1600, 1600, 1600, 1600};
+        readonly ulong[] sectors =
+        {
+            800, 800, 800, 800, 1600, 1600, 1600, 1600
+        };
 
-        readonly uint[] sectorsize = {512, 512, 512, 512, 512, 512, 512, 512};
+        readonly uint[] sectorsize =
+        {
+            512, 512, 512, 512, 512, 512, 512, 512
+        };
 
         readonly MediaType[] mediatypes =
         {
@@ -56,9 +62,8 @@ namespace Aaru.Tests.Images
 
         readonly string[] md5S =
         {
-            "eae3a95671d077deb702b3549a769f56", "eae3a95671d077deb702b3549a769f56",
-            "c5d92544c3e78b7f0a9b4baaa9a64eec", "c5d92544c3e78b7f0a9b4baaa9a64eec",
-            "a99744348a70b62b57bce2dec9132ced", "a99744348a70b62b57bce2dec9132ced",
+            "eae3a95671d077deb702b3549a769f56", "eae3a95671d077deb702b3549a769f56", "c5d92544c3e78b7f0a9b4baaa9a64eec",
+            "c5d92544c3e78b7f0a9b4baaa9a64eec", "a99744348a70b62b57bce2dec9132ced", "a99744348a70b62b57bce2dec9132ced",
             "93e71b9ecdb39d3ec9245b4f451856d4", "93e71b9ecdb39d3ec9245b4f451856d4"
         };
 
@@ -71,16 +76,16 @@ namespace Aaru.Tests.Images
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new DiscImages.D88();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
-                Assert.AreEqual(mediatypes[i], image.Info.MediaType,  testfiles[i]);
+                Assert.AreEqual(mediatypes[i], image.Info.MediaType, testfiles[i]);
 
                 // How many sectors to read at once
                 const uint SECTORS_TO_READ = 256;
                 ulong      doneSectors     = 0;
 
-                Md5Context ctx = new Md5Context();
+                var ctx = new Md5Context();
 
                 while(doneSectors < image.Info.Sectors)
                 {
diff --git a/Aaru.Tests/Images/DiskCopy42.cs b/Aaru.Tests/Images/DiskCopy42.cs
index 59eea4ade..313efe556 100644
--- a/Aaru.Tests/Images/DiskCopy42.cs
+++ b/Aaru.Tests/Images/DiskCopy42.cs
@@ -42,10 +42,12 @@ namespace Aaru.Tests.Images
         {
             // Made with DiskCopy 4.2
             "dc42/mf1dd_hfs.img.lz", "dc42/mf1dd_mfs.img.lz", "dc42/mf2dd_hfs.img.lz", "dc42/mf2dd_mfs.img.lz",
+
             // Made with ShrinkWrap 3
             "shrinkwrap/DiskCopy 4/DC6_RW_HFS_1440.image.lz", "shrinkwrap/DiskCopy 4/DC6_RW_HFS_800.image.lz",
             "shrinkwrap/DiskCopy 4/DOS1440.image.lz", "shrinkwrap/DiskCopy 4/DOS720.image.lz",
             "shrinkwrap/DiskCopy 4/PD1440.image.lz", "shrinkwrap/DiskCopy 4/PD800.image.lz",
+
             // Made with DiskImages.framework
             "macosx/DC42/DOS_1440.img.lz", "macosx/DC42/DOS_720.img.lz", "macosx/DC42/HFS_1440.img.lz",
             "macosx/DC42/HFS_800.img.lz", "macosx/DC42/ProDOS_1440.img.lz", "macosx/DC42/ProDOS_800.img.lz",
@@ -54,8 +56,8 @@ namespace Aaru.Tests.Images
 
         readonly ulong[] sectors =
         {
-            800, 800, 1600, 1600, 2880, 1600, 2880, 1440, 2880, 1600, 2880, 1440, 2880, 1600, 2880, 1600, 2880,
-            1440, 1600
+            800, 800, 1600, 1600, 2880, 1600, 2880, 1440, 2880, 1600, 2880, 1440, 2880, 1600, 2880, 1600, 2880, 1440,
+            1600
         };
 
         readonly uint[] sectorsize =
@@ -68,21 +70,18 @@ namespace Aaru.Tests.Images
             MediaType.AppleSonySS, MediaType.AppleSonySS, MediaType.AppleSonyDS, MediaType.AppleSonyDS,
             MediaType.DOS_35_HD, MediaType.AppleSonyDS, MediaType.DOS_35_HD, MediaType.DOS_35_DS_DD_9,
             MediaType.DOS_35_HD, MediaType.AppleSonyDS, MediaType.DOS_35_HD, MediaType.DOS_35_DS_DD_9,
-            MediaType.DOS_35_HD, MediaType.AppleSonyDS, MediaType.DOS_35_HD, MediaType.AppleSonyDS,
-            MediaType.DOS_35_HD, MediaType.DOS_35_DS_DD_9, MediaType.AppleSonyDS
+            MediaType.DOS_35_HD, MediaType.AppleSonyDS, MediaType.DOS_35_HD, MediaType.AppleSonyDS, MediaType.DOS_35_HD,
+            MediaType.DOS_35_DS_DD_9, MediaType.AppleSonyDS
         };
 
         readonly string[] md5S =
         {
-            "eae3a95671d077deb702b3549a769f56", "c5d92544c3e78b7f0a9b4baaa9a64eec",
-            "a99744348a70b62b57bce2dec9132ced", "93e71b9ecdb39d3ec9245b4f451856d4",
-            "3160038ca028ccf52ad7863790072145", "5e255c4bc0f6a26ecd27845b37e65aaa",
-            "ff419213080574056ebd9adf7bab3d32", "c2be571406cf6353269faa59a4a8c0a4",
-            "7975e8cf7579a6848d6fb4e546d1f682", "a72da7aedadbe194c22a3d71c62e4766",
-            "ff419213080574056ebd9adf7bab3d32", "c2be571406cf6353269faa59a4a8c0a4",
-            "3160038ca028ccf52ad7863790072145", "5e255c4bc0f6a26ecd27845b37e65aaa",
-            "7975e8cf7579a6848d6fb4e546d1f682", "a72da7aedadbe194c22a3d71c62e4766",
-            "b37823c7a90d1917f719ba5927b23da8", "4942032f7bf1d115237ea1764424828b",
+            "eae3a95671d077deb702b3549a769f56", "c5d92544c3e78b7f0a9b4baaa9a64eec", "a99744348a70b62b57bce2dec9132ced",
+            "93e71b9ecdb39d3ec9245b4f451856d4", "3160038ca028ccf52ad7863790072145", "5e255c4bc0f6a26ecd27845b37e65aaa",
+            "ff419213080574056ebd9adf7bab3d32", "c2be571406cf6353269faa59a4a8c0a4", "7975e8cf7579a6848d6fb4e546d1f682",
+            "a72da7aedadbe194c22a3d71c62e4766", "ff419213080574056ebd9adf7bab3d32", "c2be571406cf6353269faa59a4a8c0a4",
+            "3160038ca028ccf52ad7863790072145", "5e255c4bc0f6a26ecd27845b37e65aaa", "7975e8cf7579a6848d6fb4e546d1f682",
+            "a72da7aedadbe194c22a3d71c62e4766", "b37823c7a90d1917f719ba5927b23da8", "4942032f7bf1d115237ea1764424828b",
             "85574aebeef03eb355bf8541955d06ea"
         };
 
@@ -95,16 +94,16 @@ namespace Aaru.Tests.Images
                 IFilter filter   = new LZip();
                 filter.Open(location);
                 IMediaImage image = new DiscImages.DiskCopy42();
-                Assert.AreEqual(true,          image.Open(filter),    testfiles[i]);
-                Assert.AreEqual(sectors[i],    image.Info.Sectors,    testfiles[i]);
+                Assert.AreEqual(true, image.Open(filter), testfiles[i]);
+                Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
                 Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
-                Assert.AreEqual(mediatypes[i], image.Info.MediaType,  testfiles[i]);
+                Assert.AreEqual(mediatypes[i], image.Info.MediaType, testfiles[i]);
 
                 // How many sectors to read at once
                 const uint SECTORS_TO_READ = 256;
                 ulong      doneSectors     = 0;
 
-                Md5Context ctx = new Md5Context();
+                var ctx = new Md5Context();
 
                 while(doneSectors < image.Info.Sectors)
                 {
diff --git a/Aaru.Tests/Partitions/Acorn.cs b/Aaru.Tests/Partitions/Acorn.cs
index 4b81cff0d..705a9c003 100644
--- a/Aaru.Tests/Partitions/Acorn.cs
+++ b/Aaru.Tests/Partitions/Acorn.cs
@@ -39,7 +39,10 @@ namespace Aaru.Tests.Partitions
     [TestFixture]
     public class Acorn
     {
-        readonly string[] testfiles = {"linux_ics.vdi.lz"};
+        readonly string[] testfiles =
+        {
+            "linux_ics.vdi.lz"
+        };
 
         readonly Partition[][] wanted =
         {
@@ -49,47 +52,23 @@ namespace Aaru.Tests.Partitions
             {
                 new Partition
                 {
-                    Description = null,
-                    Size        = 31457280,
-                    Name        = null,
-                    Type        = "GEM",
-                    Offset      = 512,
-                    Length      = 61440,
-                    Sequence    = 0,
-                    Start       = 1
+                    Description = null, Size  = 31457280, Name  = null, Type = "GEM",
+                    Offset      = 512, Length = 61440, Sequence = 0, Start   = 1
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 41943040,
-                    Name        = null,
-                    Type        = "BGM",
-                    Offset      = 31457792,
-                    Length      = 81920,
-                    Sequence    = 1,
-                    Start       = 61441
+                    Description = null, Size       = 41943040, Name  = null, Type = "BGM",
+                    Offset      = 31457792, Length = 81920, Sequence = 1, Start   = 61441
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 56402432,
-                    Name        = null,
-                    Type        = "LNX",
-                    Offset      = 73400832,
-                    Length      = 110161,
-                    Sequence    = 2,
-                    Start       = 143361
+                    Description = null, Size       = 56402432, Name   = null, Type = "LNX",
+                    Offset      = 73400832, Length = 110161, Sequence = 2, Start   = 143361
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 43212800,
-                    Name        = null,
-                    Type        = "MAC",
-                    Offset      = 129803264,
-                    Length      = 84400,
-                    Sequence    = 3,
-                    Start       = 253522
+                    Description = null, Size        = 43212800, Name  = null, Type = "MAC",
+                    Offset      = 129803264, Length = 84400, Sequence = 3, Start   = 253522
                 }
             }
         };
@@ -106,17 +85,18 @@ namespace Aaru.Tests.Partitions
                 Assert.AreEqual(true, image.Open(filter), testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 Assert.AreEqual(wanted[i].Length, partitions.Count, testfiles[i]);
+
                 for(int j = 0; j < partitions.Count; j++)
                 {
                     // Too chatty
                     //Assert.AreEqual(wanted[i][j].PartitionDescription, partitions[j].PartitionDescription, testfiles[i]);
-                    Assert.AreEqual(wanted[i][j].Size,     partitions[j].Size,     testfiles[i]);
-                    Assert.AreEqual(wanted[i][j].Name,     partitions[j].Name,     testfiles[i]);
-                    Assert.AreEqual(wanted[i][j].Type,     partitions[j].Type,     testfiles[i]);
-                    Assert.AreEqual(wanted[i][j].Offset,   partitions[j].Offset,   testfiles[i]);
-                    Assert.AreEqual(wanted[i][j].Length,   partitions[j].Length,   testfiles[i]);
+                    Assert.AreEqual(wanted[i][j].Size, partitions[j].Size, testfiles[i]);
+                    Assert.AreEqual(wanted[i][j].Name, partitions[j].Name, testfiles[i]);
+                    Assert.AreEqual(wanted[i][j].Type, partitions[j].Type, testfiles[i]);
+                    Assert.AreEqual(wanted[i][j].Offset, partitions[j].Offset, testfiles[i]);
+                    Assert.AreEqual(wanted[i][j].Length, partitions[j].Length, testfiles[i]);
                     Assert.AreEqual(wanted[i][j].Sequence, partitions[j].Sequence, testfiles[i]);
-                    Assert.AreEqual(wanted[i][j].Start,    partitions[j].Start,    testfiles[i]);
+                    Assert.AreEqual(wanted[i][j].Start, partitions[j].Start, testfiles[i]);
                 }
             }
         }
diff --git a/Aaru.Tests/Partitions/AppleMap.cs b/Aaru.Tests/Partitions/AppleMap.cs
index 0e79d03d4..8f74a3246 100644
--- a/Aaru.Tests/Partitions/AppleMap.cs
+++ b/Aaru.Tests/Partitions/AppleMap.cs
@@ -43,10 +43,10 @@ namespace Aaru.Tests.Partitions
         {
             "d2_driver.vdi.lz", "hdt_1.8_encrypted1.vdi.lz", "hdt_1.8_encrypted2.vdi.lz", "hdt_1.8_password.vdi.lz",
             "hdt_1.8.vdi.lz", "linux.vdi.lz", "macos_1.1.vdi.lz", "macos_2.0.vdi.lz", "macos_4.2.vdi.lz",
-            "macos_4.3.vdi.lz", "macos_6.0.2.vdi.lz", "macos_6.0.3.vdi.lz", "macos_6.0.4.vdi.lz",
-            "macos_6.0.5.vdi.lz", "macos_6.0.7.vdi.lz", "macos_6.0.8.vdi.lz", "macos_6.0.vdi.lz",
-            "macos_7.0.vdi.lz", "macos_7.1.1.vdi.lz", "macos_7.5.vdi.lz", "parted.vdi.lz",
-            "silverlining_2.2.1.vdi.lz", "speedtools_3.6.vdi.lz", "vcpformatter_2.1.1.vdi.lz"
+            "macos_4.3.vdi.lz", "macos_6.0.2.vdi.lz", "macos_6.0.3.vdi.lz", "macos_6.0.4.vdi.lz", "macos_6.0.5.vdi.lz",
+            "macos_6.0.7.vdi.lz", "macos_6.0.8.vdi.lz", "macos_6.0.vdi.lz", "macos_7.0.vdi.lz", "macos_7.1.1.vdi.lz",
+            "macos_7.5.vdi.lz", "parted.vdi.lz", "silverlining_2.2.1.vdi.lz", "speedtools_3.6.vdi.lz",
+            "vcpformatter_2.1.1.vdi.lz"
         };
 
         readonly Partition[][] wanted =
@@ -56,1944 +56,960 @@ namespace Aaru.Tests.Partitions
             {
                 new Partition
                 {
-                    Description = null,
-                    Size        = 1024,
-                    Name        = null,
-                    Type        = "Apple_Driver",
-                    Offset      = 32768,
-                    Length      = 2,
-                    Sequence    = 0,
-                    Start       = 64
+                    Description = null, Size    = 1024, Name  = null, Type = "Apple_Driver",
+                    Offset      = 32768, Length = 2, Sequence = 0, Start   = 64
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 42496,
-                    Name        = "Macintosh",
-                    Type        = "Apple_Driver43",
-                    Offset      = 32768,
-                    Length      = 83,
-                    Sequence    = 1,
-                    Start       = 64
+                    Description = null, Size    = 42496, Name  = "Macintosh", Type = "Apple_Driver43",
+                    Offset      = 32768, Length = 83, Sequence = 1, Start          = 64
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 55808,
-                    Name        = "Empty",
-                    Type        = "Apple_Free",
-                    Offset      = 75264,
-                    Length      = 109,
-                    Sequence    = 2,
-                    Start       = 147
+                    Description = null, Size    = 55808, Name   = "Empty", Type = "Apple_Free",
+                    Offset      = 75264, Length = 109, Sequence = 2, Start      = 147
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 26083328,
-                    Name        = "Volume label",
-                    Type        = "Apple_HFS",
-                    Offset      = 131072,
-                    Length      = 50944,
-                    Sequence    = 3,
-                    Start       = 256
+                    Description = null, Size     = 26083328, Name  = "Volume label", Type = "Apple_HFS",
+                    Offset      = 131072, Length = 50944, Sequence = 3, Start             = 256
                 }
             },
+
             // HDT 1.8 Encryption Level 1
             new[]
             {
                 new Partition
                 {
-                    Description = null,
-                    Size        = 7168,
-                    Name        = null,
-                    Type        = "Apple_Driver",
-                    Offset      = 32768,
-                    Length      = 14,
-                    Sequence    = 0,
-                    Start       = 64
+                    Description = null, Size    = 7168, Name   = null, Type = "Apple_Driver",
+                    Offset      = 32768, Length = 14, Sequence = 0, Start   = 64
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 524288,
-                    Name        = "FWB Disk Driver",
-                    Type        = "Apple_Driver43",
-                    Offset      = 32768,
-                    Length      = 1024,
-                    Sequence    = 1,
-                    Start       = 64
+                    Description = null, Size    = 524288, Name   = "FWB Disk Driver", Type = "Apple_Driver43",
+                    Offset      = 32768, Length = 1024, Sequence = 1, Start                = 64
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 25657344,
-                    Name        = "MacOS",
-                    Type        = "Apple_HFS",
-                    Offset      = 557056,
-                    Length      = 50112,
-                    Sequence    = 2,
-                    Start       = 1088
+                    Description = null, Size     = 25657344, Name  = "MacOS", Type = "Apple_HFS",
+                    Offset      = 557056, Length = 50112, Sequence = 2, Start      = 1088
                 }
             },
+
             // HDT 1.8 Encryption Level 2
             new[]
             {
                 new Partition
                 {
-                    Description = null,
-                    Size        = 7168,
-                    Name        = null,
-                    Type        = "Apple_Driver",
-                    Offset      = 32768,
-                    Length      = 14,
-                    Sequence    = 0,
-                    Start       = 64
+                    Description = null, Size    = 7168, Name   = null, Type = "Apple_Driver",
+                    Offset      = 32768, Length = 14, Sequence = 0, Start   = 64
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 524288,
-                    Name        = "FWB Disk Driver",
-                    Type        = "Apple_Driver43",
-                    Offset      = 32768,
-                    Length      = 1024,
-                    Sequence    = 1,
-                    Start       = 64
+                    Description = null, Size    = 524288, Name   = "FWB Disk Driver", Type = "Apple_Driver43",
+                    Offset      = 32768, Length = 1024, Sequence = 1, Start                = 64
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 25657344,
-                    Name        = "MacOS",
-                    Type        = "Apple_HFS",
-                    Offset      = 557056,
-                    Length      = 50112,
-                    Sequence    = 2,
-                    Start       = 1088
+                    Description = null, Size     = 25657344, Name  = "MacOS", Type = "Apple_HFS",
+                    Offset      = 557056, Length = 50112, Sequence = 2, Start      = 1088
                 }
             },
+
             // HDT 1.8 with password
             new[]
             {
                 new Partition
                 {
-                    Description = null,
-                    Size        = 7168,
-                    Name        = null,
-                    Type        = "Apple_Driver",
-                    Offset      = 32768,
-                    Length      = 14,
-                    Sequence    = 0,
-                    Start       = 64
+                    Description = null, Size    = 7168, Name   = null, Type = "Apple_Driver",
+                    Offset      = 32768, Length = 14, Sequence = 0, Start   = 64
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 524288,
-                    Name        = "FWB Disk Driver",
-                    Type        = "Apple_Driver43",
-                    Offset      = 32768,
-                    Length      = 1024,
-                    Sequence    = 1,
-                    Start       = 64
+                    Description = null, Size    = 524288, Name   = "FWB Disk Driver", Type = "Apple_Driver43",
+                    Offset      = 32768, Length = 1024, Sequence = 1, Start                = 64
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 25657344,
-                    Name        = "MacOS",
-                    Type        = "Apple_HFS",
-                    Offset      = 557056,
-                    Length      = 50112,
-                    Sequence    = 2,
-                    Start       = 1088
+                    Description = null, Size     = 25657344, Name  = "MacOS", Type = "Apple_HFS",
+                    Offset      = 557056, Length = 50112, Sequence = 2, Start      = 1088
                 }
             },
+
             // HDT 1.8
             new[]
             {
                 new Partition
                 {
-                    Description = null,
-                    Size        = 7168,
-                    Name        = null,
-                    Type        = "Apple_Driver",
-                    Offset      = 32768,
-                    Length      = 14,
-                    Sequence    = 0,
-                    Start       = 64
+                    Description = null, Size    = 7168, Name   = null, Type = "Apple_Driver",
+                    Offset      = 32768, Length = 14, Sequence = 0, Start   = 64
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 524288,
-                    Name        = "FWB Disk Driver",
-                    Type        = "Apple_Driver43",
-                    Offset      = 32768,
-                    Length      = 1024,
-                    Sequence    = 1,
-                    Start       = 64
+                    Description = null, Size    = 524288, Name   = "FWB Disk Driver", Type = "Apple_Driver43",
+                    Offset      = 32768, Length = 1024, Sequence = 1, Start                = 64
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 25657344,
-                    Name        = "MacOS",
-                    Type        = "Apple_HFS",
-                    Offset      = 557056,
-                    Length      = 50112,
-                    Sequence    = 2,
-                    Start       = 1088
+                    Description = null, Size     = 25657344, Name  = "MacOS", Type = "Apple_HFS",
+                    Offset      = 557056, Length = 50112, Sequence = 2, Start      = 1088
                 }
             },
+
             // Linux
             new[]
             {
                 new Partition
                 {
-                    Description = null,
-                    Size        = 512,
-                    Name        = "Extra",
-                    Type        = "Apple_Free",
-                    Offset      = 32768,
-                    Length      = 1,
-                    Sequence    = 0,
-                    Start       = 64
+                    Description = null, Size    = 512, Name   = "Extra", Type = "Apple_Free",
+                    Offset      = 32768, Length = 1, Sequence = 0, Start      = 64
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 819200,
-                    Name        = "bootstrap",
-                    Type        = "Apple_Bootstrap",
-                    Offset      = 33280,
-                    Length      = 1600,
-                    Sequence    = 1,
-                    Start       = 65
+                    Description = null, Size    = 819200, Name   = "bootstrap", Type = "Apple_Bootstrap",
+                    Offset      = 33280, Length = 1600, Sequence = 1, Start          = 65
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 512,
-                    Name        = "Extra",
-                    Type        = "Apple_Free",
-                    Offset      = 852480,
-                    Length      = 1,
-                    Sequence    = 2,
-                    Start       = 1665
+                    Description = null, Size     = 512, Name   = "Extra", Type = "Apple_Free",
+                    Offset      = 852480, Length = 1, Sequence = 2, Start      = 1665
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 52428800,
-                    Name        = "Linux",
-                    Type        = "Apple_UNIX_SVR2",
-                    Offset      = 852992,
-                    Length      = 102400,
-                    Sequence    = 3,
-                    Start       = 1666
+                    Description = null, Size     = 52428800, Name   = "Linux", Type = "Apple_UNIX_SVR2",
+                    Offset      = 852992, Length = 102400, Sequence = 3, Start      = 1666
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 20971520,
-                    Name        = "ProDOS",
-                    Type        = "Apple_PRODOS",
-                    Offset      = 53281792,
-                    Length      = 40960,
-                    Sequence    = 4,
-                    Start       = 104066
+                    Description = null, Size       = 20971520, Name  = "ProDOS", Type = "Apple_PRODOS",
+                    Offset      = 53281792, Length = 40960, Sequence = 4, Start       = 104066
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 52428800,
-                    Name        = "Macintosh",
-                    Type        = "Apple_HFS",
-                    Offset      = 74253312,
-                    Length      = 102400,
-                    Sequence    = 5,
-                    Start       = 145026
+                    Description = null, Size       = 52428800, Name   = "Macintosh", Type = "Apple_HFS",
+                    Offset      = 74253312, Length = 102400, Sequence = 5, Start          = 145026
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 7535616,
-                    Name        = "Extra",
-                    Type        = "Apple_Free",
-                    Offset      = 126682112,
-                    Length      = 14718,
-                    Sequence    = 6,
-                    Start       = 247426
+                    Description = null, Size        = 7535616, Name   = "Extra", Type = "Apple_Free",
+                    Offset      = 126682112, Length = 14718, Sequence = 6, Start      = 247426
                 }
             },
+
             // Mac OS 1.1
             new[]
             {
                 new Partition
                 {
-                    Description = null,
-                    Size        = 5120,
-                    Name        = null,
-                    Type        = "Apple_Driver",
-                    Offset      = 2048,
-                    Length      = 10,
-                    Sequence    = 0,
-                    Start       = 4
+                    Description = null, Size   = 5120, Name   = null, Type = "Apple_Driver",
+                    Offset      = 2048, Length = 10, Sequence = 0, Start   = 4
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 21403648,
-                    Name        = "Macintosh",
-                    Type        = "Apple_HFS",
-                    Offset      = 8192,
-                    Length      = 41804,
-                    Sequence    = 1,
-                    Start       = 16
+                    Description = null, Size   = 21403648, Name  = "Macintosh", Type = "Apple_HFS",
+                    Offset      = 8192, Length = 41804, Sequence = 1, Start          = 16
                 }
             },
+
             // Mac OS 2.0
             new[]
             {
                 new Partition
                 {
-                    Description = null,
-                    Size        = 5120,
-                    Name        = null,
-                    Type        = "Apple_Driver",
-                    Offset      = 2048,
-                    Length      = 10,
-                    Sequence    = 0,
-                    Start       = 4
+                    Description = null, Size   = 5120, Name   = null, Type = "Apple_Driver",
+                    Offset      = 2048, Length = 10, Sequence = 0, Start   = 4
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 19950080,
-                    Name        = "Macintosh",
-                    Type        = "Apple_HFS",
-                    Offset      = 8192,
-                    Length      = 38965,
-                    Sequence    = 1,
-                    Start       = 16
+                    Description = null, Size   = 19950080, Name  = "Macintosh", Type = "Apple_HFS",
+                    Offset      = 8192, Length = 38965, Sequence = 1, Start          = 16
                 }
             },
+
             // Mac OS 4.2
             new[]
             {
                 new Partition
                 {
-                    Description = null,
-                    Size        = 5632,
-                    Name        = null,
-                    Type        = "Apple_Driver",
-                    Offset      = 2048,
-                    Length      = 11,
-                    Sequence    = 0,
-                    Start       = 4
+                    Description = null, Size   = 5632, Name   = null, Type = "Apple_Driver",
+                    Offset      = 2048, Length = 11, Sequence = 0, Start   = 4
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 19950080,
-                    Name        = "Macintosh",
-                    Type        = "Apple_HFS",
-                    Offset      = 8192,
-                    Length      = 38965,
-                    Sequence    = 1,
-                    Start       = 16
+                    Description = null, Size   = 19950080, Name  = "Macintosh", Type = "Apple_HFS",
+                    Offset      = 8192, Length = 38965, Sequence = 1, Start          = 16
                 }
             },
+
             // Mac OS 4.3
             new[]
             {
                 new Partition
                 {
-                    Description = null,
-                    Size        = 5632,
-                    Name        = null,
-                    Type        = "Apple_Driver",
-                    Offset      = 2048,
-                    Length      = 11,
-                    Sequence    = 0,
-                    Start       = 4
+                    Description = null, Size   = 5632, Name   = null, Type = "Apple_Driver",
+                    Offset      = 2048, Length = 11, Sequence = 0, Start   = 4
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 19950080,
-                    Name        = "Macintosh",
-                    Type        = "Apple_HFS",
-                    Offset      = 8192,
-                    Length      = 38965,
-                    Sequence    = 1,
-                    Start       = 16
+                    Description = null, Size   = 19950080, Name  = "Macintosh", Type = "Apple_HFS",
+                    Offset      = 8192, Length = 38965, Sequence = 1, Start          = 16
                 }
             },
+
             // Mac OS 6.0.2
             new[]
             {
                 new Partition
                 {
-                    Description = null,
-                    Size        = 5120,
-                    Name        = null,
-                    Type        = "Apple_Driver",
-                    Offset      = 32768,
-                    Length      = 10,
-                    Sequence    = 0,
-                    Start       = 64
+                    Description = null, Size    = 5120, Name   = null, Type = "Apple_Driver",
+                    Offset      = 32768, Length = 10, Sequence = 0, Start   = 64
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 16384,
-                    Name        = "Macintosh",
-                    Type        = "Apple_Driver",
-                    Offset      = 32768,
-                    Length      = 32,
-                    Sequence    = 1,
-                    Start       = 64
+                    Description = null, Size    = 16384, Name  = "Macintosh", Type = "Apple_Driver",
+                    Offset      = 32768, Length = 32, Sequence = 1, Start          = 64
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 3203072,
-                    Name        = "MacOS",
-                    Type        = "Apple_HFS",
-                    Offset      = 49152,
-                    Length      = 6256,
-                    Sequence    = 2,
-                    Start       = 96
+                    Description = null, Size    = 3203072, Name  = "MacOS", Type = "Apple_HFS",
+                    Offset      = 49152, Length = 6256, Sequence = 2, Start      = 96
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 524288,
-                    Name        = "Scratch",
-                    Type        = "Apple_Scratch",
-                    Offset      = 3252224,
-                    Length      = 1024,
-                    Sequence    = 3,
-                    Start       = 6352
+                    Description = null, Size      = 524288, Name   = "Scratch", Type = "Apple_Scratch",
+                    Offset      = 3252224, Length = 1024, Sequence = 3, Start        = 6352
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 1048576,
-                    Name        = "Eschatology 1",
-                    Type        = "Apple_UNIX_SVR2",
-                    Offset      = 3776512,
-                    Length      = 2048,
-                    Sequence    = 4,
-                    Start       = 7376
+                    Description = null, Size      = 1048576, Name  = "Eschatology 1", Type = "Apple_UNIX_SVR2",
+                    Offset      = 3776512, Length = 2048, Sequence = 4, Start              = 7376
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 2191360,
-                    Name        = "A/UX Root",
-                    Type        = "Apple_UNIX_SVR2",
-                    Offset      = 4825088,
-                    Length      = 4280,
-                    Sequence    = 5,
-                    Start       = 9424
+                    Description = null, Size      = 2191360, Name  = "A/UX Root", Type = "Apple_UNIX_SVR2",
+                    Offset      = 4825088, Length = 4280, Sequence = 5, Start          = 9424
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 1217024,
-                    Name        = "Swap",
-                    Type        = "Apple_UNIX_SVR2",
-                    Offset      = 7016448,
-                    Length      = 2377,
-                    Sequence    = 6,
-                    Start       = 13704
+                    Description = null, Size      = 1217024, Name  = "Swap", Type = "Apple_UNIX_SVR2",
+                    Offset      = 7016448, Length = 2377, Sequence = 6, Start     = 13704
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 1572864,
-                    Name        = "Eschatology 2",
-                    Type        = "Apple_UNIX_SVR2",
-                    Offset      = 8233472,
-                    Length      = 3072,
-                    Sequence    = 7,
-                    Start       = 16081
+                    Description = null, Size      = 1572864, Name  = "Eschatology 2", Type = "Apple_UNIX_SVR2",
+                    Offset      = 8233472, Length = 3072, Sequence = 7, Start              = 16081
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 1310720,
-                    Name        = "Root file system",
-                    Type        = "Apple_UNIX_SVR2",
-                    Offset      = 9806336,
-                    Length      = 2560,
-                    Sequence    = 8,
-                    Start       = 19153
+                    Description = null, Size      = 1310720, Name  = "Root file system", Type = "Apple_UNIX_SVR2",
+                    Offset      = 9806336, Length = 2560, Sequence = 8, Start                 = 19153
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 2550272,
-                    Name        = "Usr file system",
-                    Type        = "Apple_UNIX_SVR2",
-                    Offset      = 11117056,
-                    Length      = 4981,
-                    Sequence    = 9,
-                    Start       = 21713
+                    Description = null, Size       = 2550272, Name  = "Usr file system", Type = "Apple_UNIX_SVR2",
+                    Offset      = 11117056, Length = 4981, Sequence = 9, Start                = 21713
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 2048000,
-                    Name        = "Random A/UX fs",
-                    Type        = "Apple_UNIX_SVR2",
-                    Offset      = 13667328,
-                    Length      = 4000,
-                    Sequence    = 10,
-                    Start       = 26694
+                    Description = null, Size       = 2048000, Name  = "Random A/UX fs", Type = "Apple_UNIX_SVR2",
+                    Offset      = 13667328, Length = 4000, Sequence = 10, Start              = 26694
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 1296384,
-                    Name        = "Random A/UX fs",
-                    Type        = "Apple_UNIX_SVR2",
-                    Offset      = 15715328,
-                    Length      = 2532,
-                    Sequence    = 11,
-                    Start       = 30694
+                    Description = null, Size       = 1296384, Name  = "Random A/UX fs", Type = "Apple_UNIX_SVR2",
+                    Offset      = 15715328, Length = 2532, Sequence = 11, Start              = 30694
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 1364992,
-                    Name        = "Usr file system",
-                    Type        = "Apple_UNIX_SVR2",
-                    Offset      = 17011712,
-                    Length      = 2666,
-                    Sequence    = 12,
-                    Start       = 33226
+                    Description = null, Size       = 1364992, Name  = "Usr file system", Type = "Apple_UNIX_SVR2",
+                    Offset      = 17011712, Length = 2666, Sequence = 12, Start               = 33226
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 3986432,
-                    Name        = "Usr file system",
-                    Type        = "Apple_UNIX_SVR2",
-                    Offset      = 18376704,
-                    Length      = 7786,
-                    Sequence    = 13,
-                    Start       = 35892
+                    Description = null, Size       = 3986432, Name  = "Usr file system", Type = "Apple_UNIX_SVR2",
+                    Offset      = 18376704, Length = 7786, Sequence = 13, Start               = 35892
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 5714944,
-                    Name        = "Extra",
-                    Type        = "Apple_Free",
-                    Offset      = 22363136,
-                    Length      = 11162,
-                    Sequence    = 14,
-                    Start       = 43678
+                    Description = null, Size       = 5714944, Name   = "Extra", Type = "Apple_Free",
+                    Offset      = 22363136, Length = 11162, Sequence = 14, Start     = 43678
                 }
             },
+
             // Mac OS 6.0.3
             new[]
             {
                 new Partition
                 {
-                    Description = null,
-                    Size        = 5120,
-                    Name        = null,
-                    Type        = "Apple_Driver",
-                    Offset      = 32768,
-                    Length      = 10,
-                    Sequence    = 0,
-                    Start       = 64
+                    Description = null, Size    = 5120, Name   = null, Type = "Apple_Driver",
+                    Offset      = 32768, Length = 10, Sequence = 0, Start   = 64
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 16384,
-                    Name        = "Macintosh",
-                    Type        = "Apple_Driver",
-                    Offset      = 32768,
-                    Length      = 32,
-                    Sequence    = 1,
-                    Start       = 64
+                    Description = null, Size    = 16384, Name  = "Macintosh", Type = "Apple_Driver",
+                    Offset      = 32768, Length = 32, Sequence = 1, Start          = 64
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 5948928,
-                    Name        = "MacOS",
-                    Type        = "Apple_HFS",
-                    Offset      = 49152,
-                    Length      = 11619,
-                    Sequence    = 2,
-                    Start       = 96
+                    Description = null, Size    = 5948928, Name   = "MacOS", Type = "Apple_HFS",
+                    Offset      = 49152, Length = 11619, Sequence = 2, Start      = 96
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 1029632,
-                    Name        = "Scratch",
-                    Type        = "Apple_Scratch",
-                    Offset      = 5998080,
-                    Length      = 2011,
-                    Sequence    = 3,
-                    Start       = 11715
+                    Description = null, Size      = 1029632, Name  = "Scratch", Type = "Apple_Scratch",
+                    Offset      = 5998080, Length = 2011, Sequence = 3, Start        = 11715
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 2455552,
-                    Name        = "Eschatology 1",
-                    Type        = "Apple_UNIX_SVR2",
-                    Offset      = 7027712,
-                    Length      = 4796,
-                    Sequence    = 4,
-                    Start       = 13726
+                    Description = null, Size      = 2455552, Name  = "Eschatology 1", Type = "Apple_UNIX_SVR2",
+                    Offset      = 7027712, Length = 4796, Sequence = 4, Start              = 13726
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 3932160,
-                    Name        = "A/UX Root",
-                    Type        = "Apple_UNIX_SVR2",
-                    Offset      = 9483264,
-                    Length      = 7680,
-                    Sequence    = 5,
-                    Start       = 18522
+                    Description = null, Size      = 3932160, Name  = "A/UX Root", Type = "Apple_UNIX_SVR2",
+                    Offset      = 9483264, Length = 7680, Sequence = 5, Start          = 18522
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 4194304,
-                    Name        = "Swap",
-                    Type        = "Apple_UNIX_SVR2",
-                    Offset      = 13415424,
-                    Length      = 8192,
-                    Sequence    = 6,
-                    Start       = 26202
+                    Description = null, Size       = 4194304, Name  = "Swap", Type = "Apple_UNIX_SVR2",
+                    Offset      = 13415424, Length = 8192, Sequence = 6, Start     = 26202
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 587776,
-                    Name        = "Eschatology 2",
-                    Type        = "Apple_UNIX_SVR2",
-                    Offset      = 17609728,
-                    Length      = 1148,
-                    Sequence    = 7,
-                    Start       = 34394
+                    Description = null, Size       = 587776, Name   = "Eschatology 2", Type = "Apple_UNIX_SVR2",
+                    Offset      = 17609728, Length = 1148, Sequence = 7, Start              = 34394
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 6537216,
-                    Name        = "Root file system",
-                    Type        = "Apple_UNIX_SVR2",
-                    Offset      = 18197504,
-                    Length      = 12768,
-                    Sequence    = 8,
-                    Start       = 35542
+                    Description = null, Size       = 6537216, Name   = "Root file system", Type = "Apple_UNIX_SVR2",
+                    Offset      = 18197504, Length = 12768, Sequence = 8, Start                 = 35542
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 1766400,
-                    Name        = "Usr file system",
-                    Type        = "Apple_UNIX_SVR2",
-                    Offset      = 24734720,
-                    Length      = 3450,
-                    Sequence    = 9,
-                    Start       = 48310
+                    Description = null, Size       = 1766400, Name  = "Usr file system", Type = "Apple_UNIX_SVR2",
+                    Offset      = 24734720, Length = 3450, Sequence = 9, Start                = 48310
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 18432,
-                    Name        = "Extra",
-                    Type        = "Apple_Free",
-                    Offset      = 26501120,
-                    Length      = 36,
-                    Sequence    = 10,
-                    Start       = 51760
+                    Description = null, Size       = 18432, Name  = "Extra", Type = "Apple_Free",
+                    Offset      = 26501120, Length = 36, Sequence = 10, Start     = 51760
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 1558528,
-                    Name        = "Random A/UX fs",
-                    Type        = "Apple_UNIX_SVR2",
-                    Offset      = 26519552,
-                    Length      = 3044,
-                    Sequence    = 11,
-                    Start       = 51796
+                    Description = null, Size       = 1558528, Name  = "Random A/UX fs", Type = "Apple_UNIX_SVR2",
+                    Offset      = 26519552, Length = 3044, Sequence = 11, Start              = 51796
                 }
             },
+
             // Mac OS 6.0.4
             new[]
             {
                 new Partition
                 {
-                    Description = null,
-                    Size        = 5120,
-                    Name        = null,
-                    Type        = "Apple_Driver",
-                    Offset      = 32768,
-                    Length      = 10,
-                    Sequence    = 0,
-                    Start       = 64
+                    Description = null, Size    = 5120, Name   = null, Type = "Apple_Driver",
+                    Offset      = 32768, Length = 10, Sequence = 0, Start   = 64
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 16384,
-                    Name        = "Macintosh",
-                    Type        = "Apple_Driver",
-                    Offset      = 32768,
-                    Length      = 32,
-                    Sequence    = 1,
-                    Start       = 64
+                    Description = null, Size    = 16384, Name  = "Macintosh", Type = "Apple_Driver",
+                    Offset      = 32768, Length = 32, Sequence = 1, Start          = 64
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 3932160,
-                    Name        = "MacOS",
-                    Type        = "Apple_HFS",
-                    Offset      = 49152,
-                    Length      = 7680,
-                    Sequence    = 2,
-                    Start       = 96
+                    Description = null, Size    = 3932160, Name  = "MacOS", Type = "Apple_HFS",
+                    Offset      = 49152, Length = 7680, Sequence = 2, Start      = 96
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 3197440,
-                    Name        = "Scratch",
-                    Type        = "Apple_Scratch",
-                    Offset      = 3981312,
-                    Length      = 6245,
-                    Sequence    = 3,
-                    Start       = 7776
+                    Description = null, Size      = 3197440, Name  = "Scratch", Type = "Apple_Scratch",
+                    Offset      = 3981312, Length = 6245, Sequence = 3, Start        = 7776
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 3197440,
-                    Name        = "Eschatology 1",
-                    Type        = "Apple_UNIX_SVR2",
-                    Offset      = 7178752,
-                    Length      = 6245,
-                    Sequence    = 4,
-                    Start       = 14021
+                    Description = null, Size      = 3197440, Name  = "Eschatology 1", Type = "Apple_UNIX_SVR2",
+                    Offset      = 7178752, Length = 6245, Sequence = 4, Start              = 14021
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 2626560,
-                    Name        = "A/UX Root",
-                    Type        = "Apple_UNIX_SVR2",
-                    Offset      = 10376192,
-                    Length      = 5130,
-                    Sequence    = 5,
-                    Start       = 20266
+                    Description = null, Size       = 2626560, Name  = "A/UX Root", Type = "Apple_UNIX_SVR2",
+                    Offset      = 10376192, Length = 5130, Sequence = 5, Start          = 20266
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 1370112,
-                    Name        = "Swap",
-                    Type        = "Apple_UNIX_SVR2",
-                    Offset      = 13002752,
-                    Length      = 2676,
-                    Sequence    = 6,
-                    Start       = 25396
+                    Description = null, Size       = 1370112, Name  = "Swap", Type = "Apple_UNIX_SVR2",
+                    Offset      = 13002752, Length = 2676, Sequence = 6, Start     = 25396
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 2944512,
-                    Name        = "Eschatology 2",
-                    Type        = "Apple_UNIX_SVR2",
-                    Offset      = 14372864,
-                    Length      = 5751,
-                    Sequence    = 7,
-                    Start       = 28072
+                    Description = null, Size       = 2944512, Name  = "Eschatology 2", Type = "Apple_UNIX_SVR2",
+                    Offset      = 14372864, Length = 5751, Sequence = 7, Start              = 28072
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 2776576,
-                    Name        = "Root file system",
-                    Type        = "Apple_UNIX_SVR2",
-                    Offset      = 17317376,
-                    Length      = 5423,
-                    Sequence    = 8,
-                    Start       = 33823
+                    Description = null, Size       = 2776576, Name  = "Root file system", Type = "Apple_UNIX_SVR2",
+                    Offset      = 17317376, Length = 5423, Sequence = 8, Start                 = 33823
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 2892800,
-                    Name        = "Usr file system",
-                    Type        = "Apple_UNIX_SVR2",
-                    Offset      = 20093952,
-                    Length      = 5650,
-                    Sequence    = 9,
-                    Start       = 39246
+                    Description = null, Size       = 2892800, Name  = "Usr file system", Type = "Apple_UNIX_SVR2",
+                    Offset      = 20093952, Length = 5650, Sequence = 9, Start                = 39246
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 3433472,
-                    Name        = "Random A/UX fs",
-                    Type        = "Apple_UNIX_SVR2",
-                    Offset      = 22986752,
-                    Length      = 6706,
-                    Sequence    = 10,
-                    Start       = 44896
+                    Description = null, Size       = 3433472, Name  = "Random A/UX fs", Type = "Apple_UNIX_SVR2",
+                    Offset      = 22986752, Length = 6706, Sequence = 10, Start              = 44896
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 1657856,
-                    Name        = "Extra",
-                    Type        = "Apple_Free",
-                    Offset      = 26420224,
-                    Length      = 3238,
-                    Sequence    = 11,
-                    Start       = 51602
+                    Description = null, Size       = 1657856, Name  = "Extra", Type = "Apple_Free",
+                    Offset      = 26420224, Length = 3238, Sequence = 11, Start     = 51602
                 }
             },
+
             // Mac OS 6.0.5
             new[]
             {
                 new Partition
                 {
-                    Description = null,
-                    Size        = 5120,
-                    Name        = null,
-                    Type        = "Apple_Driver",
-                    Offset      = 32768,
-                    Length      = 10,
-                    Sequence    = 0,
-                    Start       = 64
+                    Description = null, Size    = 5120, Name   = null, Type = "Apple_Driver",
+                    Offset      = 32768, Length = 10, Sequence = 0, Start   = 64
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 16384,
-                    Name        = "Macintosh",
-                    Type        = "Apple_Driver",
-                    Offset      = 32768,
-                    Length      = 32,
-                    Sequence    = 1,
-                    Start       = 64
+                    Description = null, Size    = 16384, Name  = "Macintosh", Type = "Apple_Driver",
+                    Offset      = 32768, Length = 32, Sequence = 1, Start          = 64
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 2097152,
-                    Name        = "MacOS",
-                    Type        = "Apple_HFS",
-                    Offset      = 49152,
-                    Length      = 4096,
-                    Sequence    = 2,
-                    Start       = 96
+                    Description = null, Size    = 2097152, Name  = "MacOS", Type = "Apple_HFS",
+                    Offset      = 49152, Length = 4096, Sequence = 2, Start      = 96
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 342528,
-                    Name        = "Scratch",
-                    Type        = "Apple_Scratch",
-                    Offset      = 2146304,
-                    Length      = 669,
-                    Sequence    = 3,
-                    Start       = 4192
+                    Description = null, Size      = 342528, Name  = "Scratch", Type = "Apple_Scratch",
+                    Offset      = 2146304, Length = 669, Sequence = 3, Start        = 4192
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 1417216,
-                    Name        = "Eschatology 1",
-                    Type        = "Apple_UNIX_SVR2",
-                    Offset      = 2488832,
-                    Length      = 2768,
-                    Sequence    = 4,
-                    Start       = 4861
+                    Description = null, Size      = 1417216, Name  = "Eschatology 1", Type = "Apple_UNIX_SVR2",
+                    Offset      = 2488832, Length = 2768, Sequence = 4, Start              = 4861
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 1830912,
-                    Name        = "A/UX Root",
-                    Type        = "Apple_UNIX_SVR2",
-                    Offset      = 3906048,
-                    Length      = 3576,
-                    Sequence    = 5,
-                    Start       = 7629
+                    Description = null, Size      = 1830912, Name  = "A/UX Root", Type = "Apple_UNIX_SVR2",
+                    Offset      = 3906048, Length = 3576, Sequence = 5, Start          = 7629
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 1448960,
-                    Name        = "Swap",
-                    Type        = "Apple_UNIX_SVR2",
-                    Offset      = 5736960,
-                    Length      = 2830,
-                    Sequence    = 6,
-                    Start       = 11205
+                    Description = null, Size      = 1448960, Name  = "Swap", Type = "Apple_UNIX_SVR2",
+                    Offset      = 5736960, Length = 2830, Sequence = 6, Start     = 11205
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 2687488,
-                    Name        = "Root file system",
-                    Type        = "Apple_UNIX_SVR2",
-                    Offset      = 7185920,
-                    Length      = 5249,
-                    Sequence    = 7,
-                    Start       = 14035
+                    Description = null, Size      = 2687488, Name  = "Root file system", Type = "Apple_UNIX_SVR2",
+                    Offset      = 7185920, Length = 5249, Sequence = 7, Start                 = 14035
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 2565632,
-                    Name        = "Usr file system",
-                    Type        = "Apple_UNIX_SVR2",
-                    Offset      = 9873408,
-                    Length      = 5011,
-                    Sequence    = 8,
-                    Start       = 19284
+                    Description = null, Size      = 2565632, Name  = "Usr file system", Type = "Apple_UNIX_SVR2",
+                    Offset      = 9873408, Length = 5011, Sequence = 8, Start                = 19284
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 1954816,
-                    Name        = "Unreserved 1",
-                    Type        = "Apple_UNIX_SVR2",
-                    Offset      = 12439040,
-                    Length      = 3818,
-                    Sequence    = 9,
-                    Start       = 24295
+                    Description = null, Size       = 1954816, Name  = "Unreserved 1", Type = "Apple_UNIX_SVR2",
+                    Offset      = 12439040, Length = 3818, Sequence = 9, Start             = 24295
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 3543040,
-                    Name        = "Unreserved 2",
-                    Type        = "Apple_UNIX_SVR2",
-                    Offset      = 14393856,
-                    Length      = 6920,
-                    Sequence    = 10,
-                    Start       = 28113
+                    Description = null, Size       = 3543040, Name  = "Unreserved 2", Type = "Apple_UNIX_SVR2",
+                    Offset      = 14393856, Length = 6920, Sequence = 10, Start            = 28113
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 2565632,
-                    Name        = "Unreserved 3",
-                    Type        = "Apple_UNIX_SVR2",
-                    Offset      = 17936896,
-                    Length      = 5011,
-                    Sequence    = 11,
-                    Start       = 35033
+                    Description = null, Size       = 2565632, Name  = "Unreserved 3", Type = "Apple_UNIX_SVR2",
+                    Offset      = 17936896, Length = 5011, Sequence = 11, Start            = 35033
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 2932224,
-                    Name        = "Unreserved 4",
-                    Type        = "Apple_UNIX_SVR2",
-                    Offset      = 20502528,
-                    Length      = 5727,
-                    Sequence    = 12,
-                    Start       = 40044
+                    Description = null, Size       = 2932224, Name  = "Unreserved 4", Type = "Apple_UNIX_SVR2",
+                    Offset      = 20502528, Length = 5727, Sequence = 12, Start            = 40044
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 1221632,
-                    Name        = "Random A/UX fs",
-                    Type        = "Apple_UNIX_SVR2",
-                    Offset      = 23434752,
-                    Length      = 2386,
-                    Sequence    = 13,
-                    Start       = 45771
+                    Description = null, Size       = 1221632, Name  = "Random A/UX fs", Type = "Apple_UNIX_SVR2",
+                    Offset      = 23434752, Length = 2386, Sequence = 13, Start              = 45771
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 3421696,
-                    Name        = "Extra",
-                    Type        = "Apple_Free",
-                    Offset      = 24656384,
-                    Length      = 6683,
-                    Sequence    = 14,
-                    Start       = 48157
+                    Description = null, Size       = 3421696, Name  = "Extra", Type = "Apple_Free",
+                    Offset      = 24656384, Length = 6683, Sequence = 14, Start     = 48157
                 }
             },
+
             // Mac OS 6.0.7
             new[]
             {
                 new Partition
                 {
-                    Description = null,
-                    Size        = 5120,
-                    Name        = null,
-                    Type        = "Apple_Driver",
-                    Offset      = 32768,
-                    Length      = 10,
-                    Sequence    = 0,
-                    Start       = 64
+                    Description = null, Size    = 5120, Name   = null, Type = "Apple_Driver",
+                    Offset      = 32768, Length = 10, Sequence = 0, Start   = 64
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 16384,
-                    Name        = "Macintosh",
-                    Type        = "Apple_Driver",
-                    Offset      = 32768,
-                    Length      = 32,
-                    Sequence    = 1,
-                    Start       = 64
+                    Description = null, Size    = 16384, Name  = "Macintosh", Type = "Apple_Driver",
+                    Offset      = 32768, Length = 32, Sequence = 1, Start          = 64
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 14013952,
-                    Name        = "MacOS",
-                    Type        = "Apple_HFS",
-                    Offset      = 49152,
-                    Length      = 27371,
-                    Sequence    = 2,
-                    Start       = 96
+                    Description = null, Size    = 14013952, Name  = "MacOS", Type = "Apple_HFS",
+                    Offset      = 49152, Length = 27371, Sequence = 2, Start      = 96
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 1492992,
-                    Name        = "Eschatology 1",
-                    Type        = "Apple_UNIX_SVR2",
-                    Offset      = 14063104,
-                    Length      = 2916,
-                    Sequence    = 3,
-                    Start       = 27467
+                    Description = null, Size       = 1492992, Name  = "Eschatology 1", Type = "Apple_UNIX_SVR2",
+                    Offset      = 14063104, Length = 2916, Sequence = 3, Start              = 27467
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 919040,
-                    Name        = "A/UX Root",
-                    Type        = "Apple_UNIX_SVR2",
-                    Offset      = 15556096,
-                    Length      = 1795,
-                    Sequence    = 4,
-                    Start       = 30383
+                    Description = null, Size       = 919040, Name   = "A/UX Root", Type = "Apple_UNIX_SVR2",
+                    Offset      = 15556096, Length = 1795, Sequence = 4, Start          = 30383
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 1302016,
-                    Name        = "Swap",
-                    Type        = "Apple_UNIX_SVR2",
-                    Offset      = 16475136,
-                    Length      = 2543,
-                    Sequence    = 5,
-                    Start       = 32178
+                    Description = null, Size       = 1302016, Name  = "Swap", Type = "Apple_UNIX_SVR2",
+                    Offset      = 16475136, Length = 2543, Sequence = 5, Start     = 32178
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 1796608,
-                    Name        = "Root file system",
-                    Type        = "Apple_UNIX_SVR2",
-                    Offset      = 17777152,
-                    Length      = 3509,
-                    Sequence    = 6,
-                    Start       = 34721
+                    Description = null, Size       = 1796608, Name  = "Root file system", Type = "Apple_UNIX_SVR2",
+                    Offset      = 17777152, Length = 3509, Sequence = 6, Start                 = 34721
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 1943552,
-                    Name        = "Usr file system",
-                    Type        = "Apple_UNIX_SVR2",
-                    Offset      = 19573760,
-                    Length      = 3796,
-                    Sequence    = 7,
-                    Start       = 38230
+                    Description = null, Size       = 1943552, Name  = "Usr file system", Type = "Apple_UNIX_SVR2",
+                    Offset      = 19573760, Length = 3796, Sequence = 7, Start                = 38230
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 2186752,
-                    Name        = "Random A/UX fs",
-                    Type        = "Apple_UNIX_SVR2",
-                    Offset      = 21517312,
-                    Length      = 4271,
-                    Sequence    = 8,
-                    Start       = 42026
+                    Description = null, Size       = 2186752, Name  = "Random A/UX fs", Type = "Apple_UNIX_SVR2",
+                    Offset      = 21517312, Length = 4271, Sequence = 8, Start               = 42026
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 524288,
-                    Name        = "Unreserved 1",
-                    Type        = "Apple_UNIX_SVR2",
-                    Offset      = 23704064,
-                    Length      = 1024,
-                    Sequence    = 9,
-                    Start       = 46297
+                    Description = null, Size       = 524288, Name   = "Unreserved 1", Type = "Apple_UNIX_SVR2",
+                    Offset      = 23704064, Length = 1024, Sequence = 9, Start             = 46297
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 655360,
-                    Name        = "Unreserved 2",
-                    Type        = "Apple_UNIX_SVR2",
-                    Offset      = 24228352,
-                    Length      = 1280,
-                    Sequence    = 10,
-                    Start       = 47321
+                    Description = null, Size       = 655360, Name   = "Unreserved 2", Type = "Apple_UNIX_SVR2",
+                    Offset      = 24228352, Length = 1280, Sequence = 10, Start            = 47321
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 798208,
-                    Name        = "Unreserved 3",
-                    Type        = "Apple_UNIX_SVR2",
-                    Offset      = 24883712,
-                    Length      = 1559,
-                    Sequence    = 11,
-                    Start       = 48601
+                    Description = null, Size       = 798208, Name   = "Unreserved 3", Type = "Apple_UNIX_SVR2",
+                    Offset      = 24883712, Length = 1559, Sequence = 11, Start            = 48601
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 143360,
-                    Name        = "Extra",
-                    Type        = "Apple_Free",
-                    Offset      = 25681920,
-                    Length      = 280,
-                    Sequence    = 12,
-                    Start       = 50160
+                    Description = null, Size       = 143360, Name  = "Extra", Type = "Apple_Free",
+                    Offset      = 25681920, Length = 280, Sequence = 12, Start     = 50160
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 2252800,
-                    Name        = "Unreserved 4",
-                    Type        = "Apple_UNIX_SVR2",
-                    Offset      = 25825280,
-                    Length      = 4400,
-                    Sequence    = 13,
-                    Start       = 50440
+                    Description = null, Size       = 2252800, Name  = "Unreserved 4", Type = "Apple_UNIX_SVR2",
+                    Offset      = 25825280, Length = 4400, Sequence = 13, Start            = 50440
                 }
             },
+
             // Mac OS 6.0.8
             new[]
             {
                 new Partition
                 {
-                    Description = null,
-                    Size        = 5120,
-                    Name        = null,
-                    Type        = "Apple_Driver",
-                    Offset      = 32768,
-                    Length      = 10,
-                    Sequence    = 0,
-                    Start       = 64
+                    Description = null, Size    = 5120, Name   = null, Type = "Apple_Driver",
+                    Offset      = 32768, Length = 10, Sequence = 0, Start   = 64
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 16384,
-                    Name        = "Macintosh",
-                    Type        = "Apple_Driver",
-                    Offset      = 32768,
-                    Length      = 32,
-                    Sequence    = 1,
-                    Start       = 64
+                    Description = null, Size    = 16384, Name  = "Macintosh", Type = "Apple_Driver",
+                    Offset      = 32768, Length = 32, Sequence = 1, Start          = 64
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 4575744,
-                    Name        = "MacOS",
-                    Type        = "Apple_HFS",
-                    Offset      = 49152,
-                    Length      = 8937,
-                    Sequence    = 2,
-                    Start       = 96
+                    Description = null, Size    = 4575744, Name  = "MacOS", Type = "Apple_HFS",
+                    Offset      = 49152, Length = 8937, Sequence = 2, Start      = 96
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 1143808,
-                    Name        = "Scratch",
-                    Type        = "Apple_Scratch",
-                    Offset      = 4624896,
-                    Length      = 2234,
-                    Sequence    = 3,
-                    Start       = 9033
+                    Description = null, Size      = 1143808, Name  = "Scratch", Type = "Apple_Scratch",
+                    Offset      = 4624896, Length = 2234, Sequence = 3, Start        = 9033
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 3020800,
-                    Name        = "Eschatology 1",
-                    Type        = "Apple_UNIX_SVR2",
-                    Offset      = 5768704,
-                    Length      = 5900,
-                    Sequence    = 4,
-                    Start       = 11267
+                    Description = null, Size      = 3020800, Name  = "Eschatology 1", Type = "Apple_UNIX_SVR2",
+                    Offset      = 5768704, Length = 5900, Sequence = 4, Start              = 11267
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 1615872,
-                    Name        = "Unreserved 1",
-                    Type        = "Apple_UNIX_SVR2",
-                    Offset      = 8789504,
-                    Length      = 3156,
-                    Sequence    = 5,
-                    Start       = 17167
+                    Description = null, Size      = 1615872, Name  = "Unreserved 1", Type = "Apple_UNIX_SVR2",
+                    Offset      = 8789504, Length = 3156, Sequence = 5, Start             = 17167
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 1384960,
-                    Name        = "Unreserved 3",
-                    Type        = "Apple_UNIX_SVR2",
-                    Offset      = 10405376,
-                    Length      = 2705,
-                    Sequence    = 6,
-                    Start       = 20323
+                    Description = null, Size       = 1384960, Name  = "Unreserved 3", Type = "Apple_UNIX_SVR2",
+                    Offset      = 10405376, Length = 2705, Sequence = 6, Start             = 20323
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 952832,
-                    Name        = "Unreserved 4",
-                    Type        = "Apple_UNIX_SVR2",
-                    Offset      = 11790336,
-                    Length      = 1861,
-                    Sequence    = 7,
-                    Start       = 23028
+                    Description = null, Size       = 952832, Name   = "Unreserved 4", Type = "Apple_UNIX_SVR2",
+                    Offset      = 11790336, Length = 1861, Sequence = 7, Start             = 23028
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 1246208,
-                    Name        = "Extra",
-                    Type        = "Apple_Free",
-                    Offset      = 12743168,
-                    Length      = 2434,
-                    Sequence    = 8,
-                    Start       = 24889
+                    Description = null, Size       = 1246208, Name  = "Extra", Type = "Apple_Free",
+                    Offset      = 12743168, Length = 2434, Sequence = 8, Start      = 24889
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 1495040,
-                    Name        = "Random A/UX fs",
-                    Type        = "Apple_UNIX_SVR2",
-                    Offset      = 13989376,
-                    Length      = 2920,
-                    Sequence    = 9,
-                    Start       = 27323
+                    Description = null, Size       = 1495040, Name  = "Random A/UX fs", Type = "Apple_UNIX_SVR2",
+                    Offset      = 13989376, Length = 2920, Sequence = 9, Start               = 27323
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 1615872,
-                    Name        = "Unreserved 2",
-                    Type        = "Apple_UNIX_SVR2",
-                    Offset      = 15484416,
-                    Length      = 3156,
-                    Sequence    = 10,
-                    Start       = 30243
+                    Description = null, Size       = 1615872, Name  = "Unreserved 2", Type = "Apple_UNIX_SVR2",
+                    Offset      = 15484416, Length = 3156, Sequence = 10, Start            = 30243
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 2885120,
-                    Name        = "Usr file system",
-                    Type        = "Apple_UNIX_SVR2",
-                    Offset      = 17100288,
-                    Length      = 5635,
-                    Sequence    = 11,
-                    Start       = 33399
+                    Description = null, Size       = 2885120, Name  = "Usr file system", Type = "Apple_UNIX_SVR2",
+                    Offset      = 17100288, Length = 5635, Sequence = 11, Start               = 33399
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 2308096,
-                    Name        = "Root file system",
-                    Type        = "Apple_UNIX_SVR2",
-                    Offset      = 19985408,
-                    Length      = 4508,
-                    Sequence    = 12,
-                    Start       = 39034
+                    Description = null, Size       = 2308096, Name  = "Root file system", Type = "Apple_UNIX_SVR2",
+                    Offset      = 19985408, Length = 4508, Sequence = 12, Start                = 39034
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 3693056,
-                    Name        = "Swap",
-                    Type        = "Apple_UNIX_SVR2",
-                    Offset      = 22293504,
-                    Length      = 7213,
-                    Sequence    = 13,
-                    Start       = 43542
+                    Description = null, Size       = 3693056, Name  = "Swap", Type = "Apple_UNIX_SVR2",
+                    Offset      = 22293504, Length = 7213, Sequence = 13, Start    = 43542
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 2091520,
-                    Name        = "A/UX Root",
-                    Type        = "Apple_UNIX_SVR2",
-                    Offset      = 25986560,
-                    Length      = 4085,
-                    Sequence    = 14,
-                    Start       = 50755
+                    Description = null, Size       = 2091520, Name  = "A/UX Root", Type = "Apple_UNIX_SVR2",
+                    Offset      = 25986560, Length = 4085, Sequence = 14, Start         = 50755
                 }
             },
+
             // Mac OS 6.0
             new[]
             {
                 new Partition
                 {
-                    Description = null,
-                    Size        = 5120,
-                    Name        = null,
-                    Type        = "Apple_Driver",
-                    Offset      = 32768,
-                    Length      = 10,
-                    Sequence    = 0,
-                    Start       = 64
+                    Description = null, Size    = 5120, Name   = null, Type = "Apple_Driver",
+                    Offset      = 32768, Length = 10, Sequence = 0, Start   = 64
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 16384,
-                    Name        = "Macintosh",
-                    Type        = "Apple_Driver",
-                    Offset      = 32768,
-                    Length      = 32,
-                    Sequence    = 1,
-                    Start       = 64
+                    Description = null, Size    = 16384, Name  = "Macintosh", Type = "Apple_Driver",
+                    Offset      = 32768, Length = 32, Sequence = 1, Start          = 64
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 2097152,
-                    Name        = "MacOS",
-                    Type        = "Apple_HFS",
-                    Offset      = 49152,
-                    Length      = 4096,
-                    Sequence    = 2,
-                    Start       = 96
+                    Description = null, Size    = 2097152, Name  = "MacOS", Type = "Apple_HFS",
+                    Offset      = 49152, Length = 4096, Sequence = 2, Start      = 96
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 2097152,
-                    Name        = "Scratch",
-                    Type        = "Apple_Scratch",
-                    Offset      = 2146304,
-                    Length      = 4096,
-                    Sequence    = 3,
-                    Start       = 4192
+                    Description = null, Size      = 2097152, Name  = "Scratch", Type = "Apple_Scratch",
+                    Offset      = 2146304, Length = 4096, Sequence = 3, Start        = 4192
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 2097152,
-                    Name        = "Eschatology 1",
-                    Type        = "Apple_UNIX_SVR2",
-                    Offset      = 4243456,
-                    Length      = 4096,
-                    Sequence    = 4,
-                    Start       = 8288
+                    Description = null, Size      = 2097152, Name  = "Eschatology 1", Type = "Apple_UNIX_SVR2",
+                    Offset      = 4243456, Length = 4096, Sequence = 4, Start              = 8288
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 2097152,
-                    Name        = "A/UX Root",
-                    Type        = "Apple_UNIX_SVR2",
-                    Offset      = 6340608,
-                    Length      = 4096,
-                    Sequence    = 5,
-                    Start       = 12384
+                    Description = null, Size      = 2097152, Name  = "A/UX Root", Type = "Apple_UNIX_SVR2",
+                    Offset      = 6340608, Length = 4096, Sequence = 5, Start          = 12384
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 1048576,
-                    Name        = "Swap",
-                    Type        = "Apple_UNIX_SVR2",
-                    Offset      = 8437760,
-                    Length      = 2048,
-                    Sequence    = 6,
-                    Start       = 16480
+                    Description = null, Size      = 1048576, Name  = "Swap", Type = "Apple_UNIX_SVR2",
+                    Offset      = 8437760, Length = 2048, Sequence = 6, Start     = 16480
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 2097152,
-                    Name        = "Eschatology 2",
-                    Type        = "Apple_UNIX_SVR2",
-                    Offset      = 9486336,
-                    Length      = 4096,
-                    Sequence    = 7,
-                    Start       = 18528
+                    Description = null, Size      = 2097152, Name  = "Eschatology 2", Type = "Apple_UNIX_SVR2",
+                    Offset      = 9486336, Length = 4096, Sequence = 7, Start              = 18528
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 2097152,
-                    Name        = "Root file system",
-                    Type        = "Apple_UNIX_SVR2",
-                    Offset      = 11583488,
-                    Length      = 4096,
-                    Sequence    = 8,
-                    Start       = 22624
+                    Description = null, Size       = 2097152, Name  = "Root file system", Type = "Apple_UNIX_SVR2",
+                    Offset      = 11583488, Length = 4096, Sequence = 8, Start                 = 22624
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 2310144,
-                    Name        = "Usr file system",
-                    Type        = "Apple_UNIX_SVR2",
-                    Offset      = 13680640,
-                    Length      = 4512,
-                    Sequence    = 9,
-                    Start       = 26720
+                    Description = null, Size       = 2310144, Name  = "Usr file system", Type = "Apple_UNIX_SVR2",
+                    Offset      = 13680640, Length = 4512, Sequence = 9, Start                = 26720
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 5416960,
-                    Name        = "Random A/UX fs",
-                    Type        = "Apple_UNIX_SVR2",
-                    Offset      = 15990784,
-                    Length      = 10580,
-                    Sequence    = 10,
-                    Start       = 31232
+                    Description = null, Size       = 5416960, Name   = "Random A/UX fs", Type = "Apple_UNIX_SVR2",
+                    Offset      = 15990784, Length = 10580, Sequence = 10, Start              = 31232
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 4096,
-                    Name        = "Extra",
-                    Type        = "Apple_Free",
-                    Offset      = 21407744,
-                    Length      = 8,
-                    Sequence    = 11,
-                    Start       = 41812
+                    Description = null, Size       = 4096, Name  = "Extra", Type = "Apple_Free",
+                    Offset      = 21407744, Length = 8, Sequence = 11, Start     = 41812
                 }
             },
+
             // Mac OS 7.0
             new[]
             {
                 new Partition
                 {
-                    Description = null,
-                    Size        = 5120,
-                    Name        = null,
-                    Type        = "Apple_Driver",
-                    Offset      = 32768,
-                    Length      = 10,
-                    Sequence    = 0,
-                    Start       = 64
+                    Description = null, Size    = 5120, Name   = null, Type = "Apple_Driver",
+                    Offset      = 32768, Length = 10, Sequence = 0, Start   = 64
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 16384,
-                    Name        = "Macintosh",
-                    Type        = "Apple_Driver",
-                    Offset      = 32768,
-                    Length      = 32,
-                    Sequence    = 1,
-                    Start       = 64
+                    Description = null, Size    = 16384, Name  = "Macintosh", Type = "Apple_Driver",
+                    Offset      = 32768, Length = 32, Sequence = 1, Start          = 64
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 3073024,
-                    Name        = "Scratch",
-                    Type        = "Apple_Scratch",
-                    Offset      = 49152,
-                    Length      = 6002,
-                    Sequence    = 2,
-                    Start       = 96
+                    Description = null, Size    = 3073024, Name  = "Scratch", Type = "Apple_Scratch",
+                    Offset      = 49152, Length = 6002, Sequence = 2, Start        = 96
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 2726400,
-                    Name        = "Root file system",
-                    Type        = "Apple_UNIX_SVR2",
-                    Offset      = 3122176,
-                    Length      = 5325,
-                    Sequence    = 3,
-                    Start       = 6098
+                    Description = null, Size      = 2726400, Name  = "Root file system", Type = "Apple_UNIX_SVR2",
+                    Offset      = 3122176, Length = 5325, Sequence = 3, Start                 = 6098
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 3180544,
-                    Name        = "Extra",
-                    Type        = "Apple_Free",
-                    Offset      = 5848576,
-                    Length      = 6212,
-                    Sequence    = 4,
-                    Start       = 11423
+                    Description = null, Size      = 3180544, Name  = "Extra", Type = "Apple_Free",
+                    Offset      = 5848576, Length = 6212, Sequence = 4, Start      = 11423
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 4203520,
-                    Name        = "Random A/UX fs",
-                    Type        = "Apple_UNIX_SVR2",
-                    Offset      = 9029120,
-                    Length      = 8210,
-                    Sequence    = 5,
-                    Start       = 17635
+                    Description = null, Size      = 4203520, Name  = "Random A/UX fs", Type = "Apple_UNIX_SVR2",
+                    Offset      = 9029120, Length = 8210, Sequence = 5, Start               = 17635
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 2613248,
-                    Name        = "Extra",
-                    Type        = "Apple_Free",
-                    Offset      = 13232640,
-                    Length      = 5104,
-                    Sequence    = 6,
-                    Start       = 25845
+                    Description = null, Size       = 2613248, Name  = "Extra", Type = "Apple_Free",
+                    Offset      = 13232640, Length = 5104, Sequence = 6, Start      = 25845
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 5262336,
-                    Name        = "MacOS",
-                    Type        = "Apple_HFS",
-                    Offset      = 15845888,
-                    Length      = 10278,
-                    Sequence    = 7,
-                    Start       = 30949
+                    Description = null, Size       = 5262336, Name   = "MacOS", Type = "Apple_HFS",
+                    Offset      = 15845888, Length = 10278, Sequence = 7, Start      = 30949
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 1707520,
-                    Name        = "Eschatology 1",
-                    Type        = "Apple_UNIX_SVR2",
-                    Offset      = 21108224,
-                    Length      = 3335,
-                    Sequence    = 8,
-                    Start       = 41227
+                    Description = null, Size       = 1707520, Name  = "Eschatology 1", Type = "Apple_UNIX_SVR2",
+                    Offset      = 21108224, Length = 3335, Sequence = 8, Start              = 41227
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 5262336,
-                    Name        = "Extra",
-                    Type        = "Apple_Free",
-                    Offset      = 22815744,
-                    Length      = 10278,
-                    Sequence    = 9,
-                    Start       = 44562
+                    Description = null, Size       = 5262336, Name   = "Extra", Type = "Apple_Free",
+                    Offset      = 22815744, Length = 10278, Sequence = 9, Start      = 44562
                 }
             },
+
             // Mac OS 7.1.1
             new[]
             {
                 new Partition
                 {
-                    Description = null,
-                    Size        = 8704,
-                    Name        = null,
-                    Type        = "Apple_Driver",
-                    Offset      = 32768,
-                    Length      = 17,
-                    Sequence    = 0,
-                    Start       = 64
+                    Description = null, Size    = 8704, Name   = null, Type = "Apple_Driver",
+                    Offset      = 32768, Length = 17, Sequence = 0, Start   = 64
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 16384,
-                    Name        = "Macintosh",
-                    Type        = "Apple_Driver43",
-                    Offset      = 32768,
-                    Length      = 32,
-                    Sequence    = 1,
-                    Start       = 64
+                    Description = null, Size    = 16384, Name  = "Macintosh", Type = "Apple_Driver43",
+                    Offset      = 32768, Length = 32, Sequence = 1, Start          = 64
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 1486848,
-                    Name        = "Random A/UX fs",
-                    Type        = "Apple_UNIX_SVR2",
-                    Offset      = 49152,
-                    Length      = 2904,
-                    Sequence    = 2,
-                    Start       = 96
+                    Description = null, Size    = 1486848, Name  = "Random A/UX fs", Type = "Apple_UNIX_SVR2",
+                    Offset      = 49152, Length = 2904, Sequence = 2, Start               = 96
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 2097152,
-                    Name        = "ProDOS",
-                    Type        = "Apple_PRODOS",
-                    Offset      = 1536000,
-                    Length      = 4096,
-                    Sequence    = 3,
-                    Start       = 3000
+                    Description = null, Size      = 2097152, Name  = "ProDOS", Type = "Apple_PRODOS",
+                    Offset      = 1536000, Length = 4096, Sequence = 3, Start       = 3000
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 1564160,
-                    Name        = "Extra",
-                    Type        = "Apple_Free",
-                    Offset      = 3633152,
-                    Length      = 3055,
-                    Sequence    = 4,
-                    Start       = 7096
+                    Description = null, Size      = 1564160, Name  = "Extra", Type = "Apple_Free",
+                    Offset      = 3633152, Length = 3055, Sequence = 4, Start      = 7096
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 2097152,
-                    Name        = "ProDOS",
-                    Type        = "Apple_PRODOS",
-                    Offset      = 5197312,
-                    Length      = 4096,
-                    Sequence    = 5,
-                    Start       = 10151
+                    Description = null, Size      = 2097152, Name  = "ProDOS", Type = "Apple_PRODOS",
+                    Offset      = 5197312, Length = 4096, Sequence = 5, Start       = 10151
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 5148160,
-                    Name        = "MacOS",
-                    Type        = "Apple_HFS",
-                    Offset      = 7294464,
-                    Length      = 10055,
-                    Sequence    = 6,
-                    Start       = 14247
+                    Description = null, Size      = 5148160, Name   = "MacOS", Type = "Apple_HFS",
+                    Offset      = 7294464, Length = 10055, Sequence = 6, Start      = 14247
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 4406784,
-                    Name        = "Extra",
-                    Type        = "Apple_Free",
-                    Offset      = 12442624,
-                    Length      = 8607,
-                    Sequence    = 7,
-                    Start       = 24302
+                    Description = null, Size       = 4406784, Name  = "Extra", Type = "Apple_Free",
+                    Offset      = 12442624, Length = 8607, Sequence = 7, Start      = 24302
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 2485760,
-                    Name        = "Random A/UX fs",
-                    Type        = "Apple_UNIX_SVR2",
-                    Offset      = 16849408,
-                    Length      = 4855,
-                    Sequence    = 8,
-                    Start       = 32909
+                    Description = null, Size       = 2485760, Name  = "Random A/UX fs", Type = "Apple_UNIX_SVR2",
+                    Offset      = 16849408, Length = 4855, Sequence = 8, Start               = 32909
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 4746240,
-                    Name        = "Extra",
-                    Type        = "Apple_Free",
-                    Offset      = 19335168,
-                    Length      = 9270,
-                    Sequence    = 9,
-                    Start       = 37764
+                    Description = null, Size       = 4746240, Name  = "Extra", Type = "Apple_Free",
+                    Offset      = 19335168, Length = 9270, Sequence = 9, Start      = 37764
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 3996672,
-                    Name        = "A/UX Root",
-                    Type        = "Apple_UNIX_SVR2",
-                    Offset      = 24081408,
-                    Length      = 7806,
-                    Sequence    = 10,
-                    Start       = 47034
+                    Description = null, Size       = 3996672, Name  = "A/UX Root", Type = "Apple_UNIX_SVR2",
+                    Offset      = 24081408, Length = 7806, Sequence = 10, Start         = 47034
                 }
             },
+
             // Mac OS 7.5
             new[]
             {
                 new Partition
                 {
-                    Description = null,
-                    Size        = 9216,
-                    Name        = null,
-                    Type        = "Apple_Driver",
-                    Offset      = 32768,
-                    Length      = 18,
-                    Sequence    = 0,
-                    Start       = 64
+                    Description = null, Size    = 9216, Name   = null, Type = "Apple_Driver",
+                    Offset      = 32768, Length = 18, Sequence = 0, Start   = 64
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 16384,
-                    Name        = "Macintosh",
-                    Type        = "Apple_Driver43",
-                    Offset      = 32768,
-                    Length      = 32,
-                    Sequence    = 1,
-                    Start       = 64
+                    Description = null, Size    = 16384, Name  = "Macintosh", Type = "Apple_Driver43",
+                    Offset      = 32768, Length = 32, Sequence = 1, Start          = 64
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 28028928,
-                    Name        = "MacOS",
-                    Type        = "Apple_HFS",
-                    Offset      = 49152,
-                    Length      = 54744,
-                    Sequence    = 2,
-                    Start       = 96
+                    Description = null, Size    = 28028928, Name  = "MacOS", Type = "Apple_HFS",
+                    Offset      = 49152, Length = 54744, Sequence = 2, Start      = 96
                 }
             },
+
             // GNU Parted
             new[]
             {
                 new Partition
                 {
-                    Description = null,
-                    Size        = 2064384,
-                    Name        = "Extra",
-                    Type        = "Apple_Free",
-                    Offset      = 32768,
-                    Length      = 4032,
-                    Sequence    = 0,
-                    Start       = 64
+                    Description = null, Size    = 2064384, Name  = "Extra", Type = "Apple_Free",
+                    Offset      = 32768, Length = 4032, Sequence = 0, Start      = 64
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 47185920,
-                    Name        = "untitled",
-                    Type        = "Apple_HFS",
-                    Offset      = 2097152,
-                    Length      = 92160,
-                    Sequence    = 1,
-                    Start       = 4096
+                    Description = null, Size      = 47185920, Name  = "untitled", Type = "Apple_HFS",
+                    Offset      = 2097152, Length = 92160, Sequence = 1, Start         = 4096
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 84934656,
-                    Name        = "untitled",
-                    Type        = "Apple_UNIX_SVR2",
-                    Offset      = 49283072,
-                    Length      = 165888,
-                    Sequence    = 2,
-                    Start       = 96256
+                    Description = null, Size       = 84934656, Name   = "untitled", Type = "Apple_UNIX_SVR2",
+                    Offset      = 49283072, Length = 165888, Sequence = 2, Start         = 96256
                 }
             },
+
             // Silverlining 2.2.1
             new[]
             {
                 new Partition
                 {
-                    Description = null,
-                    Size        = 3072,
-                    Name        = null,
-                    Type        = "Apple_Driver",
-                    Offset      = 32768,
-                    Length      = 6,
-                    Sequence    = 0,
-                    Start       = 64
+                    Description = null, Size    = 3072, Name  = null, Type = "Apple_Driver",
+                    Offset      = 32768, Length = 6, Sequence = 0, Start   = 64
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 65536,
-                    Name        = "Macintosh_SL",
-                    Type        = "Apple_Driver43",
-                    Offset      = 32768,
-                    Length      = 128,
-                    Sequence    = 1,
-                    Start       = 64
+                    Description = null, Size    = 65536, Name   = "Macintosh_SL", Type = "Apple_Driver43",
+                    Offset      = 32768, Length = 128, Sequence = 1, Start             = 64
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 25088,
-                    Name        = null,
-                    Type        = "Apple_Driver",
-                    Offset      = 98304,
-                    Length      = 49,
-                    Sequence    = 2,
-                    Start       = 192
+                    Description = null, Size    = 25088, Name  = null, Type = "Apple_Driver",
+                    Offset      = 98304, Length = 49, Sequence = 2, Start   = 192
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 65536,
-                    Name        = "Macintosh_SL",
-                    Type        = "Apple_Driver_ATA",
-                    Offset      = 98304,
-                    Length      = 128,
-                    Sequence    = 3,
-                    Start       = 192
+                    Description = null, Size    = 65536, Name   = "Macintosh_SL", Type = "Apple_Driver_ATA",
+                    Offset      = 98304, Length = 128, Sequence = 3, Start             = 192
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 25804800,
-                    Name        = "Untitled  #1",
-                    Type        = "Apple_HFS",
-                    Offset      = 163840,
-                    Length      = 50400,
-                    Sequence    = 4,
-                    Start       = 320
+                    Description = null, Size     = 25804800, Name  = "Untitled  #1", Type = "Apple_HFS",
+                    Offset      = 163840, Length = 50400, Sequence = 4, Start             = 320
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 237568,
-                    Name        = "Extra",
-                    Type        = "Apple_Free",
-                    Offset      = 25968640,
-                    Length      = 464,
-                    Sequence    = 5,
-                    Start       = 50720
+                    Description = null, Size       = 237568, Name  = "Extra", Type = "Apple_Free",
+                    Offset      = 25968640, Length = 464, Sequence = 5, Start      = 50720
                 }
             },
+
             // Hard Disk Speed Tools 3.6
             new[]
             {
                 new Partition
                 {
-                    Description = null,
-                    Size        = 13824,
-                    Name        = null,
-                    Type        = "Apple_Driver",
-                    Offset      = 32768,
-                    Length      = 27,
-                    Sequence    = 0,
-                    Start       = 64
+                    Description = null, Size    = 13824, Name  = null, Type = "Apple_Driver",
+                    Offset      = 32768, Length = 27, Sequence = 0, Start   = 64
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 51200,
-                    Name        = "Macintosh",
-                    Type        = "Apple_Driver43",
-                    Offset      = 32768,
-                    Length      = 100,
-                    Sequence    = 1,
-                    Start       = 64
+                    Description = null, Size    = 51200, Name   = "Macintosh", Type = "Apple_Driver43",
+                    Offset      = 32768, Length = 100, Sequence = 1, Start          = 64
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 25165824,
-                    Name        = "untitled",
-                    Type        = "Apple_HFS",
-                    Offset      = 83968,
-                    Length      = 49152,
-                    Sequence    = 2,
-                    Start       = 164
+                    Description = null, Size    = 25165824, Name  = "untitled", Type = "Apple_HFS",
+                    Offset      = 83968, Length = 49152, Sequence = 2, Start         = 164
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 963584,
-                    Name        = "Extra",
-                    Type        = "Apple_Free",
-                    Offset      = 25249792,
-                    Length      = 1882,
-                    Sequence    = 3,
-                    Start       = 49316
+                    Description = null, Size       = 963584, Name   = "Extra", Type = "Apple_Free",
+                    Offset      = 25249792, Length = 1882, Sequence = 3, Start      = 49316
                 }
             },
+
             // VCP Formatter 2.1.1
             new[]
             {
                 new Partition
                 {
-                    Description = null,
-                    Size        = 12288,
-                    Name        = null,
-                    Type        = "Apple_Driver",
-                    Offset      = 57344,
-                    Length      = 24,
-                    Sequence    = 0,
-                    Start       = 112
+                    Description = null, Size    = 12288, Name  = null, Type = "Apple_Driver",
+                    Offset      = 57344, Length = 24, Sequence = 0, Start   = 112
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 16384,
-                    Name        = "Macintosh",
-                    Type        = "Apple_Driver",
-                    Offset      = 57344,
-                    Length      = 32,
-                    Sequence    = 1,
-                    Start       = 112
+                    Description = null, Size    = 16384, Name  = "Macintosh", Type = "Apple_Driver",
+                    Offset      = 57344, Length = 32, Sequence = 1, Start          = 112
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 16384,
-                    Name        = "Extra",
-                    Type        = "Apple_Free",
-                    Offset      = 73728,
-                    Length      = 32,
-                    Sequence    = 2,
-                    Start       = 144
+                    Description = null, Size    = 16384, Name  = "Extra", Type = "Apple_Free",
+                    Offset      = 73728, Length = 32, Sequence = 2, Start      = 144
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 27986944,
-                    Name        = "MacOS",
-                    Type        = "Apple_HFS",
-                    Offset      = 90112,
-                    Length      = 54662,
-                    Sequence    = 3,
-                    Start       = 176
+                    Description = null, Size    = 27986944, Name  = "MacOS", Type = "Apple_HFS",
+                    Offset      = 90112, Length = 54662, Sequence = 3, Start      = 176
                 },
+
                 // TODO: ADFS tries to read past this partition...
                 new Partition
                 {
-                    Description = null,
-                    Size        = 1024,
-                    Name        = "Extra",
-                    Type        = "Apple_Free",
-                    Offset      = 28077056,
-                    Length      = 2,
-                    Sequence    = 4,
-                    Start       = 54838
+                    Description = null, Size       = 1024, Name  = "Extra", Type = "Apple_Free",
+                    Offset      = 28077056, Length = 2, Sequence = 4, Start      = 54838
                 }
             }
         };
@@ -2010,17 +1026,18 @@ namespace Aaru.Tests.Partitions
                 Assert.AreEqual(true, image.Open(filter), testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 Assert.AreEqual(wanted[i].Length, partitions.Count, testfiles[i]);
+
                 for(int j = 0; j < partitions.Count; j++)
                 {
                     // Too chatty
                     //Assert.AreEqual(wanted[i][j].PartitionDescription, partitions[j].PartitionDescription, testfiles[i]);
-                    Assert.AreEqual(wanted[i][j].Size,     partitions[j].Size,     testfiles[i]);
-                    Assert.AreEqual(wanted[i][j].Name,     partitions[j].Name,     testfiles[i]);
-                    Assert.AreEqual(wanted[i][j].Type,     partitions[j].Type,     testfiles[i]);
-                    Assert.AreEqual(wanted[i][j].Offset,   partitions[j].Offset,   testfiles[i]);
-                    Assert.AreEqual(wanted[i][j].Length,   partitions[j].Length,   testfiles[i]);
+                    Assert.AreEqual(wanted[i][j].Size, partitions[j].Size, testfiles[i]);
+                    Assert.AreEqual(wanted[i][j].Name, partitions[j].Name, testfiles[i]);
+                    Assert.AreEqual(wanted[i][j].Type, partitions[j].Type, testfiles[i]);
+                    Assert.AreEqual(wanted[i][j].Offset, partitions[j].Offset, testfiles[i]);
+                    Assert.AreEqual(wanted[i][j].Length, partitions[j].Length, testfiles[i]);
                     Assert.AreEqual(wanted[i][j].Sequence, partitions[j].Sequence, testfiles[i]);
-                    Assert.AreEqual(wanted[i][j].Start,    partitions[j].Start,    testfiles[i]);
+                    Assert.AreEqual(wanted[i][j].Start, partitions[j].Start, testfiles[i]);
                 }
             }
         }
diff --git a/Aaru.Tests/Partitions/Atari.cs b/Aaru.Tests/Partitions/Atari.cs
index 7634577cc..631c50f25 100644
--- a/Aaru.Tests/Partitions/Atari.cs
+++ b/Aaru.Tests/Partitions/Atari.cs
@@ -39,7 +39,10 @@ namespace Aaru.Tests.Partitions
     [TestFixture]
     public class Atari
     {
-        readonly string[] testfiles = {"linux_ahdi.vdi.lz", "linux_icd.vdi.lz", "tos_1.04.vdi.lz"};
+        readonly string[] testfiles =
+        {
+            "linux_ahdi.vdi.lz", "linux_icd.vdi.lz", "tos_1.04.vdi.lz"
+        };
 
         readonly Partition[][] wanted =
         {
@@ -48,264 +51,128 @@ namespace Aaru.Tests.Partitions
             {
                 new Partition
                 {
-                    Description = null,
-                    Size        = 31457280,
-                    Name        = null,
-                    Type        = "GEM",
-                    Offset      = 512,
-                    Length      = 61440,
-                    Sequence    = 0,
-                    Start       = 1
+                    Description = null, Size  = 31457280, Name  = null, Type = "GEM",
+                    Offset      = 512, Length = 61440, Sequence = 0, Start   = 1
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 41943040,
-                    Name        = null,
-                    Type        = "BGM",
-                    Offset      = 31457792,
-                    Length      = 81920,
-                    Sequence    = 1,
-                    Start       = 61441
+                    Description = null, Size       = 41943040, Name  = null, Type = "BGM",
+                    Offset      = 31457792, Length = 81920, Sequence = 1, Start   = 61441
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 56402432,
-                    Name        = null,
-                    Type        = "LNX",
-                    Offset      = 73400832,
-                    Length      = 110161,
-                    Sequence    = 2,
-                    Start       = 143361
+                    Description = null, Size       = 56402432, Name   = null, Type = "LNX",
+                    Offset      = 73400832, Length = 110161, Sequence = 2, Start   = 143361
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 43212800,
-                    Name        = null,
-                    Type        = "MAC",
-                    Offset      = 129803264,
-                    Length      = 84400,
-                    Sequence    = 3,
-                    Start       = 253522
+                    Description = null, Size        = 43212800, Name  = null, Type = "MAC",
+                    Offset      = 129803264, Length = 84400, Sequence = 3, Start   = 253522
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 57671680,
-                    Name        = null,
-                    Type        = "MIX",
-                    Offset      = 173016064,
-                    Length      = 112640,
-                    Sequence    = 4,
-                    Start       = 337922
+                    Description = null, Size        = 57671680, Name   = null, Type = "MIX",
+                    Offset      = 173016064, Length = 112640, Sequence = 4, Start   = 337922
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 62914560,
-                    Name        = null,
-                    Type        = "MNX",
-                    Offset      = 230687744,
-                    Length      = 122880,
-                    Sequence    = 5,
-                    Start       = 450562
+                    Description = null, Size        = 62914560, Name   = null, Type = "MNX",
+                    Offset      = 230687744, Length = 122880, Sequence = 5, Start   = 450562
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 73400320,
-                    Name        = null,
-                    Type        = "RAW",
-                    Offset      = 293602304,
-                    Length      = 143360,
-                    Sequence    = 6,
-                    Start       = 573442
+                    Description = null, Size        = 73400320, Name   = null, Type = "RAW",
+                    Offset      = 293602304, Length = 143360, Sequence = 6, Start   = 573442
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 78643200,
-                    Name        = null,
-                    Type        = "SWP",
-                    Offset      = 367002624,
-                    Length      = 153600,
-                    Sequence    = 7,
-                    Start       = 716802
+                    Description = null, Size        = 78643200, Name   = null, Type = "SWP",
+                    Offset      = 367002624, Length = 153600, Sequence = 7, Start   = 716802
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 1048576,
-                    Name        = null,
-                    Type        = "UNX",
-                    Offset      = 445645824,
-                    Length      = 2048,
-                    Sequence    = 8,
-                    Start       = 870402
+                    Description = null, Size        = 1048576, Name  = null, Type = "UNX",
+                    Offset      = 445645824, Length = 2048, Sequence = 8, Start   = 870402
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 77593600,
-                    Name        = null,
-                    Type        = "LNX",
-                    Offset      = 446694400,
-                    Length      = 151550,
-                    Sequence    = 9,
-                    Start       = 872450
+                    Description = null, Size        = 77593600, Name   = null, Type = "LNX",
+                    Offset      = 446694400, Length = 151550, Sequence = 9, Start   = 872450
                 }
             },
+
             // Linux (ICD)
             new[]
             {
                 new Partition
                 {
-                    Description = null,
-                    Size        = 15728640,
-                    Name        = null,
-                    Type        = "GEM",
-                    Offset      = 512,
-                    Length      = 30720,
-                    Sequence    = 0,
-                    Start       = 1
+                    Description = null, Size  = 15728640, Name  = null, Type = "GEM",
+                    Offset      = 512, Length = 30720, Sequence = 0, Start   = 1
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 20971520,
-                    Name        = null,
-                    Type        = "UNX",
-                    Offset      = 15729152,
-                    Length      = 40960,
-                    Sequence    = 1,
-                    Start       = 30721
+                    Description = null, Size       = 20971520, Name  = null, Type = "UNX",
+                    Offset      = 15729152, Length = 40960, Sequence = 1, Start   = 30721
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 31457280,
-                    Name        = null,
-                    Type        = "LNX",
-                    Offset      = 36700672,
-                    Length      = 61440,
-                    Sequence    = 2,
-                    Start       = 71681
+                    Description = null, Size       = 31457280, Name  = null, Type = "LNX",
+                    Offset      = 36700672, Length = 61440, Sequence = 2, Start   = 71681
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 41943040,
-                    Name        = null,
-                    Type        = "BGM",
-                    Offset      = 68157952,
-                    Length      = 81920,
-                    Sequence    = 3,
-                    Start       = 133121
+                    Description = null, Size       = 41943040, Name  = null, Type = "BGM",
+                    Offset      = 68157952, Length = 81920, Sequence = 3, Start   = 133121
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 52428800,
-                    Name        = null,
-                    Type        = "MAC",
-                    Offset      = 110100992,
-                    Length      = 102400,
-                    Sequence    = 4,
-                    Start       = 215041
+                    Description = null, Size        = 52428800, Name   = null, Type = "MAC",
+                    Offset      = 110100992, Length = 102400, Sequence = 4, Start   = 215041
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 62914560,
-                    Name        = null,
-                    Type        = "MIX",
-                    Offset      = 162529792,
-                    Length      = 122880,
-                    Sequence    = 5,
-                    Start       = 317441
+                    Description = null, Size        = 62914560, Name   = null, Type = "MIX",
+                    Offset      = 162529792, Length = 122880, Sequence = 5, Start   = 317441
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 83886080,
-                    Name        = null,
-                    Type        = "SWP",
-                    Offset      = 225444352,
-                    Length      = 163840,
-                    Sequence    = 6,
-                    Start       = 440321
+                    Description = null, Size        = 83886080, Name   = null, Type = "SWP",
+                    Offset      = 225444352, Length = 163840, Sequence = 6, Start   = 440321
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 103809024,
-                    Name        = null,
-                    Type        = "MNX",
-                    Offset      = 309330432,
-                    Length      = 202752,
-                    Sequence    = 7,
-                    Start       = 604161
+                    Description = null, Size        = 103809024, Name  = null, Type = "MNX",
+                    Offset      = 309330432, Length = 202752, Sequence = 7, Start   = 604161
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 104857600,
-                    Name        = null,
-                    Type        = "LNX",
-                    Offset      = 413139456,
-                    Length      = 204800,
-                    Sequence    = 8,
-                    Start       = 806913
+                    Description = null, Size        = 104857600, Name  = null, Type = "LNX",
+                    Offset      = 413139456, Length = 204800, Sequence = 8, Start   = 806913
                 }
             },
+
             // TOS 1.04
             new[]
             {
                 new Partition
                 {
-                    Description = null,
-                    Size        = 7340032,
-                    Name        = null,
-                    Type        = "GEM",
-                    Offset      = 1024,
-                    Length      = 14336,
-                    Sequence    = 0,
-                    Start       = 2
+                    Description = null, Size   = 7340032, Name   = null, Type = "GEM",
+                    Offset      = 1024, Length = 14336, Sequence = 0, Start   = 2
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 7340032,
-                    Name        = null,
-                    Type        = "GEM",
-                    Offset      = 7341056,
-                    Length      = 14336,
-                    Sequence    = 1,
-                    Start       = 14338
+                    Description = null, Size      = 7340032, Name   = null, Type = "GEM",
+                    Offset      = 7341056, Length = 14336, Sequence = 1, Start   = 14338
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 7340032,
-                    Name        = null,
-                    Type        = "GEM",
-                    Offset      = 14681088,
-                    Length      = 14336,
-                    Sequence    = 2,
-                    Start       = 28674
+                    Description = null, Size       = 7340032, Name   = null, Type = "GEM",
+                    Offset      = 14681088, Length = 14336, Sequence = 2, Start   = 28674
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 7339008,
-                    Name        = null,
-                    Type        = "GEM",
-                    Offset      = 22021120,
-                    Length      = 14334,
-                    Sequence    = 3,
-                    Start       = 43010
+                    Description = null, Size       = 7339008, Name   = null, Type = "GEM",
+                    Offset      = 22021120, Length = 14334, Sequence = 3, Start   = 43010
                 }
             }
         };
@@ -322,17 +189,18 @@ namespace Aaru.Tests.Partitions
                 Assert.AreEqual(true, image.Open(filter), testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 Assert.AreEqual(wanted[i].Length, partitions.Count, testfiles[i]);
+
                 for(int j = 0; j < partitions.Count; j++)
                 {
                     // Too chatty
                     //Assert.AreEqual(wanted[i][j].PartitionDescription, partitions[j].PartitionDescription, testfiles[i]);
-                    Assert.AreEqual(wanted[i][j].Size,     partitions[j].Size,     testfiles[i]);
-                    Assert.AreEqual(wanted[i][j].Name,     partitions[j].Name,     testfiles[i]);
-                    Assert.AreEqual(wanted[i][j].Type,     partitions[j].Type,     testfiles[i]);
-                    Assert.AreEqual(wanted[i][j].Offset,   partitions[j].Offset,   testfiles[i]);
-                    Assert.AreEqual(wanted[i][j].Length,   partitions[j].Length,   testfiles[i]);
+                    Assert.AreEqual(wanted[i][j].Size, partitions[j].Size, testfiles[i]);
+                    Assert.AreEqual(wanted[i][j].Name, partitions[j].Name, testfiles[i]);
+                    Assert.AreEqual(wanted[i][j].Type, partitions[j].Type, testfiles[i]);
+                    Assert.AreEqual(wanted[i][j].Offset, partitions[j].Offset, testfiles[i]);
+                    Assert.AreEqual(wanted[i][j].Length, partitions[j].Length, testfiles[i]);
                     Assert.AreEqual(wanted[i][j].Sequence, partitions[j].Sequence, testfiles[i]);
-                    Assert.AreEqual(wanted[i][j].Start,    partitions[j].Start,    testfiles[i]);
+                    Assert.AreEqual(wanted[i][j].Start, partitions[j].Start, testfiles[i]);
                 }
             }
         }
diff --git a/Aaru.Tests/Partitions/BSD.cs b/Aaru.Tests/Partitions/BSD.cs
index 023fad027..8bd54f315 100644
--- a/Aaru.Tests/Partitions/BSD.cs
+++ b/Aaru.Tests/Partitions/BSD.cs
@@ -51,338 +51,171 @@ namespace Aaru.Tests.Partitions
             {
                 new Partition
                 {
-                    Description = null,
-                    Size        = 38797312,
-                    Name        = null,
-                    Type        = "FAT",
-                    Offset      = 1048576,
-                    Length      = 75776,
-                    Sequence    = 0,
-                    Start       = 2048
+                    Description = null, Size      = 38797312, Name  = null, Type = "FAT",
+                    Offset      = 1048576, Length = 75776, Sequence = 0, Start   = 2048
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 19922944,
-                    Name        = null,
-                    Type        = "FAT",
-                    Offset      = 40894464,
-                    Length      = 38912,
-                    Sequence    = 1,
-                    Start       = 79872
+                    Description = null, Size       = 19922944, Name  = null, Type = "FAT",
+                    Offset      = 40894464, Length = 38912, Sequence = 1, Start   = 79872
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 48234496,
-                    Name        = null,
-                    Type        = "FAT",
-                    Offset      = 61865984,
-                    Length      = 94208,
-                    Sequence    = 2,
-                    Start       = 120832
+                    Description = null, Size       = 48234496, Name  = null, Type = "FAT",
+                    Offset      = 61865984, Length = 94208, Sequence = 2, Start   = 120832
                 }
             },
+
             // NetBSD 1.6
             new[]
             {
                 new Partition
                 {
-                    Description = null,
-                    Size        = 10453504,
-                    Name        = null,
-                    Type        = "FAT",
-                    Offset      = 516096,
-                    Length      = 20417,
-                    Sequence    = 0,
-                    Start       = 1008
+                    Description = null, Size     = 10453504, Name  = null, Type = "FAT",
+                    Offset      = 516096, Length = 20417, Sequence = 0, Start   = 1008
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 209715200,
-                    Name        = null,
-                    Type        = "FAT",
-                    Offset      = 11354112,
-                    Length      = 409600,
-                    Sequence    = 1,
-                    Start       = 22176
+                    Description = null, Size       = 209715200, Name  = null, Type = "FAT",
+                    Offset      = 11354112, Length = 409600, Sequence = 1, Start   = 22176
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 805306368,
-                    Name        = null,
-                    Type        = "FAT",
-                    Offset      = 221405184,
-                    Length      = 1572864,
-                    Sequence    = 2,
-                    Start       = 432432
+                    Description = null, Size        = 805306368, Name   = null, Type = "FAT",
+                    Offset      = 221405184, Length = 1572864, Sequence = 2, Start   = 432432
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 747656192,
-                    Name        = null,
-                    Type        = "4.2BSD Fast File System",
-                    Offset      = 1027031040,
-                    Length      = 1460266,
-                    Sequence    = 3,
-                    Start       = 2005920
+                    Description = null, Size         = 747656192, Name   = null, Type = "4.2BSD Fast File System",
+                    Offset      = 1027031040, Length = 1460266, Sequence = 3, Start   = 2005920
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 268435456,
-                    Name        = null,
-                    Type        = "4.4LFS",
-                    Offset      = 1774854144,
-                    Length      = 524288,
-                    Sequence    = 4,
-                    Start       = 3466512
+                    Description = null, Size         = 268435456, Name  = null, Type = "4.4LFS",
+                    Offset      = 1774854144, Length = 524288, Sequence = 4, Start   = 3466512
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 103743488,
-                    Name        = null,
-                    Type        = "4.2BSD Fast File System",
-                    Offset      = 2043740160,
-                    Length      = 202624,
-                    Sequence    = 5,
-                    Start       = 3991680
+                    Description = null, Size         = 103743488, Name  = null, Type = "4.2BSD Fast File System",
+                    Offset      = 2043740160, Length = 202624, Sequence = 5, Start   = 3991680
                 }
             },
+
             // NetBSD 6.1.5
             new[]
             {
                 new Partition
                 {
-                    Description = null,
-                    Size        = 10485760,
-                    Name        = null,
-                    Type        = "FAT",
-                    Offset      = 516096,
-                    Length      = 20480,
-                    Sequence    = 0,
-                    Start       = 1008
+                    Description = null, Size     = 10485760, Name  = null, Type = "FAT",
+                    Offset      = 516096, Length = 20480, Sequence = 0, Start   = 1008
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 104857600,
-                    Name        = null,
-                    Type        = "FAT",
-                    Offset      = 11354112,
-                    Length      = 204800,
-                    Sequence    = 1,
-                    Start       = 22176
+                    Description = null, Size       = 104857600, Name  = null, Type = "FAT",
+                    Offset      = 11354112, Length = 204800, Sequence = 1, Start   = 22176
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 209715200,
-                    Name        = null,
-                    Type        = "FAT",
-                    Offset      = 116637696,
-                    Length      = 409600,
-                    Sequence    = 2,
-                    Start       = 227808
+                    Description = null, Size        = 209715200, Name  = null, Type = "FAT",
+                    Offset      = 116637696, Length = 409600, Sequence = 2, Start   = 227808
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 40771584,
-                    Name        = null,
-                    Type        = "4.2BSD Fast File System",
-                    Offset      = 326688768,
-                    Length      = 79632,
-                    Sequence    = 3,
-                    Start       = 638064
+                    Description = null, Size        = 40771584, Name  = null, Type = "4.2BSD Fast File System",
+                    Offset      = 326688768, Length = 79632, Sequence = 3, Start   = 638064
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 419430400,
-                    Name        = null,
-                    Type        = "4.2BSD Fast File System",
-                    Offset      = 367460352,
-                    Length      = 819200,
-                    Sequence    = 4,
-                    Start       = 717696
+                    Description = null, Size        = 419430400, Name  = null, Type = "4.2BSD Fast File System",
+                    Offset      = 367460352, Length = 819200, Sequence = 4, Start   = 717696
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 471859200,
-                    Name        = null,
-                    Type        = "4.2BSD Fast File System",
-                    Offset      = 787562496,
-                    Length      = 921600,
-                    Sequence    = 5,
-                    Start       = 1538208
+                    Description = null, Size        = 471859200, Name  = null, Type = "4.2BSD Fast File System",
+                    Offset      = 787562496, Length = 921600, Sequence = 5, Start   = 1538208
                 },
+
                 // Type conflicts between DragonFly and NetBSD, really is Apple UFS
                 new Partition
                 {
-                    Description = null,
-                    Size        = 78643200,
-                    Name        = null,
-                    Type        = "Hammer",
-                    Offset      = 1259790336,
-                    Length      = 153600,
-                    Sequence    = 6,
-                    Start       = 2460528
+                    Description = null, Size         = 78643200, Name   = null, Type = "Hammer",
+                    Offset      = 1259790336, Length = 153600, Sequence = 6, Start   = 2460528
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 99614720,
-                    Name        = null,
-                    Type        = "UNIX 7th Edition",
-                    Offset      = 1338753024,
-                    Length      = 194560,
-                    Sequence    = 7,
-                    Start       = 2614752
+                    Description = null, Size         = 99614720, Name   = null, Type = "UNIX 7th Edition",
+                    Offset      = 1338753024, Length = 194560, Sequence = 7, Start   = 2614752
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 244318208,
-                    Name        = null,
-                    Type        = "4.4LFS",
-                    Offset      = 1438875648,
-                    Length      = 477184,
-                    Sequence    = 8,
-                    Start       = 2810304
+                    Description = null, Size         = 244318208, Name  = null, Type = "4.4LFS",
+                    Offset      = 1438875648, Length = 477184, Sequence = 8, Start   = 2810304
                 },
+
                 // Type conflicts, really is Linux ext2
                 new Partition
                 {
-                    Description = null,
-                    Size        = 463978496,
-                    Name        = null,
-                    Type        = "Digital LSM Public Region",
-                    Offset      = 1683505152,
-                    Length      = 906208,
-                    Sequence    = 9,
-                    Start       = 3288096
+                    Description = null, Size         = 463978496, Name  = null, Type = "Digital LSM Public Region",
+                    Offset      = 1683505152, Length = 906208, Sequence = 9, Start   = 3288096
                 }
             },
+
             // NetBSD 7.1
             new[]
             {
                 new Partition
                 {
-                    Description = null,
-                    Size        = 10321920,
-                    Name        = null,
-                    Type        = "FAT",
-                    Offset      = 516096,
-                    Length      = 20160,
-                    Sequence    = 0,
-                    Start       = 1008
+                    Description = null, Size     = 10321920, Name  = null, Type = "FAT",
+                    Offset      = 516096, Length = 20160, Sequence = 0, Start   = 1008
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 104767488,
-                    Name        = null,
-                    Type        = "FAT",
-                    Offset      = 11354112,
-                    Length      = 204624,
-                    Sequence    = 1,
-                    Start       = 22176
+                    Description = null, Size       = 104767488, Name  = null, Type = "FAT",
+                    Offset      = 11354112, Length = 204624, Sequence = 1, Start   = 22176
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 209534976,
-                    Name        = null,
-                    Type        = "FAT",
-                    Offset      = 116637696,
-                    Length      = 409248,
-                    Sequence    = 2,
-                    Start       = 227808
+                    Description = null, Size        = 209534976, Name  = null, Type = "FAT",
+                    Offset      = 116637696, Length = 409248, Sequence = 2, Start   = 227808
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 40255488,
-                    Name        = null,
-                    Type        = "4.2BSD Fast File System",
-                    Offset      = 326688768,
-                    Length      = 78624,
-                    Sequence    = 3,
-                    Start       = 638064
+                    Description = null, Size        = 40255488, Name  = null, Type = "4.2BSD Fast File System",
+                    Offset      = 326688768, Length = 78624, Sequence = 3, Start   = 638064
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 419069952,
-                    Name        = null,
-                    Type        = "4.2BSD Fast File System",
-                    Offset      = 367460352,
-                    Length      = 818496,
-                    Sequence    = 4,
-                    Start       = 717696
+                    Description = null, Size        = 419069952, Name  = null, Type = "4.2BSD Fast File System",
+                    Offset      = 367460352, Length = 818496, Sequence = 4, Start   = 717696
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 471711744,
-                    Name        = null,
-                    Type        = "4.2BSD Fast File System",
-                    Offset      = 787562496,
-                    Length      = 921312,
-                    Sequence    = 5,
-                    Start       = 1538208
+                    Description = null, Size        = 471711744, Name  = null, Type = "4.2BSD Fast File System",
+                    Offset      = 787562496, Length = 921312, Sequence = 5, Start   = 1538208
                 },
+
                 // Type conflicts between DragonFly and NetBSD, really is Apple UFS
                 new Partition
                 {
-                    Description = null,
-                    Size        = 78446592,
-                    Name        = null,
-                    Type        = "Hammer",
-                    Offset      = 1259790336,
-                    Length      = 153216,
-                    Sequence    = 6,
-                    Start       = 2460528
+                    Description = null, Size         = 78446592, Name   = null, Type = "Hammer",
+                    Offset      = 1259790336, Length = 153216, Sequence = 6, Start   = 2460528
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 99606528,
-                    Name        = null,
-                    Type        = "UNIX 7th Edition",
-                    Offset      = 1338753024,
-                    Length      = 194544,
-                    Sequence    = 7,
-                    Start       = 2614752
+                    Description = null, Size         = 99606528, Name   = null, Type = "UNIX 7th Edition",
+                    Offset      = 1338753024, Length = 194544, Sequence = 7, Start   = 2614752
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 243597312,
-                    Name        = null,
-                    Type        = "4.4LFS",
-                    Offset      = 1438875648,
-                    Length      = 475776,
-                    Sequence    = 8,
-                    Start       = 2810304
+                    Description = null, Size         = 243597312, Name  = null, Type = "4.4LFS",
+                    Offset      = 1438875648, Length = 475776, Sequence = 8, Start   = 2810304
                 },
+
                 // Type conflicts, really is Linux ext2
                 new Partition
                 {
-                    Description = null,
-                    Size        = 463970304,
-                    Name        = null,
-                    Type        = "Digital LSM Public Region",
-                    Offset      = 1683505152,
-                    Length      = 906192,
-                    Sequence    = 9,
-                    Start       = 3288096
+                    Description = null, Size         = 463970304, Name  = null, Type = "Digital LSM Public Region",
+                    Offset      = 1683505152, Length = 906192, Sequence = 9, Start   = 3288096
                 }
             }
         };
@@ -399,17 +232,18 @@ namespace Aaru.Tests.Partitions
                 Assert.AreEqual(true, image.Open(filter), testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 Assert.AreEqual(wanted[i].Length, partitions.Count, testfiles[i]);
+
                 for(int j = 0; j < partitions.Count; j++)
                 {
                     // Too chatty
                     //Assert.AreEqual(wanted[i][j].PartitionDescription, partitions[j].PartitionDescription, testfiles[i]);
-                    Assert.AreEqual(wanted[i][j].Size,     partitions[j].Size,     testfiles[i]);
-                    Assert.AreEqual(wanted[i][j].Name,     partitions[j].Name,     testfiles[i]);
-                    Assert.AreEqual(wanted[i][j].Type,     partitions[j].Type,     testfiles[i]);
-                    Assert.AreEqual(wanted[i][j].Offset,   partitions[j].Offset,   testfiles[i]);
-                    Assert.AreEqual(wanted[i][j].Length,   partitions[j].Length,   testfiles[i]);
+                    Assert.AreEqual(wanted[i][j].Size, partitions[j].Size, testfiles[i]);
+                    Assert.AreEqual(wanted[i][j].Name, partitions[j].Name, testfiles[i]);
+                    Assert.AreEqual(wanted[i][j].Type, partitions[j].Type, testfiles[i]);
+                    Assert.AreEqual(wanted[i][j].Offset, partitions[j].Offset, testfiles[i]);
+                    Assert.AreEqual(wanted[i][j].Length, partitions[j].Length, testfiles[i]);
                     Assert.AreEqual(wanted[i][j].Sequence, partitions[j].Sequence, testfiles[i]);
-                    Assert.AreEqual(wanted[i][j].Start,    partitions[j].Start,    testfiles[i]);
+                    Assert.AreEqual(wanted[i][j].Start, partitions[j].Start, testfiles[i]);
                 }
             }
         }
diff --git a/Aaru.Tests/Partitions/GPT.cs b/Aaru.Tests/Partitions/GPT.cs
index 6fbf44fdd..50b770838 100644
--- a/Aaru.Tests/Partitions/GPT.cs
+++ b/Aaru.Tests/Partitions/GPT.cs
@@ -39,7 +39,10 @@ namespace Aaru.Tests.Partitions
     [TestFixture]
     public class Gpt
     {
-        readonly string[] testfiles = {"linux.vdi.lz", "parted.vdi.lz"};
+        readonly string[] testfiles =
+        {
+            "linux.vdi.lz", "parted.vdi.lz"
+        };
 
         readonly Partition[][] wanted =
         {
@@ -48,106 +51,55 @@ namespace Aaru.Tests.Partitions
             {
                 new Partition
                 {
-                    Description = null,
-                    Size        = 10485760,
-                    Name        = "EFI System",
-                    Type        = "EFI System",
-                    Offset      = 1048576,
-                    Length      = 20480,
-                    Sequence    = 0,
-                    Start       = 2048
+                    Description = null, Size      = 10485760, Name  = "EFI System", Type = "EFI System",
+                    Offset      = 1048576, Length = 20480, Sequence = 0, Start           = 2048
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 15728640,
-                    Name        = "Microsoft basic data",
+                    Description = null, Size = 15728640, Name = "Microsoft basic data",
                     Type        = "Microsoft Basic data",
-                    Offset      = 11534336,
-                    Length      = 30720,
-                    Sequence    = 1,
-                    Start       = 22528
+                    Offset      = 11534336, Length = 30720, Sequence = 1, Start = 22528
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 20971520,
-                    Name        = "Apple label",
-                    Type        = "Apple Label",
-                    Offset      = 27262976,
-                    Length      = 40960,
-                    Sequence    = 2,
-                    Start       = 53248
+                    Description = null, Size       = 20971520, Name  = "Apple label", Type = "Apple Label",
+                    Offset      = 27262976, Length = 40960, Sequence = 2, Start            = 53248
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 26214400,
-                    Name        = "Solaris /usr & Mac ZFS",
-                    Type        = "Solaris /usr or Apple ZFS",
-                    Offset      = 48234496,
-                    Length      = 51200,
-                    Sequence    = 3,
+                    Description = null, Size                          = 26214400, Name   = "Solaris /usr & Mac ZFS",
+                    Type        = "Solaris /usr or Apple ZFS", Offset = 48234496, Length = 51200, Sequence = 3,
                     Start       = 94208
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 31457280,
-                    Name        = "FreeBSD ZFS",
-                    Type        = "FreeBSD ZFS",
-                    Offset      = 74448896,
-                    Length      = 61440,
-                    Sequence    = 4,
-                    Start       = 145408
+                    Description = null, Size       = 31457280, Name  = "FreeBSD ZFS", Type = "FreeBSD ZFS",
+                    Offset      = 74448896, Length = 61440, Sequence = 4, Start            = 145408
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 28294656,
-                    Name        = "HP-UX data",
-                    Type        = "HP-UX Data",
-                    Offset      = 105906176,
-                    Length      = 55263,
-                    Sequence    = 5,
-                    Start       = 206848
+                    Description = null, Size        = 28294656, Name  = "HP-UX data", Type = "HP-UX Data",
+                    Offset      = 105906176, Length = 55263, Sequence = 5, Start           = 206848
                 }
             },
+
             // Parted
             new[]
             {
                 new Partition
                 {
-                    Description = null,
-                    Size        = 42991616,
-                    Name        = "",
-                    Type        = "Apple HFS",
-                    Offset      = 1048576,
-                    Length      = 83968,
-                    Sequence    = 0,
-                    Start       = 2048
+                    Description = null, Size      = 42991616, Name  = "", Type = "Apple HFS",
+                    Offset      = 1048576, Length = 83968, Sequence = 0, Start = 2048
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 52428800,
-                    Name        = "",
-                    Type        = "Linux filesystem",
-                    Offset      = 44040192,
-                    Length      = 102400,
-                    Sequence    = 1,
-                    Start       = 86016
+                    Description = null, Size       = 52428800, Name   = "", Type = "Linux filesystem",
+                    Offset      = 44040192, Length = 102400, Sequence = 1, Start = 86016
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 36700160,
-                    Name        = "",
-                    Type        = "Microsoft Basic data",
-                    Offset      = 96468992,
-                    Length      = 71680,
-                    Sequence    = 2,
-                    Start       = 188416
+                    Description = null, Size       = 36700160, Name  = "", Type = "Microsoft Basic data",
+                    Offset      = 96468992, Length = 71680, Sequence = 2, Start = 188416
                 }
             }
         };
@@ -164,17 +116,18 @@ namespace Aaru.Tests.Partitions
                 Assert.AreEqual(true, image.Open(filter), testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 Assert.AreEqual(wanted[i].Length, partitions.Count, testfiles[i]);
+
                 for(int j = 0; j < partitions.Count; j++)
                 {
                     // Too chatty
                     //Assert.AreEqual(wanted[i][j].PartitionDescription, partitions[j].PartitionDescription, testfiles[i]);
-                    Assert.AreEqual(wanted[i][j].Size,     partitions[j].Size,     testfiles[i]);
-                    Assert.AreEqual(wanted[i][j].Name,     partitions[j].Name,     testfiles[i]);
-                    Assert.AreEqual(wanted[i][j].Type,     partitions[j].Type,     testfiles[i]);
-                    Assert.AreEqual(wanted[i][j].Offset,   partitions[j].Offset,   testfiles[i]);
-                    Assert.AreEqual(wanted[i][j].Length,   partitions[j].Length,   testfiles[i]);
+                    Assert.AreEqual(wanted[i][j].Size, partitions[j].Size, testfiles[i]);
+                    Assert.AreEqual(wanted[i][j].Name, partitions[j].Name, testfiles[i]);
+                    Assert.AreEqual(wanted[i][j].Type, partitions[j].Type, testfiles[i]);
+                    Assert.AreEqual(wanted[i][j].Offset, partitions[j].Offset, testfiles[i]);
+                    Assert.AreEqual(wanted[i][j].Length, partitions[j].Length, testfiles[i]);
                     Assert.AreEqual(wanted[i][j].Sequence, partitions[j].Sequence, testfiles[i]);
-                    Assert.AreEqual(wanted[i][j].Start,    partitions[j].Start,    testfiles[i]);
+                    Assert.AreEqual(wanted[i][j].Start, partitions[j].Start, testfiles[i]);
                 }
             }
         }
diff --git a/Aaru.Tests/Partitions/MBR.cs b/Aaru.Tests/Partitions/MBR.cs
index 5cde6c83f..37bf52ca3 100644
--- a/Aaru.Tests/Partitions/MBR.cs
+++ b/Aaru.Tests/Partitions/MBR.cs
@@ -44,11 +44,11 @@ namespace Aaru.Tests.Partitions
             "concurrentdos_6.0.vdi.lz", "darwin_1.4.1.vdi.lz", "darwin_6.0.2.vdi.lz", "darwin_8.0.1.vdi.lz",
             "drdos_3.40.vdi.lz", "drdos_3.41.vdi.lz", "drdos_5.00.vdi.lz", "drdos_6.00.vdi.lz", "drdos_7.02.vdi.lz",
             "drdos_7.03.vdi.lz", "drdos_8.0.vdi.lz", "linux.vdi.lz", "macosx_10.3.vdi.lz", "macosx_10.4.vdi.lz",
-            "msdos_3.30a.vdi.lz", "msdos_5.00.vdi.lz", "msdos_6.00.vdi.lz", "msdos_6.20.vdi.lz",
-            "msdos_6.21.vdi.lz", "msdos_6.22.vdi.lz", "multiuserdos_7.22r04.vdi.lz", "novelldos_7.00.vdi.lz",
-            "opendos_7.01.vdi.lz", "parted.vdi.lz", "pcdos_2000.vdi.lz", "pcdos_2.00.vdi.lz", "pcdos_2.10.vdi.lz",
-            "pcdos_3.00.vdi.lz", "pcdos_3.10.vdi.lz", "pcdos_3.30.vdi.lz", "pcdos_4.00.vdi.lz", "pcdos_5.00.vdi.lz",
-            "pcdos_6.10.vdi.lz", "win95.vdi.lz", "win96osr25.vdi.lz", "winnt_3.10.vdi.lz"
+            "msdos_3.30a.vdi.lz", "msdos_5.00.vdi.lz", "msdos_6.00.vdi.lz", "msdos_6.20.vdi.lz", "msdos_6.21.vdi.lz",
+            "msdos_6.22.vdi.lz", "multiuserdos_7.22r04.vdi.lz", "novelldos_7.00.vdi.lz", "opendos_7.01.vdi.lz",
+            "parted.vdi.lz", "pcdos_2000.vdi.lz", "pcdos_2.00.vdi.lz", "pcdos_2.10.vdi.lz", "pcdos_3.00.vdi.lz",
+            "pcdos_3.10.vdi.lz", "pcdos_3.30.vdi.lz", "pcdos_4.00.vdi.lz", "pcdos_5.00.vdi.lz", "pcdos_6.10.vdi.lz",
+            "win95.vdi.lz", "win96osr25.vdi.lz", "winnt_3.10.vdi.lz"
         };
 
         readonly Partition[][] wanted =
@@ -58,1898 +58,1153 @@ namespace Aaru.Tests.Partitions
             {
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x04",
-                    Length      = 100800,
-                    Sequence    = 0,
-                    Start       = 1008
+                    Description = null, Name = null, Type = "0x04", Length = 100800,
+                    Sequence    = 0, Start   = 1008
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x04",
-                    Length      = 99792,
-                    Sequence    = 1,
-                    Start       = 102816
+                    Description = null, Name = null, Type = "0x04", Length = 99792,
+                    Sequence    = 1, Start   = 102816
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x04",
-                    Length      = 100800,
-                    Sequence    = 2,
-                    Start       = 202608
+                    Description = null, Name = null, Type = "0x04", Length = 100800,
+                    Sequence    = 2, Start   = 202608
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x04",
-                    Length      = 303408,
-                    Sequence    = 3,
-                    Start       = 352800
+                    Description = null, Name = null, Type = "0x04", Length = 303408,
+                    Sequence    = 3, Start   = 352800
                 }
             },
+
             // Darwin 1.4.1
             new[]
             {
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x07",
-                    Length      = 409248,
-                    Sequence    = 0,
-                    Start       = 409248
+                    Description = null, Name = null, Type = "0x07", Length = 409248,
+                    Sequence    = 0, Start   = 409248
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0xA8",
-                    Length      = 204624,
-                    Sequence    = 1,
-                    Start       = 818496
+                    Description = null, Name = null, Type = "0xA8", Length = 204624,
+                    Sequence    = 1, Start   = 818496
                 }
             },
+
             // Darwin 6.0.2
             new[]
             {
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0xA8",
-                    Length      = 204561,
-                    Sequence    = 0,
-                    Start       = 63
+                    Description = null, Name = null, Type = "0xA8", Length = 204561,
+                    Sequence    = 0, Start   = 63
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0xAB",
-                    Length      = 81648,
-                    Sequence    = 1,
-                    Start       = 204624
+                    Description = null, Name = null, Type = "0xAB", Length = 81648,
+                    Sequence    = 1, Start   = 204624
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 245952,
-                    Sequence    = 2,
-                    Start       = 286272
+                    Description = null, Name = null, Type = "0x06", Length = 245952,
+                    Sequence    = 2, Start   = 286272
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 488880,
-                    Sequence    = 3,
-                    Start       = 532224
+                    Description = null, Name = null, Type = "0x06", Length = 488880,
+                    Sequence    = 3, Start   = 532224
                 }
             },
+
             // Darwin 8.0.1
             new[]
             {
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 150000,
-                    Sequence    = 0,
-                    Start       = 63
+                    Description = null, Name = null, Type = "0x06", Length = 150000,
+                    Sequence    = 0, Start   = 63
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0xAF",
-                    Length      = 176000,
-                    Sequence    = 1,
-                    Start       = 150063
+                    Description = null, Name = null, Type = "0xAF", Length = 176000,
+                    Sequence    = 1, Start   = 150063
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0xA8",
-                    Length      = 350000,
-                    Sequence    = 2,
-                    Start       = 326063
+                    Description = null, Name = null, Type = "0xA8", Length = 350000,
+                    Sequence    = 2, Start   = 326063
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x0C",
-                    Length      = 347937,
-                    Sequence    = 3,
-                    Start       = 676063
+                    Description = null, Name = null, Type = "0x0C", Length = 347937,
+                    Sequence    = 3, Start   = 676063
                 }
             },
+
             // DR-DOS 3.40
             new[]
             {
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 100800,
-                    Sequence    = 0,
-                    Start       = 1008
+                    Description = null, Name = null, Type = "0x06", Length = 100800,
+                    Sequence    = 0, Start   = 1008
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 402129,
-                    Sequence    = 1,
-                    Start       = 101871
+                    Description = null, Name = null, Type = "0x06", Length = 402129,
+                    Sequence    = 1, Start   = 101871
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 152145,
-                    Sequence    = 2,
-                    Start       = 504063
+                    Description = null, Name = null, Type = "0x06", Length = 152145,
+                    Sequence    = 2, Start   = 504063
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 365841,
-                    Sequence    = 3,
-                    Start       = 656271
+                    Description = null, Name = null, Type = "0x06", Length = 365841,
+                    Sequence    = 3, Start   = 656271
                 }
             },
+
             // DR-DOS 3.41
             new[]
             {
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 126945,
-                    Sequence    = 0,
-                    Start       = 63
+                    Description = null, Name = null, Type = "0x06", Length = 126945,
+                    Sequence    = 0, Start   = 63
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 124929,
-                    Sequence    = 1,
-                    Start       = 127071
+                    Description = null, Name = null, Type = "0x06", Length = 124929,
+                    Sequence    = 1, Start   = 127071
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 101745,
-                    Sequence    = 2,
-                    Start       = 252063
+                    Description = null, Name = null, Type = "0x06", Length = 101745,
+                    Sequence    = 2, Start   = 252063
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 668241,
-                    Sequence    = 3,
-                    Start       = 353871
+                    Description = null, Name = null, Type = "0x06", Length = 668241,
+                    Sequence    = 3, Start   = 353871
                 }
             },
+
             // DR-DOS 5.00
             new[]
             {
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 128016,
-                    Sequence    = 0,
-                    Start       = 124992
+                    Description = null, Name = null, Type = "0x06", Length = 128016,
+                    Sequence    = 0, Start   = 124992
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 99729,
-                    Sequence    = 1,
-                    Start       = 253071
+                    Description = null, Name = null, Type = "0x06", Length = 99729,
+                    Sequence    = 1, Start   = 253071
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 100737,
-                    Sequence    = 2,
-                    Start       = 352863
+                    Description = null, Name = null, Type = "0x06", Length = 100737,
+                    Sequence    = 2, Start   = 352863
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 313425,
-                    Sequence    = 3,
-                    Start       = 453663
+                    Description = null, Name = null, Type = "0x06", Length = 313425,
+                    Sequence    = 3, Start   = 453663
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 254961,
-                    Sequence    = 4,
-                    Start       = 767151
+                    Description = null, Name = null, Type = "0x06", Length = 254961,
+                    Sequence    = 4, Start   = 767151
                 }
             },
+
             // DR-DOS 6.00
             new[]
             {
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 101745,
-                    Sequence    = 0,
-                    Start       = 63
+                    Description = null, Name = null, Type = "0x06", Length = 101745,
+                    Sequence    = 0, Start   = 63
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x01",
-                    Length      = 18081,
-                    Sequence    = 1,
-                    Start       = 102879
+                    Description = null, Name = null, Type = "0x01", Length = 18081,
+                    Sequence    = 1, Start   = 102879
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 130977,
-                    Sequence    = 2,
-                    Start       = 121023
+                    Description = null, Name = null, Type = "0x06", Length = 130977,
+                    Sequence    = 2, Start   = 121023
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 202545,
-                    Sequence    = 3,
-                    Start       = 252063
+                    Description = null, Name = null, Type = "0x06", Length = 202545,
+                    Sequence    = 3, Start   = 252063
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 567441,
-                    Sequence    = 4,
-                    Start       = 454671
+                    Description = null, Name = null, Type = "0x06", Length = 567441,
+                    Sequence    = 4, Start   = 454671
                 }
             },
+
             // DR-DOS 7.02
             new[]
             {
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 102753,
-                    Sequence    = 0,
-                    Start       = 63
+                    Description = null, Name = null, Type = "0x06", Length = 102753,
+                    Sequence    = 0, Start   = 63
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 307377,
-                    Sequence    = 1,
-                    Start       = 102879
+                    Description = null, Name = null, Type = "0x06", Length = 307377,
+                    Sequence    = 1, Start   = 102879
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 384993,
-                    Sequence    = 2,
-                    Start       = 410319
+                    Description = null, Name = null, Type = "0x06", Length = 384993,
+                    Sequence    = 2, Start   = 410319
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x01",
-                    Length      = 17073,
-                    Sequence    = 3,
-                    Start       = 795375
+                    Description = null, Name = null, Type = "0x01", Length = 17073,
+                    Sequence    = 3, Start   = 795375
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 209601,
-                    Sequence    = 4,
-                    Start       = 812511
+                    Description = null, Name = null, Type = "0x06", Length = 209601,
+                    Sequence    = 4, Start   = 812511
                 }
             },
+
             // DR-DOS 7.03
             new[]
             {
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 202545,
-                    Sequence    = 0,
-                    Start       = 63
+                    Description = null, Name = null, Type = "0x06", Length = 202545,
+                    Sequence    = 0, Start   = 63
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 141057,
-                    Sequence    = 1,
-                    Start       = 202671
+                    Description = null, Name = null, Type = "0x06", Length = 141057,
+                    Sequence    = 1, Start   = 202671
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 152145,
-                    Sequence    = 2,
-                    Start       = 352863
+                    Description = null, Name = null, Type = "0x06", Length = 152145,
+                    Sequence    = 2, Start   = 352863
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 364833,
-                    Sequence    = 3,
-                    Start       = 505071
+                    Description = null, Name = null, Type = "0x06", Length = 364833,
+                    Sequence    = 3, Start   = 505071
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 152145,
-                    Sequence    = 4,
-                    Start       = 869967
+                    Description = null, Name = null, Type = "0x06", Length = 152145,
+                    Sequence    = 4, Start   = 869967
                 }
             },
+
             // DR-DOS 8.0
             new[]
             {
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 205569,
-                    Sequence    = 0,
-                    Start       = 63
+                    Description = null, Name = null, Type = "0x06", Length = 205569,
+                    Sequence    = 0, Start   = 63
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 138033,
-                    Sequence    = 1,
-                    Start       = 205695
+                    Description = null, Name = null, Type = "0x06", Length = 138033,
+                    Sequence    = 1, Start   = 205695
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 303345,
-                    Sequence    = 2,
-                    Start       = 352863
+                    Description = null, Name = null, Type = "0x06", Length = 303345,
+                    Sequence    = 2, Start   = 352863
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 249921,
-                    Sequence    = 3,
-                    Start       = 656271
+                    Description = null, Name = null, Type = "0x06", Length = 249921,
+                    Sequence    = 3, Start   = 656271
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 115857,
-                    Sequence    = 4,
-                    Start       = 906255
+                    Description = null, Name = null, Type = "0x06", Length = 115857,
+                    Sequence    = 4, Start   = 906255
                 }
             },
+
             // Linux
             new[]
             {
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x04",
-                    Length      = 20480,
-                    Sequence    = 0,
-                    Start       = 2048
+                    Description = null, Name = null, Type = "0x04", Length = 20480,
+                    Sequence    = 0, Start   = 2048
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x24",
-                    Length      = 40960,
-                    Sequence    = 1,
-                    Start       = 22528
+                    Description = null, Name = null, Type = "0x24", Length = 40960,
+                    Sequence    = 1, Start   = 22528
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0xA7",
-                    Length      = 61440,
-                    Sequence    = 2,
-                    Start       = 65536
+                    Description = null, Name = null, Type = "0xA7", Length = 61440,
+                    Sequence    = 2, Start   = 65536
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x42",
-                    Length      = 81920,
-                    Sequence    = 3,
-                    Start       = 129024
+                    Description = null, Name = null, Type = "0x42", Length = 81920,
+                    Sequence    = 3, Start   = 129024
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x83",
-                    Length      = 49152,
-                    Sequence    = 4,
-                    Start       = 212992
+                    Description = null, Name = null, Type = "0x83", Length = 49152,
+                    Sequence    = 4, Start   = 212992
                 }
             },
+
             // Mac OS X 10.3
             new[]
             {
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0xA8",
-                    Length      = 204800,
-                    Sequence    = 0,
-                    Start       = 8
+                    Description = null, Name = null, Type = "0xA8", Length = 204800,
+                    Sequence    = 0, Start   = 8
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0xAF",
-                    Length      = 102400,
-                    Sequence    = 1,
-                    Start       = 204816
+                    Description = null, Name = null, Type = "0xAF", Length = 102400,
+                    Sequence    = 1, Start   = 204816
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x0B",
-                    Length      = 102400,
-                    Sequence    = 2,
-                    Start       = 307224
+                    Description = null, Name = null, Type = "0x0B", Length = 102400,
+                    Sequence    = 2, Start   = 307224
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0xAF",
-                    Length      = 204800,
-                    Sequence    = 3,
-                    Start       = 409632
+                    Description = null, Name = null, Type = "0xAF", Length = 204800,
+                    Sequence    = 3, Start   = 409632
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0xAF",
-                    Length      = 204800,
-                    Sequence    = 4,
-                    Start       = 614440
+                    Description = null, Name = null, Type = "0xAF", Length = 204800,
+                    Sequence    = 4, Start   = 614440
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0xAF",
-                    Length      = 204752,
-                    Sequence    = 5,
-                    Start       = 819248
+                    Description = null, Name = null, Type = "0xAF", Length = 204752,
+                    Sequence    = 5, Start   = 819248
                 }
             },
+
             // Mac OS X 10.4
             new[]
             {
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0xAF",
-                    Length      = 102400,
-                    Sequence    = 0,
-                    Start       = 63
+                    Description = null, Name = null, Type = "0xAF", Length = 102400,
+                    Sequence    = 0, Start   = 63
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0xAF",
-                    Length      = 204800,
-                    Sequence    = 1,
-                    Start       = 102501
+                    Description = null, Name = null, Type = "0xAF", Length = 204800,
+                    Sequence    = 1, Start   = 102501
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x0B",
-                    Length      = 204800,
-                    Sequence    = 2,
-                    Start       = 307314
+                    Description = null, Name = null, Type = "0x0B", Length = 204800,
+                    Sequence    = 2, Start   = 307314
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0xA8",
-                    Length      = 204800,
-                    Sequence    = 3,
-                    Start       = 512127
+                    Description = null, Name = null, Type = "0xA8", Length = 204800,
+                    Sequence    = 3, Start   = 512127
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 102400,
-                    Sequence    = 4,
-                    Start       = 716940
+                    Description = null, Name = null, Type = "0x06", Length = 102400,
+                    Sequence    = 4, Start   = 716940
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0xAF",
-                    Length      = 204622,
-                    Sequence    = 5,
-                    Start       = 819378
+                    Description = null, Name = null, Type = "0xAF", Length = 204622,
+                    Sequence    = 5, Start   = 819378
                 }
             },
+
             // MS-DOS 3.30A
             new[]
             {
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x04",
-                    Length      = 65457,
-                    Sequence    = 0,
-                    Start       = 63
+                    Description = null, Name = null, Type = "0x04", Length = 65457,
+                    Sequence    = 0, Start   = 63
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x04",
-                    Length      = 65457,
-                    Sequence    = 1,
-                    Start       = 65583
+                    Description = null, Name = null, Type = "0x04", Length = 65457,
+                    Sequence    = 1, Start   = 65583
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x04",
-                    Length      = 65457,
-                    Sequence    = 2,
-                    Start       = 131103
+                    Description = null, Name = null, Type = "0x04", Length = 65457,
+                    Sequence    = 2, Start   = 131103
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x04",
-                    Length      = 65457,
-                    Sequence    = 3,
-                    Start       = 196623
+                    Description = null, Name = null, Type = "0x04", Length = 65457,
+                    Sequence    = 3, Start   = 196623
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x04",
-                    Length      = 65457,
-                    Sequence    = 4,
-                    Start       = 262143
+                    Description = null, Name = null, Type = "0x04", Length = 65457,
+                    Sequence    = 4, Start   = 262143
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x04",
-                    Length      = 65457,
-                    Sequence    = 5,
-                    Start       = 327663
+                    Description = null, Name = null, Type = "0x04", Length = 65457,
+                    Sequence    = 5, Start   = 327663
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x04",
-                    Length      = 65457,
-                    Sequence    = 6,
-                    Start       = 393183
+                    Description = null, Name = null, Type = "0x04", Length = 65457,
+                    Sequence    = 6, Start   = 393183
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x04",
-                    Length      = 65457,
-                    Sequence    = 7,
-                    Start       = 458703
+                    Description = null, Name = null, Type = "0x04", Length = 65457,
+                    Sequence    = 7, Start   = 458703
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x04",
-                    Length      = 65457,
-                    Sequence    = 8,
-                    Start       = 524223
+                    Description = null, Name = null, Type = "0x04", Length = 65457,
+                    Sequence    = 8, Start   = 524223
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x04",
-                    Length      = 65457,
-                    Sequence    = 9,
-                    Start       = 589743
+                    Description = null, Name = null, Type = "0x04", Length = 65457,
+                    Sequence    = 9, Start   = 589743
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x04",
-                    Length      = 65457,
-                    Sequence    = 10,
-                    Start       = 655263
+                    Description = null, Name = null, Type = "0x04", Length = 65457,
+                    Sequence    = 10, Start  = 655263
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x04",
-                    Length      = 65457,
-                    Sequence    = 11,
-                    Start       = 720783
+                    Description = null, Name = null, Type = "0x04", Length = 65457,
+                    Sequence    = 11, Start  = 720783
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x04",
-                    Length      = 65457,
-                    Sequence    = 12,
-                    Start       = 786303
+                    Description = null, Name = null, Type = "0x04", Length = 65457,
+                    Sequence    = 12, Start  = 786303
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x04",
-                    Length      = 65457,
-                    Sequence    = 13,
-                    Start       = 851823
+                    Description = null, Name = null, Type = "0x04", Length = 65457,
+                    Sequence    = 13, Start  = 851823
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x04",
-                    Length      = 65457,
-                    Sequence    = 14,
-                    Start       = 917343
+                    Description = null, Name = null, Type = "0x04", Length = 65457,
+                    Sequence    = 14, Start  = 917343
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x04",
-                    Length      = 39249,
-                    Sequence    = 15,
-                    Start       = 982863
+                    Description = null, Name = null, Type = "0x04", Length = 39249,
+                    Sequence    = 15, Start  = 982863
                 }
             },
+
             // MS-DOS 5.00
             new[]
             {
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 102753,
-                    Sequence    = 0,
-                    Start       = 63
+                    Description = null, Name = null, Type = "0x06", Length = 102753,
+                    Sequence    = 0, Start   = 63
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x01",
-                    Length      = 31185,
-                    Sequence    = 1,
-                    Start       = 102879
+                    Description = null, Name = null, Type = "0x01", Length = 31185,
+                    Sequence    = 1, Start   = 102879
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x04",
-                    Length      = 41265,
-                    Sequence    = 2,
-                    Start       = 134127
+                    Description = null, Name = null, Type = "0x04", Length = 41265,
+                    Sequence    = 2, Start   = 134127
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x04",
-                    Length      = 51345,
-                    Sequence    = 3,
-                    Start       = 175455
+                    Description = null, Name = null, Type = "0x04", Length = 51345,
+                    Sequence    = 3, Start   = 175455
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x04",
-                    Length      = 61425,
-                    Sequence    = 4,
-                    Start       = 226863
+                    Description = null, Name = null, Type = "0x04", Length = 61425,
+                    Sequence    = 4, Start   = 226863
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 72513,
-                    Sequence    = 5,
-                    Start       = 288351
+                    Description = null, Name = null, Type = "0x06", Length = 72513,
+                    Sequence    = 5, Start   = 288351
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 82593,
-                    Sequence    = 6,
-                    Start       = 360927
+                    Description = null, Name = null, Type = "0x06", Length = 82593,
+                    Sequence    = 6, Start   = 360927
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 92673,
-                    Sequence    = 7,
-                    Start       = 443583
+                    Description = null, Name = null, Type = "0x06", Length = 92673,
+                    Sequence    = 7, Start   = 443583
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 102753,
-                    Sequence    = 8,
-                    Start       = 536319
+                    Description = null, Name = null, Type = "0x06", Length = 102753,
+                    Sequence    = 8, Start   = 536319
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 112833,
-                    Sequence    = 9,
-                    Start       = 639135
+                    Description = null, Name = null, Type = "0x06", Length = 112833,
+                    Sequence    = 9, Start   = 639135
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 122913,
-                    Sequence    = 10,
-                    Start       = 752031
+                    Description = null, Name = null, Type = "0x06", Length = 122913,
+                    Sequence    = 10, Start  = 752031
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 134001,
-                    Sequence    = 11,
-                    Start       = 875007
+                    Description = null, Name = null, Type = "0x06", Length = 134001,
+                    Sequence    = 11, Start  = 875007
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x01",
-                    Length      = 13041,
-                    Sequence    = 12,
-                    Start       = 1009071
+                    Description = null, Name = null, Type = "0x01", Length = 13041,
+                    Sequence    = 12, Start  = 1009071
                 }
             },
+
             // MS-DOS 6.00
             new[]
             {
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x04",
-                    Length      = 51345,
-                    Sequence    = 0,
-                    Start       = 63
+                    Description = null, Name = null, Type = "0x04", Length = 51345,
+                    Sequence    = 0, Start   = 63
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 72513,
-                    Sequence    = 1,
-                    Start       = 51471
+                    Description = null, Name = null, Type = "0x06", Length = 72513,
+                    Sequence    = 1, Start   = 51471
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 92673,
-                    Sequence    = 2,
-                    Start       = 124047
+                    Description = null, Name = null, Type = "0x06", Length = 92673,
+                    Sequence    = 2, Start   = 124047
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 112833,
-                    Sequence    = 3,
-                    Start       = 216783
+                    Description = null, Name = null, Type = "0x06", Length = 112833,
+                    Sequence    = 3, Start   = 216783
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 134001,
-                    Sequence    = 4,
-                    Start       = 329679
+                    Description = null, Name = null, Type = "0x06", Length = 134001,
+                    Sequence    = 4, Start   = 329679
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 154161,
-                    Sequence    = 5,
-                    Start       = 463743
+                    Description = null, Name = null, Type = "0x06", Length = 154161,
+                    Sequence    = 5, Start   = 463743
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 178353,
-                    Sequence    = 6,
-                    Start       = 617967
+                    Description = null, Name = null, Type = "0x06", Length = 178353,
+                    Sequence    = 6, Start   = 617967
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 184401,
-                    Sequence    = 7,
-                    Start       = 796383
+                    Description = null, Name = null, Type = "0x06", Length = 184401,
+                    Sequence    = 7, Start   = 796383
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x04",
-                    Length      = 41265,
-                    Sequence    = 8,
-                    Start       = 980847
+                    Description = null, Name = null, Type = "0x04", Length = 41265,
+                    Sequence    = 8, Start   = 980847
                 }
             },
+
             // MS-DOS 6.20
             new[]
             {
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 205569,
-                    Sequence    = 0,
-                    Start       = 63
+                    Description = null, Name = null, Type = "0x06", Length = 205569,
+                    Sequence    = 0, Start   = 63
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 225729,
-                    Sequence    = 1,
-                    Start       = 205695
+                    Description = null, Name = null, Type = "0x06", Length = 225729,
+                    Sequence    = 1, Start   = 205695
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 245889,
-                    Sequence    = 2,
-                    Start       = 431487
+                    Description = null, Name = null, Type = "0x06", Length = 245889,
+                    Sequence    = 2, Start   = 431487
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 267057,
-                    Sequence    = 3,
-                    Start       = 677439
+                    Description = null, Name = null, Type = "0x06", Length = 267057,
+                    Sequence    = 3, Start   = 677439
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x04",
-                    Length      = 61425,
-                    Sequence    = 4,
-                    Start       = 944559
+                    Description = null, Name = null, Type = "0x04", Length = 61425,
+                    Sequence    = 4, Start   = 944559
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x01",
-                    Length      = 16065,
-                    Sequence    = 5,
-                    Start       = 1006047
+                    Description = null, Name = null, Type = "0x01", Length = 16065,
+                    Sequence    = 5, Start   = 1006047
                 }
             },
+
             // MS-DOS 6.21
             new[]
             {
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 205569,
-                    Sequence    = 0,
-                    Start       = 63
+                    Description = null, Name = null, Type = "0x06", Length = 205569,
+                    Sequence    = 0, Start   = 63
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 225729,
-                    Sequence    = 1,
-                    Start       = 205695
+                    Description = null, Name = null, Type = "0x06", Length = 225729,
+                    Sequence    = 1, Start   = 205695
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 245889,
-                    Sequence    = 2,
-                    Start       = 431487
+                    Description = null, Name = null, Type = "0x06", Length = 245889,
+                    Sequence    = 2, Start   = 431487
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 267057,
-                    Sequence    = 3,
-                    Start       = 677439
+                    Description = null, Name = null, Type = "0x06", Length = 267057,
+                    Sequence    = 3, Start   = 677439
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x04",
-                    Length      = 51345,
-                    Sequence    = 4,
-                    Start       = 944559
+                    Description = null, Name = null, Type = "0x04", Length = 51345,
+                    Sequence    = 4, Start   = 944559
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x01",
-                    Length      = 6993,
-                    Sequence    = 5,
-                    Start       = 995967
+                    Description = null, Name = null, Type = "0x01", Length = 6993,
+                    Sequence    = 5, Start   = 995967
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x01",
-                    Length      = 19089,
-                    Sequence    = 6,
-                    Start       = 1003023
+                    Description = null, Name = null, Type = "0x01", Length = 19089,
+                    Sequence    = 6, Start   = 1003023
                 }
             },
+
             // MS-DOS 6.22
             new[]
             {
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 245889,
-                    Sequence    = 0,
-                    Start       = 63
+                    Description = null, Name = null, Type = "0x06", Length = 245889,
+                    Sequence    = 0, Start   = 63
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 205569,
-                    Sequence    = 1,
-                    Start       = 246015
+                    Description = null, Name = null, Type = "0x06", Length = 205569,
+                    Sequence    = 1, Start   = 246015
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 307377,
-                    Sequence    = 2,
-                    Start       = 451647
+                    Description = null, Name = null, Type = "0x06", Length = 307377,
+                    Sequence    = 2, Start   = 451647
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 225729,
-                    Sequence    = 3,
-                    Start       = 759087
+                    Description = null, Name = null, Type = "0x06", Length = 225729,
+                    Sequence    = 3, Start   = 759087
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x04",
-                    Length      = 37233,
-                    Sequence    = 4,
-                    Start       = 984879
+                    Description = null, Name = null, Type = "0x04", Length = 37233,
+                    Sequence    = 4, Start   = 984879
                 }
             },
+
             // Multiuser DOS 7.22 release 04
             new[]
             {
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 152145,
-                    Sequence    = 0,
-                    Start       = 63
+                    Description = null, Name = null, Type = "0x06", Length = 152145,
+                    Sequence    = 0, Start   = 63
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 99729,
-                    Sequence    = 1,
-                    Start       = 152271
+                    Description = null, Name = null, Type = "0x06", Length = 99729,
+                    Sequence    = 1, Start   = 152271
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 202545,
-                    Sequence    = 2,
-                    Start       = 252063
+                    Description = null, Name = null, Type = "0x06", Length = 202545,
+                    Sequence    = 2, Start   = 252063
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x01",
-                    Length      = 1953,
-                    Sequence    = 3,
-                    Start       = 454671
+                    Description = null, Name = null, Type = "0x01", Length = 1953,
+                    Sequence    = 3, Start   = 454671
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 565425,
-                    Sequence    = 4,
-                    Start       = 456687
+                    Description = null, Name = null, Type = "0x06", Length = 565425,
+                    Sequence    = 4, Start   = 456687
                 }
             },
+
             // Novell DOS 7.0
             new[]
             {
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 252945,
-                    Sequence    = 0,
-                    Start       = 63
+                    Description = null, Name = null, Type = "0x06", Length = 252945,
+                    Sequence    = 0, Start   = 63
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x01",
-                    Length      = 4977,
-                    Sequence    = 1,
-                    Start       = 253071
+                    Description = null, Name = null, Type = "0x01", Length = 4977,
+                    Sequence    = 1, Start   = 253071
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 202545,
-                    Sequence    = 2,
-                    Start       = 352863
+                    Description = null, Name = null, Type = "0x06", Length = 202545,
+                    Sequence    = 2, Start   = 352863
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 348705,
-                    Sequence    = 3,
-                    Start       = 555471
+                    Description = null, Name = null, Type = "0x06", Length = 348705,
+                    Sequence    = 3, Start   = 555471
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 117873,
-                    Sequence    = 4,
-                    Start       = 904239
+                    Description = null, Name = null, Type = "0x06", Length = 117873,
+                    Sequence    = 4, Start   = 904239
                 }
             },
+
             // OpenDOS 7.01
             new[]
             {
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 307377,
-                    Sequence    = 0,
-                    Start       = 63
+                    Description = null, Name = null, Type = "0x06", Length = 307377,
+                    Sequence    = 0, Start   = 63
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x01",
-                    Length      = 4977,
-                    Sequence    = 1,
-                    Start       = 307503
+                    Description = null, Name = null, Type = "0x01", Length = 4977,
+                    Sequence    = 1, Start   = 307503
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x04",
-                    Length      = 40257,
-                    Sequence    = 2,
-                    Start       = 312543
+                    Description = null, Name = null, Type = "0x04", Length = 40257,
+                    Sequence    = 2, Start   = 312543
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 202545,
-                    Sequence    = 3,
-                    Start       = 352863
+                    Description = null, Name = null, Type = "0x06", Length = 202545,
+                    Sequence    = 3, Start   = 352863
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 466641,
-                    Sequence    = 4,
-                    Start       = 555471
+                    Description = null, Name = null, Type = "0x06", Length = 466641,
+                    Sequence    = 4, Start   = 555471
                 }
             },
+
             // Parted
             new[]
             {
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x83",
-                    Length      = 67584,
-                    Sequence    = 0,
-                    Start       = 4096
+                    Description = null, Name = null, Type = "0x83", Length = 67584,
+                    Sequence    = 0, Start   = 4096
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x07",
-                    Length      = 59392,
-                    Sequence    = 1,
-                    Start       = 73728
+                    Description = null, Name = null, Type = "0x07", Length = 59392,
+                    Sequence    = 1, Start   = 73728
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 129024,
-                    Sequence    = 2,
-                    Start       = 133120
+                    Description = null, Name = null, Type = "0x06", Length = 129024,
+                    Sequence    = 2, Start   = 133120
                 }
             },
+
             // PC-DOS 2000
             new[]
             {
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 205569,
-                    Sequence    = 0,
-                    Start       = 63
+                    Description = null, Name = null, Type = "0x06", Length = 205569,
+                    Sequence    = 0, Start   = 63
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 225729,
-                    Sequence    = 1,
-                    Start       = 205695
+                    Description = null, Name = null, Type = "0x06", Length = 225729,
+                    Sequence    = 1, Start   = 205695
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 245889,
-                    Sequence    = 2,
-                    Start       = 431487
+                    Description = null, Name = null, Type = "0x06", Length = 245889,
+                    Sequence    = 2, Start   = 431487
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 287217,
-                    Sequence    = 3,
-                    Start       = 677439
+                    Description = null, Name = null, Type = "0x06", Length = 287217,
+                    Sequence    = 3, Start   = 677439
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x04",
-                    Length      = 57393,
-                    Sequence    = 4,
-                    Start       = 964719
+                    Description = null, Name = null, Type = "0x04", Length = 57393,
+                    Sequence    = 4, Start   = 964719
                 }
             },
+
             // PC-DOS 2.00
             new[]
             {
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x01",
-                    Length      = 1022111,
-                    Sequence    = 0,
-                    Start       = 1
+                    Description = null, Name = null, Type = "0x01", Length = 1022111,
+                    Sequence    = 0, Start   = 1
                 }
             },
+
             // PC-DOS 2.10
             new[]
             {
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x01",
-                    Length      = 1022111,
-                    Sequence    = 0,
-                    Start       = 1
+                    Description = null, Name = null, Type = "0x01", Length = 1022111,
+                    Sequence    = 0, Start   = 1
                 }
             },
+
             // PC-DOS 3.00
             new[]
             {
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x01",
-                    Length      = 66465,
-                    Sequence    = 0,
-                    Start       = 63
+                    Description = null, Name = null, Type = "0x01", Length = 66465,
+                    Sequence    = 0, Start   = 63
                 }
             },
+
             // PC-DOS 3.10
             new[]
             {
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x01",
-                    Length      = 66465,
-                    Sequence    = 0,
-                    Start       = 63
+                    Description = null, Name = null, Type = "0x01", Length = 66465,
+                    Sequence    = 0, Start   = 63
                 }
             },
+
             // PC-DOS 3.30
             new[]
             {
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x04",
-                    Length      = 65457,
-                    Sequence    = 0,
-                    Start       = 63
+                    Description = null, Name = null, Type = "0x04", Length = 65457,
+                    Sequence    = 0, Start   = 63
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x04",
-                    Length      = 65457,
-                    Sequence    = 1,
-                    Start       = 65583
+                    Description = null, Name = null, Type = "0x04", Length = 65457,
+                    Sequence    = 1, Start   = 65583
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x04",
-                    Length      = 65457,
-                    Sequence    = 2,
-                    Start       = 131103
+                    Description = null, Name = null, Type = "0x04", Length = 65457,
+                    Sequence    = 2, Start   = 131103
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x04",
-                    Length      = 65457,
-                    Sequence    = 3,
-                    Start       = 196623
+                    Description = null, Name = null, Type = "0x04", Length = 65457,
+                    Sequence    = 3, Start   = 196623
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x04",
-                    Length      = 65457,
-                    Sequence    = 4,
-                    Start       = 262143
+                    Description = null, Name = null, Type = "0x04", Length = 65457,
+                    Sequence    = 4, Start   = 262143
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x04",
-                    Length      = 65457,
-                    Sequence    = 5,
-                    Start       = 327663
+                    Description = null, Name = null, Type = "0x04", Length = 65457,
+                    Sequence    = 5, Start   = 327663
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x04",
-                    Length      = 65457,
-                    Sequence    = 6,
-                    Start       = 393183
+                    Description = null, Name = null, Type = "0x04", Length = 65457,
+                    Sequence    = 6, Start   = 393183
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x04",
-                    Length      = 65457,
-                    Sequence    = 7,
-                    Start       = 458703
+                    Description = null, Name = null, Type = "0x04", Length = 65457,
+                    Sequence    = 7, Start   = 458703
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x04",
-                    Length      = 65457,
-                    Sequence    = 8,
-                    Start       = 524223
+                    Description = null, Name = null, Type = "0x04", Length = 65457,
+                    Sequence    = 8, Start   = 524223
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x04",
-                    Length      = 65457,
-                    Sequence    = 9,
-                    Start       = 589743
+                    Description = null, Name = null, Type = "0x04", Length = 65457,
+                    Sequence    = 9, Start   = 589743
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x04",
-                    Length      = 65457,
-                    Sequence    = 10,
-                    Start       = 655263
+                    Description = null, Name = null, Type = "0x04", Length = 65457,
+                    Sequence    = 10, Start  = 655263
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x04",
-                    Length      = 65457,
-                    Sequence    = 11,
-                    Start       = 720783
+                    Description = null, Name = null, Type = "0x04", Length = 65457,
+                    Sequence    = 11, Start  = 720783
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x04",
-                    Length      = 65457,
-                    Sequence    = 12,
-                    Start       = 786303
+                    Description = null, Name = null, Type = "0x04", Length = 65457,
+                    Sequence    = 12, Start  = 786303
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x04",
-                    Length      = 65457,
-                    Sequence    = 13,
-                    Start       = 851823
+                    Description = null, Name = null, Type = "0x04", Length = 65457,
+                    Sequence    = 13, Start  = 851823
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x04",
-                    Length      = 65457,
-                    Sequence    = 14,
-                    Start       = 917343
+                    Description = null, Name = null, Type = "0x04", Length = 65457,
+                    Sequence    = 14, Start  = 917343
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x04",
-                    Length      = 39249,
-                    Sequence    = 15,
-                    Start       = 982863
+                    Description = null, Name = null, Type = "0x04", Length = 39249,
+                    Sequence    = 15, Start  = 982863
                 }
             },
+
             // PC-DOS 4.00
             new[]
             {
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 205569,
-                    Sequence    = 0,
-                    Start       = 63
+                    Description = null, Name = null, Type = "0x06", Length = 205569,
+                    Sequence    = 0, Start   = 63
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x01",
-                    Length      = 25137,
-                    Sequence    = 1,
-                    Start       = 205695
+                    Description = null, Name = null, Type = "0x01", Length = 25137,
+                    Sequence    = 1, Start   = 205695
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 245889,
-                    Sequence    = 2,
-                    Start       = 230895
+                    Description = null, Name = null, Type = "0x06", Length = 245889,
+                    Sequence    = 2, Start   = 230895
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 307377,
-                    Sequence    = 3,
-                    Start       = 476847
+                    Description = null, Name = null, Type = "0x06", Length = 307377,
+                    Sequence    = 3, Start   = 476847
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 237825,
-                    Sequence    = 4,
-                    Start       = 784287
+                    Description = null, Name = null, Type = "0x06", Length = 237825,
+                    Sequence    = 4, Start   = 784287
                 }
             },
+
             // PC-DOS 5.00
             new[]
             {
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 205569,
-                    Sequence    = 0,
-                    Start       = 63
+                    Description = null, Name = null, Type = "0x06", Length = 205569,
+                    Sequence    = 0, Start   = 63
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x01",
-                    Length      = 25137,
-                    Sequence    = 1,
-                    Start       = 205695
+                    Description = null, Name = null, Type = "0x01", Length = 25137,
+                    Sequence    = 1, Start   = 205695
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 245889,
-                    Sequence    = 2,
-                    Start       = 230895
+                    Description = null, Name = null, Type = "0x06", Length = 245889,
+                    Sequence    = 2, Start   = 230895
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 287217,
-                    Sequence    = 3,
-                    Start       = 476847
+                    Description = null, Name = null, Type = "0x06", Length = 287217,
+                    Sequence    = 3, Start   = 476847
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 257985,
-                    Sequence    = 4,
-                    Start       = 764127
+                    Description = null, Name = null, Type = "0x06", Length = 257985,
+                    Sequence    = 4, Start   = 764127
                 }
             },
+
             // PC-DOS 6.10
             new[]
             {
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 205569,
-                    Sequence    = 0,
-                    Start       = 63
+                    Description = null, Name = null, Type = "0x06", Length = 205569,
+                    Sequence    = 0, Start   = 63
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x01",
-                    Length      = 25137,
-                    Sequence    = 1,
-                    Start       = 205695
+                    Description = null, Name = null, Type = "0x01", Length = 25137,
+                    Sequence    = 1, Start   = 205695
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 225729,
-                    Sequence    = 2,
-                    Start       = 230895
+                    Description = null, Name = null, Type = "0x06", Length = 225729,
+                    Sequence    = 2, Start   = 230895
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 245889,
-                    Sequence    = 3,
-                    Start       = 456687
+                    Description = null, Name = null, Type = "0x06", Length = 245889,
+                    Sequence    = 3, Start   = 456687
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 319473,
-                    Sequence    = 4,
-                    Start       = 702639
+                    Description = null, Name = null, Type = "0x06", Length = 319473,
+                    Sequence    = 4, Start   = 702639
                 }
             },
+
             // Windows 95
             new[]
             {
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 205569,
-                    Sequence    = 0,
-                    Start       = 63
+                    Description = null, Name = null, Type = "0x06", Length = 205569,
+                    Sequence    = 0, Start   = 63
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 245889,
-                    Sequence    = 1,
-                    Start       = 205695
+                    Description = null, Name = null, Type = "0x06", Length = 245889,
+                    Sequence    = 1, Start   = 205695
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 267057,
-                    Sequence    = 2,
-                    Start       = 451647
+                    Description = null, Name = null, Type = "0x06", Length = 267057,
+                    Sequence    = 2, Start   = 451647
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 287217,
-                    Sequence    = 3,
-                    Start       = 718767
+                    Description = null, Name = null, Type = "0x06", Length = 287217,
+                    Sequence    = 3, Start   = 718767
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x01",
-                    Length      = 17073,
-                    Sequence    = 4,
-                    Start       = 1006047
+                    Description = null, Name = null, Type = "0x01", Length = 17073,
+                    Sequence    = 4, Start   = 1006047
                 }
             },
+
             // Windows 95 OSR 2.5
             new[]
             {
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 307377,
-                    Sequence    = 0,
-                    Start       = 63
+                    Description = null, Name = null, Type = "0x06", Length = 307377,
+                    Sequence    = 0, Start   = 63
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 245889,
-                    Sequence    = 1,
-                    Start       = 307503
+                    Description = null, Name = null, Type = "0x06", Length = 245889,
+                    Sequence    = 1, Start   = 307503
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 328545,
-                    Sequence    = 2,
-                    Start       = 553455
+                    Description = null, Name = null, Type = "0x06", Length = 328545,
+                    Sequence    = 2, Start   = 553455
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 102753,
-                    Sequence    = 3,
-                    Start       = 882063
+                    Description = null, Name = null, Type = "0x06", Length = 102753,
+                    Sequence    = 3, Start   = 882063
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x01",
-                    Length      = 21105,
-                    Sequence    = 4,
-                    Start       = 984879
+                    Description = null, Name = null, Type = "0x01", Length = 21105,
+                    Sequence    = 4, Start   = 984879
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x01",
-                    Length      = 17073,
-                    Sequence    = 5,
-                    Start       = 1006047
+                    Description = null, Name = null, Type = "0x01", Length = 17073,
+                    Sequence    = 5, Start   = 1006047
                 }
             },
+
             // Windows NT 3.10
             new[]
             {
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x07",
-                    Length      = 204561,
-                    Sequence    = 0,
-                    Start       = 63
+                    Description = null, Name = null, Type = "0x07", Length = 204561,
+                    Sequence    = 0, Start   = 63
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x07",
-                    Length      = 307377,
-                    Sequence    = 1,
-                    Start       = 204687
+                    Description = null, Name = null, Type = "0x07", Length = 307377,
+                    Sequence    = 1, Start   = 204687
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 224721,
-                    Sequence    = 2,
-                    Start       = 512127
+                    Description = null, Name = null, Type = "0x06", Length = 224721,
+                    Sequence    = 2, Start   = 512127
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x06",
-                    Length      = 214641,
-                    Sequence    = 3,
-                    Start       = 736911
+                    Description = null, Name = null, Type = "0x06", Length = 214641,
+                    Sequence    = 3, Start   = 736911
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x01",
-                    Length      = 10017,
-                    Sequence    = 4,
-                    Start       = 951615
+                    Description = null, Name = null, Type = "0x01", Length = 10017,
+                    Sequence    = 4, Start   = 951615
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "0x07",
-                    Length      = 60480,
-                    Sequence    = 5,
-                    Start       = 962640
+                    Description = null, Name = null, Type = "0x07", Length = 60480,
+                    Sequence    = 5, Start   = 962640
                 }
             }
         };
@@ -1966,17 +1221,19 @@ namespace Aaru.Tests.Partitions
                 Assert.AreEqual(true, image.Open(filter), testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 Assert.AreEqual(wanted[i].Length, partitions.Count, testfiles[i]);
+
                 for(int j = 0; j < partitions.Count; j++)
                 {
                     // Too chatty
                     //Assert.AreEqual(wanted[i][j].PartitionDescription, partitions[j].PartitionDescription, testfiles[i]);
                     Assert.AreEqual(wanted[i][j].Length * 512, partitions[j].Size, testfiles[i]);
+
                     //                    Assert.AreEqual(wanted[i][j].Name, partitions[j].Name, testfiles[i]);
-                    Assert.AreEqual(wanted[i][j].Type,        partitions[j].Type,     testfiles[i]);
-                    Assert.AreEqual(wanted[i][j].Start * 512, partitions[j].Offset,   testfiles[i]);
-                    Assert.AreEqual(wanted[i][j].Length,      partitions[j].Length,   testfiles[i]);
-                    Assert.AreEqual(wanted[i][j].Sequence,    partitions[j].Sequence, testfiles[i]);
-                    Assert.AreEqual(wanted[i][j].Start,       partitions[j].Start,    testfiles[i]);
+                    Assert.AreEqual(wanted[i][j].Type, partitions[j].Type, testfiles[i]);
+                    Assert.AreEqual(wanted[i][j].Start * 512, partitions[j].Offset, testfiles[i]);
+                    Assert.AreEqual(wanted[i][j].Length, partitions[j].Length, testfiles[i]);
+                    Assert.AreEqual(wanted[i][j].Sequence, partitions[j].Sequence, testfiles[i]);
+                    Assert.AreEqual(wanted[i][j].Start, partitions[j].Start, testfiles[i]);
                 }
             }
         }
diff --git a/Aaru.Tests/Partitions/MINIX.cs b/Aaru.Tests/Partitions/MINIX.cs
index 1bdc84404..cd5fbf5ca 100644
--- a/Aaru.Tests/Partitions/MINIX.cs
+++ b/Aaru.Tests/Partitions/MINIX.cs
@@ -39,7 +39,10 @@ namespace Aaru.Tests.Partitions
     [TestFixture]
     public class Minix
     {
-        readonly string[] testfiles = {"minix_3.1.2a.vdi.lz"};
+        readonly string[] testfiles =
+        {
+            "minix_3.1.2a.vdi.lz"
+        };
 
         readonly Partition[][] wanted =
         {
@@ -48,47 +51,23 @@ namespace Aaru.Tests.Partitions
             {
                 new Partition
                 {
-                    Description = null,
-                    Size        = 268369408,
-                    Name        = "MINIX",
-                    Type        = "MINIX",
-                    Offset      = 2064896,
-                    Length      = 524159,
-                    Sequence    = 0,
-                    Start       = 4033
+                    Description = null, Size      = 268369408, Name  = "MINIX", Type = "MINIX",
+                    Offset      = 2064896, Length = 524159, Sequence = 0, Start      = 4033
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 270434304,
-                    Name        = "MINIX",
-                    Type        = "MINIX",
-                    Offset      = 270434304,
-                    Length      = 528192,
-                    Sequence    = 1,
-                    Start       = 528192
+                    Description = null, Size        = 270434304, Name  = "MINIX", Type = "MINIX",
+                    Offset      = 270434304, Length = 528192, Sequence = 1, Start      = 528192
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 270434304,
-                    Name        = "MINIX",
-                    Type        = "MINIX",
-                    Offset      = 540868608,
-                    Length      = 528192,
-                    Sequence    = 2,
-                    Start       = 1056384
+                    Description = null, Size        = 270434304, Name  = "MINIX", Type = "MINIX",
+                    Offset      = 540868608, Length = 528192, Sequence = 2, Start      = 1056384
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 262176768,
-                    Name        = "MINIX",
-                    Type        = "MINIX",
-                    Offset      = 811302912,
-                    Length      = 512064,
-                    Sequence    = 3,
-                    Start       = 1584576
+                    Description = null, Size        = 262176768, Name  = "MINIX", Type = "MINIX",
+                    Offset      = 811302912, Length = 512064, Sequence = 3, Start      = 1584576
                 }
             }
         };
@@ -105,17 +84,19 @@ namespace Aaru.Tests.Partitions
                 Assert.AreEqual(true, image.Open(filter), testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 Assert.AreEqual(wanted[i].Length, partitions.Count, testfiles[i]);
+
                 for(int j = 0; j < partitions.Count; j++)
                 {
                     // Too chatty
                     //Assert.AreEqual(wanted[i][j].PartitionDescription, partitions[j].PartitionDescription, testfiles[i]);
                     Assert.AreEqual(wanted[i][j].Size, partitions[j].Size, testfiles[i]);
+
                     //                    Assert.AreEqual(wanted[i][j].Name, partitions[j].Name, testfiles[i]);
-                    Assert.AreEqual(wanted[i][j].Type,     partitions[j].Type,     testfiles[i]);
-                    Assert.AreEqual(wanted[i][j].Offset,   partitions[j].Offset,   testfiles[i]);
-                    Assert.AreEqual(wanted[i][j].Length,   partitions[j].Length,   testfiles[i]);
+                    Assert.AreEqual(wanted[i][j].Type, partitions[j].Type, testfiles[i]);
+                    Assert.AreEqual(wanted[i][j].Offset, partitions[j].Offset, testfiles[i]);
+                    Assert.AreEqual(wanted[i][j].Length, partitions[j].Length, testfiles[i]);
                     Assert.AreEqual(wanted[i][j].Sequence, partitions[j].Sequence, testfiles[i]);
-                    Assert.AreEqual(wanted[i][j].Start,    partitions[j].Start,    testfiles[i]);
+                    Assert.AreEqual(wanted[i][j].Start, partitions[j].Start, testfiles[i]);
                 }
             }
         }
diff --git a/Aaru.Tests/Partitions/PC98.cs b/Aaru.Tests/Partitions/PC98.cs
index e851c6d21..d7051592c 100644
--- a/Aaru.Tests/Partitions/PC98.cs
+++ b/Aaru.Tests/Partitions/PC98.cs
@@ -51,325 +51,193 @@ namespace Aaru.Tests.Partitions
             {
                 new Partition
                 {
-                    Description = null,
-                    Name        = "MS-DOS 3.30",
-                    Type        = "FAT12",
-                    Length      = 19536,
-                    Sequence    = 0,
-                    Start       = 264
+                    Description = null, Name = "MS-DOS 3.30", Type = "FAT12", Length = 19536,
+                    Sequence    = 0, Start   = 264
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = "MS-DOS 3.30",
-                    Type        = "FAT12",
-                    Length      = 39336,
-                    Sequence    = 1,
-                    Start       = 20064
+                    Description = null, Name = "MS-DOS 3.30", Type = "FAT12", Length = 39336,
+                    Sequence    = 1, Start   = 20064
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = "MS-DOS 3.30",
-                    Type        = "FAT16",
-                    Length      = 59136,
-                    Sequence    = 2,
-                    Start       = 59664
+                    Description = null, Name = "MS-DOS 3.30", Type = "FAT16", Length = 59136,
+                    Sequence    = 2, Start   = 59664
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = "MS-DOS 3.30",
-                    Type        = "FAT16",
-                    Length      = 78936,
-                    Sequence    = 3,
-                    Start       = 119064
+                    Description = null, Name = "MS-DOS 3.30", Type = "FAT16", Length = 78936,
+                    Sequence    = 3, Start   = 119064
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = "MS-DOS 3.30",
-                    Type        = "FAT16",
-                    Length      = 118536,
-                    Sequence    = 4,
-                    Start       = 198264
+                    Description = null, Name = "MS-DOS 3.30", Type = "FAT16", Length = 118536,
+                    Sequence    = 4, Start   = 198264
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = "MS-DOS 3.30",
-                    Type        = "FAT16",
-                    Length      = 197736,
-                    Sequence    = 5,
-                    Start       = 317064
+                    Description = null, Name = "MS-DOS 3.30", Type = "FAT16", Length = 197736,
+                    Sequence    = 5, Start   = 317064
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = "MS-DOS 3.30",
-                    Type        = "FAT16",
-                    Length      = 237336,
-                    Sequence    = 6,
-                    Start       = 515064
+                    Description = null, Name = "MS-DOS 3.30", Type = "FAT16", Length = 237336,
+                    Sequence    = 6, Start   = 515064
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = "MS-DOS 3.30",
-                    Type        = "FAT16",
-                    Length      = 245256,
-                    Sequence    = 7,
-                    Start       = 752664
+                    Description = null, Name = "MS-DOS 3.30", Type = "FAT16", Length = 245256,
+                    Sequence    = 7, Start   = 752664
                 }
             },
+
             // NEC MS-DOS 3.30 (80Mb HDD)
             new[]
             {
                 new Partition
                 {
-                    Description = null,
-                    Name        = "MS-DOS 3.30",
-                    Type        = "FAT16",
-                    Length      = 59136,
-                    Sequence    = 0,
-                    Start       = 264
+                    Description = null, Name = "MS-DOS 3.30", Type = "FAT16", Length = 59136,
+                    Sequence    = 0, Start   = 264
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = "MS-DOS 3.30",
-                    Type        = "FAT16",
-                    Length      = 158136,
-                    Sequence    = 1,
-                    Start       = 59664
+                    Description = null, Name = "MS-DOS 3.30", Type = "FAT16", Length = 158136,
+                    Sequence    = 1, Start   = 59664
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = "MS-DOS 3.30",
-                    Type        = "FAT16",
-                    Length      = 94776,
-                    Sequence    = 2,
-                    Start       = 218064
+                    Description = null, Name = "MS-DOS 3.30", Type = "FAT16", Length = 94776,
+                    Sequence    = 2, Start   = 218064
                 }
             },
+
             // Epson MS-DOS 3.30
             new[]
             {
                 new Partition
                 {
-                    Description = null,
-                    Name        = "NamenameName",
-                    Type        = "FAT12",
-                    Length      = 35639,
-                    Sequence    = 0,
-                    Start       = 264
+                    Description = null, Name = "NamenameName", Type = "FAT12", Length = 35639,
+                    Sequence    = 0, Start   = 264
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = "12BitFAT",
-                    Type        = "FAT12",
-                    Length      = 59399,
-                    Sequence    = 1,
-                    Start       = 35904
+                    Description = null, Name = "12BitFAT", Type = "FAT12", Length = 59399,
+                    Sequence    = 1, Start   = 35904
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = "16BitFAT",
-                    Type        = "FAT16",
-                    Length      = 79199,
-                    Sequence    = 2,
-                    Start       = 95304
+                    Description = null, Name = "16BitFAT", Type = "FAT16", Length = 79199,
+                    Sequence    = 2, Start   = 95304
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = "PartLblMaxNameXX",
-                    Type        = "FAT16",
-                    Length      = 118799,
-                    Sequence    = 3,
-                    Start       = 174504
+                    Description = null, Name = "PartLblMaxNameXX", Type = "FAT16", Length = 118799,
+                    Sequence    = 3, Start   = 174504
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = "BigFAT12",
-                    Type        = "FAT12",
-                    Length      = 158399,
-                    Sequence    = 4,
-                    Start       = 293304
+                    Description = null, Name = "BigFAT12", Type = "FAT12", Length = 158399,
+                    Sequence    = 4, Start   = 293304
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = "Lalalalalalalala",
-                    Type        = "FAT16",
-                    Length      = 197999,
-                    Sequence    = 5,
-                    Start       = 451704
+                    Description = null, Name = "Lalalalalalalala", Type = "FAT16", Length = 197999,
+                    Sequence    = 5, Start   = 451704
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = "MS-DOS Ver 5.0",
-                    Type        = "FAT16",
-                    Length      = 237599,
-                    Sequence    = 6,
-                    Start       = 649704
+                    Description = null, Name = "MS-DOS Ver 5.0", Type = "FAT16", Length = 237599,
+                    Sequence    = 6, Start   = 649704
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = "MS-DOS Ver 5.0",
-                    Type        = "FAT16",
-                    Length      = 118799,
-                    Sequence    = 7,
-                    Start       = 887304
+                    Description = null, Name = "MS-DOS Ver 5.0", Type = "FAT16", Length = 118799,
+                    Sequence    = 7, Start   = 887304
                 }
             },
+
             // NEC MS-DOS 5.00
             new[]
             {
                 new Partition
                 {
-                    Description = null,
-                    Name        = "MS-DOS 5.00",
-                    Type        = "FAT12",
-                    Length      = 28512,
-                    Sequence    = 0,
-                    Start       = 264
+                    Description = null, Name = "MS-DOS 5.00", Type = "FAT12", Length = 28512,
+                    Sequence    = 0, Start   = 264
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = "MS-DOS 5.00",
-                    Type        = "FAT16",
-                    Length      = 49104,
-                    Sequence    = 1,
-                    Start       = 29040
+                    Description = null, Name = "MS-DOS 5.00", Type = "FAT16", Length = 49104,
+                    Sequence    = 1, Start   = 29040
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = "MS-DOS 5.00",
-                    Type        = "FAT16",
-                    Length      = 93984,
-                    Sequence    = 2,
-                    Start       = 78408
+                    Description = null, Name = "MS-DOS 5.00", Type = "FAT16", Length = 93984,
+                    Sequence    = 2, Start   = 78408
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = "MS-DOS 5.00",
-                    Type        = "FAT16",
-                    Length      = 122760,
-                    Sequence    = 3,
-                    Start       = 172656
+                    Description = null, Name = "MS-DOS 5.00", Type = "FAT16", Length = 122760,
+                    Sequence    = 3, Start   = 172656
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = "MS-DOS 5.00",
-                    Type        = "FAT16",
-                    Length      = 163680,
-                    Sequence    = 4,
-                    Start       = 295680
+                    Description = null, Name = "MS-DOS 5.00", Type = "FAT16", Length = 163680,
+                    Sequence    = 4, Start   = 295680
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = "MS-DOS 5.00",
-                    Type        = "FAT16",
-                    Length      = 204600,
-                    Sequence    = 5,
-                    Start       = 459624
+                    Description = null, Name = "MS-DOS 5.00", Type = "FAT16", Length = 204600,
+                    Sequence    = 5, Start   = 459624
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = "MS-DOS 5.00",
-                    Type        = "FAT16",
-                    Length      = 204600,
-                    Sequence    = 6,
-                    Start       = 664488
+                    Description = null, Name = "MS-DOS 5.00", Type = "FAT16", Length = 204600,
+                    Sequence    = 6, Start   = 664488
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = "MS-DOS 5.00",
-                    Type        = "FAT16",
-                    Length      = 139128,
-                    Sequence    = 7,
-                    Start       = 869352
+                    Description = null, Name = "MS-DOS 5.00", Type = "FAT16", Length = 139128,
+                    Sequence    = 7, Start   = 869352
                 }
             },
+
             // NEC MS-DOS 6.20
             new[]
             {
                 new Partition
                 {
-                    Description = null,
-                    Name        = "MS-DOS 6.20",
-                    Type        = "FAT16",
-                    Length      = 61248,
-                    Sequence    = 0,
-                    Start       = 264
+                    Description = null, Name = "MS-DOS 6.20", Type = "FAT16", Length = 61248,
+                    Sequence    = 0, Start   = 264
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = "MS-DOS 6.20",
-                    Type        = "FAT16",
-                    Length      = 81840,
-                    Sequence    = 1,
-                    Start       = 61776
+                    Description = null, Name = "MS-DOS 6.20", Type = "FAT16", Length = 81840,
+                    Sequence    = 1, Start   = 61776
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = "MS-DOS 6.20",
-                    Type        = "FAT16",
-                    Length      = 122760,
-                    Sequence    = 2,
-                    Start       = 143880
+                    Description = null, Name = "MS-DOS 6.20", Type = "FAT16", Length = 122760,
+                    Sequence    = 2, Start   = 143880
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = "MS-DOS 6.20",
-                    Type        = "FAT16",
-                    Length      = 163680,
-                    Sequence    = 3,
-                    Start       = 266904
+                    Description = null, Name = "MS-DOS 6.20", Type = "FAT16", Length = 163680,
+                    Sequence    = 3, Start   = 266904
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = "MS-DOS 6.20",
-                    Type        = "FAT12",
-                    Length      = 20328,
-                    Sequence    = 4,
-                    Start       = 430848
+                    Description = null, Name = "MS-DOS 6.20", Type = "FAT12", Length = 20328,
+                    Sequence    = 4, Start   = 430848
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = "MS-DOS 6.20",
-                    Type        = "FAT16",
-                    Length      = 245520,
-                    Sequence    = 5,
-                    Start       = 451440
+                    Description = null, Name = "MS-DOS 6.20", Type = "FAT16", Length = 245520,
+                    Sequence    = 5, Start   = 451440
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = "MS-DOS 6.20",
-                    Type        = "FAT16",
-                    Length      = 315216,
-                    Sequence    = 6,
-                    Start       = 697224
+                    Description = null, Name = "MS-DOS 6.20", Type = "FAT16", Length = 315216,
+                    Sequence    = 6, Start   = 697224
                 }
             }
         };
@@ -386,15 +254,16 @@ namespace Aaru.Tests.Partitions
                 Assert.AreEqual(true, image.Open(filter), testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 Assert.AreEqual(wanted[i].Length, partitions.Count, testfiles[i]);
+
                 for(int j = 0; j < partitions.Count; j++)
                 {
                     // Too chatty
                     //Assert.AreEqual(wanted[i][j].PartitionDescription, partitions[j].PartitionDescription, testfiles[i]);
-                    Assert.AreEqual(wanted[i][j].Length,   partitions[j].Length,   testfiles[i]);
-                    Assert.AreEqual(wanted[i][j].Name,     partitions[j].Name,     testfiles[i]);
-                    Assert.AreEqual(wanted[i][j].Type,     partitions[j].Type,     testfiles[i]);
+                    Assert.AreEqual(wanted[i][j].Length, partitions[j].Length, testfiles[i]);
+                    Assert.AreEqual(wanted[i][j].Name, partitions[j].Name, testfiles[i]);
+                    Assert.AreEqual(wanted[i][j].Type, partitions[j].Type, testfiles[i]);
                     Assert.AreEqual(wanted[i][j].Sequence, partitions[j].Sequence, testfiles[i]);
-                    Assert.AreEqual(wanted[i][j].Start,    partitions[j].Start,    testfiles[i]);
+                    Assert.AreEqual(wanted[i][j].Start, partitions[j].Start, testfiles[i]);
                 }
             }
         }
diff --git a/Aaru.Tests/Partitions/RDB.cs b/Aaru.Tests/Partitions/RDB.cs
index 922d93bd6..a17a99fbe 100644
--- a/Aaru.Tests/Partitions/RDB.cs
+++ b/Aaru.Tests/Partitions/RDB.cs
@@ -39,7 +39,10 @@ namespace Aaru.Tests.Partitions
     [TestFixture]
     public class Rdb
     {
-        readonly string[] testfiles = {"amigaos_3.9.vdi.lz", "amigaos_4.0.vdi.lz", "parted.vdi.lz"};
+        readonly string[] testfiles =
+        {
+            "amigaos_3.9.vdi.lz", "amigaos_4.0.vdi.lz", "parted.vdi.lz"
+        };
 
         readonly Partition[][] wanted =
         {
@@ -48,176 +51,88 @@ namespace Aaru.Tests.Partitions
             {
                 new Partition
                 {
-                    Description = null,
-                    Size        = 87392256,
-                    Name        = "UDH0",
-                    Type        = "\"DOS\\0\"",
-                    Offset      = 2080768,
-                    Length      = 170688,
-                    Sequence    = 0,
-                    Start       = 4064
+                    Description = null, Size      = 87392256, Name   = "UDH0", Type = "\"DOS\\0\"",
+                    Offset      = 2080768, Length = 170688, Sequence = 0, Start     = 4064
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 87392256,
-                    Name        = "UDH1",
-                    Type        = "\"DOS\\2\"",
-                    Offset      = 89473024,
-                    Length      = 170688,
-                    Sequence    = 1,
-                    Start       = 174752
+                    Description = null, Size       = 87392256, Name   = "UDH1", Type = "\"DOS\\2\"",
+                    Offset      = 89473024, Length = 170688, Sequence = 1, Start     = 174752
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 87392256,
-                    Name        = "UDH2",
-                    Type        = "\"DOS\\1\"",
-                    Offset      = 176865280,
-                    Length      = 170688,
-                    Sequence    = 2,
-                    Start       = 345440
+                    Description = null, Size        = 87392256, Name   = "UDH2", Type = "\"DOS\\1\"",
+                    Offset      = 176865280, Length = 170688, Sequence = 2, Start     = 345440
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 87392256,
-                    Name        = "UDH3",
-                    Type        = "\"DOS\\3\"",
-                    Offset      = 264257536,
-                    Length      = 170688,
-                    Sequence    = 3,
-                    Start       = 516128
+                    Description = null, Size        = 87392256, Name   = "UDH3", Type = "\"DOS\\3\"",
+                    Offset      = 264257536, Length = 170688, Sequence = 3, Start     = 516128
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 87300096,
-                    Name        = "FAT16",
-                    Type        = "0x06",
-                    Offset      = 351663104,
-                    Length      = 170508,
-                    Sequence    = 4,
-                    Start       = 686842
+                    Description = null, Size        = 87300096, Name   = "FAT16", Type = "0x06",
+                    Offset      = 351663104, Length = 170508, Sequence = 4, Start      = 686842
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 85311488,
-                    Name        = "UDH5",
-                    Type        = "\"RES\\86\"",
-                    Offset      = 439042048,
-                    Length      = 166624,
-                    Sequence    = 5,
-                    Start       = 857504
+                    Description = null, Size        = 85311488, Name   = "UDH5", Type = "\"RES\\86\"",
+                    Offset      = 439042048, Length = 166624, Sequence = 5, Start     = 857504
                 }
             },
+
             // AmigaOS 4.0
             new[]
             {
                 new Partition
                 {
-                    Description = null,
-                    Size        = 91455488,
-                    Name        = "DH1",
-                    Type        = "\"DOS\\1\"",
-                    Offset      = 1048576,
-                    Length      = 178624,
-                    Sequence    = 0,
-                    Start       = 2048
+                    Description = null, Size      = 91455488, Name   = "DH1", Type = "\"DOS\\1\"",
+                    Offset      = 1048576, Length = 178624, Sequence = 0, Start    = 2048
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 76546048,
-                    Name        = "DH2",
-                    Type        = "\"DOS\\3\"",
-                    Offset      = 92504064,
-                    Length      = 149504,
-                    Sequence    = 1,
-                    Start       = 180672
+                    Description = null, Size       = 76546048, Name   = "DH2", Type = "\"DOS\\3\"",
+                    Offset      = 92504064, Length = 149504, Sequence = 1, Start    = 180672
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 78741504,
-                    Name        = "DH3",
-                    Type        = "\"DOS\\3\"",
-                    Offset      = 169050112,
-                    Length      = 153792,
-                    Sequence    = 2,
-                    Start       = 330176
+                    Description = null, Size        = 78741504, Name   = "DH3", Type = "\"DOS\\3\"",
+                    Offset      = 169050112, Length = 153792, Sequence = 2, Start    = 330176
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 78020608,
-                    Name        = "DH4",
-                    Type        = "\"DOS\\7\"",
-                    Offset      = 247791616,
-                    Length      = 152384,
-                    Sequence    = 3,
-                    Start       = 483968
+                    Description = null, Size        = 78020608, Name   = "DH4", Type = "\"DOS\\7\"",
+                    Offset      = 247791616, Length = 152384, Sequence = 3, Start    = 483968
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 85000192,
-                    Name        = "DH5",
-                    Type        = "\"SFS\\0\"",
-                    Offset      = 325812224,
-                    Length      = 166016,
-                    Sequence    = 4,
-                    Start       = 636352
+                    Description = null, Size        = 85000192, Name   = "DH5", Type = "\"SFS\\0\"",
+                    Offset      = 325812224, Length = 166016, Sequence = 4, Start    = 636352
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 113541120,
-                    Name        = "DH6",
-                    Type        = "\"SFS\\2\"",
-                    Offset      = 410812416,
-                    Length      = 221760,
-                    Sequence    = 5,
-                    Start       = 802368
+                    Description = null, Size        = 113541120, Name  = "DH6", Type = "\"SFS\\2\"",
+                    Offset      = 410812416, Length = 221760, Sequence = 5, Start    = 802368
                 }
             },
+
             // Parted
             new[]
             {
                 new Partition
                 {
-                    Description = null,
-                    Size        = 8225280,
-                    Name        = "primary",
-                    Type        = "\"\0\0\0\\0\"",
-                    Offset      = 8225280,
-                    Length      = 16065,
-                    Sequence    = 0,
-                    Start       = 16065
+                    Description = null, Size      = 8225280, Name   = "primary", Type = "\"\0\0\0\\0\"",
+                    Offset      = 8225280, Length = 16065, Sequence = 0, Start        = 16065
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 24675840,
-                    Name        = "name",
-                    Type        = "\"FAT\\1\"",
-                    Offset      = 16450560,
-                    Length      = 48195,
-                    Sequence    = 1,
-                    Start       = 32130
+                    Description = null, Size       = 24675840, Name  = "name", Type = "\"FAT\\1\"",
+                    Offset      = 16450560, Length = 48195, Sequence = 1, Start     = 32130
                 },
                 new Partition
                 {
-                    Description = null,
-                    Size        = 90478080,
-                    Name        = "partition",
-                    Type        = "\"\0\0\0\\0\"",
-                    Offset      = 41126400,
-                    Length      = 176715,
-                    Sequence    = 2,
-                    Start       = 80325
+                    Description = null, Size       = 90478080, Name   = "partition", Type = "\"\0\0\0\\0\"",
+                    Offset      = 41126400, Length = 176715, Sequence = 2, Start          = 80325
                 }
             }
         };
@@ -234,17 +149,18 @@ namespace Aaru.Tests.Partitions
                 Assert.AreEqual(true, image.Open(filter), testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 Assert.AreEqual(wanted[i].Length, partitions.Count, testfiles[i]);
+
                 for(int j = 0; j < partitions.Count; j++)
                 {
                     // Too chatty
                     //Assert.AreEqual(wanted[i][j].PartitionDescription, partitions[j].PartitionDescription, testfiles[i]);
-                    Assert.AreEqual(wanted[i][j].Size,     partitions[j].Size,     testfiles[i]);
-                    Assert.AreEqual(wanted[i][j].Name,     partitions[j].Name,     testfiles[i]);
-                    Assert.AreEqual(wanted[i][j].Type,     partitions[j].Type,     testfiles[i]);
-                    Assert.AreEqual(wanted[i][j].Offset,   partitions[j].Offset,   testfiles[i]);
-                    Assert.AreEqual(wanted[i][j].Length,   partitions[j].Length,   testfiles[i]);
+                    Assert.AreEqual(wanted[i][j].Size, partitions[j].Size, testfiles[i]);
+                    Assert.AreEqual(wanted[i][j].Name, partitions[j].Name, testfiles[i]);
+                    Assert.AreEqual(wanted[i][j].Type, partitions[j].Type, testfiles[i]);
+                    Assert.AreEqual(wanted[i][j].Offset, partitions[j].Offset, testfiles[i]);
+                    Assert.AreEqual(wanted[i][j].Length, partitions[j].Length, testfiles[i]);
                     Assert.AreEqual(wanted[i][j].Sequence, partitions[j].Sequence, testfiles[i]);
-                    Assert.AreEqual(wanted[i][j].Start,    partitions[j].Start,    testfiles[i]);
+                    Assert.AreEqual(wanted[i][j].Start, partitions[j].Start, testfiles[i]);
                 }
             }
         }
diff --git a/Aaru.Tests/Partitions/SGI.cs b/Aaru.Tests/Partitions/SGI.cs
index b74d34d3b..b732c3f88 100644
--- a/Aaru.Tests/Partitions/SGI.cs
+++ b/Aaru.Tests/Partitions/SGI.cs
@@ -39,7 +39,10 @@ namespace Aaru.Tests.Partitions
     [TestFixture]
     public class Sgi
     {
-        readonly string[] testfiles = {"linux.vdi.lz", "parted.vdi.lz"};
+        readonly string[] testfiles =
+        {
+            "linux.vdi.lz", "parted.vdi.lz"
+        };
 
         readonly Partition[][] wanted =
         {
@@ -48,169 +51,98 @@ namespace Aaru.Tests.Partitions
             {
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "XFS",
-                    Length      = 40961,
-                    Sequence    = 0,
-                    Start       = 16065
+                    Description = null, Name = null, Type = "XFS", Length = 40961,
+                    Sequence    = 0, Start   = 16065
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "Linux RAID",
-                    Length      = 61441,
-                    Sequence    = 1,
-                    Start       = 64260
+                    Description = null, Name = null, Type = "Linux RAID", Length = 61441,
+                    Sequence    = 1, Start   = 64260
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "Track replacements",
-                    Length      = 81921,
-                    Sequence    = 2,
-                    Start       = 128520
+                    Description = null, Name = null, Type = "Track replacements", Length = 81921,
+                    Sequence    = 2, Start   = 128520
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "Sector replacements",
-                    Length      = 92161,
-                    Sequence    = 3,
-                    Start       = 224910
+                    Description = null, Name = null, Type = "Sector replacements", Length = 92161,
+                    Sequence    = 3, Start   = 224910
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "Raw data (swap)",
-                    Length      = 102401,
-                    Sequence    = 4,
-                    Start       = 321300
+                    Description = null, Name = null, Type = "Raw data (swap)", Length = 102401,
+                    Sequence    = 4, Start   = 321300
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "4.2BSD Fast File System",
-                    Length      = 30721,
-                    Sequence    = 5,
-                    Start       = 433755
+                    Description = null, Name = null, Type = "4.2BSD Fast File System", Length = 30721,
+                    Sequence    = 5, Start   = 433755
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "UNIX System V",
-                    Length      = 71681,
-                    Sequence    = 6,
-                    Start       = 465885
+                    Description = null, Name = null, Type = "UNIX System V", Length = 71681,
+                    Sequence    = 6, Start   = 465885
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "EFS",
-                    Length      = 10241,
-                    Sequence    = 7,
-                    Start       = 546210
+                    Description = null, Name = null, Type = "EFS", Length = 10241,
+                    Sequence    = 7, Start   = 546210
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "Logical volume",
-                    Length      = 122881,
-                    Sequence    = 8,
-                    Start       = 562275
+                    Description = null, Name = null, Type = "Logical volume", Length = 122881,
+                    Sequence    = 8, Start   = 562275
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "Raw logical volume",
-                    Length      = 133121,
-                    Sequence    = 9,
-                    Start       = 690795
+                    Description = null, Name = null, Type = "Raw logical volume", Length = 133121,
+                    Sequence    = 9, Start   = 690795
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "XFS log device",
-                    Length      = 51201,
-                    Sequence    = 10,
-                    Start       = 835380
+                    Description = null, Name = null, Type = "XFS log device", Length = 51201,
+                    Sequence    = 10, Start  = 835380
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "Linux swap",
-                    Length      = 30721,
-                    Sequence    = 11,
-                    Start       = 899640
+                    Description = null, Name = null, Type = "Linux swap", Length = 30721,
+                    Sequence    = 11, Start  = 899640
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "SGI XVM",
-                    Length      = 6145,
-                    Sequence    = 12,
-                    Start       = 931770
+                    Description = null, Name = null, Type = "SGI XVM", Length = 6145,
+                    Sequence    = 12, Start  = 931770
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "Linux",
-                    Length      = 64260,
-                    Sequence    = 13,
-                    Start       = 947835
+                    Description = null, Name = null, Type = "Linux", Length = 64260,
+                    Sequence    = 13, Start  = 947835
                 }
             },
+
             // GNU Parted
             new[]
             {
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "Raw data (swap)",
-                    Length      = 22528,
-                    Sequence    = 0,
-                    Start       = 6144
+                    Description = null, Name = null, Type = "Raw data (swap)", Length = 22528,
+                    Sequence    = 0, Start   = 6144
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "Raw data (swap)",
-                    Length      = 67584,
-                    Sequence    = 1,
-                    Start       = 30720
+                    Description = null, Name = null, Type = "Raw data (swap)", Length = 67584,
+                    Sequence    = 1, Start   = 30720
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "Raw data (swap)",
-                    Length      = 94208,
-                    Sequence    = 2,
-                    Start       = 100352
+                    Description = null, Name = null, Type = "Raw data (swap)", Length = 94208,
+                    Sequence    = 2, Start   = 100352
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "XFS",
-                    Length      = 36864,
-                    Sequence    = 3,
-                    Start       = 196608
+                    Description = null, Name = null, Type = "XFS", Length = 36864,
+                    Sequence    = 3, Start   = 196608
                 }
             }
         };
@@ -227,17 +159,19 @@ namespace Aaru.Tests.Partitions
                 Assert.AreEqual(true, image.Open(filter), testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 Assert.AreEqual(wanted[i].Length, partitions.Count, testfiles[i]);
+
                 for(int j = 0; j < partitions.Count; j++)
                 {
                     // Too chatty
                     //Assert.AreEqual(wanted[i][j].PartitionDescription, partitions[j].PartitionDescription, testfiles[i]);
                     Assert.AreEqual(wanted[i][j].Length * 512, partitions[j].Size, testfiles[i]);
+
                     //                    Assert.AreEqual(wanted[i][j].Name, partitions[j].Name, testfiles[i]);
-                    Assert.AreEqual(wanted[i][j].Type,        partitions[j].Type,     testfiles[i]);
-                    Assert.AreEqual(wanted[i][j].Start * 512, partitions[j].Offset,   testfiles[i]);
-                    Assert.AreEqual(wanted[i][j].Length,      partitions[j].Length,   testfiles[i]);
-                    Assert.AreEqual(wanted[i][j].Sequence,    partitions[j].Sequence, testfiles[i]);
-                    Assert.AreEqual(wanted[i][j].Start,       partitions[j].Start,    testfiles[i]);
+                    Assert.AreEqual(wanted[i][j].Type, partitions[j].Type, testfiles[i]);
+                    Assert.AreEqual(wanted[i][j].Start * 512, partitions[j].Offset, testfiles[i]);
+                    Assert.AreEqual(wanted[i][j].Length, partitions[j].Length, testfiles[i]);
+                    Assert.AreEqual(wanted[i][j].Sequence, partitions[j].Sequence, testfiles[i]);
+                    Assert.AreEqual(wanted[i][j].Start, partitions[j].Start, testfiles[i]);
                 }
             }
         }
diff --git a/Aaru.Tests/Partitions/Sun.cs b/Aaru.Tests/Partitions/Sun.cs
index cd387a78c..77d504b4a 100644
--- a/Aaru.Tests/Partitions/Sun.cs
+++ b/Aaru.Tests/Partitions/Sun.cs
@@ -40,7 +40,10 @@ namespace Aaru.Tests.Partitions
     [TestFixture]
     public class Sun
     {
-        readonly string[] testfiles = {"linux.vdi.lz", "parted.vdi.lz"};
+        readonly string[] testfiles =
+        {
+            "linux.vdi.lz", "parted.vdi.lz"
+        };
 
         readonly Partition[][] wanted =
         {
@@ -49,97 +52,58 @@ namespace Aaru.Tests.Partitions
             {
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "Linux",
-                    Length      = 204800,
-                    Sequence    = 0,
-                    Start       = 0
+                    Description = null, Name = null, Type = "Linux", Length = 204800,
+                    Sequence    = 0, Start   = 0
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "Sun boot",
-                    Length      = 102400,
-                    Sequence    = 1,
-                    Start       = 208845
+                    Description = null, Name = null, Type = "Sun boot", Length = 102400,
+                    Sequence    = 1, Start   = 208845
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "Sun /",
-                    Length      = 102400,
-                    Sequence    = 2,
-                    Start       = 321300
+                    Description = null, Name = null, Type = "Sun /", Length = 102400,
+                    Sequence    = 2, Start   = 321300
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "Sun /home",
-                    Length      = 102400,
-                    Sequence    = 3,
-                    Start       = 433755
+                    Description = null, Name = null, Type = "Sun /home", Length = 102400,
+                    Sequence    = 3, Start   = 433755
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "Sun swap",
-                    Length      = 153600,
-                    Sequence    = 4,
-                    Start       = 546210
+                    Description = null, Name = null, Type = "Sun swap", Length = 153600,
+                    Sequence    = 4, Start   = 546210
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "Sun /usr",
-                    Length      = 208845,
-                    Sequence    = 5,
-                    Start       = 706860
+                    Description = null, Name = null, Type = "Sun /usr", Length = 208845,
+                    Sequence    = 5, Start   = 706860
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "Linux swap",
-                    Length      = 96390,
-                    Sequence    = 6,
-                    Start       = 915705
+                    Description = null, Name = null, Type = "Linux swap", Length = 96390,
+                    Sequence    = 6, Start   = 915705
                 }
             },
+
             // GNU Parted
             new[]
             {
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "Linux",
-                    Length      = 49152,
-                    Sequence    = 0,
-                    Start       = 0
+                    Description = null, Name = null, Type = "Linux", Length = 49152,
+                    Sequence    = 0, Start   = 0
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "Linux",
-                    Length      = 80325,
-                    Sequence    = 1,
-                    Start       = 64260
+                    Description = null, Name = null, Type = "Linux", Length = 80325,
+                    Sequence    = 1, Start   = 64260
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "Linux",
-                    Length      = 96390,
-                    Sequence    = 2,
-                    Start       = 144585
+                    Description = null, Name = null, Type = "Linux", Length = 96390,
+                    Sequence    = 2, Start   = 144585
                 }
             }
         };
@@ -156,17 +120,19 @@ namespace Aaru.Tests.Partitions
                 Assert.AreEqual(true, image.Open(filter), testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 Assert.AreEqual(wanted[i].Length, partitions.Count, testfiles[i]);
+
                 for(int j = 0; j < partitions.Count; j++)
                 {
                     // Too chatty
                     //Assert.AreEqual(wanted[i][j].PartitionDescription, partitions[j].PartitionDescription, testfiles[i]);
                     Assert.AreEqual(wanted[i][j].Length * 512, partitions[j].Size, testfiles[i]);
+
                     //                    Assert.AreEqual(wanted[i][j].Name, partitions[j].Name, testfiles[i]);
-                    Assert.AreEqual(wanted[i][j].Type,        partitions[j].Type,     testfiles[i]);
-                    Assert.AreEqual(wanted[i][j].Start * 512, partitions[j].Offset,   testfiles[i]);
-                    Assert.AreEqual(wanted[i][j].Length,      partitions[j].Length,   testfiles[i]);
-                    Assert.AreEqual(wanted[i][j].Sequence,    partitions[j].Sequence, testfiles[i]);
-                    Assert.AreEqual(wanted[i][j].Start,       partitions[j].Start,    testfiles[i]);
+                    Assert.AreEqual(wanted[i][j].Type, partitions[j].Type, testfiles[i]);
+                    Assert.AreEqual(wanted[i][j].Start * 512, partitions[j].Offset, testfiles[i]);
+                    Assert.AreEqual(wanted[i][j].Length, partitions[j].Length, testfiles[i]);
+                    Assert.AreEqual(wanted[i][j].Sequence, partitions[j].Sequence, testfiles[i]);
+                    Assert.AreEqual(wanted[i][j].Start, partitions[j].Start, testfiles[i]);
                 }
             }
         }
diff --git a/Aaru.Tests/Partitions/VTOC.cs b/Aaru.Tests/Partitions/VTOC.cs
index 90ce8b134..5be86fe24 100644
--- a/Aaru.Tests/Partitions/VTOC.cs
+++ b/Aaru.Tests/Partitions/VTOC.cs
@@ -39,7 +39,10 @@ namespace Aaru.Tests.Partitions
     [TestFixture]
     public class Vtoc
     {
-        readonly string[] testfiles = {"att_unix_vtoc.vdi.lz"};
+        readonly string[] testfiles =
+        {
+            "att_unix_vtoc.vdi.lz"
+        };
 
         readonly Partition[][] wanted =
         {
@@ -48,147 +51,83 @@ namespace Aaru.Tests.Partitions
             {
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "UNIX: Boot",
-                    Length      = 34,
-                    Sequence    = 0,
-                    Start       = 1
+                    Description = null, Name = null, Type = "UNIX: Boot", Length = 34,
+                    Sequence    = 0, Start   = 1
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "UNIX: Whole disk",
-                    Length      = 1023119,
-                    Sequence    = 1,
-                    Start       = 1
+                    Description = null, Name = null, Type = "UNIX: Whole disk", Length = 1023119,
+                    Sequence    = 1, Start   = 1
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "UNIX: Stand",
-                    Length      = 253,
-                    Sequence    = 2,
-                    Start       = 63
+                    Description = null, Name = null, Type = "UNIX: Stand", Length = 253,
+                    Sequence    = 2, Start   = 63
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "UNIX: /usr",
-                    Length      = 78624,
-                    Sequence    = 3,
-                    Start       = 378
+                    Description = null, Name = null, Type = "UNIX: /usr", Length = 78624,
+                    Sequence    = 3, Start   = 378
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "UNIX: /usr",
-                    Length      = 78624,
-                    Sequence    = 4,
-                    Start       = 79002
+                    Description = null, Name = null, Type = "UNIX: /usr", Length = 78624,
+                    Sequence    = 4, Start   = 79002
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "UNIX: /usr",
-                    Length      = 78624,
-                    Sequence    = 5,
-                    Start       = 157626
+                    Description = null, Name = null, Type = "UNIX: /usr", Length = 78624,
+                    Sequence    = 5, Start   = 157626
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "UNIX: /usr",
-                    Length      = 78624,
-                    Sequence    = 6,
-                    Start       = 236250
+                    Description = null, Name = null, Type = "UNIX: /usr", Length = 78624,
+                    Sequence    = 6, Start   = 236250
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "UNIX: /usr",
-                    Length      = 78624,
-                    Sequence    = 7,
-                    Start       = 314874
+                    Description = null, Name = null, Type = "UNIX: /usr", Length = 78624,
+                    Sequence    = 7, Start   = 314874
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "UNIX: /usr",
-                    Length      = 78624,
-                    Sequence    = 8,
-                    Start       = 393498
+                    Description = null, Name = null, Type = "UNIX: /usr", Length = 78624,
+                    Sequence    = 8, Start   = 393498
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "UNIX: /usr",
-                    Length      = 78624,
-                    Sequence    = 9,
-                    Start       = 472122
+                    Description = null, Name = null, Type = "UNIX: /usr", Length = 78624,
+                    Sequence    = 9, Start   = 472122
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "UNIX: /usr",
-                    Length      = 78624,
-                    Sequence    = 10,
-                    Start       = 550746
+                    Description = null, Name = null, Type = "UNIX: /usr", Length = 78624,
+                    Sequence    = 10, Start  = 550746
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "UNIX: /usr",
-                    Length      = 78624,
-                    Sequence    = 11,
-                    Start       = 629370
+                    Description = null, Name = null, Type = "UNIX: /usr", Length = 78624,
+                    Sequence    = 11, Start  = 629370
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "UNIX: /usr",
-                    Length      = 76608,
-                    Sequence    = 12,
-                    Start       = 707994
+                    Description = null, Name = null, Type = "UNIX: /usr", Length = 76608,
+                    Sequence    = 12, Start  = 707994
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "UNIX: /usr",
-                    Length      = 77616,
-                    Sequence    = 13,
-                    Start       = 784602
+                    Description = null, Name = null, Type = "UNIX: /usr", Length = 77616,
+                    Sequence    = 13, Start  = 784602
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "UNIX: /usr",
-                    Length      = 75600,
-                    Sequence    = 14,
-                    Start       = 862218
+                    Description = null, Name = null, Type = "UNIX: /usr", Length = 75600,
+                    Sequence    = 14, Start  = 862218
                 },
                 new Partition
                 {
-                    Description = null,
-                    Name        = null,
-                    Type        = "UNIX: /usr",
-                    Length      = 84672,
-                    Sequence    = 15,
-                    Start       = 937818
+                    Description = null, Name = null, Type = "UNIX: /usr", Length = 84672,
+                    Sequence    = 15, Start  = 937818
                 }
             }
         };
@@ -205,17 +144,19 @@ namespace Aaru.Tests.Partitions
                 Assert.AreEqual(true, image.Open(filter), testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 Assert.AreEqual(wanted[i].Length, partitions.Count, testfiles[i]);
+
                 for(int j = 0; j < partitions.Count; j++)
                 {
                     // Too chatty
                     //Assert.AreEqual(wanted[i][j].PartitionDescription, partitions[j].PartitionDescription, testfiles[i]);
                     Assert.AreEqual(wanted[i][j].Length * 512, partitions[j].Size, testfiles[i]);
+
                     //                    Assert.AreEqual(wanted[i][j].Name, partitions[j].Name, testfiles[i]);
-                    Assert.AreEqual(wanted[i][j].Type,        partitions[j].Type,     testfiles[i]);
-                    Assert.AreEqual(wanted[i][j].Start * 512, partitions[j].Offset,   testfiles[i]);
-                    Assert.AreEqual(wanted[i][j].Length,      partitions[j].Length,   testfiles[i]);
-                    Assert.AreEqual(wanted[i][j].Sequence,    partitions[j].Sequence, testfiles[i]);
-                    Assert.AreEqual(wanted[i][j].Start,       partitions[j].Start,    testfiles[i]);
+                    Assert.AreEqual(wanted[i][j].Type, partitions[j].Type, testfiles[i]);
+                    Assert.AreEqual(wanted[i][j].Start * 512, partitions[j].Offset, testfiles[i]);
+                    Assert.AreEqual(wanted[i][j].Length, partitions[j].Length, testfiles[i]);
+                    Assert.AreEqual(wanted[i][j].Sequence, partitions[j].Sequence, testfiles[i]);
+                    Assert.AreEqual(wanted[i][j].Start, partitions[j].Start, testfiles[i]);
                 }
             }
         }
diff --git a/Aaru.Tests/Partitions/Xbox.cs b/Aaru.Tests/Partitions/Xbox.cs
index 499ade713..086f75502 100644
--- a/Aaru.Tests/Partitions/Xbox.cs
+++ b/Aaru.Tests/Partitions/Xbox.cs
@@ -39,7 +39,10 @@ namespace Aaru.Tests.Partitions
     [TestFixture]
     public class Xbox
     {
-        readonly string[] testfiles = {"microsoft256mb.img.lz"};
+        readonly string[] testfiles =
+        {
+            "microsoft256mb.img.lz"
+        };
 
         readonly Partition[][] wanted =
         {
@@ -47,21 +50,13 @@ namespace Aaru.Tests.Partitions
             {
                 new Partition
                 {
-                    Description = "System cache",
-                    Name        = null,
-                    Type        = null,
-                    Length      = 16376,
-                    Sequence    = 0,
-                    Start       = 0,
+                    Description = "System cache", Name = null, Type = null, Length = 16376,
+                    Sequence    = 0, Start             = 0
                 },
                 new Partition
                 {
-                    Description = "Data volume",
-                    Name        = null,
-                    Type        = null,
-                    Length      = 475144,
-                    Sequence    = 1,
-                    Start       = 16376
+                    Description = "Data volume", Name = null, Type = null, Length = 475144,
+                    Sequence    = 1, Start            = 16376
                 }
             }
         };
@@ -78,15 +73,16 @@ namespace Aaru.Tests.Partitions
                 Assert.AreEqual(true, image.Open(filter), testfiles[i]);
                 List<Partition> partitions = Core.Partitions.GetAll(image);
                 Assert.AreEqual(wanted[i].Length, partitions.Count, testfiles[i]);
+
                 for(int j = 0; j < partitions.Count; j++)
                 {
                     // Too chatty
                     Assert.AreEqual(wanted[i][j].Description, partitions[j].Description, testfiles[i]);
                     Assert.AreEqual(wanted[i][j].Length * 512, partitions[j].Size, testfiles[i]);
-                    Assert.AreEqual(wanted[i][j].Start * 512, partitions[j].Offset,   testfiles[i]);
-                    Assert.AreEqual(wanted[i][j].Length,      partitions[j].Length,   testfiles[i]);
-                    Assert.AreEqual(wanted[i][j].Sequence,    partitions[j].Sequence, testfiles[i]);
-                    Assert.AreEqual(wanted[i][j].Start,       partitions[j].Start,    testfiles[i]);
+                    Assert.AreEqual(wanted[i][j].Start  * 512, partitions[j].Offset, testfiles[i]);
+                    Assert.AreEqual(wanted[i][j].Length, partitions[j].Length, testfiles[i]);
+                    Assert.AreEqual(wanted[i][j].Sequence, partitions[j].Sequence, testfiles[i]);
+                    Assert.AreEqual(wanted[i][j].Start, partitions[j].Start, testfiles[i]);
                 }
             }
         }
diff --git a/Aaru.Tests/Program.cs b/Aaru.Tests/Program.cs
index e3b68b48f..2da2461e0 100644
--- a/Aaru.Tests/Program.cs
+++ b/Aaru.Tests/Program.cs
@@ -8,10 +8,10 @@
 // distribute, sublicense, and/or sell copies of the Software, and to
 // permit persons to whom the Software is furnished to do so, subject to
 // the following conditions:
-// 
+//
 // The above copyright notice and this permission notice shall be
 // included in all copies or substantial portions of the Software.
-// 
+//
 // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 // EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -26,8 +26,8 @@ namespace NUnitLite.Tests
     public static class Program
     {
         /// <summary>
-        ///     The main program executes the tests. Output may be routed to
-        ///     various locations, depending on the arguments passed.
+        ///     The main program executes the tests. Output may be routed to various locations, depending on the arguments
+        ///     passed.
         /// </summary>
         /// <remarks>Run with --help for a full list of arguments supported</remarks>
         /// <param name="args"></param>
diff --git a/Aaru.Wpf.sln b/Aaru.Wpf.sln
index 9948cc676..cf91b135e 100644
--- a/Aaru.Wpf.sln
+++ b/Aaru.Wpf.sln
@@ -5,8 +5,6 @@ VisualStudioVersion = 16.0.29102.190
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aaru.Wpf", "Aaru.Wpf\Aaru.Wpf.csproj", "{487D1379-B3EE-4242-8740-AD8F04555AD9}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aaru", "Aaru\Aaru.csproj", "{7A4B05BE-73C9-4F34-87FE-E80CCF1F732D}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aaru.Checksums", "Aaru.Checksums\Aaru.Checksums.csproj", "{CC48B324-A532-4A45-87A6-6F91F7141E8D}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aaru.Helpers", "Aaru.Helpers\Aaru.Helpers.csproj", "{F8BDF57B-1571-4CD0-84B3-B422088D359A}"
@@ -37,8 +35,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aaru.Database", "Aaru.Datab
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aaru.Gui", "Aaru.Gui\Aaru.Gui.csproj", "{CF61AD81-3F98-4E7B-8F00-9957A6CDE5FA}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aaru.EntityFramework", "Aaru.EntityFramework\Aaru.EntityFramework.csproj", "{F73EE2BD-6009-4590-9F5A-68198CA5C0DA}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aaru.Dto", "Aaru.Dto\Aaru.Dto.csproj", "{F4399FF5-9BD0-475A-9EA7-3DAE45291FE2}"
 EndProject
 Global
@@ -57,14 +53,6 @@ Global
 		{487D1379-B3EE-4242-8740-AD8F04555AD9}.Release|Any CPU.Build.0 = Release|Any CPU
 		{487D1379-B3EE-4242-8740-AD8F04555AD9}.Release|x86.ActiveCfg = Release|Any CPU
 		{487D1379-B3EE-4242-8740-AD8F04555AD9}.Release|x86.Build.0 = Release|Any CPU
-		{7A4B05BE-73C9-4F34-87FE-E80CCF1F732D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7A4B05BE-73C9-4F34-87FE-E80CCF1F732D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7A4B05BE-73C9-4F34-87FE-E80CCF1F732D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{7A4B05BE-73C9-4F34-87FE-E80CCF1F732D}.Debug|x86.Build.0 = Debug|Any CPU
-		{7A4B05BE-73C9-4F34-87FE-E80CCF1F732D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7A4B05BE-73C9-4F34-87FE-E80CCF1F732D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7A4B05BE-73C9-4F34-87FE-E80CCF1F732D}.Release|x86.ActiveCfg = Release|Any CPU
-		{7A4B05BE-73C9-4F34-87FE-E80CCF1F732D}.Release|x86.Build.0 = Release|Any CPU
 		{CC48B324-A532-4A45-87A6-6F91F7141E8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CC48B324-A532-4A45-87A6-6F91F7141E8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CC48B324-A532-4A45-87A6-6F91F7141E8D}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -185,14 +173,6 @@ Global
 		{CF61AD81-3F98-4E7B-8F00-9957A6CDE5FA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CF61AD81-3F98-4E7B-8F00-9957A6CDE5FA}.Release|x86.ActiveCfg = Release|Any CPU
 		{CF61AD81-3F98-4E7B-8F00-9957A6CDE5FA}.Release|x86.Build.0 = Release|Any CPU
-		{F73EE2BD-6009-4590-9F5A-68198CA5C0DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F73EE2BD-6009-4590-9F5A-68198CA5C0DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F73EE2BD-6009-4590-9F5A-68198CA5C0DA}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F73EE2BD-6009-4590-9F5A-68198CA5C0DA}.Debug|x86.Build.0 = Debug|Any CPU
-		{F73EE2BD-6009-4590-9F5A-68198CA5C0DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F73EE2BD-6009-4590-9F5A-68198CA5C0DA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F73EE2BD-6009-4590-9F5A-68198CA5C0DA}.Release|x86.ActiveCfg = Release|Any CPU
-		{F73EE2BD-6009-4590-9F5A-68198CA5C0DA}.Release|x86.Build.0 = Release|Any CPU
 		{F4399FF5-9BD0-475A-9EA7-3DAE45291FE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F4399FF5-9BD0-475A-9EA7-3DAE45291FE2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F4399FF5-9BD0-475A-9EA7-3DAE45291FE2}.Debug|x86.ActiveCfg = Debug|Any CPU
diff --git a/Aaru.Wpf/Program.cs b/Aaru.Wpf/Program.cs
index afdd7e68d..0068fad58 100644
--- a/Aaru.Wpf/Program.cs
+++ b/Aaru.Wpf/Program.cs
@@ -10,7 +10,7 @@ using Microsoft.EntityFrameworkCore;
 
 namespace Aaru.Wpf
 {
-    class Program
+    internal class Program
     {
         internal static bool                                  Verbose;
         internal static bool                                  Debug;
@@ -24,26 +24,30 @@ namespace Aaru.Wpf
             object[] attributes = typeof(Program).Assembly.GetCustomAttributes(typeof(AssemblyTitleAttribute), false);
             AssemblyTitle = ((AssemblyTitleAttribute)attributes[0]).Title;
             attributes    = typeof(Program).Assembly.GetCustomAttributes(typeof(AssemblyCopyrightAttribute), false);
+
             AssemblyVersion =
                 Attribute.GetCustomAttribute(typeof(Program).Assembly, typeof(AssemblyInformationalVersionAttribute)) as
                     AssemblyInformationalVersionAttribute;
+
             AssemblyCopyright = ((AssemblyCopyrightAttribute)attributes[0]).Copyright;
 
             Settings.Settings.LoadSettings();
 
-            DicContext ctx = DicContext.Create(Settings.Settings.LocalDbPath);
+            var ctx = AaruContext.Create(Settings.Settings.LocalDbPath);
             ctx.Database.Migrate();
             ctx.SaveChanges();
 
             // TODO: Update database on GUI
 
-            DicContext mctx = DicContext.Create(Settings.Settings.MasterDbPath);
+            var mctx = AaruContext.Create(Settings.Settings.MasterDbPath);
             mctx.Database.Migrate();
             mctx.SaveChanges();
 
             Statistics.LoadStats();
-            if(Settings.Settings.Current.Stats != null && Settings.Settings.Current.Stats.ShareStats)
-                Task.Run(() => Statistics.SubmitStats());
+
+            if(Settings.Settings.Current.Stats != null &&
+               Settings.Settings.Current.Stats.ShareStats)
+                Task.Run(Statistics.SubmitStats);
 
             foreach(string arg in args)
                 switch(arg.ToLowerInvariant())
@@ -51,10 +55,12 @@ namespace Aaru.Wpf
                     case "-v":
                     case "--verbose":
                         Verbose = true;
+
                         break;
                     case "-d":
                     case "--debug":
                         Debug = true;
+
                         break;
                 }
 
diff --git a/Aaru.Wpf/Properties/AssemblyInfo.cs b/Aaru.Wpf/Properties/AssemblyInfo.cs
index b51c0e13b..d2cb54854 100644
--- a/Aaru.Wpf/Properties/AssemblyInfo.cs
+++ b/Aaru.Wpf/Properties/AssemblyInfo.cs
@@ -1,6 +1,4 @@
 using System.Reflection;
-using System.Resources;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Windows;
 
@@ -30,16 +28,13 @@ using System.Windows;
 
 //[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
 
-
-[assembly: ThemeInfo(
-    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
-                                     //(used if a resource is not found in the page,
-                                     // or application resource dictionaries)
-    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
-                                              //(used if a resource is not found in the page,
-                                              // app, or any theme specific resource dictionaries)
-)]
-
+[assembly: ThemeInfo(ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
+                     //(used if a resource is not found in the page,
+                     // or application resource dictionaries)
+                     ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+                     //(used if a resource is not found in the page,
+                     // app, or any theme specific resource dictionaries)
+                    )]
 
 // Version information for an assembly consists of the following four values:
 //
@@ -52,4 +47,4 @@ using System.Windows;
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
\ No newline at end of file
diff --git a/Aaru/Commands/Configure.cs b/Aaru/Commands/Configure.cs
index 2db25a24a..2e2fad002 100644
--- a/Aaru/Commands/Configure.cs
+++ b/Aaru/Commands/Configure.cs
@@ -68,21 +68,24 @@ namespace Aaru.Commands
 
             if(_gdprChange)
             {
-                AaruConsole.WriteLine("In compliance with the European Union General Data Protection Regulation 2016/679 (GDPR),\n"    +
-                                     "we must give you the following information about Aaru and ask if you want to opt-in\n" +
-                                     "in some information sharing.");
+                AaruConsole.
+                    WriteLine("In compliance with the European Union General Data Protection Regulation 2016/679 (GDPR),\n" +
+                              "we must give you the following information about Aaru and ask if you want to opt-in\n"       +
+                              "in some information sharing.");
 
                 AaruConsole.WriteLine();
 
-                AaruConsole.WriteLine("Disclaimer: Because Aaru is an open source software this information, and therefore,\n" +
-                                     "compliance with GDPR only holds true if you obtained a certificated copy from its original\n"    +
-                                     "authors. In case of doubt, close Aaru now and ask in our IRC support channel.");
+                AaruConsole.
+                    WriteLine("Disclaimer: Because Aaru is an open source software this information, and therefore,\n"       +
+                              "compliance with GDPR only holds true if you obtained a certificated copy from its original\n" +
+                              "authors. In case of doubt, close Aaru now and ask in our IRC support channel.");
 
                 AaruConsole.WriteLine();
 
-                AaruConsole.WriteLine("For any information sharing your IP address may be stored in our server, in a way that is not\n" +
-                                     "possible for any person, manual, or automated process, to link with your identity, unless\n"     +
-                                     "specified otherwise.");
+                AaruConsole.
+                    WriteLine("For any information sharing your IP address may be stored in our server, in a way that is not\n" +
+                              "possible for any person, manual, or automated process, to link with your identity, unless\n"     +
+                              "specified otherwise.");
             }
 
             var pressedKey = new ConsoleKeyInfo();
@@ -91,13 +94,13 @@ namespace Aaru.Commands
             AaruConsole.WriteLine();
 
             AaruConsole.WriteLine(
-                                 "With the 'device-report' command, Aaru creates a report of a device, that includes its\n"       +
-                                 "manufacturer, model, firmware revision and/or version, attached bus, size, and supported commands.\n"    +
-                                 "The serial number of the device is not stored in the report. If used with the debug parameter,\n"        +
-                                 "extra information about the device will be stored in the report. This information is known to contain\n" +
-                                 "the device serial number in non-standard places that prevent the automatic removal of it on a handful\n" +
-                                 "of devices. A human-readable copy of the report in XML format is always created in the same directory\n" +
-                                 "where Aaru is being run from.");
+                                  "With the 'device-report' command, Aaru creates a report of a device, that includes its\n"                +
+                                  "manufacturer, model, firmware revision and/or version, attached bus, size, and supported commands.\n"    +
+                                  "The serial number of the device is not stored in the report. If used with the debug parameter,\n"        +
+                                  "extra information about the device will be stored in the report. This information is known to contain\n" +
+                                  "the device serial number in non-standard places that prevent the automatic removal of it on a handful\n" +
+                                  "of devices. A human-readable copy of the report in XML format is always created in the same directory\n" +
+                                  "where Aaru is being run from.");
 
             while(pressedKey.Key != ConsoleKey.Y &&
                   pressedKey.Key != ConsoleKey.N)
@@ -107,16 +110,17 @@ namespace Aaru.Commands
                 AaruConsole.WriteLine();
             }
 
-            Aaru.Settings.Settings.Current.SaveReportsGlobally = pressedKey.Key == ConsoleKey.Y;
+            Settings.Settings.Current.SaveReportsGlobally = pressedKey.Key == ConsoleKey.Y;
 
             pressedKey = new ConsoleKeyInfo();
             AaruConsole.WriteLine();
 
-            AaruConsole.WriteLine("Sharing a report with us will send it to our server, that's in the european union territory, where it\n"      +
-                                 "will be manually analyzed by an european union citizen to remove any trace of personal identification\n"      +
-                                 "from it. Once that is done, it will be shared in our stats website, https://www.aaru.app\n"          +
-                                 "These report will be used to improve Aaru support, and in some cases, to provide emulation of the\n" +
-                                 "devices to other open-source projects. In any case, no information linking the report to you will be stored.");
+            AaruConsole.
+                WriteLine("Sharing a report with us will send it to our server, that's in the european union territory, where it\n" +
+                          "will be manually analyzed by an european union citizen to remove any trace of personal identification\n" +
+                          "from it. Once that is done, it will be shared in our stats website, https://www.aaru.app\n"              +
+                          "These report will be used to improve Aaru support, and in some cases, to provide emulation of the\n"     +
+                          "devices to other open-source projects. In any case, no information linking the report to you will be stored.");
 
             while(pressedKey.Key != ConsoleKey.Y &&
                   pressedKey.Key != ConsoleKey.N)
@@ -126,16 +130,17 @@ namespace Aaru.Commands
                 AaruConsole.WriteLine();
             }
 
-            Aaru.Settings.Settings.Current.ShareReports = pressedKey.Key == ConsoleKey.Y;
+            Settings.Settings.Current.ShareReports = pressedKey.Key == ConsoleKey.Y;
             #endregion Device reports
 
             #region Statistics
             AaruConsole.WriteLine();
 
-            AaruConsole.WriteLine("Aaru can store some usage statistics. These statistics are limited to the number of times a\n"        +
-                                 "command is executed, a filesystem, partition, or device is used, the operating system version, and other.\n"   +
-                                 "In no case, any information besides pure statistical usage numbers is stored, and they're just joint to the\n" +
-                                 "pool with no way of using them to identify you.");
+            AaruConsole.
+                WriteLine("Aaru can store some usage statistics. These statistics are limited to the number of times a\n"                 +
+                          "command is executed, a filesystem, partition, or device is used, the operating system version, and other.\n"   +
+                          "In no case, any information besides pure statistical usage numbers is stored, and they're just joint to the\n" +
+                          "pool with no way of using them to identify you.");
 
             pressedKey = new ConsoleKeyInfo();
 
@@ -149,7 +154,7 @@ namespace Aaru.Commands
 
             if(pressedKey.Key == ConsoleKey.Y)
             {
-                Aaru.Settings.Settings.Current.Stats = new StatsSettings();
+                Settings.Settings.Current.Stats = new StatsSettings();
 
                 pressedKey = new ConsoleKeyInfo();
 
@@ -161,7 +166,7 @@ namespace Aaru.Commands
                     AaruConsole.WriteLine();
                 }
 
-                Aaru.Settings.Settings.Current.Stats.ShareStats = pressedKey.Key == ConsoleKey.Y;
+                Settings.Settings.Current.Stats.ShareStats = pressedKey.Key == ConsoleKey.Y;
 
                 pressedKey = new ConsoleKeyInfo();
 
@@ -173,7 +178,7 @@ namespace Aaru.Commands
                     AaruConsole.WriteLine();
                 }
 
-                Aaru.Settings.Settings.Current.Stats.CommandStats = pressedKey.Key == ConsoleKey.Y;
+                Settings.Settings.Current.Stats.CommandStats = pressedKey.Key == ConsoleKey.Y;
 
                 pressedKey = new ConsoleKeyInfo();
 
@@ -185,7 +190,7 @@ namespace Aaru.Commands
                     AaruConsole.WriteLine();
                 }
 
-                Aaru.Settings.Settings.Current.Stats.DeviceStats = pressedKey.Key == ConsoleKey.Y;
+                Settings.Settings.Current.Stats.DeviceStats = pressedKey.Key == ConsoleKey.Y;
 
                 pressedKey = new ConsoleKeyInfo();
 
@@ -197,7 +202,7 @@ namespace Aaru.Commands
                     AaruConsole.WriteLine();
                 }
 
-                Aaru.Settings.Settings.Current.Stats.FilesystemStats = pressedKey.Key == ConsoleKey.Y;
+                Settings.Settings.Current.Stats.FilesystemStats = pressedKey.Key == ConsoleKey.Y;
 
                 pressedKey = new ConsoleKeyInfo();
 
@@ -209,7 +214,7 @@ namespace Aaru.Commands
                     AaruConsole.WriteLine();
                 }
 
-                Aaru.Settings.Settings.Current.Stats.FilterStats = pressedKey.Key == ConsoleKey.Y;
+                Settings.Settings.Current.Stats.FilterStats = pressedKey.Key == ConsoleKey.Y;
 
                 pressedKey = new ConsoleKeyInfo();
 
@@ -221,7 +226,7 @@ namespace Aaru.Commands
                     AaruConsole.WriteLine();
                 }
 
-                Aaru.Settings.Settings.Current.Stats.MediaImageStats = pressedKey.Key == ConsoleKey.Y;
+                Settings.Settings.Current.Stats.MediaImageStats = pressedKey.Key == ConsoleKey.Y;
 
                 pressedKey = new ConsoleKeyInfo();
 
@@ -233,7 +238,7 @@ namespace Aaru.Commands
                     AaruConsole.WriteLine();
                 }
 
-                Aaru.Settings.Settings.Current.Stats.MediaScanStats = pressedKey.Key == ConsoleKey.Y;
+                Settings.Settings.Current.Stats.MediaScanStats = pressedKey.Key == ConsoleKey.Y;
 
                 pressedKey = new ConsoleKeyInfo();
 
@@ -245,7 +250,7 @@ namespace Aaru.Commands
                     AaruConsole.WriteLine();
                 }
 
-                Aaru.Settings.Settings.Current.Stats.PartitionStats = pressedKey.Key == ConsoleKey.Y;
+                Settings.Settings.Current.Stats.PartitionStats = pressedKey.Key == ConsoleKey.Y;
 
                 pressedKey = new ConsoleKeyInfo();
 
@@ -257,7 +262,7 @@ namespace Aaru.Commands
                     AaruConsole.WriteLine();
                 }
 
-                Aaru.Settings.Settings.Current.Stats.MediaStats = pressedKey.Key == ConsoleKey.Y;
+                Settings.Settings.Current.Stats.MediaStats = pressedKey.Key == ConsoleKey.Y;
 
                 pressedKey = new ConsoleKeyInfo();
 
@@ -269,16 +274,16 @@ namespace Aaru.Commands
                     AaruConsole.WriteLine();
                 }
 
-                Aaru.Settings.Settings.Current.Stats.VerifyStats = pressedKey.Key == ConsoleKey.Y;
+                Settings.Settings.Current.Stats.VerifyStats = pressedKey.Key == ConsoleKey.Y;
             }
             else
-                Aaru.Settings.Settings.Current.Stats = null;
+                Settings.Settings.Current.Stats = null;
             #endregion Statistics
 
-            Aaru.Settings.Settings.Current.GdprCompliance = DicSettings.GdprLevel;
-            Aaru.Settings.Settings.SaveSettings();
+            Settings.Settings.Current.GdprCompliance = DicSettings.GdprLevel;
+            Settings.Settings.SaveSettings();
 
-            return(int)ErrorNumber.NoError;
+            return (int)ErrorNumber.NoError;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru/Commands/Database/Statistics.cs b/Aaru/Commands/Database/Statistics.cs
index 358ef1f4a..478e83983 100644
--- a/Aaru/Commands/Database/Statistics.cs
+++ b/Aaru/Commands/Database/Statistics.cs
@@ -55,7 +55,7 @@ namespace Aaru.Commands
             if(verbose)
                 AaruConsole.VerboseWriteLineEvent += System.Console.WriteLine;
 
-            var ctx = AaruContext.Create(Aaru.Settings.Settings.LocalDbPath);
+            var ctx = AaruContext.Create(Settings.Settings.LocalDbPath);
 
             if(!ctx.Commands.Any()     &&
                !ctx.Filesystems.Any()  &&
@@ -67,7 +67,7 @@ namespace Aaru.Commands
             {
                 AaruConsole.WriteLine("There are no statistics.");
 
-                return(int)ErrorNumber.NothingFound;
+                return (int)ErrorNumber.NothingFound;
             }
 
             bool thereAreStats = false;
@@ -211,7 +211,9 @@ namespace Aaru.Commands
 
                     if(count > 0)
                     {
-                        AaruConsole.WriteLine("Media type {0} has been found {1} times in a real device.", media, count);
+                        AaruConsole.WriteLine("Media type {0} has been found {1} times in a real device.", media,
+                                              count);
+
                         thereAreStats = true;
                     }
 
@@ -233,7 +235,7 @@ namespace Aaru.Commands
             if(!thereAreStats)
                 AaruConsole.WriteLine("There are no statistics.");
 
-            return(int)ErrorNumber.NoError;
+            return (int)ErrorNumber.NoError;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru/Commands/Database/Update.cs b/Aaru/Commands/Database/Update.cs
index 2871914c3..e2e8f3ab8 100644
--- a/Aaru/Commands/Database/Update.cs
+++ b/Aaru/Commands/Database/Update.cs
@@ -67,7 +67,7 @@ namespace Aaru.Commands
         public int Invoke(bool debug, bool verbose, bool clear, bool clearAll)
         {
             if(_masterDbUpdate)
-                return(int)ErrorNumber.NoError;
+                return (int)ErrorNumber.NoError;
 
             MainClass.PrintCopyright();
 
@@ -84,9 +84,9 @@ namespace Aaru.Commands
             {
                 try
                 {
-                    File.Delete(Aaru.Settings.Settings.LocalDbPath);
+                    File.Delete(Settings.Settings.LocalDbPath);
 
-                    var ctx = AaruContext.Create(Aaru.Settings.Settings.LocalDbPath);
+                    var ctx = AaruContext.Create(Settings.Settings.LocalDbPath);
                     ctx.Database.Migrate();
                     ctx.SaveChanges();
                 }
@@ -97,7 +97,7 @@ namespace Aaru.Commands
 
                     AaruConsole.ErrorWriteLine("Could not remove local database.");
 
-                    return(int)ErrorNumber.CannotRemoveDatabase;
+                    return (int)ErrorNumber.CannotRemoveDatabase;
                 }
             }
 
@@ -105,7 +105,7 @@ namespace Aaru.Commands
             {
                 try
                 {
-                    File.Delete(Aaru.Settings.Settings.MasterDbPath);
+                    File.Delete(Settings.Settings.MasterDbPath);
                 }
                 catch(Exception e)
                 {
@@ -114,13 +114,13 @@ namespace Aaru.Commands
 
                     AaruConsole.ErrorWriteLine("Could not remove master database.");
 
-                    return(int)ErrorNumber.CannotRemoveDatabase;
+                    return (int)ErrorNumber.CannotRemoveDatabase;
                 }
             }
 
             DoUpdate(clear || clearAll);
 
-            return(int)ErrorNumber.NoError;
+            return (int)ErrorNumber.NoError;
         }
 
         internal static void DoUpdate(bool create)
diff --git a/Aaru/Commands/Device/DeviceReport.cs b/Aaru/Commands/Device/DeviceReport.cs
index f814001b7..6f5d88701 100644
--- a/Aaru/Commands/Device/DeviceReport.cs
+++ b/Aaru/Commands/Device/DeviceReport.cs
@@ -88,11 +88,11 @@ namespace Aaru.Commands.Device
                char.IsLetter(devicePath[0]))
                 devicePath = "\\\\.\\" + char.ToUpper(devicePath[0]) + ':';
 
-            Aaru.Devices.Device dev;
+            Devices.Device dev;
 
             try
             {
-                dev = new Aaru.Devices.Device(devicePath);
+                dev = new Devices.Device(devicePath);
 
                 if(dev.IsRemote)
                     Statistics.AddRemote(dev.RemoteApplication, dev.RemoteVersion, dev.RemoteOperatingSystem,
@@ -102,14 +102,14 @@ namespace Aaru.Commands.Device
                 {
                     AaruConsole.ErrorWriteLine(Error.Print(dev.LastError));
 
-                    return(int)ErrorNumber.CannotOpenDevice;
+                    return (int)ErrorNumber.CannotOpenDevice;
                 }
             }
             catch(DeviceException e)
             {
                 AaruConsole.ErrorWriteLine(e.Message ?? Error.Print(e.LastError));
 
-                return(int)ErrorNumber.CannotOpenDevice;
+                return (int)ErrorNumber.CannotOpenDevice;
             }
 
             Statistics.AddDevice(dev);
@@ -125,7 +125,7 @@ namespace Aaru.Commands.Device
 
                 AaruConsole.ErrorWriteLine("Not continuing.");
 
-                return(int)ErrorNumber.NotEnoughPermissions;
+                return (int)ErrorNumber.NotEnoughPermissions;
             }
 
             var report = new DeviceReportV2
@@ -709,8 +709,9 @@ namespace Aaru.Commands.Device
                                 while(pressedKey.Key != ConsoleKey.Y &&
                                       pressedKey.Key != ConsoleKey.N)
                                 {
-                                    AaruConsole.Write("Do you have a {0} disc that you can insert in the drive? (Y/N): ",
-                                                     mediaType);
+                                    AaruConsole.
+                                        Write("Do you have a {0} disc that you can insert in the drive? (Y/N): ",
+                                              mediaType);
 
                                     pressedKey = System.Console.ReadKey();
                                     AaruConsole.WriteLine();
@@ -794,9 +795,9 @@ namespace Aaru.Commands.Device
                                         else
                                         {
                                             AaruConsole.DebugWriteLine("Device-Report command",
-                                                                      "Device not ready. Sense {0}h ASC {1:X2}h ASCQ {2:X2}h",
-                                                                      decSense.Value.SenseKey, decSense.Value.ASC,
-                                                                      decSense.Value.ASCQ);
+                                                                       "Device not ready. Sense {0}h ASC {1:X2}h ASCQ {2:X2}h",
+                                                                       decSense.Value.SenseKey, decSense.Value.ASC,
+                                                                       decSense.Value.ASCQ);
 
                                             mediaIsRecognized = false;
                                         }
@@ -804,7 +805,7 @@ namespace Aaru.Commands.Device
                                     else
                                     {
                                         AaruConsole.DebugWriteLine("Device-Report command",
-                                                                  "Got sense status but no sense buffer");
+                                                                   "Got sense status but no sense buffer");
 
                                         mediaIsRecognized = false;
                                     }
@@ -840,7 +841,7 @@ namespace Aaru.Commands.Device
                                             for(ushort i = (ushort)mediaTest.BlockSize;; i++)
                                             {
                                                 AaruConsole.Write("\rTrying to READ LONG with a size of {0} bytes...",
-                                                                 i);
+                                                                  i);
 
                                                 sense = dev.ReadLong10(out buffer, out senseBuffer, false, false, 0, i,
                                                                        dev.Timeout, out _);
@@ -992,9 +993,9 @@ namespace Aaru.Commands.Device
                                         else
                                         {
                                             AaruConsole.DebugWriteLine("Device-Report command",
-                                                                      "Device not ready. Sense {0} ASC {1:X2}h ASCQ {2:X2}h",
-                                                                      decSense.Value.SenseKey, decSense.Value.ASC,
-                                                                      decSense.Value.ASCQ);
+                                                                       "Device not ready. Sense {0} ASC {1:X2}h ASCQ {2:X2}h",
+                                                                       decSense.Value.SenseKey, decSense.Value.ASC,
+                                                                       decSense.Value.ASCQ);
 
                                             mediaIsRecognized = false;
                                         }
@@ -1002,7 +1003,7 @@ namespace Aaru.Commands.Device
                                     else
                                     {
                                         AaruConsole.DebugWriteLine("Device-Report command",
-                                                                  "Got sense status but no sense buffer");
+                                                                   "Got sense status but no sense buffer");
 
                                         mediaIsRecognized = false;
                                     }
@@ -1044,7 +1045,9 @@ namespace Aaru.Commands.Device
                                     while(pressedKey.Key != ConsoleKey.Y &&
                                           pressedKey.Key != ConsoleKey.N)
                                     {
-                                        AaruConsole.Write("Do you have media that you can insert in the drive? (Y/N): ");
+                                        AaruConsole.
+                                            Write("Do you have media that you can insert in the drive? (Y/N): ");
+
                                         pressedKey = System.Console.ReadKey();
                                         AaruConsole.WriteLine();
                                     }
@@ -1265,17 +1268,17 @@ namespace Aaru.Commands.Device
             jsonSw.Close();
             jsonFs.Close();
 
-            using(var ctx = AaruContext.Create(Aaru.Settings.Settings.LocalDbPath))
+            using(var ctx = AaruContext.Create(Settings.Settings.LocalDbPath))
             {
                 ctx.Reports.Add(new Report(report));
                 ctx.SaveChanges();
             }
 
             // TODO:
-            if(Aaru.Settings.Settings.Current.ShareReports)
+            if(Settings.Settings.Current.ShareReports)
                 Remote.SubmitReport(report);
 
-            return(int)ErrorNumber.NoError;
+            return (int)ErrorNumber.NoError;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru/Commands/Device/Devices.cs b/Aaru/Commands/Device/Devices.cs
index 6012f0cee..8b6318954 100644
--- a/Aaru/Commands/Device/Devices.cs
+++ b/Aaru/Commands/Device/Devices.cs
@@ -67,11 +67,11 @@ namespace Aaru.Commands.Device
             AaruConsole.DebugWriteLine("List-Devices command", "--debug={0}", debug);
             AaruConsole.DebugWriteLine("List-Devices command", "--verbose={0}", verbose);
 
-            DeviceInfo[] devices = Aaru.Devices.Device.ListDevices(out bool isRemote, out string serverApplication,
-                                                                   out string serverVersion,
-                                                                   out string serverOperatingSystem,
-                                                                   out string serverOperatingSystemVersion,
-                                                                   out string serverArchitecture, aaruRemoteHost);
+            DeviceInfo[] devices = Devices.Device.ListDevices(out bool isRemote, out string serverApplication,
+                                                              out string serverVersion,
+                                                              out string serverOperatingSystem,
+                                                              out string serverOperatingSystemVersion,
+                                                              out string serverArchitecture, aaruRemoteHost);
 
             if(isRemote)
             {
@@ -91,33 +91,33 @@ namespace Aaru.Commands.Device
                 if(aaruRemoteHost is null)
                 {
                     AaruConsole.WriteLine("{0,-22}|{1,-16}|{2,-24}|{3,-24}|{4,-10}|{5,-10}", "Path", "Vendor", "Model",
-                                         "Serial", "Bus", "Supported?");
+                                          "Serial", "Bus", "Supported?");
 
                     AaruConsole.WriteLine("{0,-22}+{1,-16}+{2,-24}+{3,-24}+{4,-10}+{5,-10}", "----------------------",
-                                         "----------------", "------------------------", "------------------------",
-                                         "----------", "----------");
+                                          "----------------", "------------------------", "------------------------",
+                                          "----------", "----------");
 
                     foreach(DeviceInfo dev in devices)
                         AaruConsole.WriteLine("{0,-22}|{1,-16}|{2,-24}|{3,-24}|{4,-10}|{5,-10}", dev.Path, dev.Vendor,
-                                             dev.Model, dev.Serial, dev.Bus, dev.Supported);
+                                              dev.Model, dev.Serial, dev.Bus, dev.Supported);
                 }
                 else
                 {
                     AaruConsole.WriteLine("{0,-48}|{1,-16}|{2,-24}|{3,-24}|{4,-10}|{5,-10}", "Path", "Vendor", "Model",
-                                         "Serial", "Bus", "Supported?");
+                                          "Serial", "Bus", "Supported?");
 
                     AaruConsole.WriteLine("{0,-48}+{1,-16}+{2,-24}+{3,-24}+{4,-10}+{5,-10}",
-                                         "------------------------------------------------", "----------------",
-                                         "------------------------", "------------------------", "----------",
-                                         "----------");
+                                          "------------------------------------------------", "----------------",
+                                          "------------------------", "------------------------", "----------",
+                                          "----------");
 
                     foreach(DeviceInfo dev in devices)
                         AaruConsole.WriteLine("{0,-48}|{1,-16}|{2,-24}|{3,-24}|{4,-10}|{5,-10}", dev.Path, dev.Vendor,
-                                             dev.Model, dev.Serial, dev.Bus, dev.Supported);
+                                              dev.Model, dev.Serial, dev.Bus, dev.Supported);
                 }
             }
 
-            return(int)ErrorNumber.NoError;
+            return (int)ErrorNumber.NoError;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru/Commands/Device/Info.cs b/Aaru/Commands/Device/Info.cs
index 04afe4c15..9655a2186 100644
--- a/Aaru/Commands/Device/Info.cs
+++ b/Aaru/Commands/Device/Info.cs
@@ -98,11 +98,11 @@ namespace Aaru.Commands.Device
                char.IsLetter(devicePath[0]))
                 devicePath = "\\\\.\\" + char.ToUpper(devicePath[0]) + ':';
 
-            Aaru.Devices.Device dev;
+            Devices.Device dev;
 
             try
             {
-                dev = new Aaru.Devices.Device(devicePath);
+                dev = new Devices.Device(devicePath);
 
                 if(dev.IsRemote)
                     Statistics.AddRemote(dev.RemoteApplication, dev.RemoteVersion, dev.RemoteOperatingSystem,
@@ -112,14 +112,14 @@ namespace Aaru.Commands.Device
                 {
                     AaruConsole.ErrorWriteLine(Error.Print(dev.LastError));
 
-                    return(int)ErrorNumber.CannotOpenDevice;
+                    return (int)ErrorNumber.CannotOpenDevice;
                 }
             }
             catch(DeviceException e)
             {
                 AaruConsole.ErrorWriteLine(e.Message ?? Error.Print(e.LastError));
 
-                return(int)ErrorNumber.CannotOpenDevice;
+                return (int)ErrorNumber.CannotOpenDevice;
             }
 
             Statistics.AddDevice(dev);
@@ -210,12 +210,12 @@ namespace Aaru.Commands.Device
                             case TupleCodes.CISTPL_SWIL:
                             case TupleCodes.CISTPL_VERS_2:
                                 AaruConsole.DebugWriteLine("Device-Info command", "Found undecoded tuple ID {0}",
-                                                          tuple.Code);
+                                                           tuple.Code);
 
                                 break;
                             default:
                                 AaruConsole.DebugWriteLine("Device-Info command", "Found unknown tuple ID 0x{0:X2}",
-                                                          (byte)tuple.Code);
+                                                           (byte)tuple.Code);
 
                                 break;
                         }
@@ -231,7 +231,7 @@ namespace Aaru.Commands.Device
                                  devInfo.AtaIdentify);
 
                 Identify.IdentifyDevice? decodedIdentify = Identify.Decode(devInfo.AtaIdentify);
-                AaruConsole.WriteLine(Aaru.Decoders.ATA.Identify.Prettify(decodedIdentify));
+                AaruConsole.WriteLine(Decoders.ATA.Identify.Prettify(decodedIdentify));
 
                 if(devInfo.AtaMcptError.HasValue)
                 {
@@ -261,7 +261,7 @@ namespace Aaru.Commands.Device
                             break;
                         default:
                             AaruConsole.WriteLine("Device contains unknown media card type {0}",
-                                                 devInfo.AtaMcptError.Value.DeviceHead & 0x07);
+                                                  devInfo.AtaMcptError.Value.DeviceHead & 0x07);
 
                             break;
                     }
@@ -326,7 +326,9 @@ namespace Aaru.Commands.Device
                                                                          dev.IsCompactFlash, dev.IsPcmcia, blocks,
                                                                          blockSize);
 
-                    AaruConsole.WriteLine(removable ? "Media identified as {0}" : "Device identified as {0}", mediaType);
+                    AaruConsole.WriteLine(removable ? "Media identified as {0}" : "Device identified as {0}",
+                                          mediaType);
+
                     Statistics.AddMedia(mediaType, true);
                 }
             }
@@ -336,7 +338,7 @@ namespace Aaru.Commands.Device
                 DataFile.WriteTo("Device-Info command", outputPrefix, "_atapi_identify.bin", "ATAPI IDENTIFY",
                                  devInfo.AtapiIdentify);
 
-                AaruConsole.WriteLine(Aaru.Decoders.ATA.Identify.Prettify(devInfo.AtapiIdentify));
+                AaruConsole.WriteLine(Decoders.ATA.Identify.Prettify(devInfo.AtapiIdentify));
             }
 
             if(devInfo.ScsiInquiry != null)
@@ -354,7 +356,8 @@ namespace Aaru.Commands.Device
                         if(page.Key >= 0x01 &&
                            page.Key <= 0x7F)
                         {
-                            AaruConsole.WriteLine("ASCII Page {0:X2}h: {1}", page.Key, EVPD.DecodeASCIIPage(page.Value));
+                            AaruConsole.WriteLine("ASCII Page {0:X2}h: {1}", page.Key,
+                                                  EVPD.DecodeASCIIPage(page.Value));
 
                             DataFile.WriteTo("Device-Info command", outputPrefix, page.Value);
                         }
@@ -375,7 +378,7 @@ namespace Aaru.Commands.Device
                         else if(page.Key == 0x82)
                         {
                             AaruConsole.WriteLine("ASCII implemented operating definitions: {0}",
-                                                 EVPD.DecodePage82(page.Value));
+                                                  EVPD.DecodePage82(page.Value));
 
                             DataFile.WriteTo("Device-Info command", outputPrefix, $"_scsi_evpd_{page.Key:X2}h.bin",
                                              $"SCSI INQUIRY EVPD {page.Key:X2}h", page.Value);
@@ -425,7 +428,7 @@ namespace Aaru.Commands.Device
                         else if(page.Key == 0xB1)
                         {
                             AaruConsole.WriteLine("Manufacturer-assigned Serial Number: {0}",
-                                                 EVPD.DecodePageB1(page.Value));
+                                                  EVPD.DecodePageB1(page.Value));
 
                             DataFile.WriteTo("Device-Info command", outputPrefix, $"_scsi_evpd_{page.Key:X2}h.bin",
                                              $"SCSI INQUIRY EVPD {page.Key:X2}h", page.Value);
@@ -433,14 +436,15 @@ namespace Aaru.Commands.Device
                         else if(page.Key == 0xB2)
                         {
                             AaruConsole.WriteLine("TapeAlert Supported Flags Bitmap: 0x{0:X16}",
-                                                 EVPD.DecodePageB2(page.Value));
+                                                  EVPD.DecodePageB2(page.Value));
 
                             DataFile.WriteTo("Device-Info command", outputPrefix, $"_scsi_evpd_{page.Key:X2}h.bin",
                                              $"SCSI INQUIRY EVPD {page.Key:X2}h", page.Value);
                         }
                         else if(page.Key == 0xB3)
                         {
-                            AaruConsole.WriteLine("Automation Device Serial Number: {0}", EVPD.DecodePageB3(page.Value));
+                            AaruConsole.WriteLine("Automation Device Serial Number: {0}",
+                                                  EVPD.DecodePageB3(page.Value));
 
                             DataFile.WriteTo("Device-Info command", outputPrefix, $"_scsi_evpd_{page.Key:X2}h.bin",
                                              $"SCSI INQUIRY EVPD {page.Key:X2}h", page.Value);
@@ -448,7 +452,7 @@ namespace Aaru.Commands.Device
                         else if(page.Key == 0xB4)
                         {
                             AaruConsole.WriteLine("Data Transfer Device Element Address: 0x{0}",
-                                                 EVPD.DecodePageB4(page.Value));
+                                                  EVPD.DecodePageB4(page.Value));
 
                             DataFile.WriteTo("Device-Info command", outputPrefix, $"_scsi_evpd_{page.Key:X2}h.bin",
                                              $"SCSI INQUIRY EVPD {page.Key:X2}h", page.Value);
@@ -533,7 +537,7 @@ namespace Aaru.Commands.Device
                                 continue;
 
                             AaruConsole.DebugWriteLine("Device-Info command", "Found undecoded SCSI VPD page 0x{0:X2}",
-                                                      page.Key);
+                                                       page.Key);
 
                             DataFile.WriteTo("Device-Info command", outputPrefix, $"_scsi_evpd_{page.Key:X2}h.bin",
                                              $"SCSI INQUIRY EVPD {page.Key:X2}h", page.Value);
@@ -560,10 +564,10 @@ namespace Aaru.Commands.Device
                     Features.SeparatedFeatures ftr = Features.Separate(devInfo.MmcConfiguration);
 
                     AaruConsole.DebugWriteLine("Device-Info command", "GET CONFIGURATION length is {0} bytes",
-                                              ftr.DataLength);
+                                               ftr.DataLength);
 
                     AaruConsole.DebugWriteLine("Device-Info command", "GET CONFIGURATION current profile is {0:X4}h",
-                                              ftr.CurrentProfile);
+                                               ftr.CurrentProfile);
 
                     if(ftr.Descriptors != null)
                     {
@@ -817,7 +821,7 @@ namespace Aaru.Commands.Device
                     else
                     {
                         AaruConsole.DebugWriteLine("Device-Info command",
-                                                  "GET CONFIGURATION returned no feature descriptors");
+                                                   "GET CONFIGURATION returned no feature descriptors");
                     }
                 }
 
@@ -831,26 +835,26 @@ namespace Aaru.Commands.Device
                         AaruConsole.WriteLine("Drive has loaded a total of {0} discs", devInfo.PlextorFeatures.Discs);
 
                         AaruConsole.WriteLine("Drive has spent {0} hours, {1} minutes and {2} seconds reading CDs",
-                                             devInfo.PlextorFeatures.CdReadTime        / 3600,
-                                             (devInfo.PlextorFeatures.CdReadTime / 60) % 60,
-                                             devInfo.PlextorFeatures.CdReadTime        % 60);
+                                              devInfo.PlextorFeatures.CdReadTime        / 3600,
+                                              (devInfo.PlextorFeatures.CdReadTime / 60) % 60,
+                                              devInfo.PlextorFeatures.CdReadTime        % 60);
 
                         AaruConsole.WriteLine("Drive has spent {0} hours, {1} minutes and {2} seconds writing CDs",
-                                             devInfo.PlextorFeatures.CdWriteTime        / 3600,
-                                             (devInfo.PlextorFeatures.CdWriteTime / 60) % 60,
-                                             devInfo.PlextorFeatures.CdWriteTime        % 60);
+                                              devInfo.PlextorFeatures.CdWriteTime        / 3600,
+                                              (devInfo.PlextorFeatures.CdWriteTime / 60) % 60,
+                                              devInfo.PlextorFeatures.CdWriteTime        % 60);
 
                         if(devInfo.PlextorFeatures.IsDvd)
                         {
                             AaruConsole.WriteLine("Drive has spent {0} hours, {1} minutes and {2} seconds reading DVDs",
-                                                 devInfo.PlextorFeatures.DvdReadTime        / 3600,
-                                                 (devInfo.PlextorFeatures.DvdReadTime / 60) % 60,
-                                                 devInfo.PlextorFeatures.DvdReadTime        % 60);
+                                                  devInfo.PlextorFeatures.DvdReadTime        / 3600,
+                                                  (devInfo.PlextorFeatures.DvdReadTime / 60) % 60,
+                                                  devInfo.PlextorFeatures.DvdReadTime        % 60);
 
                             AaruConsole.WriteLine("Drive has spent {0} hours, {1} minutes and {2} seconds writing DVDs",
-                                                 devInfo.PlextorFeatures.DvdWriteTime        / 3600,
-                                                 (devInfo.PlextorFeatures.DvdWriteTime / 60) % 60,
-                                                 devInfo.PlextorFeatures.DvdWriteTime        % 60);
+                                                  devInfo.PlextorFeatures.DvdWriteTime        / 3600,
+                                                  (devInfo.PlextorFeatures.DvdWriteTime / 60) % 60,
+                                                  devInfo.PlextorFeatures.DvdWriteTime        % 60);
                         }
                     }
 
@@ -864,7 +868,7 @@ namespace Aaru.Commands.Device
 
                             if(devInfo.PlextorFeatures.PoweRecRecommendedSpeed > 0)
                                 AaruConsole.WriteLine(" and recommends {0} Kb/sec.",
-                                                     devInfo.PlextorFeatures.PoweRecRecommendedSpeed);
+                                                      devInfo.PlextorFeatures.PoweRecRecommendedSpeed);
                             else
                                 AaruConsole.WriteLine(".");
 
@@ -882,8 +886,8 @@ namespace Aaru.Commands.Device
 
                             if(devInfo.PlextorFeatures.PoweRecLast > 0)
                                 AaruConsole.WriteLine("Last used PoweRec was {0} Kb/sec ({1}x)",
-                                                     devInfo.PlextorFeatures.PoweRecLast,
-                                                     devInfo.PlextorFeatures.PoweRecLast / 177);
+                                                      devInfo.PlextorFeatures.PoweRecLast,
+                                                      devInfo.PlextorFeatures.PoweRecLast / 177);
                         }
                         else
                         {
@@ -901,20 +905,20 @@ namespace Aaru.Commands.Device
                             AaruConsole.WriteLine("Plextor SilentMode is enabled:");
 
                             AaruConsole.WriteLine(devInfo.PlextorFeatures.AccessTimeLimit == 2 ? "\tAccess time is slow"
-                                                     : "\tAccess time is fast");
+                                                      : "\tAccess time is fast");
 
                             if(devInfo.PlextorFeatures.CdReadSpeedLimit > 0)
                                 AaruConsole.WriteLine("\tCD read speed limited to {0}x",
-                                                     devInfo.PlextorFeatures.CdReadSpeedLimit);
+                                                      devInfo.PlextorFeatures.CdReadSpeedLimit);
 
                             if(devInfo.PlextorFeatures.DvdReadSpeedLimit > 0 &&
                                devInfo.PlextorFeatures.IsDvd)
                                 AaruConsole.WriteLine("\tDVD read speed limited to {0}x",
-                                                     devInfo.PlextorFeatures.DvdReadSpeedLimit);
+                                                      devInfo.PlextorFeatures.DvdReadSpeedLimit);
 
                             if(devInfo.PlextorFeatures.CdWriteSpeedLimit > 0)
                                 AaruConsole.WriteLine("\tCD write speed limited to {0}x",
-                                                     devInfo.PlextorFeatures.CdWriteSpeedLimit);
+                                                      devInfo.PlextorFeatures.CdWriteSpeedLimit);
                         }
                     }
 
@@ -1045,21 +1049,21 @@ namespace Aaru.Commands.Device
                     {
                         noInfo = false;
                         DataFile.WriteTo("Device-Info command", outputPrefix, "_mmc_cid.bin", "MMC CID", devInfo.CID);
-                        AaruConsole.WriteLine("{0}", Aaru.Decoders.MMC.Decoders.PrettifyCID(devInfo.CID));
+                        AaruConsole.WriteLine("{0}", Decoders.MMC.Decoders.PrettifyCID(devInfo.CID));
                     }
 
                     if(devInfo.CSD != null)
                     {
                         noInfo = false;
                         DataFile.WriteTo("Device-Info command", outputPrefix, "_mmc_csd.bin", "MMC CSD", devInfo.CSD);
-                        AaruConsole.WriteLine("{0}", Aaru.Decoders.MMC.Decoders.PrettifyCSD(devInfo.CSD));
+                        AaruConsole.WriteLine("{0}", Decoders.MMC.Decoders.PrettifyCSD(devInfo.CSD));
                     }
 
                     if(devInfo.OCR != null)
                     {
                         noInfo = false;
                         DataFile.WriteTo("Device-Info command", outputPrefix, "_mmc_ocr.bin", "MMC OCR", devInfo.OCR);
-                        AaruConsole.WriteLine("{0}", Aaru.Decoders.MMC.Decoders.PrettifyOCR(devInfo.OCR));
+                        AaruConsole.WriteLine("{0}", Decoders.MMC.Decoders.PrettifyOCR(devInfo.OCR));
                     }
 
                     if(devInfo.ExtendedCSD != null)
@@ -1069,7 +1073,7 @@ namespace Aaru.Commands.Device
                         DataFile.WriteTo("Device-Info command", outputPrefix, "_mmc_ecsd.bin", "MMC Extended CSD",
                                          devInfo.ExtendedCSD);
 
-                        AaruConsole.WriteLine("{0}", Aaru.Decoders.MMC.Decoders.PrettifyExtendedCSD(devInfo.ExtendedCSD));
+                        AaruConsole.WriteLine("{0}", Decoders.MMC.Decoders.PrettifyExtendedCSD(devInfo.ExtendedCSD));
                     }
 
                     if(noInfo)
@@ -1088,7 +1092,7 @@ namespace Aaru.Commands.Device
                         DataFile.WriteTo("Device-Info command", outputPrefix, "_sd_cid.bin", "SecureDigital CID",
                                          devInfo.CID);
 
-                        AaruConsole.WriteLine("{0}", Aaru.Decoders.SecureDigital.Decoders.PrettifyCID(devInfo.CID));
+                        AaruConsole.WriteLine("{0}", Decoders.SecureDigital.Decoders.PrettifyCID(devInfo.CID));
                     }
 
                     if(devInfo.CSD != null)
@@ -1098,7 +1102,7 @@ namespace Aaru.Commands.Device
                         DataFile.WriteTo("Device-Info command", outputPrefix, "_sd_csd.bin", "SecureDigital CSD",
                                          devInfo.CSD);
 
-                        AaruConsole.WriteLine("{0}", Aaru.Decoders.SecureDigital.Decoders.PrettifyCSD(devInfo.CSD));
+                        AaruConsole.WriteLine("{0}", Decoders.SecureDigital.Decoders.PrettifyCSD(devInfo.CSD));
                     }
 
                     if(devInfo.OCR != null)
@@ -1108,7 +1112,7 @@ namespace Aaru.Commands.Device
                         DataFile.WriteTo("Device-Info command", outputPrefix, "_sd_ocr.bin", "SecureDigital OCR",
                                          devInfo.OCR);
 
-                        AaruConsole.WriteLine("{0}", Aaru.Decoders.SecureDigital.Decoders.PrettifyOCR(devInfo.OCR));
+                        AaruConsole.WriteLine("{0}", Decoders.SecureDigital.Decoders.PrettifyOCR(devInfo.OCR));
                     }
 
                     if(devInfo.SCR != null)
@@ -1118,7 +1122,7 @@ namespace Aaru.Commands.Device
                         DataFile.WriteTo("Device-Info command", outputPrefix, "_sd_scr.bin", "SecureDigital SCR",
                                          devInfo.SCR);
 
-                        AaruConsole.WriteLine("{0}", Aaru.Decoders.SecureDigital.Decoders.PrettifySCR(devInfo.SCR));
+                        AaruConsole.WriteLine("{0}", Decoders.SecureDigital.Decoders.PrettifySCR(devInfo.SCR));
                     }
 
                     if(noInfo)
@@ -1133,15 +1137,16 @@ namespace Aaru.Commands.Device
             AaruConsole.WriteLine();
 
             // Open master database
-            var ctx = AaruContext.Create(Aaru.Settings.Settings.MasterDbPath);
+            var ctx = AaruContext.Create(Settings.Settings.MasterDbPath);
 
             // Search for device in master database
-            Aaru.Database.Models.Device dbDev =
+            Database.Models.Device dbDev =
                 ctx.Devices.FirstOrDefault(d => d.Manufacturer == dev.Manufacturer && d.Model == dev.Model &&
                                                 d.Revision     == dev.FirmwareRevision);
 
             if(dbDev is null)
-                AaruConsole.WriteLine("Device not in database, please create a device report and attach it to a Github issue.");
+                AaruConsole.
+                    WriteLine("Device not in database, please create a device report and attach it to a Github issue.");
             else
             {
                 AaruConsole.WriteLine($"Device in database since {dbDev.LastSynchronized}.");
@@ -1155,9 +1160,9 @@ namespace Aaru.Commands.Device
                 ctx.CdOffsets.FirstOrDefault(d => d.Manufacturer == dev.Manufacturer && d.Model == dev.Model);
 
             AaruConsole.WriteLine(cdOffset is null ? "CD reading offset not found in database."
-                                     : $"CD reading offset is {cdOffset.Offset} samples ({cdOffset.Offset * 4} bytes).");
+                                      : $"CD reading offset is {cdOffset.Offset} samples ({cdOffset.Offset * 4} bytes).");
 
-            return(int)ErrorNumber.NoError;
+            return (int)ErrorNumber.NoError;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru/Commands/Filesystem/ExtractFiles.cs b/Aaru/Commands/Filesystem/ExtractFiles.cs
index 950c81076..d7ee67282 100644
--- a/Aaru/Commands/Filesystem/ExtractFiles.cs
+++ b/Aaru/Commands/Filesystem/ExtractFiles.cs
@@ -121,7 +121,7 @@ namespace Aaru.Commands.Filesystem
             var     filtersList = new FiltersList();
             IFilter inputFilter = filtersList.GetFilter(imagePath);
 
-            Dictionary<string, string> parsedOptions = Aaru.Core.Options.Parse(options);
+            Dictionary<string, string> parsedOptions = Core.Options.Parse(options);
             AaruConsole.DebugWriteLine("Extract-Files command", "Parsed options:");
 
             foreach(KeyValuePair<string, string> parsedOption in parsedOptions)
@@ -133,7 +133,7 @@ namespace Aaru.Commands.Filesystem
             {
                 AaruConsole.ErrorWriteLine("Cannot open specified file.");
 
-                return(int)ErrorNumber.CannotOpenFile;
+                return (int)ErrorNumber.CannotOpenFile;
             }
 
             Encoding encodingClass = null;
@@ -150,7 +150,7 @@ namespace Aaru.Commands.Filesystem
                 {
                     AaruConsole.ErrorWriteLine("Specified encoding is not supported.");
 
-                    return(int)ErrorNumber.EncodingUnknown;
+                    return (int)ErrorNumber.EncodingUnknown;
                 }
 
             PluginBase plugins = GetPluginBase.Instance;
@@ -163,12 +163,12 @@ namespace Aaru.Commands.Filesystem
                 {
                     AaruConsole.WriteLine("Image format not identified, not proceeding with analysis.");
 
-                    return(int)ErrorNumber.UnrecognizedFormat;
+                    return (int)ErrorNumber.UnrecognizedFormat;
                 }
 
                 if(verbose)
                     AaruConsole.VerboseWriteLine("Image format identified by {0} ({1}).", imageFormat.Name,
-                                                imageFormat.Id);
+                                                 imageFormat.Id);
                 else
                     AaruConsole.WriteLine("Image format identified by {0}.", imageFormat.Name);
 
@@ -176,7 +176,7 @@ namespace Aaru.Commands.Filesystem
                 {
                     AaruConsole.WriteLine("Output directory missing.");
 
-                    return(int)ErrorNumber.MissingArgument;
+                    return (int)ErrorNumber.MissingArgument;
                 }
 
                 if(Directory.Exists(outputDir) ||
@@ -184,7 +184,7 @@ namespace Aaru.Commands.Filesystem
                 {
                     AaruConsole.ErrorWriteLine("Destination exists, aborting.");
 
-                    return(int)ErrorNumber.DestinationExists;
+                    return (int)ErrorNumber.DestinationExists;
                 }
 
                 Directory.CreateDirectory(outputDir);
@@ -196,19 +196,19 @@ namespace Aaru.Commands.Filesystem
                         AaruConsole.WriteLine("Unable to open image format");
                         AaruConsole.WriteLine("No error given");
 
-                        return(int)ErrorNumber.CannotOpenFormat;
+                        return (int)ErrorNumber.CannotOpenFormat;
                     }
 
                     AaruConsole.DebugWriteLine("Extract-Files command", "Correctly opened image file.");
 
                     AaruConsole.DebugWriteLine("Extract-Files command", "Image without headers is {0} bytes.",
-                                              imageFormat.Info.ImageSize);
+                                               imageFormat.Info.ImageSize);
 
                     AaruConsole.DebugWriteLine("Extract-Files command", "Image has {0} sectors.",
-                                              imageFormat.Info.Sectors);
+                                               imageFormat.Info.Sectors);
 
                     AaruConsole.DebugWriteLine("Extract-Files command", "Image identifies disk type as {0}.",
-                                              imageFormat.Info.MediaType);
+                                               imageFormat.Info.MediaType);
 
                     Statistics.AddMediaFormat(imageFormat.Format);
                     Statistics.AddMedia(imageFormat.Info.MediaType, false);
@@ -219,11 +219,11 @@ namespace Aaru.Commands.Filesystem
                     AaruConsole.ErrorWriteLine("Unable to open image format");
                     AaruConsole.ErrorWriteLine("Error: {0}", ex.Message);
 
-                    return(int)ErrorNumber.CannotOpenFormat;
+                    return (int)ErrorNumber.CannotOpenFormat;
                 }
 
-                List<Partition> partitions = Aaru.Core.Partitions.GetAll(imageFormat);
-                Aaru.Core.Partitions.AddSchemesToStats(partitions);
+                List<Partition> partitions = Core.Partitions.GetAll(imageFormat);
+                Core.Partitions.AddSchemesToStats(partitions);
 
                 List<string>        idPlugins;
                 IReadOnlyFilesystem plugin;
@@ -242,7 +242,7 @@ namespace Aaru.Commands.Filesystem
 
                         AaruConsole.WriteLine("Identifying filesystem on partition");
 
-                        Aaru.Core.Filesystems.Identify(imageFormat, out idPlugins, partitions[i]);
+                        Core.Filesystems.Identify(imageFormat, out idPlugins, partitions[i]);
 
                         if(idPlugins.Count == 0)
                             AaruConsole.WriteLine("Filesystem not identified");
@@ -258,7 +258,7 @@ namespace Aaru.Commands.Filesystem
                                     var fs = (IReadOnlyFilesystem)plugin.
                                                                   GetType().GetConstructor(Type.EmptyTypes)?.
                                                                   Invoke(new object[]
-                                                                             { });
+                                                                             {});
 
                                     error = fs.Mount(imageFormat, partitions[i], encodingClass, parsedOptions,
                                                      @namespace);
@@ -275,7 +275,7 @@ namespace Aaru.Commands.Filesystem
                                     }
                                     else
                                         AaruConsole.ErrorWriteLine("Unable to mount device, error {0}",
-                                                                  error.ToString());
+                                                                   error.ToString());
                                 }
                         }
                         else
@@ -285,7 +285,7 @@ namespace Aaru.Commands.Filesystem
 
                             var fs = (IReadOnlyFilesystem)plugin.
                                                           GetType().GetConstructor(Type.EmptyTypes)?.Invoke(new object[]
-                                                                                                                { });
+                                                                                                                {});
 
                             error = fs.Mount(imageFormat, partitions[i], encodingClass, parsedOptions, @namespace);
 
@@ -310,7 +310,7 @@ namespace Aaru.Commands.Filesystem
                     Size = imageFormat.Info.Sectors * imageFormat.Info.SectorSize
                 };
 
-                Aaru.Core.Filesystems.Identify(imageFormat, out idPlugins, wholePart);
+                Core.Filesystems.Identify(imageFormat, out idPlugins, wholePart);
 
                 if(idPlugins.Count == 0)
                     AaruConsole.WriteLine("Filesystem not identified");
@@ -325,7 +325,7 @@ namespace Aaru.Commands.Filesystem
 
                             var fs = (IReadOnlyFilesystem)plugin.
                                                           GetType().GetConstructor(Type.EmptyTypes)?.Invoke(new object[]
-                                                                                                                { });
+                                                                                                                {});
 
                             error = fs.Mount(imageFormat, wholePart, encodingClass, parsedOptions, @namespace);
 
@@ -348,7 +348,7 @@ namespace Aaru.Commands.Filesystem
                     AaruConsole.WriteLine($"Identified by {plugin.Name}.");
 
                     var fs = (IReadOnlyFilesystem)plugin.GetType().GetConstructor(Type.EmptyTypes)?.Invoke(new object[]
-                                                                                                               { });
+                                                                                                               {});
 
                     error = fs.Mount(imageFormat, wholePart, encodingClass, parsedOptions, @namespace);
 
@@ -370,10 +370,10 @@ namespace Aaru.Commands.Filesystem
                 AaruConsole.ErrorWriteLine($"Error reading file: {ex.Message}");
                 AaruConsole.DebugWriteLine("Extract-Files command", ex.StackTrace);
 
-                return(int)ErrorNumber.UnexpectedException;
+                return (int)ErrorNumber.UnexpectedException;
             }
 
-            return(int)ErrorNumber.NoError;
+            return (int)ErrorNumber.NoError;
         }
 
         static void ExtractFilesInDir(string path, IReadOnlyFilesystem fs, string volumeName, string outputDir,
@@ -509,11 +509,11 @@ namespace Aaru.Commands.Filesystem
                                     }
                                     #pragma warning restore RECS0022 // A catch clause that catches System.Exception and has an empty body
                                     AaruConsole.WriteLine("Written {0} bytes of xattr {1} from file {2} to {3}",
-                                                         xattrBuf.Length, xattr, entry, outputPath);
+                                                          xattrBuf.Length, xattr, entry, outputPath);
                                 }
                                 else
                                     AaruConsole.ErrorWriteLine("Cannot write xattr {0} for {1}, output exists", xattr,
-                                                              entry);
+                                                               entry);
                             }
                     }
 
@@ -567,7 +567,7 @@ namespace Aaru.Commands.Filesystem
                             }
                             #pragma warning restore RECS0022 // A catch clause that catches System.Exception and has an empty body
                             AaruConsole.WriteLine("Written {0} bytes of file {1} to {2}", outBuf.Length, entry,
-                                                 outputPath);
+                                                  outputPath);
                         }
                         else
                             AaruConsole.ErrorWriteLine("Error {0} reading file {1}", error, entry);
diff --git a/Aaru/Commands/Filesystem/Ls.cs b/Aaru/Commands/Filesystem/Ls.cs
index f7831c454..7d25b8b2a 100644
--- a/Aaru/Commands/Filesystem/Ls.cs
+++ b/Aaru/Commands/Filesystem/Ls.cs
@@ -112,7 +112,7 @@ namespace Aaru.Commands.Filesystem
             var     filtersList = new FiltersList();
             IFilter inputFilter = filtersList.GetFilter(imagePath);
 
-            Dictionary<string, string> parsedOptions = Aaru.Core.Options.Parse(options);
+            Dictionary<string, string> parsedOptions = Core.Options.Parse(options);
             AaruConsole.DebugWriteLine("Ls command", "Parsed options:");
 
             foreach(KeyValuePair<string, string> parsedOption in parsedOptions)
@@ -124,7 +124,7 @@ namespace Aaru.Commands.Filesystem
             {
                 AaruConsole.ErrorWriteLine("Cannot open specified file.");
 
-                return(int)ErrorNumber.CannotOpenFile;
+                return (int)ErrorNumber.CannotOpenFile;
             }
 
             Encoding encodingClass = null;
@@ -141,7 +141,7 @@ namespace Aaru.Commands.Filesystem
                 {
                     AaruConsole.ErrorWriteLine("Specified encoding is not supported.");
 
-                    return(int)ErrorNumber.EncodingUnknown;
+                    return (int)ErrorNumber.EncodingUnknown;
                 }
 
             PluginBase plugins = GetPluginBase.Instance;
@@ -154,12 +154,12 @@ namespace Aaru.Commands.Filesystem
                 {
                     AaruConsole.WriteLine("Image format not identified, not proceeding with analysis.");
 
-                    return(int)ErrorNumber.UnrecognizedFormat;
+                    return (int)ErrorNumber.UnrecognizedFormat;
                 }
 
                 if(verbose)
                     AaruConsole.VerboseWriteLine("Image format identified by {0} ({1}).", imageFormat.Name,
-                                                imageFormat.Id);
+                                                 imageFormat.Id);
                 else
                     AaruConsole.WriteLine("Image format identified by {0}.", imageFormat.Name);
 
@@ -170,18 +170,18 @@ namespace Aaru.Commands.Filesystem
                         AaruConsole.WriteLine("Unable to open image format");
                         AaruConsole.WriteLine("No error given");
 
-                        return(int)ErrorNumber.CannotOpenFormat;
+                        return (int)ErrorNumber.CannotOpenFormat;
                     }
 
                     AaruConsole.DebugWriteLine("Ls command", "Correctly opened image file.");
 
                     AaruConsole.DebugWriteLine("Ls command", "Image without headers is {0} bytes.",
-                                              imageFormat.Info.ImageSize);
+                                               imageFormat.Info.ImageSize);
 
                     AaruConsole.DebugWriteLine("Ls command", "Image has {0} sectors.", imageFormat.Info.Sectors);
 
                     AaruConsole.DebugWriteLine("Ls command", "Image identifies disk type as {0}.",
-                                              imageFormat.Info.MediaType);
+                                               imageFormat.Info.MediaType);
 
                     Statistics.AddMediaFormat(imageFormat.Format);
                     Statistics.AddMedia(imageFormat.Info.MediaType, false);
@@ -192,11 +192,11 @@ namespace Aaru.Commands.Filesystem
                     AaruConsole.ErrorWriteLine("Unable to open image format");
                     AaruConsole.ErrorWriteLine("Error: {0}", ex.Message);
 
-                    return(int)ErrorNumber.CannotOpenFormat;
+                    return (int)ErrorNumber.CannotOpenFormat;
                 }
 
-                List<Partition> partitions = Aaru.Core.Partitions.GetAll(imageFormat);
-                Aaru.Core.Partitions.AddSchemesToStats(partitions);
+                List<Partition> partitions = Core.Partitions.GetAll(imageFormat);
+                Core.Partitions.AddSchemesToStats(partitions);
 
                 List<string>        idPlugins;
                 IReadOnlyFilesystem plugin;
@@ -215,7 +215,7 @@ namespace Aaru.Commands.Filesystem
 
                         AaruConsole.WriteLine("Identifying filesystem on partition");
 
-                        Aaru.Core.Filesystems.Identify(imageFormat, out idPlugins, partitions[i]);
+                        Core.Filesystems.Identify(imageFormat, out idPlugins, partitions[i]);
 
                         if(idPlugins.Count == 0)
                             AaruConsole.WriteLine("Filesystem not identified");
@@ -231,7 +231,7 @@ namespace Aaru.Commands.Filesystem
                                     var fs = (IReadOnlyFilesystem)plugin.
                                                                   GetType().GetConstructor(Type.EmptyTypes)?.
                                                                   Invoke(new object[]
-                                                                             { });
+                                                                             {});
 
                                     if(fs == null)
                                         continue;
@@ -247,7 +247,7 @@ namespace Aaru.Commands.Filesystem
                                     }
                                     else
                                         AaruConsole.ErrorWriteLine("Unable to mount device, error {0}",
-                                                                  error.ToString());
+                                                                   error.ToString());
                                 }
                         }
                         else
@@ -261,7 +261,7 @@ namespace Aaru.Commands.Filesystem
 
                             var fs = (IReadOnlyFilesystem)plugin.
                                                           GetType().GetConstructor(Type.EmptyTypes)?.Invoke(new object[]
-                                                                                                                { });
+                                                                                                                {});
 
                             if(fs == null)
                                 continue;
@@ -286,7 +286,7 @@ namespace Aaru.Commands.Filesystem
                     Size = imageFormat.Info.Sectors * imageFormat.Info.SectorSize
                 };
 
-                Aaru.Core.Filesystems.Identify(imageFormat, out idPlugins, wholePart);
+                Core.Filesystems.Identify(imageFormat, out idPlugins, wholePart);
 
                 if(idPlugins.Count == 0)
                     AaruConsole.WriteLine("Filesystem not identified");
@@ -301,7 +301,7 @@ namespace Aaru.Commands.Filesystem
 
                             var fs = (IReadOnlyFilesystem)plugin.
                                                           GetType().GetConstructor(Type.EmptyTypes)?.Invoke(new object[]
-                                                                                                                { });
+                                                                                                                {});
 
                             if(fs == null)
                                 continue;
@@ -328,7 +328,7 @@ namespace Aaru.Commands.Filesystem
 
                         var fs = (IReadOnlyFilesystem)plugin.
                                                       GetType().GetConstructor(Type.EmptyTypes)?.Invoke(new object[]
-                                                                                                            { });
+                                                                                                            {});
 
                         if(fs != null)
                         {
@@ -351,10 +351,10 @@ namespace Aaru.Commands.Filesystem
                 AaruConsole.ErrorWriteLine($"Error reading file: {ex.Message}");
                 AaruConsole.DebugWriteLine("Ls command", ex.StackTrace);
 
-                return(int)ErrorNumber.UnexpectedException;
+                return (int)ErrorNumber.UnexpectedException;
             }
 
-            return(int)ErrorNumber.NoError;
+            return (int)ErrorNumber.NoError;
         }
 
         static void ListFilesInDir(string path, IReadOnlyFilesystem fs, bool longFormat)
@@ -390,11 +390,11 @@ namespace Aaru.Commands.Filesystem
                     {
                         if(entry.Value.Attributes.HasFlag(FileAttributes.Directory))
                             AaruConsole.WriteLine("{0, 10:d} {0, 12:T}  {1, -20}  {2}", entry.Value.CreationTimeUtc,
-                                                 "<DIR>", entry.Key);
+                                                  "<DIR>", entry.Key);
                         else
                             AaruConsole.WriteLine("{0, 10:d} {0, 12:T}  {1, 6}{2, 14:##,#}  {3}",
-                                                 entry.Value.CreationTimeUtc, entry.Value.Inode, entry.Value.Length,
-                                                 entry.Key);
+                                                  entry.Value.CreationTimeUtc, entry.Value.Inode, entry.Value.Length,
+                                                  entry.Key);
 
                         error = fs.ListXAttr(path + "/" + entry.Key, out List<string> xattrs);
 
diff --git a/Aaru/Commands/Filesystem/Options.cs b/Aaru/Commands/Filesystem/Options.cs
index f08398c05..90d963425 100644
--- a/Aaru/Commands/Filesystem/Options.cs
+++ b/Aaru/Commands/Filesystem/Options.cs
@@ -45,8 +45,7 @@ namespace Aaru.Commands.Filesystem
 {
     internal class ListOptionsCommand : Command
     {
-        public ListOptionsCommand() : base("options",
-                                           "Lists all options supported by read-only filesystems.") =>
+        public ListOptionsCommand() : base("options", "Lists all options supported by read-only filesystems.") =>
             Handler = CommandHandler.Create(GetType().GetMethod(nameof(Invoke)));
 
         public static int Invoke(bool debug, bool verbose)
@@ -79,37 +78,37 @@ namespace Aaru.Commands.Filesystem
 
                 foreach((string name, Type type, string description) option in options.OrderBy(t => t.name))
                     AaruConsole.WriteLine("\t\t{0,-16} {1,-16} {2,-8}", option.name, TypeToString(option.type),
-                                         option.description);
+                                          option.description);
 
                 AaruConsole.WriteLine();
             }
 
-            return(int)ErrorNumber.NoError;
+            return (int)ErrorNumber.NoError;
         }
 
         static string TypeToString(Type type)
         {
             if(type == typeof(bool))
-                return"boolean";
+                return "boolean";
 
             if(type == typeof(sbyte) ||
                type == typeof(short) ||
                type == typeof(int)   ||
                type == typeof(long))
-                return"signed number";
+                return "signed number";
 
             if(type == typeof(byte)   ||
                type == typeof(ushort) ||
                type == typeof(uint)   ||
                type == typeof(ulong))
-                return"number";
+                return "number";
 
             if(type == typeof(float) ||
                type == typeof(double))
-                return"float number";
+                return "float number";
 
             if(type == typeof(Guid))
-                return"uuid";
+                return "uuid";
 
             return type == typeof(string) ? "string" : type.ToString();
         }
diff --git a/Aaru/Commands/Formats.cs b/Aaru/Commands/Formats.cs
index dd9e8945f..30ccefd1b 100644
--- a/Aaru/Commands/Formats.cs
+++ b/Aaru/Commands/Formats.cs
@@ -81,8 +81,8 @@ namespace Aaru.Commands
             AaruConsole.WriteLine();
 
             AaruConsole.WriteLine("Read-only media image formats ({0}):",
-                                 plugins.ImagePluginsList.Count(t => !t.Value.GetType().GetInterfaces().
-                                                                        Contains(typeof(IWritableImage))));
+                                  plugins.ImagePluginsList.Count(t => !t.Value.GetType().GetInterfaces().
+                                                                         Contains(typeof(IWritableImage))));
 
             if(verbose)
                 AaruConsole.VerboseWriteLine("GUID\t\t\t\t\tPlugin");
@@ -112,8 +112,8 @@ namespace Aaru.Commands
             AaruConsole.WriteLine();
 
             AaruConsole.WriteLine("Supported filesystems for identification and information only ({0}):",
-                                 plugins.PluginsList.Count(t => !t.Value.GetType().GetInterfaces().
-                                                                   Contains(typeof(IReadOnlyFilesystem))));
+                                  plugins.PluginsList.Count(t => !t.Value.GetType().GetInterfaces().
+                                                                    Contains(typeof(IReadOnlyFilesystem))));
 
             if(verbose)
                 AaruConsole.VerboseWriteLine("GUID\t\t\t\t\tPlugin");
@@ -131,7 +131,7 @@ namespace Aaru.Commands
             AaruConsole.WriteLine();
 
             AaruConsole.WriteLine("Supported filesystems that can read their contents ({0}):",
-                                 plugins.ReadOnlyFilesystems.Count);
+                                  plugins.ReadOnlyFilesystems.Count);
 
             if(verbose)
                 AaruConsole.VerboseWriteLine("GUID\t\t\t\t\tPlugin");
@@ -154,7 +154,7 @@ namespace Aaru.Commands
                 else
                     AaruConsole.WriteLine(kvp.Value.Name);
 
-            return(int)ErrorNumber.NoError;
+            return (int)ErrorNumber.NoError;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru/Commands/Image/Analyze.cs b/Aaru/Commands/Image/Analyze.cs
index f0812b7bc..1cb047ff5 100644
--- a/Aaru/Commands/Image/Analyze.cs
+++ b/Aaru/Commands/Image/Analyze.cs
@@ -107,7 +107,7 @@ namespace Aaru.Commands.Image
             {
                 AaruConsole.ErrorWriteLine("Cannot open specified file.");
 
-                return(int)ErrorNumber.CannotOpenFile;
+                return (int)ErrorNumber.CannotOpenFile;
             }
 
             Encoding encodingClass = null;
@@ -124,7 +124,7 @@ namespace Aaru.Commands.Image
                 {
                     AaruConsole.ErrorWriteLine("Specified encoding is not supported.");
 
-                    return(int)ErrorNumber.EncodingUnknown;
+                    return (int)ErrorNumber.EncodingUnknown;
                 }
 
             PluginBase plugins = GetPluginBase.Instance;
@@ -139,12 +139,12 @@ namespace Aaru.Commands.Image
                 {
                     AaruConsole.WriteLine("Image format not identified, not proceeding with analysis.");
 
-                    return(int)ErrorNumber.UnrecognizedFormat;
+                    return (int)ErrorNumber.UnrecognizedFormat;
                 }
 
                 if(verbose)
                     AaruConsole.VerboseWriteLine("Image format identified by {0} ({1}).", imageFormat.Name,
-                                                imageFormat.Id);
+                                                 imageFormat.Id);
                 else
                     AaruConsole.WriteLine("Image format identified by {0}.", imageFormat.Name);
 
@@ -157,7 +157,7 @@ namespace Aaru.Commands.Image
                         AaruConsole.WriteLine("Unable to open image format");
                         AaruConsole.WriteLine("No error given");
 
-                        return(int)ErrorNumber.CannotOpenFormat;
+                        return (int)ErrorNumber.CannotOpenFormat;
                     }
 
                     if(verbose)
@@ -176,7 +176,7 @@ namespace Aaru.Commands.Image
                     AaruConsole.ErrorWriteLine("Error: {0}", ex.Message);
                     AaruConsole.DebugWriteLine("Analyze command", "Stack trace: {0}", ex.StackTrace);
 
-                    return(int)ErrorNumber.CannotOpenFormat;
+                    return (int)ErrorNumber.CannotOpenFormat;
                 }
 
                 List<string> idPlugins;
@@ -185,8 +185,8 @@ namespace Aaru.Commands.Image
 
                 if(partitions)
                 {
-                    List<Partition> partitionsList = Aaru.Core.Partitions.GetAll(imageFormat);
-                    Aaru.Core.Partitions.AddSchemesToStats(partitionsList);
+                    List<Partition> partitionsList = Core.Partitions.GetAll(imageFormat);
+                    Core.Partitions.AddSchemesToStats(partitionsList);
 
                     if(partitionsList.Count == 0)
                     {
@@ -196,7 +196,7 @@ namespace Aaru.Commands.Image
                         {
                             AaruConsole.WriteLine("No partitions founds, not searching for filesystems");
 
-                            return(int)ErrorNumber.NothingFound;
+                            return (int)ErrorNumber.NothingFound;
                         }
 
                         checkRaw = true;
@@ -213,10 +213,10 @@ namespace Aaru.Commands.Image
                             AaruConsole.WriteLine("Partition type: {0}", partitionsList[i].Type);
 
                             AaruConsole.WriteLine("Partition start: sector {0}, byte {1}", partitionsList[i].Start,
-                                                 partitionsList[i].Offset);
+                                                  partitionsList[i].Offset);
 
                             AaruConsole.WriteLine("Partition length: {0} sectors, {1} bytes", partitionsList[i].Length,
-                                                 partitionsList[i].Size);
+                                                  partitionsList[i].Size);
 
                             AaruConsole.WriteLine("Partition scheme: {0}", partitionsList[i].Scheme);
                             AaruConsole.WriteLine("Partition description:");
@@ -227,7 +227,7 @@ namespace Aaru.Commands.Image
 
                             AaruConsole.WriteLine("Identifying filesystem on partition");
 
-                            Aaru.Core.Filesystems.Identify(imageFormat, out idPlugins, partitionsList[i]);
+                            Core.Filesystems.Identify(imageFormat, out idPlugins, partitionsList[i]);
 
                             if(idPlugins.Count == 0)
                                 AaruConsole.WriteLine("Filesystem not identified");
@@ -271,7 +271,7 @@ namespace Aaru.Commands.Image
                         Size = imageFormat.Info.Sectors * imageFormat.Info.SectorSize
                     };
 
-                    Aaru.Core.Filesystems.Identify(imageFormat, out idPlugins, wholePart);
+                    Core.Filesystems.Identify(imageFormat, out idPlugins, wholePart);
 
                     if(idPlugins.Count == 0)
                         AaruConsole.WriteLine("Filesystem not identified");
@@ -307,10 +307,10 @@ namespace Aaru.Commands.Image
                 AaruConsole.ErrorWriteLine($"Error reading file: {ex.Message}");
                 AaruConsole.DebugWriteLine("Analyze command", ex.StackTrace);
 
-                return(int)ErrorNumber.UnexpectedException;
+                return (int)ErrorNumber.UnexpectedException;
             }
 
-            return(int)ErrorNumber.NoError;
+            return (int)ErrorNumber.NoError;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru/Commands/Image/Checksum.cs b/Aaru/Commands/Image/Checksum.cs
index 16adfc694..e97a71878 100644
--- a/Aaru/Commands/Image/Checksum.cs
+++ b/Aaru/Commands/Image/Checksum.cs
@@ -191,7 +191,7 @@ namespace Aaru.Commands.Image
             {
                 AaruConsole.ErrorWriteLine("Cannot open specified file.");
 
-                return(int)ErrorNumber.CannotOpenFile;
+                return (int)ErrorNumber.CannotOpenFile;
             }
 
             IMediaImage inputFormat = ImageFormat.Detect(inputFilter);
@@ -200,7 +200,7 @@ namespace Aaru.Commands.Image
             {
                 AaruConsole.ErrorWriteLine("Unable to recognize image format, not checksumming");
 
-                return(int)ErrorNumber.UnrecognizedFormat;
+                return (int)ErrorNumber.UnrecognizedFormat;
             }
 
             inputFormat.Open(inputFilter);
@@ -274,9 +274,9 @@ namespace Aaru.Commands.Image
                                 }
 
                             AaruConsole.DebugWriteLine("Checksum command",
-                                                      "Track {0} starts at sector {1} and ends at sector {2}",
-                                                      currentTrack.TrackSequence, currentTrack.TrackStartSector,
-                                                      currentTrack.TrackEndSector);
+                                                       "Track {0} starts at sector {1} and ends at sector {2}",
+                                                       currentTrack.TrackSequence, currentTrack.TrackStartSector,
+                                                       currentTrack.TrackEndSector);
 
                             if(separatedTracks)
                                 trackChecksum = new Checksum(enabledChecksums);
@@ -295,7 +295,7 @@ namespace Aaru.Commands.Image
                                                                       currentTrack.TrackSequence);
 
                                     AaruConsole.Write("\rHashing sectors {0} to {2} of track {1}", doneSectors,
-                                                     currentTrack.TrackSequence, doneSectors + SECTORS_TO_READ);
+                                                      currentTrack.TrackSequence, doneSectors + SECTORS_TO_READ);
 
                                     doneSectors += SECTORS_TO_READ;
                                 }
@@ -305,7 +305,8 @@ namespace Aaru.Commands.Image
                                                                       currentTrack.TrackSequence);
 
                                     AaruConsole.Write("\rHashing sectors {0} to {2} of track {1}", doneSectors,
-                                                     currentTrack.TrackSequence, doneSectors + (sectors - doneSectors));
+                                                      currentTrack.TrackSequence,
+                                                      doneSectors + (sectors - doneSectors));
 
                                     doneSectors += sectors - doneSectors;
                                 }
@@ -323,7 +324,7 @@ namespace Aaru.Commands.Image
                                 if(trackChecksum != null)
                                     foreach(ChecksumType chk in trackChecksum.End())
                                         AaruConsole.WriteLine("Track {0}'s {1}: {2}", currentTrack.TrackSequence,
-                                                             chk.type, chk.Value);
+                                                              chk.type, chk.Value);
 
                             previousTrackEnd = currentTrack.TrackEndSector;
                         }
@@ -374,8 +375,8 @@ namespace Aaru.Commands.Image
                             }
 
                         AaruConsole.DebugWriteLine("Checksum command",
-                                                  "Track {0} starts at sector {1} and ends at block {2}",
-                                                  currentFile.File, currentFile.FirstBlock, currentFile.LastBlock);
+                                                   "Track {0} starts at sector {1} and ends at block {2}",
+                                                   currentFile.File, currentFile.FirstBlock, currentFile.LastBlock);
 
                         if(separatedTracks)
                             trackChecksum = new Checksum(enabledChecksums);
@@ -393,7 +394,7 @@ namespace Aaru.Commands.Image
                                 sector = tapeImage.ReadSectors(doneSectors + currentFile.FirstBlock, SECTORS_TO_READ);
 
                                 AaruConsole.Write("\rHashing blocks {0} to {2} of file {1}", doneSectors,
-                                                 currentFile.File, doneSectors + SECTORS_TO_READ);
+                                                  currentFile.File, doneSectors + SECTORS_TO_READ);
 
                                 doneSectors += SECTORS_TO_READ;
                             }
@@ -403,7 +404,7 @@ namespace Aaru.Commands.Image
                                                                (uint)(sectors - doneSectors));
 
                                 AaruConsole.Write("\rHashing blocks {0} to {2} of file {1}", doneSectors,
-                                                 currentFile.File, doneSectors + (sectors - doneSectors));
+                                                  currentFile.File, doneSectors + (sectors - doneSectors));
 
                                 doneSectors += sectors - doneSectors;
                             }
@@ -459,7 +460,7 @@ namespace Aaru.Commands.Image
                             sector = inputFormat.ReadSectors(doneSectors, SECTORS_TO_READ);
 
                             AaruConsole.Write("\rHashing sectors {0} to {1}", doneSectors,
-                                             doneSectors + SECTORS_TO_READ);
+                                              doneSectors + SECTORS_TO_READ);
 
                             doneSectors += SECTORS_TO_READ;
                         }
@@ -468,7 +469,7 @@ namespace Aaru.Commands.Image
                             sector = inputFormat.ReadSectors(doneSectors, (uint)(sectors - doneSectors));
 
                             AaruConsole.Write("\rHashing sectors {0} to {1}", doneSectors,
-                                             doneSectors + (sectors - doneSectors));
+                                              doneSectors + (sectors - doneSectors));
 
                             doneSectors += sectors - doneSectors;
                         }
@@ -485,7 +486,7 @@ namespace Aaru.Commands.Image
                 }
             }
 
-            return(int)ErrorNumber.NoError;
+            return (int)ErrorNumber.NoError;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru/Commands/Image/Compare.cs b/Aaru/Commands/Image/Compare.cs
index 45f4a0fe8..04b3ae9f7 100644
--- a/Aaru/Commands/Image/Compare.cs
+++ b/Aaru/Commands/Image/Compare.cs
@@ -90,14 +90,14 @@ namespace Aaru.Commands.Image
             {
                 AaruConsole.ErrorWriteLine("Cannot open input file 1");
 
-                return(int)ErrorNumber.CannotOpenFile;
+                return (int)ErrorNumber.CannotOpenFile;
             }
 
             if(inputFilter2 == null)
             {
                 AaruConsole.ErrorWriteLine("Cannot open input file 2");
 
-                return(int)ErrorNumber.CannotOpenFile;
+                return (int)ErrorNumber.CannotOpenFile;
             }
 
             IMediaImage input1Format = ImageFormat.Detect(inputFilter1);
@@ -107,12 +107,12 @@ namespace Aaru.Commands.Image
             {
                 AaruConsole.ErrorWriteLine("Input file 1 format not identified, not proceeding with comparison.");
 
-                return(int)ErrorNumber.UnrecognizedFormat;
+                return (int)ErrorNumber.UnrecognizedFormat;
             }
 
             if(verbose)
                 AaruConsole.VerboseWriteLine("Input file 1 format identified by {0} ({1}).", input1Format.Name,
-                                            input1Format.Id);
+                                             input1Format.Id);
             else
                 AaruConsole.WriteLine("Input file 1 format identified by {0}.", input1Format.Name);
 
@@ -120,12 +120,12 @@ namespace Aaru.Commands.Image
             {
                 AaruConsole.ErrorWriteLine("Input file 2 format not identified, not proceeding with comparison.");
 
-                return(int)ErrorNumber.UnrecognizedFormat;
+                return (int)ErrorNumber.UnrecognizedFormat;
             }
 
             if(verbose)
                 AaruConsole.VerboseWriteLine("Input file 2 format identified by {0} ({1}).", input2Format.Name,
-                                            input2Format.Id);
+                                             input2Format.Id);
             else
                 AaruConsole.WriteLine("Input file 2 format identified by {0}.", input2Format.Name);
 
@@ -361,7 +361,7 @@ namespace Aaru.Commands.Image
 
             AaruConsole.WriteLine(sb.ToString());
 
-            return(int)ErrorNumber.NoError;
+            return (int)ErrorNumber.NoError;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru/Commands/Image/Convert.cs b/Aaru/Commands/Image/Convert.cs
index 3ae3acb70..15d69e702 100644
--- a/Aaru/Commands/Image/Convert.cs
+++ b/Aaru/Commands/Image/Convert.cs
@@ -233,7 +233,7 @@ namespace Aaru.Commands.Image
             AaruConsole.DebugWriteLine("Analyze command", "--resume-file={0}", resumeFile);
             AaruConsole.DebugWriteLine("Analyze command", "--verbose={0}", verbose);
 
-            Dictionary<string, string> parsedOptions = Aaru.Core.Options.Parse(outputOptions);
+            Dictionary<string, string> parsedOptions = Core.Options.Parse(outputOptions);
             AaruConsole.DebugWriteLine("Analyze command", "Parsed options:");
 
             foreach(KeyValuePair<string, string> parsedOption in parsedOptions)
@@ -243,7 +243,7 @@ namespace Aaru.Commands.Image
             {
                 AaruConsole.ErrorWriteLine("Need to specify more than 0 sectors to copy at once");
 
-                return(int)ErrorNumber.InvalidArgument;
+                return (int)ErrorNumber.InvalidArgument;
             }
 
             Resume           resume  = null;
@@ -265,13 +265,13 @@ namespace Aaru.Commands.Image
                         AaruConsole.ErrorWriteLine("Incorrect metadata sidecar file, not continuing...");
                         AaruConsole.DebugWriteLine("Image conversion", $"{ex}");
 
-                        return(int)ErrorNumber.InvalidSidecar;
+                        return (int)ErrorNumber.InvalidSidecar;
                     }
                 else
                 {
                     AaruConsole.ErrorWriteLine("Could not find metadata sidecar, not continuing...");
 
-                    return(int)ErrorNumber.FileNotFound;
+                    return (int)ErrorNumber.FileNotFound;
                 }
 
             xs = new XmlSerializer(typeof(Resume));
@@ -289,13 +289,13 @@ namespace Aaru.Commands.Image
                         AaruConsole.ErrorWriteLine("Incorrect resume file, not continuing...");
                         AaruConsole.DebugWriteLine("Image conversion", $"{ex}");
 
-                        return(int)ErrorNumber.InvalidResume;
+                        return (int)ErrorNumber.InvalidResume;
                     }
                 else
                 {
                     AaruConsole.ErrorWriteLine("Could not find resume file, not continuing...");
 
-                    return(int)ErrorNumber.FileNotFound;
+                    return (int)ErrorNumber.FileNotFound;
                 }
 
             var     filtersList = new FiltersList();
@@ -305,14 +305,14 @@ namespace Aaru.Commands.Image
             {
                 AaruConsole.ErrorWriteLine("Cannot open specified file.");
 
-                return(int)ErrorNumber.CannotOpenFile;
+                return (int)ErrorNumber.CannotOpenFile;
             }
 
             if(File.Exists(outputPath))
             {
                 AaruConsole.ErrorWriteLine("Output file already exists, not continuing.");
 
-                return(int)ErrorNumber.DestinationExists;
+                return (int)ErrorNumber.DestinationExists;
             }
 
             PluginBase  plugins     = GetPluginBase.Instance;
@@ -322,12 +322,12 @@ namespace Aaru.Commands.Image
             {
                 AaruConsole.WriteLine("Input image format not identified, not proceeding with conversion.");
 
-                return(int)ErrorNumber.UnrecognizedFormat;
+                return (int)ErrorNumber.UnrecognizedFormat;
             }
 
             if(verbose)
                 AaruConsole.VerboseWriteLine("Input image format identified by {0} ({1}).", inputFormat.Name,
-                                            inputFormat.Id);
+                                             inputFormat.Id);
             else
                 AaruConsole.WriteLine("Input image format identified by {0}.", inputFormat.Name);
 
@@ -338,7 +338,7 @@ namespace Aaru.Commands.Image
                     AaruConsole.WriteLine("Unable to open image format");
                     AaruConsole.WriteLine("No error given");
 
-                    return(int)ErrorNumber.CannotOpenFormat;
+                    return (int)ErrorNumber.CannotOpenFormat;
                 }
 
                 mediaType = inputFormat.Info.MediaType;
@@ -365,7 +365,7 @@ namespace Aaru.Commands.Image
                 AaruConsole.DebugWriteLine("Convert-image command", "Correctly opened image file.");
 
                 AaruConsole.DebugWriteLine("Convert-image command", "Image without headers is {0} bytes.",
-                                          inputFormat.Info.ImageSize);
+                                           inputFormat.Info.ImageSize);
 
                 AaruConsole.DebugWriteLine("Convert-image command", "Image has {0} sectors.", inputFormat.Info.Sectors);
 
@@ -381,7 +381,7 @@ namespace Aaru.Commands.Image
                 AaruConsole.ErrorWriteLine("Error: {0}", ex.Message);
                 AaruConsole.DebugWriteLine("Convert-image command", "Stack trace: {0}", ex.StackTrace);
 
-                return(int)ErrorNumber.CannotOpenFormat;
+                return (int)ErrorNumber.CannotOpenFormat;
             }
 
             List<IWritableImage> candidates = new List<IWritableImage>();
@@ -406,14 +406,14 @@ namespace Aaru.Commands.Image
             {
                 AaruConsole.WriteLine("No plugin supports requested extension.");
 
-                return(int)ErrorNumber.FormatNotFound;
+                return (int)ErrorNumber.FormatNotFound;
             }
 
             if(candidates.Count > 1)
             {
                 AaruConsole.WriteLine("More than one plugin supports requested extension.");
 
-                return(int)ErrorNumber.TooManyFormats;
+                return (int)ErrorNumber.TooManyFormats;
             }
 
             IWritableImage outputFormat = candidates[0];
@@ -427,7 +427,7 @@ namespace Aaru.Commands.Image
             {
                 AaruConsole.ErrorWriteLine("Output format does not support media type, cannot continue...");
 
-                return(int)ErrorNumber.UnsupportedMedia;
+                return (int)ErrorNumber.UnsupportedMedia;
             }
 
             foreach(MediaTagType mediaTag in inputFormat.Info.ReadableMediaTags)
@@ -438,7 +438,7 @@ namespace Aaru.Commands.Image
                 AaruConsole.ErrorWriteLine("Converting image will lose media tag {0}, not continuing...", mediaTag);
                 AaruConsole.ErrorWriteLine("If you don't care, use force option.");
 
-                return(int)ErrorNumber.DataWillBeLost;
+                return (int)ErrorNumber.DataWillBeLost;
             }
 
             bool useLong = inputFormat.Info.ReadableSectorTags.Count != 0;
@@ -463,7 +463,7 @@ namespace Aaru.Commands.Image
                 AaruConsole.
                     ErrorWriteLine("If you don't care, use force option. This will skip all sector tags converting only user data.");
 
-                return(int)ErrorNumber.DataWillBeLost;
+                return (int)ErrorNumber.DataWillBeLost;
             }
 
             if(!outputFormat.Create(outputPath, mediaType, parsedOptions, inputFormat.Info.Sectors,
@@ -471,7 +471,7 @@ namespace Aaru.Commands.Image
             {
                 AaruConsole.ErrorWriteLine("Error {0} creating output image.", outputFormat.ErrorMessage);
 
-                return(int)ErrorNumber.CannotCreateFormat;
+                return (int)ErrorNumber.CannotCreateFormat;
             }
 
             var metadata = new ImageInfo
@@ -502,7 +502,7 @@ namespace Aaru.Commands.Image
                 {
                     AaruConsole.ErrorWriteLine("not continuing...");
 
-                    return(int)ErrorNumber.WriteError;
+                    return (int)ErrorNumber.WriteError;
                 }
 
                 AaruConsole.ErrorWriteLine("continuing...");
@@ -527,9 +527,9 @@ namespace Aaru.Commands.Image
                 else
                 {
                     AaruConsole.ErrorWriteLine("Error {0} writing media tag, not continuing...",
-                                              outputFormat.ErrorMessage);
+                                               outputFormat.ErrorMessage);
 
-                    return(int)ErrorNumber.WriteError;
+                    return (int)ErrorNumber.WriteError;
                 }
             }
 
@@ -543,9 +543,9 @@ namespace Aaru.Commands.Image
                 if(!outputOptical.SetTracks(inputOptical.Tracks))
                 {
                     AaruConsole.ErrorWriteLine("Error {0} sending tracks list to output image.",
-                                              outputFormat.ErrorMessage);
+                                               outputFormat.ErrorMessage);
 
-                    return(int)ErrorNumber.WriteError;
+                    return (int)ErrorNumber.WriteError;
                 }
 
                 foreach(Track track in inputOptical.Tracks)
@@ -565,10 +565,10 @@ namespace Aaru.Commands.Image
                             sectorsToDo = (uint)(trackSectors - doneSectors);
 
                         AaruConsole.Write("\rConverting sectors {0} to {1} in track {3} ({2:P2} done)",
-                                         doneSectors               + track.TrackStartSector,
-                                         doneSectors + sectorsToDo + track.TrackStartSector,
-                                         (doneSectors + track.TrackStartSector) / (double)inputFormat.Info.Sectors,
-                                         track.TrackSequence);
+                                          doneSectors               + track.TrackStartSector,
+                                          doneSectors + sectorsToDo + track.TrackStartSector,
+                                          (doneSectors + track.TrackStartSector) / (double)inputFormat.Info.Sectors,
+                                          track.TrackSequence);
 
                         bool result;
 
@@ -604,21 +604,21 @@ namespace Aaru.Commands.Image
                         if(!result)
                             if(force)
                                 AaruConsole.ErrorWriteLine("Error {0} writing sector {1}, continuing...",
-                                                          outputFormat.ErrorMessage, doneSectors);
+                                                           outputFormat.ErrorMessage, doneSectors);
                             else
                             {
                                 AaruConsole.ErrorWriteLine("Error {0} writing sector {1}, not continuing...",
-                                                          outputFormat.ErrorMessage, doneSectors);
+                                                           outputFormat.ErrorMessage, doneSectors);
 
-                                return(int)ErrorNumber.WriteError;
+                                return (int)ErrorNumber.WriteError;
                             }
 
                         doneSectors += sectorsToDo;
                     }
                 }
 
-                AaruConsole.Write("\rConverting sectors {0} to {1} in track {3} ({2:P2} done)", inputFormat.Info.Sectors,
-                                 inputFormat.Info.Sectors, 1.0, inputOptical.Tracks.Count);
+                AaruConsole.Write("\rConverting sectors {0} to {1} in track {3} ({2:P2} done)",
+                                  inputFormat.Info.Sectors, inputFormat.Info.Sectors, 1.0, inputOptical.Tracks.Count);
 
                 AaruConsole.WriteLine();
 
@@ -656,8 +656,8 @@ namespace Aaru.Commands.Image
                             case SectorTagType.CdTrackFlags:
                             case SectorTagType.CdTrackIsrc:
                                 AaruConsole.Write("\rConverting tag {0} in track {1} ({2:P2} done).", tag,
-                                                 track.TrackSequence,
-                                                 track.TrackSequence / (double)inputOptical.Tracks.Count);
+                                                  track.TrackSequence,
+                                                  track.TrackSequence / (double)inputOptical.Tracks.Count);
 
                                 sector = inputFormat.ReadSectorTag(track.TrackStartSector, tag);
                                 result = outputFormat.WriteSectorTag(sector, track.TrackStartSector, tag);
@@ -665,13 +665,13 @@ namespace Aaru.Commands.Image
                                 if(!result)
                                     if(force)
                                         AaruConsole.ErrorWriteLine("Error {0} writing tag, continuing...",
-                                                                  outputFormat.ErrorMessage);
+                                                                   outputFormat.ErrorMessage);
                                     else
                                     {
                                         AaruConsole.ErrorWriteLine("Error {0} writing tag, not continuing...",
-                                                                  outputFormat.ErrorMessage);
+                                                                   outputFormat.ErrorMessage);
 
-                                        return(int)ErrorNumber.WriteError;
+                                        return (int)ErrorNumber.WriteError;
                                     }
 
                                 continue;
@@ -687,10 +687,10 @@ namespace Aaru.Commands.Image
                                 sectorsToDo = (uint)(trackSectors - doneSectors);
 
                             AaruConsole.Write("\rConverting tag {4} for sectors {0} to {1} in track {3} ({2:P2} done)",
-                                             doneSectors               + track.TrackStartSector,
-                                             doneSectors + sectorsToDo + track.TrackStartSector,
-                                             (doneSectors + track.TrackStartSector) / (double)inputFormat.Info.Sectors,
-                                             track.TrackSequence, tag);
+                                              doneSectors               + track.TrackStartSector,
+                                              doneSectors + sectorsToDo + track.TrackStartSector,
+                                              (doneSectors + track.TrackStartSector) / (double)inputFormat.Info.Sectors,
+                                              track.TrackSequence, tag);
 
                             if(sectorsToDo == 1)
                             {
@@ -709,13 +709,14 @@ namespace Aaru.Commands.Image
                             if(!result)
                                 if(force)
                                     AaruConsole.ErrorWriteLine("Error {0} writing tag for sector {1}, continuing...",
-                                                              outputFormat.ErrorMessage, doneSectors);
+                                                               outputFormat.ErrorMessage, doneSectors);
                                 else
                                 {
-                                    AaruConsole.ErrorWriteLine("Error {0} writing tag for sector {1}, not continuing...",
-                                                              outputFormat.ErrorMessage, doneSectors);
+                                    AaruConsole.
+                                        ErrorWriteLine("Error {0} writing tag for sector {1}, not continuing...",
+                                                       outputFormat.ErrorMessage, doneSectors);
 
-                                    return(int)ErrorNumber.WriteError;
+                                    return (int)ErrorNumber.WriteError;
                                 }
 
                             doneSectors += sectorsToDo;
@@ -727,13 +728,13 @@ namespace Aaru.Commands.Image
                         case SectorTagType.CdTrackFlags:
                         case SectorTagType.CdTrackIsrc:
                             AaruConsole.Write("\rConverting tag {0} in track {1} ({2:P2} done).", tag,
-                                             inputOptical.Tracks.Count, 1.0);
+                                              inputOptical.Tracks.Count, 1.0);
 
                             break;
                         default:
                             AaruConsole.Write("\rConverting tag {4} for sectors {0} to {1} in track {3} ({2:P2} done)",
-                                             inputFormat.Info.Sectors, inputFormat.Info.Sectors, 1.0,
-                                             inputOptical.Tracks.Count, tag);
+                                              inputFormat.Info.Sectors, inputFormat.Info.Sectors, 1.0,
+                                              inputOptical.Tracks.Count, tag);
 
                             break;
                     }
@@ -744,13 +745,13 @@ namespace Aaru.Commands.Image
             else
             {
                 AaruConsole.WriteLine("Setting geometry to {0} cylinders, {1} heads and {2} sectors per track",
-                                     inputFormat.Info.Cylinders, inputFormat.Info.Heads,
-                                     inputFormat.Info.SectorsPerTrack);
+                                      inputFormat.Info.Cylinders, inputFormat.Info.Heads,
+                                      inputFormat.Info.SectorsPerTrack);
 
                 if(!outputFormat.SetGeometry(inputFormat.Info.Cylinders, inputFormat.Info.Heads,
                                              inputFormat.Info.SectorsPerTrack))
                     AaruConsole.ErrorWriteLine("Error {0} setting geometry, image may be incorrect, continuing...",
-                                              outputFormat.ErrorMessage);
+                                               outputFormat.ErrorMessage);
 
                 while(doneSectors < inputFormat.Info.Sectors)
                 {
@@ -764,7 +765,7 @@ namespace Aaru.Commands.Image
                         sectorsToDo = (uint)(inputFormat.Info.Sectors - doneSectors);
 
                     AaruConsole.Write("\rConverting sectors {0} to {1} ({2:P2} done)", doneSectors,
-                                     doneSectors + sectorsToDo, doneSectors / (double)inputFormat.Info.Sectors);
+                                      doneSectors + sectorsToDo, doneSectors / (double)inputFormat.Info.Sectors);
 
                     bool result;
 
@@ -796,20 +797,20 @@ namespace Aaru.Commands.Image
                     if(!result)
                         if(force)
                             AaruConsole.ErrorWriteLine("Error {0} writing sector {1}, continuing...",
-                                                      outputFormat.ErrorMessage, doneSectors);
+                                                       outputFormat.ErrorMessage, doneSectors);
                         else
                         {
                             AaruConsole.ErrorWriteLine("Error {0} writing sector {1}, not continuing...",
-                                                      outputFormat.ErrorMessage, doneSectors);
+                                                       outputFormat.ErrorMessage, doneSectors);
 
-                            return(int)ErrorNumber.WriteError;
+                            return (int)ErrorNumber.WriteError;
                         }
 
                     doneSectors += sectorsToDo;
                 }
 
                 AaruConsole.Write("\rConverting sectors {0} to {1} ({2:P2} done)", inputFormat.Info.Sectors,
-                                 inputFormat.Info.Sectors, 1.0);
+                                  inputFormat.Info.Sectors, 1.0);
 
                 AaruConsole.WriteLine();
 
@@ -849,8 +850,8 @@ namespace Aaru.Commands.Image
                             sectorsToDo = (uint)(inputFormat.Info.Sectors - doneSectors);
 
                         AaruConsole.Write("\rConverting tag {2} for sectors {0} to {1} ({2:P2} done)", doneSectors,
-                                         doneSectors + sectorsToDo, doneSectors / (double)inputFormat.Info.Sectors,
-                                         tag);
+                                          doneSectors + sectorsToDo, doneSectors / (double)inputFormat.Info.Sectors,
+                                          tag);
 
                         bool result;
 
@@ -868,20 +869,20 @@ namespace Aaru.Commands.Image
                         if(!result)
                             if(force)
                                 AaruConsole.ErrorWriteLine("Error {0} writing sector {1}, continuing...",
-                                                          outputFormat.ErrorMessage, doneSectors);
+                                                           outputFormat.ErrorMessage, doneSectors);
                             else
                             {
                                 AaruConsole.ErrorWriteLine("Error {0} writing sector {1}, not continuing...",
-                                                          outputFormat.ErrorMessage, doneSectors);
+                                                           outputFormat.ErrorMessage, doneSectors);
 
-                                return(int)ErrorNumber.WriteError;
+                                return (int)ErrorNumber.WriteError;
                             }
 
                         doneSectors += sectorsToDo;
                     }
 
                     AaruConsole.Write("\rConverting tag {2} for sectors {0} to {1} ({2:P2} done)",
-                                     inputFormat.Info.Sectors, inputFormat.Info.Sectors, 1.0, tag);
+                                      inputFormat.Info.Sectors, inputFormat.Info.Sectors, 1.0, tag);
 
                     AaruConsole.WriteLine();
                 }
@@ -919,12 +920,12 @@ namespace Aaru.Commands.Image
 
             if(!outputFormat.Close())
                 AaruConsole.ErrorWriteLine("Error {0} closing output image... Contents are not correct.",
-                                          outputFormat.ErrorMessage);
+                                           outputFormat.ErrorMessage);
 
             AaruConsole.WriteLine();
             AaruConsole.WriteLine("Conversion done.");
 
-            return(int)ErrorNumber.NoError;
+            return (int)ErrorNumber.NoError;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru/Commands/Image/CreateSidecar.cs b/Aaru/Commands/Image/CreateSidecar.cs
index 50f60d6a9..a6772e7cd 100644
--- a/Aaru/Commands/Image/CreateSidecar.cs
+++ b/Aaru/Commands/Image/CreateSidecar.cs
@@ -119,7 +119,7 @@ namespace Aaru.Commands.Image
                 {
                     AaruConsole.ErrorWriteLine("Specified encoding is not supported.");
 
-                    return(int)ErrorNumber.EncodingUnknown;
+                    return (int)ErrorNumber.EncodingUnknown;
                 }
 
             if(File.Exists(imagePath))
@@ -128,7 +128,7 @@ namespace Aaru.Commands.Image
                 {
                     AaruConsole.ErrorWriteLine("You cannot use --tape option when input is a file.");
 
-                    return(int)ErrorNumber.ExpectedDirectory;
+                    return (int)ErrorNumber.ExpectedDirectory;
                 }
 
                 var     filtersList = new FiltersList();
@@ -138,7 +138,7 @@ namespace Aaru.Commands.Image
                 {
                     AaruConsole.ErrorWriteLine("Cannot open specified file.");
 
-                    return(int)ErrorNumber.CannotOpenFile;
+                    return (int)ErrorNumber.CannotOpenFile;
                 }
 
                 try
@@ -149,12 +149,12 @@ namespace Aaru.Commands.Image
                     {
                         AaruConsole.WriteLine("Image format not identified, not proceeding with analysis.");
 
-                        return(int)ErrorNumber.UnrecognizedFormat;
+                        return (int)ErrorNumber.UnrecognizedFormat;
                     }
 
                     if(verbose)
                         AaruConsole.VerboseWriteLine("Image format identified by {0} ({1}).", imageFormat.Name,
-                                                    imageFormat.Id);
+                                                     imageFormat.Id);
                     else
                         AaruConsole.WriteLine("Image format identified by {0}.", imageFormat.Name);
 
@@ -165,7 +165,7 @@ namespace Aaru.Commands.Image
                             AaruConsole.WriteLine("Unable to open image format");
                             AaruConsole.WriteLine("No error given");
 
-                            return(int)ErrorNumber.CannotOpenFormat;
+                            return (int)ErrorNumber.CannotOpenFormat;
                         }
 
                         AaruConsole.DebugWriteLine("Analyze command", "Correctly opened image file.");
@@ -175,7 +175,7 @@ namespace Aaru.Commands.Image
                         AaruConsole.ErrorWriteLine("Unable to open image format");
                         AaruConsole.ErrorWriteLine("Error: {0}", ex.Message);
 
-                        return(int)ErrorNumber.CannotOpenFormat;
+                        return (int)ErrorNumber.CannotOpenFormat;
                     }
 
                     Statistics.AddMediaFormat(imageFormat.Format);
@@ -214,7 +214,7 @@ namespace Aaru.Commands.Image
                     AaruConsole.ErrorWriteLine($"Error reading file: {ex.Message}");
                     AaruConsole.DebugWriteLine("Analyze command", ex.StackTrace);
 
-                    return(int)ErrorNumber.UnexpectedException;
+                    return (int)ErrorNumber.UnexpectedException;
                 }
             }
             else if(Directory.Exists(imagePath))
@@ -223,7 +223,7 @@ namespace Aaru.Commands.Image
                 {
                     AaruConsole.ErrorWriteLine("Cannot create a sidecar from a directory.");
 
-                    return(int)ErrorNumber.ExpectedFile;
+                    return (int)ErrorNumber.ExpectedFile;
                 }
 
                 string[]     contents = Directory.GetFiles(imagePath, "*", SearchOption.TopDirectoryOnly);
@@ -255,7 +255,7 @@ namespace Aaru.Commands.Image
             else
                 AaruConsole.ErrorWriteLine("The specified input file cannot be found.");
 
-            return(int)ErrorNumber.NoError;
+            return (int)ErrorNumber.NoError;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru/Commands/Image/Decode.cs b/Aaru/Commands/Image/Decode.cs
index 5f5e0d58b..092f7c98b 100644
--- a/Aaru/Commands/Image/Decode.cs
+++ b/Aaru/Commands/Image/Decode.cs
@@ -115,7 +115,7 @@ namespace Aaru.Commands.Image
             {
                 AaruConsole.ErrorWriteLine("Cannot open specified file.");
 
-                return(int)ErrorNumber.CannotOpenFile;
+                return (int)ErrorNumber.CannotOpenFile;
             }
 
             IMediaImage inputFormat = ImageFormat.Detect(inputFilter);
@@ -124,7 +124,7 @@ namespace Aaru.Commands.Image
             {
                 AaruConsole.ErrorWriteLine("Unable to recognize image format, not decoding");
 
-                return(int)ErrorNumber.UnrecognizedFormat;
+                return (int)ErrorNumber.UnrecognizedFormat;
             }
 
             inputFormat.Open(inputFilter);
@@ -331,14 +331,14 @@ namespace Aaru.Commands.Image
                             }
                             default:
                                 AaruConsole.WriteLine("Decoder for disk tag type \"{0}\" not yet implemented, sorry.",
-                                                     tag);
+                                                      tag);
 
                                 break;
                         }
 
             if(sectorTags)
             {
-                if(length.ToLowerInvariant() == "all") { }
+                if(length.ToLowerInvariant() == "all") {}
                 else
                 {
                     if(!ulong.TryParse(length, out ulong _))
@@ -358,7 +358,7 @@ namespace Aaru.Commands.Image
                         {
                             default:
                                 AaruConsole.WriteLine("Decoder for disk tag type \"{0}\" not yet implemented, sorry.",
-                                                     tag);
+                                                      tag);
 
                                 break;
                         }
@@ -366,7 +366,7 @@ namespace Aaru.Commands.Image
                 // TODO: Not implemented
             }
 
-            return(int)ErrorNumber.NoError;
+            return (int)ErrorNumber.NoError;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru/Commands/Image/Entropy.cs b/Aaru/Commands/Image/Entropy.cs
index 372e86ec0..4627404c6 100644
--- a/Aaru/Commands/Image/Entropy.cs
+++ b/Aaru/Commands/Image/Entropy.cs
@@ -103,7 +103,7 @@ namespace Aaru.Commands.Image
             {
                 AaruConsole.ErrorWriteLine("Cannot open specified file.");
 
-                return(int)ErrorNumber.CannotOpenFile;
+                return (int)ErrorNumber.CannotOpenFile;
             }
 
             IMediaImage inputFormat = ImageFormat.Detect(inputFilter);
@@ -112,7 +112,7 @@ namespace Aaru.Commands.Image
             {
                 AaruConsole.ErrorWriteLine("Unable to recognize image format, not checksumming");
 
-                return(int)ErrorNumber.UnrecognizedFormat;
+                return (int)ErrorNumber.UnrecognizedFormat;
             }
 
             inputFormat.Open(inputFilter);
@@ -138,13 +138,13 @@ namespace Aaru.Commands.Image
 
                     if(trackEntropy.UniqueSectors != null)
                         AaruConsole.WriteLine("Track {0} has {1} unique sectors ({2:P3})", trackEntropy.Track,
-                                             trackEntropy.UniqueSectors,
-                                             (double)trackEntropy.UniqueSectors / (double)trackEntropy.Sectors);
+                                              trackEntropy.UniqueSectors,
+                                              (double)trackEntropy.UniqueSectors / (double)trackEntropy.Sectors);
                 }
             }
 
             if(!wholeDisc)
-                return(int)ErrorNumber.NoError;
+                return (int)ErrorNumber.NoError;
 
             EntropyResults entropy = entropyCalculator.CalculateMediaEntropy(duplicatedSectors);
 
@@ -152,9 +152,9 @@ namespace Aaru.Commands.Image
 
             if(entropy.UniqueSectors != null)
                 AaruConsole.WriteLine("Disk has {0} unique sectors ({1:P3})", entropy.UniqueSectors,
-                                     (double)entropy.UniqueSectors / (double)entropy.Sectors);
+                                      (double)entropy.UniqueSectors / (double)entropy.Sectors);
 
-            return(int)ErrorNumber.NoError;
+            return (int)ErrorNumber.NoError;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru/Commands/Image/Info.cs b/Aaru/Commands/Image/Info.cs
index f5a05bc70..a5e9f1573 100644
--- a/Aaru/Commands/Image/Info.cs
+++ b/Aaru/Commands/Image/Info.cs
@@ -77,7 +77,7 @@ namespace Aaru.Commands.Image
             {
                 AaruConsole.ErrorWriteLine("Cannot open specified file.");
 
-                return(int)ErrorNumber.CannotOpenFile;
+                return (int)ErrorNumber.CannotOpenFile;
             }
 
             try
@@ -88,7 +88,7 @@ namespace Aaru.Commands.Image
                 {
                     AaruConsole.WriteLine("Image format not identified.");
 
-                    return(int)ErrorNumber.UnrecognizedFormat;
+                    return (int)ErrorNumber.UnrecognizedFormat;
                 }
 
                 AaruConsole.WriteLine("Image format identified by {0} ({1}).", imageFormat.Name, imageFormat.Id);
@@ -101,7 +101,7 @@ namespace Aaru.Commands.Image
                         AaruConsole.WriteLine("Unable to open image format");
                         AaruConsole.WriteLine("No error given");
 
-                        return(int)ErrorNumber.CannotOpenFormat;
+                        return (int)ErrorNumber.CannotOpenFormat;
                     }
 
                     ImageInfo.PrintImageInfo(imageFormat);
@@ -116,7 +116,7 @@ namespace Aaru.Commands.Image
                     AaruConsole.ErrorWriteLine("Error: {0}", ex.Message);
                     AaruConsole.DebugWriteLine("Image-info command", "Stack trace: {0}", ex.StackTrace);
 
-                    return(int)ErrorNumber.CannotOpenFormat;
+                    return (int)ErrorNumber.CannotOpenFormat;
                 }
             }
             catch(Exception ex)
@@ -124,10 +124,10 @@ namespace Aaru.Commands.Image
                 AaruConsole.ErrorWriteLine($"Error reading file: {ex.Message}");
                 AaruConsole.DebugWriteLine("Image-info command", ex.StackTrace);
 
-                return(int)ErrorNumber.UnexpectedException;
+                return (int)ErrorNumber.UnexpectedException;
             }
 
-            return(int)ErrorNumber.NoError;
+            return (int)ErrorNumber.NoError;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru/Commands/Image/Options.cs b/Aaru/Commands/Image/Options.cs
index 9f929ddb0..f01ed4828 100644
--- a/Aaru/Commands/Image/Options.cs
+++ b/Aaru/Commands/Image/Options.cs
@@ -45,8 +45,7 @@ namespace Aaru.Commands.Image
 {
     internal class ListOptionsCommand : Command
     {
-        public ListOptionsCommand() : base("options",
-                                           "Lists all options supported by writable media images.") =>
+        public ListOptionsCommand() : base("options", "Lists all options supported by writable media images.") =>
             Handler = CommandHandler.Create(GetType().GetMethod(nameof(Invoke)));
 
         public static int Invoke(bool debug, bool verbose)
@@ -81,37 +80,37 @@ namespace Aaru.Commands.Image
                 foreach((string name, Type type, string description, object @default) option in
                     options.OrderBy(t => t.name))
                     AaruConsole.WriteLine("\t\t{0,-20} {1,-10} {2,-12} {3,-8}", option.name, TypeToString(option.type),
-                                         option.@default, option.description);
+                                          option.@default, option.description);
 
                 AaruConsole.WriteLine();
             }
 
-            return(int)ErrorNumber.NoError;
+            return (int)ErrorNumber.NoError;
         }
 
         static string TypeToString(Type type)
         {
             if(type == typeof(bool))
-                return"boolean";
+                return "boolean";
 
             if(type == typeof(sbyte) ||
                type == typeof(short) ||
                type == typeof(int)   ||
                type == typeof(long))
-                return"signed number";
+                return "signed number";
 
             if(type == typeof(byte)   ||
                type == typeof(ushort) ||
                type == typeof(uint)   ||
                type == typeof(ulong))
-                return"number";
+                return "number";
 
             if(type == typeof(float) ||
                type == typeof(double))
-                return"float number";
+                return "float number";
 
             if(type == typeof(Guid))
-                return"uuid";
+                return "uuid";
 
             return type == typeof(string) ? "string" : type.ToString();
         }
diff --git a/Aaru/Commands/Image/Print.cs b/Aaru/Commands/Image/Print.cs
index 05059e0d7..f77451e48 100644
--- a/Aaru/Commands/Image/Print.cs
+++ b/Aaru/Commands/Image/Print.cs
@@ -112,7 +112,7 @@ namespace Aaru.Commands.Image
             {
                 AaruConsole.ErrorWriteLine("Cannot open specified file.");
 
-                return(int)ErrorNumber.CannotOpenFile;
+                return (int)ErrorNumber.CannotOpenFile;
             }
 
             IMediaImage inputFormat = ImageFormat.Detect(inputFilter);
@@ -121,7 +121,7 @@ namespace Aaru.Commands.Image
             {
                 AaruConsole.ErrorWriteLine("Unable to recognize image format, not verifying");
 
-                return(int)ErrorNumber.UnrecognizedFormat;
+                return (int)ErrorNumber.UnrecognizedFormat;
             }
 
             inputFormat.Open(inputFilter);
@@ -148,13 +148,12 @@ namespace Aaru.Commands.Image
                     }
                 }
 
-                byte[] sector = longSectors ? inputFormat.ReadSectorLong(start + i)
-                                    : inputFormat.ReadSector(start             + i);
+                byte[] sector = longSectors ? inputFormat.ReadSectorLong(start + i) : inputFormat.ReadSector(start + i);
 
                 PrintHex.PrintHexArray(sector, width);
             }
 
-            return(int)ErrorNumber.NoError;
+            return (int)ErrorNumber.NoError;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru/Commands/Image/Verify.cs b/Aaru/Commands/Image/Verify.cs
index 8b4ae77b9..31f5c9ae3 100644
--- a/Aaru/Commands/Image/Verify.cs
+++ b/Aaru/Commands/Image/Verify.cs
@@ -97,7 +97,7 @@ namespace Aaru.Commands.Image
             {
                 AaruConsole.ErrorWriteLine("Cannot open specified file.");
 
-                return(int)ErrorNumber.CannotOpenFile;
+                return (int)ErrorNumber.CannotOpenFile;
             }
 
             IMediaImage inputFormat = ImageFormat.Detect(inputFilter);
@@ -106,7 +106,7 @@ namespace Aaru.Commands.Image
             {
                 AaruConsole.ErrorWriteLine("Unable to recognize image format, not verifying");
 
-                return(int)ErrorNumber.FormatNotFound;
+                return (int)ErrorNumber.FormatNotFound;
             }
 
             inputFormat.Open(inputFilter);
@@ -127,7 +127,7 @@ namespace Aaru.Commands.Image
             {
                 AaruConsole.ErrorWriteLine("The specified image does not support any kind of verification");
 
-                return(int)ErrorNumber.NotVerificable;
+                return (int)ErrorNumber.NotVerificable;
             }
 
             if(verifyDisc && verifiableImage != null)
@@ -165,7 +165,8 @@ namespace Aaru.Commands.Image
                 List<ulong> failingLbas = new List<ulong>();
                 List<ulong> unknownLbas = new List<ulong>();
 
-                if(verifiableSectorsImage is IOpticalMediaImage opticalMediaImage && opticalMediaImage.Tracks != null)
+                if(verifiableSectorsImage is IOpticalMediaImage opticalMediaImage &&
+                   opticalMediaImage.Tracks != null)
                 {
                     List<Track> inputTracks      = opticalMediaImage.Tracks;
                     ulong       currentSectorAll = 0;
@@ -180,7 +181,7 @@ namespace Aaru.Commands.Image
                         while(remainingSectors > 0)
                         {
                             AaruConsole.Write("\rChecking sector {0} of {1}, on track {2}", currentSectorAll,
-                                             inputFormat.Info.Sectors, currentTrack.TrackSequence);
+                                              inputFormat.Info.Sectors, currentTrack.TrackSequence);
 
                             List<ulong> tempFailingLbas;
                             List<ulong> tempUnknownLbas;
@@ -302,18 +303,18 @@ namespace Aaru.Commands.Image
 
             switch(correctImage)
             {
-                case null when correctSectors is null:   return(int)ErrorNumber.NotVerificable;
-                case null when correctSectors == false:  return(int)ErrorNumber.BadSectorsImageNotVerified;
-                case null when correctSectors == true:   return(int)ErrorNumber.CorrectSectorsImageNotVerified;
-                case false when correctSectors is null:  return(int)ErrorNumber.BadImageSectorsNotVerified;
-                case false when correctSectors == false: return(int)ErrorNumber.BadImageBadSectors;
-                case false when correctSectors == true:  return(int)ErrorNumber.CorrectSectorsBadImage;
-                case true when correctSectors is null:   return(int)ErrorNumber.CorrectImageSectorsNotVerified;
-                case true when correctSectors == false:  return(int)ErrorNumber.CorrectImageBadSectors;
-                case true when correctSectors == true:   return(int)ErrorNumber.NoError;
+                case null when correctSectors is null:   return (int)ErrorNumber.NotVerificable;
+                case null when correctSectors == false:  return (int)ErrorNumber.BadSectorsImageNotVerified;
+                case null when correctSectors == true:   return (int)ErrorNumber.CorrectSectorsImageNotVerified;
+                case false when correctSectors is null:  return (int)ErrorNumber.BadImageSectorsNotVerified;
+                case false when correctSectors == false: return (int)ErrorNumber.BadImageBadSectors;
+                case false when correctSectors == true:  return (int)ErrorNumber.CorrectSectorsBadImage;
+                case true when correctSectors is null:   return (int)ErrorNumber.CorrectImageSectorsNotVerified;
+                case true when correctSectors == false:  return (int)ErrorNumber.CorrectImageBadSectors;
+                case true when correctSectors == true:   return (int)ErrorNumber.NoError;
             }
 
-            return(int)ErrorNumber.NoError;
+            return (int)ErrorNumber.NoError;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru/Commands/ListEncodings.cs b/Aaru/Commands/ListEncodings.cs
index f2f099c80..9f86f6f60 100644
--- a/Aaru/Commands/ListEncodings.cs
+++ b/Aaru/Commands/ListEncodings.cs
@@ -76,7 +76,7 @@ namespace Aaru.Commands
             foreach(CommonEncodingInfo info in encodings.OrderBy(t => t.DisplayName))
                 AaruConsole.WriteLine("{0,-16} {1,-8}", info.Name, info.DisplayName);
 
-            return(int)ErrorNumber.NoError;
+            return (int)ErrorNumber.NoError;
         }
 
         struct CommonEncodingInfo
diff --git a/Aaru/Commands/ListNamespaces.cs b/Aaru/Commands/ListNamespaces.cs
index d81f26f03..adad77945 100644
--- a/Aaru/Commands/ListNamespaces.cs
+++ b/Aaru/Commands/ListNamespaces.cs
@@ -78,7 +78,7 @@ namespace Aaru.Commands
                 AaruConsole.WriteLine();
             }
 
-            return(int)ErrorNumber.NoError;
+            return (int)ErrorNumber.NoError;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru/Commands/Media/Dump.cs b/Aaru/Commands/Media/Dump.cs
index 0b1499ea7..0217a9829 100644
--- a/Aaru/Commands/Media/Dump.cs
+++ b/Aaru/Commands/Media/Dump.cs
@@ -216,7 +216,7 @@ namespace Aaru.Commands.Media
             // TODO: Disabled temporarily
             //AaruConsole.DebugWriteLine("Dump-Media command", "--raw={0}",           raw);
 
-            Dictionary<string, string> parsedOptions = Aaru.Core.Options.Parse(options);
+            Dictionary<string, string> parsedOptions = Core.Options.Parse(options);
             AaruConsole.DebugWriteLine("Dump-Media command", "Parsed options:");
 
             foreach(KeyValuePair<string, string> parsedOption in parsedOptions)
@@ -236,31 +236,31 @@ namespace Aaru.Commands.Media
                 {
                     AaruConsole.ErrorWriteLine("Specified encoding is not supported.");
 
-                    return(int)ErrorNumber.EncodingUnknown;
+                    return (int)ErrorNumber.EncodingUnknown;
                 }
 
             DumpSubchannel wantedSubchannel = DumpSubchannel.Any;
 
             switch(subchannel?.ToLowerInvariant())
             {
-                case"any":
+                case "any":
                 case null:
                     wantedSubchannel = DumpSubchannel.Any;
 
                     break;
-                case"rw":
+                case "rw":
                     wantedSubchannel = DumpSubchannel.Rw;
 
                     break;
-                case"rw-or-pq":
+                case "rw-or-pq":
                     wantedSubchannel = DumpSubchannel.RwOrPq;
 
                     break;
-                case"pq":
+                case "pq":
                     wantedSubchannel = DumpSubchannel.Pq;
 
                     break;
-                case"none":
+                case "none":
                     wantedSubchannel = DumpSubchannel.None;
 
                     break;
@@ -276,11 +276,11 @@ namespace Aaru.Commands.Media
                char.IsLetter(devicePath[0]))
                 devicePath = "\\\\.\\" + char.ToUpper(devicePath[0]) + ':';
 
-            Aaru.Devices.Device dev;
+            Devices.Device dev;
 
             try
             {
-                dev = new Aaru.Devices.Device(devicePath);
+                dev = new Devices.Device(devicePath);
 
                 if(dev.IsRemote)
                     Statistics.AddRemote(dev.RemoteApplication, dev.RemoteVersion, dev.RemoteOperatingSystem,
@@ -290,14 +290,14 @@ namespace Aaru.Commands.Media
                 {
                     AaruConsole.ErrorWriteLine(Error.Print(dev.LastError));
 
-                    return(int)ErrorNumber.CannotOpenDevice;
+                    return (int)ErrorNumber.CannotOpenDevice;
                 }
             }
             catch(DeviceException e)
             {
                 AaruConsole.ErrorWriteLine(e.Message ?? Error.Print(e.LastError));
 
-                return(int)ErrorNumber.CannotOpenDevice;
+                return (int)ErrorNumber.CannotOpenDevice;
             }
 
             Statistics.AddDevice(dev);
@@ -319,7 +319,7 @@ namespace Aaru.Commands.Media
                 {
                     AaruConsole.ErrorWriteLine("Incorrect resume file, not continuing...");
 
-                    return(int)ErrorNumber.InvalidResume;
+                    return (int)ErrorNumber.InvalidResume;
                 }
 
             if(resumeClass                 != null                 &&
@@ -329,7 +329,7 @@ namespace Aaru.Commands.Media
             {
                 AaruConsole.WriteLine("Media already dumped correctly, not continuing...");
 
-                return(int)ErrorNumber.AlreadyDumped;
+                return (int)ErrorNumber.AlreadyDumped;
             }
 
             CICMMetadataType sidecar   = null;
@@ -348,14 +348,14 @@ namespace Aaru.Commands.Media
                     {
                         AaruConsole.ErrorWriteLine("Incorrect metadata sidecar file, not continuing...");
 
-                        return(int)ErrorNumber.InvalidSidecar;
+                        return (int)ErrorNumber.InvalidSidecar;
                     }
                 }
                 else
                 {
                     AaruConsole.ErrorWriteLine("Could not find metadata sidecar, not continuing...");
 
-                    return(int)ErrorNumber.FileNotFound;
+                    return (int)ErrorNumber.FileNotFound;
                 }
 
             PluginBase           plugins    = GetPluginBase.Instance;
@@ -381,14 +381,14 @@ namespace Aaru.Commands.Media
             {
                 AaruConsole.WriteLine("No plugin supports requested extension.");
 
-                return(int)ErrorNumber.FormatNotFound;
+                return (int)ErrorNumber.FormatNotFound;
             }
 
             if(candidates.Count > 1)
             {
                 AaruConsole.WriteLine("More than one plugin supports requested extension.");
 
-                return(int)ErrorNumber.TooManyFormats;
+                return (int)ErrorNumber.TooManyFormats;
             }
 
             IWritableImage outputFormat = candidates[0];
@@ -432,7 +432,7 @@ namespace Aaru.Commands.Media
 
             dev.Close();
 
-            return(int)ErrorNumber.NoError;
+            return (int)ErrorNumber.NoError;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru/Commands/Media/Info.cs b/Aaru/Commands/Media/Info.cs
index 37edd6730..546ef33dd 100644
--- a/Aaru/Commands/Media/Info.cs
+++ b/Aaru/Commands/Media/Info.cs
@@ -104,11 +104,11 @@ namespace Aaru.Commands.Media
                char.IsLetter(devicePath[0]))
                 devicePath = "\\\\.\\" + char.ToUpper(devicePath[0]) + ':';
 
-            Aaru.Devices.Device dev;
+            Devices.Device dev;
 
             try
             {
-                dev = new Aaru.Devices.Device(devicePath);
+                dev = new Devices.Device(devicePath);
 
                 if(dev.IsRemote)
                     Statistics.AddRemote(dev.RemoteApplication, dev.RemoteVersion, dev.RemoteOperatingSystem,
@@ -118,14 +118,14 @@ namespace Aaru.Commands.Media
                 {
                     AaruConsole.ErrorWriteLine(Error.Print(dev.LastError));
 
-                    return(int)ErrorNumber.CannotOpenDevice;
+                    return (int)ErrorNumber.CannotOpenDevice;
                 }
             }
             catch(DeviceException e)
             {
                 AaruConsole.ErrorWriteLine(e.Message ?? Error.Print(e.LastError));
 
-                return(int)ErrorNumber.CannotOpenDevice;
+                return (int)ErrorNumber.CannotOpenDevice;
             }
 
             Statistics.AddDevice(dev);
@@ -153,17 +153,17 @@ namespace Aaru.Commands.Media
                 default: throw new NotSupportedException("Unknown device type.");
             }
 
-            return(int)ErrorNumber.NoError;
+            return (int)ErrorNumber.NoError;
         }
 
         static void DoAtaMediaInfo() => AaruConsole.ErrorWriteLine("Please use device-info command for ATA devices.");
 
-        static void DoNvmeMediaInfo(string outputPrefix, Aaru.Devices.Device dev) =>
+        static void DoNvmeMediaInfo(string outputPrefix, Devices.Device dev) =>
             throw new NotImplementedException("NVMe devices not yet supported.");
 
         static void DoSdMediaInfo() => AaruConsole.ErrorWriteLine("Please use device-info command for MMC/SD devices.");
 
-        static void DoScsiMediaInfo(bool debug, bool verbose, string outputPrefix, Aaru.Devices.Device dev)
+        static void DoScsiMediaInfo(bool debug, bool verbose, string outputPrefix, Devices.Device dev)
         {
             var scsiInfo = new ScsiInfo(dev);
 
@@ -197,7 +197,8 @@ namespace Aaru.Commands.Media
                     if(scsiInfo.Blocks    != 0 &&
                        scsiInfo.BlockSize != 0)
                         AaruConsole.WriteLine("Media has {0} blocks of {1} bytes/each. (for a total of {2} bytes)",
-                                             scsiInfo.Blocks, scsiInfo.BlockSize, scsiInfo.Blocks * scsiInfo.BlockSize);
+                                              scsiInfo.Blocks, scsiInfo.BlockSize,
+                                              scsiInfo.Blocks * scsiInfo.BlockSize);
 
                     break;
                 case PeripheralDeviceTypes.SequentialAccess:
@@ -366,7 +367,8 @@ namespace Aaru.Commands.Media
                     DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_bd_di.bin",
                                      "SCSI READ DISC STRUCTURE", scsiInfo.BlurayDiscInformation);
 
-                    AaruConsole.WriteLine("Blu-ray Disc Information:\n{0}", DI.Prettify(scsiInfo.BlurayDiscInformation));
+                    AaruConsole.WriteLine("Blu-ray Disc Information:\n{0}",
+                                          DI.Prettify(scsiInfo.BlurayDiscInformation));
                 }
 
                 if(scsiInfo.BlurayPac != null)
@@ -379,7 +381,7 @@ namespace Aaru.Commands.Media
                                      "SCSI READ DISC STRUCTURE", scsiInfo.BlurayBurstCuttingArea);
 
                     AaruConsole.WriteLine("Blu-ray Burst Cutting Area:\n{0}",
-                                         BCA.Prettify(scsiInfo.BlurayBurstCuttingArea));
+                                          BCA.Prettify(scsiInfo.BlurayBurstCuttingArea));
                 }
 
                 if(scsiInfo.BlurayDds != null)
@@ -388,7 +390,7 @@ namespace Aaru.Commands.Media
                                      "SCSI READ DISC STRUCTURE", scsiInfo.BlurayDds);
 
                     AaruConsole.WriteLine("Blu-ray Disc Definition Structure:\n{0}",
-                                         Aaru.Decoders.Bluray.DDS.Prettify(scsiInfo.BlurayDds));
+                                          Decoders.Bluray.DDS.Prettify(scsiInfo.BlurayDds));
                 }
 
                 if(scsiInfo.BlurayCartridgeStatus != null)
@@ -397,7 +399,7 @@ namespace Aaru.Commands.Media
                                      "SCSI READ DISC STRUCTURE", scsiInfo.BlurayCartridgeStatus);
 
                     AaruConsole.WriteLine("Blu-ray Cartridge Status:\n{0}",
-                                         Aaru.Decoders.Bluray.Cartridge.Prettify(scsiInfo.BlurayCartridgeStatus));
+                                          Decoders.Bluray.Cartridge.Prettify(scsiInfo.BlurayCartridgeStatus));
                 }
 
                 if(scsiInfo.BluraySpareAreaInformation != null)
@@ -406,7 +408,7 @@ namespace Aaru.Commands.Media
                                      "SCSI READ DISC STRUCTURE", scsiInfo.BluraySpareAreaInformation);
 
                     AaruConsole.WriteLine("Blu-ray Spare Area Information:\n{0}",
-                                         Aaru.Decoders.Bluray.Spare.Prettify(scsiInfo.BluraySpareAreaInformation));
+                                          Decoders.Bluray.Spare.Prettify(scsiInfo.BluraySpareAreaInformation));
                 }
 
                 if(scsiInfo.BlurayRawDfl != null)
@@ -416,7 +418,7 @@ namespace Aaru.Commands.Media
                 if(scsiInfo.BlurayTrackResources != null)
                 {
                     AaruConsole.WriteLine("Track Resources Information:\n{0}",
-                                         DiscInformation.Prettify(scsiInfo.BlurayTrackResources));
+                                          DiscInformation.Prettify(scsiInfo.BlurayTrackResources));
 
                     DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscinformation_001b.bin",
                                      "SCSI READ DISC INFORMATION", scsiInfo.BlurayTrackResources);
@@ -425,7 +427,7 @@ namespace Aaru.Commands.Media
                 if(scsiInfo.BlurayPowResources != null)
                 {
                     AaruConsole.WriteLine("POW Resources Information:\n{0}",
-                                         DiscInformation.Prettify(scsiInfo.BlurayPowResources));
+                                          DiscInformation.Prettify(scsiInfo.BlurayPowResources));
 
                     DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscinformation_010b.bin",
                                      "SCSI READ DISC INFORMATION", scsiInfo.BlurayPowResources);
@@ -456,7 +458,7 @@ namespace Aaru.Commands.Media
 
                     if(scsiInfo.DecodedCompactDiscInformation.HasValue)
                         AaruConsole.WriteLine("Standard Disc Information:\n{0}",
-                                             DiscInformation.Prettify000b(scsiInfo.DecodedCompactDiscInformation));
+                                              DiscInformation.Prettify000b(scsiInfo.DecodedCompactDiscInformation));
                 }
 
                 if(scsiInfo.Session != null)
@@ -492,7 +494,7 @@ namespace Aaru.Commands.Media
 
                     if(scsiInfo.DecodedCdTextLeadIn.HasValue)
                         AaruConsole.WriteLine("CD-TEXT on Lead-In:\n{0}",
-                                             CDTextOnLeadIn.Prettify(scsiInfo.DecodedCdTextLeadIn));
+                                              CDTextOnLeadIn.Prettify(scsiInfo.DecodedCdTextLeadIn));
                 }
 
                 if(!string.IsNullOrEmpty(scsiInfo.Mcn))
@@ -507,7 +509,8 @@ namespace Aaru.Commands.Media
                                      scsiInfo.XboxSecuritySector);
 
                 if(scsiInfo.DecodedXboxSecuritySector.HasValue)
-                    AaruConsole.WriteLine("Xbox Security Sector:\n{0}", SS.Prettify(scsiInfo.DecodedXboxSecuritySector));
+                    AaruConsole.WriteLine("Xbox Security Sector:\n{0}",
+                                          SS.Prettify(scsiInfo.DecodedXboxSecuritySector));
 
                 if(scsiInfo.XgdInfo != null)
                 {
@@ -552,10 +555,10 @@ namespace Aaru.Commands.Media
                     bool supportsRwSubchannel = Dump.SupportsRwSubchannel(dev, null, null);
 
                     // Open master database
-                    var ctx = AaruContext.Create(Aaru.Settings.Settings.MasterDbPath);
+                    var ctx = AaruContext.Create(Settings.Settings.MasterDbPath);
 
                     // Search for device in master database
-                    Aaru.Database.Models.Device dbDev =
+                    Database.Models.Device dbDev =
                         ctx.Devices.FirstOrDefault(d => d.Manufacturer == dev.Manufacturer && d.Model == dev.Model &&
                                                         d.Revision     == dev.FirmwareRevision);
 
@@ -623,7 +626,8 @@ namespace Aaru.Commands.Media
                             AaruConsole.
                                 WriteLine($"Drive reading offset is {driveOffset} bytes ({driveOffset / 4} samples).");
 
-                            AaruConsole.WriteLine($"Combined offset is {offsetBytes} bytes ({offsetBytes / 4} samples)");
+                            AaruConsole.
+                                WriteLine($"Combined offset is {offsetBytes} bytes ({offsetBytes / 4} samples)");
 
                             int? discOffset = offsetBytes - driveOffset;
 
diff --git a/Aaru/Commands/Media/Scan.cs b/Aaru/Commands/Media/Scan.cs
index 812424d0c..6b9f28032 100644
--- a/Aaru/Commands/Media/Scan.cs
+++ b/Aaru/Commands/Media/Scan.cs
@@ -92,11 +92,11 @@ namespace Aaru.Commands.Media
                char.IsLetter(devicePath[0]))
                 devicePath = "\\\\.\\" + char.ToUpper(devicePath[0]) + ':';
 
-            Aaru.Devices.Device dev;
+            Devices.Device dev;
 
             try
             {
-                dev = new Aaru.Devices.Device(devicePath);
+                dev = new Devices.Device(devicePath);
 
                 if(dev.IsRemote)
                     Statistics.AddRemote(dev.RemoteApplication, dev.RemoteVersion, dev.RemoteOperatingSystem,
@@ -106,14 +106,14 @@ namespace Aaru.Commands.Media
                 {
                     AaruConsole.ErrorWriteLine(Error.Print(dev.LastError));
 
-                    return(int)ErrorNumber.CannotOpenDevice;
+                    return (int)ErrorNumber.CannotOpenDevice;
                 }
             }
             catch(DeviceException e)
             {
                 AaruConsole.ErrorWriteLine(e.Message ?? Error.Print(e.LastError));
 
-                return(int)ErrorNumber.CannotOpenDevice;
+                return (int)ErrorNumber.CannotOpenDevice;
             }
 
             Statistics.AddDevice(dev);
@@ -135,7 +135,7 @@ namespace Aaru.Commands.Media
             ScanResults results = scanner.Scan();
 
             AaruConsole.WriteLine("Took a total of {0} seconds ({1} processing commands).", results.TotalTime,
-                                 results.ProcessingTime);
+                                  results.ProcessingTime);
 
             AaruConsole.WriteLine("Average speed: {0:F3} MiB/sec.", results.AvgSpeed);
             AaruConsole.WriteLine("Fastest speed burst: {0:F3} MiB/sec.", results.MaxSpeed);
@@ -164,12 +164,13 @@ namespace Aaru.Commands.Media
 
                 // ReSharper restore CompareOfFloatsByEqualityOperator
                 #pragma warning restore RECS0018 // Comparison of floating point numbers with equality operator
-                AaruConsole.WriteLine("Testing {0} seeks, longest seek took {1:F3} ms, fastest one took {2:F3} ms. ({3:F3} ms average)",
-                                     results.SeekTimes, results.SeekMax, results.SeekMin, results.SeekTotal / 1000);
+                AaruConsole.
+                    WriteLine("Testing {0} seeks, longest seek took {1:F3} ms, fastest one took {2:F3} ms. ({3:F3} ms average)",
+                              results.SeekTimes, results.SeekMax, results.SeekMin, results.SeekTotal / 1000);
 
             dev.Close();
 
-            return(int)ErrorNumber.NoError;
+            return (int)ErrorNumber.NoError;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru/Commands/Remote.cs b/Aaru/Commands/Remote.cs
index ff20d2450..acc6336d6 100644
--- a/Aaru/Commands/Remote.cs
+++ b/Aaru/Commands/Remote.cs
@@ -80,7 +80,7 @@ namespace Aaru.Commands
                 AaruConsole.WriteLine("Server application: {0} {1}", remote.ServerApplication, remote.ServerVersion);
 
                 AaruConsole.WriteLine("Server operating system: {0} {1} ({2})", remote.ServerOperatingSystem,
-                                     remote.ServerOperatingSystemVersion, remote.ServerArchitecture);
+                                      remote.ServerOperatingSystemVersion, remote.ServerArchitecture);
 
                 AaruConsole.WriteLine("Server maximum protocol: {0}", remote.ServerProtocolVersion);
                 remote.Disconnect();
@@ -89,10 +89,10 @@ namespace Aaru.Commands
             {
                 AaruConsole.ErrorWriteLine("Error connecting to host.");
 
-                return(int)ErrorNumber.CannotOpenDevice;
+                return (int)ErrorNumber.CannotOpenDevice;
             }
 
-            return(int)ErrorNumber.NoError;
+            return (int)ErrorNumber.NoError;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru/Main.cs b/Aaru/Main.cs
index ef4c7cc9b..80808b177 100644
--- a/Aaru/Main.cs
+++ b/Aaru/Main.cs
@@ -74,21 +74,21 @@ namespace Aaru
             AaruConsole.WriteEvent          += System.Console.Write;
             AaruConsole.ErrorWriteLineEvent += System.Console.Error.WriteLine;
 
-            Aaru.Settings.Settings.LoadSettings();
+            Settings.Settings.LoadSettings();
 
-            var ctx = AaruContext.Create(Aaru.Settings.Settings.LocalDbPath);
+            var ctx = AaruContext.Create(Settings.Settings.LocalDbPath);
             ctx.Database.Migrate();
             ctx.SaveChanges();
 
             bool masterDbUpdate = false;
 
-            if(!File.Exists(Aaru.Settings.Settings.MasterDbPath))
+            if(!File.Exists(Settings.Settings.MasterDbPath))
             {
                 masterDbUpdate = true;
                 UpdateCommand.DoUpdate(true);
             }
 
-            var masterContext = AaruContext.Create(Aaru.Settings.Settings.MasterDbPath);
+            var masterContext = AaruContext.Create(Settings.Settings.MasterDbPath);
 
             if(masterContext.Database.GetPendingMigrations().Any())
             {
@@ -96,25 +96,25 @@ namespace Aaru
 
                 try
                 {
-                    File.Delete(Aaru.Settings.Settings.MasterDbPath);
+                    File.Delete(Settings.Settings.MasterDbPath);
                 }
                 catch(Exception)
                 {
                     AaruConsole.ErrorWriteLine("Exception trying to remove old database version, cannot continue...");
-                    AaruConsole.ErrorWriteLine("Please manually remove file at {0}", Aaru.Settings.Settings.MasterDbPath);
+                    AaruConsole.ErrorWriteLine("Please manually remove file at {0}", Settings.Settings.MasterDbPath);
                 }
 
                 UpdateCommand.DoUpdate(true);
             }
 
             if((args.Length < 1 || args[0].ToLowerInvariant() != "gui") &&
-               Aaru.Settings.Settings.Current.GdprCompliance < DicSettings.GdprLevel)
+               Settings.Settings.Current.GdprCompliance < DicSettings.GdprLevel)
                 new ConfigureCommand(true, true).Invoke(args);
 
             Statistics.LoadStats();
 
-            if(Aaru.Settings.Settings.Current.Stats != null &&
-               Aaru.Settings.Settings.Current.Stats.ShareStats)
+            if(Settings.Settings.Current.Stats != null &&
+               Settings.Settings.Current.Stats.ShareStats)
                 Task.Run(Statistics.SubmitStats);
 
             Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
diff --git a/Aaru/Progress.cs b/Aaru/Progress.cs
index c2ab12c3d..b0563617d 100644
--- a/Aaru/Progress.cs
+++ b/Aaru/Progress.cs
@@ -34,14 +34,11 @@ using Aaru.Console;
 
 namespace Aaru
 {
-    static class Progress
+    internal static class Progress
     {
-        internal static void InitProgress() { }
+        internal static void InitProgress() {}
 
-        internal static void EndProgress()
-        {
-            AaruConsole.WriteLine();
-        }
+        internal static void EndProgress() => AaruConsole.WriteLine();
 
         internal static void UpdateProgress(string text, long current, long maximum)
         {
@@ -55,12 +52,9 @@ namespace Aaru
             AaruConsole.Write(text);
         }
 
-        internal static void InitProgress2() { }
+        internal static void InitProgress2() {}
 
-        internal static void EndProgress2()
-        {
-            AaruConsole.WriteLine();
-        }
+        internal static void EndProgress2() => AaruConsole.WriteLine();
 
         internal static void UpdateProgress2(string text, long current, long maximum)
         {
@@ -68,15 +62,12 @@ namespace Aaru
             AaruConsole.Write(text);
         }
 
-        internal static void InitTwoProgress() { }
+        internal static void InitTwoProgress() {}
 
-        internal static void EndTwoProgress()
-        {
-            AaruConsole.WriteLine();
-        }
+        internal static void EndTwoProgress() => AaruConsole.WriteLine();
 
         internal static void UpdateTwoProgress(string text, long current, long maximum, string text2, long current2,
-                                               long   maximum2)
+                                               long maximum2)
         {
             ClearCurrentConsoleLine();
             AaruConsole.Write(text + ": " + text2);
@@ -88,14 +79,9 @@ namespace Aaru
             AaruConsole.WriteLine(text);
         }
 
-        internal static void ErrorMessage(string text)
-        {
-            AaruConsole.ErrorWriteLine(text);
-        }
+        internal static void ErrorMessage(string text) => AaruConsole.ErrorWriteLine(text);
 
-        static void ClearCurrentConsoleLine()
-        {
+        static void ClearCurrentConsoleLine() =>
             System.Console.Write('\r' + new string(' ', System.Console.WindowWidth - 1) + '\r');
-        }
     }
 }
\ No newline at end of file