Cleaned up Curve