Refactor makePolygonal()