9 Years Ago
Refactoring, cleanup and fixes