Refactor import.