Made a few changes to clean up the service.