             guard newValue?.characters.count == 6 && newValue != pumpState?.pumpID else {
                 return
             }
-            
+
             if let pumpID = newValue {
                 let pumpState = PumpState(pumpID: pumpID)
-                
+
                 if let timeZone = self.pumpState?.timeZone {
                     pumpState.timeZone = timeZone
                 }
-                
+
                 self.pumpState = pumpState
             } else {
                 self.pumpState = nil
             }
-            
+
             nightscoutUploader?.pumpID = pumpID
-            
+
             doseStore.pumpID = pumpID
-            
+
             NSUserDefaults.standardUserDefaults().pumpID = pumpID
         }
     }
-    
+
     var pumpState: PumpState? {
         didSet {
             rileyLinkManager.pumpState = pumpState
-            
+
             if let oldValue = oldValue {
                 NSNotificationCenter.defaultCenter().removeObserver(self, name: PumpState.ValuesDidChangeNotification, object: oldValue)
             }
-            
+
             if let pumpState = pumpState {
                 NSNotificationCenter.defaultCenter().addObserver(self, selector: #selector(pumpStateValuesDidChange(_:)), name: PumpState.ValuesDidChangeNotification, object: pumpState)
             }
         }
     }
-    
+
     @objc private func pumpStateValuesDidChange(note: NSNotification) {
         switch note.userInfo?[PumpState.PropertyKey] as? String {
         case "timeZone"?:
             NSUserDefaults.standardUserDefaults().pumpTimeZone = pumpState?.timeZone
-            
+
             if let pumpTimeZone = pumpState?.timeZone {
                 if let basalRateSchedule = basalRateSchedule {
                     self.basalRateSchedule = BasalRateSchedule(dailyItems: basalRateSchedule.items, timeZone: pumpTimeZone)
                 }
-                
+
                 if let carbRatioSchedule = carbRatioSchedule {
                     self.carbRatioSchedule = CarbRatioSchedule(unit: carbRatioSchedule.unit, dailyItems: carbRatioSchedule.items, timeZone: pumpTimeZone)
                 }
-                
+
                 if let insulinSensitivitySchedule = insulinSensitivitySchedule {
                     self.insulinSensitivitySchedule = InsulinSensitivitySchedule(unit: insulinSensitivitySchedule.unit, dailyItems: insulinSensitivitySchedule.items, timeZone: pumpTimeZone)
                 }
-                
+
                 if let glucoseTargetRangeSchedule = glucoseTargetRangeSchedule {
                     self.glucoseTargetRangeSchedule = GlucoseRangeSchedule(unit: glucoseTargetRangeSchedule.unit, dailyItems: glucoseTargetRangeSchedule.items, timeZone: pumpTimeZone)
                 }

        } else {
            shareClient = nil
        }
        
        if let  settings = NSBundle.mainBundle().remoteSettings,
            siteURL = settings["NightscoutSiteURL"],
            APISecret = settings["NightscoutAPISecret"]

            return nil
        }
    }

    // MARK: - RileyLink

    @objc private func receivedRileyLinkManagerNotification(note: NSNotification) {
        NSNotificationCenter.defaultCenter().postNotificationName(note.name, object: self, userInfo: note.userInfo)
    }

    /**
     Called when a new idle message is received by the RileyLink.

     Only MySentryPumpStatus messages are handled.

     - parameter note: The notification object
     */
    @objc private func receivedRileyLinkPacketNotification(note: NSNotification) {
