Improved the .toString method