Tidy up your HttpClient usage