Cleanup of toString()