SONAR-3024 Improve toString