Refactor client connection checkout