Elliot Shank

Refactoring refactored refactorings.