Minor fixes to comments and redundant variables #1830

Job	Run time
Static Analysis	8s
Build package	6s
Build package	15s
Call ci unit tests workflow / Run tests (3.10)	1m 57s
Call ci unit tests workflow / Run tests (3.11)	1m 56s
Call ci unit tests workflow / Run tests (3.9)	1m 56s
	6m 18s

Provide feedback