Cleanup, now using StringBuilder