* Cleanups (utility methods, better field semantic, uniform parameter order)
* Use new writers in a model
* Removed remains of an old writer
* Not-needed parameters removed, tests fixed