refactor import