Applied interpolation. Minor re-factor.