Cleaned up the json responses