Cleaned up Polygon class