Remove large string concatenation