Refactor and added CSVExporter class