Code cleanup

7zip/Common/CommandLineParser.cs

@@ -33,11 +33,11 @@ namespace SevenZip.CommandLineParser
             MaxLen = maxLen;
             PostCharSet = postCharSet;
         }
-		public SwitchForm(string idString, SwitchType type, bool multi, int minLen):
+        public SwitchForm(string idString, SwitchType type, bool multi, int minLen) :
             this(idString, type, multi, minLen, 0, "")
         {
         }
-		public SwitchForm(string idString, SwitchType type, bool multi):
+        public SwitchForm(string idString, SwitchType type, bool multi) :
             this(idString, type, multi, 0)
         {
         }

7zip/Compress/LZ/LzBinTree.cs

@@ -199,9 +199,9 @@ namespace SevenZip.Compression.LZ
 
             UInt32 count = _cutValue;
 
-			while(true)
+            while (true)
             {
-				if(curMatch <= matchMinPos || count-- == 0)
+                if (curMatch <= matchMinPos || count-- == 0)
                 {
                     _son[ptr0] = _son[ptr1] = kEmptyHashValue;
                     break;
@@ -215,7 +215,7 @@ namespace SevenZip.Compression.LZ
                 UInt32 len = Math.Min(len0, len1);
                 if (_bufferBase[pby1 + len] == _bufferBase[cur + len])
                 {
-					while(++len != lenLimit)
+                    while (++len != lenLimit)
                         if (_bufferBase[pby1 + len] != _bufferBase[cur + len])
                             break;
                     if (maxLen < len)

7zip/Compress/LZ/LzInWindow.cs

@@ -115,7 +115,7 @@ namespace SevenZip.Compression.LZ
             UInt32 pby = _bufferOffset + _pos + (UInt32)index;
 
             UInt32 i;
-			for (i = 0; i < limit && _bufferBase[pby + i] == _bufferBase[pby + i - distance]; i++);
+            for (i = 0; i < limit && _bufferBase[pby + i] == _bufferBase[pby + i - distance]; i++) ;
             return i;
         }
 

7zip/Compress/LZMA/LzmaEncoder.cs

@@ -624,7 +624,7 @@ namespace SevenZip.Compression.LZMA
 
             UInt32 lenEnd = ((lenMain >= repLens[repMaxIndex]) ? lenMain : repLens[repMaxIndex]);
 
-			if(lenEnd < 2)
+            if (lenEnd < 2)
             {
                 backRes = _optimum[1].BackPrev;
                 return 1;
@@ -898,7 +898,7 @@ namespace SevenZip.Compression.LZMA
                             optimum.Prev1IsChar = false;
                         }
                     }
-					while(--lenTest >= 2);
+                    while (--lenTest >= 2);
                     lenTest = lenTestTemp;
 
                     if (repIndex == 0)
@@ -929,7 +929,7 @@ namespace SevenZip.Compression.LZMA
                             // for(; lenTest2 >= 2; lenTest2--)
                             {
                                 UInt32 offset = lenTest + 1 + lenTest2;
-								while(lenEnd < cur + offset)
+                                while (lenEnd < cur + offset)
                                     _optimum[++lenEnd].Price = kIfinityPrice;
                                 UInt32 curAndLenPrice = nextRepMatchPrice + GetRepPrice(0, lenTest2, state2, posStateNext);
                                 Optimal optimum = _optimum[cur + offset];

7zip/Compress/RangeCoder/RangeCoderBitTree.cs

@@ -22,7 +22,7 @@ namespace SevenZip.Compression.RangeCoder
         public void Encode(Encoder rangeEncoder, UInt32 symbol)
         {
             UInt32 m = 1;
-			for (int bitIndex = NumBitLevels; bitIndex > 0; )
+            for (int bitIndex = NumBitLevels; bitIndex > 0;)
             {
                 bitIndex--;
                 UInt32 bit = (symbol >> bitIndex) & 1;
@@ -47,7 +47,7 @@ namespace SevenZip.Compression.RangeCoder
         {
             UInt32 price = 0;
             UInt32 m = 1;
-			for (int bitIndex = NumBitLevels; bitIndex > 0; )
+            for (int bitIndex = NumBitLevels; bitIndex > 0;)
             {
                 bitIndex--;
                 UInt32 bit = (symbol >> bitIndex) & 1;

7zip/ICoder.cs

@@ -9,7 +9,7 @@ namespace SevenZip
     /// </summary>
     class DataErrorException : ApplicationException
     {
-		public DataErrorException(): base("Data Error") { }
+        public DataErrorException() : base("Data Error") { }
     }
 
     /// <summary>
@@ -17,7 +17,7 @@ namespace SevenZip
     /// </summary>
     class InvalidParamException : ApplicationException
     {
-		public InvalidParamException(): base("Invalid Parameter") { }
+        public InvalidParamException() : base("Invalid Parameter") { }
     }
 
     public interface ICodeProgress

App.xaml.cs

@@ -19,10 +19,10 @@
 // DEALINGS IN THE SOFTWARE.
 
 using System;
-using System.Linq;
-using System.Windows;
 using System.IO;
+using System.Linq;
 using System.Threading;
+using System.Windows;
 
 namespace WPinternals
 {

DiscUtils/BlockCache.cs

@@ -22,9 +22,7 @@
 
 namespace DiscUtils
 {
-    using System;
     using System.Collections.Generic;
-    using System.Text;
 
     internal class BlockCache<T>
         where T : Block, new()

DiscUtils/BootConfig/DiscUtilsRegistryStorage.cs

@@ -22,10 +22,10 @@
 
 namespace DiscUtils.BootConfig
 {
+    using DiscUtils.Registry;
     using System;
     using System.Collections.Generic;
     using System.Globalization;
-    using DiscUtils.Registry;
 
     internal class DiscUtilsRegistryStorage : BaseStorage
     {

DiscUtils/BootConfig/ElementValue.cs

@@ -23,7 +23,6 @@
 namespace DiscUtils.BootConfig
 {
     using System;
-    using System.Globalization;
 
     /// <summary>
     /// The value of an element.

DiscUtils/BootConfig/InheritType.cs

@@ -22,10 +22,6 @@
 
 namespace DiscUtils.BootConfig
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Text;
-
     /// <summary>
     /// Indicates the type of objects that can inherit from an object.
     /// </summary>

DiscUtils/BootConfig/Store.cs

@@ -22,9 +22,9 @@
 
 namespace DiscUtils.BootConfig
 {
+    using DiscUtils.Registry;
     using System;
     using System.Collections.Generic;
-    using DiscUtils.Registry;
 
     /// <summary>
     /// Represents a Boot Configuration Database store (i.e. a BCD file).

DiscUtils/BuilderSparseStreamExtent.cs

@@ -22,9 +22,7 @@
 
 namespace DiscUtils
 {
-    using System;
     using System.Collections.Generic;
-    using System.Text;
 
     internal class BuilderSparseStreamExtent : BuilderExtent
     {

DiscUtils/ClusterMap.cs

@@ -24,7 +24,6 @@ namespace DiscUtils
 {
     using System;
     using System.Collections.Generic;
-    using System.Text;
 
     /// <summary>
     /// Enumeration of possible cluster roles.

DiscUtils/Fat/DirectoryEntry.cs

@@ -24,7 +24,6 @@ namespace DiscUtils.Fat
 {
     using System;
     using System.IO;
-    using System.Text;
 
     internal class DirectoryEntry
     {

DiscUtils/Fat/FileAllocationTable.cs

@@ -22,7 +22,6 @@
 
 namespace DiscUtils.Fat
 {
-    using System;
     using System.IO;
 
     internal class FileAllocationTable

DiscUtils/Fat/FileSystemFactory.cs

@@ -22,8 +22,8 @@
 
 namespace DiscUtils.Fat
 {
-    using System.IO;
     using DiscUtils.Vfs;
+    using System.IO;
 
     [VfsFileSystemFactory]
     internal class FileSystemFactory : VfsFileSystemFactory

DiscUtils/LogicalDiskManager/DynamicDisk.cs

@@ -22,9 +22,9 @@
 
 namespace DiscUtils.LogicalDiskManager
 {
+    using DiscUtils.Partitions;
     using System;
     using System.IO;
-    using DiscUtils.Partitions;
 
     internal class DynamicDisk : IDiagnosticTraceable
     {

DiscUtils/LogicalDiskManager/DynamicDiskGroup.cs

@@ -22,11 +22,11 @@
 
 namespace DiscUtils.LogicalDiskManager
 {
+    using DiscUtils.Partitions;
     using System;
     using System.Collections.Generic;
     using System.Globalization;
     using System.IO;
-    using DiscUtils.Partitions;
 
     internal class DynamicDiskGroup : IDiagnosticTraceable
     {

DiscUtils/LogicalDiskManager/DynamicDiskManager.cs

@@ -22,9 +22,9 @@
 
 namespace DiscUtils.LogicalDiskManager
 {
+    using DiscUtils.Partitions;
     using System.Collections.Generic;
     using System.IO;
-    using DiscUtils.Partitions;
 
     /// <summary>
     /// A class that understands Windows LDM structures, mapping physical volumes to logical volumes.

DiscUtils/LogicalDiskManager/TocBlock.cs

@@ -22,8 +22,6 @@
 
 namespace DiscUtils.LogicalDiskManager
 {
-    using System;
-
     internal class TocBlock
     {
         public string Signature; // TOCBLOCK

DiscUtils/MappedStream.cs

@@ -22,7 +22,6 @@
 
 namespace DiscUtils
 {
-    using System;
     using System.Collections.Generic;
     using System.IO;
 

DiscUtils/Ntfs/CompressedClusterStream.cs

@@ -22,10 +22,10 @@
 
 namespace DiscUtils.Ntfs
 {
+    using DiscUtils.Compression;
     using System;
     using System.Collections.Generic;
     using System.IO;
-    using DiscUtils.Compression;
 
     internal sealed class CompressedClusterStream : ClusterStream
     {

DiscUtils/Ntfs/CookedDataRun.cs

@@ -23,7 +23,6 @@
 namespace DiscUtils.Ntfs
 {
     using System;
-    using System.Collections.Generic;
 
     internal class CookedDataRun
     {

DiscUtils/Ntfs/DataRun.cs

@@ -23,7 +23,6 @@
 namespace DiscUtils.Ntfs
 {
     using System.Globalization;
-    using System.IO;
 
     internal class DataRun
     {

DiscUtils/Ntfs/FileRecord.cs

@@ -24,7 +24,6 @@ namespace DiscUtils.Ntfs
 {
     using System;
     using System.Collections.Generic;
-    using System.Collections.ObjectModel;
     using System.IO;
 
     [Flags]

DiscUtils/Ntfs/FileSystemFactory.cs

@@ -22,8 +22,8 @@
 
 namespace DiscUtils.Ntfs
 {
-    using System.IO;
     using DiscUtils.Vfs;
+    using System.IO;
 
     [VfsFileSystemFactory]
     internal class FileSystemFactory : VfsFileSystemFactory

DiscUtils/Ntfs/FixupRecordBase.cs

@@ -22,7 +22,6 @@
 
 namespace DiscUtils.Ntfs
 {
-    using System;
     using System.IO;
 
     internal abstract class FixupRecordBase

DiscUtils/Ntfs/IndexBlock.cs

@@ -23,7 +23,6 @@
 namespace DiscUtils.Ntfs
 {
     using System;
-    using System.Collections.Generic;
     using System.IO;
 
     internal class IndexBlock : FixupRecordBase

DiscUtils/Ntfs/Internals/MasterFileTableAttribute.cs

@@ -1,9 +1,5 @@
 namespace DiscUtils.Ntfs.Internals
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Text;
-
     public sealed class MasterFileTableAttribute
     {
     }

DiscUtils/Ntfs/Internals/MasterFileTableRecord.cs

@@ -22,10 +22,6 @@
 
 namespace DiscUtils.Ntfs.Internals
 {
-    using System.Collections;
-    using System.Collections.Generic;
-    using System.IO;
-
     public sealed class MasterFileTableRecord
     {
         private FileRecord _fileRecord;

DiscUtils/Ntfs/Internals/NtfsNamespace.cs

@@ -22,8 +22,6 @@
 
 namespace DiscUtils.Ntfs.Internals
 {
-    using System;
-
     /// <summary>
     /// The known NTFS namespaces.
     /// </summary>

DiscUtils/Ntfs/LZNT1.cs

@@ -30,8 +30,8 @@
 
 namespace DiscUtils.Ntfs
 {
-    using System;
     using DiscUtils.Compression;
+    using System;
 
     /// <summary>
     /// Implementation of the LZNT1 algorithm used for compressing NTFS files.

DiscUtils/Ntfs/NonResidentDataBuffer.cs

@@ -25,7 +25,6 @@ namespace DiscUtils.Ntfs
     using System;
     using System.Collections.Generic;
     using System.IO;
-    using DiscUtils.Compression;
 
     internal class NonResidentDataBuffer : DiscUtils.Buffer, IMappedBuffer
     {

DiscUtils/Ntfs/NtfsAttribute.cs

@@ -22,7 +22,6 @@
 
 namespace DiscUtils.Ntfs
 {
-    using System;
     using System.Collections.Generic;
     using System.Globalization;
     using System.IO;

DiscUtils/Ntfs/NtfsFileSystem.cs

@@ -1097,7 +1097,7 @@ namespace DiscUtils.Ntfs
                     }
                 }
 
-                UpdateStandardInformation(dirEntry, file, delegate(StandardInformation si) { si.FileAttributes = FileNameRecord.SetAttributes(newValue, si.FileAttributes); });
+                UpdateStandardInformation(dirEntry, file, delegate (StandardInformation si) { si.FileAttributes = FileNameRecord.SetAttributes(newValue, si.FileAttributes); });
             }
         }
 
@@ -1131,7 +1131,7 @@ namespace DiscUtils.Ntfs
         {
             using (new NtfsTransaction())
             {
-                UpdateStandardInformation(path, delegate(StandardInformation si) { si.CreationTime = newTime; });
+                UpdateStandardInformation(path, delegate (StandardInformation si) { si.CreationTime = newTime; });
             }
         }
 
@@ -1165,7 +1165,7 @@ namespace DiscUtils.Ntfs
         {
             using (new NtfsTransaction())
             {
-                UpdateStandardInformation(path, delegate(StandardInformation si) { si.LastAccessTime = newTime; });
+                UpdateStandardInformation(path, delegate (StandardInformation si) { si.LastAccessTime = newTime; });
             }
         }
 
@@ -1199,7 +1199,7 @@ namespace DiscUtils.Ntfs
         {
             using (new NtfsTransaction())
             {
-                UpdateStandardInformation(path, delegate(StandardInformation si) { si.ModificationTime = newTime; });
+                UpdateStandardInformation(path, delegate (StandardInformation si) { si.ModificationTime = newTime; });
             }
         }
 
@@ -1763,7 +1763,7 @@ namespace DiscUtils.Ntfs
             {
                 UpdateStandardInformation(
                     path,
-                    delegate(StandardInformation si)
+                    delegate (StandardInformation si)
                     {
                         si.CreationTime = info.CreationTime;
                         si.LastAccessTime = info.LastAccessTime;

DiscUtils/Ntfs/NtfsFormatter.cs

@@ -137,8 +137,8 @@ namespace DiscUtils.Ntfs
                 SetSecurityAttribute(volumeFile, "O:" + localAdminString + "G:BAD:(A;;0x12019f;;;SY)(A;;0x12019f;;;BA)");
                 volumeFile.UpdateRecordInMft();
 
-                _context.GetFileByIndex = delegate(long index) { return new File(_context, _context.Mft.GetRecord(index, false)); };
-                _context.AllocateFile = delegate(FileRecordFlags frf) { return new File(_context, _context.Mft.AllocateRecord(frf, false)); };
+                _context.GetFileByIndex = delegate (long index) { return new File(_context, _context.Mft.GetRecord(index, false)); };
+                _context.AllocateFile = delegate (FileRecordFlags frf) { return new File(_context, _context.Mft.AllocateRecord(frf, false)); };
 
                 File attrDefFile = CreateSystemFile(MasterFileTable.AttrDefIndex);
                 _context.AttributeDefinitions.WriteTo(attrDefFile);

DiscUtils/Ntfs/NtfsStream.cs

@@ -22,7 +22,6 @@
 
 namespace DiscUtils.Ntfs
 {
-    using System;
     using System.Collections.Generic;
     using System.IO;
 

DiscUtils/Ntfs/NtfsTransaction.cs

@@ -23,8 +23,6 @@
 namespace DiscUtils.Ntfs
 {
     using System;
-    using System.Collections.Generic;
-    using System.Text;
 
     internal sealed class NtfsTransaction : IDisposable
     {

DiscUtils/Ntfs/RawClusterStream.cs

@@ -22,11 +22,11 @@
 
 namespace DiscUtils.Ntfs
 {
+    using DiscUtils;
     using System;
     using System.Collections.Generic;
     using System.Globalization;
     using System.IO;
-    using DiscUtils;
 
     /// <summary>
     /// Low-level non-resident attribute operations.

DiscUtils/Ntfs/SecurityDescriptor.cs

@@ -22,10 +22,8 @@
 
 namespace DiscUtils.Ntfs
 {
-    using System;
     using System.IO;
     using System.Security.AccessControl;
-    using System.Security.Principal;
 
     internal sealed class SecurityDescriptor : IByteArraySerializable, IDiagnosticTraceable
     {

DiscUtils/Ntfs/ShortFileNameOption.cs

@@ -22,10 +22,6 @@
 
 namespace DiscUtils.Ntfs
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Text;
-
     /// <summary>
     /// Controls whether short file names are created automatically.
     /// </summary>

DiscUtils/Ntfs/VolumeInformation.cs

@@ -22,7 +22,6 @@
 
 namespace DiscUtils.Ntfs
 {
-    using System;
     using System.IO;
 
     internal sealed class VolumeInformation : IByteArraySerializable, IDiagnosticTraceable

DiscUtils/Ntfs/VolumeName.cs

@@ -22,7 +22,6 @@
 
 namespace DiscUtils.Ntfs
 {
-    using System;
     using System.IO;
     using System.Text;
 

DiscUtils/ObjectCache.cs

@@ -23,7 +23,6 @@
 namespace DiscUtils
 {
     using System;
-    using System.Collections;
     using System.Collections.Generic;
 
     /// <summary>

DiscUtils/Ownership.cs

@@ -22,10 +22,6 @@
 
 namespace DiscUtils
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Text;
-
     /// <summary>
     /// Enumeration used to indicate transfer of disposable objects.
     /// </summary>

DiscUtils/Partitions/BiosPartitionInfo.cs

@@ -23,7 +23,6 @@
 namespace DiscUtils.Partitions
 {
     using System;
-    using System.IO;
 
     /// <summary>
     /// Provides access to partition records in a BIOS (MBR) partition table.

DiscUtils/Partitions/BiosPartitionedDiskBuilder.cs

@@ -24,7 +24,6 @@ namespace DiscUtils.Partitions
 {
     using System;
     using System.Collections.Generic;
-    using System.IO;
 
     /// <summary>
     /// Builds a stream with the contents of a BIOS partitioned disk.

DiscUtils/Partitions/GuidPartitionInfo.cs

@@ -23,7 +23,6 @@
 namespace DiscUtils.Partitions
 {
     using System;
-    using System.IO;
 
     /// <summary>
     /// Provides access to partition records in a GUID partition table.

DiscUtils/Partitions/PartitionInfo.cs

@@ -24,7 +24,6 @@ namespace DiscUtils.Partitions
 {
     using System;
     using System.Globalization;
-    using System.IO;
 
     /// <summary>
     /// Base class representing a disk partition.

DiscUtils/PhysicalVolumeInfo.cs

@@ -22,9 +22,9 @@
 
 namespace DiscUtils
 {
+    using DiscUtils.Partitions;
     using System;
     using System.Globalization;
-    using DiscUtils.Partitions;
 
     /// <summary>
     /// Enumeration of possible types of physical volume.

DiscUtils/Range.cs

@@ -24,7 +24,6 @@ namespace DiscUtils
 {
     using System;
     using System.Collections.Generic;
-    using System.Text;
 
     /// <summary>
     /// Represents a range of values.

DiscUtils/Raw/DiskFactory.cs

@@ -23,7 +23,6 @@
 namespace DiscUtils.Raw
 {
     using System;
-    using System.Collections.Generic;
     using System.IO;
 
     [VirtualDiskFactory("RAW", ".img,.ima,.vfd,.flp,.bif")]

DiscUtils/Raw/DiskImageFile.cs

@@ -22,9 +22,9 @@
 
 namespace DiscUtils.Raw
 {
+    using DiscUtils.Partitions;
     using System;
     using System.IO;
-    using DiscUtils.Partitions;
 
     /// <summary>
     /// Represents a single raw disk image file.

DiscUtils/Registry/BinHeader.cs

@@ -22,7 +22,6 @@
 
 namespace DiscUtils.Registry
 {
-    using System;
     using System.IO;
 
     internal sealed class BinHeader : IByteArraySerializable

DiscUtils/SparseMemoryStream.cs

@@ -22,7 +22,6 @@
 
 namespace DiscUtils
 {
-    using System.Collections.Generic;
     using System.IO;
 
     /// <summary>

DiscUtils/Tuple.cs

@@ -22,8 +22,6 @@
 
 namespace DiscUtils
 {
-    using System;
-
     internal abstract class Tuple
     {
         public abstract object this[int i]

DiscUtils/UnixFileType.cs

@@ -22,8 +22,6 @@
 
 namespace DiscUtils
 {
-    using System;
-
     /// <summary>
     /// Standard Unix-style file type.
     /// </summary>

DiscUtils/Vfs/VfsFileSystemFactoryAttribute.cs

@@ -23,8 +23,6 @@
 namespace DiscUtils.Vfs
 {
     using System;
-    using System.Collections.Generic;
-    using System.Text;
 
     /// <summary>
     /// Attribute identifying file system factory classes.

DiscUtils/VirtualDisk.cs

@@ -22,11 +22,11 @@
 
 namespace DiscUtils
 {
+    using DiscUtils.Partitions;
     using System;
     using System.Collections.Generic;
     using System.Globalization;
     using System.IO;
-    using DiscUtils.Partitions;
 
     /// <summary>
     /// Base class representing virtual hard disks.

DiscUtils/VolumeManager.cs

@@ -22,11 +22,11 @@
 
 namespace DiscUtils
 {
+    using DiscUtils.Partitions;
     using System;
     using System.Collections.Generic;
     using System.Globalization;
     using System.IO;
-    using DiscUtils.Partitions;
 
     /// <summary>
     /// VolumeManager interprets partitions and other on-disk structures (possibly combining multiple disks).

FilePickerControl.xaml.cs

@@ -27,7 +27,7 @@ using System.Windows.Media;
 
 namespace WPinternals
 {
-    public class PathChangedEventArgs: EventArgs
+    public class PathChangedEventArgs : EventArgs
     {
         public PathChangedEventArgs(string NewPath)
             : base()

HelperClasses.cs

@@ -22,25 +22,24 @@
 // Where possible the original authors are referenced.
 
 using System;
-using System.IO;
+using System.Collections;
 using System.Collections.Generic;
 using System.Globalization;
+using System.IO;
+using System.IO.Compression;
 using System.Linq;
+using System.Reflection;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Data;
 using System.Windows.Documents;
+using System.Windows.Input;
 using System.Windows.Media.Animation;
 using System.Windows.Media.Imaging;
-using System.Threading;
-using System.Windows.Input;
 using System.Windows.Threading;
-using System.IO.Compression;
-using System.Collections;
-using System.Reflection;
-using System.Net;
 
 namespace WPinternals
 {
@@ -1061,7 +1060,7 @@ namespace WPinternals
         {
         }
 
-        public DelegateCommand(Action executeMethod, Func<bool> canExecuteMethod): base(o => executeMethod(), f => canExecuteMethod())
+        public DelegateCommand(Action executeMethod, Func<bool> canExecuteMethod) : base(o => executeMethod(), f => canExecuteMethod())
         {
         }
 
@@ -1076,7 +1075,7 @@ namespace WPinternals
         }
     }
 
-    internal class FlowDocumentScrollViewerNoMouseWheel: FlowDocumentScrollViewer
+    internal class FlowDocumentScrollViewerNoMouseWheel : FlowDocumentScrollViewer
     {
         protected override void OnMouseWheel(MouseWheelEventArgs e)
         {
@@ -1167,7 +1166,7 @@ namespace WPinternals
         }
     }
 
-    internal class WPinternalsException: Exception
+    internal class WPinternalsException : Exception
     {
         // Message and SubMessaage are always printable
         internal string SubMessage = null;
@@ -1494,7 +1493,7 @@ namespace WPinternals
             }
         }
         public override void SetLength(long value) { throw new NotSupportedException(); }
-        public override void Write(byte[] buffer, int offset, int count) {throw new NotSupportedException(); }
+        public override void Write(byte[] buffer, int offset, int count) { throw new NotSupportedException(); }
         public override void Flush() { UnderlyingStream.Flush(); }
         public override void Close() { UnderlyingStream.Close(); }
         protected override void Dispose(bool disposing)
@@ -1507,7 +1506,7 @@ namespace WPinternals
     }
 
     // For writing a compressed stream
-    internal class CompressedStream: Stream
+    internal class CompressedStream : Stream
     {
         private UInt32 HeaderSize;
         private UInt64 WritePosition;
@@ -1558,7 +1557,7 @@ namespace WPinternals
         }
     }
 
-    internal class SeekableStream: Stream        
+    internal class SeekableStream : Stream
     {
         private Stream UnderlyingStream;
         private Int64 ReadPosition = 0;
@@ -1929,7 +1928,7 @@ namespace WPinternals
     /// </summary>
     public static class GridViewColumnResize
     {
-#region DependencyProperties
+        #region DependencyProperties
 
         public static readonly DependencyProperty WidthProperty =
             DependencyProperty.RegisterAttached("Width", typeof(string), typeof(GridViewColumnResize),
@@ -1948,7 +1947,7 @@ namespace WPinternals
             DependencyProperty.RegisterAttached("ListViewResizeBehaviorProperty",
                                                 typeof(ListViewResizeBehavior), typeof(GridViewColumnResize), null);
 
-#endregion
+        #endregion
 
         public static string GetWidth(DependencyObject obj)
         {
@@ -1970,7 +1969,7 @@ namespace WPinternals
             obj.SetValue(EnabledProperty, value);
         }
 
-#region CallBack
+        #region CallBack
 
         private static void OnSetWidthCallback(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs e)
         {
@@ -2025,9 +2024,9 @@ namespace WPinternals
             return behavior;
         }
 
-#endregion
+        #endregion
 
-#region Nested type: GridViewColumnResizeBehavior
+        #region Nested type: GridViewColumnResizeBehavior
 
         // This class was written by: Rolf Wessels
         // https://github.com/rolfwessels/lazycowprojects/tree/master/Wpf
@@ -2103,9 +2102,9 @@ namespace WPinternals
             }
         }
 
-#endregion
+        #endregion
 
-#region Nested type: ListViewResizeBehavior
+        #region Nested type: ListViewResizeBehavior
 
         // This class was written by: Rolf Wessels
         // https://github.com/rolfwessels/lazycowprojects/tree/master/Wpf
@@ -2211,7 +2210,7 @@ namespace WPinternals
             }
         }
 
-#endregion
+        #endregion
     }
 
     internal static class ExtensionMethods

Models/ByteOperations.cs

@@ -365,7 +365,7 @@ namespace WPinternals
                 uint crc = (uint)(((uint)0) ^ (-1));
                 for (var i = Offset; i < (Offset + Length); i++)
                 {
-                    crc = (crc >> 8) ^ CRC32Table[ (crc ^ Input[i]) & 0xFF ];
+                    crc = (crc >> 8) ^ CRC32Table[(crc ^ Input[i]) & 0xFF];
                 }
                 crc = (uint)(crc ^ (-1));
 

Models/LumiaDownloadModel.cs

@@ -20,15 +20,15 @@
 
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Runtime.Serialization;
-using System.Runtime.Serialization.Json;
 using System.Net;
 using System.Net.Http;
 using System.Net.Http.Headers;
-using System.IO;
+using System.Runtime.Serialization;
+using System.Runtime.Serialization.Json;
+using System.Text;
+using System.Threading.Tasks;
 using System.Xml;
 using System.Xml.Serialization;
 
@@ -363,7 +363,7 @@ namespace WPinternals
         }
     }
 
-    #pragma warning disable 0649
+#pragma warning disable 0649
     [DataContract]
     internal class FileUrlResult
     {
@@ -379,7 +379,7 @@ namespace WPinternals
         [DataMember]
         internal List<SoftwareFileChecksum> checksum;
     }
-    #pragma warning restore 0649
+#pragma warning restore 0649
 
     [DataContract]
     public class DiscoveryQueryParameters
@@ -454,7 +454,7 @@ namespace WPinternals
         [DataMember]
         public List<string> response;
 
-        public DiscoveryParameters(): this(DiscoveryCondition.Default)
+        public DiscoveryParameters() : this(DiscoveryCondition.Default)
         {
         }
 

Models/MassStorage.cs

@@ -26,7 +26,7 @@ using System.Runtime.InteropServices;
 
 namespace WPinternals
 {
-    internal class MassStorage: NokiaPhoneModel
+    internal class MassStorage : NokiaPhoneModel
     {
         internal string Drive = null;
         internal string PhysicalDrive = null;
@@ -37,7 +37,7 @@ namespace WPinternals
 
         private QualcommSerial Serial;
 
-        internal MassStorage(string DevicePath): base(DevicePath)
+        internal MassStorage(string DevicePath) : base(DevicePath)
         {
             try
             {

Models/NativeMethods.cs

@@ -18,10 +18,10 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-using System;
-using System.Runtime.InteropServices;
-using System.Runtime.ConstrainedExecution;
 using Microsoft.Win32.SafeHandles;
+using System;
+using System.Runtime.ConstrainedExecution;
+using System.Runtime.InteropServices;
 using System.Security;
 
 namespace WPinternals

Models/NokiaFlashModel.cs

@@ -1112,7 +1112,7 @@ namespace WPinternals
             ExecuteRawMethod(Request);
         }
 
-        internal enum SecureBootKeyType: byte
+        internal enum SecureBootKeyType : byte
         {
             Retail = 0,
             Engineering = 1

Models/NokiaPhoneModel.cs

@@ -27,7 +27,7 @@ using System.Linq;
 
 namespace WPinternals
 {
-    internal class NokiaPhoneModel: IDisposable
+    internal class NokiaPhoneModel : IDisposable
     {
         protected bool Disposed = false;
         private USBDevice Device = null;

Models/Privileges.cs

@@ -21,15 +21,15 @@
 using System;
 using System.Collections.Specialized;
 using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
 using System.Runtime.ConstrainedExecution;
+using System.Runtime.InteropServices;
 using System.Threading;
 
 namespace WPinternals
 {
     using Luid = NativeMethods.LUID;
-    using Win32Exception = System.ComponentModel.Win32Exception;
     using PrivilegeNotHeldException = System.Security.AccessControl.PrivilegeNotHeldException;
+    using Win32Exception = System.ComponentModel.Win32Exception;
 
     internal delegate void PrivilegedCallback(object state);
 

Models/QualcommPartition.cs

@@ -47,7 +47,7 @@ namespace WPinternals
         internal uint CertificatesOffset;
         internal byte[] RootKeyHash = null;
 
-        internal QualcommPartition(string Path): this(File.ReadAllBytes(Path)) { }
+        internal QualcommPartition(string Path) : this(File.ReadAllBytes(Path)) { }
 
         internal QualcommPartition(byte[] Binary, uint Offset = 0)
         {

Models/QualcommSahara.cs

@@ -23,7 +23,7 @@ using System.Threading.Tasks;
 
 namespace WPinternals
 {
-    internal enum SaharaMode: uint
+    internal enum SaharaMode : uint
     {
         ImageTransferPending = 0x00,
         ImagetransferComplete = 0x01,

Models/QualcommSerial.cs

@@ -24,7 +24,7 @@ using System.IO.Ports;
 
 namespace WPinternals
 {
-    internal class QualcommSerial: IDisposable
+    internal class QualcommSerial : IDisposable
     {
         private bool Disposed = false;
         private SerialPort Port = null;
@@ -132,7 +132,7 @@ namespace WPinternals
                         for (int i = 0; i < ResponsePattern.Length; i++)
                             if (DecodedResponse[i] != ResponsePattern[i])
                             {
-                                byte[] LogResponse = new byte[DecodedResponse.Length < 0x10 ? DecodedResponse.Length: 0x10];
+                                byte[] LogResponse = new byte[DecodedResponse.Length < 0x10 ? DecodedResponse.Length : 0x10];
                                 LogFile.Log("Qualcomm serial response: " + Converter.ConvertHexToString(LogResponse, ""), LogType.FileOnly);
                                 LogFile.Log("Expected: " + Converter.ConvertHexToString(ResponsePattern, ""), LogType.FileOnly);
                                 throw new BadMessageException();

Models/SBL1.cs

@@ -22,9 +22,9 @@ using System;
 
 namespace WPinternals
 {
-    internal class SBL1: QualcommPartition
+    internal class SBL1 : QualcommPartition
     {
-        internal SBL1(byte[] Binary): base(Binary, 0x2800) { }
+        internal SBL1(byte[] Binary) : base(Binary, 0x2800) { }
 
         internal byte[] GenerateExtraSector(byte[] PartitionHeader)
         {

Properties/AssemblyInfo.cs

@@ -1,6 +1,4 @@
 using System.Reflection;
-using System.Resources;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Windows;
 

ViewModels/AboutViewModel.cs

@@ -20,7 +20,7 @@
 
 namespace WPinternals
 {
-    internal class AboutViewModel: ContextViewModel
+    internal class AboutViewModel : ContextViewModel
     {
         internal AboutViewModel() : base() { }
 

ViewModels/BackupTargetSelectionViewModel.cs

@@ -23,7 +23,7 @@ using System.Threading;
 
 namespace WPinternals
 {
-    internal class BackupTargetSelectionViewModel: ContextViewModel
+    internal class BackupTargetSelectionViewModel : ContextViewModel
     {
         private PhoneNotifierViewModel PhoneNotifier;
         private Action<string, string, string> BackupCallback;

ViewModels/BackupViewModel.cs

@@ -26,7 +26,7 @@ using System.Threading;
 
 namespace WPinternals
 {
-    internal class BackupViewModel: ContextViewModel
+    internal class BackupViewModel : ContextViewModel
     {
         private PhoneNotifierViewModel PhoneNotifier;
         private Action Callback;

ViewModels/ContextViewModel.cs

@@ -73,11 +73,11 @@ namespace WPinternals
             UIContext = SynchronizationContext.Current;
         }
 
-        internal ContextViewModel(MainViewModel Main): this()
+        internal ContextViewModel(MainViewModel Main) : this()
         {
         }
 
-        internal ContextViewModel(MainViewModel Main, ContextViewModel SubContext): this(Main)
+        internal ContextViewModel(MainViewModel Main, ContextViewModel SubContext) : this(Main)
         {
             SubContextViewModel = SubContext;
         }

ViewModels/DownloadsViewModel.cs

@@ -32,7 +32,7 @@ using System.Windows.Data;
 
 namespace WPinternals
 {
-    internal class DownloadsViewModel: ContextViewModel
+    internal class DownloadsViewModel : ContextViewModel
     {
         private PhoneNotifierViewModel Notifier;
         private Timer SpeedTimer;
@@ -496,7 +496,7 @@ namespace WPinternals
         Failed
     };
 
-    internal class DownloadEntry: INotifyPropertyChanged
+    internal class DownloadEntry : INotifyPropertyChanged
     {
         private SynchronizationContext UIContext;
         public event PropertyChangedEventHandler PropertyChanged = delegate { };

ViewModels/DumpRomTargetSelectionViewModel.cs

@@ -23,7 +23,7 @@ using System.Threading;
 
 namespace WPinternals
 {
-    internal class DumpRomTargetSelectionViewModel: ContextViewModel
+    internal class DumpRomTargetSelectionViewModel : ContextViewModel
     {
         private Action<string, string, bool, string, bool, string, bool> DumpCallback;
         internal Action SwitchToUnlockBoot;

ViewModels/DumpRomViewModel.cs

@@ -24,7 +24,7 @@ using System.Threading;
 
 namespace WPinternals
 {
-    internal class DumpRomViewModel: ContextViewModel
+    internal class DumpRomViewModel : ContextViewModel
     {
         private Action SwitchToUnlockBoot;
         private Action SwitchToUnlockRoot;

ViewModels/GettingStartedViewModel.cs

@@ -22,7 +22,7 @@ using System;
 
 namespace WPinternals
 {
-    internal class GettingStartedViewModel: ContextViewModel
+    internal class GettingStartedViewModel : ContextViewModel
     {
         internal Action ShowDisclaimer;
         internal Action SwitchToUnlockBoot;

ViewModels/LumiaFlashRomSourceSelectionViewModel.cs

@@ -23,7 +23,7 @@ using System.Threading;
 
 namespace WPinternals
 {
-    internal class LumiaFlashRomSourceSelectionViewModel: ContextViewModel
+    internal class LumiaFlashRomSourceSelectionViewModel : ContextViewModel
     {
         private PhoneNotifierViewModel PhoneNotifier;
         private Action<string, string, string> FlashPartitionsCallback;

ViewModels/LumiaFlashRomViewModel.cs

@@ -28,7 +28,7 @@ using System.Threading.Tasks;
 
 namespace WPinternals
 {
-    internal class LumiaFlashRomViewModel: ContextViewModel
+    internal class LumiaFlashRomViewModel : ContextViewModel
     {
         private PhoneNotifierViewModel PhoneNotifier;
         internal Action SwitchToUnlockBoot;

ViewModels/LumiaInfoViewModel.cs

@@ -22,7 +22,7 @@ using System;
 
 namespace WPinternals
 {
-    internal class LumiaInfoViewModel: ContextViewModel
+    internal class LumiaInfoViewModel : ContextViewModel
     {
         internal PhoneInterfaces? CurrentInterface;
         internal IDisposable CurrentModel;

ViewModels/LumiaModeViewModel.cs

@@ -111,7 +111,8 @@ namespace WPinternals
             catch (Exception Ex)
             {
                 IsSwitchingInterface = false;
-                ActivateSubContext(new MessageViewModel(Ex.Message, () => {
+                ActivateSubContext(new MessageViewModel(Ex.Message, () =>
+                {
                     Callback();
                     Refresh();
                 }));

ViewModels/LumiaUnlockRootTargetSelectionViewModel.cs

@@ -23,19 +23,19 @@ using System.Threading;
 
 namespace WPinternals
 {
-    internal class LumiaUnlockRootTargetSelectionViewModel: LumiaRootAccessTargetSelectionViewModel
+    internal class LumiaUnlockRootTargetSelectionViewModel : LumiaRootAccessTargetSelectionViewModel
     {
         public LumiaUnlockRootTargetSelectionViewModel(PhoneNotifierViewModel PhoneNotifier, Action SwitchToUnlockBoot, Action SwitchToDumpRom, Action SwitchToFlashRom, Action UnlockPhoneCallback, Action<string, string> UnlockImageCallback)
             : base(PhoneNotifier, SwitchToUnlockBoot, SwitchToDumpRom, SwitchToFlashRom, UnlockPhoneCallback, UnlockImageCallback) { }
     }
 
-    internal class LumiaUndoRootTargetSelectionViewModel: LumiaRootAccessTargetSelectionViewModel
+    internal class LumiaUndoRootTargetSelectionViewModel : LumiaRootAccessTargetSelectionViewModel
     {
         public LumiaUndoRootTargetSelectionViewModel(PhoneNotifierViewModel PhoneNotifier, Action SwitchToUnlockBoot, Action SwitchToDumpRom, Action SwitchToFlashRom, Action UnlockPhoneCallback, Action<string, string> UnlockImageCallback)
             : base(PhoneNotifier, SwitchToUnlockBoot, SwitchToDumpRom, SwitchToFlashRom, UnlockPhoneCallback, UnlockImageCallback) { }
     }
 
-    internal class LumiaRootAccessTargetSelectionViewModel: ContextViewModel
+    internal class LumiaRootAccessTargetSelectionViewModel : ContextViewModel
     {
         private PhoneNotifierViewModel PhoneNotifier;
         internal Action SwitchToUnlockBoot;

ViewModels/LumiaUnlockRootViewModel.cs

@@ -24,7 +24,7 @@ using System.Threading;
 
 namespace WPinternals
 {
-    internal class LumiaUnlockRootViewModel: ContextViewModel
+    internal class LumiaUnlockRootViewModel : ContextViewModel
     {
         private PhoneNotifierViewModel PhoneNotifier;
         private Action SwitchToUnlockBoot;
@@ -82,7 +82,8 @@ namespace WPinternals
             }
             catch (Exception Ex)
             {
-                ActivateSubContext(new MessageViewModel(Ex.Message, () => {
+                ActivateSubContext(new MessageViewModel(Ex.Message, () =>
+                {
                     Callback();
                     ActivateSubContext(null);
                 }));

ViewModels/MessageViewModel.cs

@@ -22,7 +22,7 @@ using System;
 
 namespace WPinternals
 {
-    internal class MessageViewModel: ContextViewModel
+    internal class MessageViewModel : ContextViewModel
     {
         internal MessageViewModel(string Message, Action OkAction = null, Action CancelAction = null)
             : base()

ViewModels/NokiaMassStorageViewModel.cs

@@ -18,11 +18,9 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-using System.Threading;
-
 namespace WPinternals
 {
-    internal class NokiaMassStorageViewModel: ContextViewModel
+    internal class NokiaMassStorageViewModel : ContextViewModel
     {
         private MassStorage CurrentModel;
 

ViewModels/NokiaModeFlashViewModel.cs

@@ -19,11 +19,7 @@
 // DEALINGS IN THE SOFTWARE.
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Threading;
-using System.Threading.Tasks;
 
 namespace WPinternals
 {

ViewModels/NokiaModeMassStorageViewModel.cs

@@ -19,7 +19,6 @@
 // DEALINGS IN THE SOFTWARE.
 
 using System;
-using System.Collections.Generic;
 
 namespace WPinternals
 {

ViewModels/NokiaModeNormalViewModel.cs

@@ -22,7 +22,7 @@ using System;
 
 namespace WPinternals
 {
-    internal class NokiaModeNormalViewModel: ContextViewModel
+    internal class NokiaModeNormalViewModel : ContextViewModel
     {
         private NokiaPhoneModel CurrentModel;
         private Action<PhoneInterfaces?> RequestModeSwitch;

ViewModels/NotImplementedViewModel.cs

@@ -20,7 +20,7 @@
 
 namespace WPinternals
 {
-    internal class NotImplementedViewModel: ContextViewModel
+    internal class NotImplementedViewModel : ContextViewModel
     {
         internal string Message { get; set; }
 

ViewModels/PhoneNotifierViewModel.cs

@@ -256,7 +256,8 @@ namespace WPinternals
                     // It is not possible to invoke COM objects from a WndProc.
                     // MassStorage uses ManagementObjectSearcher, which is a COM object.
                     // Therefore we use a new thread.
-                    ThreadPool.QueueUserWorkItem(s => {
+                    ThreadPool.QueueUserWorkItem(s =>
+                    {
                         lock (ModelLock)
                         {
                             if (!(CurrentModel is MassStorage))
@@ -392,7 +393,8 @@ namespace WPinternals
                 (e.DevicePath.IndexOf("VID_05C6&PID_9008", StringComparison.OrdinalIgnoreCase) >= 0) ||
                 (e.DevicePath.IndexOf(@"disk&ven_qualcomm&prod_mmc_storage", StringComparison.OrdinalIgnoreCase) >= 0) ||
                 (e.DevicePath.IndexOf(@"DISK&VEN_MSFT&PROD_PHONE_MMC_STOR", StringComparison.OrdinalIgnoreCase) >= 0)
-            ) {
+            )
+            {
                 if (CurrentInterface != null)
                     LastInterface = CurrentInterface;
                 CurrentInterface = null;

ViewModels/RestoreSourceSelectionViewModel.cs

@@ -23,7 +23,7 @@ using System.Threading;
 
 namespace WPinternals
 {
-    internal class RestoreSourceSelectionViewModel: ContextViewModel
+    internal class RestoreSourceSelectionViewModel : ContextViewModel
     {
         private PhoneNotifierViewModel PhoneNotifier;
         private Action<string, string, string> RestoreCallback;

ViewModels/RestoreViewModel.cs

@@ -24,7 +24,7 @@ using System.Threading;
 
 namespace WPinternals
 {
-    internal class RestoreViewModel: ContextViewModel
+    internal class RestoreViewModel : ContextViewModel
     {
         private PhoneNotifierViewModel PhoneNotifier;
         private Action Callback;

ViewModels/SwitchModeViewModel.cs

@@ -30,7 +30,7 @@ namespace WPinternals
     internal delegate void ModeSwitchErrorHandler(string Message);
     internal delegate void ModeSwitchSuccessHandler(IDisposable NewModel, PhoneInterfaces NewInterface);
 
-    internal class SwitchModeViewModel: ContextViewModel
+    internal class SwitchModeViewModel : ContextViewModel
     {
         protected PhoneNotifierViewModel PhoneNotifier;
         protected IDisposable CurrentModel;
@@ -149,7 +149,8 @@ namespace WPinternals
             }
             else
             {
-                UIContext.Post(s => {
+                UIContext.Post(s =>
+                {
                     ModeSwitchProgress(Message, SubMessage);
                     SetWorkingStatus(Message, SubMessage);
                 }, null);

WPinternalsConfig.cs

@@ -22,9 +22,8 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Xml.Serialization;
 using System.Security.Cryptography;
-using System.Windows;
+using System.Xml.Serialization;
 
 namespace WPinternals
 {