Refactoring, one bugfix #666

Job	Run time
Documentation	5m 45s
Julia 1.10 - ubuntu-latest - x64 - pull_request	8m 11s
Julia 1 - macOS-latest - aarch64 - pull_request	5m 50s
Julia pre - ubuntu-latest - x64 - pull_request	8m 34s
Julia 1 - ubuntu-latest - x64 - pull_request	8m 37s
Julia 1 - windows-latest - x64 - pull_request	9m 46s
	46m 43s

Provide feedback