Refactored out uses of StringBuilder