refactored service, routes and views