Cleaning up with curve class