10 Years Ago
Refactor fixes