Improving service

Redefining Service as a class to create great apis to define the behavior.
Trailing whitespace detected.