diff --git a/extra/cfdg/models/game1-turn6/game1-turn6.factor b/extra/cfdg/models/game1-turn6/game1-turn6.factor
index 3e0994112a..5e512cd74a 100644
--- a/extra/cfdg/models/game1-turn6/game1-turn6.factor
+++ b/extra/cfdg/models/game1-turn6/game1-turn6.factor
@@ -6,29 +6,35 @@ IN: cfdg.models.game1-turn6
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-: f-triangles ( -- ) iterate? [
-[ 0.1 x 0.1 y -0.33 alpha 20 hue 0.7 sat 0.8 b triangle ] do
-[ 10 hue 0.9 sat 0.33 b triangle ] do
-[ 0.9 s 10 hue 0.5 sat 1 b triangle ] do
-[ 0.8 s 5 r f-triangles ] do
-] when ;
+: f-triangles ( -- )
+  {
+    [ 0.1 x 0.1 y -0.33 alpha 20 hue 0.7 sat 0.80 b triangle ]
+    [                         10 hue 0.9 sat 0.33 b triangle ]
+    [ 0.9 s                   10 hue 0.5 sat 1.00 b triangle ]
+    [ 0.8 s 5 r f-triangles ]
+  }
+  rule ;
 
-: f-squares ( -- ) iterate? [
-[ 0.1 x 0.1 y -0.33 alpha 250 hue 0.7 sat 0.8 b square ] do
-[ 220 hue 0.9 sat 0.33 b square ] do
-[ 0.9 s 220 hue 0.25 sat 1 b square ] do
-[ 0.8 s 5 r f-squares ] do
-] when ;
+: f-squares ( -- )
+  {
+    [ 0.1 x 0.1 y -0.33 alpha 250 hue 0.70 sat 0.80 b square ]
+    [                         220 hue 0.90 sat 0.33 b square ]
+    [ 0.9 s                   220 hue 0.25 sat 1.00 b square ]
+    [ 0.8 s 5 r f-squares ]
+  }
+  rule ;
 
 DEFER: start
 
-: spiral ( -- ) iterate? [
-  { { 1 [ f-squares
-          [ 0.5 x 0.5 y 45 r f-triangles ] do
-          [ 1 y 25 r 0.9 s spiral ] do ] }
-    { 0.022 [ [ 90 flip 50 hue start ] do ] } }
-  call-random-weighted
-] when ;
+: spiral ( -- )
+  {
+    { 1 [ f-squares ]
+        [ 0.5 x 0.5 y 45 r f-triangles ]
+        [ 1 y 25 r 0.9 s spiral ] }
+            
+    { 0.022 [ 90 flip 50 hue start ] }
+  }
+  rules ;
 
 : start ( -- )
   [       spiral ] do
diff --git a/extra/cfdg/models/spirales/spirales.factor b/extra/cfdg/models/spirales/spirales.factor
index 985c21643e..f804b6ba83 100644
--- a/extra/cfdg/models/spirales/spirales.factor
+++ b/extra/cfdg/models/spirales/spirales.factor
@@ -7,33 +7,19 @@ DEFER: line
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-: block ( -- )
-  [
-    [ circle ] do
-    [ 0.3 s 60 flip line ] do
-  ]
-  recursive ;
+: block ( -- ) { [ circle ] [ 0.3 s 60 flip line ] } rule ;
 
-: a1 ( -- )
-  [
-    [ 0.95 s 2 x 12 r 0.5 b 10 hue 1.5 sat a1 ] do
-    [ block ] do
-  ]
-  recursive ;
+: a1 ( -- ) { [ 0.95 s 2 x 12 r 0.5 b 10 hue 1.5 sat a1 ] [ block ] } rule ;
 
-: line ( -- )
-  -0.3 a
-  [   0 rotate a1 ] do
-  [ 120 rotate a1 ] do
-  [ 240 rotate a1 ] do ;
+: line ( -- ) -0.3 a { [ 0 r a1 ] [ 120 r a1 ] [ 240 r a1 ] } rule ;
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 : init ( -- )
-  [ -1 b ] >background
-  { -20 40 -20 40 } viewport set
-  [ line ] >start-shape
-  0.03 >threshold ;
+  [ -1 b ]          >background
+  { -20 40 -20 40 } >viewport
+  [ line ]          >start-shape
+  0.04              >threshold ;
 
 : run ( -- ) [ init ] cfdg-window. ;