ocd
refactor interpolation 'calls'