Ben Lovell

Refactoring