Extend & reformat Watchdog.cs