Few updates in the toString methods