Updated toString
Formatting