Refactorizing Old School