Refactoring for Voronoi Map generation