Update service response to be accurate
Also made it pretty