Cleaned up request generation