first refactorings of services