Curve Interpolation + cleanup