From e953155bd369b5a16be37c48ddf5cbac3745ea62 Mon Sep 17 00:00:00 2001
From: Natalia Portillo <claunia@claunia.com>
Date: Wed, 4 Oct 2023 00:09:19 +0100
Subject: [PATCH] Code refactor and cleanup.

---
 .idea/.idea.Aaru.Server/.idea/discord.xml     |   7 +
 .../.idea/riderMarkupCache.xml                |   6 +
 .../.idea/runConfigurations/Server_task.xml   |   8 +-
 Aaru.Server.Task/Program.cs                   |  55 +-
 Aaru.Server.Task/appsettings.json             |   2 +-
 Aaru.Server/Aaru.Server.csproj                | 134 ++---
 .../Areas/Admin/Controllers/AtasController.cs | 122 ++--
 .../Controllers/BlockDescriptorsController.cs |   3 +-
 .../Areas/Admin/Controllers/ChsController.cs  |  13 +-
 .../Admin/Controllers/CommandsController.cs   |   3 +-
 .../CompactDiscOffsetsController.cs           |  18 +-
 .../Controllers/DeviceStatsController.cs      |  18 +-
 .../Admin/Controllers/DevicesController.cs    |  27 +-
 .../Controllers/FilesystemsController.cs      |   3 +-
 .../Admin/Controllers/FiltersController.cs    |   3 +-
 .../Admin/Controllers/FireWiresController.cs  |  28 +-
 .../GdRomSwapDiscCapabilitiesController.cs    |  46 +-
 .../Areas/Admin/Controllers/HomeController.cs |   3 +-
 .../Controllers/MediaFormatsController.cs     |  11 +-
 .../Admin/Controllers/MediasController.cs     |  11 +-
 .../Areas/Admin/Controllers/MmcController.cs  |  15 +-
 .../Controllers/MmcFeaturesController.cs      |   7 +-
 .../Admin/Controllers/MmcSdsController.cs     |  15 +-
 .../Controllers/OperatingSystemsController.cs |   3 +-
 .../Admin/Controllers/PartitionsController.cs |   3 +-
 .../Admin/Controllers/PcmciasController.cs    |  11 +-
 .../Admin/Controllers/ReportsController.cs    |  26 +-
 .../Admin/Controllers/ScsiModesController.cs  |  11 +-
 .../Admin/Controllers/ScsiPagesController.cs  |  11 +-
 .../Admin/Controllers/ScsisController.cs      |  60 +-
 .../Areas/Admin/Controllers/SscsController.cs |  19 +-
 .../SupportedDensitiesController.cs           |  11 +-
 .../Controllers/TestedMediasController.cs     |  59 +-
 .../TestedSequentialMediasController.cs       |  18 +-
 .../Controllers/UsbProductsController.cs      |   3 +-
 .../Admin/Controllers/UsbVendorsController.cs |   7 +-
 .../Areas/Admin/Controllers/UsbsController.cs |  25 +-
 .../Admin/Controllers/VersionsController.cs   |   3 +-
 .../Admin/Views/Atas/CheckPrivate.cshtml      |   3 +-
 .../Areas/Admin/Views/Atas/Consolidate.cshtml |   6 +-
 .../Areas/Admin/Views/Atas/Delete.cshtml      |   6 +-
 .../Areas/Admin/Views/Atas/Details.cshtml     |   8 +-
 .../Areas/Admin/Views/Atas/Index.cshtml       |   3 +-
 .../Admin/Views/BlockDescriptors/Index.cshtml |   3 +-
 .../Areas/Admin/Views/Chs/Consolidate.cshtml  |   6 +-
 .../Areas/Admin/Views/Chs/Index.cshtml        |   3 +-
 .../Areas/Admin/Views/Commands/Index.cshtml   |   2 +-
 .../Views/CompactDiscOffsets/Delete.cshtml    |   6 +-
 .../Views/CompactDiscOffsets/Edit.cshtml      |  16 +-
 .../Views/CompactDiscOffsets/Index.cshtml     |   2 +-
 .../Admin/Views/DeviceStats/Delete.cshtml     |   6 +-
 .../Areas/Admin/Views/DeviceStats/Edit.cshtml |  14 +-
 .../Admin/Views/DeviceStats/Index.cshtml      |   2 +-
 .../Areas/Admin/Views/Devices/Delete.cshtml   |   6 +-
 .../Areas/Admin/Views/Devices/Details.cshtml  |  19 +-
 .../Areas/Admin/Views/Devices/Edit.cshtml     |  18 +-
 .../Areas/Admin/Views/Devices/Find.cshtml     |   4 +-
 .../Areas/Admin/Views/Devices/Index.cshtml    |   2 +-
 .../Admin/Views/Filesystems/Index.cshtml      |   2 +-
 .../Areas/Admin/Views/Filters/Index.cshtml    |   2 +-
 .../Admin/Views/FireWires/Consolidate.cshtml  |   6 +-
 .../Areas/Admin/Views/FireWires/Delete.cshtml |   6 +-
 .../Areas/Admin/Views/FireWires/Edit.cshtml   |  16 +-
 .../Areas/Admin/Views/FireWires/Index.cshtml  |   3 +-
 .../GdRomSwapDiscCapabilities/Delete.cshtml   |   8 +-
 .../GdRomSwapDiscCapabilities/Details.cshtml  |   4 +-
 .../Areas/Admin/Views/Home/Index.cshtml       |  62 +-
 .../Admin/Views/MediaFormats/Delete.cshtml    |   6 +-
 .../Admin/Views/MediaFormats/Index.cshtml     |   2 +-
 .../Areas/Admin/Views/Medias/Delete.cshtml    |   6 +-
 .../Areas/Admin/Views/Medias/Index.cshtml     |   2 +-
 .../Areas/Admin/Views/Mmc/Delete.cshtml       |   6 +-
 .../Areas/Admin/Views/Mmc/Details.cshtml      |   2 +-
 .../Areas/Admin/Views/Mmc/Index.cshtml        |   2 +-
 .../Admin/Views/MmcFeatures/Details.cshtml    |   2 +-
 .../Admin/Views/MmcFeatures/Index.cshtml      |   3 +-
 .../Areas/Admin/Views/MmcSds/Delete.cshtml    |   6 +-
 .../Areas/Admin/Views/MmcSds/Details.cshtml   |   2 +-
 .../Areas/Admin/Views/MmcSds/Index.cshtml     |   3 +-
 .../Admin/Views/OperatingSystems/Index.cshtml |   3 +-
 .../Areas/Admin/Views/Partitions/Index.cshtml |   2 +-
 .../Areas/Admin/Views/Pcmcias/Delete.cshtml   |   6 +-
 .../Areas/Admin/Views/Pcmcias/Index.cshtml    |   3 +-
 .../Areas/Admin/Views/Reports/Delete.cshtml   |   6 +-
 .../Areas/Admin/Views/Reports/Details.cshtml  |  15 +-
 .../Areas/Admin/Views/Reports/Edit.cshtml     |  14 +-
 .../Areas/Admin/Views/Reports/Index.cshtml    |   2 +-
 .../Areas/Admin/Views/ScsiModes/Delete.cshtml |   6 +-
 .../Areas/Admin/Views/ScsiModes/Index.cshtml  |   3 +-
 .../Areas/Admin/Views/ScsiPages/Delete.cshtml |   6 +-
 .../Areas/Admin/Views/ScsiPages/Index.cshtml  |   3 +-
 .../Admin/Views/Scsis/Consolidate.cshtml      |   6 +-
 .../Areas/Admin/Views/Scsis/Delete.cshtml     |   6 +-
 .../Areas/Admin/Views/Scsis/Details.cshtml    |   8 +-
 .../Areas/Admin/Views/Scsis/Index.cshtml      |   3 +-
 .../Areas/Admin/Views/Shared/_Layout.cshtml   |  12 +-
 .../Areas/Admin/Views/Sscs/Consolidate.cshtml |   6 +-
 .../Areas/Admin/Views/Sscs/Delete.cshtml      |   6 +-
 .../Areas/Admin/Views/Sscs/Index.cshtml       |   3 +-
 .../Views/SupportedDensities/Delete.cshtml    |   6 +-
 .../Views/SupportedDensities/Index.cshtml     |   3 +-
 .../Admin/Views/TestedMedias/Delete.cshtml    |   6 +-
 .../Admin/Views/TestedMedias/Details.cshtml   |   2 +-
 .../Admin/Views/TestedMedias/Edit.cshtml      |  18 +-
 .../Admin/Views/TestedMedias/Index.cshtml     |   3 +-
 .../TestedSequentialMedias/Delete.cshtml      |   6 +-
 .../Views/TestedSequentialMedias/Edit.cshtml  |  12 +-
 .../Views/TestedSequentialMedias/Index.cshtml |   3 +-
 .../Admin/Views/UsbProducts/Index.cshtml      |   2 +-
 .../Admin/Views/UsbVendors/Details.cshtml     |   4 +-
 .../Areas/Admin/Views/UsbVendors/Index.cshtml |   2 +-
 .../Areas/Admin/Views/Usbs/Consolidate.cshtml |   6 +-
 .../Areas/Admin/Views/Usbs/Delete.cshtml      |   6 +-
 .../Areas/Admin/Views/Usbs/Details.cshtml     |   2 +-
 .../Areas/Admin/Views/Usbs/Index.cshtml       |   3 +-
 .../Areas/Admin/Views/Versions/Index.cshtml   |   3 +-
 Aaru.Server/BasicAuthMiddleware.cs            |   2 -
 Aaru.Server/Controllers/ReportController.cs   |  52 +-
 Aaru.Server/Controllers/StatsController.cs    |  40 +-
 Aaru.Server/Controllers/UpdateController.cs   |  21 +-
 .../Controllers/UploadReportController.cs     |  20 +-
 .../Controllers/UploadStatsController.cs      |  58 +-
 Aaru.Server/Core/Ata.cs                       | 309 ++++++++--
 Aaru.Server/Core/Hash.cs                      |   4 +-
 Aaru.Server/Core/HtmlHelpers.cs               |  12 +-
 Aaru.Server/Core/ScsiInquiry.cs               |   7 +-
 Aaru.Server/Core/ScsiMmcFeatures.cs           |   6 +
 Aaru.Server/Core/ScsiMmcMode.cs               |  19 +-
 Aaru.Server/Core/ScsiModeSense.cs             |  45 +-
 Aaru.Server/Core/SscTestedMedia.cs            |   4 -
 Aaru.Server/Core/StatsConverter.cs            |  78 ++-
 Aaru.Server/Core/TestedMedia.cs               |  79 ++-
 Aaru.Server/Models/CdOffset.cs                |   5 +-
 Aaru.Server/Models/Context.cs                 |   2 +-
 Aaru.Server/Models/Device.cs                  |  11 +-
 Aaru.Server/Models/FireWireModel.cs           |  10 +-
 Aaru.Server/Models/Media.cs                   |   9 +-
 Aaru.Server/Models/MmcModelForView.cs         |   4 +-
 Aaru.Server/Models/NesHeaderInfo.cs           |  16 +-
 Aaru.Server/Models/UsbProductModel.cs         |   8 +-
 Aaru.Server/Models/UsbVendor.cs               |   7 +-
 Aaru.Server/Models/UsbVendorModel.cs          |   7 +-
 Aaru.Server/Program.cs                        | 110 ++--
 Aaru.Server/Properties/launchSettings.json    |  18 +-
 Aaru.Server/Seeder.cs                         |  10 +-
 Aaru.Server/Views/Report/View.cshtml          | 536 +++++++++---------
 .../Views/Shared/_CookieConsentPartial.cshtml |   6 +-
 Aaru.Server/Views/Shared/_Layout.cshtml       |   4 +-
 Aaru.Server/Views/Stats/Index.cshtml          |   6 +-
 Aaru.Server/appsettings.Development.json      |  10 +-
 Aaru.Server/appsettings.json                  |   6 +-
 Aaru.Server/docs/CONTRIBUTING.md              |   3 +-
 Aaru.Server/docs/ISSUE_TEMPLATE.md            |  18 +-
 Aaru.Server/docs/NEEDED.md                    | 112 ++--
 Aaru.Server/package.json                      |  16 +-
 Aaru.Server/wwwroot                           |   2 +-
 156 files changed, 1730 insertions(+), 1282 deletions(-)
 create mode 100644 .idea/.idea.Aaru.Server/.idea/discord.xml
 create mode 100644 .idea/.idea.Aaru.Server/.idea/riderMarkupCache.xml

diff --git a/.idea/.idea.Aaru.Server/.idea/discord.xml b/.idea/.idea.Aaru.Server/.idea/discord.xml
new file mode 100644
index 00000000..d8e95616
--- /dev/null
+++ b/.idea/.idea.Aaru.Server/.idea/discord.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="DiscordProjectSettings">
+    <option name="show" value="PROJECT_FILES" />
+    <option name="description" value="" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/.idea.Aaru.Server/.idea/riderMarkupCache.xml b/.idea/.idea.Aaru.Server/.idea/riderMarkupCache.xml
new file mode 100644
index 00000000..3a174183
--- /dev/null
+++ b/.idea/.idea.Aaru.Server/.idea/riderMarkupCache.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RiderMarkupStore">
+    <option name="version" value="-2154046885505616848" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/.idea.Aaru.Server/.idea/runConfigurations/Server_task.xml b/.idea/.idea.Aaru.Server/.idea/runConfigurations/Server_task.xml
index cd8c4146..131ca4fb 100644
--- a/.idea/.idea.Aaru.Server/.idea/runConfigurations/Server_task.xml
+++ b/.idea/.idea.Aaru.Server/.idea/runConfigurations/Server_task.xml
@@ -1,8 +1,8 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Server task" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/Aaru.Server.Task/bin/Debug/netcoreapp3.0/Aaru.Server.Task.dll" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/Aaru.Server.Task/bin/Debug/net6.0/Aaru.Server.Task" />
     <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/Aaru.Server.Task/bin/Debug/netcoreapp3.0" />
+    <option name="WORKING_DIRECTORY" value="$USER_HOME$/Desktop" />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="USE_MONO" value="0" />
@@ -10,9 +10,9 @@
     <option name="PROJECT_PATH" value="$PROJECT_DIR$/Aaru.Server.Task/Aaru.Server.Task.csproj" />
     <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_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value=".NETCoreApp,Version=v3.0" />
+    <option name="PROJECT_TFM" value="net6.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/Aaru.Server.Task/Program.cs b/Aaru.Server.Task/Program.cs
index 901ad23e..81f3337d 100644
--- a/Aaru.Server.Task/Program.cs
+++ b/Aaru.Server.Task/Program.cs
@@ -44,12 +44,12 @@ using Microsoft.EntityFrameworkCore;
 
 namespace Aaru.Server.Task;
 
-internal class Program
+class Program
 {
     public static void Main(string[] args)
     {
         DateTime start, end;
-        int      counter = 0;
+        var      counter = 0;
 
         start = DateTime.UtcNow;
         System.Console.WriteLine("{0}: Connecting to database...", DateTime.UtcNow);
@@ -75,10 +75,10 @@ internal class Program
             System.Console.WriteLine("{0}: Took {1:F2} seconds", end, (end - start).TotalSeconds);
 
             UsbVendor vendor           = null;
-            int       newVendors       = 0;
-            int       newProducts      = 0;
-            int       modifiedVendors  = 0;
-            int       modifiedProducts = 0;
+            var       newVendors       = 0;
+            var       newProducts      = 0;
+            var       modifiedVendors  = 0;
+            var       modifiedProducts = 0;
 
             start = DateTime.UtcNow;
             System.Console.WriteLine("{0}: Adding and updating database entries...", DateTime.UtcNow);
@@ -142,9 +142,10 @@ internal class Program
                     else if(name != product.Product)
                     {
                         System.Console.
-                               WriteLine("{0}: Will modify product with ID {1:X4} and vendor {2} ({3:X4}) from \"{4}\" to \"{5}\"",
-                                         DateTime.UtcNow, product.ProductId, product.Vendor?.Vendor ?? "null",
-                                         product.Vendor?.VendorId ?? 0, product.Product, name);
+                               WriteLine(
+                                   "{0}: Will modify product with ID {1:X4} and vendor {2} ({3:X4}) from \"{4}\" to \"{5}\"",
+                                   DateTime.UtcNow, product.ProductId, product.Vendor?.Vendor ?? "null",
+                                   product.Vendor?.VendorId ?? 0, product.Product, name);
 
                         product.Product      = name;
                         product.ModifiedWhen = DateTime.UtcNow;
@@ -203,9 +204,9 @@ internal class Program
             end = DateTime.UtcNow;
             System.Console.WriteLine("{0}: Took {1:F2} seconds", end, (end - start).TotalSeconds);
 
-            System.Console.WriteLine("{0}: {1} vendors added.", DateTime.UtcNow, newVendors);
-            System.Console.WriteLine("{0}: {1} products added.", DateTime.UtcNow, newProducts);
-            System.Console.WriteLine("{0}: {1} vendors modified.", DateTime.UtcNow, modifiedVendors);
+            System.Console.WriteLine("{0}: {1} vendors added.",     DateTime.UtcNow, newVendors);
+            System.Console.WriteLine("{0}: {1} products added.",    DateTime.UtcNow, newProducts);
+            System.Console.WriteLine("{0}: {1} vendors modified.",  DateTime.UtcNow, modifiedVendors);
             System.Console.WriteLine("{0}: {1} products modified.", DateTime.UtcNow, modifiedProducts);
 
             System.Console.WriteLine("{0}: Looking up a vendor", DateTime.UtcNow);
@@ -276,10 +277,10 @@ internal class Program
             doc.LoadHtml(html);
             HtmlNode firstTable = doc.DocumentNode.SelectSingleNode("/html[1]/body[1]/table[1]");
 
-            bool firstRow = true;
+            var firstRow = true;
 
-            int addedOffsets    = 0;
-            int modifiedOffsets = 0;
+            var addedOffsets    = 0;
+            var modifiedOffsets = 0;
 
             System.Console.WriteLine("{0}: Processing offsets...", DateTime.UtcNow);
             start = DateTime.UtcNow;
@@ -525,7 +526,7 @@ internal class Program
             end = DateTime.UtcNow;
             System.Console.WriteLine("{0}: Took {1:F2} seconds", end, (end - start).TotalSeconds);
 
-            System.Console.WriteLine("{0}: Added {1} offsets", end, addedOffsets);
+            System.Console.WriteLine("{0}: Added {1} offsets",    end, addedOffsets);
             System.Console.WriteLine("{0}: Modified {1} offsets", end, modifiedOffsets);
         }
         catch(Exception ex)
@@ -542,8 +543,8 @@ internal class Program
 
         System.Console.WriteLine("{0}: Reading iNES/NES 2.0 headers...", DateTime.UtcNow);
         start = DateTime.UtcNow;
-        int newHeaders     = 0;
-        int updatedHeaders = 0;
+        var newHeaders     = 0;
+        var updatedHeaders = 0;
         counter = 0;
 
         foreach(string file in Directory.GetFiles("nes"))
@@ -555,11 +556,11 @@ internal class Program
                 if(fs.Length <= 16)
                     continue;
 
-                byte[] header = new byte[16];
-                byte[] data   = new byte[fs.Length - 16];
+                var header = new byte[16];
+                var data   = new byte[fs.Length - 16];
 
                 fs.Read(header, 0, 16);
-                fs.Read(data, 0, data.Length);
+                fs.Read(data,   0, data.Length);
 
                 bool ines;
                 bool nes20;
@@ -607,15 +608,15 @@ internal class Program
 
                 var    hasher    = SHA256.Create();
                 byte[] hashBytes = hasher.ComputeHash(data);
-                char[] hashChars = new char[64];
+                var    hashChars = new char[64];
 
-                for(int i = 0; i < 32; i++)
+                for(var i = 0; i < 32; i++)
                 {
                     int a = hashBytes[i] >> 4;
                     int b = hashBytes[i] & 0xF;
 
                     hashChars[i * 2] = a > 9 ? (char)(a + 0x57) : (char)(a      + 0x30);
-                    hashChars[(i * 2)                   + 1] = b > 9 ? (char)(b + 0x57) : (char)(b + 0x30);
+                    hashChars[i * 2                     + 1] = b > 9 ? (char)(b + 0x57) : (char)(b + 0x30);
                 }
 
                 info.Sha256 = new string(hashChars);
@@ -632,7 +633,7 @@ internal class Program
                     continue;
                 }
 
-                bool modified = false;
+                var modified = false;
 
                 if(existing.NametableMirroring != info.NametableMirroring)
                 {
@@ -720,8 +721,8 @@ internal class Program
         System.Console.WriteLine("{0}: Took {1:F2} seconds", end, (end - start).TotalSeconds);
 
         System.Console.WriteLine("{0}: Processed {1} iNES/NES 2.0 headers...", DateTime.UtcNow, counter);
-        System.Console.WriteLine("{0}: Added {1} iNES/NES 2.0 headers...", DateTime.UtcNow, newHeaders);
-        System.Console.WriteLine("{0}: Updated {1} iNES/NES 2.0 headers...", DateTime.UtcNow, updatedHeaders);
+        System.Console.WriteLine("{0}: Added {1} iNES/NES 2.0 headers...",     DateTime.UtcNow, newHeaders);
+        System.Console.WriteLine("{0}: Updated {1} iNES/NES 2.0 headers...",   DateTime.UtcNow, updatedHeaders);
 
         System.Console.WriteLine("{0}: Committing changes...", DateTime.UtcNow);
         start = DateTime.UtcNow;
diff --git a/Aaru.Server.Task/appsettings.json b/Aaru.Server.Task/appsettings.json
index e20b6006..19c8f3a7 100644
--- a/Aaru.Server.Task/appsettings.json
+++ b/Aaru.Server.Task/appsettings.json
@@ -1,6 +1,6 @@
 {
   "ConnectionStrings": {
-    "DefaultConnection": "server=localhost;port=3306;database=discimagechef;uid=dic;password=dicpass"
+    "DefaultConnection": "server=zeus.claunia.com;port=3306;database=discimagechef;uid=dic;password=dicpass"
   },
   "Logging": {
     "LogLevel": {
diff --git a/Aaru.Server/Aaru.Server.csproj b/Aaru.Server/Aaru.Server.csproj
index 9a44b0bd..ff1415dd 100644
--- a/Aaru.Server/Aaru.Server.csproj
+++ b/Aaru.Server/Aaru.Server.csproj
@@ -24,25 +24,25 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Aaru.CommonTypes" Version="6.0.0-alpha8" />
-    <PackageReference Include="Aaru.Decoders" Version="6.0.0-alpha8" />
-    <PackageReference Include="Aaru.Dto" Version="6.0.0-alpha8" />
-    <PackageReference Include="Aaru.Helpers" Version="6.0.0-alpha8" />
-    <PackageReference Include="ChoPGP" Version="1.0.1.5" />
-    <PackageReference Include="MailKit" Version="2.15.0" />
-    <PackageReference Include="Markdig" Version="0.26.0" />
-    <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="6.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="6.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.0" />
-    <PackageReference Include="MimeKit" Version="2.15.1" />
-    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="6.0.0" />
-    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql.Design" Version="1.1.2" />
-    <PackageReference Include="prometheus-net.AspNetCore" Version="5.0.2" />
-    <PackageReference Include="Unclassified.NetRevisionTask" Version="0.4.2" PrivateAssets="all" />
+    <PackageReference Include="Aaru.CommonTypes" Version="6.0.0-alpha8"/>
+    <PackageReference Include="Aaru.Decoders" Version="6.0.0-alpha8"/>
+    <PackageReference Include="Aaru.Dto" Version="6.0.0-alpha8"/>
+    <PackageReference Include="Aaru.Helpers" Version="6.0.0-alpha8"/>
+    <PackageReference Include="ChoPGP" Version="1.0.1.5"/>
+    <PackageReference Include="MailKit" Version="2.15.0"/>
+    <PackageReference Include="Markdig" Version="0.26.0"/>
+    <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0"/>
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.0"/>
+    <PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="6.0.0"/>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.0"/>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="6.0.0"/>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0"/>
+    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.0"/>
+    <PackageReference Include="MimeKit" Version="2.15.1"/>
+    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="6.0.0"/>
+    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql.Design" Version="1.1.2"/>
+    <PackageReference Include="prometheus-net.AspNetCore" Version="5.0.2"/>
+    <PackageReference Include="Unclassified.NetRevisionTask" Version="0.4.2" PrivateAssets="all"/>
   </ItemGroup>
 
   <ItemGroup>
@@ -76,60 +76,60 @@
     <None Update="aaru-server.service">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="wwwroot\favicon.ico" />
-    <None Include="wwwroot\fonts\.htaccess" />
-    <None Include="wwwroot\fonts\ChicagoFLF.eot" />
-    <None Include="wwwroot\fonts\ChicagoFLF.ttf" />
-    <None Include="wwwroot\fonts\ChicagoFLF.woff" />
-    <None Include="wwwroot\fonts\ChicagoFLF.woff2" />
-    <None Include="wwwroot\fonts\Topaz_a500_v1.0.eot" />
-    <None Include="wwwroot\fonts\Topaz_a500_v1.0.ttf" />
-    <None Include="wwwroot\fonts\Topaz_a500_v1.0.woff" />
-    <None Include="wwwroot\fonts\Topaz_a500_v1.0.woff2" />
-    <None Include="wwwroot\fonts\vga_squarepx.eot" />
-    <None Include="wwwroot\fonts\vga_squarepx.ttf" />
-    <None Include="wwwroot\fonts\vga_squarepx.woff" />
-    <None Include="wwwroot\fonts\vga_squarepx.woff2" />
-    <None Include="wwwroot\jquery-validation-unobtrusive\jquery.validate.unobtrusive.js" />
-    <None Include="wwwroot\jquery-validation-unobtrusive\jquery.validate.unobtrusive.min.js" />
-    <None Include="wwwroot\jquery-validation-unobtrusive\LICENSE.txt" />
-    <None Include="wwwroot\jquery-validation\dist\additional-methods.js" />
-    <None Include="wwwroot\jquery-validation\dist\additional-methods.min.js" />
-    <None Include="wwwroot\jquery-validation\dist\jquery.validate.js" />
-    <None Include="wwwroot\jquery-validation\dist\jquery.validate.min.js" />
-    <None Include="wwwroot\jquery-validation\LICENSE.md" />
+    <None Include="wwwroot\favicon.ico"/>
+    <None Include="wwwroot\fonts\.htaccess"/>
+    <None Include="wwwroot\fonts\ChicagoFLF.eot"/>
+    <None Include="wwwroot\fonts\ChicagoFLF.ttf"/>
+    <None Include="wwwroot\fonts\ChicagoFLF.woff"/>
+    <None Include="wwwroot\fonts\ChicagoFLF.woff2"/>
+    <None Include="wwwroot\fonts\Topaz_a500_v1.0.eot"/>
+    <None Include="wwwroot\fonts\Topaz_a500_v1.0.ttf"/>
+    <None Include="wwwroot\fonts\Topaz_a500_v1.0.woff"/>
+    <None Include="wwwroot\fonts\Topaz_a500_v1.0.woff2"/>
+    <None Include="wwwroot\fonts\vga_squarepx.eot"/>
+    <None Include="wwwroot\fonts\vga_squarepx.ttf"/>
+    <None Include="wwwroot\fonts\vga_squarepx.woff"/>
+    <None Include="wwwroot\fonts\vga_squarepx.woff2"/>
+    <None Include="wwwroot\jquery-validation-unobtrusive\jquery.validate.unobtrusive.js"/>
+    <None Include="wwwroot\jquery-validation-unobtrusive\jquery.validate.unobtrusive.min.js"/>
+    <None Include="wwwroot\jquery-validation-unobtrusive\LICENSE.txt"/>
+    <None Include="wwwroot\jquery-validation\dist\additional-methods.js"/>
+    <None Include="wwwroot\jquery-validation\dist\additional-methods.min.js"/>
+    <None Include="wwwroot\jquery-validation\dist\jquery.validate.js"/>
+    <None Include="wwwroot\jquery-validation\dist\jquery.validate.min.js"/>
+    <None Include="wwwroot\jquery-validation\LICENSE.md"/>
   </ItemGroup>
 
   <ItemGroup>
-    <_ContentIncludedByDefault Remove="wwwroot\js\site.js" />
-    <_ContentIncludedByDefault Remove="wwwroot\css\js\colors\dos.js" />
-    <_ContentIncludedByDefault Remove="wwwroot\css\js\colors\mac.js" />
-    <_ContentIncludedByDefault Remove="Areas\Admin\Shared\Error.cshtml" />
-    <_ContentIncludedByDefault Remove="Areas\Admin\Shared\_CookieConsentPartial.cshtml" />
-    <_ContentIncludedByDefault Remove="Areas\Admin\Shared\_Layout.cshtml" />
-    <_ContentIncludedByDefault Remove="Areas\Admin\Shared\_LoginPartial.cshtml" />
-    <_ContentIncludedByDefault Remove="Areas\Admin\Shared\_ValidationScriptsPartial.cshtml" />
-    <_ContentIncludedByDefault Remove="Areas\Admin\Views\Device\Create.cshtml" />
-    <_ContentIncludedByDefault Remove="Areas\Admin\Views\Device\Delete.cshtml" />
-    <_ContentIncludedByDefault Remove="Areas\Admin\Views\Device\Details.cshtml" />
-    <_ContentIncludedByDefault Remove="Areas\Admin\Views\Device\Edit.cshtml" />
-    <_ContentIncludedByDefault Remove="Areas\Admin\Views\Device\Index.cshtml" />
-    <_ContentIncludedByDefault Remove="Areas\Admin\Views\Atas\EditorTemplates\IdHashModel.cshtml" />
-    <_ContentIncludedByDefault Remove="Views\Home\Changelog.cshtml" />
-    <_ContentIncludedByDefault Remove="Views\Home\CODE_OF_CONDUCT.cshtml" />
-    <_ContentIncludedByDefault Remove="Views\Home\CONTRIBUTING.cshtml" />
-    <_ContentIncludedByDefault Remove="Views\Home\ISSUE_TEMPLATE.cshtml" />
-    <_ContentIncludedByDefault Remove="Views\Home\NEEDED.cshtml" />
-    <_ContentIncludedByDefault Remove="Views\Home\NEEDINFO.cshtml" />
-    <_ContentIncludedByDefault Remove="Views\Home\PULL_REQUEST_TEMPLATE.cshtml" />
+    <_ContentIncludedByDefault Remove="wwwroot\js\site.js"/>
+    <_ContentIncludedByDefault Remove="wwwroot\css\js\colors\dos.js"/>
+    <_ContentIncludedByDefault Remove="wwwroot\css\js\colors\mac.js"/>
+    <_ContentIncludedByDefault Remove="Areas\Admin\Shared\Error.cshtml"/>
+    <_ContentIncludedByDefault Remove="Areas\Admin\Shared\_CookieConsentPartial.cshtml"/>
+    <_ContentIncludedByDefault Remove="Areas\Admin\Shared\_Layout.cshtml"/>
+    <_ContentIncludedByDefault Remove="Areas\Admin\Shared\_LoginPartial.cshtml"/>
+    <_ContentIncludedByDefault Remove="Areas\Admin\Shared\_ValidationScriptsPartial.cshtml"/>
+    <_ContentIncludedByDefault Remove="Areas\Admin\Views\Device\Create.cshtml"/>
+    <_ContentIncludedByDefault Remove="Areas\Admin\Views\Device\Delete.cshtml"/>
+    <_ContentIncludedByDefault Remove="Areas\Admin\Views\Device\Details.cshtml"/>
+    <_ContentIncludedByDefault Remove="Areas\Admin\Views\Device\Edit.cshtml"/>
+    <_ContentIncludedByDefault Remove="Areas\Admin\Views\Device\Index.cshtml"/>
+    <_ContentIncludedByDefault Remove="Areas\Admin\Views\Atas\EditorTemplates\IdHashModel.cshtml"/>
+    <_ContentIncludedByDefault Remove="Views\Home\Changelog.cshtml"/>
+    <_ContentIncludedByDefault Remove="Views\Home\CODE_OF_CONDUCT.cshtml"/>
+    <_ContentIncludedByDefault Remove="Views\Home\CONTRIBUTING.cshtml"/>
+    <_ContentIncludedByDefault Remove="Views\Home\ISSUE_TEMPLATE.cshtml"/>
+    <_ContentIncludedByDefault Remove="Views\Home\NEEDED.cshtml"/>
+    <_ContentIncludedByDefault Remove="Views\Home\NEEDINFO.cshtml"/>
+    <_ContentIncludedByDefault Remove="Views\Home\PULL_REQUEST_TEMPLATE.cshtml"/>
   </ItemGroup>
 
   <ItemGroup>
-    <UpToDateCheckInput Remove="Areas\Admin\Shared\Error.cshtml" />
-    <UpToDateCheckInput Remove="Areas\Admin\Shared\_CookieConsentPartial.cshtml" />
-    <UpToDateCheckInput Remove="Areas\Admin\Shared\_Layout.cshtml" />
-    <UpToDateCheckInput Remove="Areas\Admin\Shared\_LoginPartial.cshtml" />
-    <UpToDateCheckInput Remove="Areas\Admin\Shared\_ValidationScriptsPartial.cshtml" />
+    <UpToDateCheckInput Remove="Areas\Admin\Shared\Error.cshtml"/>
+    <UpToDateCheckInput Remove="Areas\Admin\Shared\_CookieConsentPartial.cshtml"/>
+    <UpToDateCheckInput Remove="Areas\Admin\Shared\_Layout.cshtml"/>
+    <UpToDateCheckInput Remove="Areas\Admin\Shared\_LoginPartial.cshtml"/>
+    <UpToDateCheckInput Remove="Areas\Admin\Shared\_ValidationScriptsPartial.cshtml"/>
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Aaru.Server/Areas/Admin/Controllers/AtasController.cs b/Aaru.Server/Areas/Admin/Controllers/AtasController.cs
index a27bbadb..a29fa100 100644
--- a/Aaru.Server/Areas/Admin/Controllers/AtasController.cs
+++ b/Aaru.Server/Areas/Admin/Controllers/AtasController.cs
@@ -7,7 +7,8 @@ using TestedMedia = Aaru.CommonTypes.Metadata.TestedMedia;
 
 namespace Aaru.Server.Areas.Admin.Controllers;
 
-[Area("Admin"), Authorize]
+[Area("Admin")]
+[Authorize]
 public sealed class AtasController : Controller
 {
     readonly AaruServerContext _context;
@@ -22,16 +23,12 @@ public sealed class AtasController : Controller
     public async Task<IActionResult> Details(int? id)
     {
         if(id == null)
-        {
             return NotFound();
-        }
 
         Ata ata = await _context.Ata.FirstOrDefaultAsync(m => m.Id == id);
 
         if(ata == null)
-        {
             return NotFound();
-        }
 
         return View(ata);
     }
@@ -40,22 +37,20 @@ public sealed class AtasController : Controller
     public async Task<IActionResult> Delete(int? id)
     {
         if(id == null)
-        {
             return NotFound();
-        }
 
         Ata ata = await _context.Ata.FirstOrDefaultAsync(m => m.Id == id);
 
         if(ata == null)
-        {
             return NotFound();
-        }
 
         return View(ata);
     }
 
     // POST: Admin/Atas/Delete/5
-    [HttpPost, ActionName("Delete"), ValidateAntiForgeryToken]
+    [HttpPost]
+    [ActionName("Delete")]
+    [ValidateAntiForgeryToken]
     public async Task<IActionResult> DeleteConfirmed(int id)
     {
         Ata ata = await _context.Ata.FindAsync(id);
@@ -67,12 +62,12 @@ public sealed class AtasController : Controller
 
     public IActionResult Consolidate()
     {
-        List<IdHashModel> hashes = _context.Ata.Select(m => new IdHashModel(m.Id, Hash.Sha512(m.Identify))).ToList();
+        var hashes = _context.Ata.Select(m => new IdHashModel(m.Id, Hash.Sha512(m.Identify))).ToList();
 
-        List<IdHashModel> dups = hashes.GroupBy(x => x.Hash).Where(g => g.Count() > 1).
-                                        Select(x => hashes.FirstOrDefault(y => y.Hash == x.Key)).ToList();
+        var dups = hashes.GroupBy(x => x.Hash).Where(g => g.Count() > 1).
+                          Select(x => hashes.FirstOrDefault(y => y.Hash == x.Key)).ToList();
 
-        for(int i = 0; i < dups.Count; i++)
+        for(var i = 0; i < dups.Count; i++)
         {
             Ata unique = _context.Ata.First(a => a.Id == dups[i].Id);
 
@@ -87,7 +82,9 @@ public sealed class AtasController : Controller
         });
     }
 
-    [HttpPost, ActionName("Consolidate"), ValidateAntiForgeryToken]
+    [HttpPost]
+    [ActionName("Consolidate")]
+    [ValidateAntiForgeryToken]
     public IActionResult ConsolidateConfirmed(string models)
     {
         IdHashModel[] duplicates;
@@ -119,24 +116,16 @@ public sealed class AtasController : Controller
                     continue;
 
                 foreach(Device ataDevice in _context.Devices.Where(d => d.ATA.Id == duplicateId))
-                {
                     ataDevice.ATA = master;
-                }
 
                 foreach(Device atapiDevice in _context.Devices.Where(d => d.ATAPI.Id == duplicateId))
-                {
                     atapiDevice.ATAPI = master;
-                }
 
                 foreach(UploadedReport ataReport in _context.Reports.Where(d => d.ATA.Id == duplicateId))
-                {
                     ataReport.ATA = master;
-                }
 
                 foreach(UploadedReport atapiReport in _context.Reports.Where(d => d.ATAPI.Id == duplicateId))
-                {
                     atapiReport.ATAPI = master;
-                }
 
                 foreach(TestedMedia testedMedia in _context.TestedMedia.Where(d => d.AtaId == duplicateId))
                 {
@@ -162,40 +151,36 @@ public sealed class AtasController : Controller
         Ata master = _context.Ata.FirstOrDefault(m => m.Id == masterId);
 
         if(master is null)
+        {
             return RedirectToAction(nameof(Compare), new
             {
                 id      = masterId,
                 rightId = slaveId
             });
+        }
 
         Ata slave = _context.Ata.FirstOrDefault(m => m.Id == slaveId);
 
         if(slave is null)
+        {
             return RedirectToAction(nameof(Compare), new
             {
                 id      = masterId,
                 rightId = slaveId
             });
+        }
 
         foreach(Device ataDevice in _context.Devices.Where(d => d.ATA.Id == slaveId))
-        {
             ataDevice.ATA = master;
-        }
 
         foreach(Device atapiDevice in _context.Devices.Where(d => d.ATAPI.Id == slaveId))
-        {
             atapiDevice.ATAPI = master;
-        }
 
         foreach(UploadedReport ataReport in _context.Reports.Where(d => d.ATA.Id == slaveId))
-        {
             ataReport.ATA = master;
-        }
 
         foreach(UploadedReport atapiReport in _context.Reports.Where(d => d.ATAPI.Id == slaveId))
-        {
             atapiReport.ATAPI = master;
-        }
 
         foreach(TestedMedia testedMedia in _context.TestedMedia.Where(d => d.AtaId == slaveId))
         {
@@ -289,7 +274,8 @@ public sealed class AtasController : Controller
 
                 switch(la)
                 {
-                    case null when ra is null: continue;
+                    case null when ra is null:
+                        continue;
                     case null:
                         model.ValueNames.Add(fieldInfo.Name);
                         model.LeftValues.Add("null");
@@ -307,10 +293,10 @@ public sealed class AtasController : Controller
                     continue;
                 }
 
-                List<object> ll = la.Cast<object>().ToList();
-                List<object> rl = ra.Cast<object>().ToList();
+                var ll = la.Cast<object>().ToList();
+                var rl = ra.Cast<object>().ToList();
 
-                for(int i = 0; i < ll.Count; i++)
+                for(var i = 0; i < ll.Count; i++)
                 {
                     if(ll[i].Equals(rl[i]))
                         continue;
@@ -422,9 +408,7 @@ public sealed class AtasController : Controller
 
             if(tmp.All(b => b > 0x20) &&
                tmp.All(b => b <= 0x5F))
-            {
                 havePrivacy.Add(ata);
-            }
         }
 
         return View(havePrivacy);
@@ -438,16 +422,16 @@ public sealed class AtasController : Controller
             return RedirectToAction(nameof(CheckPrivate));
 
         // Serial number
-        for(int i = 0; i < 20; i++)
-            ata.Identify[(10 * 2) + i] = 0x20;
+        for(var i = 0; i < 20; i++)
+            ata.Identify[10 * 2 + i] = 0x20;
 
         // Media serial number
-        for(int i = 0; i < 40; i++)
-            ata.Identify[(176 * 2) + i] = 0x20;
+        for(var i = 0; i < 40; i++)
+            ata.Identify[176 * 2 + i] = 0x20;
 
         // WWN and WWN Extension
-        for(int i = 0; i < 16; i++)
-            ata.Identify[(108 * 2) + i] = 0;
+        for(var i = 0; i < 16; i++)
+            ata.Identify[108 * 2 + i] = 0;
 
         // We need to tell EFCore the entity has changed
         _context.Update(ata);
@@ -464,24 +448,24 @@ public sealed class AtasController : Controller
             return RedirectToAction(nameof(CheckPrivate));
 
         // ReservedWords121
-        for(int i = 0; i < 10; i++)
-            ata.Identify[(121 * 2) + i] = 0;
+        for(var i = 0; i < 10; i++)
+            ata.Identify[121 * 2 + i] = 0;
 
         // ReservedWords129
-        for(int i = 0; i < 40; i++)
-            ata.Identify[(129 * 2) + i] = 0;
+        for(var i = 0; i < 40; i++)
+            ata.Identify[129 * 2 + i] = 0;
 
         // ReservedCFA
-        for(int i = 0; i < 14; i++)
-            ata.Identify[(161 * 2) + i] = 0;
+        for(var i = 0; i < 14; i++)
+            ata.Identify[161 * 2 + i] = 0;
 
         // ReservedCEATA224
-        for(int i = 0; i < 12; i++)
-            ata.Identify[(224 * 2) + i] = 0;
+        for(var i = 0; i < 12; i++)
+            ata.Identify[224 * 2 + i] = 0;
 
         // ReservedWords
-        for(int i = 0; i < 14; i++)
-            ata.Identify[(161 * 2) + i] = 0;
+        for(var i = 0; i < 14; i++)
+            ata.Identify[161 * 2 + i] = 0;
 
         // We need to tell EFCore the entity has changed
         _context.Update(ata);
@@ -498,16 +482,16 @@ public sealed class AtasController : Controller
                 return RedirectToAction(nameof(CheckPrivate));
 
             // Serial number
-            for(int i = 0; i < 20; i++)
-                ata.Identify[(10 * 2) + i] = 0x20;
+            for(var i = 0; i < 20; i++)
+                ata.Identify[10 * 2 + i] = 0x20;
 
             // Media serial number
-            for(int i = 0; i < 40; i++)
-                ata.Identify[(176 * 2) + i] = 0x20;
+            for(var i = 0; i < 40; i++)
+                ata.Identify[176 * 2 + i] = 0x20;
 
             // WWN and WWN Extension
-            for(int i = 0; i < 16; i++)
-                ata.Identify[(108 * 2) + i] = 0;
+            for(var i = 0; i < 16; i++)
+                ata.Identify[108 * 2 + i] = 0;
 
             // We need to tell EFCore the entity has changed
             _context.Update(ata);
@@ -523,24 +507,24 @@ public sealed class AtasController : Controller
         foreach(Ata ata in _context.Ata)
         {
             // ReservedWords121
-            for(int i = 0; i < 10; i++)
-                ata.Identify[(121 * 2) + i] = 0;
+            for(var i = 0; i < 10; i++)
+                ata.Identify[121 * 2 + i] = 0;
 
             // ReservedWords129
-            for(int i = 0; i < 40; i++)
-                ata.Identify[(129 * 2) + i] = 0;
+            for(var i = 0; i < 40; i++)
+                ata.Identify[129 * 2 + i] = 0;
 
             // ReservedCFA
-            for(int i = 0; i < 14; i++)
-                ata.Identify[(161 * 2) + i] = 0;
+            for(var i = 0; i < 14; i++)
+                ata.Identify[161 * 2 + i] = 0;
 
             // ReservedCEATA224
-            for(int i = 0; i < 12; i++)
-                ata.Identify[(224 * 2) + i] = 0;
+            for(var i = 0; i < 12; i++)
+                ata.Identify[224 * 2 + i] = 0;
 
             // ReservedWords
-            for(int i = 0; i < 14; i++)
-                ata.Identify[(161 * 2) + i] = 0;
+            for(var i = 0; i < 14; i++)
+                ata.Identify[161 * 2 + i] = 0;
 
             // We need to tell EFCore the entity has changed
             _context.Update(ata);
diff --git a/Aaru.Server/Areas/Admin/Controllers/BlockDescriptorsController.cs b/Aaru.Server/Areas/Admin/Controllers/BlockDescriptorsController.cs
index 7b1cda32..04281a99 100644
--- a/Aaru.Server/Areas/Admin/Controllers/BlockDescriptorsController.cs
+++ b/Aaru.Server/Areas/Admin/Controllers/BlockDescriptorsController.cs
@@ -1,6 +1,7 @@
 namespace Aaru.Server.Areas.Admin.Controllers;
 
-[Area("Admin"), Authorize]
+[Area("Admin")]
+[Authorize]
 public sealed class BlockDescriptorsController : Controller
 {
     readonly AaruServerContext _context;
diff --git a/Aaru.Server/Areas/Admin/Controllers/ChsController.cs b/Aaru.Server/Areas/Admin/Controllers/ChsController.cs
index 3d952d0a..faa2e2b1 100644
--- a/Aaru.Server/Areas/Admin/Controllers/ChsController.cs
+++ b/Aaru.Server/Areas/Admin/Controllers/ChsController.cs
@@ -3,7 +3,8 @@ using Newtonsoft.Json;
 
 namespace Aaru.Server.Areas.Admin.Controllers;
 
-[Area("Admin"), Authorize]
+[Area("Admin")]
+[Authorize]
 public sealed class ChsController : Controller
 {
     readonly AaruServerContext _context;
@@ -16,7 +17,7 @@ public sealed class ChsController : Controller
 
     public IActionResult Consolidate()
     {
-        List<ChsModel> dups = _context.Chs.GroupBy(x => new
+        var dups = _context.Chs.GroupBy(x => new
         {
             x.Cylinders,
             x.Heads,
@@ -35,7 +36,9 @@ public sealed class ChsController : Controller
         });
     }
 
-    [HttpPost, ActionName("Consolidate"), ValidateAntiForgeryToken]
+    [HttpPost]
+    [ActionName("Consolidate")]
+    [ValidateAntiForgeryToken]
     public IActionResult ConsolidateConfirmed(string models)
     {
         ChsModel[] duplicates;
@@ -65,14 +68,10 @@ public sealed class ChsController : Controller
                                         Skip(1).ToArray())
             {
                 foreach(TestedMedia media in _context.TestedMedia.Where(d => d.CHS.Id == chs.Id))
-                {
                     media.CHS = master;
-                }
 
                 foreach(TestedMedia media in _context.TestedMedia.Where(d => d.CurrentCHS.Id == chs.Id))
-                {
                     media.CurrentCHS = master;
-                }
 
                 _context.Chs.Remove(chs);
             }
diff --git a/Aaru.Server/Areas/Admin/Controllers/CommandsController.cs b/Aaru.Server/Areas/Admin/Controllers/CommandsController.cs
index ff47a82f..5bf9ec0c 100644
--- a/Aaru.Server/Areas/Admin/Controllers/CommandsController.cs
+++ b/Aaru.Server/Areas/Admin/Controllers/CommandsController.cs
@@ -1,6 +1,7 @@
 namespace Aaru.Server.Areas.Admin.Controllers;
 
-[Area("Admin"), Authorize]
+[Area("Admin")]
+[Authorize]
 public sealed class CommandsController : Controller
 {
     readonly AaruServerContext _context;
diff --git a/Aaru.Server/Areas/Admin/Controllers/CompactDiscOffsetsController.cs b/Aaru.Server/Areas/Admin/Controllers/CompactDiscOffsetsController.cs
index 6566257d..ab77c502 100644
--- a/Aaru.Server/Areas/Admin/Controllers/CompactDiscOffsetsController.cs
+++ b/Aaru.Server/Areas/Admin/Controllers/CompactDiscOffsetsController.cs
@@ -1,6 +1,7 @@
 namespace Aaru.Server.Areas.Admin.Controllers;
 
-[Area("Admin"), Authorize]
+[Area("Admin")]
+[Authorize]
 public sealed class CompactDiscOffsetsController : Controller
 {
     readonly AaruServerContext _context;
@@ -16,16 +17,12 @@ public sealed class CompactDiscOffsetsController : Controller
     public async Task<IActionResult> Edit(int? id)
     {
         if(id == null)
-        {
             return NotFound();
-        }
 
         CompactDiscOffset compactDiscOffset = await _context.CdOffsets.FindAsync(id);
 
         if(compactDiscOffset == null)
-        {
             return NotFound();
-        }
 
         return View(compactDiscOffset);
     }
@@ -33,7 +30,8 @@ public sealed class CompactDiscOffsetsController : Controller
     // POST: Admin/CompactDiscOffsets/Edit/5
     // To protect from overposting attacks, please enable the specific properties you want to bind to, for
     // more details see http://go.microsoft.com/fwlink/?LinkId=317598.
-    [HttpPost, ValidateAntiForgeryToken]
+    [HttpPost]
+    [ValidateAntiForgeryToken]
     public async Task<IActionResult> Edit(
         int id, [Bind("Id,Manufacturer,Model,Offset,Submissions,Agreement")] CompactDiscOffset changedModel)
     {
@@ -72,22 +70,20 @@ public sealed class CompactDiscOffsetsController : Controller
     public async Task<IActionResult> Delete(int? id)
     {
         if(id == null)
-        {
             return NotFound();
-        }
 
         CompactDiscOffset compactDiscOffset = await _context.CdOffsets.FirstOrDefaultAsync(m => m.Id == id);
 
         if(compactDiscOffset == null)
-        {
             return NotFound();
-        }
 
         return View(compactDiscOffset);
     }
 
     // POST: Admin/CompactDiscOffsets/Delete/5
-    [HttpPost, ActionName("Delete"), ValidateAntiForgeryToken]
+    [HttpPost]
+    [ActionName("Delete")]
+    [ValidateAntiForgeryToken]
     public async Task<IActionResult> DeleteConfirmed(int id)
     {
         CompactDiscOffset compactDiscOffset = await _context.CdOffsets.FindAsync(id);
diff --git a/Aaru.Server/Areas/Admin/Controllers/DeviceStatsController.cs b/Aaru.Server/Areas/Admin/Controllers/DeviceStatsController.cs
index 2b6144e8..32a2fa0c 100644
--- a/Aaru.Server/Areas/Admin/Controllers/DeviceStatsController.cs
+++ b/Aaru.Server/Areas/Admin/Controllers/DeviceStatsController.cs
@@ -1,6 +1,7 @@
 namespace Aaru.Server.Areas.Admin.Controllers;
 
-[Area("Admin"), Authorize]
+[Area("Admin")]
+[Authorize]
 public sealed class DeviceStatsController : Controller
 {
     readonly AaruServerContext _context;
@@ -16,16 +17,12 @@ public sealed class DeviceStatsController : Controller
     public async Task<IActionResult> Edit(int? id)
     {
         if(id == null)
-        {
             return NotFound();
-        }
 
         DeviceStat deviceStat = await _context.DeviceStats.FindAsync(id);
 
         if(deviceStat == null)
-        {
             return NotFound();
-        }
 
         return View(deviceStat);
     }
@@ -33,7 +30,8 @@ public sealed class DeviceStatsController : Controller
     // POST: Admin/DeviceStats/Edit/5
     // To protect from overposting attacks, please enable the specific properties you want to bind to, for
     // more details see http://go.microsoft.com/fwlink/?LinkId=317598.
-    [HttpPost, ValidateAntiForgeryToken]
+    [HttpPost]
+    [ValidateAntiForgeryToken]
     public async Task<IActionResult> Edit(int id, [Bind("Id,Manufacturer,Model,Revision,Bus")] DeviceStat changedModel)
     {
         if(id != changedModel.Id)
@@ -69,22 +67,20 @@ public sealed class DeviceStatsController : Controller
     public async Task<IActionResult> Delete(int? id)
     {
         if(id == null)
-        {
             return NotFound();
-        }
 
         DeviceStat deviceStat = await _context.DeviceStats.FirstOrDefaultAsync(m => m.Id == id);
 
         if(deviceStat == null)
-        {
             return NotFound();
-        }
 
         return View(deviceStat);
     }
 
     // POST: Admin/DeviceStats/Delete/5
-    [HttpPost, ActionName("Delete"), ValidateAntiForgeryToken]
+    [HttpPost]
+    [ActionName("Delete")]
+    [ValidateAntiForgeryToken]
     public async Task<IActionResult> DeleteConfirmed(int id)
     {
         DeviceStat deviceStat = await _context.DeviceStats.FindAsync(id);
diff --git a/Aaru.Server/Areas/Admin/Controllers/DevicesController.cs b/Aaru.Server/Areas/Admin/Controllers/DevicesController.cs
index 58a397c2..74e84a95 100644
--- a/Aaru.Server/Areas/Admin/Controllers/DevicesController.cs
+++ b/Aaru.Server/Areas/Admin/Controllers/DevicesController.cs
@@ -2,7 +2,8 @@ using Aaru.CommonTypes.Metadata;
 
 namespace Aaru.Server.Areas.Admin.Controllers;
 
-[Area("Admin"), Authorize]
+[Area("Admin")]
+[Authorize]
 public sealed class DevicesController : Controller
 {
     readonly AaruServerContext _context;
@@ -19,9 +20,7 @@ public sealed class DevicesController : Controller
     public async Task<IActionResult> Details(int? id)
     {
         if(id == null)
-        {
             return NotFound();
-        }
 
         var model = new DeviceDetails
         {
@@ -29,9 +28,7 @@ public sealed class DevicesController : Controller
         };
 
         if(model.Report is null)
-        {
             return NotFound();
-        }
 
         model.ReportAll = _context.Reports.
                                    Where(d => d.Manufacturer == model.Report.Manufacturer &&
@@ -90,16 +87,12 @@ public sealed class DevicesController : Controller
     public async Task<IActionResult> Edit(int? id)
     {
         if(id == null)
-        {
             return NotFound();
-        }
 
         Device device = await _context.Devices.FindAsync(id);
 
         if(device == null)
-        {
             return NotFound();
-        }
 
         return View(device);
     }
@@ -107,10 +100,12 @@ public sealed class DevicesController : Controller
     // POST: Admin/Devices/Edit/5
     // To protect from overposting attacks, please enable the specific properties you want to bind to, for
     // more details see http://go.microsoft.com/fwlink/?LinkId=317598.
-    [HttpPost, ValidateAntiForgeryToken]
+    [HttpPost]
+    [ValidateAntiForgeryToken]
     public async Task<IActionResult> Edit(
         int id,
-        [Bind("OptimalMultipleSectorsRead,Id,CompactFlash,Manufacturer,Model,Revision,Type")] Device changedModel)
+        [Bind("OptimalMultipleSectorsRead,Id,CompactFlash,Manufacturer,Model,Revision,Type")]
+        Device changedModel)
     {
         if(id != changedModel.Id)
             return NotFound();
@@ -149,22 +144,20 @@ public sealed class DevicesController : Controller
     public async Task<IActionResult> Delete(int? id)
     {
         if(id == null)
-        {
             return NotFound();
-        }
 
         Device device = await _context.Devices.FirstOrDefaultAsync(m => m.Id == id);
 
         if(device == null)
-        {
             return NotFound();
-        }
 
         return View(device);
     }
 
     // POST: Admin/Devices/Delete/5
-    [HttpPost, ActionName("Delete"), ValidateAntiForgeryToken]
+    [HttpPost]
+    [ActionName("Delete")]
+    [ValidateAntiForgeryToken]
     public async Task<IActionResult> DeleteConfirmed(int id)
     {
         Device device = await _context.Devices.FindAsync(id);
@@ -329,7 +322,7 @@ public sealed class DevicesController : Controller
                     report.SCSI?.MultiMediaDevice != null)
             {
                 foreach(TestedMedia testedMedia in _context.TestedMedia.Where(d => d.MmcId == report.SCSI.
-                                                                                  MultiMediaDevice.Id))
+                                                                                      MultiMediaDevice.Id))
                 {
                     testedMedia.MmcId = device.SCSI.MultiMediaDevice.Id;
                     _context.Update(testedMedia);
diff --git a/Aaru.Server/Areas/Admin/Controllers/FilesystemsController.cs b/Aaru.Server/Areas/Admin/Controllers/FilesystemsController.cs
index c5ffc2ef..1fdb98e7 100644
--- a/Aaru.Server/Areas/Admin/Controllers/FilesystemsController.cs
+++ b/Aaru.Server/Areas/Admin/Controllers/FilesystemsController.cs
@@ -1,6 +1,7 @@
 namespace Aaru.Server.Areas.Admin.Controllers;
 
-[Area("Admin"), Authorize]
+[Area("Admin")]
+[Authorize]
 public sealed class FilesystemsController : Controller
 {
     readonly AaruServerContext _context;
diff --git a/Aaru.Server/Areas/Admin/Controllers/FiltersController.cs b/Aaru.Server/Areas/Admin/Controllers/FiltersController.cs
index f82d0828..3de1f2cd 100644
--- a/Aaru.Server/Areas/Admin/Controllers/FiltersController.cs
+++ b/Aaru.Server/Areas/Admin/Controllers/FiltersController.cs
@@ -1,6 +1,7 @@
 namespace Aaru.Server.Areas.Admin.Controllers;
 
-[Area("Admin"), Authorize]
+[Area("Admin")]
+[Authorize]
 public sealed class FiltersController : Controller
 {
     readonly AaruServerContext _context;
diff --git a/Aaru.Server/Areas/Admin/Controllers/FireWiresController.cs b/Aaru.Server/Areas/Admin/Controllers/FireWiresController.cs
index 813873ce..1780b6c1 100644
--- a/Aaru.Server/Areas/Admin/Controllers/FireWiresController.cs
+++ b/Aaru.Server/Areas/Admin/Controllers/FireWiresController.cs
@@ -3,7 +3,8 @@ using Newtonsoft.Json;
 
 namespace Aaru.Server.Areas.Admin.Controllers;
 
-[Area("Admin"), Authorize]
+[Area("Admin")]
+[Authorize]
 public sealed class FireWiresController : Controller
 {
     readonly AaruServerContext _context;
@@ -18,16 +19,12 @@ public sealed class FireWiresController : Controller
     public async Task<IActionResult> Edit(int? id)
     {
         if(id == null)
-        {
             return NotFound();
-        }
 
         FireWire fireWire = await _context.FireWire.FindAsync(id);
 
         if(fireWire == null)
-        {
             return NotFound();
-        }
 
         return View(fireWire);
     }
@@ -35,7 +32,8 @@ public sealed class FireWiresController : Controller
     // POST: Admin/FireWires/Edit/5
     // To protect from overposting attacks, please enable the specific properties you want to bind to, for
     // more details see http://go.microsoft.com/fwlink/?LinkId=317598.
-    [HttpPost, ValidateAntiForgeryToken]
+    [HttpPost]
+    [ValidateAntiForgeryToken]
     public async Task<IActionResult> Edit(
         int id, [Bind("Id,VendorID,ProductID,Manufacturer,Product,RemovableMedia")] FireWire changedModel)
     {
@@ -73,22 +71,20 @@ public sealed class FireWiresController : Controller
     public async Task<IActionResult> Delete(int? id)
     {
         if(id == null)
-        {
             return NotFound();
-        }
 
         FireWire fireWire = await _context.FireWire.FirstOrDefaultAsync(m => m.Id == id);
 
         if(fireWire == null)
-        {
             return NotFound();
-        }
 
         return View(fireWire);
     }
 
     // POST: Admin/FireWires/Delete/5
-    [HttpPost, ActionName("Delete"), ValidateAntiForgeryToken]
+    [HttpPost]
+    [ActionName("Delete")]
+    [ValidateAntiForgeryToken]
     public async Task<IActionResult> DeleteConfirmed(int id)
     {
         FireWire fireWire = await _context.FireWire.FindAsync(id);
@@ -102,7 +98,7 @@ public sealed class FireWiresController : Controller
 
     public IActionResult Consolidate()
     {
-        List<FireWireModel> dups = _context.FireWire.GroupBy(x => new
+        var dups = _context.FireWire.GroupBy(x => new
         {
             x.VendorID,
             x.ProductID,
@@ -125,7 +121,9 @@ public sealed class FireWiresController : Controller
         });
     }
 
-    [HttpPost, ActionName("Consolidate"), ValidateAntiForgeryToken]
+    [HttpPost]
+    [ActionName("Consolidate")]
+    [ValidateAntiForgeryToken]
     public IActionResult ConsolidateConfirmed(string models)
     {
         FireWireModel[] duplicates;
@@ -161,14 +159,10 @@ public sealed class FireWiresController : Controller
                                                   Skip(1).ToArray())
             {
                 foreach(Device device in _context.Devices.Where(d => d.FireWire.Id == firewire.Id))
-                {
                     device.FireWire = master;
-                }
 
                 foreach(UploadedReport report in _context.Reports.Where(d => d.FireWire.Id == firewire.Id))
-                {
                     report.FireWire = master;
-                }
 
                 _context.FireWire.Remove(firewire);
             }
diff --git a/Aaru.Server/Areas/Admin/Controllers/GdRomSwapDiscCapabilitiesController.cs b/Aaru.Server/Areas/Admin/Controllers/GdRomSwapDiscCapabilitiesController.cs
index 5f9b75d0..6fb0ccbd 100644
--- a/Aaru.Server/Areas/Admin/Controllers/GdRomSwapDiscCapabilitiesController.cs
+++ b/Aaru.Server/Areas/Admin/Controllers/GdRomSwapDiscCapabilitiesController.cs
@@ -6,7 +6,8 @@ using Aaru.Helpers;
 
 namespace Aaru.Server.Areas.Admin.Controllers;
 
-[Area("Admin"), Authorize]
+[Area("Admin")]
+[Authorize]
 public sealed class GdRomSwapDiscCapabilitiesController : Controller
 {
     readonly AaruServerContext _context;
@@ -17,16 +18,12 @@ public sealed class GdRomSwapDiscCapabilitiesController : Controller
     public async Task<IActionResult> Details(int? id)
     {
         if(id == null)
-        {
             return NotFound();
-        }
 
         GdRomSwapDiscCapabilities caps = await _context.GdRomSwapDiscCapabilities.FirstOrDefaultAsync(m => m.Id == id);
 
         if(caps == null)
-        {
             return NotFound();
-        }
 
         return View(caps);
     }
@@ -35,22 +32,20 @@ public sealed class GdRomSwapDiscCapabilitiesController : Controller
     public async Task<IActionResult> Delete(int? id)
     {
         if(id == null)
-        {
             return NotFound();
-        }
 
         GdRomSwapDiscCapabilities caps = await _context.GdRomSwapDiscCapabilities.FirstOrDefaultAsync(m => m.Id == id);
 
         if(caps == null)
-        {
             return NotFound();
-        }
 
         return View(caps);
     }
 
     // POST: Admin/GdRomSwapDiscCapabilities/Delete/5
-    [HttpPost, ActionName("Delete"), ValidateAntiForgeryToken]
+    [HttpPost]
+    [ActionName("Delete")]
+    [ValidateAntiForgeryToken]
     public async Task<IActionResult> DeleteConfirmed(int id)
     {
         GdRomSwapDiscCapabilities caps = await _context.GdRomSwapDiscCapabilities.FindAsync(id);
@@ -68,9 +63,7 @@ public sealed class GdRomSwapDiscCapabilitiesController : Controller
         GdRomSwapDiscCapabilities caps = _context.GdRomSwapDiscCapabilities.FirstOrDefault(m => m.Id == id);
 
         if(caps == null)
-        {
             return NotFound();
-        }
 
         var model = new TestedMediaDataModel
         {
@@ -80,13 +73,13 @@ public sealed class GdRomSwapDiscCapabilitiesController : Controller
 
         byte[] buffer;
         var    sb      = new StringBuilder();
-        byte[] sector  = new byte[2352];
-        byte[] subq    = new byte[16];
-        byte[] fullsub = new byte[96];
+        var    sector  = new byte[2352];
+        var    subq    = new byte[16];
+        var    fullsub = new byte[96];
 
-        bool audio = true;
-        bool pq    = false;
-        bool rw    = false;
+        var audio = true;
+        var pq    = false;
+        var rw    = false;
 
         switch(data)
         {
@@ -285,7 +278,8 @@ public sealed class GdRomSwapDiscCapabilitiesController : Controller
                 rw     = true;
 
                 break;
-            default: return NotFound();
+            default:
+                return NotFound();
         }
 
         if(pq                           &&
@@ -312,12 +306,10 @@ public sealed class GdRomSwapDiscCapabilitiesController : Controller
         if(buffer == null)
             return View(model);
 
-        for(int i = 0; i < buffer.Length; i += blockSize)
+        for(var i = 0; i < buffer.Length; i += blockSize)
         {
             if(audio)
-            {
                 sb.AppendLine("Audio or scrambled data sector.");
-            }
             else
             {
                 Array.Copy(buffer, i, sector, 0, 2352);
@@ -351,10 +343,10 @@ public sealed class GdRomSwapDiscCapabilitiesController : Controller
     {
         byte[] deint = Subchannel.Deinterleave(sub);
 
-        bool validP  = true;
-        bool validRw = true;
+        var validP  = true;
+        var validRw = true;
 
-        for(int i = 0; i < 12; i++)
+        for(var i = 0; i < 12; i++)
         {
             if(deint[i] == 0x00 ||
                deint[i] == 0xFF)
@@ -365,7 +357,7 @@ public sealed class GdRomSwapDiscCapabilitiesController : Controller
             break;
         }
 
-        for(int i = 24; i < 96; i++)
+        for(var i = 24; i < 96; i++)
         {
             if(deint[i] == 0x00)
                 continue;
@@ -375,7 +367,7 @@ public sealed class GdRomSwapDiscCapabilitiesController : Controller
             break;
         }
 
-        byte[] q = new byte[12];
+        var q = new byte[12];
         Array.Copy(deint, 12, q, 0, 12);
 
         return Subchannel.PrettifyQ(q, deint[21] > 0x10, 16, !validP, false, validRw);
diff --git a/Aaru.Server/Areas/Admin/Controllers/HomeController.cs b/Aaru.Server/Areas/Admin/Controllers/HomeController.cs
index 3c88b92e..7adf2fbf 100644
--- a/Aaru.Server/Areas/Admin/Controllers/HomeController.cs
+++ b/Aaru.Server/Areas/Admin/Controllers/HomeController.cs
@@ -32,7 +32,8 @@
 
 namespace Aaru.Server.Areas.Admin.Controllers;
 
-[Area("Admin"), Authorize]
+[Area("Admin")]
+[Authorize]
 public sealed class HomeController : Controller
 {
     public ActionResult Index() => View();
diff --git a/Aaru.Server/Areas/Admin/Controllers/MediaFormatsController.cs b/Aaru.Server/Areas/Admin/Controllers/MediaFormatsController.cs
index ffa9e45e..11304938 100644
--- a/Aaru.Server/Areas/Admin/Controllers/MediaFormatsController.cs
+++ b/Aaru.Server/Areas/Admin/Controllers/MediaFormatsController.cs
@@ -1,6 +1,7 @@
 namespace Aaru.Server.Areas.Admin.Controllers;
 
-[Area("Admin"), Authorize]
+[Area("Admin")]
+[Authorize]
 public sealed class MediaFormatsController : Controller
 {
     readonly AaruServerContext _context;
@@ -14,22 +15,20 @@ public sealed class MediaFormatsController : Controller
     public async Task<IActionResult> Delete(int? id)
     {
         if(id == null)
-        {
             return NotFound();
-        }
 
         MediaFormat mediaFormat = await _context.MediaFormats.FirstOrDefaultAsync(m => m.Id == id);
 
         if(mediaFormat == null)
-        {
             return NotFound();
-        }
 
         return View(mediaFormat);
     }
 
     // POST: Admin/MediaFormats/Delete/5
-    [HttpPost, ActionName("Delete"), ValidateAntiForgeryToken]
+    [HttpPost]
+    [ActionName("Delete")]
+    [ValidateAntiForgeryToken]
     public async Task<IActionResult> DeleteConfirmed(int id)
     {
         MediaFormat mediaFormat = await _context.MediaFormats.FindAsync(id);
diff --git a/Aaru.Server/Areas/Admin/Controllers/MediasController.cs b/Aaru.Server/Areas/Admin/Controllers/MediasController.cs
index 721a7380..aacbccf8 100644
--- a/Aaru.Server/Areas/Admin/Controllers/MediasController.cs
+++ b/Aaru.Server/Areas/Admin/Controllers/MediasController.cs
@@ -1,6 +1,7 @@
 namespace Aaru.Server.Areas.Admin.Controllers;
 
-[Area("Admin"), Authorize]
+[Area("Admin")]
+[Authorize]
 public sealed class MediasController : Controller
 {
     readonly AaruServerContext _context;
@@ -25,22 +26,20 @@ public sealed class MediasController : Controller
     public async Task<IActionResult> Delete(int? id)
     {
         if(id == null)
-        {
             return NotFound();
-        }
 
         Media media = await _context.Medias.FirstOrDefaultAsync(m => m.Id == id);
 
         if(media == null)
-        {
             return NotFound();
-        }
 
         return View(media);
     }
 
     // POST: Admin/Medias/Delete/5
-    [HttpPost, ActionName("Delete"), ValidateAntiForgeryToken]
+    [HttpPost]
+    [ActionName("Delete")]
+    [ValidateAntiForgeryToken]
     public async Task<IActionResult> DeleteConfirmed(int id)
     {
         Media media = await _context.Medias.FindAsync(id);
diff --git a/Aaru.Server/Areas/Admin/Controllers/MmcController.cs b/Aaru.Server/Areas/Admin/Controllers/MmcController.cs
index e124adba..aacd2cb2 100644
--- a/Aaru.Server/Areas/Admin/Controllers/MmcController.cs
+++ b/Aaru.Server/Areas/Admin/Controllers/MmcController.cs
@@ -2,7 +2,8 @@ using Aaru.CommonTypes.Metadata;
 
 namespace Aaru.Server.Areas.Admin.Controllers;
 
-[Area("Admin"), Authorize]
+[Area("Admin")]
+[Authorize]
 public sealed class MmcController : Controller
 {
     readonly AaruServerContext _context;
@@ -28,16 +29,12 @@ public sealed class MmcController : Controller
     public async Task<IActionResult> Details(int? id)
     {
         if(id == null)
-        {
             return NotFound();
-        }
 
         Mmc mmc = await _context.Mmc.FirstOrDefaultAsync(m => m.Id == id);
 
         if(mmc == null)
-        {
             return NotFound();
-        }
 
         return View(mmc);
     }
@@ -46,22 +43,20 @@ public sealed class MmcController : Controller
     public async Task<IActionResult> Delete(int? id)
     {
         if(id == null)
-        {
             return NotFound();
-        }
 
         Mmc mmc = await _context.Mmc.FirstOrDefaultAsync(m => m.Id == id);
 
         if(mmc == null)
-        {
             return NotFound();
-        }
 
         return View(mmc);
     }
 
     // POST: Admin/Mmc/Delete/5
-    [HttpPost, ActionName("Delete"), ValidateAntiForgeryToken]
+    [HttpPost]
+    [ActionName("Delete")]
+    [ValidateAntiForgeryToken]
     public async Task<IActionResult> DeleteConfirmed(int id)
     {
         Mmc         mmc     = await _context.Mmc.FindAsync(id);
diff --git a/Aaru.Server/Areas/Admin/Controllers/MmcFeaturesController.cs b/Aaru.Server/Areas/Admin/Controllers/MmcFeaturesController.cs
index bc391da5..e5960563 100644
--- a/Aaru.Server/Areas/Admin/Controllers/MmcFeaturesController.cs
+++ b/Aaru.Server/Areas/Admin/Controllers/MmcFeaturesController.cs
@@ -2,7 +2,8 @@ using Aaru.CommonTypes.Metadata;
 
 namespace Aaru.Server.Areas.Admin.Controllers;
 
-[Area("Admin"), Authorize]
+[Area("Admin")]
+[Authorize]
 public sealed class MmcFeaturesController : Controller
 {
     readonly AaruServerContext _context;
@@ -16,16 +17,12 @@ public sealed class MmcFeaturesController : Controller
     public async Task<IActionResult> Details(int? id)
     {
         if(id == null)
-        {
             return NotFound();
-        }
 
         MmcFeatures mmcFeatures = await _context.MmcFeatures.FirstOrDefaultAsync(m => m.Id == id);
 
         if(mmcFeatures == null)
-        {
             return NotFound();
-        }
 
         return View(mmcFeatures);
     }
diff --git a/Aaru.Server/Areas/Admin/Controllers/MmcSdsController.cs b/Aaru.Server/Areas/Admin/Controllers/MmcSdsController.cs
index 4d57211f..739c6b29 100644
--- a/Aaru.Server/Areas/Admin/Controllers/MmcSdsController.cs
+++ b/Aaru.Server/Areas/Admin/Controllers/MmcSdsController.cs
@@ -2,7 +2,8 @@ using Aaru.CommonTypes.Metadata;
 
 namespace Aaru.Server.Areas.Admin.Controllers;
 
-[Area("Admin"), Authorize]
+[Area("Admin")]
+[Authorize]
 public sealed class MmcSdsController : Controller
 {
     readonly AaruServerContext _context;
@@ -16,16 +17,12 @@ public sealed class MmcSdsController : Controller
     public async Task<IActionResult> Details(int? id)
     {
         if(id == null)
-        {
             return NotFound();
-        }
 
         MmcSd mmcSd = await _context.MmcSd.FirstOrDefaultAsync(m => m.Id == id);
 
         if(mmcSd == null)
-        {
             return NotFound();
-        }
 
         return View(mmcSd);
     }
@@ -34,22 +31,20 @@ public sealed class MmcSdsController : Controller
     public async Task<IActionResult> Delete(int? id)
     {
         if(id == null)
-        {
             return NotFound();
-        }
 
         MmcSd mmcSd = await _context.MmcSd.FirstOrDefaultAsync(m => m.Id == id);
 
         if(mmcSd == null)
-        {
             return NotFound();
-        }
 
         return View(mmcSd);
     }
 
     // POST: Admin/MmcSds/Delete/5
-    [HttpPost, ActionName("Delete"), ValidateAntiForgeryToken]
+    [HttpPost]
+    [ActionName("Delete")]
+    [ValidateAntiForgeryToken]
     public async Task<IActionResult> DeleteConfirmed(int id)
     {
         MmcSd mmcSd = await _context.MmcSd.FindAsync(id);
diff --git a/Aaru.Server/Areas/Admin/Controllers/OperatingSystemsController.cs b/Aaru.Server/Areas/Admin/Controllers/OperatingSystemsController.cs
index 867139a2..72d865c0 100644
--- a/Aaru.Server/Areas/Admin/Controllers/OperatingSystemsController.cs
+++ b/Aaru.Server/Areas/Admin/Controllers/OperatingSystemsController.cs
@@ -1,6 +1,7 @@
 namespace Aaru.Server.Areas.Admin.Controllers;
 
-[Area("Admin"), Authorize]
+[Area("Admin")]
+[Authorize]
 public sealed class OperatingSystemsController : Controller
 {
     readonly AaruServerContext _context;
diff --git a/Aaru.Server/Areas/Admin/Controllers/PartitionsController.cs b/Aaru.Server/Areas/Admin/Controllers/PartitionsController.cs
index a827bb41..d3018ce8 100644
--- a/Aaru.Server/Areas/Admin/Controllers/PartitionsController.cs
+++ b/Aaru.Server/Areas/Admin/Controllers/PartitionsController.cs
@@ -1,6 +1,7 @@
 namespace Aaru.Server.Areas.Admin.Controllers;
 
-[Area("Admin"), Authorize]
+[Area("Admin")]
+[Authorize]
 public sealed class PartitionsController : Controller
 {
     readonly AaruServerContext _context;
diff --git a/Aaru.Server/Areas/Admin/Controllers/PcmciasController.cs b/Aaru.Server/Areas/Admin/Controllers/PcmciasController.cs
index a15864db..83ea7eda 100644
--- a/Aaru.Server/Areas/Admin/Controllers/PcmciasController.cs
+++ b/Aaru.Server/Areas/Admin/Controllers/PcmciasController.cs
@@ -2,7 +2,8 @@ using Aaru.CommonTypes.Metadata;
 
 namespace Aaru.Server.Areas.Admin.Controllers;
 
-[Area("Admin"), Authorize]
+[Area("Admin")]
+[Authorize]
 public sealed class PcmciasController : Controller
 {
     readonly AaruServerContext _context;
@@ -16,22 +17,20 @@ public sealed class PcmciasController : Controller
     public async Task<IActionResult> Delete(int? id)
     {
         if(id == null)
-        {
             return NotFound();
-        }
 
         Pcmcia pcmcia = await _context.Pcmcia.FirstOrDefaultAsync(m => m.Id == id);
 
         if(pcmcia == null)
-        {
             return NotFound();
-        }
 
         return View(pcmcia);
     }
 
     // POST: Admin/Pcmcias/Delete/5
-    [HttpPost, ActionName("Delete"), ValidateAntiForgeryToken]
+    [HttpPost]
+    [ActionName("Delete")]
+    [ValidateAntiForgeryToken]
     public async Task<IActionResult> DeleteConfirmed(int id)
     {
         Pcmcia pcmcia = await _context.Pcmcia.FindAsync(id);
diff --git a/Aaru.Server/Areas/Admin/Controllers/ReportsController.cs b/Aaru.Server/Areas/Admin/Controllers/ReportsController.cs
index cd38d6f4..b5a6e397 100644
--- a/Aaru.Server/Areas/Admin/Controllers/ReportsController.cs
+++ b/Aaru.Server/Areas/Admin/Controllers/ReportsController.cs
@@ -3,7 +3,8 @@ using Microsoft.EntityFrameworkCore.ChangeTracking;
 
 namespace Aaru.Server.Areas.Admin.Controllers;
 
-[Area("Admin"), Authorize]
+[Area("Admin")]
+[Authorize]
 public sealed class ReportsController : Controller
 {
     readonly AaruServerContext _context;
@@ -20,9 +21,7 @@ public sealed class ReportsController : Controller
     public async Task<IActionResult> Details(int? id)
     {
         if(id == null)
-        {
             return NotFound();
-        }
 
         var model = new UploadedReportDetails
         {
@@ -30,9 +29,7 @@ public sealed class ReportsController : Controller
         };
 
         if(model.Report is null)
-        {
             return NotFound();
-        }
 
         model.ReportAll = _context.Devices.
                                    Where(d => d.Manufacturer == model.Report.Manufacturer &&
@@ -80,16 +77,12 @@ public sealed class ReportsController : Controller
     public async Task<IActionResult> Edit(int? id)
     {
         if(id == null)
-        {
             return NotFound();
-        }
 
         UploadedReport uploadedReport = await _context.Reports.FindAsync(id);
 
         if(uploadedReport == null)
-        {
             return NotFound();
-        }
 
         return View(uploadedReport);
     }
@@ -97,7 +90,8 @@ public sealed class ReportsController : Controller
     // POST: Admin/Reports/Edit/5
     // To protect from overposting attacks, please enable the specific properties you want to bind to, for
     // more details see http://go.microsoft.com/fwlink/?LinkId=317598.
-    [HttpPost, ValidateAntiForgeryToken]
+    [HttpPost]
+    [ValidateAntiForgeryToken]
     public async Task<IActionResult> Edit(
         int id, [Bind("Id,CompactFlash,Manufacturer,Model,Revision,Type")] UploadedReport changedModel)
     {
@@ -135,22 +129,20 @@ public sealed class ReportsController : Controller
     public async Task<IActionResult> Delete(int? id)
     {
         if(id == null)
-        {
             return NotFound();
-        }
 
         UploadedReport uploadedReport = await _context.Reports.FirstOrDefaultAsync(m => m.Id == id);
 
         if(uploadedReport == null)
-        {
             return NotFound();
-        }
 
         return View(uploadedReport);
     }
 
     // POST: Admin/Reports/Delete/5
-    [HttpPost, ActionName("Delete"), ValidateAntiForgeryToken]
+    [HttpPost]
+    [ActionName("Delete")]
+    [ValidateAntiForgeryToken]
     public async Task<IActionResult> DeleteConfirmed(int id)
     {
         UploadedReport uploadedReport = await _context.Reports.FindAsync(id);
@@ -163,16 +155,12 @@ public sealed class ReportsController : Controller
     public IActionResult Promote(int? id)
     {
         if(id == null)
-        {
             return NotFound();
-        }
 
         UploadedReport uploadedReport = _context.Reports.FirstOrDefault(m => m.Id == id);
 
         if(uploadedReport == null)
-        {
             return NotFound();
-        }
 
         var device = new Device(uploadedReport.ATAId, uploadedReport.ATAPIId, uploadedReport.FireWireId,
                                 uploadedReport.MultiMediaCardId, uploadedReport.PCMCIAId,
diff --git a/Aaru.Server/Areas/Admin/Controllers/ScsiModesController.cs b/Aaru.Server/Areas/Admin/Controllers/ScsiModesController.cs
index 269a36a3..ac0553e7 100644
--- a/Aaru.Server/Areas/Admin/Controllers/ScsiModesController.cs
+++ b/Aaru.Server/Areas/Admin/Controllers/ScsiModesController.cs
@@ -2,7 +2,8 @@ using Aaru.CommonTypes.Metadata;
 
 namespace Aaru.Server.Areas.Admin.Controllers;
 
-[Area("Admin"), Authorize]
+[Area("Admin")]
+[Authorize]
 public sealed class ScsiModesController : Controller
 {
     readonly AaruServerContext _context;
@@ -16,22 +17,20 @@ public sealed class ScsiModesController : Controller
     public async Task<IActionResult> Delete(int? id)
     {
         if(id == null)
-        {
             return NotFound();
-        }
 
         ScsiMode scsiMode = await _context.ScsiMode.FirstOrDefaultAsync(m => m.Id == id);
 
         if(scsiMode == null)
-        {
             return NotFound();
-        }
 
         return View(scsiMode);
     }
 
     // POST: Admin/ScsiModes/Delete/5
-    [HttpPost, ActionName("Delete"), ValidateAntiForgeryToken]
+    [HttpPost]
+    [ActionName("Delete")]
+    [ValidateAntiForgeryToken]
     public async Task<IActionResult> DeleteConfirmed(int id)
     {
         ScsiMode scsiMode = await _context.ScsiMode.FindAsync(id);
diff --git a/Aaru.Server/Areas/Admin/Controllers/ScsiPagesController.cs b/Aaru.Server/Areas/Admin/Controllers/ScsiPagesController.cs
index db5c0309..490cb174 100644
--- a/Aaru.Server/Areas/Admin/Controllers/ScsiPagesController.cs
+++ b/Aaru.Server/Areas/Admin/Controllers/ScsiPagesController.cs
@@ -2,7 +2,8 @@ using Aaru.CommonTypes.Metadata;
 
 namespace Aaru.Server.Areas.Admin.Controllers;
 
-[Area("Admin"), Authorize]
+[Area("Admin")]
+[Authorize]
 public sealed class ScsiPagesController : Controller
 {
     readonly AaruServerContext _context;
@@ -16,22 +17,20 @@ public sealed class ScsiPagesController : Controller
     public async Task<IActionResult> Delete(int? id)
     {
         if(id == null)
-        {
             return NotFound();
-        }
 
         ScsiPage scsiPage = await _context.ScsiPage.FirstOrDefaultAsync(m => m.Id == id);
 
         if(scsiPage == null)
-        {
             return NotFound();
-        }
 
         return View(scsiPage);
     }
 
     // POST: Admin/ScsiPages/Delete/5
-    [HttpPost, ActionName("Delete"), ValidateAntiForgeryToken]
+    [HttpPost]
+    [ActionName("Delete")]
+    [ValidateAntiForgeryToken]
     public async Task<IActionResult> DeleteConfirmed(int id)
     {
         ScsiPage scsiPage = await _context.ScsiPage.FindAsync(id);
diff --git a/Aaru.Server/Areas/Admin/Controllers/ScsisController.cs b/Aaru.Server/Areas/Admin/Controllers/ScsisController.cs
index e2b73287..bcf9ef43 100644
--- a/Aaru.Server/Areas/Admin/Controllers/ScsisController.cs
+++ b/Aaru.Server/Areas/Admin/Controllers/ScsisController.cs
@@ -8,7 +8,8 @@ using TestedMedia = Aaru.CommonTypes.Metadata.TestedMedia;
 
 namespace Aaru.Server.Areas.Admin.Controllers;
 
-[Area("Admin"), Authorize]
+[Area("Admin")]
+[Authorize]
 public sealed class ScsisController : Controller
 {
     readonly AaruServerContext _context;
@@ -24,22 +25,18 @@ public sealed class ScsisController : Controller
                                                              StringHandlers.
                                                                  CToString(m.Inquiry?.ProductIdentification)).
                                                   ThenBy(m => StringHandlers.CToString(m.Inquiry?.
-                                                             ProductRevisionLevel)));
+                                                                 ProductRevisionLevel)));
 
     // GET: Admin/Scsis/Details/5
     public async Task<IActionResult> Details(int? id)
     {
         if(id == null)
-        {
             return NotFound();
-        }
 
         Scsi scsi = await _context.Scsi.FirstOrDefaultAsync(m => m.Id == id);
 
         if(scsi == null)
-        {
             return NotFound();
-        }
 
         return View(scsi);
     }
@@ -48,22 +45,20 @@ public sealed class ScsisController : Controller
     public async Task<IActionResult> Delete(int? id)
     {
         if(id == null)
-        {
             return NotFound();
-        }
 
         Scsi scsi = await _context.Scsi.FirstOrDefaultAsync(m => m.Id == id);
 
         if(scsi == null)
-        {
             return NotFound();
-        }
 
         return View(scsi);
     }
 
     // POST: Admin/Scsis/Delete/5
-    [HttpPost, ActionName("Delete"), ValidateAntiForgeryToken]
+    [HttpPost]
+    [ActionName("Delete")]
+    [ValidateAntiForgeryToken]
     public async Task<IActionResult> DeleteConfirmed(int id)
     {
         Scsi scsi = await _context.Scsi.FindAsync(id);
@@ -75,13 +70,13 @@ public sealed class ScsisController : Controller
 
     public IActionResult Consolidate()
     {
-        List<IdHashModel> hashes = _context.Scsi.Where(m => m.InquiryData != null).
-                                            Select(m => new IdHashModel(m.Id, Hash.Sha512(m.InquiryData))).ToList();
+        var hashes = _context.Scsi.Where(m => m.InquiryData != null).
+                              Select(m => new IdHashModel(m.Id, Hash.Sha512(m.InquiryData))).ToList();
 
-        List<IdHashModel> dups = hashes.GroupBy(x => x.Hash).Where(g => g.Count() > 1).
-                                        Select(x => hashes.FirstOrDefault(y => y.Hash == x.Key)).ToList();
+        var dups = hashes.GroupBy(x => x.Hash).Where(g => g.Count() > 1).
+                          Select(x => hashes.FirstOrDefault(y => y.Hash == x.Key)).ToList();
 
-        for(int i = 0; i < dups.Count; i++)
+        for(var i = 0; i < dups.Count; i++)
         {
             Scsi unique = _context.Scsi.First(a => a.Id == dups[i].Id);
 
@@ -98,7 +93,9 @@ public sealed class ScsisController : Controller
         });
     }
 
-    [HttpPost, ActionName("Consolidate"), ValidateAntiForgeryToken]
+    [HttpPost]
+    [ActionName("Consolidate")]
+    [ValidateAntiForgeryToken]
     public IActionResult ConsolidateConfirmed(string models)
     {
         IdHashModel[] duplicates;
@@ -130,14 +127,10 @@ public sealed class ScsisController : Controller
                     continue;
 
                 foreach(Device scsiDevice in _context.Devices.Where(d => d.SCSI.Id == duplicateId))
-                {
                     scsiDevice.SCSI = master;
-                }
 
                 foreach(UploadedReport scsiReport in _context.Reports.Where(d => d.SCSI.Id == duplicateId))
-                {
                     scsiReport.SCSI = master;
-                }
 
                 foreach(TestedMedia testedMedia in _context.TestedMedia.Where(d => d.ScsiId == duplicateId))
                 {
@@ -233,7 +226,8 @@ public sealed class ScsisController : Controller
 
                 switch(la)
                 {
-                    case null when ra is null: continue;
+                    case null when ra is null:
+                        continue;
                     case null:
                         model.ValueNames.Add(fieldInfo.Name);
                         model.LeftValues.Add("null");
@@ -251,10 +245,10 @@ public sealed class ScsisController : Controller
                     continue;
                 }
 
-                List<object> ll = la.Cast<object>().ToList();
-                List<object> rl = ra.Cast<object>().ToList();
+                var ll = la.Cast<object>().ToList();
+                var rl = ra.Cast<object>().ToList();
 
-                for(int i = 0; i < ll.Count; i++)
+                for(var i = 0; i < ll.Count; i++)
                 {
                     if(ll[i].Equals(rl[i]))
                         continue;
@@ -269,13 +263,13 @@ public sealed class ScsisController : Controller
                         case nameof(Inquiry.Seagate_DriveSerialNumber):
                         case nameof(Inquiry.Seagate_ServoPROMPartNo):
                         case nameof(Inquiry.VendorIdentification):
-                            byte[] lb = new byte[ll.Count];
-                            byte[] rb = new byte[rl.Count];
+                            var lb = new byte[ll.Count];
+                            var rb = new byte[rl.Count];
 
-                            for(int j = 0; j < ll.Count; j++)
+                            for(var j = 0; j < ll.Count; j++)
                                 lb[j] = (byte)ll[j];
 
-                            for(int j = 0; j < ll.Count; j++)
+                            for(var j = 0; j < ll.Count; j++)
                                 rb[j] = (byte)rl[j];
 
                             model.ValueNames.Add(fieldInfo.Name);
@@ -329,30 +323,30 @@ public sealed class ScsisController : Controller
         Scsi master = _context.Scsi.FirstOrDefault(m => m.Id == masterId);
 
         if(master is null)
+        {
             return RedirectToAction(nameof(Compare), new
             {
                 id      = masterId,
                 rightId = slaveId
             });
+        }
 
         Scsi slave = _context.Scsi.FirstOrDefault(m => m.Id == slaveId);
 
         if(slave is null)
+        {
             return RedirectToAction(nameof(Compare), new
             {
                 id      = masterId,
                 rightId = slaveId
             });
+        }
 
         foreach(Device scsiDevice in _context.Devices.Where(d => d.SCSI.Id == slaveId))
-        {
             scsiDevice.SCSI = master;
-        }
 
         foreach(UploadedReport scsiReport in _context.Reports.Where(d => d.SCSI.Id == slaveId))
-        {
             scsiReport.SCSI = master;
-        }
 
         foreach(TestedMedia testedMedia in _context.TestedMedia.Where(d => d.ScsiId == slaveId))
         {
diff --git a/Aaru.Server/Areas/Admin/Controllers/SscsController.cs b/Aaru.Server/Areas/Admin/Controllers/SscsController.cs
index 223bb797..2af7af29 100644
--- a/Aaru.Server/Areas/Admin/Controllers/SscsController.cs
+++ b/Aaru.Server/Areas/Admin/Controllers/SscsController.cs
@@ -3,7 +3,8 @@ using Newtonsoft.Json;
 
 namespace Aaru.Server.Areas.Admin.Controllers;
 
-[Area("Admin"), Authorize]
+[Area("Admin")]
+[Authorize]
 public sealed class SscsController : Controller
 {
     readonly AaruServerContext _context;
@@ -19,22 +20,20 @@ public sealed class SscsController : Controller
     public async Task<IActionResult> Delete(int? id)
     {
         if(id == null)
-        {
             return NotFound();
-        }
 
         Ssc ssc = await _context.Ssc.FirstOrDefaultAsync(m => m.Id == id);
 
         if(ssc == null)
-        {
             return NotFound();
-        }
 
         return View(ssc);
     }
 
     // POST: Admin/Sscs/Delete/5
-    [HttpPost, ActionName("Delete"), ValidateAntiForgeryToken]
+    [HttpPost]
+    [ActionName("Delete")]
+    [ValidateAntiForgeryToken]
     public async Task<IActionResult> DeleteConfirmed(int id)
     {
         Ssc ssc = await _context.Ssc.FindAsync(id);
@@ -46,7 +45,7 @@ public sealed class SscsController : Controller
 
     public IActionResult Consolidate()
     {
-        List<SscModel> dups = _context.Ssc.GroupBy(x => new
+        var dups = _context.Ssc.GroupBy(x => new
         {
             x.BlockSizeGranularity,
             x.MaxBlockLength,
@@ -65,7 +64,9 @@ public sealed class SscsController : Controller
         });
     }
 
-    [HttpPost, ActionName("Consolidate"), ValidateAntiForgeryToken]
+    [HttpPost]
+    [ActionName("Consolidate")]
+    [ValidateAntiForgeryToken]
     public IActionResult ConsolidateConfirmed(string models)
     {
         SscModel[] duplicates;
@@ -96,9 +97,7 @@ public sealed class SscsController : Controller
                                                        m.MinBlockLength == duplicate.MinBlockLength).Skip(1).ToArray())
             {
                 foreach(TestedSequentialMedia media in _context.TestedSequentialMedia.Where(d => d.SscId == ssc.Id))
-                {
                     media.SscId = master.Id;
-                }
 
                 _context.Ssc.Update(ssc);
                 _context.Ssc.Remove(ssc);
diff --git a/Aaru.Server/Areas/Admin/Controllers/SupportedDensitiesController.cs b/Aaru.Server/Areas/Admin/Controllers/SupportedDensitiesController.cs
index 0ef9f891..c0f60855 100644
--- a/Aaru.Server/Areas/Admin/Controllers/SupportedDensitiesController.cs
+++ b/Aaru.Server/Areas/Admin/Controllers/SupportedDensitiesController.cs
@@ -2,7 +2,8 @@ using Aaru.CommonTypes.Metadata;
 
 namespace Aaru.Server.Areas.Admin.Controllers;
 
-[Area("Admin"), Authorize]
+[Area("Admin")]
+[Authorize]
 public sealed class SupportedDensitiesController : Controller
 {
     readonly AaruServerContext _context;
@@ -23,22 +24,20 @@ public sealed class SupportedDensitiesController : Controller
     public async Task<IActionResult> Delete(int? id)
     {
         if(id == null)
-        {
             return NotFound();
-        }
 
         SupportedDensity supportedDensity = await _context.SupportedDensity.FirstOrDefaultAsync(m => m.Id == id);
 
         if(supportedDensity == null)
-        {
             return NotFound();
-        }
 
         return View(supportedDensity);
     }
 
     // POST: Admin/SupportedDensities/Delete/5
-    [HttpPost, ActionName("Delete"), ValidateAntiForgeryToken]
+    [HttpPost]
+    [ActionName("Delete")]
+    [ValidateAntiForgeryToken]
     public async Task<IActionResult> DeleteConfirmed(int id)
     {
         SupportedDensity supportedDensity = await _context.SupportedDensity.FindAsync(id);
diff --git a/Aaru.Server/Areas/Admin/Controllers/TestedMediasController.cs b/Aaru.Server/Areas/Admin/Controllers/TestedMediasController.cs
index dfb8016a..c6b43b1f 100644
--- a/Aaru.Server/Areas/Admin/Controllers/TestedMediasController.cs
+++ b/Aaru.Server/Areas/Admin/Controllers/TestedMediasController.cs
@@ -15,7 +15,8 @@ using Spare = Aaru.Decoders.Bluray.Spare;
 
 namespace Aaru.Server.Areas.Admin.Controllers;
 
-[Area("Admin"), Authorize]
+[Area("Admin")]
+[Authorize]
 public sealed class TestedMediasController : Controller
 {
     readonly AaruServerContext _context;
@@ -34,16 +35,12 @@ public sealed class TestedMediasController : Controller
     public async Task<IActionResult> Details(int? id)
     {
         if(id == null)
-        {
             return NotFound();
-        }
 
         TestedMedia testedMedia = await _context.TestedMedia.FirstOrDefaultAsync(m => m.Id == id);
 
         if(testedMedia == null)
-        {
             return NotFound();
-        }
 
         return View(testedMedia);
     }
@@ -52,16 +49,12 @@ public sealed class TestedMediasController : Controller
     public async Task<IActionResult> Edit(int? id)
     {
         if(id == null)
-        {
             return NotFound();
-        }
 
         TestedMedia testedMedia = await _context.TestedMedia.FindAsync(id);
 
         if(testedMedia == null)
-        {
             return NotFound();
-        }
 
         return View(testedMedia);
     }
@@ -69,7 +62,8 @@ public sealed class TestedMediasController : Controller
     // POST: Admin/TestedMedias/Edit/5
     // To protect from overposting attacks, please enable the specific properties you want to bind to, for
     // more details see http://go.microsoft.com/fwlink/?LinkId=317598.
-    [HttpPost, ValidateAntiForgeryToken]
+    [HttpPost]
+    [ValidateAntiForgeryToken]
     public async Task<IActionResult> Edit(
         int id, [Bind("Id,Blocks,BlockSize,LongBlockSize,Manufacturer,MediumTypeName,Model")] TestedMedia changedModel)
     {
@@ -108,22 +102,20 @@ public sealed class TestedMediasController : Controller
     public async Task<IActionResult> Delete(int? id)
     {
         if(id == null)
-        {
             return NotFound();
-        }
 
         TestedMedia testedMedia = await _context.TestedMedia.FirstOrDefaultAsync(m => m.Id == id);
 
         if(testedMedia == null)
-        {
             return NotFound();
-        }
 
         return View(testedMedia);
     }
 
     // POST: Admin/TestedMedias/Delete/5
-    [HttpPost, ActionName("Delete"), ValidateAntiForgeryToken]
+    [HttpPost]
+    [ActionName("Delete")]
+    [ValidateAntiForgeryToken]
     public async Task<IActionResult> DeleteConfirmed(int id)
     {
         TestedMedia testedMedia = await _context.TestedMedia.FindAsync(id);
@@ -141,9 +133,7 @@ public sealed class TestedMediasController : Controller
         TestedMedia testedMedia = _context.TestedMedia.FirstOrDefault(m => m.Id == id);
 
         if(testedMedia == null)
-        {
             return NotFound();
-        }
 
         var model = new TestedMediaDataModel
         {
@@ -152,11 +142,11 @@ public sealed class TestedMediasController : Controller
         };
 
         byte[] buffer;
-        byte[] sector    = new byte[2352];
-        byte[] subq      = new byte[16];
-        byte[] fullsub   = new byte[96];
-        bool   c2Errors  = false;
-        bool   scrambled = false;
+        var    sector    = new byte[2352];
+        var    subq      = new byte[16];
+        var    fullsub   = new byte[96];
+        var    c2Errors  = false;
+        var    scrambled = false;
 
         switch(data)
         {
@@ -205,7 +195,7 @@ public sealed class TestedMediasController : Controller
 
                 model.Decoded = Sector.Prettify(sector);
 
-                for(int i = 2352; i < buffer.Length; i++)
+                for(var i = 2352; i < buffer.Length; i++)
                 {
                     if(buffer[i] == 0x00)
                         continue;
@@ -258,7 +248,7 @@ public sealed class TestedMediasController : Controller
                 if(buffer.Length < 2448)
                     break;
 
-                for(int i = 2352; i < 2616; i++)
+                for(var i = 2352; i < 2616; i++)
                 {
                     if(buffer[i] == 0x00)
                         continue;
@@ -428,7 +418,7 @@ public sealed class TestedMediasController : Controller
 
                 model.Decoded += "\n" + GetPrettySub(fullsub);
 
-                for(int i = 2352; i < 2646; i++)
+                for(var i = 2352; i < 2646; i++)
                 {
                     if(buffer[i] == 0x00)
                         continue;
@@ -582,7 +572,7 @@ public sealed class TestedMediasController : Controller
 
                 model.Decoded += "\n" + GetPrettySub(fullsub);
 
-                for(int i = 2448; i < buffer.Length; i++)
+                for(var i = 2448; i < buffer.Length; i++)
                 {
                     if(buffer[i] != 0x00)
                     {
@@ -639,7 +629,7 @@ public sealed class TestedMediasController : Controller
 
                 model.Decoded += "\n" + GetPrettySub(fullsub);
 
-                for(int i = 2468; i < 2762; i++)
+                for(var i = 2468; i < 2762; i++)
                 {
                     if(buffer[i] == 0x00)
                         continue;
@@ -681,7 +671,7 @@ public sealed class TestedMediasController : Controller
 
                 model.Decoded += "\n" + GetPrettySub(fullsub);
 
-                for(int i = 2468; i < 2762; i++)
+                for(var i = 2468; i < 2762; i++)
                 {
                     if(buffer[i] == 0x00)
                         continue;
@@ -694,7 +684,8 @@ public sealed class TestedMediasController : Controller
                 model.Decoded += "\n" + (c2Errors ? "C2 errors found." : "No C2 errors.");
 
                 break;
-            default: return NotFound();
+            default:
+                return NotFound();
         }
 
         model.RawDataAsHex = PrintHex.ByteArrayToHexArrayString(buffer);
@@ -712,10 +703,10 @@ public sealed class TestedMediasController : Controller
     {
         byte[] deint = Subchannel.Deinterleave(sub);
 
-        bool validP  = true;
-        bool validRw = true;
+        var validP  = true;
+        var validRw = true;
 
-        for(int i = 0; i < 12; i++)
+        for(var i = 0; i < 12; i++)
         {
             if(deint[i] == 0x00 ||
                deint[i] == 0xFF)
@@ -726,7 +717,7 @@ public sealed class TestedMediasController : Controller
             break;
         }
 
-        for(int i = 24; i < 96; i++)
+        for(var i = 24; i < 96; i++)
         {
             if(deint[i] == 0x00)
                 continue;
@@ -736,7 +727,7 @@ public sealed class TestedMediasController : Controller
             break;
         }
 
-        byte[] q = new byte[12];
+        var q = new byte[12];
         Array.Copy(deint, 12, q, 0, 12);
 
         return Subchannel.PrettifyQ(q, deint[21] > 0x10, 16, !validP, false, validRw);
diff --git a/Aaru.Server/Areas/Admin/Controllers/TestedSequentialMediasController.cs b/Aaru.Server/Areas/Admin/Controllers/TestedSequentialMediasController.cs
index a546d5a9..15ce8efb 100644
--- a/Aaru.Server/Areas/Admin/Controllers/TestedSequentialMediasController.cs
+++ b/Aaru.Server/Areas/Admin/Controllers/TestedSequentialMediasController.cs
@@ -2,7 +2,8 @@ using Aaru.CommonTypes.Metadata;
 
 namespace Aaru.Server.Areas.Admin.Controllers;
 
-[Area("Admin"), Authorize]
+[Area("Admin")]
+[Authorize]
 public sealed class TestedSequentialMediasController : Controller
 {
     readonly AaruServerContext _context;
@@ -18,16 +19,12 @@ public sealed class TestedSequentialMediasController : Controller
     public async Task<IActionResult> Edit(int? id)
     {
         if(id == null)
-        {
             return NotFound();
-        }
 
         TestedSequentialMedia testedSequentialMedia = await _context.TestedSequentialMedia.FindAsync(id);
 
         if(testedSequentialMedia == null)
-        {
             return NotFound();
-        }
 
         return View(testedSequentialMedia);
     }
@@ -35,7 +32,8 @@ public sealed class TestedSequentialMediasController : Controller
     // POST: Admin/TestedSequentialMedias/Edit/5
     // To protect from overposting attacks, please enable the specific properties you want to bind to, for
     // more details see http://go.microsoft.com/fwlink/?LinkId=317598.
-    [HttpPost, ValidateAntiForgeryToken]
+    [HttpPost]
+    [ValidateAntiForgeryToken]
     public async Task<IActionResult> Edit(
         int id, [Bind("Id,Manufacturer,MediumTypeName,Model")] TestedSequentialMedia changedModel)
     {
@@ -71,23 +69,21 @@ public sealed class TestedSequentialMediasController : Controller
     public async Task<IActionResult> Delete(int? id)
     {
         if(id == null)
-        {
             return NotFound();
-        }
 
         TestedSequentialMedia testedSequentialMedia =
             await _context.TestedSequentialMedia.FirstOrDefaultAsync(m => m.Id == id);
 
         if(testedSequentialMedia == null)
-        {
             return NotFound();
-        }
 
         return View(testedSequentialMedia);
     }
 
     // POST: Admin/TestedSequentialMedias/Delete/5
-    [HttpPost, ActionName("Delete"), ValidateAntiForgeryToken]
+    [HttpPost]
+    [ActionName("Delete")]
+    [ValidateAntiForgeryToken]
     public async Task<IActionResult> DeleteConfirmed(int id)
     {
         TestedSequentialMedia testedSequentialMedia = await _context.TestedSequentialMedia.FindAsync(id);
diff --git a/Aaru.Server/Areas/Admin/Controllers/UsbProductsController.cs b/Aaru.Server/Areas/Admin/Controllers/UsbProductsController.cs
index 468dea79..aac9eeef 100644
--- a/Aaru.Server/Areas/Admin/Controllers/UsbProductsController.cs
+++ b/Aaru.Server/Areas/Admin/Controllers/UsbProductsController.cs
@@ -1,6 +1,7 @@
 namespace Aaru.Server.Areas.Admin.Controllers;
 
-[Area("Admin"), Authorize]
+[Area("Admin")]
+[Authorize]
 public sealed class UsbProductsController : Controller
 {
     readonly AaruServerContext _context;
diff --git a/Aaru.Server/Areas/Admin/Controllers/UsbVendorsController.cs b/Aaru.Server/Areas/Admin/Controllers/UsbVendorsController.cs
index 31a11649..4c47cf78 100644
--- a/Aaru.Server/Areas/Admin/Controllers/UsbVendorsController.cs
+++ b/Aaru.Server/Areas/Admin/Controllers/UsbVendorsController.cs
@@ -1,6 +1,7 @@
 namespace Aaru.Server.Areas.Admin.Controllers;
 
-[Area("Admin"), Authorize]
+[Area("Admin")]
+[Authorize]
 public sealed class UsbVendorsController : Controller
 {
     readonly AaruServerContext _context;
@@ -15,16 +16,12 @@ public sealed class UsbVendorsController : Controller
     public async Task<IActionResult> Details(int? id)
     {
         if(id == null)
-        {
             return NotFound();
-        }
 
         UsbVendor usbVendor = await _context.UsbVendors.FirstOrDefaultAsync(m => m.Id == id);
 
         if(usbVendor == null)
-        {
             return NotFound();
-        }
 
         return View(new UsbVendorModel
         {
diff --git a/Aaru.Server/Areas/Admin/Controllers/UsbsController.cs b/Aaru.Server/Areas/Admin/Controllers/UsbsController.cs
index 7b1eee81..21062633 100644
--- a/Aaru.Server/Areas/Admin/Controllers/UsbsController.cs
+++ b/Aaru.Server/Areas/Admin/Controllers/UsbsController.cs
@@ -3,7 +3,8 @@ using Newtonsoft.Json;
 
 namespace Aaru.Server.Areas.Admin.Controllers;
 
-[Area("Admin"), Authorize]
+[Area("Admin")]
+[Authorize]
 public sealed class UsbsController : Controller
 {
     readonly AaruServerContext _context;
@@ -19,16 +20,12 @@ public sealed class UsbsController : Controller
     public async Task<IActionResult> Details(int? id)
     {
         if(id == null)
-        {
             return NotFound();
-        }
 
         Usb usb = await _context.Usb.FirstOrDefaultAsync(m => m.Id == id);
 
         if(usb == null)
-        {
             return NotFound();
-        }
 
         return View(usb);
     }
@@ -37,22 +34,20 @@ public sealed class UsbsController : Controller
     public async Task<IActionResult> Delete(int? id)
     {
         if(id == null)
-        {
             return NotFound();
-        }
 
         Usb usb = await _context.Usb.FirstOrDefaultAsync(m => m.Id == id);
 
         if(usb == null)
-        {
             return NotFound();
-        }
 
         return View(usb);
     }
 
     // POST: Admin/Usbs/Delete/5
-    [HttpPost, ActionName("Delete"), ValidateAntiForgeryToken]
+    [HttpPost]
+    [ActionName("Delete")]
+    [ValidateAntiForgeryToken]
     public async Task<IActionResult> DeleteConfirmed(int id)
     {
         Usb usb = await _context.Usb.FindAsync(id);
@@ -64,7 +59,7 @@ public sealed class UsbsController : Controller
 
     public IActionResult Consolidate()
     {
-        List<UsbModel> dups = _context.Usb.GroupBy(x => new
+        var dups = _context.Usb.GroupBy(x => new
         {
             x.Manufacturer,
             x.Product,
@@ -85,7 +80,9 @@ public sealed class UsbsController : Controller
         });
     }
 
-    [HttpPost, ActionName("Consolidate"), ValidateAntiForgeryToken]
+    [HttpPost]
+    [ActionName("Consolidate")]
+    [ValidateAntiForgeryToken]
     public IActionResult ConsolidateConfirmed(string models)
     {
         UsbModel[] duplicates;
@@ -125,14 +122,10 @@ public sealed class UsbsController : Controller
                 }
 
                 foreach(Device device in _context.Devices.Where(d => d.USB.Id == slave.Id))
-                {
                     device.USB = master;
-                }
 
                 foreach(UploadedReport report in _context.Reports.Where(d => d.USB.Id == slave.Id))
-                {
                     report.USB = master;
-                }
 
                 if(master.Descriptors is null &&
                    slave.Descriptors != null)
diff --git a/Aaru.Server/Areas/Admin/Controllers/VersionsController.cs b/Aaru.Server/Areas/Admin/Controllers/VersionsController.cs
index c620b7c3..a665e2e8 100644
--- a/Aaru.Server/Areas/Admin/Controllers/VersionsController.cs
+++ b/Aaru.Server/Areas/Admin/Controllers/VersionsController.cs
@@ -1,6 +1,7 @@
 namespace Aaru.Server.Areas.Admin.Controllers;
 
-[Area("Admin"), Authorize]
+[Area("Admin")]
+[Authorize]
 public sealed class VersionsController : Controller
 {
     readonly AaruServerContext _context;
diff --git a/Aaru.Server/Areas/Admin/Views/Atas/CheckPrivate.cshtml b/Aaru.Server/Areas/Admin/Views/Atas/CheckPrivate.cshtml
index 33a42138..b404e0a4 100644
--- a/Aaru.Server/Areas/Admin/Views/Atas/CheckPrivate.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/Atas/CheckPrivate.cshtml
@@ -1,4 +1,5 @@
 @using System.Text
+@using Aaru.CommonTypes.Metadata
 @model IEnumerable<Aaru.CommonTypes.Metadata.Ata>
 
 @{
@@ -91,7 +92,7 @@ ATA IDENTIFY DEVICE responses with possible private data
     </tr>
     </thead>
     <tbody>
-    @foreach(var item in Model)
+    @foreach(Ata item in Model)
     {
         <tr>
             <td>
diff --git a/Aaru.Server/Areas/Admin/Views/Atas/Consolidate.cshtml b/Aaru.Server/Areas/Admin/Views/Atas/Consolidate.cshtml
index 67ee956b..de6221e2 100644
--- a/Aaru.Server/Areas/Admin/Views/Atas/Consolidate.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/Atas/Consolidate.cshtml
@@ -10,7 +10,7 @@
     <table class="table">
         <thead>
         <tbody>
-        @foreach(var item in Model.List)
+        @foreach(IdHashModel item in Model.List)
         {
             <tr>
                 <td>
@@ -24,8 +24,8 @@
 <div>
     Do you want to remove the duplicates?
     <form asp-action="Consolidate" enctype="multipart/form-data">
-        <input asp-for="Json" name="models" type="hidden" />
+        <input asp-for="Json" name="models" type="hidden"/>
         <a asp-action="Index" class="btn btn-primary">Back to List</a>
-        <input class="btn btn-danger" type="submit" value="Consolidate" />
+        <input class="btn btn-danger" type="submit" value="Consolidate"/>
     </form>
 </div>
\ No newline at end of file
diff --git a/Aaru.Server/Areas/Admin/Views/Atas/Delete.cshtml b/Aaru.Server/Areas/Admin/Views/Atas/Delete.cshtml
index 978cca90..365d08a2 100644
--- a/Aaru.Server/Areas/Admin/Views/Atas/Delete.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/Atas/Delete.cshtml
@@ -38,13 +38,13 @@
 <h3>Are you sure you want to delete this?</h3>
 <div>
     <h4>ATA IDENTIFY DEVICE / ATAPI IDENTIFY PACKET DEVICE - ID = @Model.Id</h4>
-    <hr />
+    <hr/>
     @Html.Raw(Html.EncodedMultiLineText(Identify.Prettify(Model.Identify)))
 </div>
 <div>
     <form asp-action="Delete">
-        <input asp-for="Id" type="hidden" />
+        <input asp-for="Id" type="hidden"/>
         <a asp-action="Index" class="btn btn-primary">Back to List</a>
-        <input class="btn btn-danger" type="submit" value="Delete" />
+        <input class="btn btn-danger" type="submit" value="Delete"/>
     </form>
 </div>
\ No newline at end of file
diff --git a/Aaru.Server/Areas/Admin/Views/Atas/Details.cshtml b/Aaru.Server/Areas/Admin/Views/Atas/Details.cshtml
index e3d3fa0c..51125934 100644
--- a/Aaru.Server/Areas/Admin/Views/Atas/Details.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/Atas/Details.cshtml
@@ -37,15 +37,15 @@
 }
 <div>
     <h4>ATA IDENTIFY DEVICE / ATAPI IDENTIFY PACKET DEVICE - ID = @Model.Id</h4>
-    <hr />
+    <hr/>
     @Html.Raw(Html.EncodedMultiLineText(Identify.Prettify(Model.Identify)))
 </div>
 <div>
     <form asp-action="Compare">
-        <input asp-for="Id" type="hidden" />
+        <input asp-for="Id" type="hidden"/>
         Compare to:
-        <input name="RightId" type="number" />
+        <input name="RightId" type="number"/>
         <a asp-action="Index" class="btn btn-secondary">Back to List</a>
-        <input class="btn btn-primary" type="submit" value="Compare" />
+        <input class="btn btn-primary" type="submit" value="Compare"/>
     </form>
 </div>
\ No newline at end of file
diff --git a/Aaru.Server/Areas/Admin/Views/Atas/Index.cshtml b/Aaru.Server/Areas/Admin/Views/Atas/Index.cshtml
index 2913a52a..1374d78b 100644
--- a/Aaru.Server/Areas/Admin/Views/Atas/Index.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/Atas/Index.cshtml
@@ -1,3 +1,4 @@
+@using Aaru.CommonTypes.Metadata
 @model IEnumerable<Aaru.CommonTypes.Metadata.Ata>
 
 @{
@@ -54,7 +55,7 @@
     </tr>
     </thead>
     <tbody>
-    @foreach(var item in Model)
+    @foreach(Ata item in Model)
     {
         <tr>
             <td>
diff --git a/Aaru.Server/Areas/Admin/Views/BlockDescriptors/Index.cshtml b/Aaru.Server/Areas/Admin/Views/BlockDescriptors/Index.cshtml
index 1090efee..9a746b70 100644
--- a/Aaru.Server/Areas/Admin/Views/BlockDescriptors/Index.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/BlockDescriptors/Index.cshtml
@@ -1,3 +1,4 @@
+@using Aaru.CommonTypes.Metadata
 @model IEnumerable<Aaru.CommonTypes.Metadata.BlockDescriptor>
 
 @{
@@ -49,7 +50,7 @@
     </tr>
     </thead>
     <tbody>
-    @foreach(var item in Model)
+    @foreach(BlockDescriptor item in Model)
     {
         <tr>
             <td>
diff --git a/Aaru.Server/Areas/Admin/Views/Chs/Consolidate.cshtml b/Aaru.Server/Areas/Admin/Views/Chs/Consolidate.cshtml
index f101bd91..ceaef526 100644
--- a/Aaru.Server/Areas/Admin/Views/Chs/Consolidate.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/Chs/Consolidate.cshtml
@@ -10,7 +10,7 @@
     <table class="table">
         <thead>
         <tbody>
-        @foreach(var item in Model.List)
+        @foreach(ChsModel item in Model.List)
         {
             <tr>
                 <td>
@@ -24,8 +24,8 @@
 <div>
     Do you want to remove the duplicates?
     <form asp-action="Consolidate" enctype="multipart/form-data">
-        <input asp-for="Json" name="models" type="hidden" />
+        <input asp-for="Json" name="models" type="hidden"/>
         <a asp-action="Index" class="btn btn-primary">Back to List</a>
-        <input class="btn btn-danger" type="submit" value="Consolidate" />
+        <input class="btn btn-danger" type="submit" value="Consolidate"/>
     </form>
 </div>
\ No newline at end of file
diff --git a/Aaru.Server/Areas/Admin/Views/Chs/Index.cshtml b/Aaru.Server/Areas/Admin/Views/Chs/Index.cshtml
index a03a2f1b..f06484fc 100644
--- a/Aaru.Server/Areas/Admin/Views/Chs/Index.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/Chs/Index.cshtml
@@ -1,3 +1,4 @@
+@using Aaru.CommonTypes.Metadata
 @model IEnumerable<Aaru.CommonTypes.Metadata.Chs>
 
 @{
@@ -51,7 +52,7 @@
     </tr>
     </thead>
     <tbody>
-    @foreach(var item in Model)
+    @foreach(Chs item in Model)
     {
         <tr>
             <td>
diff --git a/Aaru.Server/Areas/Admin/Views/Commands/Index.cshtml b/Aaru.Server/Areas/Admin/Views/Commands/Index.cshtml
index 5ea5899a..bf338fc9 100644
--- a/Aaru.Server/Areas/Admin/Views/Commands/Index.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/Commands/Index.cshtml
@@ -47,7 +47,7 @@
     </tr>
     </thead>
     <tbody>
-    @foreach(var item in Model)
+    @foreach(Command item in Model)
     {
         <tr>
             <td>
diff --git a/Aaru.Server/Areas/Admin/Views/CompactDiscOffsets/Delete.cshtml b/Aaru.Server/Areas/Admin/Views/CompactDiscOffsets/Delete.cshtml
index 2defc276..16ac6739 100644
--- a/Aaru.Server/Areas/Admin/Views/CompactDiscOffsets/Delete.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/CompactDiscOffsets/Delete.cshtml
@@ -36,7 +36,7 @@
 <h3>Are you sure you want to delete this?</h3>
 <div>
     <h4>Compact disc offset</h4>
-    <hr />
+    <hr/>
     <dl class="row">
         <dt class="col-sm-2">
             @Html.DisplayNameFor(model => model.AddedWhen)
@@ -82,8 +82,8 @@
         </dd>
     </dl>
     <form asp-action="Delete">
-        <input asp-for="Id" type="hidden" />
+        <input asp-for="Id" type="hidden"/>
         <a asp-action="Index" class="btn btn-primary">Back to List</a>
-        <input class="btn btn-danger" type="submit" value="Delete" />
+        <input class="btn btn-danger" type="submit" value="Delete"/>
     </form>
 </div>
\ No newline at end of file
diff --git a/Aaru.Server/Areas/Admin/Views/CompactDiscOffsets/Edit.cshtml b/Aaru.Server/Areas/Admin/Views/CompactDiscOffsets/Edit.cshtml
index b05a4c28..8f2115d0 100644
--- a/Aaru.Server/Areas/Admin/Views/CompactDiscOffsets/Edit.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/CompactDiscOffsets/Edit.cshtml
@@ -34,39 +34,39 @@
     // ****************************************************************************/
 }
 <h4>Compact disc offset</h4>
-<hr />
+<hr/>
 <div class="row">
     <div class="col-md-4">
         <form asp-action="Edit">
             <div asp-validation-summary="ModelOnly" class="text-danger"></div>
-            <input asp-for="Id" type="hidden" />
+            <input asp-for="Id" type="hidden"/>
             <div class="form-group">
                 <label asp-for="Manufacturer" class="control-label"></label>
-                <input asp-for="Manufacturer" class="form-control" />
+                <input asp-for="Manufacturer" class="form-control"/>
                 <span asp-validation-for="Manufacturer" class="text-danger"></span>
             </div>
             <div class="form-group">
                 <label asp-for="Model" class="control-label"></label>
-                <input asp-for="Model" class="form-control" />
+                <input asp-for="Model" class="form-control"/>
                 <span asp-validation-for="Model" class="text-danger"></span>
             </div>
             <div class="form-group">
                 <label asp-for="Offset" class="control-label"></label>
-                <input asp-for="Offset" class="form-control" />
+                <input asp-for="Offset" class="form-control"/>
                 <span asp-validation-for="Offset" class="text-danger"></span>
             </div>
             <div class="form-group">
                 <label asp-for="Submissions" class="control-label"></label>
-                <input asp-for="Submissions" class="form-control" />
+                <input asp-for="Submissions" class="form-control"/>
                 <span asp-validation-for="Submissions" class="text-danger"></span>
             </div>
             <div class="form-group">
                 <label asp-for="Agreement" class="control-label"></label>
-                <input asp-for="Agreement" class="form-control" />
+                <input asp-for="Agreement" class="form-control"/>
                 <span asp-validation-for="Agreement" class="text-danger"></span>
             </div>
             <div class="form-group">
-                <input class="btn btn-primary" type="submit" value="Save" />
+                <input class="btn btn-primary" type="submit" value="Save"/>
                 <a asp-action="Index" class="btn btn-secondary">Back to List</a>
             </div>
         </form>
diff --git a/Aaru.Server/Areas/Admin/Views/CompactDiscOffsets/Index.cshtml b/Aaru.Server/Areas/Admin/Views/CompactDiscOffsets/Index.cshtml
index 0b54026f..5de6f9d7 100644
--- a/Aaru.Server/Areas/Admin/Views/CompactDiscOffsets/Index.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/CompactDiscOffsets/Index.cshtml
@@ -63,7 +63,7 @@
     </tr>
     </thead>
     <tbody>
-    @foreach(var item in Model)
+    @foreach(CompactDiscOffset item in Model)
     {
         <tr>
             <td>
diff --git a/Aaru.Server/Areas/Admin/Views/DeviceStats/Delete.cshtml b/Aaru.Server/Areas/Admin/Views/DeviceStats/Delete.cshtml
index c480aa66..491e4e98 100644
--- a/Aaru.Server/Areas/Admin/Views/DeviceStats/Delete.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/DeviceStats/Delete.cshtml
@@ -36,7 +36,7 @@
 <h3>Are you sure you want to delete this?</h3>
 <div>
     <h4>Device statistic</h4>
-    <hr />
+    <hr/>
     <dl class="row">
         <dt class="col-sm-2">
             @Html.DisplayNameFor(model => model.Manufacturer)
@@ -64,8 +64,8 @@
         </dd>
     </dl>
     <form asp-action="Delete">
-        <input asp-for="Id" type="hidden" />
+        <input asp-for="Id" type="hidden"/>
         <a asp-action="Index" class="btn btn-primary">Back to List</a>
-        <input class="btn btn-danger" type="submit" value="Delete" />
+        <input class="btn btn-danger" type="submit" value="Delete"/>
     </form>
 </div>
\ No newline at end of file
diff --git a/Aaru.Server/Areas/Admin/Views/DeviceStats/Edit.cshtml b/Aaru.Server/Areas/Admin/Views/DeviceStats/Edit.cshtml
index d7bf064d..044e276d 100644
--- a/Aaru.Server/Areas/Admin/Views/DeviceStats/Edit.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/DeviceStats/Edit.cshtml
@@ -34,34 +34,34 @@
     // ****************************************************************************/
 }
 <h4>Device statistic</h4>
-<hr />
+<hr/>
 <div class="row">
     <div class="col-md-4">
         <form asp-action="Edit">
             <div asp-validation-summary="ModelOnly" class="text-danger"></div>
-            <input asp-for="Id" type="hidden" />
+            <input asp-for="Id" type="hidden"/>
             <div class="form-group">
                 <label asp-for="Manufacturer" class="control-label"></label>
-                <input asp-for="Manufacturer" class="form-control" />
+                <input asp-for="Manufacturer" class="form-control"/>
                 <span asp-validation-for="Manufacturer" class="text-danger"></span>
             </div>
             <div class="form-group">
                 <label asp-for="Model" class="control-label"></label>
-                <input asp-for="Model" class="form-control" />
+                <input asp-for="Model" class="form-control"/>
                 <span asp-validation-for="Model" class="text-danger"></span>
             </div>
             <div class="form-group">
                 <label asp-for="Revision" class="control-label"></label>
-                <input asp-for="Revision" class="form-control" />
+                <input asp-for="Revision" class="form-control"/>
                 <span asp-validation-for="Revision" class="text-danger"></span>
             </div>
             <div class="form-group">
                 <label asp-for="Bus" class="control-label"></label>
-                <input asp-for="Bus" class="form-control" />
+                <input asp-for="Bus" class="form-control"/>
                 <span asp-validation-for="Bus" class="text-danger"></span>
             </div>
             <div class="form-group">
-                <input class="btn btn-primary" type="submit" value="Save" />
+                <input class="btn btn-primary" type="submit" value="Save"/>
                 <a asp-action="Index" class="btn btn-secondary">Back to List</a>
             </div>
         </form>
diff --git a/Aaru.Server/Areas/Admin/Views/DeviceStats/Index.cshtml b/Aaru.Server/Areas/Admin/Views/DeviceStats/Index.cshtml
index bac0a020..b578373b 100644
--- a/Aaru.Server/Areas/Admin/Views/DeviceStats/Index.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/DeviceStats/Index.cshtml
@@ -56,7 +56,7 @@
     </tr>
     </thead>
     <tbody>
-    @foreach(var item in Model)
+    @foreach(DeviceStat item in Model)
     {
         <tr>
             <td>
diff --git a/Aaru.Server/Areas/Admin/Views/Devices/Delete.cshtml b/Aaru.Server/Areas/Admin/Views/Devices/Delete.cshtml
index 19789ce2..7d36ca6f 100644
--- a/Aaru.Server/Areas/Admin/Views/Devices/Delete.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/Devices/Delete.cshtml
@@ -36,7 +36,7 @@
 <h3>Are you sure you want to delete this?</h3>
 <div>
     <h4>Device report</h4>
-    <hr />
+    <hr/>
     <dl class="row">
         <dt class="col-sm-2">
             @Html.DisplayNameFor(model => model.AddedWhen)
@@ -94,8 +94,8 @@
         </dd>
     </dl>
     <form asp-action="Delete">
-        <input asp-for="Id" type="hidden" />
+        <input asp-for="Id" type="hidden"/>
         <a asp-action="Index" class="btn btn-primary">Back to List</a>
-        <input class="btn btn-danger" type="submit" value="Delete" />
+        <input class="btn btn-danger" type="submit" value="Delete"/>
     </form>
 </div>
\ No newline at end of file
diff --git a/Aaru.Server/Areas/Admin/Views/Devices/Details.cshtml b/Aaru.Server/Areas/Admin/Views/Devices/Details.cshtml
index 57a03510..6e6cc0e0 100644
--- a/Aaru.Server/Areas/Admin/Views/Devices/Details.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/Devices/Details.cshtml
@@ -1,3 +1,4 @@
+@using Aaru.CommonTypes.Metadata
 @model DeviceDetails
 
 @{
@@ -35,7 +36,7 @@
 }
 <div>
     <h4>Device report</h4>
-    <hr />
+    <hr/>
     <dl class="row">
         <dt class="col-sm-2">
             @Html.DisplayNameFor(model => model.Report.AddedWhen)
@@ -171,7 +172,7 @@
             </tr>
             </thead>
             <tbody>
-            @foreach(var item in Model.SameAll)
+            @foreach(int item in Model.SameAll)
             {
                 <tr>
                     <td>
@@ -201,7 +202,7 @@
             </tr>
             </thead>
             <tbody>
-            @foreach(var item in Model.SameButManufacturer)
+            @foreach(int item in Model.SameButManufacturer)
             {
                 <tr>
                     <td>
@@ -231,7 +232,7 @@
             </tr>
             </thead>
             <tbody>
-            @foreach(var item in Model.ReportAll)
+            @foreach(int item in Model.ReportAll)
             {
                 <tr>
                     <td>
@@ -261,7 +262,7 @@
             </tr>
             </thead>
             <tbody>
-            @foreach(var item in Model.ReportButManufacturer)
+            @foreach(int item in Model.ReportButManufacturer)
             {
                 <tr>
                     <td>
@@ -303,7 +304,7 @@
             </tr>
             </thead>
             <tbody>
-            @foreach(var item in Model.StatsAll)
+            @foreach(DeviceStat item in Model.StatsAll)
             {
                 <tr>
                     <td>
@@ -370,7 +371,7 @@
             </tr>
             </thead>
             <tbody>
-            @foreach(var item in Model.StatsButManufacturer)
+            @foreach(DeviceStat item in Model.StatsButManufacturer)
             {
                 <tr>
                     <td>
@@ -424,7 +425,7 @@
             </tr>
             </thead>
             <tbody>
-            @foreach(var item in Model.TestedMedias)
+            @foreach(TestedMedia item in Model.TestedMedias)
             {
                 <tr>
                     <td>
@@ -465,7 +466,7 @@
             </tr>
             </thead>
             <tbody>
-            @foreach(var item in Model.TestedSequentialMedias)
+            @foreach(TestedSequentialMedia item in Model.TestedSequentialMedias)
             {
                 <tr>
                     <td>
diff --git a/Aaru.Server/Areas/Admin/Views/Devices/Edit.cshtml b/Aaru.Server/Areas/Admin/Views/Devices/Edit.cshtml
index f924d82b..436852d7 100644
--- a/Aaru.Server/Areas/Admin/Views/Devices/Edit.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/Devices/Edit.cshtml
@@ -35,40 +35,40 @@
     // ****************************************************************************/
 }
 <h4>Device report</h4>
-<hr />
+<hr/>
 <div class="row">
     <div class="col-md-4">
         <form asp-action="Edit">
             <div asp-validation-summary="ModelOnly" class="text-danger"></div>
-            <input asp-for="Id" type="hidden" />
+            <input asp-for="Id" type="hidden"/>
             <div class="form-group">
                 <label asp-for="Manufacturer" class="control-label"></label>
-                <input asp-for="Manufacturer" class="form-control" />
+                <input asp-for="Manufacturer" class="form-control"/>
                 <span asp-validation-for="Manufacturer" class="text-danger"></span>
             </div>
             <div class="form-group">
                 <label asp-for="Model" class="control-label"></label>
-                <input asp-for="Model" class="form-control" />
+                <input asp-for="Model" class="form-control"/>
                 <span asp-validation-for="Model" class="text-danger"></span>
             </div>
             <div class="form-group">
                 <label asp-for="Revision" class="control-label"></label>
-                <input asp-for="Revision" class="form-control" />
+                <input asp-for="Revision" class="form-control"/>
                 <span asp-validation-for="Revision" class="text-danger"></span>
             </div>
             <div class="form-check form-group">
                 <label class="form-check-label">
-                    <input asp-for="CompactFlash" class="form-check-input" /> @Html.DisplayNameFor(model => model.CompactFlash)
+                    <input asp-for="CompactFlash" class="form-check-input"/> @Html.DisplayNameFor(model => model.CompactFlash)
                 </label>
             </div>
             <div class="form-group">
                 <label asp-for="OptimalMultipleSectorsRead" class="control-label"></label>
-                <input asp-for="OptimalMultipleSectorsRead" class="form-control" />
+                <input asp-for="OptimalMultipleSectorsRead" class="form-control"/>
                 <span asp-validation-for="OptimalMultipleSectorsRead" class="text-danger"></span>
             </div>
             <div class="form-group">
                 <label asp-for="CanReadGdRomUsingSwapDisc" class="control-label"></label>
-                <input asp-for="CanReadGdRomUsingSwapDisc" class="form-control" />
+                <input asp-for="CanReadGdRomUsingSwapDisc" class="form-control"/>
                 <span asp-validation-for="CanReadGdRomUsingSwapDisc" class="text-danger"></span>
             </div>
             <div class="form-group">
@@ -77,7 +77,7 @@
                 <span asp-validation-for="Type" class="text-danger"></span>
             </div>
             <div class="form-group">
-                <input class="btn btn-primary" type="submit" value="Save" />
+                <input class="btn btn-primary" type="submit" value="Save"/>
                 <a asp-action="Index" class="btn btn-secondary">Back to List</a>
             </div>
         </form>
diff --git a/Aaru.Server/Areas/Admin/Views/Devices/Find.cshtml b/Aaru.Server/Areas/Admin/Views/Devices/Find.cshtml
index e1b76700..f0fd7d45 100644
--- a/Aaru.Server/Areas/Admin/Views/Devices/Find.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/Devices/Find.cshtml
@@ -35,7 +35,7 @@
 }
 <div>
     <h4>Found device reports with similar data</h4>
-    <hr />
+    <hr/>
     <dl class="row">
         <dt class="col-sm-2">
             @Html.DisplayNameFor(model => model.Manufacturer)
@@ -91,7 +91,7 @@ else
         </tr>
         </thead>
         <tbody>
-        @foreach(var item in Model.LikeDevices)
+        @foreach(Device item in Model.LikeDevices)
         {
             <tr>
                 <td>
diff --git a/Aaru.Server/Areas/Admin/Views/Devices/Index.cshtml b/Aaru.Server/Areas/Admin/Views/Devices/Index.cshtml
index 4d55de2d..148be75a 100644
--- a/Aaru.Server/Areas/Admin/Views/Devices/Index.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/Devices/Index.cshtml
@@ -62,7 +62,7 @@
     </tr>
     </thead>
     <tbody>
-    @foreach(var item in Model)
+    @foreach(Device item in Model)
     {
         <tr>
             <td>
diff --git a/Aaru.Server/Areas/Admin/Views/Filesystems/Index.cshtml b/Aaru.Server/Areas/Admin/Views/Filesystems/Index.cshtml
index f1cc82b8..d7c718f9 100644
--- a/Aaru.Server/Areas/Admin/Views/Filesystems/Index.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/Filesystems/Index.cshtml
@@ -46,7 +46,7 @@
     </tr>
     </thead>
     <tbody>
-    @foreach(var item in Model)
+    @foreach(Filesystem item in Model)
     {
         <tr>
             <td>
diff --git a/Aaru.Server/Areas/Admin/Views/Filters/Index.cshtml b/Aaru.Server/Areas/Admin/Views/Filters/Index.cshtml
index 54d6001b..5fd1a195 100644
--- a/Aaru.Server/Areas/Admin/Views/Filters/Index.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/Filters/Index.cshtml
@@ -46,7 +46,7 @@
     </tr>
     </thead>
     <tbody>
-    @foreach(var item in Model)
+    @foreach(Filter item in Model)
     {
         <tr>
             <td>
diff --git a/Aaru.Server/Areas/Admin/Views/FireWires/Consolidate.cshtml b/Aaru.Server/Areas/Admin/Views/FireWires/Consolidate.cshtml
index 7f3822fe..ed72dec7 100644
--- a/Aaru.Server/Areas/Admin/Views/FireWires/Consolidate.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/FireWires/Consolidate.cshtml
@@ -28,7 +28,7 @@
         </tr>
         </thead>
         <tbody>
-        @foreach(var item in Model.List)
+        @foreach(FireWireModel item in Model.List)
         {
             <tr>
                 <td>
@@ -54,8 +54,8 @@
 <div>
     Do you want to remove the duplicates?
     <form asp-action="Consolidate" enctype="multipart/form-data">
-        <input asp-for="Json" name="models" type="hidden" />
+        <input asp-for="Json" name="models" type="hidden"/>
         <a asp-action="Index" class="btn btn-primary">Back to List</a>
-        <input class="btn btn-danger" type="submit" value="Consolidate" />
+        <input class="btn btn-danger" type="submit" value="Consolidate"/>
     </form>
 </div>
\ No newline at end of file
diff --git a/Aaru.Server/Areas/Admin/Views/FireWires/Delete.cshtml b/Aaru.Server/Areas/Admin/Views/FireWires/Delete.cshtml
index 6bdb0bb1..9db61189 100644
--- a/Aaru.Server/Areas/Admin/Views/FireWires/Delete.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/FireWires/Delete.cshtml
@@ -36,7 +36,7 @@
 <h3>Are you sure you want to delete this?</h3>
 <div>
     <h4>FireWire registers</h4>
-    <hr />
+    <hr/>
     <dl class="row">
         <dt class="col-sm-2">
             @Html.DisplayNameFor(model => model.VendorID)
@@ -70,8 +70,8 @@
         </dd>
     </dl>
     <form asp-action="Delete">
-        <input asp-for="Id" type="hidden" />
+        <input asp-for="Id" type="hidden"/>
         <a asp-action="Index" class="btn btn-primary">Back to List</a>
-        <input class="btn btn-danger" type="submit" value="Delete" />
+        <input class="btn btn-danger" type="submit" value="Delete"/>
     </form>
 </div>
\ No newline at end of file
diff --git a/Aaru.Server/Areas/Admin/Views/FireWires/Edit.cshtml b/Aaru.Server/Areas/Admin/Views/FireWires/Edit.cshtml
index eccd1cc1..d8b1dc4c 100644
--- a/Aaru.Server/Areas/Admin/Views/FireWires/Edit.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/FireWires/Edit.cshtml
@@ -34,39 +34,39 @@
     // ****************************************************************************/
 }
 <h4>FireWire registers</h4>
-<hr />
+<hr/>
 <div class="row">
     <div class="col-md-4">
         <form asp-action="Edit">
             <div asp-validation-summary="ModelOnly" class="text-danger"></div>
-            <input asp-for="Id" type="hidden" />
+            <input asp-for="Id" type="hidden"/>
             <div class="form-group">
                 <label asp-for="VendorID" class="control-label"></label>
-                <input asp-for="VendorID" class="form-control" />
+                <input asp-for="VendorID" class="form-control"/>
                 <span asp-validation-for="VendorID" class="text-danger"></span>
             </div>
             <div class="form-group">
                 <label asp-for="ProductID" class="control-label"></label>
-                <input asp-for="ProductID" class="form-control" />
+                <input asp-for="ProductID" class="form-control"/>
                 <span asp-validation-for="ProductID" class="text-danger"></span>
             </div>
             <div class="form-group">
                 <label asp-for="Manufacturer" class="control-label"></label>
-                <input asp-for="Manufacturer" class="form-control" />
+                <input asp-for="Manufacturer" class="form-control"/>
                 <span asp-validation-for="Manufacturer" class="text-danger"></span>
             </div>
             <div class="form-group">
                 <label asp-for="Product" class="control-label"></label>
-                <input asp-for="Product" class="form-control" />
+                <input asp-for="Product" class="form-control"/>
                 <span asp-validation-for="Product" class="text-danger"></span>
             </div>
             <div class="form-check form-group">
                 <label class="form-check-label">
-                    <input asp-for="RemovableMedia" class="form-check-input" /> @Html.DisplayNameFor(model => model.RemovableMedia)
+                    <input asp-for="RemovableMedia" class="form-check-input"/> @Html.DisplayNameFor(model => model.RemovableMedia)
                 </label>
             </div>
             <div class="form-group">
-                <input class="btn btn-primary" type="submit" value="Save" />
+                <input class="btn btn-primary" type="submit" value="Save"/>
                 <a asp-action="Index" class="btn btn-secondary">Back to List</a>
             </div>
         </form>
diff --git a/Aaru.Server/Areas/Admin/Views/FireWires/Index.cshtml b/Aaru.Server/Areas/Admin/Views/FireWires/Index.cshtml
index f9f47e20..5a9c67a1 100644
--- a/Aaru.Server/Areas/Admin/Views/FireWires/Index.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/FireWires/Index.cshtml
@@ -1,3 +1,4 @@
+@using Aaru.CommonTypes.Metadata
 @model IEnumerable<Aaru.CommonTypes.Metadata.FireWire>
 
 @{
@@ -57,7 +58,7 @@
     </tr>
     </thead>
     <tbody>
-    @foreach(var item in Model)
+    @foreach(FireWire item in Model)
     {
         <tr>
             <td>
diff --git a/Aaru.Server/Areas/Admin/Views/GdRomSwapDiscCapabilities/Delete.cshtml b/Aaru.Server/Areas/Admin/Views/GdRomSwapDiscCapabilities/Delete.cshtml
index 56131ac1..d40e66a7 100644
--- a/Aaru.Server/Areas/Admin/Views/GdRomSwapDiscCapabilities/Delete.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/GdRomSwapDiscCapabilities/Delete.cshtml
@@ -37,7 +37,7 @@
 <h3>Are you sure you want to delete this?</h3>
 <div>
 <h2>GD-ROM swap-trick capabilities report</h2>
-<hr />
+<hr/>
 @if(Model.TestCrashed)
 {
     <h4>Computer crashed while testing.</h4>
@@ -45,7 +45,7 @@
 else if(Model.RecognizedSwapDisc)
 {
     <h4>Swap disc Lead-Out starts at @($"{Model.SwapDiscLeadOutPMIN:X2}"):@($"{Model.SwapDiscLeadOutPSEC:X2}"):@($"{Model.SwapDiscLeadOutPFRAM:X2}") (@($"{Model.SwapDiscLeadOutStart}") sectors).</h4>
-    <hr />
+    <hr/>
     <dl class="row">
         <dt class="col-sm-4">Minimum readable sector in HD area:</dt>
         <dd class="col-sm-8">@Model.MinimumReadableSectorInHdArea</dd>
@@ -1145,7 +1145,7 @@ else
     <h4>Swap disc not recognized, or firmware reset after tray opened.</h4>
 }
 <form asp-action="Delete">
-    <input asp-for="Id" type="hidden" />
-    <input class="btn btn-danger" type="submit" value="Delete" />
+    <input asp-for="Id" type="hidden"/>
+    <input class="btn btn-danger" type="submit" value="Delete"/>
 </form>
 </div>
\ No newline at end of file
diff --git a/Aaru.Server/Areas/Admin/Views/GdRomSwapDiscCapabilities/Details.cshtml b/Aaru.Server/Areas/Admin/Views/GdRomSwapDiscCapabilities/Details.cshtml
index 6346aa89..5ab834f2 100644
--- a/Aaru.Server/Areas/Admin/Views/GdRomSwapDiscCapabilities/Details.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/GdRomSwapDiscCapabilities/Details.cshtml
@@ -36,7 +36,7 @@
 }
 <div>
 <h2>GD-ROM swap-trick capabilities report</h2>
-<hr />
+<hr/>
 @if(Model.TestCrashed)
 {
     <h4>Computer crashed while testing.</h4>
@@ -44,7 +44,7 @@
 else if(Model.RecognizedSwapDisc)
 {
     <h4>Swap disc Lead-Out starts at @($"{Model.SwapDiscLeadOutPMIN:X2}"):@($"{Model.SwapDiscLeadOutPSEC:X2}"):@($"{Model.SwapDiscLeadOutPFRAM:X2}") (@($"{Model.SwapDiscLeadOutStart}") sectors).</h4>
-    <hr />
+    <hr/>
     <dl class="row">
         <dt class="col-sm-4">Minimum readable sector in HD area:</dt>
         <dd class="col-sm-8">@Model.MinimumReadableSectorInHdArea</dd>
diff --git a/Aaru.Server/Areas/Admin/Views/Home/Index.cshtml b/Aaru.Server/Areas/Admin/Views/Home/Index.cshtml
index d7368765..5e20f417 100644
--- a/Aaru.Server/Areas/Admin/Views/Home/Index.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/Home/Index.cshtml
@@ -32,66 +32,66 @@
     // ****************************************************************************/
 }
 <a asp-action="Index" asp-controller="Atas">ATA IDENTIFY DEVICE / ATAPI IDENTIFY PACKET DEVICE responses</a>
-<br />
+<br/>
 <a asp-action="Index" asp-controller="BlockDescriptors">SCSI Streaming Devices Block Descriptors</a>
-<br />
+<br/>
 <a asp-action="Index" asp-controller="Chs">Cylinders / Heads / Sectors triplets</a>
-<br />
+<br/>
 <a asp-action="Index" asp-controller="Commands">Commands used</a>
-<br />
+<br/>
 <a asp-action="Index" asp-controller="CompactDiscOffsets">Compact Disc Offsets</a>
-<br />
+<br/>
 <a asp-action="Index" asp-controller="Devices">Device reports</a>
-<br />
+<br/>
 <a asp-action="Index" asp-controller="DeviceStats">Device statistics</a>
-<br />
+<br/>
 <a asp-action="Index" asp-controller="Filesystems">Filesystems detected</a>
-<br />
+<br/>
 <a asp-action="Index" asp-controller="Filters">Filters detected</a>
-<br />
+<br/>
 <a asp-action="Index" asp-controller="FireWires">FireWire devices reported</a>
-<br />
+<br/>
 <a asp-action="Index" asp-controller="MediaFormats">Media image formats detected</a>
-<br />
+<br/>
 <a asp-action="Index" asp-controller="Medias">Media types detected</a>
-<br />
+<br/>
 <a asp-action="Index" asp-controller="Medias" asp-route-real="true">Media types detected in real devices</a>
-<br />
+<br/>
 <a asp-action="Index" asp-controller="Medias" asp-route-real="false">Media types detected in images</a>
-<br />
+<br/>
 <a asp-action="Index" asp-controller="Mmc">MODE SENSE page 2Ah responses</a>
-<br />
+<br/>
 <a asp-action="Index" asp-controller="MmcFeatures">MMC GET FEATURES responses</a>
-<br />
+<br/>
 <a asp-action="Index" asp-controller="MmcSds">MultiMediaCard / SecureDigital registers</a>
-<br />
+<br/>
 <a asp-action="Index" asp-controller="OperatingSystems">Operating systems detected</a>
-<br />
+<br/>
 <a asp-action="Index" asp-controller="Partitions">Partitioning schemes detected</a>
-<br />
+<br/>
 <a asp-action="Index" asp-controller="Pcmcias">PCMCIA card registers</a>
-<br />
+<br/>
 <a asp-action="Index" asp-controller="Reports">Uploaded reports</a>
-<br />
+<br/>
 <a asp-action="Index" asp-controller="ScsiModes">SCSI MODE SENSE responses</a>
-<br />
+<br/>
 <a asp-action="Index" asp-controller="ScsiPages">SCSI MODE SENSE pages</a>
-<br />
+<br/>
 <a asp-action="Index" asp-controller="Scsis">SCSI INQUIRY responses</a>
-<br />
+<br/>
 <a asp-action="Index" asp-controller="Sscs">SCSI STREAMING COMMANDS limits</a>
-<br />
+<br/>
 <a asp-action="Index" asp-controller="SupportedDensities">SCSI supported densities</a>
-<br />
+<br/>
 <a asp-action="Index" asp-controller="TestedMedias">Tested media</a>
-<br />
+<br/>
 <a asp-action="Index" asp-controller="TestedSequentialMedias">Tested media on SCSI streaming devices</a>
-<br />
+<br/>
 <a asp-action="Index" asp-controller="Usbs">USB devices</a>
-<br />
+<br/>
 <a asp-action="Index" asp-controller="UsbProducts">USB products</a>
-<br />
+<br/>
 <a asp-action="Index" asp-controller="UsbVendors">USB vendors</a>
-<br />
+<br/>
 <a asp-action="Index" asp-controller="Versions">Aaru versions used</a>
 <br/>
\ No newline at end of file
diff --git a/Aaru.Server/Areas/Admin/Views/MediaFormats/Delete.cshtml b/Aaru.Server/Areas/Admin/Views/MediaFormats/Delete.cshtml
index eb43048b..345a596f 100644
--- a/Aaru.Server/Areas/Admin/Views/MediaFormats/Delete.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/MediaFormats/Delete.cshtml
@@ -36,7 +36,7 @@
 <h3>Are you sure you want to delete this?</h3>
 <div>
     <h4>Media image format</h4>
-    <hr />
+    <hr/>
     <dl class="row">
         <dt class="col-sm-2">
             @Html.DisplayNameFor(model => model.Name)
@@ -52,8 +52,8 @@
         </dd>
     </dl>
     <form asp-action="Delete">
-        <input asp-for="Id" type="hidden" />
+        <input asp-for="Id" type="hidden"/>
         <a asp-action="Index" class="btn btn-primary">Back to List</a>
-        <input class="btn btn-danger" type="submit" value="Delete" />
+        <input class="btn btn-danger" type="submit" value="Delete"/>
     </form>
 </div>
\ No newline at end of file
diff --git a/Aaru.Server/Areas/Admin/Views/MediaFormats/Index.cshtml b/Aaru.Server/Areas/Admin/Views/MediaFormats/Index.cshtml
index 95339ef5..15aa0e25 100644
--- a/Aaru.Server/Areas/Admin/Views/MediaFormats/Index.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/MediaFormats/Index.cshtml
@@ -47,7 +47,7 @@
     </tr>
     </thead>
     <tbody>
-    @foreach(var item in Model)
+    @foreach(MediaFormat item in Model)
     {
         <tr>
             <td>
diff --git a/Aaru.Server/Areas/Admin/Views/Medias/Delete.cshtml b/Aaru.Server/Areas/Admin/Views/Medias/Delete.cshtml
index a672d5e6..c7104e3d 100644
--- a/Aaru.Server/Areas/Admin/Views/Medias/Delete.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/Medias/Delete.cshtml
@@ -36,7 +36,7 @@
 <h3>Are you sure you want to delete this?</h3>
 <div>
     <h4>Media</h4>
-    <hr />
+    <hr/>
     <dl class="row">
         <dt class="col-sm-2">
             @Html.DisplayNameFor(model => model.Type)
@@ -58,8 +58,8 @@
         </dd>
     </dl>
     <form asp-action="Delete">
-        <input asp-for="Id" type="hidden" />
+        <input asp-for="Id" type="hidden"/>
         <a asp-action="Index" class="btn btn-primary">Back to List</a>
-        <input class="btn btn-danger" type="submit" value="Delete" />
+        <input class="btn btn-danger" type="submit" value="Delete"/>
     </form>
 </div>
\ No newline at end of file
diff --git a/Aaru.Server/Areas/Admin/Views/Medias/Index.cshtml b/Aaru.Server/Areas/Admin/Views/Medias/Index.cshtml
index eab44b85..8d030634 100644
--- a/Aaru.Server/Areas/Admin/Views/Medias/Index.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/Medias/Index.cshtml
@@ -53,7 +53,7 @@
     </tr>
     </thead>
     <tbody>
-    @foreach(var item in Model)
+    @foreach(Media item in Model)
     {
         <tr>
             <td>
diff --git a/Aaru.Server/Areas/Admin/Views/Mmc/Delete.cshtml b/Aaru.Server/Areas/Admin/Views/Mmc/Delete.cshtml
index 43248249..7799f254 100644
--- a/Aaru.Server/Areas/Admin/Views/Mmc/Delete.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/Mmc/Delete.cshtml
@@ -38,11 +38,11 @@
 <h3>Are you sure you want to delete this?</h3>
 <div>
     <h4>SCSI CD-ROM capabilities page - ID = @Model.Id</h4>
-    <hr />
+    <hr/>
     @Html.Raw(Html.EncodedMultiLineText(Modes.PrettifyModePage_2A(Model.ModeSense2AData)))
     <form asp-action="Delete">
-        <input asp-for="Id" type="hidden" />
+        <input asp-for="Id" type="hidden"/>
         <a asp-action="Index" class="btn btn-primary">Back to List</a>
-        <input class="btn btn-danger" type="submit" value="Delete" />
+        <input class="btn btn-danger" type="submit" value="Delete"/>
     </form>
 </div>
\ No newline at end of file
diff --git a/Aaru.Server/Areas/Admin/Views/Mmc/Details.cshtml b/Aaru.Server/Areas/Admin/Views/Mmc/Details.cshtml
index 97288d05..1dcd27db 100644
--- a/Aaru.Server/Areas/Admin/Views/Mmc/Details.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/Mmc/Details.cshtml
@@ -37,7 +37,7 @@
 }
 <div>
     <h4>SCSI CD-ROM capabilities page - ID = @Model.Id</h4>
-    <hr />
+    <hr/>
     @Html.Raw(Html.EncodedMultiLineText(Modes.PrettifyModePage_2A(Model.ModeSense2AData)))
 </div>
 <div>
diff --git a/Aaru.Server/Areas/Admin/Views/Mmc/Index.cshtml b/Aaru.Server/Areas/Admin/Views/Mmc/Index.cshtml
index 2bfb4e0b..ac2a355a 100644
--- a/Aaru.Server/Areas/Admin/Views/Mmc/Index.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/Mmc/Index.cshtml
@@ -51,7 +51,7 @@
     </tr>
     </thead>
     <tbody>
-    @foreach(var item in Model)
+    @foreach(MmcModelForView item in Model)
     {
         <tr>
             <td>
diff --git a/Aaru.Server/Areas/Admin/Views/MmcFeatures/Details.cshtml b/Aaru.Server/Areas/Admin/Views/MmcFeatures/Details.cshtml
index 453147f2..299896e5 100644
--- a/Aaru.Server/Areas/Admin/Views/MmcFeatures/Details.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/MmcFeatures/Details.cshtml
@@ -35,7 +35,7 @@
 }
 <div>
 <h4>MMC FEATURES</h4>
-<hr />
+<hr/>
 <dl class="row">
 <dt class="col-sm-2">
     @Html.DisplayNameFor(model => model.AACSVersion)
diff --git a/Aaru.Server/Areas/Admin/Views/MmcFeatures/Index.cshtml b/Aaru.Server/Areas/Admin/Views/MmcFeatures/Index.cshtml
index a035f7f5..8f9c5658 100644
--- a/Aaru.Server/Areas/Admin/Views/MmcFeatures/Index.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/MmcFeatures/Index.cshtml
@@ -1,3 +1,4 @@
+@using Aaru.CommonTypes.Metadata
 @model IEnumerable<Aaru.CommonTypes.Metadata.MmcFeatures>
 
 @{
@@ -410,7 +411,7 @@
 </tr>
 </thead>
 <tbody>
-@foreach(var item in Model)
+@foreach(MmcFeatures item in Model)
 {
     <tr>
     <td>
diff --git a/Aaru.Server/Areas/Admin/Views/MmcSds/Delete.cshtml b/Aaru.Server/Areas/Admin/Views/MmcSds/Delete.cshtml
index 33017bfd..c3a753cb 100644
--- a/Aaru.Server/Areas/Admin/Views/MmcSds/Delete.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/MmcSds/Delete.cshtml
@@ -38,7 +38,7 @@
 <h3>Are you sure you want to delete this?</h3>
 <div>
     <h4>MultiMediaCard / SecureDigital registers</h4>
-    <hr />
+    <hr/>
     <dl class="row">
         @if(Model.SCR != null)
         {
@@ -119,8 +119,8 @@
         }
     </dl>
     <form asp-action="Delete">
-        <input asp-for="Id" type="hidden" />
+        <input asp-for="Id" type="hidden"/>
         <a asp-action="Index" class="btn btn-primary">Back to List</a>
-        <input class="btn btn-danger" type="submit" value="Delete" />
+        <input class="btn btn-danger" type="submit" value="Delete"/>
     </form>
 </div>
\ No newline at end of file
diff --git a/Aaru.Server/Areas/Admin/Views/MmcSds/Details.cshtml b/Aaru.Server/Areas/Admin/Views/MmcSds/Details.cshtml
index f8566a45..1832d095 100644
--- a/Aaru.Server/Areas/Admin/Views/MmcSds/Details.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/MmcSds/Details.cshtml
@@ -37,7 +37,7 @@
 }
 <div>
     <h4>MultiMediaCard / SecureDigital registers</h4>
-    <hr />
+    <hr/>
     <dl class="row">
         @if(Model.SCR != null)
         {
diff --git a/Aaru.Server/Areas/Admin/Views/MmcSds/Index.cshtml b/Aaru.Server/Areas/Admin/Views/MmcSds/Index.cshtml
index 5ea6acc4..caa65364 100644
--- a/Aaru.Server/Areas/Admin/Views/MmcSds/Index.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/MmcSds/Index.cshtml
@@ -1,3 +1,4 @@
+@using Aaru.CommonTypes.Metadata
 @model IEnumerable<Aaru.CommonTypes.Metadata.MmcSd>
 
 @{
@@ -44,7 +45,7 @@
     </tr>
     </thead>
     <tbody>
-    @foreach(var item in Model)
+    @foreach(MmcSd item in Model)
     {
         <tr>
             <td>
diff --git a/Aaru.Server/Areas/Admin/Views/OperatingSystems/Index.cshtml b/Aaru.Server/Areas/Admin/Views/OperatingSystems/Index.cshtml
index b40a8915..6edac835 100644
--- a/Aaru.Server/Areas/Admin/Views/OperatingSystems/Index.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/OperatingSystems/Index.cshtml
@@ -1,3 +1,4 @@
+@using OperatingSystem = Aaru.Server.Models.OperatingSystem
 @model IEnumerable<Aaru.Server.Models.OperatingSystem>
 
 @{
@@ -49,7 +50,7 @@
     </tr>
     </thead>
     <tbody>
-    @foreach(var item in Model)
+    @foreach(OperatingSystem item in Model)
     {
         <tr>
             <td>
diff --git a/Aaru.Server/Areas/Admin/Views/Partitions/Index.cshtml b/Aaru.Server/Areas/Admin/Views/Partitions/Index.cshtml
index adc62c33..3c98d5b7 100644
--- a/Aaru.Server/Areas/Admin/Views/Partitions/Index.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/Partitions/Index.cshtml
@@ -46,7 +46,7 @@
     </tr>
     </thead>
     <tbody>
-    @foreach(var item in Model)
+    @foreach(Partition item in Model)
     {
         <tr>
             <td>
diff --git a/Aaru.Server/Areas/Admin/Views/Pcmcias/Delete.cshtml b/Aaru.Server/Areas/Admin/Views/Pcmcias/Delete.cshtml
index c6af7be2..d18a0ff9 100644
--- a/Aaru.Server/Areas/Admin/Views/Pcmcias/Delete.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/Pcmcias/Delete.cshtml
@@ -36,7 +36,7 @@
 <h3>Are you sure you want to delete this?</h3>
 <div>
     <h4>PCMCIA data</h4>
-    <hr />
+    <hr/>
     <dl class="row">
         <dt class="col-sm-2">
             @Html.DisplayNameFor(model => model.CIS)
@@ -76,8 +76,8 @@
         </dd>
     </dl>
     <form asp-action="Delete">
-        <input asp-for="Id" type="hidden" />
+        <input asp-for="Id" type="hidden"/>
         <a asp-action="Index" class="btn btn-primary">Back to List</a>
-        <input class="btn btn-danger" type="submit" value="Delete" />
+        <input class="btn btn-danger" type="submit" value="Delete"/>
     </form>
 </div>
\ No newline at end of file
diff --git a/Aaru.Server/Areas/Admin/Views/Pcmcias/Index.cshtml b/Aaru.Server/Areas/Admin/Views/Pcmcias/Index.cshtml
index 229f2d2e..0b646d29 100644
--- a/Aaru.Server/Areas/Admin/Views/Pcmcias/Index.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/Pcmcias/Index.cshtml
@@ -1,3 +1,4 @@
+@using Aaru.CommonTypes.Metadata
 @model IEnumerable<Aaru.CommonTypes.Metadata.Pcmcia>
 
 @{
@@ -59,7 +60,7 @@
     </tr>
     </thead>
     <tbody>
-    @foreach(var item in Model)
+    @foreach(Pcmcia item in Model)
     {
         <tr>
             <td>
diff --git a/Aaru.Server/Areas/Admin/Views/Reports/Delete.cshtml b/Aaru.Server/Areas/Admin/Views/Reports/Delete.cshtml
index 17510fbd..e8c2f60f 100644
--- a/Aaru.Server/Areas/Admin/Views/Reports/Delete.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/Reports/Delete.cshtml
@@ -6,7 +6,7 @@
 <h3>Are you sure you want to delete this?</h3>
 <div>
     <h4>Uploaded report</h4>
-    <hr />
+    <hr/>
     <dl class="row">
         <dt class="col-sm-2">
             @Html.DisplayNameFor(model => model.UploadedWhen)
@@ -46,8 +46,8 @@
         </dd>
     </dl>
     <form asp-action="Delete">
-        <input asp-for="Id" type="hidden" />
+        <input asp-for="Id" type="hidden"/>
         <a asp-action="Index" class="btn btn-primary">Back to List</a>
-        <input class="btn btn-danger" type="submit" value="Delete" />
+        <input class="btn btn-danger" type="submit" value="Delete"/>
     </form>
 </div>
\ No newline at end of file
diff --git a/Aaru.Server/Areas/Admin/Views/Reports/Details.cshtml b/Aaru.Server/Areas/Admin/Views/Reports/Details.cshtml
index 899f4f15..2a769abb 100644
--- a/Aaru.Server/Areas/Admin/Views/Reports/Details.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/Reports/Details.cshtml
@@ -1,3 +1,4 @@
+@using Aaru.CommonTypes.Metadata
 @model UploadedReportDetails
 
 @{
@@ -5,7 +6,7 @@
 }
 <div>
     <h4>Uploaded report</h4>
-    <hr />
+    <hr/>
     <dl class="row">
         <dt class="col-sm-2">
             @Html.DisplayNameFor(model => model.Report.UploadedWhen)
@@ -124,7 +125,7 @@
             </tr>
             </thead>
             <tbody>
-            @foreach(var item in Model.SameAll)
+            @foreach(int item in Model.SameAll)
             {
                 <tr>
                     <td>
@@ -154,7 +155,7 @@
             </tr>
             </thead>
             <tbody>
-            @foreach(var item in Model.SameButManufacturer)
+            @foreach(int item in Model.SameButManufacturer)
             {
                 <tr>
                     <td>
@@ -184,7 +185,7 @@
             </tr>
             </thead>
             <tbody>
-            @foreach(var item in Model.ReportAll)
+            @foreach(int item in Model.ReportAll)
             {
                 <tr>
                     <td>
@@ -214,7 +215,7 @@
             </tr>
             </thead>
             <tbody>
-            @foreach(var item in Model.ReportButManufacturer)
+            @foreach(int item in Model.ReportButManufacturer)
             {
                 <tr>
                     <td>
@@ -250,7 +251,7 @@
             </tr>
             </thead>
             <tbody>
-            @foreach(var item in Model.TestedMedias)
+            @foreach(TestedMedia item in Model.TestedMedias)
             {
                 <tr>
                     <td>
@@ -291,7 +292,7 @@
             </tr>
             </thead>
             <tbody>
-            @foreach(var item in Model.TestedSequentialMedias)
+            @foreach(TestedSequentialMedia item in Model.TestedSequentialMedias)
             {
                 <tr>
                     <td>
diff --git a/Aaru.Server/Areas/Admin/Views/Reports/Edit.cshtml b/Aaru.Server/Areas/Admin/Views/Reports/Edit.cshtml
index 320aa9df..bf59205b 100644
--- a/Aaru.Server/Areas/Admin/Views/Reports/Edit.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/Reports/Edit.cshtml
@@ -5,30 +5,30 @@
     ViewData["Title"] = "Edit";
 }
 <h4>Uploaded report</h4>
-<hr />
+<hr/>
 <div class="row">
     <div class="col-md-4">
         <form asp-action="Edit">
             <div asp-validation-summary="ModelOnly" class="text-danger"></div>
-            <input asp-for="Id" type="hidden" />
+            <input asp-for="Id" type="hidden"/>
             <div class="form-group">
                 <label asp-for="Manufacturer" class="control-label"></label>
-                <input asp-for="Manufacturer" class="form-control" />
+                <input asp-for="Manufacturer" class="form-control"/>
                 <span asp-validation-for="Manufacturer" class="text-danger"></span>
             </div>
             <div class="form-group">
                 <label asp-for="Model" class="control-label"></label>
-                <input asp-for="Model" class="form-control" />
+                <input asp-for="Model" class="form-control"/>
                 <span asp-validation-for="Model" class="text-danger"></span>
             </div>
             <div class="form-group">
                 <label asp-for="Revision" class="control-label"></label>
-                <input asp-for="Revision" class="form-control" />
+                <input asp-for="Revision" class="form-control"/>
                 <span asp-validation-for="Revision" class="text-danger"></span>
             </div>
             <div class="form-check form-group">
                 <label class="form-check-label">
-                    <input asp-for="CompactFlash" class="form-check-input" /> @Html.DisplayNameFor(model => model.CompactFlash)
+                    <input asp-for="CompactFlash" class="form-check-input"/> @Html.DisplayNameFor(model => model.CompactFlash)
                 </label>
             </div>
             <div class="form-group">
@@ -37,7 +37,7 @@
                 <span asp-validation-for="Type" class="text-danger"></span>
             </div>
             <div class="form-group">
-                <input class="btn btn-primary" type="submit" value="Save" />
+                <input class="btn btn-primary" type="submit" value="Save"/>
                 <a asp-action="Index" class="btn btn-secondary">Back to List</a>
             </div>
         </form>
diff --git a/Aaru.Server/Areas/Admin/Views/Reports/Index.cshtml b/Aaru.Server/Areas/Admin/Views/Reports/Index.cshtml
index 13493692..1d500f6c 100644
--- a/Aaru.Server/Areas/Admin/Views/Reports/Index.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/Reports/Index.cshtml
@@ -26,7 +26,7 @@
     </tr>
     </thead>
     <tbody>
-    @foreach(var item in Model)
+    @foreach(UploadedReport item in Model)
     {
         <tr>
             <td>
diff --git a/Aaru.Server/Areas/Admin/Views/ScsiModes/Delete.cshtml b/Aaru.Server/Areas/Admin/Views/ScsiModes/Delete.cshtml
index 19a9583b..6fc41987 100644
--- a/Aaru.Server/Areas/Admin/Views/ScsiModes/Delete.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/ScsiModes/Delete.cshtml
@@ -36,7 +36,7 @@
 <h3>Are you sure you want to delete this?</h3>
 <div>
     <h4>SCSI MODE SENSE response</h4>
-    <hr />
+    <hr/>
     <dl class="row">
         <dt class="col-sm-2">
             @Html.DisplayNameFor(model => model.MediumType)
@@ -76,8 +76,8 @@
         </dd>
     </dl>
     <form asp-action="Delete">
-        <input asp-for="Id" type="hidden" />
+        <input asp-for="Id" type="hidden"/>
         <a asp-action="Index" class="btn btn-primary">Back to List</a>
-        <input class="btn btn-danger" type="submit" value="Delete" />
+        <input class="btn btn-danger" type="submit" value="Delete"/>
     </form>
 </div>
\ No newline at end of file
diff --git a/Aaru.Server/Areas/Admin/Views/ScsiModes/Index.cshtml b/Aaru.Server/Areas/Admin/Views/ScsiModes/Index.cshtml
index 8bffc04a..9de806c5 100644
--- a/Aaru.Server/Areas/Admin/Views/ScsiModes/Index.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/ScsiModes/Index.cshtml
@@ -1,3 +1,4 @@
+@using Aaru.CommonTypes.Metadata
 @model IEnumerable<Aaru.CommonTypes.Metadata.ScsiMode>
 
 @{
@@ -59,7 +60,7 @@
     </tr>
     </thead>
     <tbody>
-    @foreach(var item in Model)
+    @foreach(ScsiMode item in Model)
     {
         <tr>
             <td>
diff --git a/Aaru.Server/Areas/Admin/Views/ScsiPages/Delete.cshtml b/Aaru.Server/Areas/Admin/Views/ScsiPages/Delete.cshtml
index 592824ef..55dc6dc1 100644
--- a/Aaru.Server/Areas/Admin/Views/ScsiPages/Delete.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/ScsiPages/Delete.cshtml
@@ -36,7 +36,7 @@
 <h3>Are you sure you want to delete this?</h3>
 <div>
     <h4>ScsiPage</h4>
-    <hr />
+    <hr/>
     <dl class="row">
         <dt class="col-sm-2">
             @Html.DisplayNameFor(model => model.page)
@@ -58,8 +58,8 @@
         </dd>
     </dl>
     <form asp-action="Delete">
-        <input asp-for="Id" type="hidden" />
+        <input asp-for="Id" type="hidden"/>
         <a asp-action="Index" class="btn btn-primary">Back to List</a>
-        <input class="btn btn-danger" type="submit" value="Delete" />
+        <input class="btn btn-danger" type="submit" value="Delete"/>
     </form>
 </div>
\ No newline at end of file
diff --git a/Aaru.Server/Areas/Admin/Views/ScsiPages/Index.cshtml b/Aaru.Server/Areas/Admin/Views/ScsiPages/Index.cshtml
index 5c0a77a3..7c3f1da1 100644
--- a/Aaru.Server/Areas/Admin/Views/ScsiPages/Index.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/ScsiPages/Index.cshtml
@@ -1,3 +1,4 @@
+@using Aaru.CommonTypes.Metadata
 @model IEnumerable<Aaru.CommonTypes.Metadata.ScsiPage>
 
 @{
@@ -47,7 +48,7 @@
     </tr>
     </thead>
     <tbody>
-    @foreach(var item in Model)
+    @foreach(ScsiPage item in Model)
     {
         <tr>
             <td>
diff --git a/Aaru.Server/Areas/Admin/Views/Scsis/Consolidate.cshtml b/Aaru.Server/Areas/Admin/Views/Scsis/Consolidate.cshtml
index 2241e030..58be2e30 100644
--- a/Aaru.Server/Areas/Admin/Views/Scsis/Consolidate.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/Scsis/Consolidate.cshtml
@@ -10,7 +10,7 @@
     <table class="table">
         <thead>
         <tbody>
-        @foreach(var item in Model.List)
+        @foreach(IdHashModel item in Model.List)
         {
             <tr>
                 <td>
@@ -24,8 +24,8 @@
 <div>
     Do you want to remove the duplicates?
     <form asp-action="Consolidate" enctype="multipart/form-data">
-        <input asp-for="Json" name="models" type="hidden" />
+        <input asp-for="Json" name="models" type="hidden"/>
         <a asp-action="Index" class="btn btn-primary">Back to List</a>
-        <input class="btn btn-danger" type="submit" value="Consolidate" />
+        <input class="btn btn-danger" type="submit" value="Consolidate"/>
     </form>
 </div>
\ No newline at end of file
diff --git a/Aaru.Server/Areas/Admin/Views/Scsis/Delete.cshtml b/Aaru.Server/Areas/Admin/Views/Scsis/Delete.cshtml
index 17202704..8cc44619 100644
--- a/Aaru.Server/Areas/Admin/Views/Scsis/Delete.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/Scsis/Delete.cshtml
@@ -38,11 +38,11 @@
 <h3>Are you sure you want to delete this?</h3>
 <div>
     <h4>SCSI INQUIRY - ID = @Model.Id</h4>
-    <hr />
+    <hr/>
     @Html.Raw(Html.EncodedMultiLineText(Inquiry.Prettify(Model.InquiryData)))
     <form asp-action="Delete">
-        <input asp-for="Id" type="hidden" />
+        <input asp-for="Id" type="hidden"/>
         <a asp-action="Index" class="btn btn-primary">Back to List</a>
-        <input class="btn btn-danger" type="submit" value="Delete" />
+        <input class="btn btn-danger" type="submit" value="Delete"/>
     </form>
 </div>
\ No newline at end of file
diff --git a/Aaru.Server/Areas/Admin/Views/Scsis/Details.cshtml b/Aaru.Server/Areas/Admin/Views/Scsis/Details.cshtml
index f019413c..bd43cba6 100644
--- a/Aaru.Server/Areas/Admin/Views/Scsis/Details.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/Scsis/Details.cshtml
@@ -37,15 +37,15 @@
 }
 <div>
     <h4>SCSI INQUIRY - ID = @Model.Id</h4>
-    <hr />
+    <hr/>
     @Html.Raw(Html.EncodedMultiLineText(Inquiry.Prettify(Model.InquiryData)))
 </div>
 <div>
     <form asp-action="Compare">
-        <input asp-for="Id" type="hidden" />
+        <input asp-for="Id" type="hidden"/>
         Compare to:
-        <input name="RightId" type="number" />
+        <input name="RightId" type="number"/>
         <a asp-action="Index" class="btn btn-secondary">Back to List</a>
-        <input class="btn btn-primary" type="submit" value="Compare" />
+        <input class="btn btn-primary" type="submit" value="Compare"/>
     </form>
 </div>
\ No newline at end of file
diff --git a/Aaru.Server/Areas/Admin/Views/Scsis/Index.cshtml b/Aaru.Server/Areas/Admin/Views/Scsis/Index.cshtml
index 7e4e2df6..45cf8efb 100644
--- a/Aaru.Server/Areas/Admin/Views/Scsis/Index.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/Scsis/Index.cshtml
@@ -1,3 +1,4 @@
+@using Aaru.CommonTypes.Metadata
 @using Aaru.Helpers
 @model IEnumerable<Aaru.CommonTypes.Metadata.Scsi>
 
@@ -66,7 +67,7 @@
     </tr>
     </thead>
     <tbody>
-    @foreach(var item in Model)
+    @foreach(Scsi item in Model)
     {
         <tr>
             <td>
diff --git a/Aaru.Server/Areas/Admin/Views/Shared/_Layout.cshtml b/Aaru.Server/Areas/Admin/Views/Shared/_Layout.cshtml
index ff2854a3..336059c2 100644
--- a/Aaru.Server/Areas/Admin/Views/Shared/_Layout.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/Shared/_Layout.cshtml
@@ -42,20 +42,20 @@
     {
         // 24th January, Macintosh launch
         case 24:
-            <link href="~/css/mac/aaruserver.css" rel="stylesheet" type="text/css" />
+            <link href="~/css/mac/aaruserver.css" rel="stylesheet" type="text/css"/>
             <script src="~/js/colors/mac.js"></script>
             break;
         // 23rd July, Amiga launch
         case 204:
-            <link href="~/css/amiga/aaruserver.css" rel="stylesheet" type="text/css" />
+            <link href="~/css/amiga/aaruserver.css" rel="stylesheet" type="text/css"/>
             <script src="~/js/colors/amiga.js"></script>
             break;
         default:
-            <link href="~/css/dos/aaruserver.css" rel="stylesheet" type="text/css" />
+            <link href="~/css/dos/aaruserver.css" rel="stylesheet" type="text/css"/>
             <script src="~/js/colors/dos.js"></script>
             break;
     }
-    <meta charset="utf-8" />
+    <meta charset="utf-8"/>
     <title>@ViewBag.Title</title>
     <!-- Global site tag (gtag.js) - Google Analytics -->
     <script async src="https://www.googletagmanager.com/gtag/js?id=UA-111466173-1"></script>
@@ -100,7 +100,7 @@
     <a href="http://www.claunia.com" target="_blank">
         Claunia.com
     </a>
-    <br />
+    <br/>
     @switch(DateTime.UtcNow.DayOfYear)
     {
         // 24th January, Macintosh launch
@@ -115,7 +115,7 @@
             @Html.Raw("Fonts are © 2015 - 2016 <a href=\"http://int10h.org\" target=\"_blank\">VileR</a>")
             break;
     }
-    <br />
+    <br/>
     CSS © 2018-2019
     <a href="https://getbootstrap.com/" target="_blank">
         Bootstrap
diff --git a/Aaru.Server/Areas/Admin/Views/Sscs/Consolidate.cshtml b/Aaru.Server/Areas/Admin/Views/Sscs/Consolidate.cshtml
index f1808731..4b356dca 100644
--- a/Aaru.Server/Areas/Admin/Views/Sscs/Consolidate.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/Sscs/Consolidate.cshtml
@@ -22,7 +22,7 @@
         </tr>
         </thead>
         <tbody>
-        @foreach(var item in Model.List)
+        @foreach(SscModel item in Model.List)
         {
             <tr>
                 <td>
@@ -42,8 +42,8 @@
 <div>
     Do you want to remove the duplicates?
     <form asp-action="Consolidate" enctype="multipart/form-data">
-        <input asp-for="Json" name="models" type="hidden" />
+        <input asp-for="Json" name="models" type="hidden"/>
         <a asp-action="Index" class="btn btn-primary">Back to List</a>
-        <input class="btn btn-danger" type="submit" value="Consolidate" />
+        <input class="btn btn-danger" type="submit" value="Consolidate"/>
     </form>
 </div>
\ No newline at end of file
diff --git a/Aaru.Server/Areas/Admin/Views/Sscs/Delete.cshtml b/Aaru.Server/Areas/Admin/Views/Sscs/Delete.cshtml
index 9107bc72..e27b1f81 100644
--- a/Aaru.Server/Areas/Admin/Views/Sscs/Delete.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/Sscs/Delete.cshtml
@@ -36,7 +36,7 @@
 <h3>Are you sure you want to delete this?</h3>
 <div>
     <h4>SSC</h4>
-    <hr />
+    <hr/>
     <dl class="row">
         <dt class="col-sm-2">
             @Html.DisplayNameFor(model => model.BlockSizeGranularity)
@@ -58,8 +58,8 @@
         </dd>
     </dl>
     <form asp-action="Delete">
-        <input asp-for="Id" type="hidden" />
+        <input asp-for="Id" type="hidden"/>
         <a asp-action="Index" class="btn btn-primary">Back to List</a>
-        <input class="btn btn-danger" type="submit" value="Delete" />
+        <input class="btn btn-danger" type="submit" value="Delete"/>
     </form>
 </div>
\ No newline at end of file
diff --git a/Aaru.Server/Areas/Admin/Views/Sscs/Index.cshtml b/Aaru.Server/Areas/Admin/Views/Sscs/Index.cshtml
index ee73b80d..bf6e1323 100644
--- a/Aaru.Server/Areas/Admin/Views/Sscs/Index.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/Sscs/Index.cshtml
@@ -1,3 +1,4 @@
+@using Aaru.CommonTypes.Metadata
 @model IEnumerable<Aaru.CommonTypes.Metadata.Ssc>
 
 @{
@@ -53,7 +54,7 @@
     </tr>
     </thead>
     <tbody>
-    @foreach(var item in Model)
+    @foreach(Ssc item in Model)
     {
         <tr>
             <td>
diff --git a/Aaru.Server/Areas/Admin/Views/SupportedDensities/Delete.cshtml b/Aaru.Server/Areas/Admin/Views/SupportedDensities/Delete.cshtml
index aa8ada1b..ed1e11d3 100644
--- a/Aaru.Server/Areas/Admin/Views/SupportedDensities/Delete.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/SupportedDensities/Delete.cshtml
@@ -36,7 +36,7 @@
 <h3>Are you sure you want to delete this?</h3>
 <div>
     <h4>Supported density</h4>
-    <hr />
+    <hr/>
     <dl class="row">
         <dt class="col-sm-2">
             @Html.DisplayNameFor(model => model.PrimaryCode)
@@ -112,8 +112,8 @@
         </dd>
     </dl>
     <form asp-action="Delete">
-        <input asp-for="Id" type="hidden" />
+        <input asp-for="Id" type="hidden"/>
         <a asp-action="Index" class="btn btn-primary">Back to List</a>
-        <input class="btn btn-danger" type="submit" value="Delete" />
+        <input class="btn btn-danger" type="submit" value="Delete"/>
     </form>
 </div>
\ No newline at end of file
diff --git a/Aaru.Server/Areas/Admin/Views/SupportedDensities/Index.cshtml b/Aaru.Server/Areas/Admin/Views/SupportedDensities/Index.cshtml
index 667f7876..c6a1b7f1 100644
--- a/Aaru.Server/Areas/Admin/Views/SupportedDensities/Index.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/SupportedDensities/Index.cshtml
@@ -1,3 +1,4 @@
+@using Aaru.CommonTypes.Metadata
 @model IEnumerable<Aaru.CommonTypes.Metadata.SupportedDensity>
 
 @{
@@ -77,7 +78,7 @@
     </tr>
     </thead>
     <tbody>
-    @foreach(var item in Model)
+    @foreach(SupportedDensity item in Model)
     {
         <tr>
             <td>
diff --git a/Aaru.Server/Areas/Admin/Views/TestedMedias/Delete.cshtml b/Aaru.Server/Areas/Admin/Views/TestedMedias/Delete.cshtml
index 04fe130c..07c8fd2a 100644
--- a/Aaru.Server/Areas/Admin/Views/TestedMedias/Delete.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/TestedMedias/Delete.cshtml
@@ -36,7 +36,7 @@
 <h3>Are you sure you want to delete this?</h3>
 <div>
 <h4>Tested media</h4>
-<hr />
+<hr/>
 <dl class="row">
 <dt class="col-sm-2">
     @Html.DisplayNameFor(model => model.IdentifyData)
@@ -1494,8 +1494,8 @@
 </dd>
 </dl>
 <form asp-action="Delete">
-    <input asp-for="Id" type="hidden" />
+    <input asp-for="Id" type="hidden"/>
     <a asp-action="Index" class="btn btn-primary">Back to List</a>
-    <input class="btn btn-danger" type="submit" value="Delete" />
+    <input class="btn btn-danger" type="submit" value="Delete"/>
 </form>
 </div>
\ No newline at end of file
diff --git a/Aaru.Server/Areas/Admin/Views/TestedMedias/Details.cshtml b/Aaru.Server/Areas/Admin/Views/TestedMedias/Details.cshtml
index 8bd74ae7..e4d4d739 100644
--- a/Aaru.Server/Areas/Admin/Views/TestedMedias/Details.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/TestedMedias/Details.cshtml
@@ -35,7 +35,7 @@
 }
 <div>
 <h4>Tested media</h4>
-<hr />
+<hr/>
 <dl class="row">
 <dt class="col-sm-2">
     @Html.DisplayNameFor(model => model.IdentifyData)
diff --git a/Aaru.Server/Areas/Admin/Views/TestedMedias/Edit.cshtml b/Aaru.Server/Areas/Admin/Views/TestedMedias/Edit.cshtml
index 8cb21406..6460f8e5 100644
--- a/Aaru.Server/Areas/Admin/Views/TestedMedias/Edit.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/TestedMedias/Edit.cshtml
@@ -34,44 +34,44 @@
     // ****************************************************************************/
 }
 <h4>Tested media</h4>
-<hr />
+<hr/>
 <div class="row">
     <div class="col-md-4">
         <form asp-action="Edit">
             <div asp-validation-summary="ModelOnly" class="text-danger"></div>
-            <input asp-for="Id" type="hidden" />
+            <input asp-for="Id" type="hidden"/>
             <div class="form-group">
                 <label asp-for="Blocks" class="control-label"></label>
-                <input asp-for="Blocks" class="form-control" />
+                <input asp-for="Blocks" class="form-control"/>
                 <span asp-validation-for="Blocks" class="text-danger"></span>
             </div>
             <div class="form-group">
                 <label asp-for="BlockSize" class="control-label"></label>
-                <input asp-for="BlockSize" class="form-control" />
+                <input asp-for="BlockSize" class="form-control"/>
                 <span asp-validation-for="BlockSize" class="text-danger"></span>
             </div>
             <div class="form-group">
                 <label asp-for="LongBlockSize" class="control-label"></label>
-                <input asp-for="LongBlockSize" class="form-control" />
+                <input asp-for="LongBlockSize" class="form-control"/>
                 <span asp-validation-for="LongBlockSize" class="text-danger"></span>
             </div>
             <div class="form-group">
                 <label asp-for="Manufacturer" class="control-label"></label>
-                <input asp-for="Manufacturer" class="form-control" />
+                <input asp-for="Manufacturer" class="form-control"/>
                 <span asp-validation-for="Manufacturer" class="text-danger"></span>
             </div>
             <div class="form-group">
                 <label asp-for="MediumTypeName" class="control-label"></label>
-                <input asp-for="MediumTypeName" class="form-control" />
+                <input asp-for="MediumTypeName" class="form-control"/>
                 <span asp-validation-for="MediumTypeName" class="text-danger"></span>
             </div>
             <div class="form-group">
                 <label asp-for="Model" class="control-label"></label>
-                <input asp-for="Model" class="form-control" />
+                <input asp-for="Model" class="form-control"/>
                 <span asp-validation-for="Model" class="text-danger"></span>
             </div>
             <div class="form-group">
-                <input class="btn btn-primary" type="submit" value="Save" />
+                <input class="btn btn-primary" type="submit" value="Save"/>
                 <a asp-action="Index" class="btn btn-secondary">Back to List</a>
             </div>
         </form>
diff --git a/Aaru.Server/Areas/Admin/Views/TestedMedias/Index.cshtml b/Aaru.Server/Areas/Admin/Views/TestedMedias/Index.cshtml
index efb60fc4..bc2d73a0 100644
--- a/Aaru.Server/Areas/Admin/Views/TestedMedias/Index.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/TestedMedias/Index.cshtml
@@ -1,3 +1,4 @@
+@using Aaru.CommonTypes.Metadata
 @model IEnumerable<Aaru.CommonTypes.Metadata.TestedMedia>
 
 @{
@@ -62,7 +63,7 @@
     </tr>
     </thead>
     <tbody>
-    @foreach(var item in Model)
+    @foreach(TestedMedia item in Model)
     {
         <tr>
             <td>
diff --git a/Aaru.Server/Areas/Admin/Views/TestedSequentialMedias/Delete.cshtml b/Aaru.Server/Areas/Admin/Views/TestedSequentialMedias/Delete.cshtml
index 828a979e..0e266de2 100644
--- a/Aaru.Server/Areas/Admin/Views/TestedSequentialMedias/Delete.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/TestedSequentialMedias/Delete.cshtml
@@ -36,7 +36,7 @@
 <h3>Are you sure you want to delete this?</h3>
 <div>
     <h4>Tested sequential media</h4>
-    <hr />
+    <hr/>
     <dl class="row">
         <dt class="col-sm-2">
             @Html.DisplayNameFor(model => model.CanReadMediaSerial)
@@ -82,8 +82,8 @@
         </dd>
     </dl>
     <form asp-action="Delete">
-        <input asp-for="Id" type="hidden" />
+        <input asp-for="Id" type="hidden"/>
         <a asp-action="Index" class="btn btn-primary">Back to List</a>
-        <input class="btn btn-danger" type="submit" value="Delete" />
+        <input class="btn btn-danger" type="submit" value="Delete"/>
     </form>
 </div>
\ No newline at end of file
diff --git a/Aaru.Server/Areas/Admin/Views/TestedSequentialMedias/Edit.cshtml b/Aaru.Server/Areas/Admin/Views/TestedSequentialMedias/Edit.cshtml
index ebf2efa4..dd0c1215 100644
--- a/Aaru.Server/Areas/Admin/Views/TestedSequentialMedias/Edit.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/TestedSequentialMedias/Edit.cshtml
@@ -34,29 +34,29 @@
     // ****************************************************************************/
 }
 <h4>Tested sequential media</h4>
-<hr />
+<hr/>
 <div class="row">
     <div class="col-md-4">
         <form asp-action="Edit">
             <div asp-validation-summary="ModelOnly" class="text-danger"></div>
-            <input asp-for="Id" type="hidden" />
+            <input asp-for="Id" type="hidden"/>
             <div class="form-group">
                 <label asp-for="Manufacturer" class="control-label"></label>
-                <input asp-for="Manufacturer" class="form-control" />
+                <input asp-for="Manufacturer" class="form-control"/>
                 <span asp-validation-for="Manufacturer" class="text-danger"></span>
             </div>
             <div class="form-group">
                 <label asp-for="Model" class="control-label"></label>
-                <input asp-for="Model" class="form-control" />
+                <input asp-for="Model" class="form-control"/>
                 <span asp-validation-for="Model" class="text-danger"></span>
             </div>
             <div class="form-group">
                 <label asp-for="MediumTypeName" class="control-label"></label>
-                <input asp-for="MediumTypeName" class="form-control" />
+                <input asp-for="MediumTypeName" class="form-control"/>
                 <span asp-validation-for="MediumTypeName" class="text-danger"></span>
             </div>
             <div class="form-group">
-                <input class="btn btn-primary" type="submit" value="Save" />
+                <input class="btn btn-primary" type="submit" value="Save"/>
                 <a asp-action="Index" class="btn btn-secondary">Back to List</a>
             </div>
         </form>
diff --git a/Aaru.Server/Areas/Admin/Views/TestedSequentialMedias/Index.cshtml b/Aaru.Server/Areas/Admin/Views/TestedSequentialMedias/Index.cshtml
index 4299f3d4..7d15c7e7 100644
--- a/Aaru.Server/Areas/Admin/Views/TestedSequentialMedias/Index.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/TestedSequentialMedias/Index.cshtml
@@ -1,3 +1,4 @@
+@using Aaru.CommonTypes.Metadata
 @model IEnumerable<Aaru.CommonTypes.Metadata.TestedSequentialMedia>
 
 @{
@@ -62,7 +63,7 @@
     </tr>
     </thead>
     <tbody>
-    @foreach(var item in Model)
+    @foreach(TestedSequentialMedia item in Model)
     {
         <tr>
             <td>
diff --git a/Aaru.Server/Areas/Admin/Views/UsbProducts/Index.cshtml b/Aaru.Server/Areas/Admin/Views/UsbProducts/Index.cshtml
index 7ae35021..50854910 100644
--- a/Aaru.Server/Areas/Admin/Views/UsbProducts/Index.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/UsbProducts/Index.cshtml
@@ -49,7 +49,7 @@
     </tr>
     </thead>
     <tbody>
-    @foreach(var item in Model)
+    @foreach(UsbProductModel item in Model)
     {
         <tr>
             <td>
diff --git a/Aaru.Server/Areas/Admin/Views/UsbVendors/Details.cshtml b/Aaru.Server/Areas/Admin/Views/UsbVendors/Details.cshtml
index 616d9f59..98b456fb 100644
--- a/Aaru.Server/Areas/Admin/Views/UsbVendors/Details.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/UsbVendors/Details.cshtml
@@ -35,7 +35,7 @@
 }
 <div>
     <h4>USB vendor</h4>
-    <hr />
+    <hr/>
     <dl class="row">
         <dt class="col-sm-2">
             @Html.DisplayNameFor(model => model.Vendor)
@@ -65,7 +65,7 @@
         </tr>
         </thead>
         <tbody>
-        @foreach(var item in Model.Products)
+        @foreach(UsbProductModel item in Model.Products)
         {
             <tr>
                 <td>
diff --git a/Aaru.Server/Areas/Admin/Views/UsbVendors/Index.cshtml b/Aaru.Server/Areas/Admin/Views/UsbVendors/Index.cshtml
index 61d2ed9d..e2eb32f9 100644
--- a/Aaru.Server/Areas/Admin/Views/UsbVendors/Index.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/UsbVendors/Index.cshtml
@@ -47,7 +47,7 @@
     </tr>
     </thead>
     <tbody>
-    @foreach(var item in Model)
+    @foreach(UsbVendor item in Model)
     {
         <tr>
             <td>
diff --git a/Aaru.Server/Areas/Admin/Views/Usbs/Consolidate.cshtml b/Aaru.Server/Areas/Admin/Views/Usbs/Consolidate.cshtml
index 6a4f84e2..97bd1805 100644
--- a/Aaru.Server/Areas/Admin/Views/Usbs/Consolidate.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/Usbs/Consolidate.cshtml
@@ -25,7 +25,7 @@
         </tr>
         </thead>
         <tbody>
-        @foreach(var item in Model.List)
+        @foreach(UsbModel item in Model.List)
         {
             <tr>
                 <td>
@@ -48,8 +48,8 @@
 <div>
     Do you want to remove the duplicates?
     <form asp-action="Consolidate" enctype="multipart/form-data">
-        <input asp-for="Json" name="models" type="hidden" />
+        <input asp-for="Json" name="models" type="hidden"/>
         <a asp-action="Index" class="btn btn-primary">Back to List</a>
-        <input class="btn btn-danger" type="submit" value="Consolidate" />
+        <input class="btn btn-danger" type="submit" value="Consolidate"/>
     </form>
 </div>
\ No newline at end of file
diff --git a/Aaru.Server/Areas/Admin/Views/Usbs/Delete.cshtml b/Aaru.Server/Areas/Admin/Views/Usbs/Delete.cshtml
index cb1f10e5..d3245e9e 100644
--- a/Aaru.Server/Areas/Admin/Views/Usbs/Delete.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/Usbs/Delete.cshtml
@@ -36,7 +36,7 @@
 <h3>Are you sure you want to delete this?</h3>
 <div>
     <h4>USB</h4>
-    <hr />
+    <hr/>
     <dl class="row">
         <dt class="col-sm-2">
             @Html.DisplayNameFor(model => model.VendorID)
@@ -76,8 +76,8 @@
         </dd>
     </dl>
     <form asp-action="Delete">
-        <input asp-for="Id" type="hidden" />
+        <input asp-for="Id" type="hidden"/>
         <a asp-action="Index" class="btn btn-primary">Back to List</a>
-        <input class="btn btn-danger" type="submit" value="Delete" />
+        <input class="btn btn-danger" type="submit" value="Delete"/>
     </form>
 </div>
\ No newline at end of file
diff --git a/Aaru.Server/Areas/Admin/Views/Usbs/Details.cshtml b/Aaru.Server/Areas/Admin/Views/Usbs/Details.cshtml
index 3d01466a..116c5c3c 100644
--- a/Aaru.Server/Areas/Admin/Views/Usbs/Details.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/Usbs/Details.cshtml
@@ -35,7 +35,7 @@
 }
 <div>
     <h4>USB</h4>
-    <hr />
+    <hr/>
     <dl class="row">
         <dt class="col-sm-2">
             @Html.DisplayNameFor(model => model.Manufacturer)
diff --git a/Aaru.Server/Areas/Admin/Views/Usbs/Index.cshtml b/Aaru.Server/Areas/Admin/Views/Usbs/Index.cshtml
index 7c7a4a0f..450822f2 100644
--- a/Aaru.Server/Areas/Admin/Views/Usbs/Index.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/Usbs/Index.cshtml
@@ -1,3 +1,4 @@
+@using Aaru.CommonTypes.Metadata
 @model IEnumerable<Aaru.CommonTypes.Metadata.Usb>
 
 @{
@@ -59,7 +60,7 @@
     </tr>
     </thead>
     <tbody>
-    @foreach(var item in Model)
+    @foreach(Usb item in Model)
     {
         <tr>
             <td>
diff --git a/Aaru.Server/Areas/Admin/Views/Versions/Index.cshtml b/Aaru.Server/Areas/Admin/Views/Versions/Index.cshtml
index e00771a2..8390c446 100644
--- a/Aaru.Server/Areas/Admin/Views/Versions/Index.cshtml
+++ b/Aaru.Server/Areas/Admin/Views/Versions/Index.cshtml
@@ -1,3 +1,4 @@
+@using Version = Aaru.Server.Models.Version
 @model IEnumerable<Aaru.Server.Models.Version>
 
 @{
@@ -47,7 +48,7 @@
     </tr>
     </thead>
     <tbody>
-    @foreach(var item in Model)
+    @foreach(Version item in Model)
     {
         <tr>
             <td>
diff --git a/Aaru.Server/BasicAuthMiddleware.cs b/Aaru.Server/BasicAuthMiddleware.cs
index 69b21812..f94b27e1 100644
--- a/Aaru.Server/BasicAuthMiddleware.cs
+++ b/Aaru.Server/BasicAuthMiddleware.cs
@@ -51,9 +51,7 @@ public sealed class BasicAuthMiddleware
 
         // Add realm if it is not null
         if(!string.IsNullOrWhiteSpace(_realm))
-        {
             context.Response.Headers["WWW-Authenticate"] += $" realm=\"{_realm}\"";
-        }
 
         // Return unauthorized
         context.Response.StatusCode = (int)HttpStatusCode.Unauthorized;
diff --git a/Aaru.Server/Controllers/ReportController.cs b/Aaru.Server/Controllers/ReportController.cs
index 3fd9808b..69963e27 100644
--- a/Aaru.Server/Controllers/ReportController.cs
+++ b/Aaru.Server/Controllers/ReportController.cs
@@ -51,9 +51,7 @@ public sealed class ReportController : Controller
 
     public ActionResult Index() => RedirectToAction("View", "Report", new RouteValueDictionary
     {
-        {
-            "id", 1
-        }
+        { "id", 1 }
     });
 
     public ActionResult View(int? id)
@@ -109,6 +107,7 @@ public sealed class ReportController : Controller
             }
 
             if(report.FireWire != null)
+            {
                 ViewBag.FireWireItem = new Item
                 {
                     Manufacturer       = report.FireWire.Manufacturer,
@@ -116,6 +115,7 @@ public sealed class ReportController : Controller
                     VendorDescription  = $"0x{report.FireWire.VendorID:x8}",
                     ProductDescription = $"0x{report.FireWire.ProductID:x8}"
                 };
+            }
 
             if(report.PCMCIA != null)
             {
@@ -135,34 +135,38 @@ public sealed class ReportController : Controller
                     Dictionary<string, string> decodedTuples = new();
 
                     foreach(Tuple tuple in tuples)
+                    {
                         switch(tuple.Code)
                         {
                             case TupleCodes.CISTPL_NULL:
                             case TupleCodes.CISTPL_END:
                             case TupleCodes.CISTPL_MANFID:
-                            case TupleCodes.CISTPL_VERS_1: break;
+                            case TupleCodes.CISTPL_VERS_1:
+                                break;
                             case TupleCodes.CISTPL_DEVICEGEO:
                             case TupleCodes.CISTPL_DEVICEGEO_A:
                                 DeviceGeometryTuple geom = CIS.DecodeDeviceGeometryTuple(tuple.Data);
 
                                 if(geom?.Geometries != null)
+                                {
                                     foreach(DeviceGeometry geometry in geom.Geometries)
                                     {
                                         decodedTuples.Add("Device width",
-                                                          $"{(1 << (geometry.CardInterface - 1)) * 8} bits");
+                                                          $"{(1 << geometry.CardInterface - 1) * 8} bits");
 
                                         decodedTuples.Add("Erase block",
-                                                          $"{(1 << (geometry.EraseBlockSize - 1)) * (1 << (geometry.Interleaving - 1))} bytes");
+                                                          $"{(1 << geometry.EraseBlockSize - 1) * (1 << geometry.Interleaving - 1)} bytes");
 
                                         decodedTuples.Add("Read block",
-                                                          $"{(1 << (geometry.ReadBlockSize - 1)) * (1 << (geometry.Interleaving - 1))} bytes");
+                                                          $"{(1 << geometry.ReadBlockSize - 1) * (1 << geometry.Interleaving - 1)} bytes");
 
                                         decodedTuples.Add("Write block",
-                                                          $"{(1 << (geometry.WriteBlockSize - 1)) * (1 << (geometry.Interleaving - 1))} bytes");
+                                                          $"{(1 << geometry.WriteBlockSize - 1) * (1 << geometry.Interleaving - 1)} bytes");
 
                                         decodedTuples.Add("Partition alignment",
-                                                          $"{(1 << (geometry.EraseBlockSize - 1)) * (1 << (geometry.Interleaving - 1)) * (1 << (geometry.Partitions - 1))} bytes");
+                                                          $"{(1 << geometry.EraseBlockSize - 1) * (1 << geometry.Interleaving - 1) * (1 << geometry.Partitions - 1)} bytes");
                                     }
+                                }
 
                                 break;
                             case TupleCodes.CISTPL_ALTSTR:
@@ -207,16 +211,17 @@ public sealed class ReportController : Controller
 
                                 break;
                         }
+                    }
 
                     if(decodedTuples.Count > 0)
                         ViewBag.repPcmciaTuples = decodedTuples;
                 }
             }
 
-            bool              removable   = true;
+            var               removable   = true;
             List<TestedMedia> testedMedia = null;
-            bool              atapi       = false;
-            bool              sscMedia    = false;
+            var               atapi       = false;
+            var               sscMedia    = false;
 
             if(report.ATA   != null ||
                report.ATAPI != null)
@@ -266,7 +271,8 @@ public sealed class ReportController : Controller
                     Inquiry inq = report.SCSI.Inquiry.Value;
 
                     ViewBag.lblScsiVendor = VendorString.Prettify(vendorId) != vendorId
-                                                ? $"{vendorId} ({VendorString.Prettify(vendorId)})" : vendorId;
+                                                ? $"{vendorId} ({VendorString.Prettify(vendorId)})"
+                                                : vendorId;
 
                     ViewBag.lblScsiProduct  = StringHandlers.CToString(inq.ProductIdentification);
                     ViewBag.lblScsiRevision = StringHandlers.CToString(inq.ProductRevisionLevel);
@@ -364,19 +370,29 @@ public sealed class ReportController : Controller
                        report.SCSI.ReadCapabilities.BlockSize.HasValue)
                     {
                         scsiOneValue.
-                            Add($"Device has {report.SCSI.ReadCapabilities.Blocks} blocks of {report.SCSI.ReadCapabilities.BlockSize} bytes each");
+                            Add(
+                                $"Device has {report.SCSI.ReadCapabilities.Blocks} blocks of {report.SCSI.ReadCapabilities.BlockSize} bytes each");
 
                         if(report.SCSI.ReadCapabilities.Blocks * report.SCSI.ReadCapabilities.BlockSize / 1024 / 1024 >
                            1000000)
+                        {
                             scsiOneValue.
-                                Add($"Device size: {report.SCSI.ReadCapabilities.Blocks * report.SCSI.ReadCapabilities.BlockSize} bytes, {report.SCSI.ReadCapabilities.Blocks * report.SCSI.ReadCapabilities.BlockSize / 1000 / 1000 / 1000 / 1000} Tb, {(double)(report.SCSI.ReadCapabilities.Blocks * report.SCSI.ReadCapabilities.BlockSize) / 1024 / 1024 / 1024 / 1024:F2} TiB");
+                                Add(
+                                    $"Device size: {report.SCSI.ReadCapabilities.Blocks * report.SCSI.ReadCapabilities.BlockSize} bytes, {report.SCSI.ReadCapabilities.Blocks * report.SCSI.ReadCapabilities.BlockSize / 1000 / 1000 / 1000 / 1000} Tb, {(double)(report.SCSI.ReadCapabilities.Blocks * report.SCSI.ReadCapabilities.BlockSize) / 1024 / 1024 / 1024 / 1024:F2} TiB");
+                        }
                         else if(report.SCSI.ReadCapabilities.Blocks * report.SCSI.ReadCapabilities.BlockSize / 1024 /
                                 1024 > 1000)
+                        {
                             scsiOneValue.
-                                Add($"Device size: {report.SCSI.ReadCapabilities.Blocks * report.SCSI.ReadCapabilities.BlockSize} bytes, {report.SCSI.ReadCapabilities.Blocks * report.SCSI.ReadCapabilities.BlockSize / 1000 / 1000 / 1000} Gb, {(double)(report.SCSI.ReadCapabilities.Blocks * report.SCSI.ReadCapabilities.BlockSize) / 1024 / 1024 / 1024:F2} GiB");
+                                Add(
+                                    $"Device size: {report.SCSI.ReadCapabilities.Blocks * report.SCSI.ReadCapabilities.BlockSize} bytes, {report.SCSI.ReadCapabilities.Blocks * report.SCSI.ReadCapabilities.BlockSize / 1000 / 1000 / 1000} Gb, {(double)(report.SCSI.ReadCapabilities.Blocks * report.SCSI.ReadCapabilities.BlockSize) / 1024 / 1024 / 1024:F2} GiB");
+                        }
                         else
+                        {
                             scsiOneValue.
-                                Add($"Device size: {report.SCSI.ReadCapabilities.Blocks * report.SCSI.ReadCapabilities.BlockSize} bytes, {report.SCSI.ReadCapabilities.Blocks * report.SCSI.ReadCapabilities.BlockSize / 1000 / 1000} Mb, {(double)(report.SCSI.ReadCapabilities.Blocks * report.SCSI.ReadCapabilities.BlockSize) / 1024 / 1024:F2} MiB");
+                                Add(
+                                    $"Device size: {report.SCSI.ReadCapabilities.Blocks * report.SCSI.ReadCapabilities.BlockSize} bytes, {report.SCSI.ReadCapabilities.Blocks * report.SCSI.ReadCapabilities.BlockSize / 1000 / 1000} Mb, {(double)(report.SCSI.ReadCapabilities.Blocks * report.SCSI.ReadCapabilities.BlockSize) / 1024 / 1024:F2} MiB");
+                        }
                     }
 
                     if(report.SCSI.ReadCapabilities.MediumType.HasValue)
@@ -415,9 +431,7 @@ public sealed class ReportController : Controller
                         scsiOneValue.Add("Device supports READ LONG (16) command.");
                 }
                 else
-                {
                     testedMedia = report.SCSI.RemovableMedias;
-                }
 
                 ViewBag.repScsi = scsiOneValue;
             }
diff --git a/Aaru.Server/Controllers/StatsController.cs b/Aaru.Server/Controllers/StatsController.cs
index 62d3c29e..5f8f8bb6 100644
--- a/Aaru.Server/Controllers/StatsController.cs
+++ b/Aaru.Server/Controllers/StatsController.cs
@@ -65,6 +65,7 @@ public sealed class StatsController : Controller
         {
             if(System.IO.File.Exists(Path.Combine(_env.ContentRootPath ?? throw new InvalidOperationException(),
                                                   "Statistics", "Statistics.xml")))
+            {
                 try
                 {
                     var statistics = new Stats();
@@ -72,8 +73,10 @@ public sealed class StatsController : Controller
                     var xs = new XmlSerializer(statistics.GetType());
 
                     FileStream fs =
-                        WaitForFile(Path.Combine(_env.ContentRootPath ?? throw new InvalidOperationException(), "Statistics", "Statistics.xml"),
-                                    FileMode.Open, FileAccess.Read, FileShare.Read);
+                        WaitForFile(
+                            Path.Combine(_env.ContentRootPath ?? throw new InvalidOperationException(), "Statistics",
+                                         "Statistics.xml"),
+                            FileMode.Open, FileAccess.Read, FileShare.Read);
 
                     statistics = (Stats)xs.Deserialize(fs);
                     fs.Close();
@@ -87,18 +90,21 @@ public sealed class StatsController : Controller
                 {
                     // Do nothing
                 }
+            }
 
             if(_ctx.OperatingSystems.Any())
             {
                 List<NameValueStats> operatingSystems = new();
 
                 foreach(OperatingSystem nvs in _ctx.OperatingSystems)
+                {
                     operatingSystems.Add(new NameValueStats
                     {
                         name =
                             $"{DetectOS.GetPlatformName((PlatformID)Enum.Parse(typeof(PlatformID), nvs.Name), nvs.Version)}{(string.IsNullOrEmpty(nvs.Version) ? "" : " ")}{nvs.Version}",
                         Value = nvs.Count
                     });
+                }
 
                 ViewBag.repOperatingSystems = operatingSystems.OrderBy(os => os.name).ToList();
             }
@@ -108,11 +114,13 @@ public sealed class StatsController : Controller
                 List<NameValueStats> versions = new();
 
                 foreach(Version nvs in _ctx.Versions)
+                {
                     versions.Add(new NameValueStats
                     {
                         name  = nvs.Name == "previous" ? "Previous than 3.4.99.0" : nvs.Name,
                         Value = nvs.Count
                     });
+                }
 
                 ViewBag.repVersions = versions.OrderBy(ver => ver.name).ToList();
             }
@@ -138,6 +146,7 @@ public sealed class StatsController : Controller
                 List<MediaItem> virtualMedia = new();
 
                 foreach(Media nvs in _ctx.Medias)
+                {
                     try
                     {
                         (string type, string subType) mediaType =
@@ -145,45 +154,58 @@ public sealed class StatsController : Controller
                                                             nvs.Type));
 
                         if(nvs.Real)
+                        {
                             realMedia.Add(new MediaItem
                             {
                                 Type    = mediaType.type,
                                 SubType = mediaType.subType,
                                 Count   = nvs.Count
                             });
+                        }
                         else
+                        {
                             virtualMedia.Add(new MediaItem
                             {
                                 Type    = mediaType.type,
                                 SubType = mediaType.subType,
                                 Count   = nvs.Count
                             });
+                        }
                     }
                     catch
                     {
                         if(nvs.Real)
+                        {
                             realMedia.Add(new MediaItem
                             {
                                 Type    = nvs.Type,
                                 SubType = null,
                                 Count   = nvs.Count
                             });
+                        }
                         else
+                        {
                             virtualMedia.Add(new MediaItem
                             {
                                 Type    = nvs.Type,
                                 SubType = null,
                                 Count   = nvs.Count
                             });
+                        }
                     }
+                }
 
                 if(realMedia.Count > 0)
+                {
                     ViewBag.repRealMedia = realMedia.OrderBy(media => media.Type).ThenBy(media => media.SubType).
                                                      ToList();
+                }
 
                 if(virtualMedia.Count > 0)
+                {
                     ViewBag.repVirtualMedia = virtualMedia.OrderBy(media => media.Type).ThenBy(media => media.SubType).
                                                            ToList();
+                }
             }
 
             if(_ctx.DeviceStats.Any())
@@ -216,8 +238,10 @@ public sealed class StatsController : Controller
                         var xs = new XmlSerializer(deviceReport.GetType());
 
                         FileStream fs =
-                            WaitForFile(Path.Combine(_env.ContentRootPath ?? throw new InvalidOperationException(), "Reports", xmlFile),
-                                        FileMode.Open, FileAccess.Read, FileShare.Read);
+                            WaitForFile(
+                                Path.Combine(_env.ContentRootPath ?? throw new InvalidOperationException(), "Reports",
+                                             xmlFile),
+                                FileMode.Open, FileAccess.Read, FileShare.Read);
 
                         deviceReport = (DeviceReport)xs.Deserialize(fs);
                         fs.Close();
@@ -259,7 +283,7 @@ public sealed class StatsController : Controller
 
     static FileStream WaitForFile(string fullPath, FileMode mode, FileAccess access, FileShare share)
     {
-        for(int numTries = 0; numTries < 100; numTries++)
+        for(var numTries = 0; numTries < 100; numTries++)
         {
             FileStream fs = null;
 
@@ -290,11 +314,11 @@ public sealed class StatsController : Controller
             Count = g.Sum()
         });
 
-        string[][] result = new string[2][];
+        var result = new string[2][];
         result[0] = query.Select(x => x.Name).ToArray();
         result[1] = query.Select(x => x.Count.ToString()).ToArray();
 
-        for(int i = 0; i < result[0].Length; i++)
+        for(var i = 0; i < result[0].Length; i++)
             result[0][i] = DetectOS.GetPlatformName((PlatformID)Enum.Parse(typeof(PlatformID), result[0][i]));
 
         return Json(result);
@@ -583,7 +607,7 @@ public sealed class StatsController : Controller
 
     public IActionResult GetDevicesByManufacturerData()
     {
-        List<Device> devices = _ctx.Devices.Where(d => d.Manufacturer != null && d.Manufacturer != "").ToList();
+        var devices = _ctx.Devices.Where(d => d.Manufacturer != null && d.Manufacturer != "").ToList();
 
         var data = devices.Select(d => d.Manufacturer.ToLowerInvariant()).Distinct().Select(manufacturer => new
         {
diff --git a/Aaru.Server/Controllers/UpdateController.cs b/Aaru.Server/Controllers/UpdateController.cs
index 05a3a90a..10f4adf5 100644
--- a/Aaru.Server/Controllers/UpdateController.cs
+++ b/Aaru.Server/Controllers/UpdateController.cs
@@ -47,7 +47,8 @@ public sealed class UpdateController : Controller
 
     /// <summary>Receives a report from Aaru.Core, verifies it's in the correct format and stores it on the server</summary>
     /// <returns>HTTP response</returns>
-    [Route("api/update"), HttpGet]
+    [Route("api/update")]
+    [HttpGet]
     public ActionResult Update(long timestamp)
     {
         var      sync     = new SyncDto();
@@ -56,15 +57,18 @@ public sealed class UpdateController : Controller
         sync.UsbVendors = new List<UsbVendorDto>();
 
         foreach(UsbVendor vendor in _ctx.UsbVendors.Where(v => v.ModifiedWhen > lastSync))
+        {
             sync.UsbVendors.Add(new UsbVendorDto
             {
                 VendorId = vendor.VendorId,
                 Vendor   = vendor.Vendor
             });
+        }
 
         sync.UsbProducts = new List<UsbProductDto>();
 
         foreach(UsbProduct product in _ctx.UsbProducts.Include(p => p.Vendor).Where(p => p.ModifiedWhen > lastSync))
+        {
             sync.UsbProducts.Add(new UsbProductDto
             {
                 Id        = product.Id,
@@ -72,6 +76,7 @@ public sealed class UpdateController : Controller
                 ProductId = product.ProductId,
                 VendorId  = product.Vendor.VendorId
             });
+        }
 
         sync.Offsets = new List<CdOffsetDto>();
 
@@ -81,18 +86,21 @@ public sealed class UpdateController : Controller
         sync.Devices = new List<DeviceDto>();
 
         foreach(Device device in _ctx.Devices.Where(d => d.ModifiedWhen > lastSync).ToList())
+        {
             sync.Devices.Add(new DeviceDto(JsonConvert.
                                                DeserializeObject<DeviceReportV2>(JsonConvert.SerializeObject(device,
-                                                   Formatting.None, new JsonSerializerSettings
-                                                   {
-                                                       ReferenceLoopHandling =
-                                                           ReferenceLoopHandling.Ignore
-                                                   })), device.Id, device.OptimalMultipleSectorsRead,
+                                                       Formatting.None, new JsonSerializerSettings
+                                                       {
+                                                           ReferenceLoopHandling =
+                                                               ReferenceLoopHandling.Ignore
+                                                       })), device.Id, device.OptimalMultipleSectorsRead,
                                            device.CanReadGdRomUsingSwapDisc));
+        }
 
         sync.NesHeaders = new List<NesHeaderDto>();
 
         foreach(NesHeaderInfo header in _ctx.NesHeaders.Where(v => v.ModifiedWhen > lastSync))
+        {
             sync.NesHeaders.Add(new NesHeaderDto
             {
                 Id                     = header.Id,
@@ -109,6 +117,7 @@ public sealed class UpdateController : Controller
                 VsHardwareType         = header.VsHardwareType,
                 VsPpuType              = header.VsPpuType
             });
+        }
 
         var js = JsonSerializer.Create();
         var sw = new StringWriter();
diff --git a/Aaru.Server/Controllers/UploadReportController.cs b/Aaru.Server/Controllers/UploadReportController.cs
index 0106e109..92e0b69c 100644
--- a/Aaru.Server/Controllers/UploadReportController.cs
+++ b/Aaru.Server/Controllers/UploadReportController.cs
@@ -58,7 +58,8 @@ public sealed class UploadReportController : Controller
 
     /// <summary>Receives a report from Aaru.Core, verifies it's in the correct format and stores it on the server</summary>
     /// <returns>HTTP response</returns>
-    [Route("api/uploadreport"), HttpPost]
+    [Route("api/uploadreport")]
+    [HttpPost]
     public async Task<IActionResult> UploadReport()
     {
         var response = new ContentResult
@@ -93,7 +94,7 @@ public sealed class UploadReportController : Controller
                                                                     NullValueHandling = NullValueHandling.Ignore
                                                                 }));
 
-            string reportV2String = jsonSw.ToString();
+            var reportV2String = jsonSw.ToString();
             jsonSw.Close();
 
             var newUploadedReport = new UploadedReport(reportV2);
@@ -108,9 +109,7 @@ public sealed class UploadReportController : Controller
                    newUploadedReport.ATA.ReadCapabilities.CurrentCHS.Heads &&
                    newUploadedReport.ATA.ReadCapabilities.CHS.Sectors ==
                    newUploadedReport.ATA.ReadCapabilities.CurrentCHS.Sectors)
-                {
                     newUploadedReport.ATA.ReadCapabilities.CHS = newUploadedReport.ATA.ReadCapabilities.CurrentCHS;
-                }
             }
 
             // Check if the CHS or CurrentCHS of this report already exist in the database
@@ -148,9 +147,7 @@ public sealed class UploadReportController : Controller
                         if(media.CHS.Cylinders == media.CurrentCHS.Cylinders &&
                            media.CHS.Heads     == media.CurrentCHS.Heads     &&
                            media.CHS.Sectors   == media.CurrentCHS.Sectors)
-                        {
                             media.CHS = media.CurrentCHS;
-                        }
                     }
 
                     if(media.CHS != null)
@@ -199,7 +196,7 @@ public sealed class UploadReportController : Controller
                 }
             };
 
-            message.From.Add(new MailboxAddress("Aaru Server", "aaru@claunia.com"));
+            message.From.Add(new MailboxAddress("Aaru Server",    "aaru@claunia.com"));
             message.To.Add(new MailboxAddress("Natalia Portillo", "claunia@claunia.com"));
 
             using(var client = new SmtpClient())
@@ -229,7 +226,8 @@ public sealed class UploadReportController : Controller
 
     /// <summary>Receives a report from Aaru.Core, verifies it's in the correct format and stores it on the server</summary>
     /// <returns>HTTP response</returns>
-    [Route("api/uploadreportv2"), HttpPost]
+    [Route("api/uploadreportv2")]
+    [HttpPost]
     public async Task<IActionResult> UploadReportV2()
     {
         var response = new ContentResult
@@ -265,9 +263,7 @@ public sealed class UploadReportController : Controller
                    newUploadedReport.ATA.ReadCapabilities.CurrentCHS.Heads &&
                    newUploadedReport.ATA.ReadCapabilities.CHS.Sectors ==
                    newUploadedReport.ATA.ReadCapabilities.CurrentCHS.Sectors)
-                {
                     newUploadedReport.ATA.ReadCapabilities.CHS = newUploadedReport.ATA.ReadCapabilities.CurrentCHS;
-                }
             }
 
             // Check if the CHS or CurrentCHS of this report already exist in the database
@@ -305,9 +301,7 @@ public sealed class UploadReportController : Controller
                         if(media.CHS.Cylinders == media.CurrentCHS.Cylinders &&
                            media.CHS.Heads     == media.CurrentCHS.Heads     &&
                            media.CHS.Sectors   == media.CurrentCHS.Sectors)
-                        {
                             media.CHS = media.CurrentCHS;
-                        }
                     }
 
                     if(media.CHS != null)
@@ -356,7 +350,7 @@ public sealed class UploadReportController : Controller
                 }
             };
 
-            message.From.Add(new MailboxAddress("Aaru Server", "aaru@claunia.com"));
+            message.From.Add(new MailboxAddress("Aaru Server",    "aaru@claunia.com"));
             message.To.Add(new MailboxAddress("Natalia Portillo", "claunia@claunia.com"));
 
             using(var client = new SmtpClient())
diff --git a/Aaru.Server/Controllers/UploadStatsController.cs b/Aaru.Server/Controllers/UploadStatsController.cs
index 98c12728..07974374 100644
--- a/Aaru.Server/Controllers/UploadStatsController.cs
+++ b/Aaru.Server/Controllers/UploadStatsController.cs
@@ -51,7 +51,8 @@ public sealed class UploadStatsController : Controller
 
     /// <summary>Receives statistics from Aaru.Core, processes them and adds them to a server-side global statistics XML</summary>
     /// <returns>HTTP response</returns>
-    [Route("api/uploadstats"), HttpPost]
+    [Route("api/uploadstats")]
+    [HttpPost]
     public async Task<IActionResult> UploadStats()
     {
         var response = new ContentResult
@@ -96,7 +97,8 @@ public sealed class UploadStatsController : Controller
 
     /// <summary>Receives a report from Aaru.Core, verifies it's in the correct format and stores it on the server</summary>
     /// <returns>HTTP response</returns>
-    [Route("api/uploadstatsv2"), HttpPost]
+    [Route("api/uploadstatsv2")]
+    [HttpPost]
     public async Task<IActionResult> UploadStatsV2()
     {
         var response = new ContentResult
@@ -121,6 +123,7 @@ public sealed class UploadStatsController : Controller
             }
 
             if(newstats.Commands != null)
+            {
                 foreach(NameValueStats nvs in newstats.Commands)
                 {
                     if(nvs.name == "analyze")
@@ -129,91 +132,115 @@ public sealed class UploadStatsController : Controller
                     Command existing = _ctx.Commands.FirstOrDefault(c => c.Name == nvs.name);
 
                     if(existing == null)
+                    {
                         await _ctx.Commands.AddAsync(new Command
                         {
                             Name  = nvs.name,
                             Count = nvs.Value
                         });
+                    }
                     else
                         existing.Count += nvs.Value;
                 }
+            }
 
             if(newstats.Versions != null)
+            {
                 foreach(NameValueStats nvs in newstats.Versions)
                 {
                     Version existing = _ctx.Versions.FirstOrDefault(c => c.Name == nvs.name);
 
                     if(existing == null)
+                    {
                         await _ctx.Versions.AddAsync(new Version
                         {
                             Name  = nvs.name,
                             Count = nvs.Value
                         });
+                    }
                     else
                         existing.Count += nvs.Value;
                 }
+            }
 
             if(newstats.Filesystems != null)
+            {
                 foreach(NameValueStats nvs in newstats.Filesystems)
                 {
                     Filesystem existing = _ctx.Filesystems.FirstOrDefault(c => c.Name == nvs.name);
 
                     if(existing == null)
+                    {
                         await _ctx.Filesystems.AddAsync(new Filesystem
                         {
                             Name  = nvs.name,
                             Count = nvs.Value
                         });
+                    }
                     else
                         existing.Count += nvs.Value;
                 }
+            }
 
             if(newstats.Partitions != null)
+            {
                 foreach(NameValueStats nvs in newstats.Partitions)
                 {
                     Partition existing = _ctx.Partitions.FirstOrDefault(c => c.Name == nvs.name);
 
                     if(existing == null)
+                    {
                         await _ctx.Partitions.AddAsync(new Partition
                         {
                             Name  = nvs.name,
                             Count = nvs.Value
                         });
+                    }
                     else
                         existing.Count += nvs.Value;
                 }
+            }
 
             if(newstats.MediaFormats != null)
+            {
                 foreach(NameValueStats nvs in newstats.MediaFormats)
                 {
                     MediaFormat existing = _ctx.MediaFormats.FirstOrDefault(c => c.Name == nvs.name);
 
                     if(existing == null)
+                    {
                         await _ctx.MediaFormats.AddAsync(new MediaFormat
                         {
                             Name  = nvs.name,
                             Count = nvs.Value
                         });
+                    }
                     else
                         existing.Count += nvs.Value;
                 }
+            }
 
             if(newstats.Filters != null)
+            {
                 foreach(NameValueStats nvs in newstats.Filters)
                 {
                     Filter existing = _ctx.Filters.FirstOrDefault(c => c.Name == nvs.name);
 
                     if(existing == null)
+                    {
                         await _ctx.Filters.AddAsync(new Filter
                         {
                             Name  = nvs.name,
                             Count = nvs.Value
                         });
+                    }
                     else
                         existing.Count += nvs.Value;
                 }
+            }
 
             if(newstats.OperatingSystems != null)
+            {
                 foreach(OsStats operatingSystem in newstats.OperatingSystems)
                 {
                     OperatingSystem existing =
@@ -221,38 +248,48 @@ public sealed class UploadStatsController : Controller
                                                                   c.Version == operatingSystem.version);
 
                     if(existing == null)
+                    {
                         await _ctx.OperatingSystems.AddAsync(new OperatingSystem
                         {
                             Name    = operatingSystem.name,
                             Version = operatingSystem.version,
                             Count   = operatingSystem.Value
                         });
+                    }
                     else
                         existing.Count += operatingSystem.Value;
                 }
+            }
 
             if(newstats.Medias != null)
+            {
                 foreach(MediaStats media in newstats.Medias)
                 {
                     Media existing = _ctx.Medias.FirstOrDefault(c => c.Type == media.type && c.Real == media.real);
 
                     if(existing == null)
+                    {
                         await _ctx.Medias.AddAsync(new Media
                         {
                             Type  = media.type,
                             Real  = media.real,
                             Count = media.Value
                         });
+                    }
                     else
                         existing.Count += media.Value;
                 }
+            }
 
             if(newstats.Devices != null)
-                foreach(DeviceStats device in from device in newstats.Devices let existing =
+            {
+                foreach(DeviceStats device in from device in newstats.Devices
+                                              let existing =
                                                   _ctx.DeviceStats.FirstOrDefault(c => c.Bus == device.Bus &&
                                                       c.Manufacturer == device.Manufacturer &&
                                                       c.Model == device.Model && c.Revision == device.Revision)
-                                              where existing == null select device)
+                                              where existing == null
+                                              select device)
                 {
                     await _ctx.DeviceStats.AddAsync(new DeviceStat
                     {
@@ -262,8 +299,10 @@ public sealed class UploadStatsController : Controller
                         Revision     = device.Revision
                     });
                 }
+            }
 
             if(newstats.RemoteApplications != null)
+            {
                 foreach(OsStats application in newstats.RemoteApplications)
                 {
                     RemoteApplication existing =
@@ -271,32 +310,40 @@ public sealed class UploadStatsController : Controller
                                                                     c.Version == application.version);
 
                     if(existing == null)
+                    {
                         await _ctx.RemoteApplications.AddAsync(new RemoteApplication
                         {
                             Name    = application.name,
                             Version = application.version,
                             Count   = application.Value
                         });
+                    }
                     else
                         existing.Count += application.Value;
                 }
+            }
 
             if(newstats.RemoteArchitectures != null)
+            {
                 foreach(NameValueStats nvs in newstats.RemoteArchitectures)
                 {
                     RemoteArchitecture existing = _ctx.RemoteArchitectures.FirstOrDefault(c => c.Name == nvs.name);
 
                     if(existing == null)
+                    {
                         await _ctx.RemoteArchitectures.AddAsync(new RemoteArchitecture
                         {
                             Name  = nvs.name,
                             Count = nvs.Value
                         });
+                    }
                     else
                         existing.Count += nvs.Value;
                 }
+            }
 
             if(newstats.RemoteOperatingSystems != null)
+            {
                 foreach(OsStats remoteOperatingSystem in newstats.RemoteOperatingSystems)
                 {
                     RemoteOperatingSystem existing =
@@ -304,15 +351,18 @@ public sealed class UploadStatsController : Controller
                                                                         c.Version == remoteOperatingSystem.version);
 
                     if(existing == null)
+                    {
                         await _ctx.RemoteOperatingSystems.AddAsync(new RemoteOperatingSystem
                         {
                             Name    = remoteOperatingSystem.name,
                             Version = remoteOperatingSystem.version,
                             Count   = remoteOperatingSystem.Value
                         });
+                    }
                     else
                         existing.Count += remoteOperatingSystem.Value;
                 }
+            }
 
             await _ctx.SaveChangesAsync();
 
diff --git a/Aaru.Server/Core/Ata.cs b/Aaru.Server/Core/Ata.cs
index 428949af..09b077a2 100644
--- a/Aaru.Server/Core/Ata.cs
+++ b/Aaru.Server/Core/Ata.cs
@@ -70,8 +70,17 @@ public static class Ata
         if(!string.IsNullOrEmpty(ataIdentify.AdditionalPID))
             ataTwoValue.Add("Additional product ID", ataIdentify.AdditionalPID);
 
-        bool ata1 = false, ata2 = false, ata3 = false, ata4 = false, ata5 = false, ata6 = false, ata7 = false,
-             acs  = false, acs2 = false, acs3 = false, acs4 = false;
+        bool ata1 = false,
+             ata2 = false,
+             ata3 = false,
+             ata4 = false,
+             ata5 = false,
+             ata6 = false,
+             ata7 = false,
+             acs  = false,
+             acs2 = false,
+             acs3 = false,
+             acs4 = false;
 
         if((ushort)ataIdentify.MajorVersion == 0x0000 ||
            (ushort)ataIdentify.MajorVersion == 0xFFFF)
@@ -115,9 +124,9 @@ public static class Ata
             acs4 |= ataIdentify.MajorVersion.HasFlag(Identify.MajorVersionBit.ACS4);
         }
 
-        int    maxAtaLevel = 0;
-        int    minAtaLevel = 255;
-        string tmpString   = "";
+        var maxAtaLevel = 0;
+        var minAtaLevel = 255;
+        var tmpString   = "";
 
         if(ata1)
         {
@@ -561,7 +570,8 @@ public static class Ata
                     break;
                 default:
                     ataOneValue.
-                        Add($"ATAPI Unknown device type field value 0x{((ushort)ataIdentify.GeneralConfiguration & 0x1F00) >> 8:X2}");
+                        Add(
+                            $"ATAPI Unknown device type field value 0x{((ushort)ataIdentify.GeneralConfiguration & 0x1F00) >> 8:X2}");
 
                     break;
             }
@@ -583,7 +593,8 @@ public static class Ata
                     break;
                 default:
                     ataOneValue.
-                        Add($"Unknown ATAPI DRQ behaviour code {((ushort)ataIdentify.GeneralConfiguration & 0x60) >> 5}");
+                        Add(
+                            $"Unknown ATAPI DRQ behaviour code {((ushort)ataIdentify.GeneralConfiguration & 0x60) >> 5}");
 
                     break;
             }
@@ -609,8 +620,10 @@ public static class Ata
         else if(!cfa)
         {
             if(minAtaLevel >= 5)
+            {
                 if(ataIdentify.GeneralConfiguration.HasFlag(Identify.GeneralConfigurationBit.IncompleteResponse))
                     ataOneValue.Add("Incomplete identify response");
+            }
 
             if(ataIdentify.GeneralConfiguration.HasFlag(Identify.GeneralConfigurationBit.NonMagnetic))
                 ataOneValue.Add("Device uses non-magnetic media");
@@ -619,8 +632,10 @@ public static class Ata
                 ataOneValue.Add("Device is removable");
 
             if(minAtaLevel <= 5)
+            {
                 if(ataIdentify.GeneralConfiguration.HasFlag(Identify.GeneralConfigurationBit.Fixed))
                     ataOneValue.Add("Device is fixed");
+            }
 
             if(ata1)
             {
@@ -664,6 +679,7 @@ public static class Ata
 
         if((ushort)ataIdentify.SpecificConfiguration != 0x0000 &&
            (ushort)ataIdentify.SpecificConfiguration != 0xFFFF)
+        {
             switch(ataIdentify.SpecificConfiguration)
             {
                 case Identify.SpecificConfigurationEnum.RequiresSetIncompleteResponse:
@@ -678,12 +694,14 @@ public static class Ata
                     break;
                 case Identify.SpecificConfigurationEnum.NotRequiresSetIncompleteResponse:
                     ataOneValue.
-                        Add("Device does not require SET FEATURES to spin up and IDENTIFY DEVICE response is incomplete.");
+                        Add(
+                            "Device does not require SET FEATURES to spin up and IDENTIFY DEVICE response is incomplete.");
 
                     break;
                 case Identify.SpecificConfigurationEnum.NotRequiresSetCompleteResponse:
                     ataOneValue.
-                        Add("Device does not require SET FEATURES to spin up and IDENTIFY DEVICE response is complete.");
+                        Add(
+                            "Device does not require SET FEATURES to spin up and IDENTIFY DEVICE response is complete.");
 
                     break;
                 default:
@@ -692,35 +710,42 @@ public static class Ata
 
                     break;
             }
+        }
 
         // Obsolete since ATA-2, however, it is yet used in ATA-8 devices
         if(ataIdentify.BufferSize != 0x0000 &&
            ataIdentify.BufferSize != 0xFFFF &&
            ataIdentify.BufferType != 0x0000 &&
            ataIdentify.BufferType != 0xFFFF)
+        {
             switch(ataIdentify.BufferType)
             {
                 case 1:
                     ataOneValue.
-                        Add($"{ataIdentify.BufferSize * logicalSectorSize / 1024} KiB of single ported single sector buffer");
+                        Add(
+                            $"{ataIdentify.BufferSize * logicalSectorSize / 1024} KiB of single ported single sector buffer");
 
                     break;
                 case 2:
                     ataOneValue.
-                        Add($"{ataIdentify.BufferSize * logicalSectorSize / 1024} KiB of dual ported multi sector buffer");
+                        Add(
+                            $"{ataIdentify.BufferSize * logicalSectorSize / 1024} KiB of dual ported multi sector buffer");
 
                     break;
                 case 3:
                     ataOneValue.
-                        Add($"{ataIdentify.BufferSize * logicalSectorSize / 1024} KiB of dual ported multi sector buffer with read caching");
+                        Add(
+                            $"{ataIdentify.BufferSize * logicalSectorSize / 1024} KiB of dual ported multi sector buffer with read caching");
 
                     break;
                 default:
                     ataOneValue.
-                        Add($"{ataIdentify.BufferSize * logicalSectorSize / 1024} KiB of unknown type {ataIdentify.BufferType} buffer");
+                        Add(
+                            $"{ataIdentify.BufferSize * logicalSectorSize / 1024} KiB of unknown type {ataIdentify.BufferType} buffer");
 
                     break;
             }
+        }
 
         ataOneValue.Add("<i>Device capabilities:</i>");
 
@@ -728,8 +753,11 @@ public static class Ata
             ataOneValue.Add("Standby time values are standard");
 
         if(ataIdentify.Capabilities.HasFlag(Identify.CapabilitiesBit.IORDY))
+        {
             ataOneValue.Add(ataIdentify.Capabilities.HasFlag(Identify.CapabilitiesBit.CanDisableIORDY)
-                                ? "IORDY is supported and can be disabled" : "IORDY is supported");
+                                ? "IORDY is supported and can be disabled"
+                                : "IORDY is supported");
+        }
 
         if(ataIdentify.Capabilities.HasFlag(Identify.CapabilitiesBit.DMASupport))
             ataOneValue.Add("DMA is supported");
@@ -755,20 +783,25 @@ public static class Ata
 
         if(ataIdentify.Capabilities2.HasFlag(Identify.CapabilitiesBit2.MustBeSet) &&
            !ataIdentify.Capabilities2.HasFlag(Identify.CapabilitiesBit2.MustBeClear))
+        {
             if(ataIdentify.Capabilities2.HasFlag(Identify.CapabilitiesBit2.SpecificStandbyTimer))
                 ataOneValue.Add("Device indicates a specific minimum standby timer value");
+        }
 
         if(ataIdentify.Capabilities3.HasFlag(Identify.CapabilitiesBit3.MultipleValid))
         {
             ataOneValue.
-                Add($"A maximum of {ataIdentify.MultipleSectorNumber} sectors can be transferred per interrupt on READ/WRITE MULTIPLE");
+                Add(
+                    $"A maximum of {ataIdentify.MultipleSectorNumber} sectors can be transferred per interrupt on READ/WRITE MULTIPLE");
 
             ataOneValue.Add($"Device supports setting a maximum of {ataIdentify.MultipleMaxSectors} sectors");
         }
 
         if(ata1)
+        {
             if(ataIdentify.TrustedComputing.HasFlag(Identify.TrustedComputingBit.TrustedComputing))
                 ataOneValue.Add("Device supports doubleword I/O");
+        }
 
         if(minAtaLevel <= 3)
         {
@@ -1021,17 +1054,23 @@ public static class Ata
 
         if(ataIdentify.MinMDMACycleTime != 0 &&
            ataIdentify.RecMDMACycleTime != 0)
+        {
             ataOneValue.Add($"At minimum {ataIdentify.MinMDMACycleTime} ns. transfer cycle time per word in MDMA, " +
                             $"{ataIdentify.RecMDMACycleTime} ns. recommended");
+        }
 
         if(ataIdentify.MinPIOCycleTimeNoFlow != 0)
+        {
             ataOneValue.
                 Add($"At minimum {ataIdentify.MinPIOCycleTimeNoFlow} ns. transfer cycle time per word in PIO, " +
                     "without flow control");
+        }
 
         if(ataIdentify.MinPIOCycleTimeFlow != 0)
+        {
             ataOneValue.Add($"At minimum {ataIdentify.MinPIOCycleTimeFlow} ns. transfer cycle time per word in PIO, " +
                             "with IORDY flow control");
+        }
 
         if(ataIdentify.MaxQueueDepth != 0)
             ataOneValue.Add($"{ataIdentify.MaxQueueDepth + 1} depth of queue maximum");
@@ -1108,11 +1147,14 @@ public static class Ata
 
         if(ataIdentify.InterseekDelay != 0x0000 &&
            ataIdentify.InterseekDelay != 0xFFFF)
+        {
             ataOneValue.
                 Add($"{ataIdentify.InterseekDelay} microseconds of interseek delay for ISO-7779 acoustic testing");
+        }
 
         if((ushort)ataIdentify.DeviceFormFactor != 0x0000 &&
            (ushort)ataIdentify.DeviceFormFactor != 0xFFFF)
+        {
             switch(ataIdentify.DeviceFormFactor)
             {
                 case Identify.DeviceFormFactorEnum.FiveAndQuarter:
@@ -1140,12 +1182,16 @@ public static class Ata
 
                     break;
             }
+        }
 
         if(atapi)
+        {
             if(ataIdentify.ATAPIByteCount > 0)
                 ataOneValue.Add($"{ataIdentify.ATAPIByteCount} bytes count limit for ATAPI");
+        }
 
         if(cfa)
+        {
             if((ataIdentify.CFAPowerMode & 0x8000) == 0x8000)
             {
                 ataOneValue.Add("CompactFlash device supports power mode 1");
@@ -1158,61 +1204,100 @@ public static class Ata
 
                 ataOneValue.Add($"CompactFlash device uses a maximum of {ataIdentify.CFAPowerMode & 0x0FFF} mA");
             }
+        }
 
         ataOneValue.Add("<i>Command set and features:</i>");
 
         if(ataIdentify.CommandSet.HasFlag(Identify.CommandSetBit.Nop))
+        {
             ataOneValue.Add(ataIdentify.EnabledCommandSet.HasFlag(Identify.CommandSetBit.Nop)
-                                ? "NOP is supported and enabled" : "NOP is supported");
+                                ? "NOP is supported and enabled"
+                                : "NOP is supported");
+        }
 
         if(ataIdentify.CommandSet.HasFlag(Identify.CommandSetBit.ReadBuffer))
+        {
             ataOneValue.Add(ataIdentify.EnabledCommandSet.HasFlag(Identify.CommandSetBit.ReadBuffer)
-                                ? "READ BUFFER is supported and enabled" : "READ BUFFER is supported");
+                                ? "READ BUFFER is supported and enabled"
+                                : "READ BUFFER is supported");
+        }
 
         if(ataIdentify.CommandSet.HasFlag(Identify.CommandSetBit.WriteBuffer))
+        {
             ataOneValue.Add(ataIdentify.EnabledCommandSet.HasFlag(Identify.CommandSetBit.WriteBuffer)
-                                ? "WRITE BUFFER is supported and enabled" : "WRITE BUFFER is supported");
+                                ? "WRITE BUFFER is supported and enabled"
+                                : "WRITE BUFFER is supported");
+        }
 
         if(ataIdentify.CommandSet.HasFlag(Identify.CommandSetBit.HPA))
+        {
             ataOneValue.Add(ataIdentify.EnabledCommandSet.HasFlag(Identify.CommandSetBit.HPA)
-                                ? "Host Protected Area is supported and enabled" : "Host Protected Area is supported");
+                                ? "Host Protected Area is supported and enabled"
+                                : "Host Protected Area is supported");
+        }
 
         if(ataIdentify.CommandSet.HasFlag(Identify.CommandSetBit.DeviceReset))
+        {
             ataOneValue.Add(ataIdentify.EnabledCommandSet.HasFlag(Identify.CommandSetBit.DeviceReset)
-                                ? "DEVICE RESET is supported and enabled" : "DEVICE RESET is supported");
+                                ? "DEVICE RESET is supported and enabled"
+                                : "DEVICE RESET is supported");
+        }
 
         if(ataIdentify.CommandSet.HasFlag(Identify.CommandSetBit.Service))
+        {
             ataOneValue.Add(ataIdentify.EnabledCommandSet.HasFlag(Identify.CommandSetBit.Service)
-                                ? "SERVICE interrupt is supported and enabled" : "SERVICE interrupt is supported");
+                                ? "SERVICE interrupt is supported and enabled"
+                                : "SERVICE interrupt is supported");
+        }
 
         if(ataIdentify.CommandSet.HasFlag(Identify.CommandSetBit.Release))
+        {
             ataOneValue.Add(ataIdentify.EnabledCommandSet.HasFlag(Identify.CommandSetBit.Release)
-                                ? "Release is supported and enabled" : "Release is supported");
+                                ? "Release is supported and enabled"
+                                : "Release is supported");
+        }
 
         if(ataIdentify.CommandSet.HasFlag(Identify.CommandSetBit.LookAhead))
+        {
             ataOneValue.Add(ataIdentify.EnabledCommandSet.HasFlag(Identify.CommandSetBit.LookAhead)
-                                ? "Look-ahead read is supported and enabled" : "Look-ahead read is supported");
+                                ? "Look-ahead read is supported and enabled"
+                                : "Look-ahead read is supported");
+        }
 
         if(ataIdentify.CommandSet.HasFlag(Identify.CommandSetBit.WriteCache))
+        {
             ataOneValue.Add(ataIdentify.EnabledCommandSet.HasFlag(Identify.CommandSetBit.WriteCache)
-                                ? "Write cache is supported and enabled" : "Write cache is supported");
+                                ? "Write cache is supported and enabled"
+                                : "Write cache is supported");
+        }
 
         if(ataIdentify.CommandSet.HasFlag(Identify.CommandSetBit.Packet))
+        {
             ataOneValue.Add(ataIdentify.EnabledCommandSet.HasFlag(Identify.CommandSetBit.Packet)
-                                ? "PACKET is supported and enabled" : "PACKET is supported");
+                                ? "PACKET is supported and enabled"
+                                : "PACKET is supported");
+        }
 
         if(ataIdentify.CommandSet.HasFlag(Identify.CommandSetBit.PowerManagement))
+        {
             ataOneValue.Add(ataIdentify.EnabledCommandSet.HasFlag(Identify.CommandSetBit.PowerManagement)
-                                ? "Power management is supported and enabled" : "Power management is supported");
+                                ? "Power management is supported and enabled"
+                                : "Power management is supported");
+        }
 
         if(ataIdentify.CommandSet.HasFlag(Identify.CommandSetBit.RemovableMedia))
+        {
             ataOneValue.Add(ataIdentify.EnabledCommandSet.HasFlag(Identify.CommandSetBit.RemovableMedia)
                                 ? "Removable media feature set is supported and enabled"
                                 : "Removable media feature set is supported");
+        }
 
         if(ataIdentify.CommandSet.HasFlag(Identify.CommandSetBit.SecurityMode))
+        {
             ataOneValue.Add(ataIdentify.EnabledCommandSet.HasFlag(Identify.CommandSetBit.SecurityMode)
-                                ? "Security mode is supported and enabled" : "Security mode is supported");
+                                ? "Security mode is supported and enabled"
+                                : "Security mode is supported");
+        }
 
         if(ataIdentify.Capabilities.HasFlag(Identify.CapabilitiesBit.LBASupport))
             ataOneValue.Add("28-bit LBA is supported");
@@ -1221,75 +1306,107 @@ public static class Ata
            !ataIdentify.CommandSet2.HasFlag(Identify.CommandSetBit2.MustBeClear))
         {
             if(ataIdentify.CommandSet2.HasFlag(Identify.CommandSetBit2.LBA48))
+            {
                 ataOneValue.Add(ataIdentify.EnabledCommandSet2.HasFlag(Identify.CommandSetBit2.LBA48)
-                                    ? "48-bit LBA is supported and enabled" : "48-bit LBA is supported");
+                                    ? "48-bit LBA is supported and enabled"
+                                    : "48-bit LBA is supported");
+            }
 
             if(ataIdentify.CommandSet2.HasFlag(Identify.CommandSetBit2.FlushCache))
+            {
                 ataOneValue.Add(ataIdentify.EnabledCommandSet2.HasFlag(Identify.CommandSetBit2.FlushCache)
-                                    ? "FLUSH CACHE is supported and enabled" : "FLUSH CACHE is supported");
+                                    ? "FLUSH CACHE is supported and enabled"
+                                    : "FLUSH CACHE is supported");
+            }
 
             if(ataIdentify.CommandSet2.HasFlag(Identify.CommandSetBit2.FlushCacheExt))
+            {
                 ataOneValue.Add(ataIdentify.EnabledCommandSet2.HasFlag(Identify.CommandSetBit2.FlushCacheExt)
-                                    ? "FLUSH CACHE EXT is supported and enabled" : "FLUSH CACHE EXT is supported");
+                                    ? "FLUSH CACHE EXT is supported and enabled"
+                                    : "FLUSH CACHE EXT is supported");
+            }
 
             if(ataIdentify.CommandSet2.HasFlag(Identify.CommandSetBit2.DCO))
+            {
                 ataOneValue.Add(ataIdentify.EnabledCommandSet2.HasFlag(Identify.CommandSetBit2.DCO)
                                     ? "Device Configuration Overlay feature set is supported and enabled"
                                     : "Device Configuration Overlay feature set is supported");
+            }
 
             if(ataIdentify.CommandSet2.HasFlag(Identify.CommandSetBit2.AAM))
+            {
                 ataOneValue.Add(ataIdentify.EnabledCommandSet2.HasFlag(Identify.CommandSetBit2.AAM)
                                     ? $"Automatic Acoustic Management is supported and enabled with value {ataIdentify.CurrentAAM} (vendor recommends {ataIdentify.RecommendedAAM}"
                                     : "Automatic Acoustic Management is supported");
+            }
 
             if(ataIdentify.CommandSet2.HasFlag(Identify.CommandSetBit2.SetMax))
+            {
                 ataOneValue.Add(ataIdentify.EnabledCommandSet2.HasFlag(Identify.CommandSetBit2.SetMax)
                                     ? "SET MAX security extension is supported and enabled"
                                     : "SET MAX security extension is supported");
+            }
 
             if(ataIdentify.CommandSet2.HasFlag(Identify.CommandSetBit2.AddressOffsetReservedAreaBoot))
+            {
                 ataOneValue.Add(ataIdentify.EnabledCommandSet2.HasFlag(Identify.CommandSetBit2.
                                                                            AddressOffsetReservedAreaBoot)
                                     ? "Address Offset Reserved Area Boot is supported and enabled"
                                     : "Address Offset Reserved Area Boot is supported");
+            }
 
             if(ataIdentify.CommandSet2.HasFlag(Identify.CommandSetBit2.SetFeaturesRequired))
                 ataOneValue.Add("SET FEATURES is required before spin-up");
 
             if(ataIdentify.CommandSet2.HasFlag(Identify.CommandSetBit2.PowerUpInStandby))
+            {
                 ataOneValue.Add(ataIdentify.EnabledCommandSet2.HasFlag(Identify.CommandSetBit2.PowerUpInStandby)
                                     ? "Power-up in standby is supported and enabled"
                                     : "Power-up in standby is supported");
+            }
 
             if(ataIdentify.CommandSet2.HasFlag(Identify.CommandSetBit2.RemovableNotification))
+            {
                 ataOneValue.Add(ataIdentify.EnabledCommandSet2.HasFlag(Identify.CommandSetBit2.RemovableNotification)
                                     ? "Removable Media Status Notification is supported and enabled"
                                     : "Removable Media Status Notification is supported");
+            }
 
             if(ataIdentify.CommandSet2.HasFlag(Identify.CommandSetBit2.APM))
+            {
                 ataOneValue.Add(ataIdentify.EnabledCommandSet2.HasFlag(Identify.CommandSetBit2.APM)
                                     ? $"Advanced Power Management is supported and enabled with value {ataIdentify.CurrentAPM}"
                                     : "Advanced Power Management is supported");
+            }
 
             if(ataIdentify.CommandSet2.HasFlag(Identify.CommandSetBit2.CompactFlash))
+            {
                 ataOneValue.Add(ataIdentify.EnabledCommandSet2.HasFlag(Identify.CommandSetBit2.CompactFlash)
                                     ? "CompactFlash feature set is supported and enabled"
                                     : "CompactFlash feature set is supported");
+            }
 
             if(ataIdentify.CommandSet2.HasFlag(Identify.CommandSetBit2.RWQueuedDMA))
+            {
                 ataOneValue.Add(ataIdentify.EnabledCommandSet2.HasFlag(Identify.CommandSetBit2.RWQueuedDMA)
                                     ? "READ DMA QUEUED and WRITE DMA QUEUED are supported and enabled"
                                     : "READ DMA QUEUED and WRITE DMA QUEUED are supported");
+            }
 
             if(ataIdentify.CommandSet2.HasFlag(Identify.CommandSetBit2.DownloadMicrocode))
+            {
                 ataOneValue.Add(ataIdentify.EnabledCommandSet2.HasFlag(Identify.CommandSetBit2.DownloadMicrocode)
                                     ? "DOWNLOAD MICROCODE is supported and enabled"
                                     : "DOWNLOAD MICROCODE is supported");
+            }
         }
 
         if(ataIdentify.CommandSet.HasFlag(Identify.CommandSetBit.SMART))
+        {
             ataOneValue.Add(ataIdentify.EnabledCommandSet.HasFlag(Identify.CommandSetBit.SMART)
-                                ? "S.M.A.R.T. is supported and enabled" : "S.M.A.R.T. is supported");
+                                ? "S.M.A.R.T. is supported and enabled"
+                                : "S.M.A.R.T. is supported");
+        }
 
         if(ataIdentify.SCTCommandTransport.HasFlag(Identify.SCTCommandTransportBit.Supported))
             ataOneValue.Add("S.M.A.R.T. Command Transport is supported");
@@ -1298,19 +1415,25 @@ public static class Ata
            !ataIdentify.CommandSet3.HasFlag(Identify.CommandSetBit3.MustBeClear))
         {
             if(ataIdentify.CommandSet3.HasFlag(Identify.CommandSetBit3.SMARTSelfTest))
+            {
                 ataOneValue.Add(ataIdentify.EnabledCommandSet3.HasFlag(Identify.CommandSetBit3.SMARTSelfTest)
                                     ? "S.M.A.R.T. self-testing is supported and enabled"
                                     : "S.M.A.R.T. self-testing is supported");
+            }
 
             if(ataIdentify.CommandSet3.HasFlag(Identify.CommandSetBit3.SMARTLog))
+            {
                 ataOneValue.Add(ataIdentify.EnabledCommandSet3.HasFlag(Identify.CommandSetBit3.SMARTLog)
                                     ? "S.M.A.R.T. error logging is supported and enabled"
                                     : "S.M.A.R.T. error logging is supported");
+            }
 
             if(ataIdentify.CommandSet3.HasFlag(Identify.CommandSetBit3.IdleImmediate))
+            {
                 ataOneValue.Add(ataIdentify.EnabledCommandSet3.HasFlag(Identify.CommandSetBit3.IdleImmediate)
                                     ? "IDLE IMMEDIATE with UNLOAD FEATURE is supported and enabled"
                                     : "IDLE IMMEDIATE with UNLOAD FEATURE is supported");
+            }
 
             if(ataIdentify.CommandSet3.HasFlag(Identify.CommandSetBit3.WriteURG))
                 ataOneValue.Add("URG bit is supported in WRITE STREAM DMA EXT and WRITE STREAM EXT");
@@ -1322,82 +1445,113 @@ public static class Ata
                 ataOneValue.Add("Device has a World Wide Name");
 
             if(ataIdentify.CommandSet3.HasFlag(Identify.CommandSetBit3.FUAWriteQ))
+            {
                 ataOneValue.Add(ataIdentify.EnabledCommandSet3.HasFlag(Identify.CommandSetBit3.FUAWriteQ)
                                     ? "WRITE DMA QUEUED FUA EXT is supported and enabled"
                                     : "WRITE DMA QUEUED FUA EXT is supported");
+            }
 
             if(ataIdentify.CommandSet3.HasFlag(Identify.CommandSetBit3.FUAWrite))
+            {
                 ataOneValue.Add(ataIdentify.EnabledCommandSet3.HasFlag(Identify.CommandSetBit3.FUAWrite)
                                     ? "WRITE DMA FUA EXT and WRITE MULTIPLE FUA EXT are supported and enabled"
                                     : "WRITE DMA FUA EXT and WRITE MULTIPLE FUA EXT are supported");
+            }
 
             if(ataIdentify.CommandSet3.HasFlag(Identify.CommandSetBit3.GPL))
+            {
                 ataOneValue.Add(ataIdentify.EnabledCommandSet3.HasFlag(Identify.CommandSetBit3.GPL)
                                     ? "General Purpose Logging is supported and enabled"
                                     : "General Purpose Logging is supported");
+            }
 
             if(ataIdentify.CommandSet3.HasFlag(Identify.CommandSetBit3.Streaming))
+            {
                 ataOneValue.Add(ataIdentify.EnabledCommandSet3.HasFlag(Identify.CommandSetBit3.Streaming)
                                     ? "Streaming feature set is supported and enabled"
                                     : "Streaming feature set is supported");
+            }
 
             if(ataIdentify.CommandSet3.HasFlag(Identify.CommandSetBit3.MCPT))
+            {
                 ataOneValue.Add(ataIdentify.EnabledCommandSet3.HasFlag(Identify.CommandSetBit3.MCPT)
                                     ? "Media Card Pass Through command set is supported and enabled"
                                     : "Media Card Pass Through command set is supported");
+            }
 
             if(ataIdentify.CommandSet3.HasFlag(Identify.CommandSetBit3.MediaSerial))
+            {
                 ataOneValue.Add(ataIdentify.EnabledCommandSet3.HasFlag(Identify.CommandSetBit3.MediaSerial)
-                                    ? "Media Serial is supported and valid" : "Media Serial is supported");
+                                    ? "Media Serial is supported and valid"
+                                    : "Media Serial is supported");
+            }
         }
 
         if(ataIdentify.CommandSet4.HasFlag(Identify.CommandSetBit4.MustBeSet) &&
            !ataIdentify.CommandSet4.HasFlag(Identify.CommandSetBit4.MustBeClear))
         {
             if(ataIdentify.CommandSet4.HasFlag(Identify.CommandSetBit4.DSN))
+            {
                 ataOneValue.Add(ataIdentify.EnabledCommandSet4.HasFlag(Identify.CommandSetBit4.DSN)
-                                    ? "DSN feature set is supported and enabled" : "DSN feature set is supported");
+                                    ? "DSN feature set is supported and enabled"
+                                    : "DSN feature set is supported");
+            }
 
             if(ataIdentify.CommandSet4.HasFlag(Identify.CommandSetBit4.AMAC))
+            {
                 ataOneValue.Add(ataIdentify.EnabledCommandSet4.HasFlag(Identify.CommandSetBit4.AMAC)
                                     ? "Accessible Max Address Configuration is supported and enabled"
                                     : "Accessible Max Address Configuration is supported");
+            }
 
             if(ataIdentify.CommandSet4.HasFlag(Identify.CommandSetBit4.ExtPowerCond))
+            {
                 ataOneValue.Add(ataIdentify.EnabledCommandSet4.HasFlag(Identify.CommandSetBit4.ExtPowerCond)
                                     ? "Extended Power Conditions are supported and enabled"
                                     : "Extended Power Conditions are supported");
+            }
 
             if(ataIdentify.CommandSet4.HasFlag(Identify.CommandSetBit4.ExtStatusReport))
+            {
                 ataOneValue.Add(ataIdentify.EnabledCommandSet4.HasFlag(Identify.CommandSetBit4.ExtStatusReport)
                                     ? "Extended Status Reporting is supported and enabled"
                                     : "Extended Status Reporting is supported");
+            }
 
             if(ataIdentify.CommandSet4.HasFlag(Identify.CommandSetBit4.FreeFallControl))
+            {
                 ataOneValue.Add(ataIdentify.EnabledCommandSet4.HasFlag(Identify.CommandSetBit4.FreeFallControl)
                                     ? "Free-fall control feature set is supported and enabled"
                                     : "Free-fall control feature set is supported");
+            }
 
             if(ataIdentify.CommandSet4.HasFlag(Identify.CommandSetBit4.SegmentedDownloadMicrocode))
+            {
                 ataOneValue.Add(ataIdentify.EnabledCommandSet4.HasFlag(Identify.CommandSetBit4.
                                                                            SegmentedDownloadMicrocode)
                                     ? "Segmented feature in DOWNLOAD MICROCODE is supported and enabled"
                                     : "Segmented feature in DOWNLOAD MICROCODE is supported");
+            }
 
             if(ataIdentify.CommandSet4.HasFlag(Identify.CommandSetBit4.RWDMAExtGpl))
+            {
                 ataOneValue.Add(ataIdentify.EnabledCommandSet4.HasFlag(Identify.CommandSetBit4.RWDMAExtGpl)
                                     ? "READ/WRITE DMA EXT GPL are supported and enabled"
                                     : "READ/WRITE DMA EXT GPL are supported");
+            }
 
             if(ataIdentify.CommandSet4.HasFlag(Identify.CommandSetBit4.WriteUnc))
+            {
                 ataOneValue.Add(ataIdentify.EnabledCommandSet4.HasFlag(Identify.CommandSetBit4.WriteUnc)
                                     ? "WRITE UNCORRECTABLE is supported and enabled"
                                     : "WRITE UNCORRECTABLE is supported");
+            }
 
             if(ataIdentify.CommandSet4.HasFlag(Identify.CommandSetBit4.WRV))
             {
                 ataOneValue.Add(ataIdentify.EnabledCommandSet4.HasFlag(Identify.CommandSetBit4.WRV)
-                                    ? "Write/Read/Verify is supported and enabled" : "Write/Read/Verify is supported");
+                                    ? "Write/Read/Verify is supported and enabled"
+                                    : "Write/Read/Verify is supported");
 
                 ataOneValue.Add($"{ataIdentify.WRVSectorCountMode2} sectors for Write/Read/Verify mode 2");
                 ataOneValue.Add($"{ataIdentify.WRVSectorCountMode3} sectors for Write/Read/Verify mode 3");
@@ -1407,8 +1561,11 @@ public static class Ata
             }
 
             if(ataIdentify.CommandSet4.HasFlag(Identify.CommandSetBit4.DT1825))
+            {
                 ataOneValue.Add(ataIdentify.EnabledCommandSet4.HasFlag(Identify.CommandSetBit4.DT1825)
-                                    ? "DT1825 is supported and enabled" : "DT1825 is supported");
+                                    ? "DT1825 is supported and enabled"
+                                    : "DT1825 is supported");
+            }
         }
 
         if(true)
@@ -1472,6 +1629,7 @@ public static class Ata
         }
 
         if(true)
+        {
             if(ataIdentify.Capabilities3.HasFlag(Identify.CapabilitiesBit3.Sanitize))
             {
                 ataOneValue.Add("Sanitize feature set is supported");
@@ -1483,70 +1641,100 @@ public static class Ata
                 if(ataIdentify.Capabilities3.HasFlag(Identify.CapabilitiesBit3.SanitizeAntifreeze))
                     ataOneValue.Add("SANITIZE ANTIFREEZE LOCK EXT is supported");
             }
+        }
 
         if(!ata1 &&
            maxAtaLevel >= 8)
+        {
             if(ataIdentify.TrustedComputing.HasFlag(Identify.TrustedComputingBit.Set)    &&
                !ataIdentify.TrustedComputing.HasFlag(Identify.TrustedComputingBit.Clear) &&
                ataIdentify.TrustedComputing.HasFlag(Identify.TrustedComputingBit.TrustedComputing))
                 ataOneValue.Add("Trusted Computing feature set is supported");
+        }
 
         if((ataIdentify.TransportMajorVersion & 0xF000) >> 12 == 0x1 ||
            (ataIdentify.TransportMajorVersion & 0xF000) >> 12 == 0xE)
         {
             if(true)
+            {
                 if(!ataIdentify.SATACapabilities.HasFlag(Identify.SATACapabilitiesBit.Clear))
+                {
                     if(ataIdentify.SATACapabilities.HasFlag(Identify.SATACapabilitiesBit.ReadLogDMAExt))
                         ataOneValue.Add("READ LOG DMA EXT is supported");
+                }
+            }
 
             if(true)
+            {
                 if(!ataIdentify.SATACapabilities2.HasFlag(Identify.SATACapabilitiesBit2.Clear))
+                {
                     if(ataIdentify.SATACapabilities2.HasFlag(Identify.SATACapabilitiesBit2.FPDMAQ))
                         ataOneValue.Add("RECEIVE FPDMA QUEUED and SEND FPDMA QUEUED are supported");
+                }
+            }
 
             if(true)
+            {
                 if(!ataIdentify.SATAFeatures.HasFlag(Identify.SATAFeaturesBit.Clear))
                 {
                     if(ataIdentify.SATAFeatures.HasFlag(Identify.SATAFeaturesBit.NonZeroBufferOffset))
+                    {
                         ataOneValue.Add(ataIdentify.EnabledSATAFeatures.HasFlag(Identify.SATAFeaturesBit.
-                                                                                    NonZeroBufferOffset)
+                                            NonZeroBufferOffset)
                                             ? "Non-zero buffer offsets are supported and enabled"
                                             : "Non-zero buffer offsets are supported");
+                    }
 
                     if(ataIdentify.SATAFeatures.HasFlag(Identify.SATAFeaturesBit.DMASetup))
+                    {
                         ataOneValue.Add(ataIdentify.EnabledSATAFeatures.HasFlag(Identify.SATAFeaturesBit.DMASetup)
                                             ? "DMA Setup auto-activation is supported and enabled"
                                             : "DMA Setup auto-activation is supported");
+                    }
 
                     if(ataIdentify.SATAFeatures.HasFlag(Identify.SATAFeaturesBit.InitPowerMgmt))
+                    {
                         ataOneValue.Add(ataIdentify.EnabledSATAFeatures.HasFlag(Identify.SATAFeaturesBit.InitPowerMgmt)
                                             ? "Device-initiated power management is supported and enabled"
                                             : "Device-initiated power management is supported");
+                    }
 
                     if(ataIdentify.SATAFeatures.HasFlag(Identify.SATAFeaturesBit.InOrderData))
+                    {
                         ataOneValue.Add(ataIdentify.EnabledSATAFeatures.HasFlag(Identify.SATAFeaturesBit.InOrderData)
                                             ? "In-order data delivery is supported and enabled"
                                             : "In-order data delivery is supported");
+                    }
 
                     if(!atapi)
+                    {
                         if(ataIdentify.SATAFeatures.HasFlag(Identify.SATAFeaturesBit.HardwareFeatureControl))
+                        {
                             ataOneValue.Add(ataIdentify.EnabledSATAFeatures.HasFlag(Identify.SATAFeaturesBit.
                                                 HardwareFeatureControl)
                                                 ? "Hardware Feature Control is supported and enabled"
                                                 : "Hardware Feature Control is supported");
+                        }
+                    }
 
                     if(atapi)
+                    {
                         if(ataIdentify.SATAFeatures.HasFlag(Identify.SATAFeaturesBit.AsyncNotification))
+                        {
                             if(ataIdentify.EnabledSATAFeatures.HasFlag(Identify.SATAFeaturesBit.AsyncNotification))
                                 ataOneValue.Add("Asynchronous notification is supported");
                             else
                                 ataOneValue.Add("Asynchronous notification is supported");
+                        }
+                    }
 
                     if(ataIdentify.SATAFeatures.HasFlag(Identify.SATAFeaturesBit.SettingsPreserve))
+                    {
                         if(ataIdentify.EnabledSATAFeatures.HasFlag(Identify.SATAFeaturesBit.SettingsPreserve))
                             ataOneValue.Add("Software Settings Preservation is supported");
                         else
                             ataOneValue.Add("Software Settings Preservation is supported");
+                    }
 
                     if(ataIdentify.SATAFeatures.HasFlag(Identify.SATAFeaturesBit.NCQAutoSense))
                         ataOneValue.Add("NCQ Autosense is supported");
@@ -1554,6 +1742,7 @@ public static class Ata
                     if(ataIdentify.EnabledSATAFeatures.HasFlag(Identify.SATAFeaturesBit.EnabledSlumber))
                         ataOneValue.Add("Automatic Partial to Slumber transitions are enabled");
                 }
+            }
         }
 
         if((ataIdentify.RemovableStatusSet & 0x03) > 0)
@@ -1567,8 +1756,10 @@ public static class Ata
             ataOneValue.Add("TRIM is supported");
 
         if(ataIdentify.DataSetMgmtSize > 0)
+        {
             ataOneValue.
                 Add($"DATA SET MANAGEMENT can receive a maximum of {ataIdentify.DataSetMgmtSize} blocks of 512 bytes");
+        }
 
         if(ataIdentify.SecurityStatus.HasFlag(Identify.SecurityStatusBit.Supported))
         {
@@ -1579,21 +1770,23 @@ public static class Ata
                 ataOneValue.Add("Security is enabled");
 
                 ataOneValue.Add(ataIdentify.SecurityStatus.HasFlag(Identify.SecurityStatusBit.Locked)
-                                    ? "Security is locked" : "Security is not locked");
+                                    ? "Security is locked"
+                                    : "Security is not locked");
 
                 ataOneValue.Add(ataIdentify.SecurityStatus.HasFlag(Identify.SecurityStatusBit.Frozen)
-                                    ? "Security is frozen" : "Security is not frozen");
+                                    ? "Security is frozen"
+                                    : "Security is not frozen");
 
                 ataOneValue.Add(ataIdentify.SecurityStatus.HasFlag(Identify.SecurityStatusBit.Expired)
-                                    ? "Security count has expired" : "Security count has not expired");
+                                    ? "Security count has expired"
+                                    : "Security count has not expired");
 
                 ataOneValue.Add(ataIdentify.SecurityStatus.HasFlag(Identify.SecurityStatusBit.Maximum)
-                                    ? "Security level is maximum" : "Security level is high");
+                                    ? "Security level is maximum"
+                                    : "Security level is high");
             }
             else
-            {
                 ataOneValue.Add("Security is not enabled");
-            }
 
             if(ataIdentify.SecurityStatus.HasFlag(Identify.SecurityStatusBit.Enhanced))
                 ataOneValue.Add("Supports enhanced security erase");
@@ -1601,8 +1794,10 @@ public static class Ata
             ataOneValue.Add($"{ataIdentify.SecurityEraseTime * 2} minutes to complete secure erase");
 
             if(ataIdentify.SecurityStatus.HasFlag(Identify.SecurityStatusBit.Enhanced))
+            {
                 ataOneValue.
                     Add($"{ataIdentify.EnhancedSecurityEraseTime * 2} minutes to complete enhanced secure erase");
+            }
 
             ataOneValue.Add($"Master password revision code: {ataIdentify.MasterPasswordRevisionCode}");
         }
@@ -1664,8 +1859,11 @@ public static class Ata
             if(ataReport.ReadCapabilities.NominalRotationRate != null   &&
                ataReport.ReadCapabilities.NominalRotationRate != 0x0000 &&
                ataReport.ReadCapabilities.NominalRotationRate != 0xFFFF)
-                ataOneValue.Add(ataReport.ReadCapabilities.NominalRotationRate == 0x0001 ? "Device does not rotate."
+            {
+                ataOneValue.Add(ataReport.ReadCapabilities.NominalRotationRate == 0x0001
+                                    ? "Device does not rotate."
                                     : $"Device rotates at {ataReport.ReadCapabilities.NominalRotationRate} rpm");
+            }
 
             if(!atapi)
             {
@@ -1686,8 +1884,11 @@ public static class Ata
                    ataReport.ReadCapabilities.BlockSize.Value != ataReport.ReadCapabilities.PhysicalBlockSize.Value &&
                    (ataReport.ReadCapabilities.LogicalAlignment & 0x8000) == 0x0000 &&
                    (ataReport.ReadCapabilities.LogicalAlignment & 0x4000) == 0x4000)
+                {
                     ataOneValue.
-                        Add($"Logical sector starts at offset {ataReport.ReadCapabilities.LogicalAlignment & 0x3FFF} from physical sector");
+                        Add(
+                            $"Logical sector starts at offset {ataReport.ReadCapabilities.LogicalAlignment & 0x3FFF} from physical sector");
+                }
 
                 if(ataReport.ReadCapabilities.CHS        != null &&
                    ataReport.ReadCapabilities.CurrentCHS != null)
@@ -1716,9 +1917,9 @@ public static class Ata
                     int currentSectors = ataReport.ReadCapabilities.CHS.Cylinders *
                                          ataReport.ReadCapabilities.CHS.Heads * ataReport.ReadCapabilities.CHS.Sectors;
 
-                    ataTwoValue.Add("Cylinders", $"{ataReport.ReadCapabilities.CHS.Cylinders}");
-                    ataTwoValue.Add("Heads", $"{ataReport.ReadCapabilities.CHS.Heads}");
-                    ataTwoValue.Add("Sectors per track", $"{ataReport.ReadCapabilities.CHS.Sectors}");
+                    ataTwoValue.Add("Cylinders",                       $"{ataReport.ReadCapabilities.CHS.Cylinders}");
+                    ataTwoValue.Add("Heads",                           $"{ataReport.ReadCapabilities.CHS.Heads}");
+                    ataTwoValue.Add("Sectors per track",               $"{ataReport.ReadCapabilities.CHS.Sectors}");
                     ataTwoValue.Add("Sectors addressable in CHS mode", $"{currentSectors}");
 
                     ataTwoValue.Add("Device size in CHS mode",
@@ -1731,14 +1932,20 @@ public static class Ata
                                     $"{ataReport.ReadCapabilities.LBASectors}");
 
                     if((ulong)ataReport.ReadCapabilities.LBASectors * logicalSectorSize / 1024 / 1024 > 1000000)
+                    {
                         ataTwoValue.Add("Device size in 28-bit LBA mode",
                                         $"{(ulong)ataReport.ReadCapabilities.LBASectors * logicalSectorSize} bytes, {(ulong)ataReport.ReadCapabilities.LBASectors * logicalSectorSize / 1000 / 1000 / 1000 / 1000} Tb, {(double)((ulong)ataReport.ReadCapabilities.LBASectors * logicalSectorSize) / 1024 / 1024 / 1024 / 1024:F2} TiB");
+                    }
                     else if((ulong)ataReport.ReadCapabilities.LBASectors * logicalSectorSize / 1024 / 1024 > 1000)
+                    {
                         ataTwoValue.Add("Device size in 28-bit LBA mode",
                                         $"{(ulong)ataReport.ReadCapabilities.LBASectors * logicalSectorSize} bytes, {(ulong)ataReport.ReadCapabilities.LBASectors * logicalSectorSize / 1000 / 1000 / 1000} Gb, {(double)((ulong)ataReport.ReadCapabilities.LBASectors * logicalSectorSize) / 1024 / 1024 / 1024:F2} GiB");
+                    }
                     else
+                    {
                         ataTwoValue.Add("Device size in 28-bit LBA mode",
                                         $"{(ulong)ataReport.ReadCapabilities.LBASectors * logicalSectorSize} bytes, {(ulong)ataReport.ReadCapabilities.LBASectors * logicalSectorSize / 1000 / 1000} Mb, {(double)((ulong)ataReport.ReadCapabilities.LBASectors * logicalSectorSize) / 1024 / 1024:F2} MiB");
+                    }
                 }
 
                 if(ataReport.ReadCapabilities.LBA48Sectors != null)
@@ -1747,14 +1954,20 @@ public static class Ata
                                     $"{ataReport.ReadCapabilities.LBA48Sectors}");
 
                     if(ataReport.ReadCapabilities.LBA48Sectors * logicalSectorSize / 1024 / 1024 > 1000000)
+                    {
                         ataTwoValue.Add("Device size in 48-bit LBA mode",
                                         $"{ataReport.ReadCapabilities.LBA48Sectors * logicalSectorSize} bytes, {ataReport.ReadCapabilities.LBA48Sectors * logicalSectorSize / 1000 / 1000 / 1000 / 1000} Tb, {(double)(ataReport.ReadCapabilities.LBA48Sectors * logicalSectorSize) / 1024 / 1024 / 1024 / 1024:F2} TiB");
+                    }
                     else if(ataReport.ReadCapabilities.LBA48Sectors * logicalSectorSize / 1024 / 1024 > 1000)
+                    {
                         ataTwoValue.Add("Device size in 48-bit LBA mode",
                                         $"{ataReport.ReadCapabilities.LBA48Sectors * logicalSectorSize} bytes, {ataReport.ReadCapabilities.LBA48Sectors * logicalSectorSize / 1000 / 1000 / 1000} Gb, {(double)(ataReport.ReadCapabilities.LBA48Sectors * logicalSectorSize) / 1024 / 1024 / 1024:F2} GiB");
+                    }
                     else
+                    {
                         ataTwoValue.Add("Device size in 48-bit LBA mode",
                                         $"{ataReport.ReadCapabilities.LBA48Sectors * logicalSectorSize} bytes, {ataReport.ReadCapabilities.LBA48Sectors * logicalSectorSize / 1000 / 1000} Mb, {(double)(ataReport.ReadCapabilities.LBA48Sectors * logicalSectorSize) / 1024 / 1024:F2} MiB");
+                    }
                 }
 
                 if(ata1 || cfa)
@@ -1816,8 +2029,6 @@ public static class Ata
                 ataOneValue.Add("Device supports SEEK command in 28-bit LBA mode");
         }
         else
-        {
             testedMedia = ataReport.RemovableMedias;
-        }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Server/Core/Hash.cs b/Aaru.Server/Core/Hash.cs
index 87a26f33..a0b00867 100644
--- a/Aaru.Server/Core/Hash.cs
+++ b/Aaru.Server/Core/Hash.cs
@@ -14,9 +14,9 @@ public static class Hash
             hash = sha.ComputeHash(data);
         }
 
-        char[] chars = new char[hash.Length * 2];
+        var chars = new char[hash.Length * 2];
 
-        int j = 0;
+        var j = 0;
 
         foreach(byte b in hash)
         {
diff --git a/Aaru.Server/Core/HtmlHelpers.cs b/Aaru.Server/Core/HtmlHelpers.cs
index 0e8a3ad2..db8a099c 100644
--- a/Aaru.Server/Core/HtmlHelpers.cs
+++ b/Aaru.Server/Core/HtmlHelpers.cs
@@ -7,18 +7,22 @@ namespace Aaru.Server.Core;
 public static class HtmlHelpers
 {
     public static string EncodedMultiLineText(this IHtmlHelper<CommonTypes.Metadata.Ata> helper, string text) =>
-        string.IsNullOrEmpty(text) ? string.Empty
+        string.IsNullOrEmpty(text)
+            ? string.Empty
             : Regex.Replace(helper.Encode(text), "&#xD;&#xA;|&#xA;|&#xD;", "<br/>");
 
     public static string EncodedMultiLineText(this IHtmlHelper<Mmc> helper, string text) =>
-        string.IsNullOrEmpty(text) ? string.Empty
+        string.IsNullOrEmpty(text)
+            ? string.Empty
             : Regex.Replace(helper.Encode(text), "&#xD;&#xA;|&#xA;|&#xD;", "<br/>");
 
     public static string EncodedMultiLineText(this IHtmlHelper<MmcSd> helper, string text) =>
-        string.IsNullOrEmpty(text) ? string.Empty
+        string.IsNullOrEmpty(text)
+            ? string.Empty
             : Regex.Replace(helper.Encode(text), "&#xD;&#xA;|&#xA;|&#xD;", "<br/>");
 
     public static string EncodedMultiLineText(this IHtmlHelper<Scsi> helper, string text) =>
-        string.IsNullOrEmpty(text) ? string.Empty
+        string.IsNullOrEmpty(text)
+            ? string.Empty
             : Regex.Replace(helper.Encode(text), "&#xD;&#xA;|&#xA;|&#xD;", "<br/>");
 }
\ No newline at end of file
diff --git a/Aaru.Server/Core/ScsiInquiry.cs b/Aaru.Server/Core/ScsiInquiry.cs
index fce36bb1..444ab064 100644
--- a/Aaru.Server/Core/ScsiInquiry.cs
+++ b/Aaru.Server/Core/ScsiInquiry.cs
@@ -34,7 +34,7 @@ using Aaru.CommonTypes.Structs.Devices.SCSI;
 
 namespace Aaru.Server.Core;
 
-internal static class ScsiInquiry
+static class ScsiInquiry
 {
     /// <summary>
     ///     Takes the SCSI INQUIRY part of a device report and prints it as a list of values to be sequenced by ASP.NET in
@@ -376,10 +376,12 @@ internal static class ScsiInquiry
             return scsiOneValue;
 
         foreach(ushort versionDescriptor in inquiry.VersionDescriptors)
+        {
             switch(versionDescriptor)
             {
                 case 0xFFFF:
-                case 0x0000: break;
+                case 0x0000:
+                    break;
                 case 0x0020:
                     scsiOneValue.Add("Device complies with SAM (no version claimed)");
 
@@ -2257,6 +2259,7 @@ internal static class ScsiInquiry
 
                     break;
             }
+        }
 
         return scsiOneValue;
     }
diff --git a/Aaru.Server/Core/ScsiMmcFeatures.cs b/Aaru.Server/Core/ScsiMmcFeatures.cs
index 7c8b2c3f..892c4998 100644
--- a/Aaru.Server/Core/ScsiMmcFeatures.cs
+++ b/Aaru.Server/Core/ScsiMmcFeatures.cs
@@ -252,10 +252,13 @@ public static class ScsiMmcFeatures
             mmcOneValue.Add($"{ftr.LogicalBlockSize} bytes per logical block");
 
         if(ftr.MultiRead)
+        {
             mmcOneValue.
                 Add("Drive claims capability to read all CD formats according to OSTA Multi-Read Specification");
+        }
 
         if(ftr.PhysicalInterfaceStandard.HasValue)
+        {
             switch(ftr.PhysicalInterfaceStandard)
             {
                 case PhysicalInterfaces.Unspecified:
@@ -303,6 +306,7 @@ public static class ScsiMmcFeatures
 
                     break;
             }
+        }
 
         if(ftr.PreventJumper)
             mmcOneValue.Add("Drive power ups locked");
@@ -452,6 +456,7 @@ public static class ScsiMmcFeatures
             mmcOneValue.Add("Drive supports Device Busy events");
 
         if(ftr.LoadingMechanismType.HasValue)
+        {
             switch(ftr.LoadingMechanismType)
             {
                 case 0:
@@ -479,6 +484,7 @@ public static class ScsiMmcFeatures
 
                     break;
             }
+        }
 
         if(ftr.SupportsHybridDiscs)
             mmcOneValue.Add("Drive is able to access Hybrid discs");
diff --git a/Aaru.Server/Core/ScsiMmcMode.cs b/Aaru.Server/Core/ScsiMmcMode.cs
index 7ef1b930..82da0a25 100644
--- a/Aaru.Server/Core/ScsiMmcMode.cs
+++ b/Aaru.Server/Core/ScsiMmcMode.cs
@@ -112,12 +112,14 @@ public static class ScsiMmcMode
         {
             mmcOneValue.Add("Drive power ups locked");
 
-            mmcOneValue.Add(mode.LockState ? "Drive is locked, media cannot be ejected or inserted"
+            mmcOneValue.Add(mode.LockState
+                                ? "Drive is locked, media cannot be ejected or inserted"
                                 : "Drive is not locked, media can be ejected and inserted");
         }
         else
         {
-            mmcOneValue.Add(mode.LockState ? "Drive is locked, media cannot be ejected, but if empty, can be inserted"
+            mmcOneValue.Add(mode.LockState
+                                ? "Drive is locked, media cannot be ejected, but if empty, can be inserted"
                                 : "Drive is not locked, media can be ejected and inserted");
         }
 
@@ -177,11 +179,16 @@ public static class ScsiMmcMode
         if(mode.CurrentWriteSpeedSelected > 0)
         {
             if(mode.RotationControlSelected == 0)
+            {
                 mmcOneValue.
                     Add($"Drive's current writing speed is {mode.CurrentWriteSpeedSelected} Kbyte/sec. in CLV mode");
+            }
             else if(mode.RotationControlSelected == 1)
+            {
                 mmcOneValue.
-                    Add($"Drive's current writing speed is {mode.CurrentWriteSpeedSelected} Kbyte/sec. in pure CAV mode");
+                    Add(
+                        $"Drive's current writing speed is {mode.CurrentWriteSpeedSelected} Kbyte/sec. in pure CAV mode");
+            }
         }
         else
         {
@@ -193,13 +200,19 @@ public static class ScsiMmcMode
         }
 
         if(mode.WriteSpeedPerformanceDescriptors != null)
+        {
             foreach(ModePage_2A_WriteDescriptor descriptor in mode.WriteSpeedPerformanceDescriptors.Where(descriptor =>
                         descriptor.WriteSpeed > 0))
+            {
                 if(descriptor.RotationControl == 0)
                     mmcOneValue.Add($"Drive supports writing at {descriptor.WriteSpeed} Kbyte/sec. in CLV mode");
                 else if(descriptor.RotationControl == 1)
+                {
                     mmcOneValue.
                         Add($"Drive supports writing at is {descriptor.WriteSpeed} Kbyte/sec. in pure CAV mode");
+                }
+            }
+        }
 
         if(mode.TestWrite)
             mmcOneValue.Add("Drive supports test writing");
diff --git a/Aaru.Server/Core/ScsiModeSense.cs b/Aaru.Server/Core/ScsiModeSense.cs
index e75df822..19b4724c 100644
--- a/Aaru.Server/Core/ScsiModeSense.cs
+++ b/Aaru.Server/Core/ScsiModeSense.cs
@@ -47,7 +47,7 @@ public static class ScsiModeSense
     /// <param name="deviceType">SCSI peripheral device type</param>
     /// <param name="scsiOneValue">List to put values on</param>
     /// <param name="modePages">List to put key=value pairs on</param>
-    public static void Report(ScsiMode modeSense, string vendor, PeripheralDeviceTypes deviceType,
+    public static void Report(ScsiMode         modeSense,    string vendor, PeripheralDeviceTypes deviceType,
                               ref List<string> scsiOneValue, ref Dictionary<string, string> modePages)
     {
         if(modeSense.MediumType.HasValue)
@@ -57,13 +57,20 @@ public static class ScsiModeSense
             scsiOneValue.Add("Device is write protected.");
 
         if(modeSense.BlockDescriptors != null)
+        {
             foreach(BlockDescriptor descriptor in modeSense.BlockDescriptors)
+            {
                 if(descriptor.Blocks.HasValue &&
                    descriptor.BlockLength.HasValue)
+                {
                     scsiOneValue.
-                        Add($"Density code {descriptor.Density:X2}h has {descriptor.Blocks} blocks of {descriptor.BlockLength} bytes each");
+                        Add(
+                            $"Density code {descriptor.Density:X2}h has {descriptor.Blocks} blocks of {descriptor.BlockLength} bytes each");
+                }
                 else
                     scsiOneValue.Add($"Density code {descriptor.Density:X2}h");
+            }
+        }
 
         if(modeSense.DPOandFUA)
             scsiOneValue.Add("Drive supports DPO and FUA bits");
@@ -72,6 +79,7 @@ public static class ScsiModeSense
             scsiOneValue.Add("Blank checking during write is enabled");
 
         if(modeSense.BufferedMode.HasValue)
+        {
             switch(modeSense.BufferedMode)
             {
                 case 0:
@@ -91,11 +99,13 @@ public static class ScsiModeSense
 
                     break;
             }
+        }
 
         if(modeSense.ModePages == null)
             return;
 
         foreach(ScsiPage page in modeSense.ModePages)
+        {
             switch(page.page)
             {
                 case 0x00:
@@ -104,19 +114,26 @@ public static class ScsiModeSense
                        page.subpage == 0)
                         modePages.Add($"MODE page {page.page:X2}h", Modes.PrettifyModePage_00_SFF(page.value));
                     else
+                    {
                         modePages.
-                            Add(page.subpage != 0 ? $"MODE page {page.page:X2}h subpage {page.subpage:X2}h" : $"MODE page {page.page:X2}h",
+                            Add(
+                                page.subpage != 0
+                                    ? $"MODE page {page.page:X2}h subpage {page.subpage:X2}h"
+                                    : $"MODE page {page.page:X2}h",
                                 "Unknown vendor mode page");
+                    }
 
                     break;
                 }
                 case 0x01:
                 {
                     if(page.subpage == 0)
+                    {
                         modePages.Add($"MODE page {page.page:X2}h",
                                       deviceType == PeripheralDeviceTypes.MultiMediaDevice
                                           ? Modes.PrettifyModePage_01_MMC(page.value)
                                           : Modes.PrettifyModePage_01(page.value));
+                    }
                     else
                         goto default;
 
@@ -170,10 +187,12 @@ public static class ScsiModeSense
                 case 0x07:
                 {
                     if(page.subpage == 0)
+                    {
                         modePages.Add($"MODE page {page.page:X2}h",
                                       deviceType == PeripheralDeviceTypes.MultiMediaDevice
                                           ? Modes.PrettifyModePage_07_MMC(page.value)
                                           : Modes.PrettifyModePage_07(page.value));
+                    }
                     else
                         goto default;
 
@@ -193,8 +212,10 @@ public static class ScsiModeSense
                     if(page.subpage == 0)
                         modePages.Add($"MODE page {page.page:X2}h", Modes.PrettifyModePage_0A(page.value));
                     else if(page.subpage == 1)
+                    {
                         modePages.Add($"MODE page {page.page:X2}h subpage {page.subpage:X2}h",
                                       Modes.PrettifyModePage_0A_S01(page.value));
+                    }
                     else
                         goto default;
 
@@ -239,10 +260,12 @@ public static class ScsiModeSense
                 case 0x10:
                 {
                     if(page.subpage == 0)
+                    {
                         modePages.Add($"MODE page {page.page:X2}h",
                                       deviceType == PeripheralDeviceTypes.SequentialAccess
                                           ? Modes.PrettifyModePage_10_SSC(page.value)
                                           : Modes.PrettifyModePage_10(page.value));
+                    }
                     else
                         goto default;
 
@@ -273,8 +296,10 @@ public static class ScsiModeSense
                     if(page.subpage == 0)
                         modePages.Add($"MODE page {page.page:X2}h", Modes.PrettifyModePage_1A(page.value));
                     else if(page.subpage == 1)
+                    {
                         modePages.Add($"MODE page {page.page:X2}h subpage {page.subpage:X2}h",
                                       Modes.PrettifyModePage_1A_S01(page.value));
+                    }
                     else
                         goto default;
 
@@ -292,13 +317,17 @@ public static class ScsiModeSense
                 case 0x1C:
                 {
                     if(page.subpage == 0)
+                    {
                         modePages.Add($"MODE page {page.page:X2}h",
                                       deviceType == PeripheralDeviceTypes.MultiMediaDevice
                                           ? Modes.PrettifyModePage_1C_SFF(page.value)
                                           : Modes.PrettifyModePage_1C(page.value));
+                    }
                     else if(page.subpage == 1)
+                    {
                         modePages.Add($"MODE page {page.page:X2}h subpage {page.subpage:X2}h",
                                       Modes.PrettifyModePage_1C_S01(page.value));
+                    }
                     else
                         goto default;
 
@@ -409,18 +438,24 @@ public static class ScsiModeSense
                 }
                 default:
                 {
-                    modePages.Add(page.subpage != 0 ? $"MODE page {page.page:X2}h subpage {page.subpage:X2}h" : $"MODE page {page.page:X2}h",
-                                  "Unknown mode page");
+                    modePages.Add(
+                        page.subpage != 0
+                            ? $"MODE page {page.page:X2}h subpage {page.subpage:X2}h"
+                            : $"MODE page {page.page:X2}h",
+                        "Unknown mode page");
                 }
 
                     break;
             }
+        }
 
         Dictionary<string, string> newModePages = new();
 
         foreach(KeyValuePair<string, string> kvp in modePages)
+        {
             newModePages.Add(kvp.Key,
                              string.IsNullOrWhiteSpace(kvp.Value) ? "Undecoded" : kvp.Value.Replace("\n", "<br/>"));
+        }
 
         modePages = newModePages;
     }
diff --git a/Aaru.Server/Core/SscTestedMedia.cs b/Aaru.Server/Core/SscTestedMedia.cs
index 55607ced..bd49c943 100644
--- a/Aaru.Server/Core/SscTestedMedia.cs
+++ b/Aaru.Server/Core/SscTestedMedia.cs
@@ -51,13 +51,9 @@ public static class SscTestedMedia
                     mediaOneValue.Add($"Medium type code: {media.MediumType:X2}h");
             }
             else if(media.MediumType.HasValue)
-            {
                 mediaOneValue.Add($"<i>Information for medium type {media.MediumType:X2}h</i>");
-            }
             else
-            {
                 mediaOneValue.Add("<i>Information for unknown medium type</i>");
-            }
 
             if(!string.IsNullOrWhiteSpace(media.Manufacturer))
                 mediaOneValue.Add($"Medium manufactured by: {media.Manufacturer}");
diff --git a/Aaru.Server/Core/StatsConverter.cs b/Aaru.Server/Core/StatsConverter.cs
index b7402a90..9ed587b9 100644
--- a/Aaru.Server/Core/StatsConverter.cs
+++ b/Aaru.Server/Core/StatsConverter.cs
@@ -47,11 +47,13 @@ public static class StatsConverter
             Command existing = ctx.Commands.FirstOrDefault(c => c.Name == "fs-info");
 
             if(existing == null)
+            {
                 ctx.Commands.Add(new Command
                 {
                     Count = newStats.Commands.Analyze,
                     Name  = "fs-info"
                 });
+            }
             else
                 existing.Count += newStats.Commands.Analyze;
         }
@@ -61,11 +63,13 @@ public static class StatsConverter
             Command existing = ctx.Commands.FirstOrDefault(c => c.Name == "benchmark");
 
             if(existing == null)
+            {
                 ctx.Commands.Add(new Command
                 {
                     Count = newStats.Commands.Benchmark,
                     Name  = "benchmark"
                 });
+            }
             else
                 existing.Count += newStats.Commands.Benchmark;
         }
@@ -75,11 +79,13 @@ public static class StatsConverter
             Command existing = ctx.Commands.FirstOrDefault(c => c.Name == "checksum");
 
             if(existing == null)
+            {
                 ctx.Commands.Add(new Command
                 {
                     Count = newStats.Commands.Checksum,
                     Name  = "checksum"
                 });
+            }
             else
                 existing.Count += newStats.Commands.Checksum;
         }
@@ -89,11 +95,13 @@ public static class StatsConverter
             Command existing = ctx.Commands.FirstOrDefault(c => c.Name == "compare");
 
             if(existing == null)
+            {
                 ctx.Commands.Add(new Command
                 {
                     Count = newStats.Commands.Compare,
                     Name  = "compare"
                 });
+            }
             else
                 existing.Count += newStats.Commands.Compare;
         }
@@ -103,11 +111,13 @@ public static class StatsConverter
             Command existing = ctx.Commands.FirstOrDefault(c => c.Name == "create-sidecar");
 
             if(existing == null)
+            {
                 ctx.Commands.Add(new Command
                 {
                     Count = newStats.Commands.CreateSidecar,
                     Name  = "create-sidecar"
                 });
+            }
             else
                 existing.Count += newStats.Commands.CreateSidecar;
         }
@@ -117,11 +127,13 @@ public static class StatsConverter
             Command existing = ctx.Commands.FirstOrDefault(c => c.Name == "decode");
 
             if(existing == null)
+            {
                 ctx.Commands.Add(new Command
                 {
                     Count = newStats.Commands.Decode,
                     Name  = "decode"
                 });
+            }
             else
                 existing.Count += newStats.Commands.Decode;
         }
@@ -131,11 +143,13 @@ public static class StatsConverter
             Command existing = ctx.Commands.FirstOrDefault(c => c.Name == "device-info");
 
             if(existing == null)
+            {
                 ctx.Commands.Add(new Command
                 {
                     Count = newStats.Commands.DeviceInfo,
                     Name  = "device-info"
                 });
+            }
             else
                 existing.Count += newStats.Commands.DeviceInfo;
         }
@@ -145,11 +159,13 @@ public static class StatsConverter
             Command existing = ctx.Commands.FirstOrDefault(c => c.Name == "device-report");
 
             if(existing == null)
+            {
                 ctx.Commands.Add(new Command
                 {
                     Count = newStats.Commands.DeviceReport,
                     Name  = "device-report"
                 });
+            }
             else
                 existing.Count += newStats.Commands.DeviceReport;
         }
@@ -159,11 +175,13 @@ public static class StatsConverter
             Command existing = ctx.Commands.FirstOrDefault(c => c.Name == "dump-media");
 
             if(existing == null)
+            {
                 ctx.Commands.Add(new Command
                 {
                     Count = newStats.Commands.DumpMedia,
                     Name  = "dump-media"
                 });
+            }
             else
                 existing.Count += newStats.Commands.DumpMedia;
         }
@@ -173,11 +191,13 @@ public static class StatsConverter
             Command existing = ctx.Commands.FirstOrDefault(c => c.Name == "entropy");
 
             if(existing == null)
+            {
                 ctx.Commands.Add(new Command
                 {
                     Count = newStats.Commands.Entropy,
                     Name  = "entropy"
                 });
+            }
             else
                 existing.Count += newStats.Commands.Entropy;
         }
@@ -187,11 +207,13 @@ public static class StatsConverter
             Command existing = ctx.Commands.FirstOrDefault(c => c.Name == "formats");
 
             if(existing == null)
+            {
                 ctx.Commands.Add(new Command
                 {
                     Count = newStats.Commands.Formats,
                     Name  = "formats"
                 });
+            }
             else
                 existing.Count += newStats.Commands.Formats;
         }
@@ -201,11 +223,13 @@ public static class StatsConverter
             Command existing = ctx.Commands.FirstOrDefault(c => c.Name == "media-info");
 
             if(existing == null)
+            {
                 ctx.Commands.Add(new Command
                 {
                     Count = newStats.Commands.MediaInfo,
                     Name  = "media-info"
                 });
+            }
             else
                 existing.Count += newStats.Commands.MediaInfo;
         }
@@ -215,11 +239,13 @@ public static class StatsConverter
             Command existing = ctx.Commands.FirstOrDefault(c => c.Name == "media-scan");
 
             if(existing == null)
+            {
                 ctx.Commands.Add(new Command
                 {
                     Count = newStats.Commands.MediaScan,
                     Name  = "media-scan"
                 });
+            }
             else
                 existing.Count += newStats.Commands.MediaScan;
         }
@@ -229,11 +255,13 @@ public static class StatsConverter
             Command existing = ctx.Commands.FirstOrDefault(c => c.Name == "printhex");
 
             if(existing == null)
+            {
                 ctx.Commands.Add(new Command
                 {
                     Count = newStats.Commands.PrintHex,
                     Name  = "printhex"
                 });
+            }
             else
                 existing.Count += newStats.Commands.PrintHex;
         }
@@ -243,11 +271,13 @@ public static class StatsConverter
             Command existing = ctx.Commands.FirstOrDefault(c => c.Name == "verify");
 
             if(existing == null)
+            {
                 ctx.Commands.Add(new Command
                 {
                     Count = newStats.Commands.Verify,
                     Name  = "verify"
                 });
+            }
             else
                 existing.Count += newStats.Commands.Verify;
         }
@@ -257,11 +287,13 @@ public static class StatsConverter
             Command existing = ctx.Commands.FirstOrDefault(c => c.Name == "ls");
 
             if(existing == null)
+            {
                 ctx.Commands.Add(new Command
                 {
                     Count = newStats.Commands.Ls,
                     Name  = "ls"
                 });
+            }
             else
                 existing.Count += newStats.Commands.Ls;
         }
@@ -271,11 +303,13 @@ public static class StatsConverter
             Command existing = ctx.Commands.FirstOrDefault(c => c.Name == "extract-files");
 
             if(existing == null)
+            {
                 ctx.Commands.Add(new Command
                 {
                     Count = newStats.Commands.ExtractFiles,
                     Name  = "extract-files"
                 });
+            }
             else
                 existing.Count += newStats.Commands.ExtractFiles;
         }
@@ -285,11 +319,13 @@ public static class StatsConverter
             Command existing = ctx.Commands.FirstOrDefault(c => c.Name == "list-devices");
 
             if(existing == null)
+            {
                 ctx.Commands.Add(new Command
                 {
                     Count = newStats.Commands.ListDevices,
                     Name  = "list-devices"
                 });
+            }
             else
                 existing.Count += newStats.Commands.ListDevices;
         }
@@ -299,11 +335,13 @@ public static class StatsConverter
             Command existing = ctx.Commands.FirstOrDefault(c => c.Name == "list-encodings");
 
             if(existing == null)
+            {
                 ctx.Commands.Add(new Command
                 {
                     Count = newStats.Commands.ListEncodings,
                     Name  = "list-encodings"
                 });
+            }
             else
                 existing.Count += newStats.Commands.ListEncodings;
         }
@@ -313,11 +351,13 @@ public static class StatsConverter
             Command existing = ctx.Commands.FirstOrDefault(c => c.Name == "convert-image");
 
             if(existing == null)
+            {
                 ctx.Commands.Add(new Command
                 {
                     Count = newStats.Commands.ConvertImage,
                     Name  = "convert-image"
                 });
+            }
             else
                 existing.Count += newStats.Commands.ConvertImage;
         }
@@ -327,11 +367,13 @@ public static class StatsConverter
             Command existing = ctx.Commands.FirstOrDefault(c => c.Name == "image-info");
 
             if(existing == null)
+            {
                 ctx.Commands.Add(new Command
                 {
                     Count = newStats.Commands.ImageInfo,
                     Name  = "image-info"
                 });
+            }
             else
                 existing.Count += newStats.Commands.ImageInfo;
         }
@@ -349,12 +391,14 @@ public static class StatsConverter
                                                              c.Version == operatingSystem.version);
 
                 if(existing == null)
+                {
                     ctx.OperatingSystems.Add(new OperatingSystem
                     {
                         Count   = operatingSystem.Value,
                         Name    = operatingSystem.name,
                         Version = operatingSystem.version
                     });
+                }
                 else
                     existing.Count += operatingSystem.Value;
             }
@@ -364,11 +408,13 @@ public static class StatsConverter
             OperatingSystem existing = ctx.OperatingSystems.FirstOrDefault(c => c.Name == "Linux" && c.Version == null);
 
             if(existing == null)
+            {
                 ctx.OperatingSystems.Add(new OperatingSystem
                 {
                     Count = 1,
                     Name  = "Linux"
                 });
+            }
             else
                 existing.Count++;
         }
@@ -383,11 +429,13 @@ public static class StatsConverter
                 Version existing = ctx.Versions.FirstOrDefault(c => c.Name == nvs.name);
 
                 if(existing == null)
+                {
                     ctx.Versions.Add(new Version
                     {
                         Count = nvs.Value,
                         Name  = nvs.name
                     });
+                }
                 else
                     existing.Count += nvs.Value;
             }
@@ -397,16 +445,19 @@ public static class StatsConverter
             Version existing = ctx.Versions.FirstOrDefault(c => c.Name == "previous");
 
             if(existing == null)
+            {
                 ctx.Versions.Add(new Version
                 {
                     Count = 1,
                     Name  = "previous"
                 });
+            }
             else
                 existing.Count++;
         }
 
         if(newStats.Filesystems != null)
+        {
             foreach(NameValueStats nvs in newStats.Filesystems)
             {
                 if(string.IsNullOrWhiteSpace(nvs.name))
@@ -415,16 +466,20 @@ public static class StatsConverter
                 Filesystem existing = ctx.Filesystems.FirstOrDefault(c => c.Name == nvs.name);
 
                 if(existing == null)
+                {
                     ctx.Filesystems.Add(new Filesystem
                     {
                         Count = nvs.Value,
                         Name  = nvs.name
                     });
+                }
                 else
                     existing.Count += nvs.Value;
             }
+        }
 
         if(newStats.Partitions != null)
+        {
             foreach(NameValueStats nvs in newStats.Partitions)
             {
                 if(string.IsNullOrWhiteSpace(nvs.name))
@@ -433,16 +488,20 @@ public static class StatsConverter
                 Partition existing = ctx.Partitions.FirstOrDefault(c => c.Name == nvs.name);
 
                 if(existing == null)
+                {
                     ctx.Partitions.Add(new Partition
                     {
                         Count = nvs.Value,
                         Name  = nvs.name
                     });
+                }
                 else
                     existing.Count += nvs.Value;
             }
+        }
 
         if(newStats.MediaImages != null)
+        {
             foreach(NameValueStats nvs in newStats.MediaImages)
             {
                 if(string.IsNullOrWhiteSpace(nvs.name))
@@ -451,16 +510,20 @@ public static class StatsConverter
                 MediaFormat existing = ctx.MediaFormats.FirstOrDefault(c => c.Name == nvs.name);
 
                 if(existing == null)
+                {
                     ctx.MediaFormats.Add(new MediaFormat
                     {
                         Count = nvs.Value,
                         Name  = nvs.name
                     });
+                }
                 else
                     existing.Count += nvs.Value;
             }
+        }
 
         if(newStats.Filters != null)
+        {
             foreach(NameValueStats nvs in newStats.Filters)
             {
                 if(string.IsNullOrWhiteSpace(nvs.name))
@@ -469,21 +532,25 @@ public static class StatsConverter
                 Filter existing = ctx.Filters.FirstOrDefault(c => c.Name == nvs.name);
 
                 if(existing == null)
+                {
                     ctx.Filters.Add(new Filter
                     {
                         Count = nvs.Value,
                         Name  = nvs.name
                     });
+                }
                 else
                     existing.Count += nvs.Value;
             }
+        }
 
         if(newStats.Devices != null)
+        {
             foreach(DeviceStats device in newStats.Devices.Where(device => !string.IsNullOrWhiteSpace(device.Model)).
                                                    Where(device => !ctx.DeviceStats.Any(c => c.Bus == device.Bus &&
-                                                                       c.Manufacturer == device.Manufacturer &&
-                                                                       c.Model == device.Model &&
-                                                                       c.Revision == device.Revision)))
+                                                                           c.Manufacturer == device.Manufacturer &&
+                                                                           c.Model == device.Model &&
+                                                                           c.Revision == device.Revision)))
             {
                 ctx.DeviceStats.Add(new DeviceStat
                 {
@@ -493,8 +560,10 @@ public static class StatsConverter
                     Revision     = device.Revision
                 });
             }
+        }
 
         if(newStats.Medias != null)
+        {
             foreach(MediaStats media in newStats.Medias)
             {
                 if(string.IsNullOrWhiteSpace(media.type))
@@ -503,15 +572,18 @@ public static class StatsConverter
                 Media existing = ctx.Medias.FirstOrDefault(c => c.Type == media.type && c.Real == media.real);
 
                 if(existing == null)
+                {
                     ctx.Medias.Add(new Media
                     {
                         Count = media.Value,
                         Real  = media.real,
                         Type  = media.type
                     });
+                }
                 else
                     existing.Count += media.Value;
             }
+        }
 
         ctx.SaveChanges();
     }
diff --git a/Aaru.Server/Core/TestedMedia.cs b/Aaru.Server/Core/TestedMedia.cs
index 21d1d3cb..b67ec5c9 100644
--- a/Aaru.Server/Core/TestedMedia.cs
+++ b/Aaru.Server/Core/TestedMedia.cs
@@ -49,15 +49,12 @@ public static class TestedMedia
                     mediaOneValue.Add($"Medium type code: {testedMedia.MediumType:X2}h");
             }
             else if(testedMedia.MediumType != null)
-            {
                 mediaOneValue.Add($"<i>Information for medium type {testedMedia.MediumType:X2}h</i>");
-            }
             else
-            {
                 mediaOneValue.Add("<i>Information for unknown medium type</i>");
-            }
 
-            mediaOneValue.Add(testedMedia.MediaIsRecognized ? "Drive recognizes this medium."
+            mediaOneValue.Add(testedMedia.MediaIsRecognized
+                                  ? "Drive recognizes this medium."
                                   : "Drive does not recognize this medium.");
 
             if(!string.IsNullOrWhiteSpace(testedMedia.Manufacturer))
@@ -84,14 +81,23 @@ public static class TestedMedia
                 mediaOneValue.Add($"Medium has {testedMedia.Blocks} blocks of {testedMedia.BlockSize} bytes each");
 
                 if(testedMedia.Blocks * testedMedia.BlockSize / 1024 / 1024 > 1000000)
+                {
                     mediaOneValue.
-                        Add($"Medium size: {testedMedia.Blocks * testedMedia.BlockSize} bytes, {testedMedia.Blocks * testedMedia.BlockSize / 1000 / 1000 / 1000 / 1000} Tb, {(double)(testedMedia.Blocks * testedMedia.BlockSize) / 1024 / 1024 / 1024 / 1024:F2} TiB");
+                        Add(
+                            $"Medium size: {testedMedia.Blocks * testedMedia.BlockSize} bytes, {testedMedia.Blocks * testedMedia.BlockSize / 1000 / 1000 / 1000 / 1000} Tb, {(double)(testedMedia.Blocks * testedMedia.BlockSize) / 1024 / 1024 / 1024 / 1024:F2} TiB");
+                }
                 else if(testedMedia.Blocks * testedMedia.BlockSize / 1024 / 1024 > 1000)
+                {
                     mediaOneValue.
-                        Add($"Medium size: {testedMedia.Blocks * testedMedia.BlockSize} bytes, {testedMedia.Blocks * testedMedia.BlockSize / 1000 / 1000 / 1000} Gb, {(double)(testedMedia.Blocks * testedMedia.BlockSize) / 1024 / 1024 / 1024:F2} GiB");
+                        Add(
+                            $"Medium size: {testedMedia.Blocks * testedMedia.BlockSize} bytes, {testedMedia.Blocks * testedMedia.BlockSize / 1000 / 1000 / 1000} Gb, {(double)(testedMedia.Blocks * testedMedia.BlockSize) / 1024 / 1024 / 1024:F2} GiB");
+                }
                 else
+                {
                     mediaOneValue.
-                        Add($"Medium size: {testedMedia.Blocks * testedMedia.BlockSize} bytes, {testedMedia.Blocks * testedMedia.BlockSize / 1000 / 1000} Mb, {(double)(testedMedia.Blocks * testedMedia.BlockSize) / 1024 / 1024:F2} MiB");
+                        Add(
+                            $"Medium size: {testedMedia.Blocks * testedMedia.BlockSize} bytes, {testedMedia.Blocks * testedMedia.BlockSize / 1000 / 1000} Mb, {(double)(testedMedia.Blocks * testedMedia.BlockSize) / 1024 / 1024:F2} MiB");
+                }
             }
 
             if(testedMedia.CHS        != null &&
@@ -109,10 +115,12 @@ public static class TestedMedia
                     Add($"Sectors per track: {testedMedia.CHS.Sectors} max., {testedMedia.CurrentCHS.Sectors} current");
 
                 mediaOneValue.
-                    Add($"Sectors addressable in CHS mode: {testedMedia.CHS.Cylinders * testedMedia.CHS.Heads * testedMedia.CHS.Sectors} max., {currentSectors} current");
+                    Add(
+                        $"Sectors addressable in CHS mode: {testedMedia.CHS.Cylinders * testedMedia.CHS.Heads * testedMedia.CHS.Sectors} max., {currentSectors} current");
 
                 mediaOneValue.
-                    Add($"Medium size in CHS mode: {(ulong)currentSectors * testedMedia.BlockSize} bytes, {(ulong)currentSectors * testedMedia.BlockSize / 1000 / 1000} Mb, {(double)((ulong)currentSectors * testedMedia.BlockSize) / 1024 / 1024:F2} MiB");
+                    Add(
+                        $"Medium size in CHS mode: {(ulong)currentSectors * testedMedia.BlockSize} bytes, {(ulong)currentSectors * testedMedia.BlockSize / 1000 / 1000} Mb, {(double)((ulong)currentSectors * testedMedia.BlockSize) / 1024 / 1024:F2} MiB");
             }
             else if(testedMedia.CHS != null)
             {
@@ -123,7 +131,8 @@ public static class TestedMedia
                 mediaOneValue.Add($"Sectors addressable in CHS mode: {currentSectors}");
 
                 mediaOneValue.
-                    Add($"Medium size in CHS mode: {(ulong)currentSectors * testedMedia.BlockSize} bytes, {(ulong)currentSectors * testedMedia.BlockSize / 1000 / 1000} Mb, {(double)((ulong)currentSectors * testedMedia.BlockSize) / 1024 / 1024:F2} MiB");
+                    Add(
+                        $"Medium size in CHS mode: {(ulong)currentSectors * testedMedia.BlockSize} bytes, {(ulong)currentSectors * testedMedia.BlockSize / 1000 / 1000} Mb, {(double)((ulong)currentSectors * testedMedia.BlockSize) / 1024 / 1024:F2} MiB");
             }
 
             if(testedMedia.LBASectors != null)
@@ -131,14 +140,23 @@ public static class TestedMedia
                 mediaOneValue.Add($"Sectors addressable in sectors in 28-bit LBA mode: {testedMedia.LBASectors}");
 
                 if((ulong)testedMedia.LBASectors * testedMedia.BlockSize / 1024 / 1024 > 1000000)
+                {
                     mediaOneValue.
-                        Add($"Medium size in 28-bit LBA mode: {(ulong)testedMedia.LBASectors * testedMedia.BlockSize} bytes, {(ulong)testedMedia.LBASectors * testedMedia.BlockSize / 1000 / 1000 / 1000 / 1000} Tb, {(double)((ulong)testedMedia.LBASectors * testedMedia.BlockSize) / 1024 / 1024 / 1024 / 1024:F2} TiB");
+                        Add(
+                            $"Medium size in 28-bit LBA mode: {(ulong)testedMedia.LBASectors * testedMedia.BlockSize} bytes, {(ulong)testedMedia.LBASectors * testedMedia.BlockSize / 1000 / 1000 / 1000 / 1000} Tb, {(double)((ulong)testedMedia.LBASectors * testedMedia.BlockSize) / 1024 / 1024 / 1024 / 1024:F2} TiB");
+                }
                 else if((ulong)testedMedia.LBASectors * testedMedia.BlockSize / 1024 / 1024 > 1000)
+                {
                     mediaOneValue.
-                        Add($"Medium size in 28-bit LBA mode: {(ulong)testedMedia.LBASectors * testedMedia.BlockSize} bytes, {(ulong)testedMedia.LBASectors * testedMedia.BlockSize / 1000 / 1000 / 1000} Gb, {(double)((ulong)testedMedia.LBASectors * testedMedia.BlockSize) / 1024 / 1024 / 1024:F2} GiB");
+                        Add(
+                            $"Medium size in 28-bit LBA mode: {(ulong)testedMedia.LBASectors * testedMedia.BlockSize} bytes, {(ulong)testedMedia.LBASectors * testedMedia.BlockSize / 1000 / 1000 / 1000} Gb, {(double)((ulong)testedMedia.LBASectors * testedMedia.BlockSize) / 1024 / 1024 / 1024:F2} GiB");
+                }
                 else
+                {
                     mediaOneValue.
-                        Add($"Medium size in 28-bit LBA mode: {(ulong)testedMedia.LBASectors * testedMedia.BlockSize} bytes, {(ulong)testedMedia.LBASectors * testedMedia.BlockSize / 1000 / 1000} Mb, {(double)((ulong)testedMedia.LBASectors * testedMedia.BlockSize) / 1024 / 1024:F2} MiB");
+                        Add(
+                            $"Medium size in 28-bit LBA mode: {(ulong)testedMedia.LBASectors * testedMedia.BlockSize} bytes, {(ulong)testedMedia.LBASectors * testedMedia.BlockSize / 1000 / 1000} Mb, {(double)((ulong)testedMedia.LBASectors * testedMedia.BlockSize) / 1024 / 1024:F2} MiB");
+                }
             }
 
             if(testedMedia.LBA48Sectors != null)
@@ -146,29 +164,44 @@ public static class TestedMedia
                 mediaOneValue.Add($"Sectors addressable in sectors in 48-bit LBA mode: {testedMedia.LBA48Sectors}");
 
                 if(testedMedia.LBA48Sectors * testedMedia.BlockSize / 1024 / 1024 > 1000000)
+                {
                     mediaOneValue.
-                        Add($"Medium size in 48-bit LBA mode: {testedMedia.LBA48Sectors * testedMedia.BlockSize} bytes, {testedMedia.LBA48Sectors * testedMedia.BlockSize / 1000 / 1000 / 1000 / 1000} Tb, {(double)(testedMedia.LBA48Sectors * testedMedia.BlockSize) / 1024 / 1024 / 1024 / 1024:F2} TiB");
+                        Add(
+                            $"Medium size in 48-bit LBA mode: {testedMedia.LBA48Sectors * testedMedia.BlockSize} bytes, {testedMedia.LBA48Sectors * testedMedia.BlockSize / 1000 / 1000 / 1000 / 1000} Tb, {(double)(testedMedia.LBA48Sectors * testedMedia.BlockSize) / 1024 / 1024 / 1024 / 1024:F2} TiB");
+                }
                 else if(testedMedia.LBA48Sectors * testedMedia.BlockSize / 1024 / 1024 > 1000)
+                {
                     mediaOneValue.
-                        Add($"Medium size in 48-bit LBA mode: {testedMedia.LBA48Sectors * testedMedia.BlockSize} bytes, {testedMedia.LBA48Sectors * testedMedia.BlockSize / 1000 / 1000 / 1000} Gb, {(double)(testedMedia.LBA48Sectors * testedMedia.BlockSize) / 1024 / 1024 / 1024:F2} GiB");
+                        Add(
+                            $"Medium size in 48-bit LBA mode: {testedMedia.LBA48Sectors * testedMedia.BlockSize} bytes, {testedMedia.LBA48Sectors * testedMedia.BlockSize / 1000 / 1000 / 1000} Gb, {(double)(testedMedia.LBA48Sectors * testedMedia.BlockSize) / 1024 / 1024 / 1024:F2} GiB");
+                }
                 else
+                {
                     mediaOneValue.
-                        Add($"Medium size in 48-bit LBA mode: {testedMedia.LBA48Sectors * testedMedia.BlockSize} bytes, {testedMedia.LBA48Sectors * testedMedia.BlockSize / 1000 / 1000} Mb, {(double)(testedMedia.LBA48Sectors * testedMedia.BlockSize) / 1024 / 1024:F2} MiB");
+                        Add(
+                            $"Medium size in 48-bit LBA mode: {testedMedia.LBA48Sectors * testedMedia.BlockSize} bytes, {testedMedia.LBA48Sectors * testedMedia.BlockSize / 1000 / 1000} Mb, {(double)(testedMedia.LBA48Sectors * testedMedia.BlockSize) / 1024 / 1024:F2} MiB");
+                }
             }
 
             if(testedMedia.NominalRotationRate != null   &&
                testedMedia.NominalRotationRate != 0x0000 &&
                testedMedia.NominalRotationRate != 0xFFFF)
-                mediaOneValue.Add(testedMedia.NominalRotationRate == 0x0001 ? "Medium does not rotate."
+            {
+                mediaOneValue.Add(testedMedia.NominalRotationRate == 0x0001
+                                      ? "Medium does not rotate."
                                       : $"Medium rotates at {testedMedia.NominalRotationRate} rpm");
+            }
 
             if(testedMedia.BlockSize                   != null                                &&
                testedMedia.PhysicalBlockSize           != null                                &&
                testedMedia.BlockSize.Value             != testedMedia.PhysicalBlockSize.Value &&
                (testedMedia.LogicalAlignment & 0x8000) == 0x0000                              &&
                (testedMedia.LogicalAlignment & 0x4000) == 0x4000)
+            {
                 mediaOneValue.
-                    Add($"Logical sector starts at offset {testedMedia.LogicalAlignment & 0x3FFF} from physical sector");
+                    Add(
+                        $"Logical sector starts at offset {testedMedia.LogicalAlignment & 0x3FFF} from physical sector");
+            }
 
             if(testedMedia.SupportsReadSectors == true)
                 mediaOneValue.Add("Device can use the READ SECTOR(S) command in CHS mode with this medium");
@@ -192,8 +225,10 @@ public static class TestedMedia
                 mediaOneValue.Add("Device can use the READ SECTOR(S) command in 28-bit LBA mode with this medium");
 
             if(testedMedia.SupportsReadRetryLba == true)
+            {
                 mediaOneValue.
                     Add("Device can use the READ SECTOR(S) RETRY command in 28-bit LBA mode with this medium");
+            }
 
             if(testedMedia.SupportsReadDmaLba == true)
                 mediaOneValue.Add("Device can use the READ DMA command in 28-bit LBA mode with this medium");
@@ -250,12 +285,16 @@ public static class TestedMedia
                 mediaOneValue.Add("Device can use the READ CD command with MM:SS:FF addressing with this medium");
 
             if(testedMedia.SupportsReadCdRaw == true)
+            {
                 mediaOneValue.
                     Add("Device can use the READ CD command with LBA addressing with this medium to read raw sector");
+            }
 
             if(testedMedia.SupportsReadCdMsfRaw == true)
+            {
                 mediaOneValue.
                     Add("Device can use the READ CD command with MM:SS:FF addressing with this medium read raw sector");
+            }
 
             if(testedMedia.SupportsHLDTSTReadRawDVD == true)
                 mediaOneValue.Add("Device can use the HL-DT-ST vendor READ DVD (RAW) command with this medium");
@@ -297,8 +336,10 @@ public static class TestedMedia
                 mediaOneValue.Add("Device can correct subchannels when reading from this medium");
 
             if(testedMedia.CanReadCorrectedSubchannelWithC2 == true)
+            {
                 mediaOneValue.
                     Add("Device can correct subchannels and report the C2 pointers when reading from this medium");
+            }
 
             if(testedMedia.CanReadDCB == true)
                 mediaOneValue.Add("Device can read the Disc Control Blocks from this medium");
diff --git a/Aaru.Server/Models/CdOffset.cs b/Aaru.Server/Models/CdOffset.cs
index 92c64caf..1fffe2f2 100644
--- a/Aaru.Server/Models/CdOffset.cs
+++ b/Aaru.Server/Models/CdOffset.cs
@@ -60,9 +60,12 @@ public class CompactDiscOffset : CdOffset
     }
 
     public int Id { get; set; }
+
     [DisplayName("Added date")]
     public DateTime AddedWhen { get; set; }
+
     [DisplayName("Modification date")]
-    public DateTime ModifiedWhen { get;               set; }
+    public DateTime ModifiedWhen { get; set; }
+
     public virtual ICollection<Device> Devices { get; set; }
 }
\ No newline at end of file
diff --git a/Aaru.Server/Models/Context.cs b/Aaru.Server/Models/Context.cs
index 2874f524..9434138b 100644
--- a/Aaru.Server/Models/Context.cs
+++ b/Aaru.Server/Models/Context.cs
@@ -265,7 +265,7 @@ public sealed class AaruServerContext : IdentityDbContext<IdentityUser>
         command.CommandText =
             $"SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA=DATABASE() AND TABLE_NAME=\"{tableName}\"";
 
-        long result = (long)command.ExecuteScalar();
+        var result = (long)command.ExecuteScalar();
 
         return result != 0;
     }
diff --git a/Aaru.Server/Models/Device.cs b/Aaru.Server/Models/Device.cs
index e0821da8..8bae62e8 100644
--- a/Aaru.Server/Models/Device.cs
+++ b/Aaru.Server/Models/Device.cs
@@ -84,13 +84,18 @@ public class Device : DeviceReportV2
 
     [DisplayName("Added when")]
     public DateTime AddedWhen { get; set; }
+
     [DisplayName("Modified when")]
-    public DateTime? ModifiedWhen { get;             set; }
+    public DateTime? ModifiedWhen { get; set; }
+
     public virtual CompactDiscOffset CdOffset { get; set; }
 
-    [DefaultValue(0), DisplayName("Optimal no. of sectors to be read at once")]
+    [DefaultValue(0)]
+    [DisplayName("Optimal no. of sectors to be read at once")]
     public int OptimalMultipleSectorsRead { get; set; }
-    [DefaultValue(null), DisplayName("Can read GD-ROM using swap disc trick")]
+
+    [DefaultValue(null)]
+    [DisplayName("Can read GD-ROM using swap disc trick")]
     public bool? CanReadGdRomUsingSwapDisc { get; set; }
 
     public int? ATAId                       { get; set; }
diff --git a/Aaru.Server/Models/FireWireModel.cs b/Aaru.Server/Models/FireWireModel.cs
index e3ff4cb4..6328b4ee 100644
--- a/Aaru.Server/Models/FireWireModel.cs
+++ b/Aaru.Server/Models/FireWireModel.cs
@@ -5,14 +5,20 @@ namespace Aaru.Server.Models;
 
 public class FireWireModel
 {
-    [DisplayName("Vendor ID"), DisplayFormat(ApplyFormatInEditMode = true, DataFormatString = "0x{0:X8}")]
+    [DisplayName("Vendor ID")]
+    [DisplayFormat(ApplyFormatInEditMode = true, DataFormatString = "0x{0:X8}")]
     public uint VendorID { get; set; }
-    [DisplayName("Product ID"), DisplayFormat(ApplyFormatInEditMode = true, DataFormatString = "0x{0:X8}")]
+
+    [DisplayName("Product ID")]
+    [DisplayFormat(ApplyFormatInEditMode = true, DataFormatString = "0x{0:X8}")]
     public uint ProductID { get; set; }
+
     [DisplayFormat(NullDisplayText = "Unknown")]
     public string Manufacturer { get; set; }
+
     [DisplayFormat(NullDisplayText = "Unknown")]
     public string Product { get; set; }
+
     [DisplayName("Is media removable?")]
     public bool RemovableMedia { get; set; }
 }
diff --git a/Aaru.Server/Models/Media.cs b/Aaru.Server/Models/Media.cs
index fc8a9f4a..da354317 100644
--- a/Aaru.Server/Models/Media.cs
+++ b/Aaru.Server/Models/Media.cs
@@ -50,7 +50,7 @@ public class Media : BaseModel<int>
     {
         get
         {
-            if(_mediaType != default)
+            if(_mediaType != default((string type, string subType)))
                 return _mediaType;
 
             try
@@ -69,8 +69,11 @@ public class Media : BaseModel<int>
         }
     }
 
-    [NotMapped, DisplayName("Physical type")]
+    [NotMapped]
+    [DisplayName("Physical type")]
     public string PhysicalType => MediaType.type;
-    [NotMapped, DisplayName("Logical type")]
+
+    [NotMapped]
+    [DisplayName("Logical type")]
     public string LogicalType => MediaType.subType;
 }
\ No newline at end of file
diff --git a/Aaru.Server/Models/MmcModelForView.cs b/Aaru.Server/Models/MmcModelForView.cs
index a305a283..2303509e 100644
--- a/Aaru.Server/Models/MmcModelForView.cs
+++ b/Aaru.Server/Models/MmcModelForView.cs
@@ -5,8 +5,10 @@ namespace Aaru.Server.Models;
 
 public class MmcModelForView : BaseModel<int>
 {
-    [DisplayFormat(NullDisplayText = "none"), DisplayName("MMC FEATURES ID")]
+    [DisplayFormat(NullDisplayText = "none")]
+    [DisplayName("MMC FEATURES ID")]
     public int? FeaturesId { get; set; }
+
     [DisplayName("Response length (bytes)")]
     public int DataLength { get; set; }
 }
\ No newline at end of file
diff --git a/Aaru.Server/Models/NesHeaderInfo.cs b/Aaru.Server/Models/NesHeaderInfo.cs
index 6a076d7d..4e44fed9 100644
--- a/Aaru.Server/Models/NesHeaderInfo.cs
+++ b/Aaru.Server/Models/NesHeaderInfo.cs
@@ -6,32 +6,46 @@ namespace Aaru.Server.Models;
 public class NesHeaderInfo : BaseModel<int>
 {
     /// <summary>ROM hash</summary>
-    [StringLength(64), Required]
+    [StringLength(64)]
+    [Required]
     public string Sha256 { get; set; }
+
     /// <summary>If <c>true</c> vertical mirroring is hard-wired, horizontal or mapper defined otherwise</summary>
     public bool NametableMirroring { get; set; }
+
     /// <summary>If <c>true</c> a battery is present</summary>
     public bool BatteryPresent { get; set; }
+
     /// <summary>If <c>true</c> the four player screen mode is hardwired</summary>
     public bool FourScreenMode { get; set; }
+
     /// <summary>Mapper number (NES 2.0 when in conflict)</summary>
     public ushort Mapper { get; set; }
+
     /// <summary>Console type</summary>
     public NesConsoleType ConsoleType { get; set; }
+
     /// <summary>Submapper number</summary>
     public byte Submapper { get; set; }
+
     /// <summary>Timing mode</summary>
     public NesTimingMode TimingMode { get; set; }
+
     /// <summary>Vs. PPU type</summary>
     public NesVsPpuType VsPpuType { get; set; }
+
     /// <summary>Vs. hardware type</summary>
     public NesVsHardwareType VsHardwareType { get; set; }
+
     /// <summary>Extended console type</summary>
     public NesExtendedConsoleType ExtendedConsoleType { get; set; }
+
     /// <summary>Default expansion device</summary>
     public NesDefaultExpansionDevice DefaultExpansionDevice { get; set; }
+
     /// <summary>Date when model has been added to the database</summary>
     public DateTime AddedWhen { get; set; }
+
     /// <summary>Date when model was last modified</summary>
     public DateTime ModifiedWhen { get; set; }
 }
\ No newline at end of file
diff --git a/Aaru.Server/Models/UsbProductModel.cs b/Aaru.Server/Models/UsbProductModel.cs
index 5c4ae861..3619e90a 100644
--- a/Aaru.Server/Models/UsbProductModel.cs
+++ b/Aaru.Server/Models/UsbProductModel.cs
@@ -7,9 +7,13 @@ public class UsbProductModel
 {
     [DisplayName("Manufacturer")]
     public string VendorName { get; set; }
-    public int VendorId { get;      set; }
+
+    public int VendorId { get; set; }
+
     [DisplayName("Product")]
     public string ProductName { get; set; }
-    [DisplayName("Product ID"), DisplayFormat(DataFormatString = "0x{0:X4}")]
+
+    [DisplayName("Product ID")]
+    [DisplayFormat(DataFormatString = "0x{0:X4}")]
     public ushort ProductId { get; set; }
 }
\ No newline at end of file
diff --git a/Aaru.Server/Models/UsbVendor.cs b/Aaru.Server/Models/UsbVendor.cs
index 52a758e7..23ab663e 100644
--- a/Aaru.Server/Models/UsbVendor.cs
+++ b/Aaru.Server/Models/UsbVendor.cs
@@ -47,10 +47,13 @@ public class UsbVendor : BaseModel<int>
         AddedWhen = ModifiedWhen = DateTime.UtcNow;
     }
 
-    [DisplayName("Manufacturer ID"), DisplayFormat(DataFormatString = "0x{0:X4}")]
+    [DisplayName("Manufacturer ID")]
+    [DisplayFormat(DataFormatString = "0x{0:X4}")]
     public ushort VendorId { get; set; }
+
     [DisplayName("Manufacturer")]
-    public string Vendor { get;         set; }
+    public string Vendor { get; set; }
+
     public DateTime AddedWhen    { get; set; }
     public DateTime ModifiedWhen { get; set; }
 
diff --git a/Aaru.Server/Models/UsbVendorModel.cs b/Aaru.Server/Models/UsbVendorModel.cs
index 35697b10..b13c6f71 100644
--- a/Aaru.Server/Models/UsbVendorModel.cs
+++ b/Aaru.Server/Models/UsbVendorModel.cs
@@ -7,7 +7,10 @@ public class UsbVendorModel
 {
     [DisplayName("Manufacturer")]
     public string Vendor { get; set; }
-    [DisplayName("Vendor ID"), DisplayFormat(DataFormatString = "0x{0:X4}")]
-    public ushort VendorId { get;                set; }
+
+    [DisplayName("Vendor ID")]
+    [DisplayFormat(DataFormatString = "0x{0:X4}")]
+    public ushort VendorId { get; set; }
+
     public List<UsbProductModel> Products { get; set; }
 }
\ No newline at end of file
diff --git a/Aaru.Server/Program.cs b/Aaru.Server/Program.cs
index bdf0325a..f2b842d3 100644
--- a/Aaru.Server/Program.cs
+++ b/Aaru.Server/Program.cs
@@ -20,66 +20,68 @@ public sealed class Program
         System.Console.Clear();
 
         System.Console.Write(
-                             "\u001b[32m                             .                ,,\n" +
-                             "\u001b[32m                          ;,.                  '0d.\n" +
-                             "\u001b[32m                        oc                       oWd                      \u001b[31m" +
-                             @"__/\\\\\\\\\\\\_____/\\\\\\\\\\\________/\\\\\\\\\_        " + "\n\u001b[0m" +
-                             "\u001b[32m                      ;X.                         'WN'                    \u001b[31m" +
-                             @" _\/\\\////////\\\__\/////\\\///______/\\\////////__       " + "\n\u001b[0m" +
-                             "\u001b[32m                     oMo                           cMM:                   \u001b[31m" +
-                             @"  _\/\\\______\//\\\_____\/\\\_______/\\\/___________      " + "\n\u001b[0m" +
-                             "\u001b[32m                    ;MM.                           .MMM;                  \u001b[31m" +
-                             @"   _\/\\\_______\/\\\_____\/\\\______/\\\_____________     " + "\n\u001b[0m" +
-                             "\u001b[32m                    NMM                             WMMW                  \u001b[31m" +
-                             @"    _\/\\\_______\/\\\_____\/\\\_____\/\\\_____________    " + "\n\u001b[0m" +
-                             "\u001b[32m                   'MMM                             MMMM;                 \u001b[31m" +
-                             @"     _\/\\\_______\/\\\_____\/\\\_____\//\\\____________   " + "\n\u001b[0m" +
-                             "\u001b[32m                   ,MMM:                           dMMMM:                 \u001b[31m" +
-                             @"      _\/\\\_______/\\\______\/\\\______\///\\\__________  " + "\n\u001b[0m" +
-                             "\u001b[32m                   .MMMW.                         :MMMMM.                 \u001b[31m" +
-                             @"       _\/\\\\\\\\\\\\/____/\\\\\\\\\\\____\////\\\\\\\\\_ " + "\n\u001b[0m" +
-                             "\u001b[32m                    XMMMW:    .:xKNMMMMMMN0d,    lMMMMMd                  \u001b[31m" +
-                             @"        _\////////////_____\///////////________\/////////__" + "\n\u001b[0m" +
-                             "\u001b[32m                    :MMMMMK; cWMNkl:;;;:lxKMXc .0MMMMMO\u001b[0m\n" +
-                             "\u001b[32m                   ..KMMMMMMNo,.             ,OMMMMMMW:,.                 \u001b[37;1m          Aaru Website\u001b[0m\n" +
-                             "\u001b[32m            .;d0NMMMMMMMMMMMMMMW0d:'    .;lOWMMMMMMMMMMMMMXkl.            \u001b[37;1m          Version \u001b[0m\u001b[33m{0}\u001b[37;1m-\u001b[0m\u001b[31m{1}\u001b[0m\n" +
-                             "\u001b[32m          :KMMMMMMMMMMMMMMMMMMMMMMMMc  WMMMMMMMMMMMMMMMMMMMMMMWk'\u001b[0m\n" +
-                             "\u001b[32m        ;NMMMMWX0kkkkO0XMMMMMMMMMMM0'  dNMMMMMMMMMMW0xl:;,;:oOWMMX;       \u001b[37;1m          Running under \u001b[35;1m{2}\u001b[37;1m, \u001b[35m{3}-bit\u001b[37;1m in \u001b[35m{4}-bit\u001b[37;1m mode.\u001b[0m\n" +
-                             "\u001b[32m       xMMWk:.           .c0MMMMMW'      OMMMMMM0c'..          .oNMO      \u001b[37;1m          Using \u001b[33;1m{5}\u001b[37;1m version \u001b[31;1m{6}\u001b[0m\n" +
-                             "\u001b[32m      OMNc            .MNc   oWMMk       'WMMNl. .MMK             ;KX.\u001b[0m\n" +
-                             "\u001b[32m     xMO               WMN     ;  .,    ,  ':    ,MMx               lK\u001b[0m\n" +
-                             "\u001b[32m    ,Md                cMMl     .XMMMWWMMMO      XMW.                :\u001b[0m\n" +
-                             "\u001b[32m    Ok                  xMMl     XMMMMMMMMc     0MW,\u001b[0m\n" +
-                             "\u001b[32m    0                    oMM0'   lMMMMMMMM.   :NMN'\u001b[0m\n" +
-                             "\u001b[32m    .                     .0MMKl ;MMMMMMMM  oNMWd\u001b[0m\n" +
-                             "\u001b[32m                            .dNW cMMMMMMMM, XKl\u001b[0m\n" +
-                             "\u001b[32m                                 0MMMMMMMMK\u001b[0m\n" +
-                             "\u001b[32m                                ;MMMMMMMMMMO                              \u001b[37;1m          Proudly presented to you by:\u001b[0m\n" +
-                             "\u001b[32m                               'WMMMMKxMMMMM0                             \u001b[34;1m          Natalia Portillo\u001b[0m\n" +
-                             "\u001b[32m                              oMMMMNc  :WMMMMN:\u001b[0m\n" +
-                             "\u001b[32m                           .dWMMM0;      dWMMMMXl.                        \u001b[37;1m          Thanks to all contributors, collaborators, translators, donators and friends.\u001b[0m\n" +
-                             "\u001b[32m               .......,cd0WMMNk:           c0MMMMMWKkolc:clodc'\u001b[0m\n" +
-                             "\u001b[32m                 .';loddol:'.                 ':oxkkOkkxoc,.\u001b[0m\n" +
-                             "\u001b[0m\n", Version.GetVersion(),
-                         #if DEBUG
-                             "DEBUG"
-                         #else
+            "\u001b[32m                             .                ,,\n" +
+            "\u001b[32m                          ;,.                  '0d.\n" +
+            "\u001b[32m                        oc                       oWd                      \u001b[31m" +
+            @"__/\\\\\\\\\\\\_____/\\\\\\\\\\\________/\\\\\\\\\_        " + "\n\u001b[0m" +
+            "\u001b[32m                      ;X.                         'WN'                    \u001b[31m" +
+            @" _\/\\\////////\\\__\/////\\\///______/\\\////////__       " + "\n\u001b[0m" +
+            "\u001b[32m                     oMo                           cMM:                   \u001b[31m" +
+            @"  _\/\\\______\//\\\_____\/\\\_______/\\\/___________      " + "\n\u001b[0m" +
+            "\u001b[32m                    ;MM.                           .MMM;                  \u001b[31m" +
+            @"   _\/\\\_______\/\\\_____\/\\\______/\\\_____________     " + "\n\u001b[0m" +
+            "\u001b[32m                    NMM                             WMMW                  \u001b[31m" +
+            @"    _\/\\\_______\/\\\_____\/\\\_____\/\\\_____________    " + "\n\u001b[0m" +
+            "\u001b[32m                   'MMM                             MMMM;                 \u001b[31m" +
+            @"     _\/\\\_______\/\\\_____\/\\\_____\//\\\____________   " + "\n\u001b[0m" +
+            "\u001b[32m                   ,MMM:                           dMMMM:                 \u001b[31m" +
+            @"      _\/\\\_______/\\\______\/\\\______\///\\\__________  " + "\n\u001b[0m" +
+            "\u001b[32m                   .MMMW.                         :MMMMM.                 \u001b[31m" +
+            @"       _\/\\\\\\\\\\\\/____/\\\\\\\\\\\____\////\\\\\\\\\_ " + "\n\u001b[0m" +
+            "\u001b[32m                    XMMMW:    .:xKNMMMMMMN0d,    lMMMMMd                  \u001b[31m" +
+            @"        _\////////////_____\///////////________\/////////__" + "\n\u001b[0m" +
+            "\u001b[32m                    :MMMMMK; cWMNkl:;;;:lxKMXc .0MMMMMO\u001b[0m\n" +
+            "\u001b[32m                   ..KMMMMMMNo,.             ,OMMMMMMW:,.                 \u001b[37;1m          Aaru Website\u001b[0m\n" +
+            "\u001b[32m            .;d0NMMMMMMMMMMMMMMW0d:'    .;lOWMMMMMMMMMMMMMXkl.            \u001b[37;1m          Version \u001b[0m\u001b[33m{0}\u001b[37;1m-\u001b[0m\u001b[31m{1}\u001b[0m\n" +
+            "\u001b[32m          :KMMMMMMMMMMMMMMMMMMMMMMMMc  WMMMMMMMMMMMMMMMMMMMMMMWk'\u001b[0m\n" +
+            "\u001b[32m        ;NMMMMWX0kkkkO0XMMMMMMMMMMM0'  dNMMMMMMMMMMW0xl:;,;:oOWMMX;       \u001b[37;1m          Running under \u001b[35;1m{2}\u001b[37;1m, \u001b[35m{3}-bit\u001b[37;1m in \u001b[35m{4}-bit\u001b[37;1m mode.\u001b[0m\n" +
+            "\u001b[32m       xMMWk:.           .c0MMMMMW'      OMMMMMM0c'..          .oNMO      \u001b[37;1m          Using \u001b[33;1m{5}\u001b[37;1m version \u001b[31;1m{6}\u001b[0m\n" +
+            "\u001b[32m      OMNc            .MNc   oWMMk       'WMMNl. .MMK             ;KX.\u001b[0m\n" +
+            "\u001b[32m     xMO               WMN     ;  .,    ,  ':    ,MMx               lK\u001b[0m\n" +
+            "\u001b[32m    ,Md                cMMl     .XMMMWWMMMO      XMW.                :\u001b[0m\n" +
+            "\u001b[32m    Ok                  xMMl     XMMMMMMMMc     0MW,\u001b[0m\n" +
+            "\u001b[32m    0                    oMM0'   lMMMMMMMM.   :NMN'\u001b[0m\n" +
+            "\u001b[32m    .                     .0MMKl ;MMMMMMMM  oNMWd\u001b[0m\n" +
+            "\u001b[32m                            .dNW cMMMMMMMM, XKl\u001b[0m\n" +
+            "\u001b[32m                                 0MMMMMMMMK\u001b[0m\n" +
+            "\u001b[32m                                ;MMMMMMMMMMO                              \u001b[37;1m          Proudly presented to you by:\u001b[0m\n" +
+            "\u001b[32m                               'WMMMMKxMMMMM0                             \u001b[34;1m          Natalia Portillo\u001b[0m\n" +
+            "\u001b[32m                              oMMMMNc  :WMMMMN:\u001b[0m\n" +
+            "\u001b[32m                           .dWMMM0;      dWMMMMXl.                        \u001b[37;1m          Thanks to all contributors, collaborators, translators, donators and friends.\u001b[0m\n" +
+            "\u001b[32m               .......,cd0WMMNk:           c0MMMMMWKkolc:clodc'\u001b[0m\n" +
+            "\u001b[32m                 .';loddol:'.                 ':oxkkOkkxoc,.\u001b[0m\n" +
+            "\u001b[0m\n", Version.GetVersion(),
+        #if DEBUG
+            "DEBUG"
+        #else
                           "RELEASE"
-                         #endif
-                             , DetectOS.GetPlatformName(DetectOS.GetRealPlatformID()),
-                             Environment.Is64BitOperatingSystem ? 64 : 32, Environment.Is64BitProcess ? 64 : 32,
-                             DetectOS.IsMono ? "Mono" : ".NET Core",
-                             DetectOS.IsMono ? Version.GetMonoVersion() : Version.GetNetCoreVersion());
+        #endif
+          , DetectOS.GetPlatformName(DetectOS.GetRealPlatformID()),
+            Environment.Is64BitOperatingSystem ? 64 : 32, Environment.Is64BitProcess ? 64 : 32,
+            DetectOS.IsMono ? "Mono" : ".NET Core",
+            DetectOS.IsMono ? Version.GetMonoVersion() : Version.GetNetCoreVersion());
 
         System.Console.WriteLine("\u001b[31;1mBuilding web application...\u001b[0m");
 
         WebApplicationBuilder builder = WebApplication.CreateBuilder(args);
 
         builder.Services.AddDbContext<AaruServerContext>(options => options.
-                                                                    UseMySql(builder.Configuration.GetConnectionString("DefaultConnection"),
-                                                                             new
-                                                                                 MariaDbServerVersion(new System.
-                                                                                     Version(10, 4, 0))).
+                                                                    UseMySql(
+                                                                        builder.Configuration.GetConnectionString(
+                                                                            "DefaultConnection"),
+                                                                        new
+                                                                            MariaDbServerVersion(
+                                                                                new System.Version(10, 4, 0))).
                                                                     UseLazyLoadingProxies());
 
         builder.Services.AddDefaultIdentity<IdentityUser>(options =>
@@ -124,7 +126,7 @@ public sealed class Program
 
         app.UseEndpoints(endpoints =>
         {
-            endpoints.MapControllerRoute("areas", "{area}/{controller=Home}/{action=Index}/{id?}");
+            endpoints.MapControllerRoute("areas",   "{area}/{controller=Home}/{action=Index}/{id?}");
             endpoints.MapControllerRoute("default", "{controller=Home}/{action=Index}/{id?}");
             endpoints.MapRazorPages();
         });
diff --git a/Aaru.Server/Properties/launchSettings.json b/Aaru.Server/Properties/launchSettings.json
index 0a557df9..b4b98767 100644
--- a/Aaru.Server/Properties/launchSettings.json
+++ b/Aaru.Server/Properties/launchSettings.json
@@ -1,24 +1,24 @@
 {
   "iisSettings": {
-    "windowsAuthentication"  : false,
+    "windowsAuthentication":   false,
     "anonymousAuthentication": true,
-    "iisExpress"             : {
+    "iisExpress":              {
       "applicationUrl": "http://localhost:62005",
-      "sslPort"       : 44393
+      "sslPort":        44393
     }
   },
-  "profiles"   : {
+  "profiles":    {
     "IIS Express": {
-      "commandName"         : "IISExpress",
-      "launchBrowser"       : true,
+      "commandName":          "IISExpress",
+      "launchBrowser":        true,
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
     },
     "Aaru.Server": {
-      "commandName"         : "Project",
-      "launchBrowser"       : true,
-      "applicationUrl"      : "http://localhost:5000",
+      "commandName":          "Project",
+      "launchBrowser":        true,
+      "applicationUrl":       "http://localhost:5000",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
diff --git a/Aaru.Server/Seeder.cs b/Aaru.Server/Seeder.cs
index 094614c0..5c54330c 100644
--- a/Aaru.Server/Seeder.cs
+++ b/Aaru.Server/Seeder.cs
@@ -7,15 +7,13 @@ public static class Seeder
 {
     public static void Seed(AaruServerContext ctx, IServiceProvider serviceProvider)
     {
-        string                    email       = "claunia@claunia.com";
-        char[]                    randChars   = new char[16];
+        var                       email       = "claunia@claunia.com";
+        var                       randChars   = new char[16];
         UserManager<IdentityUser> userManager = serviceProvider.GetRequiredService<UserManager<IdentityUser>>();
         var                       rnd         = new Random();
 
-        for(int i = 0; i < randChars.Length; i++)
-        {
+        for(var i = 0; i < randChars.Length; i++)
             randChars[i] = (char)rnd.Next(32, 126);
-        }
 
         string password = new(randChars);
 
@@ -34,8 +32,6 @@ public static class Seeder
         IdentityResult result = userManager.CreateAsync(user, password).Result;
 
         if(result.Succeeded)
-        {
             System.Console.WriteLine("Password is {0}, save it!", password);
-        }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Server/Views/Report/View.cshtml b/Aaru.Server/Views/Report/View.cshtml
index 0b5b4d9e..66b85920 100644
--- a/Aaru.Server/Views/Report/View.cshtml
+++ b/Aaru.Server/Views/Report/View.cshtml
@@ -37,287 +37,287 @@
     // ****************************************************************************/
 }
 <div class="container-fluid">
-Aaru Report for
-@ViewBag.lblManufacturer
-@ViewBag.lblModel
-@ViewBag.lblRevision
+    Aaru Report for
+    @ViewBag.lblManufacturer
+    @ViewBag.lblModel
+    @ViewBag.lblRevision
 
-@if(ViewBag.UsbItem != null)
-{
-    <div id="divUsb">
-        <br />
-        <b>USB characteristics:</b>
-        <br />
-        <i>Manufacturer:</i> @ViewBag.UsbItem.Manufacturer
-        <br />
-        <i>Product:</i> @ViewBag.UsbItem.Product
-        <br />
-        <i>Vendor ID:</i> @ViewBag.UsbItem.VendorDescription
-        <br />
-        <i>Product ID:</i> @ViewBag.UsbItem.ProductDescription
-    </div>
-}
+    @if(ViewBag.UsbItem != null)
+    {
+        <div id="divUsb">
+            <br/>
+            <b>USB characteristics:</b>
+            <br/>
+            <i>Manufacturer:</i> @ViewBag.UsbItem.Manufacturer
+            <br/>
+            <i>Product:</i> @ViewBag.UsbItem.Product
+            <br/>
+            <i>Vendor ID:</i> @ViewBag.UsbItem.VendorDescription
+            <br/>
+            <i>Product ID:</i> @ViewBag.UsbItem.ProductDescription
+        </div>
+    }
 
-@if(ViewBag.FireWireItem != null)
-{
-    <div id="divFireWire">
-        <br />
-        <b>FireWire characteristics:</b>
-        <br />
-        <i>Manufacturer:</i> @ViewBag.FireWire.Manufacturer
-        <br />
-        <i>Product:</i> @ViewBag.FireWire.Product
-        <br />
-        <i>Vendor ID:</i> @ViewBag.FireWire.VendorDescription
-        <br />
-        <i>Product ID:</i> @ViewBag.FireWire.ProductDescription
-    </div>
-}
+    @if(ViewBag.FireWireItem != null)
+    {
+        <div id="divFireWire">
+            <br/>
+            <b>FireWire characteristics:</b>
+            <br/>
+            <i>Manufacturer:</i> @ViewBag.FireWire.Manufacturer
+            <br/>
+            <i>Product:</i> @ViewBag.FireWire.Product
+            <br/>
+            <i>Vendor ID:</i> @ViewBag.FireWire.VendorDescription
+            <br/>
+            <i>Product ID:</i> @ViewBag.FireWire.ProductDescription
+        </div>
+    }
 
-@if(ViewBag.PcmciaItem != null)
-{
-    <div id="divPcmcia">
-        <br />
-        <b>PCMCIA characteristics:</b>
-        <br />
-        <i>Manufacturer:</i> @ViewBag.PcmciaItem.Manufacturer
-        <br />
-        <i>Product:</i> @ViewBag.PcmciaItem.ProductName
-        <br />
-        <i>Manufacturer code:</i> @ViewBag.PcmciaItem.VendorDescription
-        <br />
-        <i>Card code:</i> @ViewBag.PcmciaItem.CardCode
-        <br />
-        <i>Compliance:</i> @ViewBag.PcmciaItem.Compliance
-        <br />
-        @if(ViewBag.repPcmciaTuples != null)
-        {
-            foreach(KeyValuePair<string, string> kvp in ViewBag.repPcmciaTuples)
+    @if(ViewBag.PcmciaItem != null)
+    {
+        <div id="divPcmcia">
+            <br/>
+            <b>PCMCIA characteristics:</b>
+            <br/>
+            <i>Manufacturer:</i> @ViewBag.PcmciaItem.Manufacturer
+            <br/>
+            <i>Product:</i> @ViewBag.PcmciaItem.ProductName
+            <br/>
+            <i>Manufacturer code:</i> @ViewBag.PcmciaItem.VendorDescription
+            <br/>
+            <i>Card code:</i> @ViewBag.PcmciaItem.CardCode
+            <br/>
+            <i>Compliance:</i> @ViewBag.PcmciaItem.Compliance
+            <br/>
+            @if(ViewBag.repPcmciaTuples != null)
+            {
+                foreach(KeyValuePair<string, string> kvp in ViewBag.repPcmciaTuples)
+                {
+                    <text>
+                        <i>@kvp.Key</i>: @kvp.Value
+                        <br/></text>
+                }
+            }
+        </div>
+    }
+
+    @if(ViewBag.AtaItem != null)
+    {
+        <div id="divAta">
+            <br/>
+            <b>
+                @ViewBag.AtaItem characteristics:
+            </b>
+            <br/>
+            @ViewBag.lblAtaDeviceType
+            <br/>
+            @foreach(KeyValuePair<string, string> kvp in ViewBag.repAtaTwo)
             {
                 <text>
                     <i>@kvp.Key</i>: @kvp.Value
-                    <br /></text>
+                    <br/></text>
             }
-        }
-    </div>
-}
-
-@if(ViewBag.AtaItem != null)
-{
-    <div id="divAta">
-        <br />
-        <b>
-            @ViewBag.AtaItem characteristics:
-        </b>
-        <br />
-        @ViewBag.lblAtaDeviceType
-        <br />
-        @foreach(KeyValuePair<string, string> kvp in ViewBag.repAtaTwo)
-        {
-            <text>
-                <i>@kvp.Key</i>: @kvp.Value
-                <br /></text>
-        }
-        <br />
-        @foreach(string item in ViewBag.repAtaOne)
-        {
-            @Html.Raw(item)
-            <br />
-        }
-    </div>
-}
-@if(ViewBag.repScsi != null)
-{
-    <div id="divScsi">
-        <br />
-        <b>SCSI characteristics:</b>
-        <br />
-        <i>Vendor: </i>@ViewBag.lblScsiVendor
-        <br />
-        <i>Product: </i>@ViewBag.lblScsiProduct
-        <br />
-        <i>Revision: </i>@ViewBag.lblScsiRevision
-        <br />
-        @foreach(string item in ViewBag.repScsi)
-        {
-            @Html.Raw(item)
-            <br />
-        }
-        @if(ViewBag.repModeSense != null)
-        {
-            <div id="divScsiModeSense">
-                <br />
-                <i>SCSI mode sense pages:</i>
-                <table border="1">
-                    <tr>
-                        <th>Mode</th>
-                        <th>Contents</th>
-                    </tr>
-                    @foreach(KeyValuePair<string, string> kvp in ViewBag.repModeSense)
-                    {
+            <br/>
+            @foreach(string item in ViewBag.repAtaOne)
+            {
+                @Html.Raw(item)
+                <br/>
+            }
+        </div>
+    }
+    @if(ViewBag.repScsi != null)
+    {
+        <div id="divScsi">
+            <br/>
+            <b>SCSI characteristics:</b>
+            <br/>
+            <i>Vendor: </i>@ViewBag.lblScsiVendor
+            <br/>
+            <i>Product: </i>@ViewBag.lblScsiProduct
+            <br/>
+            <i>Revision: </i>@ViewBag.lblScsiRevision
+            <br/>
+            @foreach(string item in ViewBag.repScsi)
+            {
+                @Html.Raw(item)
+                <br/>
+            }
+            @if(ViewBag.repModeSense != null)
+            {
+                <div id="divScsiModeSense">
+                    <br/>
+                    <i>SCSI mode sense pages:</i>
+                    <table border="1">
                         <tr>
-                            <td>
-                                @kvp.Key
-                            </td>
-                            <td>
-                                @Html.Raw(kvp.Value)
-                            </td>
+                            <th>Mode</th>
+                            <th>Contents</th>
                         </tr>
-                    }
-                </table>
-            </div>
-        }
-        @if(ViewBag.repEvpd != null)
-        {
-            <div id="divScsiEvpd">
-                <br />
-                <i>SCSI extended vital product data pages:</i>
-                <table border="1">
-                    <tr>
-                        <th>EVPD</th>
-                        <th>Contents</th>
-                    </tr>
-                    @foreach(KeyValuePair<string, string> kvp in ViewBag.repEvpd)
-                    {
+                        @foreach(KeyValuePair<string, string> kvp in ViewBag.repModeSense)
+                        {
+                            <tr>
+                                <td>
+                                    @kvp.Key
+                                </td>
+                                <td>
+                                    @Html.Raw(kvp.Value)
+                                </td>
+                            </tr>
+                        }
+                    </table>
+                </div>
+            }
+            @if(ViewBag.repEvpd != null)
+            {
+                <div id="divScsiEvpd">
+                    <br/>
+                    <i>SCSI extended vital product data pages:</i>
+                    <table border="1">
                         <tr>
-                            <td>
-                                @kvp.Key
-                            </td>
-                            <td>
-                                @Html.Raw(kvp.Value)
-                            </td>
+                            <th>EVPD</th>
+                            <th>Contents</th>
                         </tr>
-                    }
-                </table>
-            </div>
-        }
-        @if(ViewBag.repScsiMmcMode != null)
-        {
-            <div id="divScsiMmcMode">
-                <br />
-                <b>SCSI CD-ROM capabilities:</b>
-                <br />
-                @foreach(string item in ViewBag.repScsiMmcMode)
-                {
-                    @Html.Raw(item)
-                    <br />
-                }
-            </div>
-        }
-        @if(ViewBag.repScsiMmcFeatures != null)
-        {
-            <div id="divScsiMmcFeatures">
-                <br />
-                <b>SCSI MMC features:</b>
-                <br />
-                @foreach(string item in ViewBag.repScsiMmcFeatures)
-                {
-                    @Html.Raw(item)
-                    <br />
-                }
-            </div>
-        }
-        @if(ViewBag.divScsiSscVisible == true)
-        {
-            <div id="divScsiSsc">
-                <br />
-                <b>SCSI Streaming device capabilities:</b>
-                <br />
-                Block size granularity: @ViewBag.lblScsiSscGranularity
-                <br />
-                Maximum block length: @ViewBag.lblScsiSscMaxBlock bytes
-                <br />
-                Minimum block length: @ViewBag.lblScsiSscMinBlock bytes
-                <br />
-                @if(ViewBag.repScsiSscDensities != null)
-                {
-                    foreach(SupportedDensity density in ViewBag.repScsiSscDensities)
+                        @foreach(KeyValuePair<string, string> kvp in ViewBag.repEvpd)
+                        {
+                            <tr>
+                                <td>
+                                    @kvp.Key
+                                </td>
+                                <td>
+                                    @Html.Raw(kvp.Value)
+                                </td>
+                            </tr>
+                        }
+                    </table>
+                </div>
+            }
+            @if(ViewBag.repScsiMmcMode != null)
+            {
+                <div id="divScsiMmcMode">
+                    <br/>
+                    <b>SCSI CD-ROM capabilities:</b>
+                    <br/>
+                    @foreach(string item in ViewBag.repScsiMmcMode)
                     {
-                        <text>
-                            <br />
-                            <b>
-                                Information for supported density with primary code @($"{density.PrimaryCode:X2}h") and secondary code @($"{density.SecondaryCode:X2}h")
-                            </b>
-                            <br />
-                            Drive can write this density: @density.Writable
-                            <br />
-                            Duplicate density: @density.Duplicate
-                            <br />
-                            Default density: @density.DefaultDensity
-                            <br />
-                            Density has @density.BitsPerMm bits per mm, with @density.Tracks tracks in a @density.Width mm width tape
-                            Name: @density.Name
-                            <br />
-                            Organization: @density.Organization
-                            <br />
-                            Description: @density.Description
-                            <br />
-                            Maximum capacity: @density.Capacity megabytes
-                            <br />
-                        </text>
+                        @Html.Raw(item)
+                        <br/>
                     }
-                }
-                @if(ViewBag.repScsiSscMedias != null)
-                {
-                    foreach(SscSupportedMedia media in ViewBag.repScsiSscMedias)
+                </div>
+            }
+            @if(ViewBag.repScsiMmcFeatures != null)
+            {
+                <div id="divScsiMmcFeatures">
+                    <br/>
+                    <b>SCSI MMC features:</b>
+                    <br/>
+                    @foreach(string item in ViewBag.repScsiMmcFeatures)
                     {
-                        <text>
-                            <br />
-                            <b>
-                                Information for supported media with type code @($"{media.MediumType:X2}h")
-                            </b>
-                            <br />
-                            Media is @media.Length m long in a @media.Width mm width tape
-                            Name: @media.Name
-                            <br />
-                            Organization: @media.Organization
-                            <br />
-                            Description: @media.Description
-                            <br />
-                        </text>
+                        @Html.Raw(item)
+                        <br/>
                     }
-                }
-            </div>
-        }
-    </div>
-}
-@if(ViewBag.repTestedMedia != null)
-{
-    <div id="divTestedMedia">
-        <br />
-        <b>Tested media:</b>
-        <br />
-        @foreach(string item in ViewBag.repTestedMedia)
-        {
-            @Html.Raw(item)
-            <br />
-        }
-    </div>
-}
-@if(ViewBag.repMMC != null)
-{
-    <div id="divMMC">
-        <br />
-        <b>MultiMediaCard device:</b>
-        <br />
-        @foreach(string item in ViewBag.repMMC)
-        {
-            @Html.Raw(item)
-            <br />
-        }
-    </div>
-}
-@if(ViewBag.repSD != null)
-{
-    <div id="divSD">
-        <br />
-        <b>SecureDigital device:</b>
-        <br />
-        @foreach(string item in ViewBag.repSD)
-        {
-            @Html.Raw(item)
-            <br />
-        }
-    </div>
-}
+                </div>
+            }
+            @if(ViewBag.divScsiSscVisible == true)
+            {
+                <div id="divScsiSsc">
+                    <br/>
+                    <b>SCSI Streaming device capabilities:</b>
+                    <br/>
+                    Block size granularity: @ViewBag.lblScsiSscGranularity
+                    <br/>
+                    Maximum block length: @ViewBag.lblScsiSscMaxBlock bytes
+                    <br/>
+                    Minimum block length: @ViewBag.lblScsiSscMinBlock bytes
+                    <br/>
+                    @if(ViewBag.repScsiSscDensities != null)
+                    {
+                        foreach(SupportedDensity density in ViewBag.repScsiSscDensities)
+                        {
+                            <text>
+                                <br/>
+                                <b>
+                                    Information for supported density with primary code @($"{density.PrimaryCode:X2}h") and secondary code @($"{density.SecondaryCode:X2}h")
+                                </b>
+                                <br/>
+                                Drive can write this density: @density.Writable
+                                <br/>
+                                Duplicate density: @density.Duplicate
+                                <br/>
+                                Default density: @density.DefaultDensity
+                                <br/>
+                                Density has @density.BitsPerMm bits per mm, with @density.Tracks tracks in a @density.Width mm width tape
+                                Name: @density.Name
+                                <br/>
+                                Organization: @density.Organization
+                                <br/>
+                                Description: @density.Description
+                                <br/>
+                                Maximum capacity: @density.Capacity megabytes
+                                <br/>
+                            </text>
+                        }
+                    }
+                    @if(ViewBag.repScsiSscMedias != null)
+                    {
+                        foreach(SscSupportedMedia media in ViewBag.repScsiSscMedias)
+                        {
+                            <text>
+                                <br/>
+                                <b>
+                                    Information for supported media with type code @($"{media.MediumType:X2}h")
+                                </b>
+                                <br/>
+                                Media is @media.Length m long in a @media.Width mm width tape
+                                Name: @media.Name
+                                <br/>
+                                Organization: @media.Organization
+                                <br/>
+                                Description: @media.Description
+                                <br/>
+                            </text>
+                        }
+                    }
+                </div>
+            }
+        </div>
+    }
+    @if(ViewBag.repTestedMedia != null)
+    {
+        <div id="divTestedMedia">
+            <br/>
+            <b>Tested media:</b>
+            <br/>
+            @foreach(string item in ViewBag.repTestedMedia)
+            {
+                @Html.Raw(item)
+                <br/>
+            }
+        </div>
+    }
+    @if(ViewBag.repMMC != null)
+    {
+        <div id="divMMC">
+            <br/>
+            <b>MultiMediaCard device:</b>
+            <br/>
+            @foreach(string item in ViewBag.repMMC)
+            {
+                @Html.Raw(item)
+                <br/>
+            }
+        </div>
+    }
+    @if(ViewBag.repSD != null)
+    {
+        <div id="divSD">
+            <br/>
+            <b>SecureDigital device:</b>
+            <br/>
+            @foreach(string item in ViewBag.repSD)
+            {
+                @Html.Raw(item)
+                <br/>
+            }
+        </div>
+    }
 </div>
\ No newline at end of file
diff --git a/Aaru.Server/Views/Shared/_CookieConsentPartial.cshtml b/Aaru.Server/Views/Shared/_CookieConsentPartial.cshtml
index f8e74dc1..8f3671f2 100644
--- a/Aaru.Server/Views/Shared/_CookieConsentPartial.cshtml
+++ b/Aaru.Server/Views/Shared/_CookieConsentPartial.cshtml
@@ -1,8 +1,8 @@
 @using Microsoft.AspNetCore.Http.Features
 @{
-    var consentFeature = Context.Features.Get<ITrackingConsentFeature>();
-    var showBanner = !consentFeature?.CanTrack ?? false;
-    var cookieString = consentFeature?.CreateConsentCookie();
+    ITrackingConsentFeature consentFeature = Context.Features.Get<ITrackingConsentFeature>();
+    bool showBanner = !consentFeature?.CanTrack ?? false;
+    string cookieString = consentFeature?.CreateConsentCookie();
 }
 
 @if(showBanner)
diff --git a/Aaru.Server/Views/Shared/_Layout.cshtml b/Aaru.Server/Views/Shared/_Layout.cshtml
index badc71d4..38feaaed 100644
--- a/Aaru.Server/Views/Shared/_Layout.cshtml
+++ b/Aaru.Server/Views/Shared/_Layout.cshtml
@@ -36,8 +36,8 @@
 <meta charset="UTF-8">
 <head>
     <script src="~/js/colors.js"></script>
-    <link href="~/css/aaruserver.css" rel="stylesheet" type="text/css" />
-    <meta charset="utf-8" />
+    <link href="~/css/aaruserver.css" rel="stylesheet" type="text/css"/>
+    <meta charset="utf-8"/>
     <title>@ViewBag.Title</title>
     <!-- Global site tag (gtag.js) - Google Analytics -->
     <script async src="https://www.googletagmanager.com/gtag/js?id=UA-111466173-1"></script>
diff --git a/Aaru.Server/Views/Stats/Index.cshtml b/Aaru.Server/Views/Stats/Index.cshtml
index 0daedef8..8c7d4081 100644
--- a/Aaru.Server/Views/Stats/Index.cshtml
+++ b/Aaru.Server/Views/Stats/Index.cshtml
@@ -110,7 +110,7 @@
                 </div>
             </div>
         </div>
-        <br />
+        <br/>
     </div>
 }
 @if(ViewBag.repVersions != null)
@@ -145,7 +145,7 @@
                 </div>
             </div>
         </div>
-        <br />
+        <br/>
     </div>
 }
 @if(ViewBag.repCommands != null)
@@ -179,7 +179,7 @@
                 </div>
             </div>
         </div>
-        <br />
+        <br/>
     </div>
 }
 @if(ViewBag.repFilters != null)
diff --git a/Aaru.Server/appsettings.Development.json b/Aaru.Server/appsettings.Development.json
index 424a156b..0cbef074 100644
--- a/Aaru.Server/appsettings.Development.json
+++ b/Aaru.Server/appsettings.Development.json
@@ -1,11 +1,11 @@
 {
-  "ConnectionStrings"    : {
-    "DefaultConnection": "server=localhost;port=3306;database=discimagechef;uid=dic;password=dicpass"
+  "ConnectionStrings":     {
+    "DefaultConnection": "server=zeus.claunia.com;port=3306;database=discimagechef;uid=dic;password=dicpass"
   },
-  "Logging"              : {
+  "Logging":               {
     "LogLevel": {
-      "Default"  : "Debug",
-      "System"   : "Information",
+      "Default":   "Debug",
+      "System":    "Information",
       "Microsoft": "Information"
     }
   },
diff --git a/Aaru.Server/appsettings.json b/Aaru.Server/appsettings.json
index b3d9c672..59c30016 100644
--- a/Aaru.Server/appsettings.json
+++ b/Aaru.Server/appsettings.json
@@ -1,8 +1,8 @@
 {
-  "Logging"          : {
+  "Logging":           {
     "LogLevel": {
-      "Default"                   : "Information",
-      "Microsoft"                 : "Warning",
+      "Default":                    "Information",
+      "Microsoft":                  "Warning",
       "Microsoft.Hosting.Lifetime": "Information"
     }
   },
diff --git a/Aaru.Server/docs/CONTRIBUTING.md b/Aaru.Server/docs/CONTRIBUTING.md
index 7bcded23..d4e7aec6 100644
--- a/Aaru.Server/docs/CONTRIBUTING.md
+++ b/Aaru.Server/docs/CONTRIBUTING.md
@@ -136,7 +136,8 @@ don't need to create one. When you are creating a bug report, please
 [include as many details as possible](#how-do-i-submit-a-good-bug-report). Fill out
 [the required template](.github/ISSUE_TEMPLATE.md), the information it asks for helps us resolve issues faster.
 
-> **Note:** If you find a **Closed** issue that seems like it is the same thing that you're experiencing, open a new issue and include a link to the original issue in the body of your new one.
+> **Note:** If you find a **Closed** issue that seems like it is the same thing that you're experiencing, open a new
+> issue and include a link to the original issue in the body of your new one.
 
 #### Before Submitting A Bug Report
 
diff --git a/Aaru.Server/docs/ISSUE_TEMPLATE.md b/Aaru.Server/docs/ISSUE_TEMPLATE.md
index 0490f034..4a0ac63e 100644
--- a/Aaru.Server/docs/ISSUE_TEMPLATE.md
+++ b/Aaru.Server/docs/ISSUE_TEMPLATE.md
@@ -36,15 +36,15 @@
 * **Manufacturer**:
 * **Model**:
 * **Bus**:
-    * [ ] Parallel ATA
-    * [ ] Serial ATA
-    * [ ] SCSI (any)
-    * [ ] ATAPI (mark above if parallel or serial)
-    * [ ] USB
-    * [ ] FireWire
-    * [ ] PCMCIA
-    * [ ] SecureDigital
-    * [ ] MultiMediaCard
+  * [ ] Parallel ATA
+  * [ ] Serial ATA
+  * [ ] SCSI (any)
+  * [ ] ATAPI (mark above if parallel or serial)
+  * [ ] USB
+  * [ ] FireWire
+  * [ ] PCMCIA
+  * [ ] SecureDigital
+  * [ ] MultiMediaCard
 
 ### Output of command execution with debug output enabled
 
diff --git a/Aaru.Server/docs/NEEDED.md b/Aaru.Server/docs/NEEDED.md
index 89e0ac3d..e8853cdc 100644
--- a/Aaru.Server/docs/NEEDED.md
+++ b/Aaru.Server/docs/NEEDED.md
@@ -78,64 +78,64 @@ This is a list of software whose physical media has some characteristics that ne
 dumping of such characteristics. Usually those are copy protections.
 
 - CD-i Ready
-    - Accelerator
-    - Alien Gate
-    - Beyond Limits
-    - Escape
-    - Lucky Luke
-    - Louis Armstrong
-    - Dark Fables of Aesop
-    - More Dark Fables of Aesop
-    - Mozart
-    - Opera Imaginaire
-    - Pavarotti
-    - Steel Machine
-    - The Apprentice
-    - Dimo's Quest
-    - The Worlds of...
+  - Accelerator
+  - Alien Gate
+  - Beyond Limits
+  - Escape
+  - Lucky Luke
+  - Louis Armstrong
+  - Dark Fables of Aesop
+  - More Dark Fables of Aesop
+  - Mozart
+  - Opera Imaginaire
+  - Pavarotti
+  - Steel Machine
+  - The Apprentice
+  - Dimo's Quest
+  - The Worlds of...
 - SafeDisc
-    - Beowulf
-    - Black & White 2
-    - Brothers in Arms: Road to Hill 30
-    - Carmageddon II: Carpocalypse Now
-    - Close Combat: Invasion Normandy
-    - Codename: Eagle
+  - Beowulf
+  - Black & White 2
+  - Brothers in Arms: Road to Hill 30
+  - Carmageddon II: Carpocalypse Now
+  - Close Combat: Invasion Normandy
+  - Codename: Eagle
 - SecuROM
-    - Arabian Nights
-    - Arcania: Gothic 4
-    - Boiling Point: Road to Hell
-    - Cars 2
-    - Colin McRae Rally 04
-    - Colin McRae Rally 2.0
-    - Colin McRae Rally 3
-    - Command & Conquer: Red Alert 3 - Uprising
-    - Devil May Cry 4
-    - Die Hard: Nakatomi Plaza
-    - Disney Planes
+  - Arabian Nights
+  - Arcania: Gothic 4
+  - Boiling Point: Road to Hell
+  - Cars 2
+  - Colin McRae Rally 04
+  - Colin McRae Rally 2.0
+  - Colin McRae Rally 3
+  - Command & Conquer: Red Alert 3 - Uprising
+  - Devil May Cry 4
+  - Die Hard: Nakatomi Plaza
+  - Disney Planes
 - StarForce
-    - Black Mirror 3
-    - BloodRayne 2
-    - Chronostorm: Siberian Border
-    - Codename: Outbreak
-    - Dead to Rights
-    - Disciples III: Renaissance
-    - Mount & Blade
-    - Pac-Man World 2
+  - Black Mirror 3
+  - BloodRayne 2
+  - Chronostorm: Siberian Border
+  - Codename: Outbreak
+  - Dead to Rights
+  - Disciples III: Renaissance
+  - Mount & Blade
+  - Pac-Man World 2
 - Tages
-    - Anno 1701
-    - Darkstar One
-    - Faery: Legends of Avalon
-    - Helldorado
-    - Nostradamus: The Last Prophecy
-    - Silverfall
+  - Anno 1701
+  - Darkstar One
+  - Faery: Legends of Avalon
+  - Helldorado
+  - Nostradamus: The Last Prophecy
+  - Silverfall
 - Solidshield
-    - A-Train 8
-    - Anno 2070
-    - Assassin's Creed: Brotherhood
-    - Dead Mountaineer's Hotel
-    - Dead Space 2
-    - Helldorado
-    - I Am Alive
-    - ObsCure II
-    - Shift 2 Unleashed
-    - Warfare
\ No newline at end of file
+  - A-Train 8
+  - Anno 2070
+  - Assassin's Creed: Brotherhood
+  - Dead Mountaineer's Hotel
+  - Dead Space 2
+  - Helldorado
+  - I Am Alive
+  - ObsCure II
+  - Shift 2 Unleashed
+  - Warfare
\ No newline at end of file
diff --git a/Aaru.Server/package.json b/Aaru.Server/package.json
index d6ee5316..16df5651 100644
--- a/Aaru.Server/package.json
+++ b/Aaru.Server/package.json
@@ -1,12 +1,12 @@
 {
-  "name"        : "Aaru.Server",
-  "version"     : "4.5.99.1663",
-  "description" : "Server component for Aaru Data Preservation Suite",
-  "private"     : true,
-  "author"      : "Natalia Portillo <claunia@claunia.com>",
-  "homepage"    : "https://www.aaru.app",
-  "license"     : "LGPL",
-  "repository"  : "github:aaru-dps/Aaru.Server",
+  "name":         "Aaru.Server",
+  "version":      "4.5.99.1663",
+  "description":  "Server component for Aaru Data Preservation Suite",
+  "private":      true,
+  "author":       "Natalia Portillo <claunia@claunia.com>",
+  "homepage":     "https://www.aaru.app",
+  "license":      "LGPL",
+  "repository":   "github:aaru-dps/Aaru.Server",
   "dependencies": {
     "bootstrap": "^4.3.1"
   }
diff --git a/Aaru.Server/wwwroot b/Aaru.Server/wwwroot
index 7f4c5d8f..12d07980 160000
--- a/Aaru.Server/wwwroot
+++ b/Aaru.Server/wwwroot
@@ -1 +1 @@
-Subproject commit 7f4c5d8ff8b792ae383524009d9756fb674ab856
+Subproject commit 12d079807da1e148f498acede25b01133bcda9a5