Craig Buchek

Refactoring