lots of cleanups to the voronoi example