Refactor and fix string concat typo