diff --git a/bonobo/_api.py b/bonobo/_api.py
index a960cbc..f5463c7 100644
--- a/bonobo/_api.py
+++ b/bonobo/_api.py
@@ -13,7 +13,7 @@ from bonobo.nodes import __all__ as _all_nodes
 from bonobo.registry import create_reader, create_writer
 from bonobo.structs.graphs import Graph
 from bonobo.util.api import ApiHelper
-from bonobo.util.environ import parse_args, get_argument_parser
+from bonobo.util.environ import get_argument_parser, parse_args
 
 __all__ = []
 
diff --git a/bonobo/commands/convert.py b/bonobo/commands/convert.py
index d04e97b..91d540c 100644
--- a/bonobo/commands/convert.py
+++ b/bonobo/commands/convert.py
@@ -1,7 +1,7 @@
 import bonobo
 from bonobo.commands import BaseCommand
 from bonobo.registry import READER, WRITER, default_registry
-from bonobo.util.resolvers import _resolve_transformations, _resolve_options
+from bonobo.util.resolvers import _resolve_options, _resolve_transformations
 
 
 class ConvertCommand(BaseCommand):
diff --git a/bonobo/config/configurables.py b/bonobo/config/configurables.py
index 81defaa..85a89c9 100644
--- a/bonobo/config/configurables.py
+++ b/bonobo/config/configurables.py
@@ -1,5 +1,5 @@
 from bonobo.errors import AbstractError
-from bonobo.util import isoption, iscontextprocessor, sortedlist, get_name
+from bonobo.util import get_name, iscontextprocessor, isoption, sortedlist
 
 __all__ = [
     'Configurable',
diff --git a/bonobo/config/functools.py b/bonobo/config/functools.py
index 7beaf6f..4bf9c31 100644
--- a/bonobo/config/functools.py
+++ b/bonobo/config/functools.py
@@ -1,5 +1,4 @@
 import functools
-
 import itertools
 
 
diff --git a/bonobo/contrib/django/commands.py b/bonobo/contrib/django/commands.py
index ac5f387..e20a3ae 100644
--- a/bonobo/contrib/django/commands.py
+++ b/bonobo/contrib/django/commands.py
@@ -1,12 +1,13 @@
 from logging import getLogger
 from types import GeneratorType
 
+from colorama import Back, Fore, Style
+from django.core.management import BaseCommand
+from django.core.management.base import OutputWrapper
+
 import bonobo
 from bonobo.plugins.console import ConsoleOutputPlugin
 from bonobo.util.term import CLEAR_EOL
-from colorama import Fore, Back, Style
-from django.core.management import BaseCommand
-from django.core.management.base import OutputWrapper
 from mondrian import term
 
 from .utils import create_or_update
diff --git a/bonobo/examples/clock.py b/bonobo/examples/clock.py
index 1977cba..fda1ce7 100644
--- a/bonobo/examples/clock.py
+++ b/bonobo/examples/clock.py
@@ -1,7 +1,8 @@
-import bonobo
 import datetime
 import time
 
+import bonobo
+
 
 def extract():
     """Placeholder, change, rename, remove... """
diff --git a/bonobo/examples/datasets/__main__.py b/bonobo/examples/datasets/__main__.py
index e330dc4..1419a08 100644
--- a/bonobo/examples/datasets/__main__.py
+++ b/bonobo/examples/datasets/__main__.py
@@ -2,9 +2,9 @@ import os
 
 import bonobo
 from bonobo import examples
+from bonobo.examples import get_datasets_dir, get_minor_version, get_services
 from bonobo.examples.datasets.coffeeshops import get_graph as get_coffeeshops_graph
 from bonobo.examples.datasets.fablabs import get_graph as get_fablabs_graph
-from bonobo.examples import get_minor_version, get_datasets_dir, get_services
 
 graph_factories = {
     'coffeeshops': get_coffeeshops_graph,
diff --git a/bonobo/examples/empty.py b/bonobo/examples/empty.py
index e144923..044ab43 100644
--- a/bonobo/examples/empty.py
+++ b/bonobo/examples/empty.py
@@ -1,7 +1,8 @@
-import bonobo
 import datetime
 import time
 
+import bonobo
+
 
 def extract():
     """Placeholder, change, rename, remove... """
diff --git a/bonobo/examples/files/services.py b/bonobo/examples/files/services.py
index 38b61b9..fc8a42f 100644
--- a/bonobo/examples/files/services.py
+++ b/bonobo/examples/files/services.py
@@ -1,4 +1,4 @@
-from bonobo import open_fs, examples
+from bonobo import examples, open_fs
 
 
 def get_services():
diff --git a/bonobo/execution/contexts/graph.py b/bonobo/execution/contexts/graph.py
index 2c5bbd4..e5c6554 100644
--- a/bonobo/execution/contexts/graph.py
+++ b/bonobo/execution/contexts/graph.py
@@ -3,14 +3,15 @@ from functools import partial
 from queue import Empty
 from time import sleep
 
+from whistle import EventDispatcher
+
 from bonobo.config import create_container
-from bonobo.constants import BEGIN, END, EMPTY
+from bonobo.constants import BEGIN, EMPTY, END
 from bonobo.errors import InactiveReadableError
 from bonobo.execution import events
 from bonobo.execution.contexts.base import BaseContext
-from bonobo.execution.contexts.node import NodeExecutionContext, AsyncNodeExecutionContext
+from bonobo.execution.contexts.node import AsyncNodeExecutionContext, NodeExecutionContext
 from bonobo.execution.contexts.plugin import PluginExecutionContext
-from whistle import EventDispatcher
 
 logger = logging.getLogger(__name__)
 
diff --git a/bonobo/execution/contexts/node.py b/bonobo/execution/contexts/node.py
index a34a784..443447d 100644
--- a/bonobo/execution/contexts/node.py
+++ b/bonobo/execution/contexts/node.py
@@ -10,11 +10,11 @@ from bonobo.config.processors import ContextCurrifier
 from bonobo.constants import BEGIN, END, TICK_PERIOD
 from bonobo.errors import InactiveReadableError, UnrecoverableError, UnrecoverableTypeError
 from bonobo.execution.contexts.base import BaseContext
-from bonobo.structs.inputs import Input, AioInput
-from bonobo.structs.tokens import Token, Flag
-from bonobo.util import get_name, isconfigurabletype, ensure_tuple, deprecated
+from bonobo.structs.inputs import AioInput, Input
+from bonobo.structs.tokens import Flag, Token
+from bonobo.util import deprecated, ensure_tuple, get_name, isconfigurabletype
 from bonobo.util.bags import BagType
-from bonobo.util.envelopes import isenvelope, F_NOT_MODIFIED, F_INHERIT
+from bonobo.util.envelopes import F_INHERIT, F_NOT_MODIFIED, isenvelope
 from bonobo.util.statistics import WithStatistics
 
 logger = logging.getLogger(__name__)
diff --git a/bonobo/nodes/aggregation.py b/bonobo/nodes/aggregation.py
index f09cc17..ebdbf47 100644
--- a/bonobo/nodes/aggregation.py
+++ b/bonobo/nodes/aggregation.py
@@ -1,4 +1,4 @@
-from bonobo.config import Configurable, Method, Option, ContextProcessor, use_raw_input
+from bonobo.config import Configurable, ContextProcessor, Method, Option, use_raw_input
 from bonobo.util import ValueHolder
 
 
diff --git a/bonobo/nodes/basics.py b/bonobo/nodes/basics.py
index 9708996..7bdfe24 100644
--- a/bonobo/nodes/basics.py
+++ b/bonobo/nodes/basics.py
@@ -4,7 +4,7 @@ import itertools
 import pprint
 
 from bonobo import settings
-from bonobo.config import Configurable, Option, Method, use_raw_input, use_context, use_no_input
+from bonobo.config import Configurable, Method, Option, use_context, use_no_input, use_raw_input
 from bonobo.config.functools import transformation_factory
 from bonobo.config.processors import ContextProcessor, use_context_processor
 from bonobo.constants import NOT_MODIFIED
diff --git a/bonobo/nodes/filter.py b/bonobo/nodes/filter.py
index 0e0026f..88e3101 100644
--- a/bonobo/nodes/filter.py
+++ b/bonobo/nodes/filter.py
@@ -1,6 +1,5 @@
-from bonobo.constants import NOT_MODIFIED
-
 from bonobo.config import Configurable, Method
+from bonobo.constants import NOT_MODIFIED
 
 
 class Filter(Configurable):
diff --git a/bonobo/nodes/io/file.py b/bonobo/nodes/io/file.py
index 7cbf410..fe5ca37 100644
--- a/bonobo/nodes/io/file.py
+++ b/bonobo/nodes/io/file.py
@@ -1,4 +1,4 @@
-from bonobo.config import Option, ContextProcessor, use_context
+from bonobo.config import ContextProcessor, Option, use_context
 from bonobo.constants import NOT_MODIFIED
 from bonobo.errors import UnrecoverableError
 from bonobo.nodes.io.base import FileHandler, Reader, Writer
diff --git a/bonobo/plugins/console.py b/bonobo/plugins/console.py
index 69a044c..81320b5 100644
--- a/bonobo/plugins/console.py
+++ b/bonobo/plugins/console.py
@@ -1,8 +1,9 @@
 import io
 import sys
-from contextlib import redirect_stdout, redirect_stderr
+from contextlib import redirect_stderr, redirect_stdout
 
-from colorama import Style, Fore, init as initialize_colorama_output_wrappers
+from colorama import Fore, Style
+from colorama import init as initialize_colorama_output_wrappers
 
 from bonobo import settings
 from bonobo.execution import events
diff --git a/bonobo/registry.py b/bonobo/registry.py
index f45da4f..8ef7773 100644
--- a/bonobo/registry.py
+++ b/bonobo/registry.py
@@ -1,8 +1,9 @@
 import mimetypes
-
 import os
 
-from bonobo.nodes import JsonReader, CsvReader, PickleReader, FileReader, FileWriter, PickleWriter, CsvWriter, JsonWriter
+from bonobo.nodes import (
+    CsvReader, CsvWriter, FileReader, FileWriter, JsonReader, JsonWriter, PickleReader, PickleWriter
+)
 
 FILETYPE_CSV = 'text/csv'
 FILETYPE_JSON = 'application/json'
diff --git a/bonobo/settings.py b/bonobo/settings.py
index 684d18c..833dace 100644
--- a/bonobo/settings.py
+++ b/bonobo/settings.py
@@ -1,5 +1,4 @@
 import logging
-
 import os
 
 from bonobo.errors import ValidationError
diff --git a/bonobo/structs/graphs.py b/bonobo/structs/graphs.py
index 292d7b2..4cc939b 100644
--- a/bonobo/structs/graphs.py
+++ b/bonobo/structs/graphs.py
@@ -3,11 +3,12 @@ import json
 from collections import namedtuple
 from copy import copy
 
-from bonobo.constants import BEGIN
-from bonobo.util import get_name
 from graphviz import ExecutableNotFound
 from graphviz.dot import Digraph
 
+from bonobo.constants import BEGIN
+from bonobo.util import get_name
+
 GraphRange = namedtuple('GraphRange', ['graph', 'input', 'output'])
 
 
diff --git a/bonobo/structs/inputs.py b/bonobo/structs/inputs.py
index 646051b..2731000 100644
--- a/bonobo/structs/inputs.py
+++ b/bonobo/structs/inputs.py
@@ -15,8 +15,8 @@
 # limitations under the License.
 
 from abc import ABCMeta, abstractmethod
-from queue import Queue
 from asyncio.queues import Queue as AioQueue
+from queue import Queue
 
 from bonobo.constants import BEGIN, END
 from bonobo.errors import AbstractError, InactiveReadableError, InactiveWritableError
diff --git a/bonobo/util/term.py b/bonobo/util/term.py
index 0920b22..2fa02ce 100644
--- a/bonobo/util/term.py
+++ b/bonobo/util/term.py
@@ -1,2 +1,2 @@
 CLEAR_EOL = '\033[0K'
-MOVE_CURSOR_UP = lambda n: '\033[{}A'.format(n)
\ No newline at end of file
+MOVE_CURSOR_UP = lambda n: '\033[{}A'.format(n)
diff --git a/bonobo/util/testing.py b/bonobo/util/testing.py
index 19dd472..f7b5108 100644
--- a/bonobo/util/testing.py
+++ b/bonobo/util/testing.py
@@ -4,16 +4,16 @@ import io
 import os
 import runpy
 import sys
-from contextlib import contextmanager, redirect_stdout, redirect_stderr
+from contextlib import contextmanager, redirect_stderr, redirect_stdout
 from unittest.mock import patch
 
 import pytest
 
-from bonobo import open_fs, __main__, get_examples_path
+from bonobo import __main__, get_examples_path, open_fs
 from bonobo.commands import entrypoint
-from bonobo.structs.tokens import Token
 from bonobo.execution.contexts.graph import GraphExecutionContext
 from bonobo.execution.contexts.node import NodeExecutionContext
+from bonobo.structs.tokens import Token
 
 
 @contextmanager