Minor refactoring to the services