More string formatting changes