Minor edits and code cleanup #3073

Job	Run time
test-latest-deps	10m 38s
features-tests / test	32s
build-lint-test (3.9, windows-latest)	12m 47s
build-lint-test (3.9, macos-arm)	7m 53s
build-lint-test (3.9, ubuntu-arm)	10m 20s
build-lint-test (3.9, ubuntu-latest)	16m 45s
build-lint-test (3.13, ubuntu-arm)	10m 55s
build-lint-test (3.13, ubuntu-latest)	17m 59s
build-lint-test (3.9, macos-intel)	11m 2s
build-lint-test (3.13, macos-arm)	10m 42s
build-lint-test (3.13, windows-latest)	17m 13s
build-lint-test (3.13, macos-intel)	16m 16s
	2h 23m 2s

Provide feedback