Refactor journalist-import