Refactor the Exporter object