Switched to internal HttpClient. Also some resharper suggestions