change string concat for speed
Cleanup after merge.