diff --git a/cloud/quantum_floating_ip b/cloud/quantum_floating_ip
index d7b4bfafa14..22c00f7c052 100644
--- a/cloud/quantum_floating_ip
+++ b/cloud/quantum_floating_ip
@@ -161,7 +161,7 @@ def _create_floating_ip(quantum, module, port_id, net_id):
         result = quantum.create_floatingip({'floatingip': kwargs})
     except Exception as e:
         module.fail_json(msg="There was an error in updating the floating ip address: %s" % e.message)
-    module.exit_json(changed=True, result=result, public_ip=result['floatingip']['floating_ip_address'] )
+    module.exit_json(changed=True, result=result, public_ip=result['floatingip']['floating_ip_address'])
 
 def _get_net_id(quantum, module):
     kwargs = {
diff --git a/database/riak b/database/riak
index ea99dff1225..78c99fb4593 100644
--- a/database/riak
+++ b/database/riak
@@ -144,7 +144,7 @@ def main():
 # here we attempt to get stats from the http stats interface for 120 seconds.
     timeout = time.time() + 120
     while True:
-        if time.time () > timeout:
+        if time.time() > timeout:
             module.fail_json(msg='Timeout, could not fetch Riak stats.')
         try:
             stats_raw = urllib2.urlopen(
@@ -230,7 +230,7 @@ def main():
                 result['handoffs'] = 'No transfers active.'
                 break
             time.sleep(10)
-            if time.time () > timeout:
+            if time.time() > timeout:
                 module.fail_json(msg='Timeout waiting for handoffs.')
 
 # this could take a while, recommend to run in async mode
@@ -247,7 +247,7 @@ def main():
                 break
             time.sleep(10)
             wait += 10
-        if time.time () > timeout:
+        if time.time() > timeout:
             module.fail_json(msg='Timeout waiting for nodes to agree on ring.')
 
     result['ring_ready'] = ring_check()
diff --git a/system/setup b/system/setup
index 0315a351dad..6c075c032e8 100644
--- a/system/setup
+++ b/system/setup
@@ -1608,8 +1608,10 @@ class SunOSNetwork(GenericBsdIfconfigNetwork, Network):
         else:
             current_if = interfaces[device]
         flags = self.get_options(words[1])
-        if 'IPv4' in flags: v = 'ipv4'
-        if 'IPv6' in flags: v = 'ipv6'
+        if 'IPv4' in flags: 
+            v = 'ipv4'
+        if 'IPv6' in flags: 
+            v = 'ipv6'
         current_if[v].append({'flags': flags, 'mtu': words[3]})
         current_if['macaddress'] = 'unknown'    # will be overwritten later
         return current_if