diff --git a/pyinventorymgr/inventory_items.py b/pyinventorymgr/inventory_items.py
index 254cd9e..17b5eab 100644
--- a/pyinventorymgr/inventory_items.py
+++ b/pyinventorymgr/inventory_items.py
@@ -40,7 +40,7 @@
 
         self.SetMultiple(INTF_NAME, data)
 
-        ## this will load properties from cache
+        # this will load properties from cache
         PropertyCacher.load(name, INTF_NAME, self.properties)
 
     @dbus.service.method(
@@ -104,8 +104,8 @@
         obj = InventoryItem(bus, obj_path, FRUS[f])
         obj_parent.add(obj_path, obj)
 
-        ## TODO:  this is a hack to update bmc inventory item with version
-        ## should be done by flash object
+        # TODO:  this is a hack to update bmc inventory item with version
+        # should be done by flash object
         if (FRUS[f]['fru_type'] == "BMC"):
             version = getVersion()
             obj.update({'version': version})
diff --git a/pyinventorymgr/sync_inventory_items.py b/pyinventorymgr/sync_inventory_items.py
index b00ef5c..a96c015 100644
--- a/pyinventorymgr/sync_inventory_items.py
+++ b/pyinventorymgr/sync_inventory_items.py
@@ -71,6 +71,7 @@
             mproxy = obj.get_dbus_method('Get', PROP_INTF_NAME)
             return mproxy(INV_INTF_NAME, prop)
 
+
 # Get Network Interface object.
 def get_network_interface_object(bus):
     mapper = obmc.mapper.Mapper(bus)
@@ -125,7 +126,7 @@
     sys_mac = ''
     try:
         sys_mac = subprocess.check_output(["fw_printenv", "-n", "ethaddr"])
-    except:
+    except Exception:
         # Handle when mac does not exist in u-boot
         return sys_mac
     return sys_mac
@@ -159,6 +160,7 @@
     else:
         print "Error setting uuid"
 
+
 if __name__ == '__main__':
     arg = argparse.ArgumentParser()
     arg.add_argument('-p')