Slight cleanup of request and response code.