Refactoring of curve