Modularised string generation and a few changes