refactor: this --> client