diff --git a/mayan/apps/common/__init__.py b/mayan/apps/common/__init__.py
index 88d46d4663..151f543606 100644
--- a/mayan/apps/common/__init__.py
+++ b/mayan/apps/common/__init__.py
@@ -82,5 +82,5 @@ def auto_admin_account_passwd_change(sender, instance, **kwargs):
         pass
 
 
-if (validate_path(TEMPORARY_DIRECTORY) == False) or (not TEMPORARY_DIRECTORY):
+if (not validate_path(TEMPORARY_DIRECTORY)) or (not TEMPORARY_DIRECTORY):
     setattr(common_settings, 'TEMPORARY_DIRECTORY', tempfile.mkdtemp())
diff --git a/mayan/apps/common/serializers/better_yaml.py b/mayan/apps/common/serializers/better_yaml.py
index 330053f270..21a2ba56e9 100644
--- a/mayan/apps/common/serializers/better_yaml.py
+++ b/mayan/apps/common/serializers/better_yaml.py
@@ -55,10 +55,11 @@ Requires PyYaml (http://pyyaml.org/), of course.
 from StringIO import StringIO
 import yaml
 
-from django.core.serializers.pyyaml import Serializer as YamlSerializer
 from django.core.serializers.python import Deserializer as PythonDeserializer
+from django.core.serializers.pyyaml import Serializer as YamlSerializer
 from django.utils.encoding import smart_unicode
 
+
 class Serializer (YamlSerializer):
     """
     Serialize database objects as nested dicts, indexed first by
diff --git a/mayan/apps/common/templatetags/set_var.py b/mayan/apps/common/templatetags/set_var.py
index 3d1f8c0084..88706a157c 100644
--- a/mayan/apps/common/templatetags/set_var.py
+++ b/mayan/apps/common/templatetags/set_var.py
@@ -13,7 +13,6 @@ class SetVarNode(template.Node):
             value = template.Variable(self.var_value).resolve(context)
         except template.VariableDoesNotExist:
             value = ""
-        #context[self.var_name] = value
         # Make it global across all blocks
         context.dicts[0][self.var_name] = value
 
diff --git a/mayan/apps/common/utils.py b/mayan/apps/common/utils.py
index 1dcceffd1e..3be0600aef 100644
--- a/mayan/apps/common/utils.py
+++ b/mayan/apps/common/utils.py
@@ -44,7 +44,7 @@ def urlquote(link=None, get=None):
         get = link
         link = ''
     assert isinstance(get, dict), u'wrong type "%s", dict required' % type(get)
-    #assert not (link.startswith('http://') or link.startswith('https://')), \
+    # assert not (link.startswith('http://') or link.startswith('https://')), \
     #    'This method should only quote the url path.
     #    It should not start with http(s)://  (%s)' % (
     #    link)
@@ -81,8 +81,8 @@ def return_attrib(obj, attrib, arguments=None):
             pass
 
 
-#http://snippets.dzone.com/posts/show/5434
-#http://snippets.dzone.com/user/jakob
+# http://snippets.dzone.com/posts/show/5434
+# http://snippets.dzone.com/user/jakob
 def pretty_size(size, suffixes=None):
     suffixes = suffixes if not suffixes is None else [
         (u'B', 1024L), (u'K', 1048576L), (u'M', 1073741824L),
@@ -326,7 +326,7 @@ def generate_choices_w_labels(choices, display_object_type=True):
         else:
             results.append((u'%s,%s' % (ct.model, choice.pk), u'%s' % (label)))
 
-    #Sort results by the label not the key value
+    # Sort results by the label not the key value
     return sorted(results, key=lambda x: x[1])
 
 
diff --git a/mayan/apps/common/views.py b/mayan/apps/common/views.py
index b80f428a84..80c6c7947a 100644
--- a/mayan/apps/common/views.py
+++ b/mayan/apps/common/views.py
@@ -130,7 +130,7 @@ def assign_remove(request, left_list, right_list, add_method, remove_method, lef
     context = {
         'subtemplates_list': [
             {
-                'name':'generic_form_subtemplate.html',
+                'name': 'generic_form_subtemplate.html',
                 'grid': 6,
                 'context': {
                     'form': unselected_list,
@@ -140,7 +140,7 @@ def assign_remove(request, left_list, right_list, add_method, remove_method, lef
                 }
             },
             {
-                'name':'generic_form_subtemplate.html',
+                'name': 'generic_form_subtemplate.html',
                 'grid': 6,
                 'grid_clear': True,
                 'context': {
@@ -238,7 +238,7 @@ def password_change_view(request):
     """
     Password change wrapper for better control
     """
-    context={'title': _(u'Current user password change')}
+    context = {'title': _(u'Current user password change')}
 
     return password_change(
         request,
diff --git a/mayan/apps/common/widgets.py b/mayan/apps/common/widgets.py
index bb0beb397a..a134f788d0 100644
--- a/mayan/apps/common/widgets.py
+++ b/mayan/apps/common/widgets.py
@@ -1,12 +1,12 @@
-import os
 from itertools import chain
+import os
 
-from django.utils.translation import ugettext_lazy as _
-from django.utils.safestring import mark_safe
 from django import forms
 from django.forms.util import flatatt
-from django.utils.html import conditional_escape
 from django.utils.encoding import force_unicode
+from django.utils.html import conditional_escape
+from django.utils.safestring import mark_safe
+from django.utils.translation import ugettext_lazy as _
 
 
 class PlainWidget(forms.widgets.Widget):
@@ -32,15 +32,15 @@ class DetailSelectMultiple(forms.widgets.SelectMultiple):
         options = None
         if value:
             if getattr(value, '__iter__', None):
-                options = [(index, string) for index, string in \
+                options = [(index, string) for index, string in
                     self.choices if index in value]
             else:
-                options = [(index, string) for index, string in \
+                options = [(index, string) for index, string in
                     self.choices if index == value]
         else:
             if self.choices:
                 if self.choices[0] != (u'', u'---------') and value != []:
-                    options = [(index, string) for index, string in \
+                    options = [(index, string) for index, string in
                         self.choices]
 
         if options:
diff --git a/mayan/apps/dynamic_search/api.py b/mayan/apps/dynamic_search/api.py
index fdf098ba8c..ec3bdb3a6b 100644
--- a/mayan/apps/dynamic_search/api.py
+++ b/mayan/apps/dynamic_search/api.py
@@ -110,12 +110,12 @@ def perform_search(query_string, field_list=None):
                 single_result_ids = set(model.objects.filter(query).values_list('pk', flat=True))
                 #Convert queryset to python set and perform the
                 #AND operation on the program and not as a query
-                if model_result_ids == None:
+                if not model_result_ids:
                     model_result_ids = single_result_ids
                 else:
                     model_result_ids &= single_result_ids
 
-            if model_result_ids == None:
+            if not model_result_ids:
                 model_result_ids = []
 
             result_count += len(model_result_ids)
diff --git a/mayan/apps/dynamic_search/classes.py b/mayan/apps/dynamic_search/classes.py
index fb558dc81a..ab264e4bb3 100644
--- a/mayan/apps/dynamic_search/classes.py
+++ b/mayan/apps/dynamic_search/classes.py
@@ -119,7 +119,6 @@ class SearchModel(object):
                     }
                 )
 
-
         logger.debug('search_dict: %s' % search_dict)
 
         return self.execute_search(search_dict, global_and_search=True)
diff --git a/mayan/apps/navigation/api.py b/mayan/apps/navigation/api.py
index 56bb037245..4ab907fb1f 100644
--- a/mayan/apps/navigation/api.py
+++ b/mayan/apps/navigation/api.py
@@ -68,7 +68,7 @@ def register_top_menu(name, link, children_views=None,
         top_menu_entries.append(entry)
 
     sort_menu_entries()
-    
+
     return entry
 
 
diff --git a/mayan/apps/navigation/utils.py b/mayan/apps/navigation/utils.py
index 6c008e5576..b6a740866c 100644
--- a/mayan/apps/navigation/utils.py
+++ b/mayan/apps/navigation/utils.py
@@ -1,4 +1,5 @@
-#http://www.djangosnippets.org/snippets/1378/
+# TODO: Django now has a resolve function use it instead of this
+# http://www.djangosnippets.org/snippets/1378/
 
 from django.core.urlresolvers import RegexURLResolver, RegexURLPattern, Resolver404, get_resolver
 
diff --git a/mayan/apps/navigation/widgets.py b/mayan/apps/navigation/widgets.py
index f587fc6ebb..f6e9ac097d 100644
--- a/mayan/apps/navigation/widgets.py
+++ b/mayan/apps/navigation/widgets.py
@@ -1,14 +1,14 @@
-from __future__ import absolute_import 
+from __future__ import absolute_import
 
 import urlparse
 
-from django.utils.safestring import mark_safe
 from django.conf import settings
-from django.utils.translation import ugettext_lazy as _
-from django.core.urlresolvers import reverse
-from django.template.defaultfilters import capfirst
 from django.core.exceptions import PermissionDenied
+from django.core.urlresolvers import reverse
 from django.template import RequestContext, Variable
+from django.template.defaultfilters import capfirst
+from django.utils.safestring import mark_safe
+from django.utils.translation import ugettext_lazy as _
 
 from permissions.models import Permission
 
diff --git a/mayan/apps/permissions/views.py b/mayan/apps/permissions/views.py
index e811a2d0af..48e548e7f9 100644
--- a/mayan/apps/permissions/views.py
+++ b/mayan/apps/permissions/views.py
@@ -105,41 +105,6 @@ def role_permissions(request, role_id):
     }, context_instance=RequestContext(request))
 
 
-def role_edit(request, role_id):
-    Permission.objects.check_permissions(request.user, [PERMISSION_ROLE_EDIT])
-
-    return update_object(request, template_name='generic_form.html',
-        form_class=RoleForm, object_id=role_id, extra_context={
-            'object_name': _(u'role')}
-    )
-
-
-def role_create(request):
-    Permission.objects.check_permissions(request.user, [PERMISSION_ROLE_CREATE])
-
-    return create_object(request, model=Role,
-        template_name='generic_form.html',
-        post_save_redirect=reverse('role_list'))
-
-
-def role_delete(request, role_id):
-    Permission.objects.check_permissions(request.user, [PERMISSION_ROLE_DELETE])
-
-    next = request.POST.get('next', request.GET.get('next', request.META.get('HTTP_REFERER', '/')))
-    previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', '/')))
-
-    return delete_object(request, model=Role, object_id=role_id,
-        template_name='generic_confirm.html',
-        post_delete_redirect=reverse('role_list'),
-        extra_context={
-            'delete_view': True,
-            'next': next,
-            'previous': previous,
-            'object_name': _(u'role'),
-            'form_icon': u'medal_gold_delete.png',
-        })
-
-
 def permission_grant(request):
     Permission.objects.check_permissions(request.user, [PERMISSION_PERMISSION_GRANT])
     items_property_list = loads(request.GET.get('items_property_list', []))
diff --git a/mayan/apps/project_tools/links.py b/mayan/apps/project_tools/links.py
index 29fd689b7b..f14df29da1 100644
--- a/mayan/apps/project_tools/links.py
+++ b/mayan/apps/project_tools/links.py
@@ -1,3 +1,3 @@
 from django.utils.translation import ugettext_lazy as _
 
-link_tools = link={'text': _(u'tools'), 'view': 'tools_list', 'famfam': 'wrench'}
+link_tools = {'text': _(u'tools'), 'view': 'tools_list', 'famfam': 'wrench'}
diff --git a/mayan/apps/smart_settings/__init__.py b/mayan/apps/smart_settings/__init__.py
index 364fab1034..6643d18458 100644
--- a/mayan/apps/smart_settings/__init__.py
+++ b/mayan/apps/smart_settings/__init__.py
@@ -6,9 +6,11 @@ from project_setup.api import register_setup
 
 from .links import check_settings
 
+
 def is_superuser(context):
     return context['request'].user.is_staff or context['request'].user.is_superuser
 
+
 check_settings = {'text': _(u'settings'), 'view': 'setting_list', 'famfam': 'cog', 'icon': 'cog.png', 'condition': is_superuser, 'children_view_regex': [r'^setting_']}
 
 register_setup(check_settings)
diff --git a/mayan/apps/user_management/views.py b/mayan/apps/user_management/views.py
index 319c43d32b..0f72b83373 100644
--- a/mayan/apps/user_management/views.py
+++ b/mayan/apps/user_management/views.py
@@ -1,13 +1,13 @@
 from __future__ import absolute_import
 
 from django.contrib import messages
+from django.contrib.auth import get_user_model
 from django.contrib.auth.models import User, Group
 from django.core.urlresolvers import reverse
 from django.http import HttpResponseRedirect
 from django.shortcuts import render_to_response, get_object_or_404
 from django.template import RequestContext
 from django.utils.translation import ugettext_lazy as _
-
 from common.utils import generate_choices_w_labels, encapsulate
 from common.views import assign_remove
 from common.widgets import two_state_template