refactor: fix code quality based on comments #1282

All 533 tests pass, 2 skipped in 3m 57s

    1 files ±0 212 suites ±0 3m 57s ⏱️ +3s
535 tests ±0 533 ✔️ ±0 2 💤 ±0 0 ❌ ±0
538 runs ±0 536 ✔️ ±0 2 💤 ±0 0 ❌ ±0

Results for commit 972efe2. ± Comparison against earlier commit c34d15f.