refactorings in Importers.scala