Refactor PuppetDb\Client