diff --git a/ArrayIsEmpty.cs b/ArrayIsEmpty.cs
index b83f8b10c..bb3769e29 100644
--- a/ArrayIsEmpty.cs
+++ b/ArrayIsEmpty.cs
@@ -30,6 +30,8 @@
 // Copyright © 2011-2018 Natalia Portillo
 // ****************************************************************************/
 
+using System.Linq;
+
 namespace DiscImageChef
 {
     public static partial class ArrayHelpers
@@ -38,18 +40,14 @@ namespace DiscImageChef
         {
             if(array == null) return true;
 
-            foreach(byte b in array) if(b != 0x00 && b != 0x20) return false;
-
-            return true;
+            return array.All(b => b == 0x00 || b == 0x20);
         }
 
         public static bool ArrayIsNullOrEmpty(byte[] array)
         {
             if(array == null) return true;
 
-            foreach(byte b in array) if(b != 0x00) return false;
-
-            return true;
+            return array.All(b => b == 0x00);
         }
     }
 }
\ No newline at end of file
diff --git a/Extents/ExtentsByte.cs b/Extents/ExtentsByte.cs
index ad6e549bf..b96b174d8 100644
--- a/Extents/ExtentsByte.cs
+++ b/Extents/ExtentsByte.cs
@@ -125,9 +125,7 @@ namespace Extents
 
         public bool Contains(byte item)
         {
-            foreach(Tuple<byte, byte> extent in backend) if(item >= extent.Item1 && item <= extent.Item2) return true;
-
-            return false;
+            return backend.Any(extent => item >= extent.Item1 && item <= extent.Item2);
         }
 
         public void Clear()
@@ -196,12 +194,10 @@ namespace Extents
         public bool GetStart(byte item, out byte start)
         {
             start = 0;
-            foreach(Tuple<byte, byte> extent in backend)
-                if(item >= extent.Item1 && item <= extent.Item2)
-                {
-                    start = extent.Item1;
-                    return true;
-                }
+            foreach(Tuple<byte, byte> extent in backend.Where(extent => item >= extent.Item1 && item <= extent.Item2)) {
+                start = extent.Item1;
+                return true;
+            }
 
             return false;
         }
diff --git a/Extents/ExtentsInt.cs b/Extents/ExtentsInt.cs
index ad651ff6e..92d989250 100644
--- a/Extents/ExtentsInt.cs
+++ b/Extents/ExtentsInt.cs
@@ -125,9 +125,7 @@ namespace Extents
 
         public bool Contains(int item)
         {
-            foreach(Tuple<int, int> extent in backend) if(item >= extent.Item1 && item <= extent.Item2) return true;
-
-            return false;
+            return backend.Any(extent => item >= extent.Item1 && item <= extent.Item2);
         }
 
         public void Clear()
@@ -196,12 +194,10 @@ namespace Extents
         public bool GetStart(int item, out int start)
         {
             start = 0;
-            foreach(Tuple<int, int> extent in backend)
-                if(item >= extent.Item1 && item <= extent.Item2)
-                {
-                    start = extent.Item1;
-                    return true;
-                }
+            foreach(Tuple<int, int> extent in backend.Where(extent => item >= extent.Item1 && item <= extent.Item2)) {
+                start = extent.Item1;
+                return true;
+            }
 
             return false;
         }
diff --git a/Extents/ExtentsLong.cs b/Extents/ExtentsLong.cs
index 85fdf56d6..e958628fa 100644
--- a/Extents/ExtentsLong.cs
+++ b/Extents/ExtentsLong.cs
@@ -125,9 +125,7 @@ namespace Extents
 
         public bool Contains(long item)
         {
-            foreach(Tuple<long, long> extent in backend) if(item >= extent.Item1 && item <= extent.Item2) return true;
-
-            return false;
+            return backend.Any(extent => item >= extent.Item1 && item <= extent.Item2);
         }
 
         public void Clear()
@@ -196,12 +194,10 @@ namespace Extents
         public bool GetStart(long item, out long start)
         {
             start = 0;
-            foreach(Tuple<long, long> extent in backend)
-                if(item >= extent.Item1 && item <= extent.Item2)
-                {
-                    start = extent.Item1;
-                    return true;
-                }
+            foreach(Tuple<long, long> extent in backend.Where(extent => item >= extent.Item1 && item <= extent.Item2)) {
+                start = extent.Item1;
+                return true;
+            }
 
             return false;
         }
diff --git a/Extents/ExtentsSByte.cs b/Extents/ExtentsSByte.cs
index 2444eb27e..c5d665611 100644
--- a/Extents/ExtentsSByte.cs
+++ b/Extents/ExtentsSByte.cs
@@ -125,9 +125,7 @@ namespace Extents
 
         public bool Contains(sbyte item)
         {
-            foreach(Tuple<sbyte, sbyte> extent in backend) if(item >= extent.Item1 && item <= extent.Item2) return true;
-
-            return false;
+            return backend.Any(extent => item >= extent.Item1 && item <= extent.Item2);
         }
 
         public void Clear()
@@ -196,12 +194,10 @@ namespace Extents
         public bool GetStart(sbyte item, out sbyte start)
         {
             start = 0;
-            foreach(Tuple<sbyte, sbyte> extent in backend)
-                if(item >= extent.Item1 && item <= extent.Item2)
-                {
-                    start = extent.Item1;
-                    return true;
-                }
+            foreach(Tuple<sbyte, sbyte> extent in backend.Where(extent => item >= extent.Item1 && item <= extent.Item2)) {
+                start = extent.Item1;
+                return true;
+            }
 
             return false;
         }
diff --git a/Extents/ExtentsShort.cs b/Extents/ExtentsShort.cs
index ac32f34b5..604eee365 100644
--- a/Extents/ExtentsShort.cs
+++ b/Extents/ExtentsShort.cs
@@ -125,9 +125,7 @@ namespace Extents
 
         public bool Contains(short item)
         {
-            foreach(Tuple<short, short> extent in backend) if(item >= extent.Item1 && item <= extent.Item2) return true;
-
-            return false;
+            return backend.Any(extent => item >= extent.Item1 && item <= extent.Item2);
         }
 
         public void Clear()
@@ -196,12 +194,10 @@ namespace Extents
         public bool GetStart(short item, out short start)
         {
             start = 0;
-            foreach(Tuple<short, short> extent in backend)
-                if(item >= extent.Item1 && item <= extent.Item2)
-                {
-                    start = extent.Item1;
-                    return true;
-                }
+            foreach(Tuple<short, short> extent in backend.Where(extent => item >= extent.Item1 && item <= extent.Item2)) {
+                start = extent.Item1;
+                return true;
+            }
 
             return false;
         }
diff --git a/Extents/ExtentsUInt.cs b/Extents/ExtentsUInt.cs
index 27a0e8b00..1eb22492c 100644
--- a/Extents/ExtentsUInt.cs
+++ b/Extents/ExtentsUInt.cs
@@ -125,9 +125,7 @@ namespace Extents
 
         public bool Contains(uint item)
         {
-            foreach(Tuple<uint, uint> extent in backend) if(item >= extent.Item1 && item <= extent.Item2) return true;
-
-            return false;
+            return backend.Any(extent => item >= extent.Item1 && item <= extent.Item2);
         }
 
         public void Clear()
@@ -196,12 +194,10 @@ namespace Extents
         public bool GetStart(uint item, out uint start)
         {
             start = 0;
-            foreach(Tuple<uint, uint> extent in backend)
-                if(item >= extent.Item1 && item <= extent.Item2)
-                {
-                    start = extent.Item1;
-                    return true;
-                }
+            foreach(Tuple<uint, uint> extent in backend.Where(extent => item >= extent.Item1 && item <= extent.Item2)) {
+                start = extent.Item1;
+                return true;
+            }
 
             return false;
         }
diff --git a/Extents/ExtentsULong.cs b/Extents/ExtentsULong.cs
index 7fcea95c2..47e5a3ef6 100644
--- a/Extents/ExtentsULong.cs
+++ b/Extents/ExtentsULong.cs
@@ -125,9 +125,7 @@ namespace Extents
 
         public bool Contains(ulong item)
         {
-            foreach(Tuple<ulong, ulong> extent in backend) if(item >= extent.Item1 && item <= extent.Item2) return true;
-
-            return false;
+            return backend.Any(extent => item >= extent.Item1 && item <= extent.Item2);
         }
 
         public void Clear()
@@ -196,12 +194,10 @@ namespace Extents
         public bool GetStart(ulong item, out ulong start)
         {
             start = 0;
-            foreach(Tuple<ulong, ulong> extent in backend)
-                if(item >= extent.Item1 && item <= extent.Item2)
-                {
-                    start = extent.Item1;
-                    return true;
-                }
+            foreach(Tuple<ulong, ulong> extent in backend.Where(extent => item >= extent.Item1 && item <= extent.Item2)) {
+                start = extent.Item1;
+                return true;
+            }
 
             return false;
         }
diff --git a/Extents/ExtentsUShort.cs b/Extents/ExtentsUShort.cs
index e9e11d4ce..6ee29957c 100644
--- a/Extents/ExtentsUShort.cs
+++ b/Extents/ExtentsUShort.cs
@@ -125,10 +125,7 @@ namespace Extents
 
         public bool Contains(ushort item)
         {
-            foreach(Tuple<ushort, ushort> extent in backend)
-                if(item >= extent.Item1 && item <= extent.Item2) return true;
-
-            return false;
+            return backend.Any(extent => item >= extent.Item1 && item <= extent.Item2);
         }
 
         public void Clear()
@@ -197,12 +194,10 @@ namespace Extents
         public bool GetStart(ushort item, out ushort start)
         {
             start = 0;
-            foreach(Tuple<ushort, ushort> extent in backend)
-                if(item >= extent.Item1 && item <= extent.Item2)
-                {
-                    start = extent.Item1;
-                    return true;
-                }
+            foreach(Tuple<ushort, ushort> extent in backend.Where(extent => item >= extent.Item1 && item <= extent.Item2)) {
+                start = extent.Item1;
+                return true;
+            }
 
             return false;
         }