do refactoring service classes