Mark Menard

Refactoring