reduced the 'reTrimSpace' in the non QSA fork and made it independent