Brian Marrick

Refactoring