Sean Griffin

Refactoring