refactor code according to the comments #677

All 408 tests pass, 1 skipped in 4m 9s

    1 files ±0 156 suites ±0 4m 9s ⏱️ -2s
409 tests ±0 408 ✔️ ±0 1 💤 ±0 0 ❌ ±0
414 runs ±0 413 ✔️ ±0 1 💤 ±0 0 ❌ ±0

Results for commit 0c19860. ± Comparison against earlier commit 47c05d5.