diff --git a/avatar/models.py b/avatar/models.py
index da97e49..af74908 100644
--- a/avatar/models.py
+++ b/avatar/models.py
@@ -2,11 +2,12 @@ import datetime
 import os.path
 
 from django.db import models
-from django.contrib.auth.models import User
 from django.core.files.base import ContentFile
 from django.utils.translation import ugettext as _
 from django.utils.hashcompat import md5_constructor
 
+from django.contrib.auth.models import User
+
 try:
     from cStringIO import StringIO
     dir(StringIO) # Placate PyFlakes
diff --git a/avatar/templatetags/avatar_tags.py b/avatar/templatetags/avatar_tags.py
index a51b7fe..630966c 100644
--- a/avatar/templatetags/avatar_tags.py
+++ b/avatar/templatetags/avatar_tags.py
@@ -1,13 +1,14 @@
 import urllib
 
 from django import template
-from django.contrib.auth.models import User
 from django.utils.translation import ugettext as _
 from django.utils.hashcompat import md5_constructor
 from django.core.urlresolvers import reverse
 
-from avatar.util import get_primary_avatar
+from django.contrib.auth.models import User
+
 from avatar import AVATAR_GRAVATAR_BACKUP, AVATAR_GRAVATAR_DEFAULT
+from avatar.util import get_primary_avatar
 from avatar.util import get_default_avatar_url
 
 register = template.Library()
diff --git a/avatar/tests.py b/avatar/tests.py
index 249c784..c620bf6 100644
--- a/avatar/tests.py
+++ b/avatar/tests.py
@@ -1,9 +1,12 @@
 import os.path
+
 from django.test import TestCase
 from django.test.client import Client
-from django.contrib.auth.models import User
 from django.core.urlresolvers import reverse
 from django.conf import settings
+
+from django.contrib.auth.models import User
+
 from avatar import AVATAR_DEFAULT_URL
 
 try:
diff --git a/avatar/views.py b/avatar/views.py
index 03a549b..a4d91e6 100644
--- a/avatar/views.py
+++ b/avatar/views.py
@@ -1,18 +1,17 @@
-from avatar.models import Avatar
-from avatar.util import get_primary_avatar
-from avatar.forms import PrimaryAvatarForm, DeleteAvatarForm, UploadAvatarForm
 from django.http import HttpResponseRedirect
 from django.shortcuts import render_to_response
 from django.template import RequestContext
-from django.contrib.auth.decorators import login_required
 from django.utils.translation import ugettext as _
-
 from django.db.models import get_app
 from django.core.exceptions import ImproperlyConfigured
 from django.conf import settings
 
+from django.contrib.auth.decorators import login_required
+
 from avatar import AVATAR_MAX_AVATARS_PER_USER
-from avatar.util import get_default_avatar_url
+from avatar.models import Avatar
+from avatar.util import get_primary_avatar, get_default_avatar_url
+from avatar.forms import PrimaryAvatarForm, DeleteAvatarForm, UploadAvatarForm
 
 try:
     notification = get_app('notification')