Refactored Code in ArenaWatcher