Cleaning up and fixing json as default response format