Refactoring webservice clients