Improved toString
white space