Refactoring the way interpolation is done for a more uniform and clean implementation. (Less error prone)