Removed string concat where it is not needed