The Great Refactoring begins
Great refactoring, Pt. I