Add new toString method.
Fix missing @return on toString