General refactor and format #284

Job	Run time
Run pipeline with test data (24.04.2 \| test \| docker)	3m 9s
Run pipeline with test data (latest-everything \| test \| docker)	2m 51s
	6m 0s

Provide feedback