Cleanup + stringbuilder changes