refactor(client): small refactoring #290

Job	Run time
Check Style	10s
Test with Miri	45s
Check MSRV (1.63)	2m 9s
features	41s
Test stable on ubuntu-latest	39s
Test stable on windows-latest	1m 14s
Test stable on macOS-latest	52s
Test beta on ubuntu-latest	36s
Test beta on windows-latest	1m 21s
Test beta on macOS-latest	52s
Test nightly on ubuntu-latest	35s
Test nightly on windows-latest	1m 10s
Test nightly on macOS-latest	55s
Build docs	19s
CI is green	1s
	12m 19s

Provide feedback