Refactor importer

Thank you for your contribution!