Cleaned up PolygonTool