8 Years Ago
Refactoring, simplification