Refactoring for Guzzle3