Refactor concatenations

- [x] Replace "+" by "%" concatenations