refactor import logic