Refactor client object