Jason Swett

Refactoring