More ActorRef refactoring