Changed some String formatting