Refactoring to support kolich-httpclient4-closure 2.3