Minor improvement on Exporter class