refactor(spm): collapse helpers, trim verbose comments #10002

Job	Run time
comment-and-label	5s
	5s

Provide feedback