[REF] minor changes to import and export functions