diff --git a/src/pixie.nim b/src/pixie.nim
index d8221cb..822f11a 100644
--- a/src/pixie.nim
+++ b/src/pixie.nim
@@ -1,8 +1,7 @@
 import bumpy, chroma, flatty/binny, os, pixie/blends, pixie/common,
     pixie/context, pixie/fileformats/bmp, pixie/fileformats/gif,
     pixie/fileformats/jpg, pixie/fileformats/png, pixie/fileformats/svg,
-    pixie/fonts, pixie/images, pixie/masks, pixie/paints, pixie/paths, strutils,
-    vmath
+    pixie/fonts, pixie/images, pixie/masks, pixie/paints, pixie/paths, strutils, vmath
 
 export blends, bumpy, chroma, common, context, fonts, images, masks, paints,
     paths, vmath
diff --git a/src/pixie/context.nim b/src/pixie/context.nim
index ab58f8d..fd81133 100644
--- a/src/pixie/context.nim
+++ b/src/pixie/context.nim
@@ -296,13 +296,13 @@ proc clearRect*(ctx: Context, rect: Rect) =
   if ctx.layer != nil:
     ctx.layer.fillPath(
       path,
-      Paint(kind: pkSolid, color:rgbx(0, 0, 0, 0), blendMode: bmOverwrite),
+      Paint(kind: pkSolid, color: rgbx(0, 0, 0, 0), blendMode: bmOverwrite),
       ctx.mat
     )
   else:
     ctx.image.fillPath(
       path,
-      Paint(kind: pkSolid, color:rgbx(0, 0, 0, 0), blendMode: bmOverwrite),
+      Paint(kind: pkSolid, color: rgbx(0, 0, 0, 0), blendMode: bmOverwrite),
       ctx.mat
     )
 
diff --git a/src/pixie/demo.nim b/src/pixie/demo.nim
index 284e947..7520da8 100644
--- a/src/pixie/demo.nim
+++ b/src/pixie/demo.nim
@@ -1,7 +1,6 @@
-import opengl, pixie, pixie/context
-import staticglfw except Image
-export pixie
-export staticglfw except Image
+import opengl, pixie, pixie/context, staticglfw except Image
+
+export pixie, staticglfw except Image
 
 var
   dpi: float32 = 1.0
diff --git a/src/pixie/fileformats/svg.nim b/src/pixie/fileformats/svg.nim
index c460ed5..62425ef 100644
--- a/src/pixie/fileformats/svg.nim
+++ b/src/pixie/fileformats/svg.nim
@@ -1,7 +1,7 @@
 ## Load SVG files.
 
-import chroma, pixie/common, pixie/images, pixie/paths, pixie/paints, strutils, vmath,
-    xmlparser, xmltree
+import chroma, pixie/common, pixie/images, pixie/paints, pixie/paths, strutils,
+    vmath, xmlparser, xmltree
 
 const
   xmlSignature* = "<?xml"
diff --git a/tests/test_context.nim b/tests/test_context.nim
index 8c1f499..744f2da 100644
--- a/tests/test_context.nim
+++ b/tests/test_context.nim
@@ -408,7 +408,6 @@ block:
 
   ctx.image.writeFile("tests/images/context/clip_1e.png")
 
-
 block:
   let ctx = newContext(newImage(300, 150))
 
diff --git a/tests/test_paths.nim b/tests/test_paths.nim
index 93d2d8e..8d2f96e 100644
--- a/tests/test_paths.nim
+++ b/tests/test_paths.nim
@@ -47,7 +47,7 @@ block:
     image = newImage(100, 100)
     pathStr = "M 10 10 L 90 90"
     color = rgba(255, 0, 0, 255)
-  image.strokePath(pathStr, color, strokeWidth=10)
+  image.strokePath(pathStr, color, strokeWidth = 10)
   image.writeFile("tests/images/paths/pathStroke1.png")
 
 block:
@@ -55,7 +55,7 @@ block:
     image = newImage(100, 100)
     pathStr = "M 10 10 L 50 60 90 90"
     color = rgba(255, 0, 0, 255)
-  image.strokePath(pathStr, color, strokeWidth=10)
+  image.strokePath(pathStr, color, strokeWidth = 10)
   image.writeFile("tests/images/paths/pathStroke2.png")
 
 block:
@@ -268,12 +268,12 @@ block:
 
   image.strokePath(
     path, rgba(0, 0, 0, 255), vec2(5, 25), 10, lcButt, ljBevel,
-    dashes = @[2.float32,2]
+    dashes = @[2.float32, 2]
   )
 
   image.strokePath(
     path, rgba(0, 0, 0, 255), vec2(5, 45), 10, lcButt, ljBevel,
-    dashes = @[4.float32,4]
+    dashes = @[4.float32, 4]
   )
 
   image.strokePath(