REFACTOR

Signed-off-by: JesperHolmstrom <jesper_jeppe@hotmail.com>
COVERAGE

Signed-off-by: JesperHolmstrom <jesper_jeppe@hotmail.com>
Signed-off-by: JesperHolmstrom <jesper_jeppe@hotmail.com>