Update to use a single StringBuilder