Factorized interpolation and smoothing in separate function, debugged code, simplified/reduced a couple of methods.