Thomas Meeks

Refactoring