+ refactor csv-file generator little bit