more refactoring and explanations in importers