minor refactor on setup_import