Kasper Timm Hansen

Refactoring