In the final stages
Cleanup to_s output