diff --git a/InvenTree/InvenTree/urls.py b/InvenTree/InvenTree/urls.py
index 0c5c988ca0..3e8e400729 100644
--- a/InvenTree/InvenTree/urls.py
+++ b/InvenTree/InvenTree/urls.py
@@ -80,7 +80,7 @@ settings_urls = [
     url(r'^purchase-order/?', SettingsView.as_view(template_name='InvenTree/settings/po.html'), name='settings-po'),
     url(r'^sales-order/?', SettingsView.as_view(template_name='InvenTree/settings/so.html'), name='settings-so'),
 
-     url(r'^(?P<pk>\d+)/edit/?', SettingEdit.as_view(), name='setting-edit'),
+    url(r'^(?P<pk>\d+)/edit/?', SettingEdit.as_view(), name='setting-edit'),
 
     # Catch any other urls
     url(r'^.*$', SettingsView.as_view(template_name='InvenTree/settings/user.html'), name='settings'),
diff --git a/InvenTree/common/models.py b/InvenTree/common/models.py
index 434f0571e5..ef6ebce8bf 100644
--- a/InvenTree/common/models.py
+++ b/InvenTree/common/models.py
@@ -34,7 +34,7 @@ class InvenTreeSetting(models.Model):
 
     Each global setting has the following parameters:
     
-    - name: Translatable string name of the setting (required) 
+    - name: Translatable string name of the setting (required)
     - description: Translatable string description of the setting (required)
     - default: Default value (optional)
     - units: Units of the particular setting (optional)
@@ -148,7 +148,6 @@ class InvenTreeSetting(models.Model):
         else:
             return ''
 
-
     @classmethod
     def get_default_value(cls, key):
         """
@@ -178,7 +177,7 @@ class InvenTreeSetting(models.Model):
         try:
             setting = InvenTreeSetting.objects.filter(key__iexact=key).first()
             return setting.pk
-        except InvenTreeSettingSetting.DoesNotExist:
+        except InvenTreeSetting.DoesNotExist:
             return None
 
     @classmethod
diff --git a/InvenTree/part/templatetags/inventree_extras.py b/InvenTree/part/templatetags/inventree_extras.py
index 54e9a0ba24..c5a45bc836 100644
--- a/InvenTree/part/templatetags/inventree_extras.py
+++ b/InvenTree/part/templatetags/inventree_extras.py
@@ -94,6 +94,7 @@ def settings_name(key, *args, **kwargs):
 
     return InvenTreeSetting.get_setting_name(key)
 
+
 @register.simple_tag()
 def settings_description(key, *args, **kwargs):
     """
@@ -102,6 +103,7 @@ def settings_description(key, *args, **kwargs):
 
     return InvenTreeSetting.get_setting_description(key)
 
+
 @register.simple_tag()
 def settings_units(key, *args, **kwargs):
     """
@@ -110,6 +112,7 @@ def settings_units(key, *args, **kwargs):
 
     return InvenTreeSetting.get_setting_units(key)
 
+
 @register.simple_tag()
 def settings_value(key, *args, **kwargs):
     """
@@ -118,6 +121,7 @@ def settings_value(key, *args, **kwargs):
 
     return InvenTreeSetting.get_setting(key, backup_value=kwargs.get('backup', None))
 
+
 @register.simple_tag()
 def settings_pk(key, *args, **kwargs):
     """