More refactoring in view.py to streamline the watcher process