diff --git a/src/Shared/HandyControlDemo_Shared/Window/TouchDragMoveWindow.xaml.cs b/src/Shared/HandyControlDemo_Shared/Window/TouchDragMoveWindow.xaml.cs
index c767502c..0bdd46a9 100644
--- a/src/Shared/HandyControlDemo_Shared/Window/TouchDragMoveWindow.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/Window/TouchDragMoveWindow.xaml.cs
@@ -29,4 +29,4 @@ namespace HandyControlDemo.Window
             _currentTouchCount++;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Helper/WindowHelper.cs b/src/Shared/HandyControl_Shared/Tools/Helper/WindowHelper.cs
index e9c4d88e..b2808aba 100644
--- a/src/Shared/HandyControl_Shared/Tools/Helper/WindowHelper.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Helper/WindowHelper.cs
@@ -20,7 +20,7 @@ namespace HandyControl.Tools
         /// <returns></returns>
         public static Window GetActiveWindow() => Application.Current.Windows.OfType<Window>().SingleOrDefault(x => x.IsActive);
 
-        private static readonly BitArray _cacheValid = new BitArray((int)InteropValues.CacheSlot.NumSlots);
+        private static readonly BitArray _cacheValid = new BitArray((int) InteropValues.CacheSlot.NumSlots);
 
         private static bool _setDpiX = true;
 
@@ -91,7 +91,7 @@ namespace HandyControl.Tools
                             try
                             {
                                 _dpiX = InteropMethods.GetDeviceCaps(new HandleRef(null, dc), InteropValues.LOGPIXELSX);
-                                _cacheValid[(int)InteropValues.CacheSlot.DpiX] = true;
+                                _cacheValid[(int) InteropValues.CacheSlot.DpiX] = true;
                             }
                             finally
                             {
@@ -114,9 +114,9 @@ namespace HandyControl.Tools
             {
                 lock (_cacheValid)
                 {
-                    while (!_cacheValid[(int)InteropValues.CacheSlot.WindowResizeBorderThickness])
+                    while (!_cacheValid[(int) InteropValues.CacheSlot.WindowResizeBorderThickness])
                     {
-                        _cacheValid[(int)InteropValues.CacheSlot.WindowResizeBorderThickness] = true;
+                        _cacheValid[(int) InteropValues.CacheSlot.WindowResizeBorderThickness] = true;
 
                         var frameSize = new Size(InteropMethods.GetSystemMetrics(InteropValues.SM.CXSIZEFRAME), InteropMethods.GetSystemMetrics(InteropValues.SM.CYSIZEFRAME));
                         var frameSizeInDips = DpiHelper.DeviceSizeToLogical(frameSize, DpiX / 96.0, Dpi / 96.0);
@@ -143,7 +143,7 @@ namespace HandyControl.Tools
                 InteropMethods.ReleaseDC(IntPtr.Zero, hdc);
                 return WindowResizeBorderThickness.Add(new Thickness((autoHide ? - 4 : 4) * scale));
 #else
-                return WindowResizeBorderThickness.Add(new Thickness(autoHide ? - 4 : 4));
+                return WindowResizeBorderThickness.Add(new Thickness(autoHide ? -4 : 4));
 #endif
             }
         }
diff --git a/src/Shared/HandyControl_Shared/Tools/Interop/InteropValues.cs b/src/Shared/HandyControl_Shared/Tools/Interop/InteropValues.cs
index d2c29d36..94fe3437 100644
--- a/src/Shared/HandyControl_Shared/Tools/Interop/InteropValues.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Interop/InteropValues.cs
@@ -35,7 +35,7 @@ namespace HandyControl.Tools.Interop
             PLANES = 14,
             BI_RGB = 0,
             DIB_RGB_COLORS = 0,
-            E_FAIL = unchecked((int)0x80004005),
+            E_FAIL = unchecked((int) 0x80004005),
             NIF_MESSAGE = 0x00000001,
             NIF_ICON = 0x00000002,
             NIF_TIP = 0x00000004,
@@ -233,10 +233,10 @@ namespace HandyControl.Tools.Interop
 
             public RECT(Rect rect)
             {
-                Left = (int)rect.Left;
-                Top = (int)rect.Top;
-                Right = (int)rect.Right;
-                Bottom = (int)rect.Bottom;
+                Left = (int) rect.Left;
+                Top = (int) rect.Top;
+                Right = (int) rect.Right;
+                Bottom = (int) rect.Bottom;
             }
 
             public Point Position => new Point(Left, Top);
@@ -717,11 +717,11 @@ namespace HandyControl.Tools.Interop
             [return: MarshalAs(UnmanagedType.I8)]
             long CopyTo([In, MarshalAs(UnmanagedType.Interface)] IStream pstm, [In, MarshalAs(UnmanagedType.I8)] long cb, [Out, MarshalAs(UnmanagedType.LPArray)] long[] pcbRead);
 
-            void Commit([In]int grfCommitFlags);
+            void Commit([In] int grfCommitFlags);
 
             void Revert();
 
-            void LockRegion([In, MarshalAs(UnmanagedType.I8)]long libOffset, [In, MarshalAs(UnmanagedType.I8)] long cb, [In] int dwLockType);
+            void LockRegion([In, MarshalAs(UnmanagedType.I8)] long libOffset, [In, MarshalAs(UnmanagedType.I8)] long cb, [In] int dwLockType);
 
             void UnlockRegion([In, MarshalAs(UnmanagedType.I8)] long libOffset, [In, MarshalAs(UnmanagedType.I8)] long cb, [In] int dwLockType);
 
@@ -820,7 +820,7 @@ namespace HandyControl.Tools.Interop
                     while (written < cb)
                     {
                         var toRead = bufsize;
-                        if (written + toRead > cb) toRead = (int)(cb - written);
+                        if (written + toRead > cb) toRead = (int) (cb - written);
                         var read = Read(buffer, toRead);
                         if (read == 0) break;
                         if (pstm.Write(buffer, read) != read)
@@ -1061,4 +1061,4 @@ namespace HandyControl.Tools.Interop
             SWP_SHOWWINDOW = 0x0040
         }
     }
-}
\ No newline at end of file
+}