diff --git a/ArrayFill.cs b/ArrayFill.cs
index e4a1a4d..d08b4b0 100644
--- a/ArrayFill.cs
+++ b/ArrayFill.cs
@@ -54,12 +54,7 @@ namespace DiscImageChef
             Array.Copy(destinationArray, 0, destinationArray, copyLength, destinationArray.Length - copyLength);
         }
 
-        public static string ByteArrayToHex(byte[] array)
-        {
-            return ByteArrayToHex(array, false);
-        }
-
-        public static string ByteArrayToHex(byte[] array, bool upper)
+        public static string ByteArrayToHex(byte[] array, bool upper = false)
         {
             StringBuilder sb = new StringBuilder();
             for(long i = 0; i < array.LongLength; i++) sb.AppendFormat("{0:x2}", array[i]);
diff --git a/ArrayIsEmpty.cs b/ArrayIsEmpty.cs
index bb3769e..94c466c 100644
--- a/ArrayIsEmpty.cs
+++ b/ArrayIsEmpty.cs
@@ -38,16 +38,12 @@ namespace DiscImageChef
     {
         public static bool ArrayIsNullOrWhiteSpace(byte[] array)
         {
-            if(array == null) return true;
-
-            return array.All(b => b == 0x00 || b == 0x20);
+            return array == null || array.All(b => b == 0x00 || b == 0x20);
         }
 
         public static bool ArrayIsNullOrEmpty(byte[] array)
         {
-            if(array == null) return true;
-
-            return array.All(b => b == 0x00);
+            return array == null || array.All(b => b == 0x00);
         }
     }
 }
\ No newline at end of file
diff --git a/Extents/ExtentsByte.cs b/Extents/ExtentsByte.cs
index b96b174..13c9ffa 100644
--- a/Extents/ExtentsByte.cs
+++ b/Extents/ExtentsByte.cs
@@ -45,15 +45,12 @@ namespace Extents
             backend = new List<Tuple<byte, byte>>();
         }
 
-        public ExtentsByte(List<Tuple<byte, byte>> list)
+        public ExtentsByte(IEnumerable<Tuple<byte, byte>> list)
         {
             backend = list.OrderBy(t => t.Item1).ToList();
         }
 
-        public int Count
-        {
-            get { return backend.Count; }
-        }
+        public int Count => backend.Count;
 
         public void Add(byte item)
         {
@@ -108,12 +105,7 @@ namespace Extents
             backend = backend.OrderBy(t => t.Item1).ToList();
         }
 
-        public void Add(byte start, byte end)
-        {
-            Add(start, end, false);
-        }
-
-        public void Add(byte start, byte end, bool run)
+        public void Add(byte start, byte end, bool run = false)
         {
             byte realEnd;
             if(run) realEnd = (byte)(start + end - 1);
diff --git a/Extents/ExtentsInt.cs b/Extents/ExtentsInt.cs
index 92d9892..ce631c8 100644
--- a/Extents/ExtentsInt.cs
+++ b/Extents/ExtentsInt.cs
@@ -45,15 +45,12 @@ namespace Extents
             backend = new List<Tuple<int, int>>();
         }
 
-        public ExtentsInt(List<Tuple<int, int>> list)
+        public ExtentsInt(IEnumerable<Tuple<int, int>> list)
         {
             backend = list.OrderBy(t => t.Item1).ToList();
         }
 
-        public int Count
-        {
-            get { return backend.Count; }
-        }
+        public int Count => backend.Count;
 
         public void Add(int item)
         {
@@ -108,12 +105,7 @@ namespace Extents
             backend = backend.OrderBy(t => t.Item1).ToList();
         }
 
-        public void Add(int start, int end)
-        {
-            Add(start, end, false);
-        }
-
-        public void Add(int start, int end, bool run)
+        public void Add(int start, int end, bool run = false)
         {
             int realEnd;
             if(run) realEnd = start + end - 1;
diff --git a/Extents/ExtentsLong.cs b/Extents/ExtentsLong.cs
index e958628..68a9faf 100644
--- a/Extents/ExtentsLong.cs
+++ b/Extents/ExtentsLong.cs
@@ -45,15 +45,12 @@ namespace Extents
             backend = new List<Tuple<long, long>>();
         }
 
-        public ExtentsLong(List<Tuple<long, long>> list)
+        public ExtentsLong(IEnumerable<Tuple<long, long>> list)
         {
             backend = list.OrderBy(t => t.Item1).ToList();
         }
 
-        public int Count
-        {
-            get { return backend.Count; }
-        }
+        public int Count => backend.Count;
 
         public void Add(long item)
         {
@@ -108,12 +105,7 @@ namespace Extents
             backend = backend.OrderBy(t => t.Item1).ToList();
         }
 
-        public void Add(long start, long end)
-        {
-            Add(start, end, false);
-        }
-
-        public void Add(long start, long end, bool run)
+        public void Add(long start, long end, bool run = false)
         {
             long realEnd;
             if(run) realEnd = start + end - 1;
diff --git a/Extents/ExtentsSByte.cs b/Extents/ExtentsSByte.cs
index c5d6656..df5b0d1 100644
--- a/Extents/ExtentsSByte.cs
+++ b/Extents/ExtentsSByte.cs
@@ -45,15 +45,12 @@ namespace Extents
             backend = new List<Tuple<sbyte, sbyte>>();
         }
 
-        public ExtentsSByte(List<Tuple<sbyte, sbyte>> list)
+        public ExtentsSByte(IEnumerable<Tuple<sbyte, sbyte>> list)
         {
             backend = list.OrderBy(t => t.Item1).ToList();
         }
 
-        public int Count
-        {
-            get { return backend.Count; }
-        }
+        public int Count => backend.Count;
 
         public void Add(sbyte item)
         {
@@ -108,12 +105,7 @@ namespace Extents
             backend = backend.OrderBy(t => t.Item1).ToList();
         }
 
-        public void Add(sbyte start, sbyte end)
-        {
-            Add(start, end, false);
-        }
-
-        public void Add(sbyte start, sbyte end, bool run)
+        public void Add(sbyte start, sbyte end, bool run = false)
         {
             sbyte realEnd;
             if(run) realEnd = (sbyte)(start + end - 1);
diff --git a/Extents/ExtentsShort.cs b/Extents/ExtentsShort.cs
index 604eee3..505a4fc 100644
--- a/Extents/ExtentsShort.cs
+++ b/Extents/ExtentsShort.cs
@@ -45,15 +45,12 @@ namespace Extents
             backend = new List<Tuple<short, short>>();
         }
 
-        public ExtentsShort(List<Tuple<short, short>> list)
+        public ExtentsShort(IEnumerable<Tuple<short, short>> list)
         {
             backend = list.OrderBy(t => t.Item1).ToList();
         }
 
-        public int Count
-        {
-            get { return backend.Count; }
-        }
+        public int Count => backend.Count;
 
         public void Add(short item)
         {
@@ -108,12 +105,7 @@ namespace Extents
             backend = backend.OrderBy(t => t.Item1).ToList();
         }
 
-        public void Add(short start, short end)
-        {
-            Add(start, end, false);
-        }
-
-        public void Add(short start, short end, bool run)
+        public void Add(short start, short end, bool run = false)
         {
             short realEnd;
             if(run) realEnd = (short)(start + end - 1);
diff --git a/Extents/ExtentsUInt.cs b/Extents/ExtentsUInt.cs
index 1eb2249..5768ba1 100644
--- a/Extents/ExtentsUInt.cs
+++ b/Extents/ExtentsUInt.cs
@@ -45,15 +45,12 @@ namespace Extents
             backend = new List<Tuple<uint, uint>>();
         }
 
-        public ExtentsUInt(List<Tuple<uint, uint>> list)
+        public ExtentsUInt(IEnumerable<Tuple<uint, uint>> list)
         {
             backend = list.OrderBy(t => t.Item1).ToList();
         }
 
-        public int Count
-        {
-            get { return backend.Count; }
-        }
+        public int Count => backend.Count;
 
         public void Add(uint item)
         {
@@ -108,12 +105,7 @@ namespace Extents
             backend = backend.OrderBy(t => t.Item1).ToList();
         }
 
-        public void Add(uint start, uint end)
-        {
-            Add(start, end, false);
-        }
-
-        public void Add(uint start, uint end, bool run)
+        public void Add(uint start, uint end, bool run = false)
         {
             uint realEnd;
             if(run) realEnd = start + end - 1;
diff --git a/Extents/ExtentsULong.cs b/Extents/ExtentsULong.cs
index 47e5a3e..f5cc9eb 100644
--- a/Extents/ExtentsULong.cs
+++ b/Extents/ExtentsULong.cs
@@ -45,15 +45,12 @@ namespace Extents
             backend = new List<Tuple<ulong, ulong>>();
         }
 
-        public ExtentsULong(List<Tuple<ulong, ulong>> list)
+        public ExtentsULong(IEnumerable<Tuple<ulong, ulong>> list)
         {
             backend = list.OrderBy(t => t.Item1).ToList();
         }
 
-        public int Count
-        {
-            get { return backend.Count; }
-        }
+        public int Count => backend.Count;
 
         public void Add(ulong item)
         {
@@ -108,12 +105,7 @@ namespace Extents
             backend = backend.OrderBy(t => t.Item1).ToList();
         }
 
-        public void Add(ulong start, ulong end)
-        {
-            Add(start, end, false);
-        }
-
-        public void Add(ulong start, ulong end, bool run)
+        public void Add(ulong start, ulong end, bool run = false)
         {
             ulong realEnd;
             if(run) realEnd = start + end - 1;
diff --git a/Extents/ExtentsUShort.cs b/Extents/ExtentsUShort.cs
index 6ee2995..530f795 100644
--- a/Extents/ExtentsUShort.cs
+++ b/Extents/ExtentsUShort.cs
@@ -45,15 +45,12 @@ namespace Extents
             backend = new List<Tuple<ushort, ushort>>();
         }
 
-        public ExtentsUShort(List<Tuple<ushort, ushort>> list)
+        public ExtentsUShort(IEnumerable<Tuple<ushort, ushort>> list)
         {
             backend = list.OrderBy(t => t.Item1).ToList();
         }
 
-        public int Count
-        {
-            get { return backend.Count; }
-        }
+        public int Count => backend.Count;
 
         public void Add(ushort item)
         {
@@ -108,12 +105,7 @@ namespace Extents
             backend = backend.OrderBy(t => t.Item1).ToList();
         }
 
-        public void Add(ushort start, ushort end)
-        {
-            Add(start, end, false);
-        }
-
-        public void Add(ushort start, ushort end, bool run)
+        public void Add(ushort start, ushort end, bool run = false)
         {
             ushort realEnd;
             if(run) realEnd = (ushort)(start + end - 1);
diff --git a/Swapping.cs b/Swapping.cs
index 75bec25..75fb4d3 100644
--- a/Swapping.cs
+++ b/Swapping.cs
@@ -118,12 +118,12 @@ namespace DiscImageChef
 
         public static ushort Swap(ushort x)
         {
-            return (ushort)((x << 8) | (x >> 8));
+            return (ushort) ((x << 8) | (x >> 8));
         }
 
         public static short Swap(short x)
         {
-            return (short)((x << 8) | ((x >> 8) & 0xFF));
+            return (short) ((x << 8) | ((x >> 8) & 0xFF));
         }
 
         public static uint Swap(uint x)
@@ -134,8 +134,8 @@ namespace DiscImageChef
 
         public static int Swap(int x)
         {
-            x = (int)(((x << 8) & 0xFF00FF00) | (((uint)x >> 8) & 0xFF00FF));
-            return (int)(((uint)x << 16) | (((uint)x >> 16) & 0xFFFF));
+            x = (int) (((x << 8) & 0xFF00FF00) | (((uint) x >> 8) & 0xFF00FF));
+            return (int) (((uint) x << 16) | (((uint) x >> 16) & 0xFFFF));
         }
     }
 }
\ No newline at end of file