[MOD] Options, CSV, JSON: refactorings