Jason Charnes

Refactoring