Phil Crissman

Refactoring