simplifying service. Adding more docs