Great refactoring, Pt. III