Refactor for string interpolation