 
         case .BlackList:
 
-            let cell = tableView.dequeueReusableCellWithIdentifier(settingsMoreCellID) as! SettingsMoreCell
+            let cell: SettingsMoreCell = tableView.dequeueReusableCell()
             cell.annotationLabel.text = NSLocalizedString("Blocked Users", comment: "")
             return cell
 
         case .CreatorsOfBlockedFeeds:
 
-            let cell = tableView.dequeueReusableCellWithIdentifier(settingsMoreCellID) as! SettingsMoreCell
+            let cell: SettingsMoreCell = tableView.dequeueReusableCell()
             cell.annotationLabel.text = NSLocalizedString("Creators of Blocked Feeds", comment: "")
             return cell
         }

            switch indexPath.row {

            case DoNotDisturbPeriodRow.Switch.rawValue:
                let cell = tableView.dequeueReusableCellWithIdentifier(DoNotDisturbSwitchCellID) as! DoNotDisturbSwitchCell
                cell.promptLabel.text = NSLocalizedString("Do Not Disturb", comment: "")
                cell.toggleSwitch.on = doNotDisturbPeriod.isOn


                return cell

            case DoNotDisturbPeriodRow.Period.rawValue:

                let cell: DoNotDisturbPeriodCell = tableView.dequeueReusableCell()

                cell.fromPromptLabel.text = NSLocalizedString("From", comment: "")
                cell.toPromptLabel.text = NSLocalizedString("To", comment: "")

