Refactor concatenations