Refactor RemoteNode