#JC-1202 small refactoring - extra toString() were removed