6 Years Ago
More refactoring