diff --git a/quark/drivers/optimized_nvp_driver.py b/quark/drivers/optimized_nvp_driver.py
index 6885250..10e028c 100644
--- a/quark/drivers/optimized_nvp_driver.py
+++ b/quark/drivers/optimized_nvp_driver.py
@@ -18,13 +18,14 @@ Optimized NVP client for Quark
 """
 import sqlalchemy as sa
 
-from sqlalchemy import orm
-from quark.db import models
 from nvp_driver import NVPDriver
 from quantum.openstack.common import log as logging
+from quark.db import models
+from sqlalchemy import orm
 
 LOG = logging.getLogger("quantum.quark.nvplib")
 
+
 class OptimizedNVPDriver(NVPDriver):
     def delete_network(self, context, network_id):
         lswitches = self._lswitches_for_network(context, network_id)
@@ -57,7 +58,7 @@ class OptimizedNVPDriver(NVPDriver):
             delete_port(context, port_id, lswitch_uuid=switch.nvp_id)
         context.session.delete(port)
         switch.port_count = switch.port_count - 1
-        if switch.port_count == 0: 
+        if switch.port_count == 0:
             self._lswitch_delete(context, switch.nvp_id)
 
     def _lport_select_by_id(self, context, port_id):
@@ -143,6 +144,7 @@ class OptimizedNVPDriver(NVPDriver):
             all()
         return switches
 
+
 class LSwitchPort(models.BASEV2, models.HasId):
     __tablename__ = "quark_nvp_driver_lswitchport"
     port_id = sa.Column(sa.String(36), nullable=False)
@@ -150,6 +152,7 @@ class LSwitchPort(models.BASEV2, models.HasId):
                           sa.ForeignKey("quark_nvp_driver_lswitch.id"),
                           nullable=False)
 
+
 class LSwitch(models.BASEV2, models.HasId):
     __tablename__ = "quark_nvp_driver_lswitch"
     nvp_id = sa.Column(sa.String(36), nullable=False)
diff --git a/quark/tests/test_optimized_nvp_driver.py b/quark/tests/test_optimized_nvp_driver.py
index 5005e1c..ab70983 100644
--- a/quark/tests/test_optimized_nvp_driver.py
+++ b/quark/tests/test_optimized_nvp_driver.py
@@ -23,7 +23,8 @@ import quark.tests.test_nvp_driver as test_nvp_driver
 class TestOptimizedNVPDriver(test_nvp_driver.TestNVPDriver):
     def setUp(self):
         if not hasattr(self, 'driver'):
-            self.driver = quark.drivers.optimized_nvp_driver.OptimizedNVPDriver()
+            self.driver = quark.drivers.optimized_nvp_driver.\
+                OptimizedNVPDriver()
         super(TestOptimizedNVPDriver, self).setUp()
         self.d_pkg = "quark.drivers.optimized_nvp_driver.OptimizedNVPDriver"
         self.context.session.add = mock.Mock(return_value=None)