refactoring service clients