Refactoring, one bugfix #657

Job	Run time
Documentation	5m 43s
Julia 1 - windows-latest - x64 - pull_request	15m 48s
Julia 1 - ubuntu-latest - x64 - pull_request	8m 27s
Julia 1.10 - ubuntu-latest - x64 - pull_request	7m 51s
Julia 1 - macOS-latest - aarch64 - pull_request	6m 44s
Julia pre - ubuntu-latest - x64 - pull_request	8m 38s
	53m 11s

Provide feedback