Refactoring the Baseline Functionality #323

Job	Run time
Unittests (8.2)	41s
Unittests (8.3)	37s
Coding Standard & Static Analysis	29s
Unittests (8.4)	1m 1s
	2m 48s

Provide feedback