diff --git a/src/bauer_spiral.scad b/src/bauer_spiral.scad
index 5d33d56c..8673b86f 100644
--- a/src/bauer_spiral.scad
+++ b/src/bauer_spiral.scad
@@ -19,11 +19,9 @@ function bauer_spiral(n, radius = 1, rt_dir = "CT_CLK") =
     [
         for(k = 1; k <= n; k = k + 1)
         let(
-            z = 1 - (2 * k - 1) / n,
+            z = 1 - (2 * k - 1) / n,   // cos_phi
             sin_phi = sqrt(1 - z ^ 2),
-            theta = clk * L * acos(z),
-            x = sin_phi * cos(theta),
-            y = sin_phi * sin(theta)
+            theta = clk * L * acos(z)
         )
-        [x, y, z] * radius
+        [sin_phi * cos(theta), sin_phi * sin(theta), z] * radius
     ];
\ No newline at end of file
diff --git a/src/fibonacci_lattice.scad b/src/fibonacci_lattice.scad
index c7ad3f4d..2518c85f 100644
--- a/src/fibonacci_lattice.scad
+++ b/src/fibonacci_lattice.scad
@@ -18,10 +18,9 @@ function fibonacci_lattice(n, radius = 1, dir = "CT_CLK") =
     [
         for(i = [0:n - 1])
         let(
-            z = 1 - (2 * i + 1) / n,
-            r = sqrt(1 - z ^ 2),
-            theta = phi * i * clk,
-            deg = degrees(theta)
+            z = 1 - (2 * i + 1) / n,        // cos_phi
+            sin_phi = sqrt(1 - z ^ 2),
+            theta = clk * i * degrees(phi)
         )
-        [cos(deg) * r, sin(deg) * r, z] * radius
+        [cos(theta) * sin_phi, sin(theta) * sin_phi, z] * radius
     ];
\ No newline at end of file