Refactoring to accomodate kolich-httpclient4-closure 2.1