Build strings smarter
Separate steps