Renamed cutomer service
Refactored Service and queries