Fix import and refactor.