diff --git a/DiscImageChef/Checksums/CDChecksums.cs b/DiscImageChef/Checksums/CDChecksums.cs
index 26ad7b08c..a5711b833 100644
--- a/DiscImageChef/Checksums/CDChecksums.cs
+++ b/DiscImageChef/Checksums/CDChecksums.cs
@@ -328,8 +328,7 @@ namespace DiscImageChef.Checksums
                     return null;
                 }
             }
-            else
-                return null;
+            return null;
         }
 
         static bool? CheckCDSectorSubChannel(byte[] subchannel)
diff --git a/DiscImageChef/ImagePlugins/ZZZRawImage.cs b/DiscImageChef/ImagePlugins/ZZZRawImage.cs
index eeddf32d9..46c8f661f 100644
--- a/DiscImageChef/ImagePlugins/ZZZRawImage.cs
+++ b/DiscImageChef/ImagePlugins/ZZZRawImage.cs
@@ -397,7 +397,7 @@ namespace DiscImageChef.ImagePlugins
 
         #region Private methods
 
-        private DiskType CalculateDiskType()
+        DiskType CalculateDiskType()
         {
             if (_imageInfo.sectorSize == 2048)
             {
diff --git a/DiscImageChef/PartPlugins/AppleMap.cs b/DiscImageChef/PartPlugins/AppleMap.cs
index 7fce42dcd..2925141dc 100644
--- a/DiscImageChef/PartPlugins/AppleMap.cs
+++ b/DiscImageChef/PartPlugins/AppleMap.cs
@@ -62,8 +62,6 @@ namespace DiscImageChef.PartPlugins
 
         public override bool GetInformation(ImagePlugins.ImagePlugin imagePlugin, out List<Partition> partitions)
         {
-            byte[] cString;
-			
             ulong apm_entries;
             uint sector_size;
 
@@ -75,7 +73,7 @@ namespace DiscImageChef.PartPlugins
             partitions = new List<Partition>();
 			
             AppleMapBootEntry APMB = new AppleMapBootEntry();
-            AppleMapPartitionEntry APMEntry = new AppleMapPartitionEntry();
+            AppleMapPartitionEntry APMEntry;
 
             byte[] APMB_sector = imagePlugin.ReadSector(0);
 
@@ -136,7 +134,6 @@ namespace DiscImageChef.PartPlugins
 			
             for (ulong i = 0; i < apm_entries; i++) // For each partition
             {
-                APMEntry = new AppleMapPartitionEntry();
                 if(APMFromHDDOnCD)
                     APMEntry_sector = Read2048SectorAs512(imagePlugin, first_sector + i);
                 else
@@ -194,7 +191,7 @@ namespace DiscImageChef.PartPlugins
             return true;
         }
 
-        byte[] Read2048SectorAs512(ImagePlugins.ImagePlugin imagePlugin, UInt64 LBA)
+        static byte[] Read2048SectorAs512(ImagePlugins.ImagePlugin imagePlugin, UInt64 LBA)
         {
             UInt64 LBA2k = LBA / 4;
             int Remainder = (int)(LBA % 4);
@@ -207,7 +204,7 @@ namespace DiscImageChef.PartPlugins
             return sector;
         }
 
-        AppleMapPartitionEntry DecodeAPMEntry(byte[] APMEntry_sector)
+        static AppleMapPartitionEntry DecodeAPMEntry(byte[] APMEntry_sector)
         {
             AppleMapPartitionEntry APMEntry = new AppleMapPartitionEntry();
             byte[] cString;
diff --git a/DiscImageChef/Plugins/AppleHFS.cs b/DiscImageChef/Plugins/AppleHFS.cs
index c3c2028a4..5f8f6241a 100644
--- a/DiscImageChef/Plugins/AppleHFS.cs
+++ b/DiscImageChef/Plugins/AppleHFS.cs
@@ -77,20 +77,17 @@ namespace DiscImageChef.Plugins
 
                     return drSigWord != HFSP_MAGIC;
                 }
-                else
+                mdb_sector = Read2048SectorAs512(imagePlugin, 2 + partitionOffset);
+                drSigWord = BigEndianBitConverter.ToUInt16(mdb_sector, 0);
+
+                if (drSigWord == HFS_MAGIC)
                 {
-                    mdb_sector = Read2048SectorAs512(imagePlugin, 2 + partitionOffset);
-                    drSigWord = BigEndianBitConverter.ToUInt16(mdb_sector, 0);
+                    if (MainClass.isDebug)
+                        Console.WriteLine("DEBUG (HFS Plugin): HFS sector size is 512 bytes, but device's 2048");
 
-                    if (drSigWord == HFS_MAGIC)
-                    {
-                        if(MainClass.isDebug)
-                            Console.WriteLine("DEBUG (HFS Plugin): HFS sector size is 512 bytes, but device's 2048");
+                    drSigWord = BigEndianBitConverter.ToUInt16(mdb_sector, 0x7C); // Seek to embedded HFS+ signature
 
-                        drSigWord = BigEndianBitConverter.ToUInt16(mdb_sector, 0x7C); // Seek to embedded HFS+ signature
-
-                        return drSigWord != HFSP_MAGIC;
-                    }
+                    return drSigWord != HFSP_MAGIC;
                 }
             }
             else
@@ -364,7 +361,7 @@ namespace DiscImageChef.Plugins
             return;
         }
 
-        byte[] Read2048SectorAs512(ImagePlugins.ImagePlugin imagePlugin, UInt64 LBA)
+        static byte[] Read2048SectorAs512(ImagePlugins.ImagePlugin imagePlugin, UInt64 LBA)
         {
             UInt64 LBA2k = LBA / 4;
             int Remainder = (int)(LBA % 4);