Refactoring more code and fixing broken utils #1303

Job	Run time
Set CI/CD metadata	6s
Commit stage / Check file format	4s
Commit stage / Check English usage	7s
Commit stage / Count lines of code	9s
Commit stage / Scan dependencies	28s
Commit stage / Check Markdown format	6s
Commit stage / Scan secrets	8s
Test stage / Run Util Tests	33s
	1m 41s

Provide feedback