Added string formatting