Yup, that's way more intuitive, and removes the artifact of the first circle looking like the points are clustered around the middle:
I forked it: https://openprocessing.org/sketch/1929579
I forked it with similar idea:
https://openprocessing.org/sketch/1929687
(i am to lazy to register to make a fork, here is the code change):
replace:
with: in every block