Cleaned up some of the response code.