Rein Henrichs

Refactoring