Tidy up string interpolation