DEV: Beginning of volatility surface code refactoring