Tom Ridge

Refactoring