10 Years Ago
More refactoring.