Bugfix.
Bugfix
reformat toString
refactor