code clean up and curve instrument market data