Adam Hawkins

Refactoring