I think you should move this all to another method under StorageWatcher.