Refactor Inport