diff --git a/src/_impl/_archimedean_spiral_impl.scad b/src/_impl/_archimedean_spiral_impl.scad
index 770fb872..5c453fe3 100644
--- a/src/_impl/_archimedean_spiral_impl.scad
+++ b/src/_impl/_archimedean_spiral_impl.scad
@@ -1,26 +1,23 @@
 use <../util/radians.scad>;
 use <../util/degrees.scad>;
 
-function _radian_step(b, theta, dist) =
-    let(r_square = (b * theta) ^ 2)
-    radians(acos(1 - dist ^ 2 / (2 * r_square)));
+function _radian_step(b, radian, pow2_dist) =
+    radians(acos(1 - pow2_dist / (2 * (b * radian) ^ 2)));
 
-function _find_radians(b, point_distance, rads, n, count = 1) =
-    let(pre_rads = rads[count - 1])
-    count == n ? rads : (
-        _find_radians(
-            b, 
-            point_distance, 
-            [each rads, pre_rads + _radian_step(b, pre_rads, point_distance)], 
-            n,
-            count + 1
-        ) 
-    );
+function _find_radians(b, pow2_dist, init_radian, n) = 
+    [
+        for(
+            count = 0, radian = init_radian; 
+            count < n; 
+            count = count + 1, radian = radian + _radian_step(b, radian, pow2_dist)
+        )
+        radian
+    ];
 
 function _archimedean_spiral_impl(arm_distance, init_angle, point_distance, num_of_points, rt_dir) =
     let(b = arm_distance / (2 * PI), init_radian = radians(init_angle), sgn = rt_dir == "CT_CLK" ? 1 : -1)
     [
-        for(theta = _find_radians(b, point_distance, [init_radian], num_of_points)) 
-        let(r = b * theta, a = degrees(sgn * theta))
+        for(radian = _find_radians(b, point_distance ^ 2, init_radian, num_of_points)) 
+        let(r = b * radian, a = degrees(sgn * radian))
         [r * [cos(a), sin(a)], a]
     ];
\ No newline at end of file