Jon: cleaner httpclient