Minor refactoring on the service methods