refactor; optimized importer