Refactor Octogate::Client