Refactoring

Blub