Fixed: return Polygon, use calcPoints and code style