More cleanup and refactoring
Decorator for services with serviceID and running info