Refactoring services to SRP