Refactor: Extract memory from Watcher into separate class