Refactor

Refactor af klasse