Stephan Hagemann

Refactoring