Not related to this changes, but a StringBuilder could be used here