diff --git a/VoodooPS2Controller/VoodooPS2Controller.cpp b/VoodooPS2Controller/VoodooPS2Controller.cpp
index 34322a28..689df2b2 100644
--- a/VoodooPS2Controller/VoodooPS2Controller.cpp
+++ b/VoodooPS2Controller/VoodooPS2Controller.cpp
@@ -293,6 +293,11 @@ bool ApplePS2Controller::init(OSDictionary* dict)
   _cmdbyteLock = IOLockAlloc();
   if (!_cmdbyteLock)
       return false;
+	
+  _deliverNotification = OSSymbol::withCString(kDeliverNotifications);
+   if (_deliverNotification == NULL)
+	  return false;
+
 
   _workLoop                = 0;
 
@@ -383,6 +388,7 @@ void ApplePS2Controller::free(void)
         IOLockFree(_cmdbyteLock);
         _cmdbyteLock = 0;
     }
+	
 #if DEBUGGER_SUPPORT
     if (_controllerLock)
     {
@@ -502,38 +508,14 @@ void ApplePS2Controller::resetController(void)
 bool ApplePS2Controller::start(IOService * provider)
 {
   DEBUG_LOG("ApplePS2Controller::start entered...\n");
-    
-  const OSSymbol * deliverNotification = OSSymbol::withCString(kDeliverNotifications);
-  if (deliverNotification == NULL)
-      return false;
-
-  OSDictionary * propertyMatch = propertyMatching(deliverNotification, kOSBooleanTrue);
-  if (propertyMatch != NULL) {
-    IOServiceMatchingNotificationHandler notificationHandler = OSMemberFunctionCast(IOServiceMatchingNotificationHandler, this, &ApplePS2Controller::notificationHandler);
 
-    //
-    // Register notifications for availability of any IOService objects wanting to consume our message events
-    //
-    _publishNotify = addMatchingNotification(gIOFirstPublishNotification,
-                                             propertyMatch,
-                                             notificationHandler,
-                                             this,
-                                             0, 10000);
-
-    _terminateNotify = addMatchingNotification(gIOTerminatedNotification,
-                                               propertyMatch,
-                                               notificationHandler,
-                                               this,
-                                               0, 10000);
-
-    propertyMatch->release();
-  }
-  deliverNotification->release();
  //
  // The driver has been instructed to start.  Allocate all our resources.
  //
  if (!super::start(provider))
      return false;
+	
+ OSDictionary * propertyMatch = nullptr;
 
 #if DEBUGGER_SUPPORT
   // Enable special key sequence to enter debugger if debug boot-arg was set.
@@ -676,6 +658,28 @@ bool ApplePS2Controller::start(IOService * provider)
     
   registerService();
 
+  propertyMatch = propertyMatching(_deliverNotification, kOSBooleanTrue);
+  if (propertyMatch != NULL) {
+    IOServiceMatchingNotificationHandler notificationHandler = OSMemberFunctionCast(IOServiceMatchingNotificationHandler, this, &ApplePS2Controller::notificationHandler);
+
+    //
+    // Register notifications for availability of any IOService objects wanting to consume our message events
+    //
+    _publishNotify = addMatchingNotification(gIOFirstPublishNotification,
+										   propertyMatch,
+										   notificationHandler,
+										   this,
+										   0, 10000);
+
+    _terminateNotify = addMatchingNotification(gIOTerminatedNotification,
+											 propertyMatch,
+											 notificationHandler,
+											 this,
+											 0, 10000);
+
+    propertyMatch->release();
+  }
+
   DEBUG_LOG("ApplePS2Controller::start leaving.\n");
   return true; // success
 
@@ -728,6 +732,7 @@ void ApplePS2Controller::stop(IOService * provider)
 
   // Free the RMCF configuration cache
   OSSafeReleaseNULL(_rmcfCache);
+  OSSafeReleaseNULL(_deliverNotification);
 
   // Free the request queue lock and empty out the request queue.
   if (_requestQueueLock)
@@ -2036,6 +2041,7 @@ void ApplePS2Controller::notificationHandlerGated(IOService * newService, IONoti
 
 bool ApplePS2Controller::notificationHandler(void * refCon, IOService * newService, IONotifier * notifier)
 {
+	assert(_cmdGate != nullptr);
     _cmdGate->runAction(OSMemberFunctionCast(IOCommandGate::Action, this, &ApplePS2Controller::notificationHandlerGated), newService, notifier);
     return true;
 }
@@ -2080,6 +2086,7 @@ void ApplePS2Controller::dispatchMessageGated(int* message, void* data)
 
 void ApplePS2Controller::dispatchMessage(int message, void* data)
 {
+	assert(_cmdGate != nullptr);
     _cmdGate->runAction(OSMemberFunctionCast(IOCommandGate::Action, this, &ApplePS2Controller::dispatchMessageGated), &message, data);
 }
 
diff --git a/VoodooPS2Controller/VoodooPS2Controller.h b/VoodooPS2Controller/VoodooPS2Controller.h
index 7e4d7595..48cb5479 100644
--- a/VoodooPS2Controller/VoodooPS2Controller.h
+++ b/VoodooPS2Controller/VoodooPS2Controller.h
@@ -181,9 +181,9 @@ class EXPORT ApplePS2Controller : public IOService
   OSDeclareDefaultStructors(ApplePS2Controller);
     
 public:                                // interrupt-time variables and functions
-  IOInterruptEventSource * _interruptSourceKeyboard;
-  IOInterruptEventSource * _interruptSourceMouse;
-  IOInterruptEventSource * _interruptSourceQueue;
+	IOInterruptEventSource * _interruptSourceKeyboard {nullptr};
+  IOInterruptEventSource * _interruptSourceMouse {nullptr};
+  IOInterruptEventSource * _interruptSourceQueue {nullptr};
 
 #if DEBUGGER_SUPPORT
   bool                     _debuggingEnabled;
@@ -197,7 +197,7 @@ class EXPORT ApplePS2Controller : public IOService
 #endif //DEBUGGER_SUPPORT
 
 private:
-  IOWorkLoop *             _workLoop;
+  IOWorkLoop *             _workLoop {nullptr};
   queue_head_t             _requestQueue;
   IOLock*                  _requestQueueLock;
   IOLock*                  _cmdbyteLock;
@@ -221,20 +221,20 @@ class EXPORT ApplePS2Controller : public IOService
   int                      _ignoreInterrupts;
   int                      _ignoreOutOfOrder;
     
-  ApplePS2MouseDevice *    _mouseDevice;          // mouse nub
-  ApplePS2KeyboardDevice * _keyboardDevice;       // keyboard nub
+  ApplePS2MouseDevice *    _mouseDevice {nullptr};          // mouse nub
+  ApplePS2KeyboardDevice * _keyboardDevice {nullptr};       // keyboard nub
 
-  IONotifier*              _publishNotify;
-  IONotifier*              _terminateNotify;
+  IONotifier*              _publishNotify {nullptr};
+  IONotifier*              _terminateNotify {nullptr};
     
-  OSSet*                   _notificationServices;
+  OSSet*                   _notificationServices {nullptr};
     
 #if DEBUGGER_SUPPORT
-  IOSimpleLock *           _controllerLock;       // mach simple spin lock
+  IOSimpleLock *           _controllerLock {nullptr};       // mach simple spin lock
 
-  KeyboardQueueElement *   _keyboardQueueAlloc;   // queues' allocation space
-  queue_head_t             _keyboardQueue;        // queue of available keys
-  queue_head_t             _keyboardQueueUnused;  // queue of unused entries
+  KeyboardQueueElement *   _keyboardQueueAlloc {nullptr};   // queues' allocation space
+  queue_head_t             _keyboardQueue;        			// queue of available keys
+  queue_head_t             _keyboardQueueUnused;  			// queue of unused entries
 
   bool                     _extendedState;
   UInt16                   _modifierState;
@@ -249,11 +249,12 @@ class EXPORT ApplePS2Controller : public IOService
 #endif
   int                      _wakedelay;
   bool                     _mouseWakeFirst;
-  IOCommandGate*           _cmdGate;
+  IOCommandGate*           _cmdGate {nullptr};
 #if WATCHDOG_TIMER
-  IOTimerEventSource*      _watchdogTimer;
+  IOTimerEventSource*      _watchdogTimer {nullptr};
 #endif
-  OSDictionary*            _rmcfCache;
+  OSDictionary*            _rmcfCache {nullptr};
+  const OSSymbol*          _deliverNotification {nullptr};
 
   virtual PS2InterruptResult _dispatchDriverInterrupt(PS2DeviceType deviceType, UInt8 data);
   virtual void dispatchDriverInterrupt(PS2DeviceType deviceType, UInt8 data);