diff --git a/DeviceDto.cs b/DeviceDto.cs
index 1d485e395..fb4ad2482 100644
--- a/DeviceDto.cs
+++ b/DeviceDto.cs
@@ -78,11 +78,14 @@ namespace DiscImageChef.Dto
             {
                 ATA.Identify         = null;
                 ATA.ReadCapabilities = ClearBinaries(ATA.ReadCapabilities);
+
                 if(ATA.RemovableMedias != null)
                 {
                     TestedMedia[] medias = ATA.RemovableMedias.ToArray();
                     ATA.RemovableMedias = new List<TestedMedia>();
-                    foreach(TestedMedia media in medias) ATA.RemovableMedias.Add(ClearBinaries(media));
+
+                    foreach(TestedMedia media in medias)
+                        ATA.RemovableMedias.Add(ClearBinaries(media));
                 }
             }
 
@@ -90,11 +93,14 @@ namespace DiscImageChef.Dto
             {
                 ATAPI.Identify         = null;
                 ATAPI.ReadCapabilities = ClearBinaries(ATAPI.ReadCapabilities);
+
                 if(ATAPI.RemovableMedias != null)
                 {
                     TestedMedia[] medias = ATAPI.RemovableMedias.ToArray();
                     ATAPI.RemovableMedias = new List<TestedMedia>();
-                    foreach(TestedMedia media in medias) ATAPI.RemovableMedias.Add(ClearBinaries(media));
+
+                    foreach(TestedMedia media in medias)
+                        ATAPI.RemovableMedias.Add(ClearBinaries(media));
                 }
             }
 
@@ -129,19 +135,23 @@ namespace DiscImageChef.Dto
                 {
                     TestedMedia[] medias = SCSI.RemovableMedias.ToArray();
                     SCSI.RemovableMedias = new List<TestedMedia>();
-                    foreach(TestedMedia media in medias) SCSI.RemovableMedias.Add(ClearBinaries(media));
+
+                    foreach(TestedMedia media in medias)
+                        SCSI.RemovableMedias.Add(ClearBinaries(media));
                 }
 
                 if(SCSI.MultiMediaDevice != null)
                 {
                     SCSI.MultiMediaDevice.ModeSense2AData = null;
 
-                    if(SCSI.MultiMediaDevice.Features != null) SCSI.MultiMediaDevice.Features.BinaryData = null;
+                    if(SCSI.MultiMediaDevice.Features != null)
+                        SCSI.MultiMediaDevice.Features.BinaryData = null;
 
                     if(SCSI.MultiMediaDevice.TestedMedia != null)
                     {
                         TestedMedia[] medias = SCSI.MultiMediaDevice.TestedMedia.ToArray();
                         SCSI.MultiMediaDevice.TestedMedia = new List<TestedMedia>();
+
                         foreach(TestedMedia media in medias)
                             SCSI.MultiMediaDevice.TestedMedia.Add(ClearBinaries(media));
                     }
@@ -150,7 +160,8 @@ namespace DiscImageChef.Dto
                 SCSI.SequentialDevice = null;
             }
 
-            if(USB != null) USB.Descriptors = null;
+            if(USB != null)
+                USB.Descriptors = null;
 
             Id                         = id;
             OptimalMultipleSectorsRead = optimalMultipleSectorsRead;
@@ -162,7 +173,8 @@ namespace DiscImageChef.Dto
 
         static TestedMedia ClearBinaries(TestedMedia media)
         {
-            if(media is null) return null;
+            if(media is null)
+                return null;
 
             media.AdipData                      = null;
             media.AtipData                      = null;
@@ -228,6 +240,7 @@ namespace DiscImageChef.Dto
             media.RWSubchannelWithC2Data        = null;
             media.TocData                       = null;
             media.Track1PregapData              = null;
+
             return media;
         }
     }