[service] refactoring