Chris Hagmann

Refactoring