Enhanced code refactoring #29

Job	Run time
Security Audit	5m 9s
Test Suite (windows-latest, stable)	32s
Test Suite (ubuntu-latest, stable)	23s
Test Suite (macos-latest, beta)	36s
Test Suite (ubuntu-latest, beta)	33s
Test Suite (windows-latest, beta)	25s
Test Suite (macos-latest, stable)	22s
Build Release	0s
	8m 0s

Provide feedback