Improved #toString