Improve string interpolation