Pat Maddox

Refactoring