[REFACTOR] Output building

[hamburghammer]

Refactor the building of the final output to use directly the JSON marshal function. This option should prevent formatting errors that might occur inside the current implementation where the JSON is build from hand.