Refactoring remoting