string concat cleanup again