cleaning up of the toString() functions