Updated string formatting