optimization and refactoring for events ignored by watchdog