version_watcher: code cleanup