Minor changes

Maybe I'm wrong though, the service module is hard to follow.