Aaron Harpole

Refactoring