Enhanced code refactoring #21

Job	Run time
Security Audit	5m 8s
Test Suite (ubuntu-latest, stable)	21s
Test Suite (ubuntu-latest, beta)	32s
Test Suite (windows-latest, beta)	26s
Test Suite (macos-latest, beta)	36s
Test Suite (windows-latest, stable)	1m 24s
Test Suite (macos-latest, stable)	29s
Build Release	0s
	8m 56s

Provide feedback