diff --git a/djadmin2/core.py b/djadmin2/core.py
index d726b54..fcd8e3d 100644
--- a/djadmin2/core.py
+++ b/djadmin2/core.py
@@ -123,7 +123,6 @@ class Admin2(object):
             try:
                 import_module("%s.admin2" % app_name)
             except ImportError as e:
-
                 if str(e).startswith("No module named") and 'admin2' in str(e):
                     continue
                 raise e
diff --git a/djadmin2/filters.py b/djadmin2/filters.py
index 42ccf94..7c06c49 100644
--- a/djadmin2/filters.py
+++ b/djadmin2/filters.py
@@ -2,7 +2,6 @@
 from __future__ import division, absolute_import, unicode_literals
 
 import collections
-import six
 
 from itertools import chain
 
@@ -12,6 +11,7 @@ from django.utils.html import format_html
 from django.utils.encoding import force_text, force_bytes
 from django.utils.safestring import mark_safe
 from django.forms import widgets as django_widgets
+from django.utils import six
 from django.utils.translation import ugettext_lazy
 
 import django_filters
diff --git a/djadmin2/views.py b/djadmin2/views.py
index f460117..76b2d41 100644
--- a/djadmin2/views.py
+++ b/djadmin2/views.py
@@ -28,6 +28,7 @@ from . import permissions, utils
 from .forms import AdminAuthenticationForm
 from .viewmixins import Admin2Mixin, AdminModel2Mixin, Admin2ModelFormMixin
 from .filters import build_list_filter, build_date_filter
+from .models import LogEntry
 
 class AdminView(object):
 
@@ -390,7 +391,6 @@ class ModelEditFormView(AdminModel2Mixin, Admin2ModelFormMixin,
 
     def forms_valid(self, form, inlines):
         response = super(ModelEditFormView, self).forms_valid(form, inlines)
-        from .models import LogEntry
         LogEntry.objects.log_action(
             self.request.user.id,
             self.object,
@@ -427,7 +427,6 @@ class ModelAddFormView(AdminModel2Mixin, Admin2ModelFormMixin,
 
     def forms_valid(self, form, inlines):
         response = super(ModelAddFormView, self).forms_valid(form, inlines)
-        from .models import LogEntry
         LogEntry.objects.log_action(
             self.request.user.id,
             self.object,
@@ -471,7 +470,6 @@ class ModelDeleteView(AdminModel2Mixin, generic.DeleteView):
         return context
 
     def delete(self, request, *args, **kwargs):
-        from .models import LogEntry
         LogEntry.objects.log_action(
             request.user.id,
             self.get_object(),
@@ -509,7 +507,6 @@ class ModelHistoryView(AdminModel2Mixin, generic.ListView):
 
     def get_queryset(self):
         content_type = ContentType.objects.get_for_model(self.get_object())
-        from .models import LogEntry
         return LogEntry.objects.filter(
             content_type=content_type,
             object_id=self.get_object().id