4 Years Ago
Bunch of clean up/refactoring/optimizing