Clean up string generation code

[tzussman]

Redefines the same functions over and over again, should also reuse code where possible