Refactor existing code #15

Job	Run time
build (ubuntu-gcc14, ubuntu-latest, Release, gcc-14, g++-14)	1m 6s
build (windows-msvc, windows-latest, Release, cl, cl)	51s
build (ubuntu-clang, ubuntu-latest, Release, clang, clang++)	42s
	2m 39s

Provide feedback