Refacotring remote actor