Code refactoring for Curve Bootstrap