Drying up some code
Fix json response