Viktor Schmidt

Refactoring