diff --git a/samples/deviceFactory/deviceStatus.py b/samples/deviceFactory/deviceStatus.py
index fbc94832..4d6fba31 100644
--- a/samples/deviceFactory/deviceStatus.py
+++ b/samples/deviceFactory/deviceStatus.py
@@ -56,14 +56,14 @@ def loadConfigFile(source):
     client = wiotp.sdk.application.ApplicationClient(options)
 
     # Terminal colour mods
-    red="%c[31m" % chr(27)
-    green="%c[32m" % chr(27)
-    off="%c[0m" % chr(27)
+    red = "%c[31m" % chr(27)
+    green = "%c[32m" % chr(27)
+    off = "%c[0m" % chr(27)
 
     statuses = client.registry.connectionStatus.find(typeId=args.typeId)
     output = {}
     for status in statuses:
-        #print(status)
+        # print(status)
         clientId = status["id"]
         deviceId = clientId.split(":")[3]
         if not deviceId.startswith(args.batchId):
@@ -76,7 +76,7 @@ def loadConfigFile(source):
             output[batchNum] = "%s%s%s" % (green, batchNum, off)
         else:
             output[batchNum] = "%s" % (batchNum)
-    
+
     print("=================================================")
     print("Device Connection State Report")
     print("")
@@ -85,14 +85,14 @@ def loadConfigFile(source):
     print("%sconnected%s / %sdisconnected%s / unknown" % (green, off, red, off))
     print("=================================================")
     outStr = ""
-    for i in range(1,args.numberOfDevices+1):
+    for i in range(1, args.numberOfDevices + 1):
         batchNum = "%04d" % (i)
         if batchNum in output:
             outStr += output[batchNum] + " "
         else:
             outStr += batchNum + " "
-        
+
         if batchNum[3] == "0":
             outStr += "\n"
-        
+
     print(outStr)
diff --git a/samples/simpleApp/simpleApp.py b/samples/simpleApp/simpleApp.py
index 21037204..7467f0ef 100644
--- a/samples/simpleApp/simpleApp.py
+++ b/samples/simpleApp/simpleApp.py
@@ -124,7 +124,7 @@ def usage():
         options = wiotp.sdk.application.parseConfigFile(configFilePath)
     else:
         options = wiotp.sdk.application.parseEnvVars()
-    
+
     try:
         client = wiotp.sdk.application.ApplicationClient(options)
         # If you want to see more detail about what's going on, set log level to DEBUG
diff --git a/src/wiotp/sdk/application/client.py b/src/wiotp/sdk/application/client.py
index 5b286692..ae04bfbd 100644
--- a/src/wiotp/sdk/application/client.py
+++ b/src/wiotp/sdk/application/client.py
@@ -99,13 +99,12 @@ def __init__(self, config, logHandlers=None):
             # We directly expose the get() method via self.serviceStatus()
             self._serviceStatus = ServiceStatus(apiClient)
 
-
     def serviceStatus(self):
         if not self._config.isQuickstart():
             return self._serviceStatus.get()
         else:
             return None
-    
+
     def subscribeToDeviceEvents(self, typeId="+", deviceId="+", eventId="+", msgFormat="+", qos=0):
         """
         Subscribe to device event messages