7 Years Ago
Refactoring some of the easy stuff