make concat more cleaner
make template more readable