JSDoc updates
Refactor service.