diff --git a/InvenTree/InvenTree/status_codes.py b/InvenTree/InvenTree/status_codes.py
index c8fddc5b2c..9207e28c7b 100644
--- a/InvenTree/InvenTree/status_codes.py
+++ b/InvenTree/InvenTree/status_codes.py
@@ -21,7 +21,7 @@ class OrderStatus(StatusCode):
     COMPLETE = 30  # Order has been completed
     CANCELLED = 40  # Order was cancelled
     LOST = 50  # Order was lost
-    RETURNED = 60 # Order was returned
+    RETURNED = 60  # Order was returned
 
     options = {
         PENDING: _("Pending"),
@@ -35,7 +35,7 @@ class OrderStatus(StatusCode):
 
 class StockStatus(StatusCode):
 
-    OK = 10  # Item is OK 
+    OK = 10  # Item is OK
     ATTENTION = 50  # Item requires attention
     DAMAGED = 55  # Item is damaged
     DESTROYED = 60  # Item is destroyed
diff --git a/InvenTree/build/models.py b/InvenTree/build/models.py
index b4511e3bdc..4f5f1630aa 100644
--- a/InvenTree/build/models.py
+++ b/InvenTree/build/models.py
@@ -71,7 +71,6 @@ class Build(models.Model):
         help_text='Number of parts to build'
     )
 
-
     status = models.PositiveIntegerField(default=BuildStatus.PENDING,
                                          choices=BuildStatus.items(),
                                          validators=[MinValueValidator(0)],
diff --git a/InvenTree/company/models.py b/InvenTree/company/models.py
index de8d2d0458..880d37869b 100644
--- a/InvenTree/company/models.py
+++ b/InvenTree/company/models.py
@@ -150,7 +150,6 @@ class Company(models.Model):
         ])
 
 
-
 class Contact(models.Model):
     """ A Contact represents a person who works at a particular company.
     A Company may have zero or more associated Contact objects.
diff --git a/InvenTree/order/admin.py b/InvenTree/order/admin.py
index 0ea5e8c599..e6b8db5735 100644
--- a/InvenTree/order/admin.py
+++ b/InvenTree/order/admin.py
@@ -2,7 +2,6 @@
 from __future__ import unicode_literals
 
 from django.contrib import admin
-from import_export.admin import ImportExportModelAdmin
 
 from .models import PurchaseOrder, PurchaseOrderLineItem
 
diff --git a/InvenTree/order/models.py b/InvenTree/order/models.py
index 4679f02eea..e9188dc869 100644
--- a/InvenTree/order/models.py
+++ b/InvenTree/order/models.py
@@ -1,12 +1,10 @@
-from django.db import models, transaction
+from django.db import models
 from django.core.validators import MinValueValidator
 from django.contrib.auth.models import User
 
 from django.utils.translation import ugettext as _
 
-from part.models import Part
 from company.models import Company
-from stock.models import StockItem
 
 from InvenTree.status_codes import OrderStatus
 
@@ -75,16 +73,18 @@ class PurchaseOrder(Order):
 
     ORDER_PREFIX = "PO"
 
-    supplier = models.ForeignKey(Company, on_delete=models.CASCADE,
-                                limit_choices_to={
-                                    'is_supplier': True,
-                                },
-                                related_name='purchase_orders',
-                                help_text=_('Company')
-                                )
+    supplier = models.ForeignKey(
+        Company, on_delete=models.CASCADE,
+        limit_choices_to={
+            'is_supplier': True,
+        },
+        related_name='purchase_orders',
+        help_text=_('Company')
+    )
+
 
 class OrderLineItem(models.Model):
-    """ Abstract model for an order line item 
+    """ Abstract model for an order line item
     
     Attributes:
         quantity: Number of items
@@ -101,7 +101,7 @@ class OrderLineItem(models.Model):
 
 
 class PurchaseOrderLineItem(OrderLineItem):
-    """ Model for a purchase order line item. 
+    """ Model for a purchase order line item.
     
     Attributes:
         order: Reference to a PurchaseOrder object
diff --git a/InvenTree/order/tests.py b/InvenTree/order/tests.py
index 7ce503c2dd..ce215e567d 100644
--- a/InvenTree/order/tests.py
+++ b/InvenTree/order/tests.py
@@ -1,3 +1 @@
-from django.test import TestCase
-
-# Create your tests here.
+# TODO - Implement tests for the order app