diff --git a/src/OpenTK/Audio/OpenAL/Alc/Alc.cs b/src/OpenTK/Audio/OpenAL/Alc/Alc.cs
index a49f4d31..ef6d39a7 100644
--- a/src/OpenTK/Audio/OpenAL/Alc/Alc.cs
+++ b/src/OpenTK/Audio/OpenAL/Alc/Alc.cs
@@ -435,7 +435,7 @@ namespace OpenTK.Audio.OpenAL
         /// <param name="buffer">a buffer, which must be large enough to accommodate the number of samples.</param>
         /// <param name="samples">the number of samples to be retrieved.</param>
         [CLSCompliant(false)]
-        public static void CaptureSamples<T>(IntPtr device, T[, ,] buffer, int samples)
+        public static void CaptureSamples<T>(IntPtr device, T[,,] buffer, int samples)
             where T : struct
         {
             CaptureSamples(device, ref buffer[0, 0, 0], samples);
diff --git a/src/OpenTK/BlittableValueType.cs b/src/OpenTK/BlittableValueType.cs
index 2c1a362f..264aa83f 100644
--- a/src/OpenTK/BlittableValueType.cs
+++ b/src/OpenTK/BlittableValueType.cs
@@ -178,7 +178,7 @@ namespace OpenTK
         /// <param name="type">An instance of the type to check.</param>
         /// <returns>True if T is blittable; false otherwise.</returns>
         [CLSCompliant(false)]
-        public static bool Check<T>(T[, ,] type)
+        public static bool Check<T>(T[,,] type)
         {
             return BlittableValueType<T>.Check();
         }
@@ -255,7 +255,7 @@ namespace OpenTK
         /// <returns>An integer, specifying the size of the type in bytes.</returns>
         /// <exception cref="System.ArgumentException">Occurs when type is not blittable.</exception>
         [CLSCompliant(false)]
-        public static int StrideOf<T>(T[, ,] type)
+        public static int StrideOf<T>(T[,,] type)
         {
             if (!Check(type))
             {
diff --git a/src/OpenTK/Platform/MacOS/HIDInput.cs b/src/OpenTK/Platform/MacOS/HIDInput.cs
index 846171a3..705f862e 100644
--- a/src/OpenTK/Platform/MacOS/HIDInput.cs
+++ b/src/OpenTK/Platform/MacOS/HIDInput.cs
@@ -1022,7 +1022,7 @@ namespace OpenTK.Platform.MacOS
                 }
                 else
                 {
-                    float f1 = (float)x; 
+                    float f1 = (float)x;
                     float f2 = (float)y;
                     p.X.Value = *(IntPtr *)&f1;
                     p.Y.Value = *(IntPtr *)&f2;
@@ -1599,7 +1599,7 @@ namespace OpenTK.Platform.MacOS
             Key.Unknown, /* Volume Up */
             Key.Unknown, /* Volume Down */
             Key.CapsLock, /* Locking Caps Lock */
-            Key.NumLock , /* Locking Num Lock */
+            Key.NumLock, /* Locking Num Lock */
             Key.ScrollLock, /* Locking Scroll Lock */
             Key.KeypadDecimal, /* Keypad Comma */
             Key.Unknown, /* Keypad Equal Sign for AS/400 */
diff --git a/src/OpenTK/Platform/MacOS/Quartz/DisplayServices.cs b/src/OpenTK/Platform/MacOS/Quartz/DisplayServices.cs
index f05e0082..df8acf4b 100644
--- a/src/OpenTK/Platform/MacOS/Quartz/DisplayServices.cs
+++ b/src/OpenTK/Platform/MacOS/Quartz/DisplayServices.cs
@@ -81,28 +81,28 @@ namespace OpenTK.Platform.MacOS
         [DllImport(lib, EntryPoint = "CGDisplayBounds")]
         private unsafe static extern void DisplayBounds(out NSRect rect, IntPtr display);
 
-        [DllImport(lib,EntryPoint="CGDisplayPixelsWide")]
+        [DllImport(lib, EntryPoint="CGDisplayPixelsWide")]
         internal static extern int DisplayPixelsWide(IntPtr display);
 
-        [DllImport(lib,EntryPoint="CGDisplayPixelsHigh")]
+        [DllImport(lib, EntryPoint="CGDisplayPixelsHigh")]
         internal static extern int DisplayPixelsHigh(IntPtr display);
 
-        [DllImport(lib,EntryPoint="CGDisplayCurrentMode")]
+        [DllImport(lib, EntryPoint="CGDisplayCurrentMode")]
         internal static extern IntPtr DisplayCurrentMode(IntPtr display);
 
-        [DllImport(lib,EntryPoint="CGDisplayCapture")]
+        [DllImport(lib, EntryPoint="CGDisplayCapture")]
         internal static extern CGDisplayErr DisplayCapture(IntPtr display);
 
-        [DllImport(lib,EntryPoint="CGCaptureAllDisplays")]
+        [DllImport(lib, EntryPoint="CGCaptureAllDisplays")]
         internal static extern CGDisplayErr CaptureAllDisplays();
 
-        [DllImport(lib,EntryPoint="CGShieldingWindowLevel")]
+        [DllImport(lib, EntryPoint="CGShieldingWindowLevel")]
         internal static extern uint ShieldingWindowLevel();
 
-        [DllImport(lib,EntryPoint="CGDisplayRelease")]
+        [DllImport(lib, EntryPoint="CGDisplayRelease")]
         internal static extern CGDisplayErr DisplayRelease(IntPtr display);
 
-        [DllImport(lib,EntryPoint="CGReleaseAllDisplays")]
+        [DllImport(lib, EntryPoint="CGReleaseAllDisplays")]
         internal static extern CGDisplayErr DisplayReleaseAll();
 
         [DllImport(lib, EntryPoint = "CGDisplayAvailableModes")]
diff --git a/src/OpenTK/Platform/Windows/WinGraphicsMode.cs b/src/OpenTK/Platform/Windows/WinGraphicsMode.cs
index c0633f3c..0835edcd 100644
--- a/src/OpenTK/Platform/Windows/WinGraphicsMode.cs
+++ b/src/OpenTK/Platform/Windows/WinGraphicsMode.cs
@@ -59,7 +59,7 @@ namespace OpenTK.Platform.Windows
         public GraphicsMode SelectGraphicsMode(ColorFormat color, int depth, int stencil, int samples,
             ColorFormat accum, int buffers, bool stereo)
         {
-            GraphicsMode mode = new GraphicsMode(color, depth, stencil, samples,accum, buffers, stereo);
+            GraphicsMode mode = new GraphicsMode(color, depth, stencil, samples, accum, buffers, stereo);
             GraphicsMode created_mode = ChoosePixelFormatARB(Device, mode);
 
             // If ChoosePixelFormatARB failed, iterate through all acceleration types in turn (ICD, MCD, None)
diff --git a/src/OpenTK/Platform/Windows/WinRawJoystick.cs b/src/OpenTK/Platform/Windows/WinRawJoystick.cs
index fe09fa2f..233a640f 100644
--- a/src/OpenTK/Platform/Windows/WinRawJoystick.cs
+++ b/src/OpenTK/Platform/Windows/WinRawJoystick.cs
@@ -51,7 +51,7 @@ namespace OpenTK.Platform.Windows
             internal readonly int XInputIndex;
 
             private readonly Dictionary<int, int> axes =
-                new Dictionary<int,int>();
+                new Dictionary<int, int>();
 
             private readonly Dictionary<int, int> buttons =
                 new Dictionary<int, int>();
diff --git a/src/OpenTK/Platform/X11/API.cs b/src/OpenTK/Platform/X11/API.cs
index 7f52d79b..0628fca1 100644
--- a/src/OpenTK/Platform/X11/API.cs
+++ b/src/OpenTK/Platform/X11/API.cs
@@ -1171,7 +1171,7 @@ XF86VidModeGetGammaRampSize(
         XF86MenuKB = 0x1008ff65,
         XF86Calculator = 0x1008ff1d,
         XF86Sleep = 0x1008ff2f,
-        XF86WakeUp = 0x1008ff2b ,
+        XF86WakeUp = 0x1008ff2b,
         XF86Explorer = 0x1008ff5d,
         XF86Send = 0x1008ff7b,
         XF86Xfer = 0x1008ff8a,
@@ -1190,7 +1190,7 @@ XF86VidModeGetGammaRampSize(
         XF86Favorites = 0x1008ff30,
         XF86MyComputer = 0x1008ff33,
         XF86Back = 0x1008ff26,
-        XF86Forward = 0x1008ff27 ,
+        XF86Forward = 0x1008ff27,
         XF86Eject = 0x1008ff2c,
         XF86AudioPlay = 0x1008ff14,
         XF86AudioStop = 0x1008ff15,