fixing #26: code cleanup

No :smile: 

It's updated later down in a thread-safe manner using `.Concat(...)` and replaced.