diff --git a/Extents/ExtentsByte.cs b/Extents/ExtentsByte.cs
index b7efb0f71..ad6e549bf 100644
--- a/Extents/ExtentsByte.cs
+++ b/Extents/ExtentsByte.cs
@@ -82,19 +82,18 @@ namespace Extents
                 }
 
                 // Expands existing extent end
-                if(item == backend[i].Item2 + 1)
+                if(item != backend[i].Item2 + 1) continue;
+
+                removeOne = backend[i];
+
+                if(i < backend.Count - 1 && item == backend[i + 1].Item1 - 1)
                 {
-                    removeOne = backend[i];
-
-                    if(i < backend.Count - 1 && item == backend[i + 1].Item1 - 1)
-                    {
-                        removeTwo = backend[i + 1];
-                        itemToAdd = new Tuple<byte, byte>(backend[i].Item1, backend[i + 1].Item2);
-                    }
-                    else itemToAdd = new Tuple<byte, byte>(backend[i].Item1, item);
-
-                    break;
+                    removeTwo = backend[i + 1];
+                    itemToAdd = new Tuple<byte, byte>(backend[i].Item1, backend[i + 1].Item2);
                 }
+                else itemToAdd = new Tuple<byte, byte>(backend[i].Item1, item);
+
+                break;
             }
 
             if(itemToAdd != null)
@@ -170,11 +169,10 @@ namespace Extents
                 }
 
                 // Extent is only element
-                if(item == extent.Item1 && item == extent.Item2)
-                {
-                    toRemove = extent;
-                    break;
-                }
+                if(item != extent.Item1 || item != extent.Item2) continue;
+
+                toRemove = extent;
+                break;
             }
 
             // Item not found
diff --git a/Extents/ExtentsInt.cs b/Extents/ExtentsInt.cs
index ee6b2d3cd..ad651ff6e 100644
--- a/Extents/ExtentsInt.cs
+++ b/Extents/ExtentsInt.cs
@@ -82,19 +82,18 @@ namespace Extents
                 }
 
                 // Expands existing extent end
-                if(item == backend[i].Item2 + 1)
+                if(item != backend[i].Item2 + 1) continue;
+
+                removeOne = backend[i];
+
+                if(i < backend.Count - 1 && item == backend[i + 1].Item1 - 1)
                 {
-                    removeOne = backend[i];
-
-                    if(i < backend.Count - 1 && item == backend[i + 1].Item1 - 1)
-                    {
-                        removeTwo = backend[i + 1];
-                        itemToAdd = new Tuple<int, int>(backend[i].Item1, backend[i + 1].Item2);
-                    }
-                    else itemToAdd = new Tuple<int, int>(backend[i].Item1, item);
-
-                    break;
+                    removeTwo = backend[i + 1];
+                    itemToAdd = new Tuple<int, int>(backend[i].Item1, backend[i + 1].Item2);
                 }
+                else itemToAdd = new Tuple<int, int>(backend[i].Item1, item);
+
+                break;
             }
 
             if(itemToAdd != null)
@@ -170,11 +169,10 @@ namespace Extents
                 }
 
                 // Extent is only element
-                if(item == extent.Item1 && item == extent.Item2)
-                {
-                    toRemove = extent;
-                    break;
-                }
+                if(item != extent.Item1 || item != extent.Item2) continue;
+
+                toRemove = extent;
+                break;
             }
 
             // Item not found
diff --git a/Extents/ExtentsLong.cs b/Extents/ExtentsLong.cs
index 1e2979ce4..85fdf56d6 100644
--- a/Extents/ExtentsLong.cs
+++ b/Extents/ExtentsLong.cs
@@ -82,19 +82,18 @@ namespace Extents
                 }
 
                 // Expands existing extent end
-                if(item == backend[i].Item2 + 1)
+                if(item != backend[i].Item2 + 1) continue;
+
+                removeOne = backend[i];
+
+                if(i < backend.Count - 1 && item == backend[i + 1].Item1 - 1)
                 {
-                    removeOne = backend[i];
-
-                    if(i < backend.Count - 1 && item == backend[i + 1].Item1 - 1)
-                    {
-                        removeTwo = backend[i + 1];
-                        itemToAdd = new Tuple<long, long>(backend[i].Item1, backend[i + 1].Item2);
-                    }
-                    else itemToAdd = new Tuple<long, long>(backend[i].Item1, item);
-
-                    break;
+                    removeTwo = backend[i + 1];
+                    itemToAdd = new Tuple<long, long>(backend[i].Item1, backend[i + 1].Item2);
                 }
+                else itemToAdd = new Tuple<long, long>(backend[i].Item1, item);
+
+                break;
             }
 
             if(itemToAdd != null)
@@ -170,11 +169,10 @@ namespace Extents
                 }
 
                 // Extent is only element
-                if(item == extent.Item1 && item == extent.Item2)
-                {
-                    toRemove = extent;
-                    break;
-                }
+                if(item != extent.Item1 || item != extent.Item2) continue;
+
+                toRemove = extent;
+                break;
             }
 
             // Item not found
diff --git a/Extents/ExtentsSByte.cs b/Extents/ExtentsSByte.cs
index 8ecd6093d..2444eb27e 100644
--- a/Extents/ExtentsSByte.cs
+++ b/Extents/ExtentsSByte.cs
@@ -82,19 +82,18 @@ namespace Extents
                 }
 
                 // Expands existing extent end
-                if(item == backend[i].Item2 + 1)
+                if(item != backend[i].Item2 + 1) continue;
+
+                removeOne = backend[i];
+
+                if(i < backend.Count - 1 && item == backend[i + 1].Item1 - 1)
                 {
-                    removeOne = backend[i];
-
-                    if(i < backend.Count - 1 && item == backend[i + 1].Item1 - 1)
-                    {
-                        removeTwo = backend[i + 1];
-                        itemToAdd = new Tuple<sbyte, sbyte>(backend[i].Item1, backend[i + 1].Item2);
-                    }
-                    else itemToAdd = new Tuple<sbyte, sbyte>(backend[i].Item1, item);
-
-                    break;
+                    removeTwo = backend[i + 1];
+                    itemToAdd = new Tuple<sbyte, sbyte>(backend[i].Item1, backend[i + 1].Item2);
                 }
+                else itemToAdd = new Tuple<sbyte, sbyte>(backend[i].Item1, item);
+
+                break;
             }
 
             if(itemToAdd != null)
@@ -170,11 +169,10 @@ namespace Extents
                 }
 
                 // Extent is only element
-                if(item == extent.Item1 && item == extent.Item2)
-                {
-                    toRemove = extent;
-                    break;
-                }
+                if(item != extent.Item1 || item != extent.Item2) continue;
+
+                toRemove = extent;
+                break;
             }
 
             // Item not found
diff --git a/Extents/ExtentsShort.cs b/Extents/ExtentsShort.cs
index 2e5f40158..ac32f34b5 100644
--- a/Extents/ExtentsShort.cs
+++ b/Extents/ExtentsShort.cs
@@ -82,19 +82,18 @@ namespace Extents
                 }
 
                 // Expands existing extent end
-                if(item == backend[i].Item2 + 1)
+                if(item != backend[i].Item2 + 1) continue;
+
+                removeOne = backend[i];
+
+                if(i < backend.Count - 1 && item == backend[i + 1].Item1 - 1)
                 {
-                    removeOne = backend[i];
-
-                    if(i < backend.Count - 1 && item == backend[i + 1].Item1 - 1)
-                    {
-                        removeTwo = backend[i + 1];
-                        itemToAdd = new Tuple<short, short>(backend[i].Item1, backend[i + 1].Item2);
-                    }
-                    else itemToAdd = new Tuple<short, short>(backend[i].Item1, item);
-
-                    break;
+                    removeTwo = backend[i + 1];
+                    itemToAdd = new Tuple<short, short>(backend[i].Item1, backend[i + 1].Item2);
                 }
+                else itemToAdd = new Tuple<short, short>(backend[i].Item1, item);
+
+                break;
             }
 
             if(itemToAdd != null)
@@ -170,11 +169,10 @@ namespace Extents
                 }
 
                 // Extent is only element
-                if(item == extent.Item1 && item == extent.Item2)
-                {
-                    toRemove = extent;
-                    break;
-                }
+                if(item != extent.Item1 || item != extent.Item2) continue;
+
+                toRemove = extent;
+                break;
             }
 
             // Item not found
diff --git a/Extents/ExtentsUInt.cs b/Extents/ExtentsUInt.cs
index 8fb27ffc6..27a0e8b00 100644
--- a/Extents/ExtentsUInt.cs
+++ b/Extents/ExtentsUInt.cs
@@ -82,19 +82,18 @@ namespace Extents
                 }
 
                 // Expands existing extent end
-                if(item == backend[i].Item2 + 1)
+                if(item != backend[i].Item2 + 1) continue;
+
+                removeOne = backend[i];
+
+                if(i < backend.Count - 1 && item == backend[i + 1].Item1 - 1)
                 {
-                    removeOne = backend[i];
-
-                    if(i < backend.Count - 1 && item == backend[i + 1].Item1 - 1)
-                    {
-                        removeTwo = backend[i + 1];
-                        itemToAdd = new Tuple<uint, uint>(backend[i].Item1, backend[i + 1].Item2);
-                    }
-                    else itemToAdd = new Tuple<uint, uint>(backend[i].Item1, item);
-
-                    break;
+                    removeTwo = backend[i + 1];
+                    itemToAdd = new Tuple<uint, uint>(backend[i].Item1, backend[i + 1].Item2);
                 }
+                else itemToAdd = new Tuple<uint, uint>(backend[i].Item1, item);
+
+                break;
             }
 
             if(itemToAdd != null)
@@ -170,11 +169,10 @@ namespace Extents
                 }
 
                 // Extent is only element
-                if(item == extent.Item1 && item == extent.Item2)
-                {
-                    toRemove = extent;
-                    break;
-                }
+                if(item != extent.Item1 || item != extent.Item2) continue;
+
+                toRemove = extent;
+                break;
             }
 
             // Item not found
diff --git a/Extents/ExtentsULong.cs b/Extents/ExtentsULong.cs
index 68d5a3b64..7fcea95c2 100644
--- a/Extents/ExtentsULong.cs
+++ b/Extents/ExtentsULong.cs
@@ -82,19 +82,18 @@ namespace Extents
                 }
 
                 // Expands existing extent end
-                if(item == backend[i].Item2 + 1)
+                if(item != backend[i].Item2 + 1) continue;
+
+                removeOne = backend[i];
+
+                if(i < backend.Count - 1 && item == backend[i + 1].Item1 - 1)
                 {
-                    removeOne = backend[i];
-
-                    if(i < backend.Count - 1 && item == backend[i + 1].Item1 - 1)
-                    {
-                        removeTwo = backend[i + 1];
-                        itemToAdd = new Tuple<ulong, ulong>(backend[i].Item1, backend[i + 1].Item2);
-                    }
-                    else itemToAdd = new Tuple<ulong, ulong>(backend[i].Item1, item);
-
-                    break;
+                    removeTwo = backend[i + 1];
+                    itemToAdd = new Tuple<ulong, ulong>(backend[i].Item1, backend[i + 1].Item2);
                 }
+                else itemToAdd = new Tuple<ulong, ulong>(backend[i].Item1, item);
+
+                break;
             }
 
             if(itemToAdd != null)
@@ -170,11 +169,10 @@ namespace Extents
                 }
 
                 // Extent is only element
-                if(item == extent.Item1 && item == extent.Item2)
-                {
-                    toRemove = extent;
-                    break;
-                }
+                if(item != extent.Item1 || item != extent.Item2) continue;
+
+                toRemove = extent;
+                break;
             }
 
             // Item not found
diff --git a/Extents/ExtentsUShort.cs b/Extents/ExtentsUShort.cs
index e74f0287c..e9e11d4ce 100644
--- a/Extents/ExtentsUShort.cs
+++ b/Extents/ExtentsUShort.cs
@@ -82,19 +82,18 @@ namespace Extents
                 }
 
                 // Expands existing extent end
-                if(item == backend[i].Item2 + 1)
+                if(item != backend[i].Item2 + 1) continue;
+
+                removeOne = backend[i];
+
+                if(i < backend.Count - 1 && item == backend[i + 1].Item1 - 1)
                 {
-                    removeOne = backend[i];
-
-                    if(i < backend.Count - 1 && item == backend[i + 1].Item1 - 1)
-                    {
-                        removeTwo = backend[i + 1];
-                        itemToAdd = new Tuple<ushort, ushort>(backend[i].Item1, backend[i + 1].Item2);
-                    }
-                    else itemToAdd = new Tuple<ushort, ushort>(backend[i].Item1, item);
-
-                    break;
+                    removeTwo = backend[i + 1];
+                    itemToAdd = new Tuple<ushort, ushort>(backend[i].Item1, backend[i + 1].Item2);
                 }
+                else itemToAdd = new Tuple<ushort, ushort>(backend[i].Item1, item);
+
+                break;
             }
 
             if(itemToAdd != null)
@@ -171,11 +170,10 @@ namespace Extents
                 }
 
                 // Extent is only element
-                if(item == extent.Item1 && item == extent.Item2)
-                {
-                    toRemove = extent;
-                    break;
-                }
+                if(item != extent.Item1 || item != extent.Item2) continue;
+
+                toRemove = extent;
+                break;
             }
 
             // Item not found
diff --git a/StringHandlers.cs b/StringHandlers.cs
index 839cfea8f..728715e05 100644
--- a/StringHandlers.cs
+++ b/StringHandlers.cs
@@ -145,11 +145,10 @@ namespace DiscImageChef
             {
                 if(i == start) return "";
 
-                if(SpacePaddedString[i - 1] != 0x20)
-                {
-                    len = i;
-                    break;
-                }
+                if(SpacePaddedString[i - 1] == 0x20) continue;
+
+                len = i;
+                break;
             }
 
             return len == 0 ? "" : encoding.GetString(SpacePaddedString, start, len);