Eric Hayes

Refactoring