         let newDevice  = aNotification.object as! DRDevice
         let deviceInfo = newDevice.info()
         
-        let supportLevel = deviceInfo?[DRDeviceSupportLevelKey] as! NSString
-        let interconnect = deviceInfo?[DRDevicePhysicalInterconnectLocationKey]
-                                                                    as! NSString
-        
-        if (interconnect as String == DRDevicePhysicalInterconnectLocationInternal &&
-            supportLevel as String == DRDeviceSupportLevelAppleShipping) {
+        let supportLevel = deviceInfo?[DRDeviceSupportLevelKey] as! String
+        let interconnect =
+            deviceInfo?[DRDevicePhysicalInterconnectLocationKey] as! String
+        
+        if interconnect == DRDevicePhysicalInterconnectLocationInternal &&
+           supportLevel == DRDeviceSupportLevelAppleShipping {
             // The supposition here is that the SMC will only know about
             // internal Apple "made" ODD, and not a 3rd party one that someone
             // swapped in

            }
        }
        
        DRNotificationCenter.currentRunLoop().removeObserver(self,
                                             name: NSNotification.Name.DRDeviceAppeared.rawValue,
                                             object: nil)
    }
    
    func testBatteryPowerMethods() {

            isLaptop = true
            
            // Getting these values to cross ref
            var prop = IORegistryEntryCreateCFProperty(
                service, "IsCharging" as CFString!,
                kCFAllocatorDefault,
                0
            )
            
            ASPCharging = prop?.takeUnretainedValue() as! Bool
            
            prop = IORegistryEntryCreateCFProperty(
                service, "FullyCharged" as CFString!,
                kCFAllocatorDefault,
                0
            )
            
            ASPCharged = prop?.takeUnretainedValue() as! Bool
        }
