diff --git a/phpmon/Domain/Preferences/PrefsVC.swift b/phpmon/Domain/Preferences/PrefsVC.swift
index 87594c7..8091174 100644
--- a/phpmon/Domain/Preferences/PrefsVC.swift
+++ b/phpmon/Domain/Preferences/PrefsVC.swift
@@ -231,7 +231,7 @@ class GeneralPreferencesVC: GenericPreferenceVC {
     // MARK: - Lifecycle
 
     public static func fromStoryboard() -> GenericPreferenceVC {
-        var vc = NSStoryboard(name: "Main", bundle: nil)
+        let vc = NSStoryboard(name: "Main", bundle: nil)
             .instantiateController(withIdentifier: "preferencesTemplateVC") as! GenericPreferenceVC
 
         vc.views = [
diff --git a/phpmon/Domain/Preferences/Views/CheckboxPreferenceView.swift b/phpmon/Domain/Preferences/Views/CheckboxPreferenceView.swift
index eee6b21..a5e8f3e 100644
--- a/phpmon/Domain/Preferences/Views/CheckboxPreferenceView.swift
+++ b/phpmon/Domain/Preferences/Views/CheckboxPreferenceView.swift
@@ -59,15 +59,12 @@ protocol CheckboxPreferenceViewBehavior {
 
 class CheckboxPreferenceBehavior: CheckboxPreferenceViewBehavior {
     var button: NSButton
-    var preference: PreferenceName {
-        didSet {
-            button.state = Preferences.isEnabled(self.preference) ? .on : .off
-        }
-    }
+    var preference: PreferenceName
 
     init(button: NSButton, preference: PreferenceName) {
-        self.button = button
         self.preference = preference
+        self.button = button
+        self.button.state = Preferences.isEnabled(self.preference) ? .on : .off
     }
 
     public func toggled(checked: Bool) {