Sebastian Delmont

Refactoring