Clean up some string interpolation