NN clusterizer: Cleanup + fix for cluster flag setting #24128

Job	Run time
PR formatting / clang-format	36s
PR formatting / line endings	28s
PR formatting / whitespace	17s
PR formatting / pragma-once	7s
PR formatting / copyright headers	18s
	1m 46s

Provide feedback