7 Years Ago
More refactoring