use Exporter. Cleanup indirect calls