10 Years Ago
Even more refactoring.