Chris Wyckoff

Refactoring