diff --git a/spacy/ml/models/__init__.py b/spacy/ml/models/__init__.py
index 01a8e7454..5125018e5 100644
--- a/spacy/ml/models/__init__.py
+++ b/spacy/ml/models/__init__.py
@@ -1,8 +1,8 @@
 from .entity_linker import *  # noqa
 from .multi_task import *  # noqa
 from .parser import *  # noqa
-from .spancat import *  # noqa
 from .span_finder import *  # noqa
+from .spancat import *  # noqa
 from .tagger import *  # noqa
 from .textcat import *  # noqa
 from .tok2vec import *  # noqa
diff --git a/spacy/ml/models/span_finder.py b/spacy/ml/models/span_finder.py
index 62ddd9eb5..836387a9d 100644
--- a/spacy/ml/models/span_finder.py
+++ b/spacy/ml/models/span_finder.py
@@ -1,9 +1,11 @@
 from typing import Callable, List, Tuple
-from thinc.api import Model, chain, with_array
-from thinc.types import Floats2d, Floats1d
-from spacy.tokens import Doc
-from ...util import registry
 
+from thinc.api import Model, chain, with_array
+from thinc.types import Floats1d, Floats2d
+
+from spacy.tokens import Doc
+
+from ...util import registry
 
 InT = List[Doc]
 OutT = Floats2d
diff --git a/spacy/pipeline/__init__.py b/spacy/pipeline/__init__.py
index 70d97afab..ec941b945 100644
--- a/spacy/pipeline/__init__.py
+++ b/spacy/pipeline/__init__.py
@@ -2,22 +2,22 @@ from .attributeruler import AttributeRuler
 from .dep_parser import DependencyParser
 from .edit_tree_lemmatizer import EditTreeLemmatizer
 from .entity_linker import EntityLinker
-from .ner import EntityRecognizer
 from .entityruler import EntityRuler
+from .functions import merge_entities, merge_noun_chunks, merge_subtokens
 from .lemmatizer import Lemmatizer
 from .morphologizer import Morphologizer
+from .ner import EntityRecognizer
 from .pipe import Pipe
-from .trainable_pipe import TrainablePipe
-from .senter import SentenceRecognizer
 from .sentencizer import Sentencizer
+from .senter import SentenceRecognizer
+from .span_finder import SpanFinder
+from .span_ruler import SpanRuler
+from .spancat import SpanCategorizer
 from .tagger import Tagger
 from .textcat import TextCategorizer
-from .spancat import SpanCategorizer
-from .span_ruler import SpanRuler
-from .span_finder import SpanFinder
 from .textcat_multilabel import MultiLabel_TextCategorizer
 from .tok2vec import Tok2Vec
-from .functions import merge_entities, merge_noun_chunks, merge_subtokens
+from .trainable_pipe import TrainablePipe
 
 __all__ = [
     "AttributeRuler",
diff --git a/spacy/pipeline/span_finder.py b/spacy/pipeline/span_finder.py
index 6822607c8..1679a6cdf 100644
--- a/spacy/pipeline/span_finder.py
+++ b/spacy/pipeline/span_finder.py
@@ -1,18 +1,19 @@
-from typing import List, Dict, Callable, Tuple, Optional, Iterable, Any, cast
 from functools import partial
-from thinc.api import Config, Model, set_dropout_rate
-from thinc.api import Optimizer, get_current_ops, Ops
-from thinc.types import Floats2d, Ragged, Ints1d
+from typing import Any, Callable, Dict, Iterable, List, Optional, Tuple, cast
+
+from thinc.api import (Config, Model, Ops, Optimizer, get_current_ops,
+                       set_dropout_rate)
+from thinc.types import Floats2d, Ints1d, Ragged
 
 from spacy.language import Language
 from spacy.pipeline.trainable_pipe import TrainablePipe
+from spacy.scorer import Scorer
 from spacy.tokens import Doc
 from spacy.training import Example
-from spacy.scorer import Scorer
+
 from ..util import registry
 from .spancat import Suggester
 
-
 span_finder_default_config = """
 [model]
 @architectures = "spacy.SpanFinder.v1"
diff --git a/spacy/tests/pipeline/test_span_finder.py b/spacy/tests/pipeline/test_span_finder.py
index d5c801210..66065688f 100644
--- a/spacy/tests/pipeline/test_span_finder.py
+++ b/spacy/tests/pipeline/test_span_finder.py
@@ -1,13 +1,13 @@
-from spacy.language import Language
-from spacy.util import registry
-from spacy.tokens import Doc
-from spacy.training import Example
+import pytest
 from thinc.api import Config
 from thinc.types import Ragged
-from spacy.pipeline.span_finder import DEFAULT_PREDICTED_KEY
-from spacy.pipeline.span_finder import span_finder_default_config
-import pytest
 
+from spacy.language import Language
+from spacy.pipeline.span_finder import (DEFAULT_PREDICTED_KEY,
+                                        span_finder_default_config)
+from spacy.tokens import Doc
+from spacy.training import Example
+from spacy.util import registry
 
 TRAINING_KEY = "pytest"