Ryan Davis

Refactoring