Cleaned up HttpClient usage