Mark Siemers

Refactoring