Update toString() encapsulation