diff --git a/src/.isort.cfg b/src/.isort.cfg
index adcc4815..a41daf53 100644
--- a/src/.isort.cfg
+++ b/src/.isort.cfg
@@ -1,3 +1,3 @@
 [settings]
 line_length=120
-skip=migrations,celery.py
+skip=migrations,celery.py,__init__.py
diff --git a/src/c3nav/mapdata/models/__init__.py b/src/c3nav/mapdata/models/__init__.py
index f7572fa6..20ae3182 100644
--- a/src/c3nav/mapdata/models/__init__.py
+++ b/src/c3nav/mapdata/models/__init__.py
@@ -1,8 +1,8 @@
-from c3nav.mapdata.models.access import AccessRestriction  # noqa
-from c3nav.mapdata.models.geometry.level import AltitudeArea, Building, Door, Space  # noqa
-from c3nav.mapdata.models.geometry.space import AltitudeMarker, Area, Hole, LineObstacle, Obstacle, Stair  # noqa
-from c3nav.mapdata.models.graph import GraphEdge, GraphNode, WayType  # noqa
-from c3nav.mapdata.models.level import Level  # noqa
-from c3nav.mapdata.models.locations import Location, LocationGroup, LocationGroupCategory, LocationSlug  # noqa
-from c3nav.mapdata.models.source import Source  # noqa
 from c3nav.mapdata.models.update import MapUpdate  # noqa
+from c3nav.mapdata.models.access import AccessRestriction  # noqa
+from c3nav.mapdata.models.level import Level  # noqa
+from c3nav.mapdata.models.geometry.level import Building, Space, Door, AltitudeArea  # noqa
+from c3nav.mapdata.models.geometry.space import Area, Stair, Obstacle, LineObstacle, Hole, AltitudeMarker  # noqa
+from c3nav.mapdata.models.locations import Location, LocationSlug, LocationGroup, LocationGroupCategory  # noqa
+from c3nav.mapdata.models.source import Source  # noqa
+from c3nav.mapdata.models.graph import GraphNode, WayType, GraphEdge  # noqa
diff --git a/src/c3nav/mapdata/render/engines/__init__.py b/src/c3nav/mapdata/render/engines/__init__.py
index db74d088..13070edf 100644
--- a/src/c3nav/mapdata/render/engines/__init__.py
+++ b/src/c3nav/mapdata/render/engines/__init__.py
@@ -1,13 +1,13 @@
 from django.conf import settings
 from django.core import checks
 
-from c3nav.mapdata.render.engines.base import get_engine, get_engine_filetypes, register_engine  # noqa
+from c3nav.mapdata.render.engines.base import register_engine, get_engine, get_engine_filetypes  # noqa
 from c3nav.mapdata.render.engines.blender import BlenderEngine  # noqa
-from c3nav.mapdata.render.engines.openscad import OpenSCADEngine  # noqa
 from c3nav.mapdata.render.engines.openscadold import OldOpenSCADEngine  # noqa
+from c3nav.mapdata.render.engines.openscad import OpenSCADEngine  # noqa
+from c3nav.mapdata.render.engines.wavefront import WavefrontEngine  # noqa
 from c3nav.mapdata.render.engines.stl import STLEngine  # noqa
 from c3nav.mapdata.render.engines.svg import SVGEngine  # noqa
-from c3nav.mapdata.render.engines.wavefront import WavefrontEngine  # noqa
 
 
 @checks.register()
diff --git a/src/c3nav/mapdata/render/geometry/__init__.py b/src/c3nav/mapdata/render/geometry/__init__.py
index 1c2c39c2..6bc17b9e 100644
--- a/src/c3nav/mapdata/render/geometry/__init__.py
+++ b/src/c3nav/mapdata/render/geometry/__init__.py
@@ -1,3 +1,3 @@
-from c3nav.mapdata.render.geometry.altitudearea import AltitudeAreaGeometries  # noqa
-from c3nav.mapdata.render.geometry.hybrid import HybridGeometry, hybrid_union  # noqa
+from c3nav.mapdata.render.geometry.hybrid import hybrid_union, HybridGeometry  # noqa
 from c3nav.mapdata.render.geometry.level import LevelGeometries  # noqa
+from c3nav.mapdata.render.geometry.altitudearea import AltitudeAreaGeometries  # noqa