Aaron Patterson

Refactoring