Small refactor, internalise the datastruct #7028

Job	Run time
lint-code	5s
test-application-3-10 / test-application	1m 46s
test-application-3-11 / test-application	1m 53s
test-application-3-12 / test-application	1m 46s
test-application-3-13 / test-application	2m 15s
	7m 45s

Provide feedback