refactoring few services