Replace StringBuilder with more efficient String concatenation (re-do)